xfs: for-next rebased to 3c1a79f

Hi folks,

The for-next branch of the xfs kernel repository at

git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git

has just been rebased.

The rebase is really only a rework of the merge order of the patches due to the torn log write detection fixes that Brian sent. These need to go to Linus before anything, so I have pushed them into the tree immediately after the commits that went into 4.5-rc4. Once they've been in linux-next for a couple of days I'll send a pull-req to Linus.

As a result, none of the original commit IDs have changed ias none of the topic branches have been changed - only the merge commits have changed. This remerge also cleans up the double merge of the xfs-dio-fix-4.6 topic branch which was done after adding an ext4 fix to that branch.

I've also appended Darrick's fix for the writepage rework in that topic branch, as it will make merging the rest of the fixes from him simpler (now only one topic branch dependency, not two).

-Dave.

The new head of the for-next branch is commit:

3c1a79f Merge branch 'xfs-misc-fixes-4.6-2' into for-next

New Commits:

Brian Foster (4):
[82ff6cc] xfs: separate log head record discovery from verification [65b99a0] xfs: refactor unmount record detection into helper [717bc0e] xfs: refactor in-core log state update to helper [7f6aff3] xfs: only run torn log write detection on dirty logs

Darrick J. Wong (1):
[0df61da] xfs: ioends require logically contiguous file offsets

Dave Chinner (10):

      [9deed09] Merge branch 'xfs-torn-log-fixes-4.5' into for-next
      [c53473b] Merge branch 'xfs-rt-fixes-4.6' into for-next
      [1b186d2] Merge branch 'xfs-get-next-dquot-4.6' into for-next
      [acb3e26] Merge branch 'xfs-dio-fix-4.6' into for-next
      [6d247d4] Merge branch 'xfs-misc-fixes-4.6' into for-next
      [a2bbcb6] Merge branch 'xfs-gut-icdinode-4.6' into for-next
      [7f0ed54] Merge branch 'xfs-buf-macro-cleanup-4.6' into for-next
      [3d93ec0] Merge branch 'xfs-writepage-rework-4.6' into for-next
      [85a9f38] Merge branch 'xfs-dax-fixes-4.6' into for-next
      [3c1a79f] Merge branch 'xfs-misc-fixes-4.6-2' into for-next

Code Diffstat:

 fs/xfs/xfs_aops.c        |   3 +-
 fs/xfs/xfs_log_recover.c | 271 ++++++++++++++++++++++++++++++-------------------
 2 files changed, 170 insertions(+), 104 deletions(-)

Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs