summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "nfsd: warn on odd reply state in nfsd_vfs_read"J. Bruce Fields2012-12-211-1/+0
* Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/r...Linus Torvalds2012-12-2122-214/+2234
|\
| *-. Merge branches 'cxgb4', 'ipoib' and 'mlx4' into for-nextRoland Dreier2012-12-199-45/+134
| |\ \
| | | * mlx4_core: Allow choosing flow steering modeJack Morgenstein2012-12-194-16/+50
| | | * mlx4_core: Adjustments to Flow Steering activation logic for SR-IOVJack Morgenstein2012-12-193-25/+62
| | | * mlx4_core: Fix error flow in the flow steering wrapperHadar Hen Zion2012-12-191-1/+1
| | | * mlx4_core: Add QPN enforcement for flow steering rules set by VFsHadar Hen Zion2012-12-191-6/+20
| | * | IPoIB: Call skb_dst_drop() once skb is enqueued for sendingRoland Dreier2012-12-192-1/+5
| | |/
| * | RDMA/cxgb4: Fix bug for active and passive LE hash collision pathVipul Pandya2012-12-197-88/+376
| * | RDMA/cxgb4: Fix LE hash collision bug for passive open connectionVipul Pandya2012-12-194-55/+497
| * | RDMA/cxgb4: Fix LE hash collision bug for active open connectionVipul Pandya2012-12-196-47/+315
| * | cxgb4: Add LE hash collision bug fix path in LLD driverVipul Pandya2012-12-194-10/+193
| * | cxgb4: Add T4 filter supportVipul Pandya2012-12-198-7/+757
| |/
* | Merge tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd...Linus Torvalds2012-12-219-68/+9
|\ \
| * | xtensa: Use generic asm/mmu.h for nommuLars-Peter Clausen2012-12-092-4/+1
| * | h8300: Use generic asm/mmu.hLars-Peter Clausen2012-12-092-10/+1
| * | c6x: Use generic asm/mmu.hLars-Peter Clausen2012-12-092-22/+1
| * | asm-generic/mmu.h: Add support for FDPICLars-Peter Clausen2012-12-091-0/+5
| * | asm-generic/mmu.h: Remove unused vmlist field from mm_context_tLars-Peter Clausen2012-12-091-1/+0
| * | asm-generic: io: remove {read,write} string functionsWill Deacon2012-10-261-30/+0
| * | asm-generic/io.h: remove asm/cacheflush.h includeJames Hogan2012-10-252-1/+1
* | | ARM: dts: fix duplicated build target and alphabetical sort out for exynosKukjin Kim2012-12-211-3/+2
* | | NFS: Kill fscache warnings when mounting without -ofscTrond Myklebust2012-12-211-4/+15
* | | NFS: Provide stub nfs_fscache_wait_on_invalidate() for when CONFIG_NFS_FSCACHE=nDavid Howells2012-12-211-0/+1
* | | Merge tag 'vfio-for-v3.8-v2' of git://github.com/awilliam/linux-vfioLinus Torvalds2012-12-202-53/+64
|\ \ \
| * | | vfio-pci: Enable device before attempting resetAlex Williamson2012-12-071-13/+10
| * | | VFIO: fix out of order labels for error recovery in vfio_pci_init()Jiang Liu2012-12-071-2/+2
| * | | VFIO: use ACCESS_ONCE() to guard access to dev->driverJiang Liu2012-12-071-1/+2
| * | | VFIO: unregister IOMMU notifier on error recovery pathJiang Liu2012-12-071-16/+15
| * | | vfio-pci: Re-order device resetAlex Williamson2012-12-071-12/+31
| * | | vfio: simplify kmalloc+copy_from_user to memdup_userFengguang Wu2012-12-071-9/+4
* | | | Merge branch 'for-next' of git://git.infradead.org/users/eparis/notifyLinus Torvalds2012-12-2014-121/+180
|\ \ \ \
| * | | | inotify: automatically restart syscallsEric Paris2012-12-111-1/+1
| * | | | inotify: dont skip removal of watch descriptor if creation of ignored event f...Lino Sanfilippo2012-12-111-5/+5
| * | | | fanotify: dont merge permission eventsLino Sanfilippo2012-12-111-0/+6
| * | | | fsnotify: make fasync generic for both inotify and fanotifyEric Paris2012-12-115-10/+20
| * | | | fsnotify: change locking orderLino Sanfilippo2012-12-112-13/+14
| * | | | fsnotify: dont put marks on temporary list when clearing marks by groupLino Sanfilippo2012-12-112-9/+2
| * | | | fsnotify: introduce locked versions of fsnotify_add_mark() and fsnotify_remov...Lino Sanfilippo2012-12-112-12/+34
| * | | | fsnotify: pass group to fsnotify_destroy_mark()Lino Sanfilippo2012-12-1110-34/+38
| * | | | fsnotify: use a mutex instead of a spinlock to protect a groups mark listLino Sanfilippo2012-12-115-15/+15
| * | | | fanotify: add an extra flag to mark_remove_from_mask that indicates wheather ...Lino Sanfilippo2012-12-111-5/+14
| * | | | fsnotify: take groups mark_lock before mark lockLino Sanfilippo2012-12-111-10/+16
| * | | | fsnotify: use reference counting for groupsLino Sanfilippo2012-12-114-28/+27
| * | | | fsnotify: introduce fsnotify_get_group()Lino Sanfilippo2012-12-112-1/+11
| * | | | inotify, fanotify: replace fsnotify_put_group() with fsnotify_destroy_group()Lino Sanfilippo2012-12-114-14/+13
* | | | | Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-12-2030-88/+261
|\ \ \ \ \
| * | | | | keys: use keyring_alloc() to create module signing keyringDavid Howells2012-12-201-9/+6
| * | | | | keys: fix unreachable codeAlan Cox2012-12-201-2/+0
| * | | | | sendfile: allows bypassing of notifier eventsScott Wolchok2012-12-201-0/+2
OpenPOWER on IntegriCloud