From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Jens Axboe <axboe@kernel•dk>, David Sterba <dsterba@suse•cz>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Christoph Hellwig <hch@lst•de>
Subject: linux-next: manual merge of the block tree with the btrfs-kdave tree
Date: Tue, 13 Jun 2017 13:15:17 +1000 [thread overview]
Message-ID: <20170613131517.42918886@canb.auug.org.au> (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
next reply other threads:[~2017-06-13 3:15 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-13 3:15 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-02-18 1:07 linux-next: manual merge of the block tree with the btrfs-kdave tree Stephen Rothwell
2017-06-21 3:13 Stephen Rothwell
2017-06-20 1:37 Stephen Rothwell
2017-06-13 3:50 Stephen Rothwell
2017-06-13 3:34 Stephen Rothwell
2017-06-13 3:27 Stephen Rothwell
2016-11-17 2:01 Stephen Rothwell
2016-11-17 2:49 ` Jens Axboe
2016-11-17 13:23 ` Christoph Hellwig
2016-11-18 17:47 ` David Sterba
2016-07-08 4:03 Stephen Rothwell
2016-07-08 4:00 Stephen Rothwell
2016-07-08 3:49 Stephen Rothwell
2016-07-08 3:31 Stephen Rothwell
2016-07-08 3:27 Stephen Rothwell
2016-07-08 3:26 Stephen Rothwell
2016-06-24 2:34 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170613131517.42918886@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=axboe@kernel$(echo .)dk \
--cc=dsterba@suse$(echo .)cz \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox