]> git.baikalelectronics.ru Git - kernel.git/commitdiff
Merge tag 'xfs-for-linus-4.10-rc3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Jan 2017 02:33:35 +0000 (18:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Jan 2017 02:33:35 +0000 (18:33 -0800)
Pull xfs fixes from Darrick Wong:

 - fixes for crashes and double-cleanup errors

 - XFS maintainership handover

 - fix to prevent absurdly large block reservations

 - fix broken sysfs getter/setters

* tag 'xfs-for-linus-4.10-rc3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
  xfs: fix max_retries _show and _store functions
  xfs: update MAINTAINERS
  xfs: fix crash and data corruption due to removal of busy COW extents
  xfs: use the actual AG length when reserving blocks
  xfs: fix double-cleanup when CUI recovery fails

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge