From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>, David Sterba <dsterba@suse.cz>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Howells <dhowells@redhat.com>,
Christos Gkekas <chris.gekas@gmail.com>
Subject: linux-next: manual merge of the vfs tree with the btrfs-kdave tree
Date: Thu, 14 Sep 2017 10:31:10 +1000 [thread overview]
Message-ID: <20170914103110.2f30cae3@canb.auug.org.au> (raw)
Hi Al,
Today's linux-next merge of the vfs tree got a conflict in:
fs/btrfs/root-tree.c
between commit:
8b591d54b74b ("btrfs: Clean up dead code in root-tree")
from the btrfs-kdave tree and commit:
bc98a42c1f7d ("VFS: Convert sb->s_flags & MS_RDONLY to sb_rdonly(sb)")
from the vfs tree.
I fixed it up (the former removed the code updated by the latter, so I
did that) 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.
[David Sterba: just wondering if all the commits that appeared in the
btrfs-kdave tree today (so late in the merge window) are really destined
for v4.14?]
--
Cheers,
Stephen Rothwell
next reply other threads:[~2017-09-14 0:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-14 0:31 Stephen Rothwell [this message]
2017-11-08 22:47 linux-next: manual merge of the vfs tree with the btrfs-kdave tree Stephen Rothwell
2018-08-02 0:31 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=20170914103110.2f30cae3@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=chris.gekas@gmail.com \
--cc=dhowells@redhat.com \
--cc=dsterba@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/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
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;
as well as URLs for NNTP newsgroup(s).