diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 00:23:52 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-29 00:23:52 +0200 |
| commit | f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5 (patch) | |
| tree | fb51d60060453aef9e776c7d3a31588609d34d76 /drivers/net/ethernet/i825xx/3c527.c | |
| parent | Merge branch 'slab/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | xfs: add lots of attribute trace points (diff) | |
| download | linux-f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5.tar.xz linux-f21ce8f8447c8be8847dadcfdbcc76b0d7365fa5.zip | |
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
Pull XFS update (part 2) from Ben Myers:
"Fixes for tracing of xfs_name strings, flag handling in
open_by_handle, a log space hang with freeze/unfreeze, fstrim offset
calculations, a section mismatch with xfs_qm_exit, an oops in
xlog_recover_process_iunlinks, and a deadlock in xfs_rtfree_extent.
There are also additional trace points for attributes, and the
addition of a workqueue for allocation to work around kernel stack
size limitations."
* 'for-linus' of git://oss.sgi.com/xfs/xfs:
xfs: add lots of attribute trace points
xfs: Fix oops on IO error during xlog_recover_process_iunlinks()
xfs: fix fstrim offset calculations
xfs: Account log unmount transaction correctly
xfs: don't cache inodes read through bulkstat
xfs: trace xfs_name strings correctly
xfs: introduce an allocation workqueue
xfs: Fix open flag handling in open_by_handle code
xfs: fix deadlock in xfs_rtfree_extent
fs: xfs: fix section mismatch in linux-next
Diffstat (limited to 'drivers/net/ethernet/i825xx/3c527.c')
0 files changed, 0 insertions, 0 deletions