linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [ANNOUNCE] xfs: for-next branch updated to 0fc204e2eb64
@ 2016-11-10  4:29 Dave Chinner
  0 siblings, 0 replies; only message in thread
From: Dave Chinner @ 2016-11-10  4:29 UTC (permalink / raw)
  To: linux-xfs; +Cc: linux-fsdevel, jack, tytso, ross.zwisler

[-- Attachment #1: Type: text/plain, Size: 1762 bytes --]

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 updated. This update has a couple of new patches
for iomap and XFS, and a fixup of a cleanup patch. The topic
branches were re-merged, so it's a rebuilt tree.

I added the IOMAP_FAULT patch into the dax-4.10-iomap-pmd branch as
Christoph requested. This will cause some minor hassles - that topic
branch is based on 4.9-rc1, and there is a IOMAP_REPORT flag added
in 4.9-rc3. Hence when you merge it into a more recent tree, a merge
conflict will occur. The merge conflict resolution is trivial but if
you need help it can be seen in the for-next branch (in the merge
commit currently known as b649c42e25b7).

-Dave.

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

0fc204e2eb64 Merge branch 'xfs-4.10-misc-fixes-1' into for-next

New Commits:

Brian Foster (1):
      [98efe8af1c9f] xfs: fix unbalanced inode reclaim flush locking

Darrick J. Wong (1):
      [bec9d48d7a30] xfs: check minimum block size for CRC filesystems

Dave Chinner (3):
      [b649c42e25b7] Merge branch 'dax-4.10-iomap-pmd' into for-next
      [8f23d318aa74] Merge branch 'xfs-4.10-libxfs-cleanups' into for-next
      [0fc204e2eb64] Merge branch 'xfs-4.10-misc-fixes-1' into for-next

Jan Kara (1):
      [9484ab1bf446] dax: Introduce IOMAP_FAULT flag


Code Diffstat:

 fs/dax.c               |  4 ++--
 fs/iomap.c             |  5 +++--
 fs/xfs/libxfs/xfs_sb.c |  3 +--
 fs/xfs/xfs_icache.c    | 27 ++++++++++++++-------------
 fs/xfs/xfs_inode.h     | 11 ++++++-----
 include/linux/iomap.h  |  1 +
 6 files changed, 27 insertions(+), 24 deletions(-)
-- 
Dave Chinner
david@fromorbit.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2016-11-10  4:30 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-10  4:29 [ANNOUNCE] xfs: for-next branch updated to 0fc204e2eb64 Dave Chinner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).