Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1664370 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-06-13 05:20 +0200 |
| Last post | 2017-06-13 05:20 +0200 |
| Articles | 1 — 1 participant |
Back to article view | Back to linux.kernel
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
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-06-13 05:20 +0200 |
| Subject | linux-next: manual merge of the block tree with the btrfs-kdave tree |
| Message-ID | <tRKx4-2BE-9@gated-at.bofh.it> |
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 top | Article view | linux.kernel
csiph-web