linux-next: manual merge of the block tree with the btrfs-kdave tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the block tree with the btrfs-kdave tree
Date	2017-06-13 05:20 +0200
Message-ID	<tRKx4-2BE-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Jens,

Today's linux-next merge of the block tree got a conflict in:

  fs/btrfs/compression.c

between commit:

  c1045c6859c1 ("btrfs: opencode trivial compressed_bio_alloc, simplify error handling")

from the btrfs-kdave tree and commit:

  4e4cbee93d56 ("block: switch bios to blk_status_t")

from the block tree.

I fixed it up (the former removed one of the hunks fo code updated by the
latter) and can carry the fix as necessary. This is now fixed as far as
linux-next is concerned, but any non trivial conflicts should be mentioned
to your upstream maintainer when your tree is submitted for merging.
You may also want to consider cooperating with the maintainer of the
conflicting tree to minimise any particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

linux-next: manual merge of the block tree with the btrfs-kdave  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-13 05:20 +0200

csiph-web