aboutsummaryrefslogtreecommitdiff
path: root/include
AgeCommit message (Collapse)AuthorFilesLines
2011-03-12net: Remove unnecessary padding in struct flowiDavid S. Miller1-10/+10
Move tos, scope, proto, and flags to the beginning of the structure. Signed-off-by: David S. Miller <[email protected]>
2011-03-12ipv4: Create and use route lookup helpers.David S. Miller1-0/+48
The idea here is this minimizes the number of places one has to edit in order to make changes to how flows are defined and used. Signed-off-by: David S. Miller <[email protected]>
2011-03-12Merge branch 'for-davem' of ↵David S. Miller4-33/+81
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
2011-03-12Merge branch 'irq/core' into x86/irqThomas Gleixner3-95/+429
Reason: Enabling irq threads and update to latest genirq functionality requires the core code Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-12Merge branch 'tip/futex/devel' of ↵Thomas Gleixner1-23/+24
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-rt into core/futexes futex,plist: Pass the real head of the priority list to plist_del() futex,plist: Remove debug lock assignment from plist_node plist: Shrink struct plist_head plist: Add priority list test
2011-03-12genirq: Add chip flag to force mask on suspendThomas Gleixner1-0/+2
On suspend we disable all interrupts in the core code, but this does not mask the interrupt line in the default implementation as we use a lazy disable approach. That means we mark the interrupt disabled, but leave the hardware unmasked. That's an optimization because we avoid the hardware access for the common case where no interrupt happens after we marked it disabled. If an interrupt happens, then the interrupt flow handler masks the line at the hardware level and marks it pending. Suspend makes use of this delayed disable as it "disables" all interrupts when preparing the suspend transition. Right before the system goes into hardware suspend state it checks whether one of the interrupts which is marked as a wakeup interrupt came in after disabling it. Most interrupt chips have a separate register which selects the interrupts which can wake up the system from suspend, so we don't have to mask any on the non wakeup interrupts. But now we have to deal with brilliant designed hardware which lacks such a wakeup configuration facility. For such hardware it's necessary to mask all non wakeup interrupts before going into suspend in order to avoid the wakeup from random interrupts. Rather than working around this in the affected interrupt chip implementations we can solve this elegant in the core code itself. Add a flag IRQCHIP_MASK_ON_SUSPEND which can be set by the irq chip implementation to indicate, that the interrupts which are not selected as wakeup sources must be masked in the suspend path. Mask them in the loop which checks the wakeup interrupts pending flag. Signed-off-by: Thomas Gleixner <[email protected]> Reviewed-by: Abhijeet Dharmapurikar <[email protected]> LKML-Reference: <[email protected]>
2011-03-12gpio/mcp23s08: support mcp23s17 variantPeter Korsgaard1-6/+9
mpc23s17 is very similar to the mcp23s08, except that registers are 16bit wide, so extend the interface to work with both variants. The s17 variant also has an additional address pin, so adjust platform data structure to support up to 8 devices per SPI chipselect. Signed-off-by: Peter Korsgaard <[email protected]> Signed-off-by: Grant Likely <[email protected]>
2011-03-12Merge commit 'v2.6.38-rc8' into spi/nextGrant Likely37-86/+159
Conflicts: drivers/spi/pxa2xx_spi_pci.c
2011-03-11usb: host: Add EHCI driver for NVIDIA Tegra SoCsBenoit Goby2-1/+34
The Tegra 2 SoC has 3 EHCI compatible USB controllers. This patch adds the necessary glue to allow the ehci-hcd driver to work on Tegra 2 SoCs. The platform data is used to configure board-specific phy settings and to configure the operating mode, as one of the ports may be used as a otg port. For additional power saving, the driver supports powering down the phy on bus suspend when it is used, for example, to connect an internal device that use an out-of-band remote wakeup mechanism (e.g. a gpio). Signed-off-by: Benoit Goby <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-03-11usb: otg: Add ulpi viewport access opsBenoit Goby1-0/+5
Add generic access ops for controllers with a ulpi viewport register (e.g. Chipidea/ARC based controllers). Signed-off-by: Benoit Goby <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
2011-03-11NFSv4: Send unmapped uid/gids to the server when using auth_sysTrond Myklebust1-0/+1
The new behaviour is enabled using the new module parameter 'nfs4_disable_idmapping'. Note that if the server rejects an unmapped uid or gid, then the client will automatically switch back to using the idmapper. Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4: cleanup idmapper functions to take an nfs_server argumentTrond Myklebust1-4/+5
...instead of the nfs_client. Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1: rearrange ->doio argsFred Isaman1-2/+2
This will make it possible to clear the lseg pointer in the same function as it is put, instead of in the caller nfs_pageio_doio(). Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1: pnfs filelayout driver writeFred Isaman1-0/+2
Allows the pnfs filelayout driver to write to the data servers. Note that COMMIT to data servers will be implemented in a future patch. To avoid improper behavior, for the moment any WRITE to a data server that would also require a COMMIT to the data server is sent NFS_FILE_SYNC. Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Dean Hildebrand <[email protected]> Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Mingyang Guo <[email protected]> Signed-off-by: Oleg Drokin <[email protected]> Signed-off-by: Ricardo Labiaga <[email protected]> Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Benny Halevy <[email protected]> Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1: implement generic pnfs layer write switchAndy Adamson2-0/+2
Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Boaz Harrosh <[email protected]> Signed-off-by: Dean Hildebrand <[email protected]> Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: J. Bruce Fields <[email protected]> Signed-off-by: Mike Sager <[email protected]> Signed-off-by: Ricardo Labiaga <[email protected]> Signed-off-by: Tao Guo <[email protected]> Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Benny Halevy <[email protected]> Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1: Send lseg down into nfs_write_rpcsetupFred Isaman1-0/+1
We grab the lseg sent in from the doio function and attach it to each struct nfs_write_data created. This is how the lseg will be sent to the layout driver. Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1: add callback to nfs4_write_doneFred Isaman1-0/+1
Add callback that pnfs layout driver can use to do its own handling of data server WRITE response. Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1 move deviceid cache to filelayout driverChristoph Hellwig1-1/+0
No need for generic cache with only one user. Keep a simple hash of deviceids in the filelayout driver. Signed-off-by: Christoph Hellwig <[email protected]> Acked-by: Andy Adamson <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1: filelayout async error handlerAndy Adamson2-0/+2
Use our own async error handler. Mark the layout as failed and retry i/o through the MDS on specified errors. Update the mds_offset in nfs_readpage_retry so that a failed short-read retry to a DS gets correctly resent through the MDS. Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1: filelayout readAndy Adamson1-0/+1
Attempt a pNFS file layout read by setting up the nfs_read_data struct and calling nfs_initiate_read with the data server rpc client and the filelayout rpc call ops. Error handling is implemented in a subsequent patch. Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Dean Hildebrand <[email protected]> Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Mingyang Guo <[email protected]> Signed-off-by: Oleg Drokin <[email protected]> Signed-off-by: Ricardo Labiaga <[email protected]> Tested-by: Guo Mingyang <[email protected]> Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Benny Halevy <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1: data server connectionAndy Adamson1-0/+1
Introduce a data server set_client and init session following the nfs4_set_client and nfs4_init_session convention. Once a new nfs_client is on the nfs_client_list, the nfs_client cl_cons_state serializes access to creating an nfs_client struct with matching properties. Use the new nfs_get_client() that initializes new clients. Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1: generic readAndy Adamson2-0/+2
Separate the rpc run portion of nfs_read_rpcsetup into a new function nfs_initiate_read that is called for normal NFS I/O. Add a pNFS read_pagelist function that is called instead of nfs_intitate_read for pNFS reads. Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Boaz Harrosh <[email protected]> Signed-off-by: Dean Hildebrand <[email protected]> Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Mike Sager <[email protected]> Signed-off-by: Mingyang Guo <[email protected]> Signed-off-by: Ricardo Labiaga <[email protected]> Signed-off-by: Tao Guo <[email protected]> Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Benny Halevy <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1: shift pnfs_update_layout locationsFred Isaman2-2/+3
Move the pnfs_update_layout call location to nfs_pageio_do_add_request(). Grab the lseg sent in the doio function to nfs_read_rpcsetup and attach it to each nfs_read_data so it can be sent to the layout driver. Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Dean Hildebrand <[email protected]> Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Benny Halevy <[email protected]> Signed-off-by: Boaz Harrosh <[email protected]> Signed-off-by: Oleg Drokin <[email protected]> Signed-off-by: Tao Guo <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1: coelesce across layout stripesFred Isaman1-0/+2
Add a pg_test layout driver hook which is used to avoid coelescing I/O across layout stripes. Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Dean Hildebrand <[email protected]> Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Benny Halevy <[email protected]> Signed-off-by: Boaz Harrosh <[email protected]> Signed-off-by: Oleg Drokin <[email protected]> Signed-off-by: Tao Guo <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1: new flag for lease time checkAndy Adamson1-0/+1
Data servers cannot send nfs4_proc_get_lease_time. but still need to setup state renewal. Add the NFS_CS_CHECK_LEASE_TIME bit to indicate if the lease time can be checked. Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4.1: new flag for state renewal checkAndy Adamson1-0/+1
Data servers not sharing a session with the mount MDS always have an empty cl_superblocks list. Replace the cl_superblocks empty list check to see if it is time to shut down renewd with the NFS_CS_STOP_RENEW bit which is not set by such a data server. Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFS move nfs_client initialization into nfs_get_clientAndy Adamson1-0/+3
Now nfs_get_client returns an nfs_client ready to be used no matter if it was found or created. Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFSv4: remove CONFIG_NFS_V4 from nfs_read_dataAndy Adamson1-2/+0
Cleanup nfs_read_data. We also won't use CONFIG_NFS_V4_1 for additional NFSv4.1 fields in subsequent patches. Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11NFS: change nfs_writeback_done to return voidFred Isaman1-1/+1
The return values are not used by any callers. Signed-off-by: Fred Isaman <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11mac80211: implement support for cfg80211_ops->{get,set}_ringparamJohn W. Linville1-0/+7
Signed-off-by: John W. Linville <[email protected]>
2011-03-11NFSv4/4.1: Fix nfs4_schedule_state_recovery abusesTrond Myklebust1-5/+3
nfs4_schedule_state_recovery() should only be used when we need to force the state manager to check the lease. If we just want to start the state manager in order to handle a state recovery situation, we should be using nfs4_schedule_state_manager(). This patch fixes the abuses of nfs4_schedule_state_recovery() by replacing its use with a set of helper functions that do the right thing. Signed-off-by: Trond Myklebust <[email protected]>
2011-03-11plist: Shrink struct plist_headLai Jiangshan1-23/+24
struct plist_head is used in struct task_struct as well as struct rtmutex. If we can make it smaller, it will also make these structures smaller as well. The field prio_list in struct plist_head is seldom used and we can get its information from the plist_nodes. Removing this field will decrease the size of plist_head by half. Signed-off-by: Lai Jiangshan <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Steven Rostedt <[email protected]>
2011-03-11block: fixup plugging stubs for !CONFIG_BLOCKJens Axboe1-3/+6
They used an older prototype, fix it up. Reported-by: Randy Dunlap <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
2011-03-11wireless: add support for ethtool_ops->{get,set}_ringparamJohn W. Linville1-0/+8
Signed-off-by: John W. Linville <[email protected]>
2011-03-11Merge branch 'master' of ↵John W. Linville4-33/+81
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
2011-03-11Merge branch 'slab/rcu' into slab/nextPekka Enberg70-187/+355
Conflicts: mm/slub.c
2011-03-11slub: automatically reserve bytes at the end of slabLai Jiangshan1-0/+1
There is no "struct" for slub's slab, it shares with struct page. But struct page is very small, it is insufficient when we need to add some metadata for slab. So we add a field "reserved" to struct kmem_cache, when a slab is allocated, kmem_cache->reserved bytes are automatically reserved at the end of the slab for slab's metadata. Changed from v1: Export the reserved field via sysfs Acked-by: Christoph Lameter <[email protected]> Signed-off-by: Lai Jiangshan <[email protected]> Signed-off-by: Pekka Enberg <[email protected]>
2011-03-11Lockless (and preemptless) fastpaths for slubChristoph Lameter1-1/+4
Use the this_cpu_cmpxchg_double functionality to implement a lockless allocation algorithm on arches that support fast this_cpu_ops. Each of the per cpu pointers is paired with a transaction id that ensures that updates of the per cpu information can only occur in sequence on a certain cpu. A transaction id is a "long" integer that is comprised of an event number and the cpu number. The event number is incremented for every change to the per cpu state. This means that the cmpxchg instruction can verify for an update that nothing interfered and that we are updating the percpu structure for the processor where we picked up the information and that we are also currently on that processor when we update the information. This results in a significant decrease of the overhead in the fastpaths. It also makes it easy to adopt the fast path for realtime kernels since this is lockless and does not require the use of the current per cpu area over the critical section. It is only important that the per cpu area is current at the beginning of the critical section and at the end. So there is no need even to disable preemption. Test results show that the fastpath cycle count is reduced by up to ~ 40% (alloc/free test goes from ~140 cycles down to ~80). The slowpath for kfree adds a few cycles. Sadly this does nothing for the slowpath which is where the main issues with performance in slub are but the best case performance rises significantly. (For that see the more complex slub patches that require cmpxchg_double) Kmalloc: alloc/free test Before: 10000 times kmalloc(8)/kfree -> 134 cycles 10000 times kmalloc(16)/kfree -> 152 cycles 10000 times kmalloc(32)/kfree -> 144 cycles 10000 times kmalloc(64)/kfree -> 142 cycles 10000 times kmalloc(128)/kfree -> 142 cycles 10000 times kmalloc(256)/kfree -> 132 cycles 10000 times kmalloc(512)/kfree -> 132 cycles 10000 times kmalloc(1024)/kfree -> 135 cycles 10000 times kmalloc(2048)/kfree -> 135 cycles 10000 times kmalloc(4096)/kfree -> 135 cycles 10000 times kmalloc(8192)/kfree -> 144 cycles 10000 times kmalloc(16384)/kfree -> 754 cycles After: 10000 times kmalloc(8)/kfree -> 78 cycles 10000 times kmalloc(16)/kfree -> 78 cycles 10000 times kmalloc(32)/kfree -> 82 cycles 10000 times kmalloc(64)/kfree -> 88 cycles 10000 times kmalloc(128)/kfree -> 79 cycles 10000 times kmalloc(256)/kfree -> 79 cycles 10000 times kmalloc(512)/kfree -> 85 cycles 10000 times kmalloc(1024)/kfree -> 82 cycles 10000 times kmalloc(2048)/kfree -> 82 cycles 10000 times kmalloc(4096)/kfree -> 85 cycles 10000 times kmalloc(8192)/kfree -> 82 cycles 10000 times kmalloc(16384)/kfree -> 706 cycles Kmalloc: Repeatedly allocate then free test Before: 10000 times kmalloc(8) -> 211 cycles kfree -> 113 cycles 10000 times kmalloc(16) -> 174 cycles kfree -> 115 cycles 10000 times kmalloc(32) -> 235 cycles kfree -> 129 cycles 10000 times kmalloc(64) -> 222 cycles kfree -> 120 cycles 10000 times kmalloc(128) -> 343 cycles kfree -> 139 cycles 10000 times kmalloc(256) -> 827 cycles kfree -> 147 cycles 10000 times kmalloc(512) -> 1048 cycles kfree -> 272 cycles 10000 times kmalloc(1024) -> 2043 cycles kfree -> 528 cycles 10000 times kmalloc(2048) -> 4002 cycles kfree -> 571 cycles 10000 times kmalloc(4096) -> 7740 cycles kfree -> 628 cycles 10000 times kmalloc(8192) -> 8062 cycles kfree -> 850 cycles 10000 times kmalloc(16384) -> 8895 cycles kfree -> 1249 cycles After: 10000 times kmalloc(8) -> 190 cycles kfree -> 129 cycles 10000 times kmalloc(16) -> 76 cycles kfree -> 123 cycles 10000 times kmalloc(32) -> 126 cycles kfree -> 124 cycles 10000 times kmalloc(64) -> 181 cycles kfree -> 128 cycles 10000 times kmalloc(128) -> 310 cycles kfree -> 140 cycles 10000 times kmalloc(256) -> 809 cycles kfree -> 165 cycles 10000 times kmalloc(512) -> 1005 cycles kfree -> 269 cycles 10000 times kmalloc(1024) -> 1999 cycles kfree -> 527 cycles 10000 times kmalloc(2048) -> 3967 cycles kfree -> 570 cycles 10000 times kmalloc(4096) -> 7658 cycles kfree -> 637 cycles 10000 times kmalloc(8192) -> 8111 cycles kfree -> 859 cycles 10000 times kmalloc(16384) -> 8791 cycles kfree -> 1173 cycles Signed-off-by: Christoph Lameter <[email protected]> Signed-off-by: Pekka Enberg <[email protected]>
2011-03-11slub: min_partial needs to be in first cachelineChristoph Lameter1-1/+1
It is used in unfreeze_slab() which is a performance critical function. Signed-off-by: Christoph Lameter <[email protected]> Signed-off-by: Pekka Enberg <[email protected]>
2011-03-11Merge branch 'for-2.6.39' of ↵Pekka Enberg2-13/+150
git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into slub/lockless
2011-03-11genirq: Add desc->irq_data accessorThomas Gleixner1-0/+5
We have accessors for all fields in irq_data based on irq_desc, but not for irq_data itself. Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-11futex: Sanitize futex ops argument typesMichel Lespinasse1-4/+4
Change futex_atomic_op_inuser and futex_atomic_cmpxchg_inatomic prototypes to use u32 types for the futex as this is the data type the futex core code uses all over the place. Signed-off-by: Michel Lespinasse <[email protected]> Cc: Darren Hart <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Matt Turner <[email protected]> Cc: Russell King <[email protected]> Cc: David Howells <[email protected]> Cc: Tony Luck <[email protected]> Cc: Michal Simek <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: "James E.J. Bottomley" <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Paul Mundt <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Chris Metcalf <[email protected]> Cc: Linus Torvalds <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-11futex: Sanitize cmpxchg_futex_value_locked APIMichel Lespinasse1-1/+2
The cmpxchg_futex_value_locked API was funny in that it returned either the original, user-exposed futex value OR an error code such as -EFAULT. This was confusing at best, and could be a source of livelocks in places that retry the cmpxchg_futex_value_locked after trying to fix the issue by running fault_in_user_writeable(). This change makes the cmpxchg_futex_value_locked API more similar to the get_futex_value_locked one, returning an error code and updating the original value through a reference argument. Signed-off-by: Michel Lespinasse <[email protected]> Acked-by: Chris Metcalf <[email protected]> [tile] Acked-by: Tony Luck <[email protected]> [ia64] Acked-by: Thomas Gleixner <[email protected]> Tested-by: Michal Simek <[email protected]> [microblaze] Acked-by: David Howells <[email protected]> [frv] Cc: Darren Hart <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Matt Turner <[email protected]> Cc: Russell King <[email protected]> Cc: Ralf Baechle <[email protected]> Cc: "James E.J. Bottomley" <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Paul Mundt <[email protected]> Cc: "David S. Miller" <[email protected]> Cc: Linus Torvalds <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]>
2011-03-11ALSA: Add snd_ctl_activate_id()Takashi Iwai1-0/+2
Added a new API function snd_ctl_activate_id() for activate / inactivate the control element dynamically. Signed-off-by: Takashi Iwai <[email protected]> Signed-off-by: Mark Brown <[email protected]>
2011-03-11net: add proper documentation for previously added net_device_ops for FCoEYi Zou1-0/+36
Add proper documentation for previously added net_device_ops ops for FCoE. Signed-off-by: Yi Zou <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
2011-03-10Merge branch 'for_2.6.39/pm-misc' of ↵Tony Lindgren8-17/+13
ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
2011-03-10ipv4: Kill flowi arg to fib_select_multipath()David S. Miller1-1/+1
Completely unused. Signed-off-by: David S. Miller <[email protected]>
2011-03-10ipv4: Remove redundant RCU locking in ip_check_mc().David S. Miller1-1/+1
All callers are under rcu_read_lock() protection already. Rename to ip_check_mc_rcu() to make it even more clear. Signed-off-by: David S. Miller <[email protected]>
2011-03-10Merge branch 'master' of ↵David S. Miller5-12/+21
master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 Conflicts: drivers/net/bnx2x/bnx2x_cmn.c
2011-03-10NFSv4: remove duplicate clientid in struct nfs_clientAndy Adamson1-2/+0
Signed-off-by: Andy Adamson <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
Powered by cgit, Gruvboxed by Blaster4385.