diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-22 11:26:01 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-02-22 11:26:01 -0500 |
| commit | 645ceee885facc6de60051be150ca1b06bdb9e51 (patch) | |
| tree | 51ca6e829aeacbe83e290cbd2b8c95e7268ae85d /MAINTAINERS | |
| parent | 10527106abec1e72a3b1f06fe58f0162603ed9df (diff) | |
| parent | 5ef11eb0700f806c4671ba33e5befa784a2f70ef (diff) | |
Merge branch 'xfs-fixes-for-3.14-rc4' of git://oss.sgi.com/xfs/xfs
Pull xfs fixes from Dave Chinner:
"This is the first pull request I've had to do for you, so I'm still
sorting things out. The reason I'm sending this and not Ben should be
obvious from the first commit below - SGI has stepped down from the
XFS maintainership role. As such, I'd like to take another
opportunity to thank them for their many years of effort maintaining
XFS and supporting the XFS community that they developed from the
ground up.
So I haven't had time to work things like signed tags into my
workflows yet, so this is just a repo branch I'm asking you to pull
from. And yes, I named the branch -rc4 because I wanted the fixes in
rc4, not because the branch was for merging into -rc3. Probably not
right, either.
Anyway, I should have everything sorted out by the time the next merge
window comes around. If there's anything that you don't like in the
pull req, feel free to flame me unmercifully.
The changes are fixes for recent regressions and important thinkos in
verification code:
- a log vector buffer alignment issue on ia32
- timestamps on truncate got mangled
- primary superblock CRC validation fixes and error message
sanitisation"
* 'xfs-fixes-for-3.14-rc4' of git://oss.sgi.com/xfs/xfs:
xfs: limit superblock corruption errors to actual corruption
xfs: skip verification on initial "guess" superblock read
MAINTAINERS: SGI no longer maintaining XFS
xfs: xfs_sb_read_verify() doesn't flag bad crcs on primary sb
xfs: ensure correct log item buffer alignment
xfs: ensure correct timestamp updates from truncate
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2225bb91afcc..5aa1c500fe6d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -9728,7 +9728,6 @@ F: drivers/xen/*swiotlb* | |||
| 9728 | XFS FILESYSTEM | 9728 | XFS FILESYSTEM |
| 9729 | P: Silicon Graphics Inc | 9729 | P: Silicon Graphics Inc |
| 9730 | M: Dave Chinner <david@fromorbit.com> | 9730 | M: Dave Chinner <david@fromorbit.com> |
| 9731 | M: Ben Myers <bpm@sgi.com> | ||
| 9732 | M: xfs@oss.sgi.com | 9731 | M: xfs@oss.sgi.com |
| 9733 | L: xfs@oss.sgi.com | 9732 | L: xfs@oss.sgi.com |
| 9734 | W: http://oss.sgi.com/projects/xfs | 9733 | W: http://oss.sgi.com/projects/xfs |