From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Sterba <dsterba@suse•cz>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Masami Hiramatsu <mhiramat@kernel•org>,
Alexei Starovoitov <ast@kernel•org>,
Nikolay Borisov <nborisov@suse•com>
Subject: linux-next: manual merge of the btrfs-kdave tree with Linus' tree
Date: Wed, 7 Feb 2018 10:45:33 +1100 [thread overview]
Message-ID: <20180207104533.216ef09b@canb.auug.org.au> (raw)
Hi David,
Today's linux-next merge of the btrfs-kdave tree got a conflict in:
fs/btrfs/disk-io.c
between commit:
540adea3809f ("error-injection: Separate error-injection from kprobe")
from Linus' tree and commit:
8bd2a9b19fd7 ("btrfs: Remove custom crc32c init code")
from the btrfs-kdave tree.
I fixed it up (see below) 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
diff --cc fs/btrfs/disk-io.c
index f9cef2f8d1a5,ff64113ec5f0..000000000000
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@@ -30,7 -30,7 +30,8 @@@
#include <linux/ratelimit.h>
#include <linux/uuid.h>
#include <linux/semaphore.h>
+#include <linux/error-injection.h>
+ #include <linux/crc32c.h>
#include <asm/unaligned.h>
#include "ctree.h"
#include "disk-io.h"
next reply other threads:[~2018-02-06 23:45 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-06 23:45 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-09-19 11:31 linux-next: manual merge of the btrfs-kdave tree with Linus' tree Mark Brown
2019-09-23 11:59 ` David Sterba
2018-02-06 23:49 Stephen Rothwell
2017-08-24 23:58 Stephen Rothwell
2017-09-04 6:02 ` Stephen Rothwell
2017-07-24 0:54 Stephen Rothwell
2017-07-18 0:18 Stephen Rothwell
2017-07-21 13:49 ` David Sterba
2016-12-14 23:25 Stephen Rothwell
2016-09-05 1:47 Stephen Rothwell
2016-04-05 0:32 Stephen Rothwell
2016-04-05 0:32 Stephen Rothwell
2016-04-05 0:32 Stephen Rothwell
2016-02-01 23:22 Stephen Rothwell
2016-02-02 5:16 ` Chandan Rajendra
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=20180207104533.216ef09b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ast@kernel$(echo .)org \
--cc=dsterba@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhiramat@kernel$(echo .)org \
--cc=nborisov@suse$(echo .)com \
/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