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>
Subject: linux-next: manual merge of the vfs tree with the btrfs-kdave tree
Date: Thu, 2 Aug 2018 10:31:35 +1000 [thread overview]
Message-ID: <20180802103135.2e620406@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1239 bytes --]
Hi all,
Today's linux-next merge of the vfs tree got conflicts in:
fs/btrfs/inode.c
fs/btrfs/tree-log.c
Commits
8e5d411c91c1 ("btrfs: simplify btrfs_iget()")
cfac83868124 ("btrfs: lift make_bad_inode() into btrfs_iget()")
efa119590db3 ("btrfs: IS_ERR(p) && PTR_ERR(p) == n is a weird way to spell p == ERR_PTR(n)")
353dd669cc08 ("btrfs: btrfs_iget() never returns an is_bad_inode() inode.")
from the vfs tree are duplicated as commits
5ee149473042 ("btrfs: simplify btrfs_iget")
083a7dddaecc ("btrfs: lift make_bad_inode into btrfs_iget")
8bca6b1de61e ("btrfs: simplify IS_ERR/PTR_ERR checks")
7ffab8b69edc ("btrfs: btrfs_iget never returns an is_bad_inode inode")
in the btrfs-kdave tree :-( (except 5ee149473042 has an extra comment
and efa119590db3 has na extra space)
I fixed it up (the obvious way) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-08-02 0:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-02 0:31 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2017-11-08 22:47 linux-next: manual merge of the vfs tree with the btrfs-kdave tree Stephen Rothwell
2017-09-14 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=20180802103135.2e620406@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--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).