]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: deff82f a081298)
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Feb 2012 22:19:45 +0000 (14:19 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Feb 2012 22:19:45 +0000 (14:19 -0800)
commit9bd0ae5578ce54b52204db4cdb758ad009586d7b
tree17b622ee141cb9fd6eda5417ec30f9ea21a29c14tree | snapshot
parentdeff82f93da7f15d01aca05c2bd7eb7d6de4e97bcommit | diff
parenta081298745e976e61afb3d71e68ee4e674625264commit | diff
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

Two bugfixes in XFS for 3.3: one fix passes KMEM_SLEEP to kmem_realloc
instead of 0, and the other resolves a possible deadlock in xfs quotas.

* 'for-linus' of git://oss.sgi.com/xfs/xfs:
  xfs: use a normal shrinker for the dquot freelist
  xfs: pass KM_SLEEP flag to kmem_realloc() in xlog_recover_add_to_cnt_trans()
Linux Kernel Source Tree.