From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>,
Al Viro <viro@ZenIV.linux.org.uk>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Chengguang Xu <cgxu519@gmx.com>,
Sabyasachi Gupta <sabyasachi.linux@gmail.com>
Subject: linux-next: manual merge of the akpm tree with the vfs tree
Date: Thu, 11 Apr 2019 16:21:57 +1000 [thread overview]
Message-ID: <20190411162157.77e4c8cb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]
Hi all,
Today's linux-next merge of the akpm tree got a conflict in:
fs/block_dev.c
between commit:
6d46d2934aea ("fs/block_dev.c: remove unused include")
from the vfs tree and patch:
"fs/block_dev.c: Remove duplicate header"
from the akpm 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/block_dev.c
index 6b584817d461,bc80d165f0c0..000000000000
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@@ -29,7 -29,7 +29,6 @@@
#include <linux/namei.h>
#include <linux/log2.h>
#include <linux/cleancache.h>
- #include <linux/dax.h>
-#include <linux/badblocks.h>
#include <linux/task_io_accounting_ops.h>
#include <linux/falloc.h>
#include <linux/uaccess.h>
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-04-11 6:21 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-11 6:21 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2020-05-15 11:33 Stephen Rothwell
2018-05-17 6:36 Stephen Rothwell
2018-01-02 6:46 Stephen Rothwell
2016-12-12 5:52 Stephen Rothwell
2016-12-12 8:14 ` Ian Kent
2014-08-08 6:20 Stephen Rothwell
2013-09-10 4:41 Stephen Rothwell
2013-09-05 8:56 Stephen Rothwell
2013-04-30 5:54 Stephen Rothwell
2013-04-29 8:34 Stephen Rothwell
2013-04-29 8:25 Stephen Rothwell
2013-04-04 6:26 Stephen Rothwell
2013-04-04 6:56 ` Andrew Morton
2013-04-04 7:02 ` Andrew Morton
2013-04-04 8:10 ` Al Viro
2013-04-04 23:18 ` Stephen Rothwell
2013-04-04 8:02 ` Al Viro
2013-04-04 15:43 ` Nathan Zimmer
2013-04-04 6:17 Stephen Rothwell
2013-04-04 6:12 Stephen Rothwell
2013-04-04 12:33 ` Jan Kara
2013-04-04 6:04 Stephen Rothwell
2013-02-25 3:40 Stephen Rothwell
2012-09-24 13:40 Stephen Rothwell
2012-09-24 13:12 Stephen Rothwell
2012-09-24 13:06 Stephen Rothwell
2012-07-22 5:44 Stephen Rothwell
2011-07-18 8:55 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=20190411162157.77e4c8cb@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=cgxu519@gmx.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sabyasachi.linux@gmail.com \
--cc=viro@ZenIV.linux.org.uk \
--subject='Re: linux-next: manual merge of the akpm tree with the vfs tree' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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).