From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>, David Sterba <dsterba@suse.cz>
Cc: David Sterba <dsterba@suse.com>,
Josef Bacik <josef@toxicpanda.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Miklos Szeredi <mszeredi@redhat.com>
Subject: linux-next: manual merge of the vfs tree with the btrfs tree
Date: Mon, 12 Apr 2021 11:59:45 +1000 [thread overview]
Message-ID: <20210412115945.2f2c3485@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 782 bytes --]
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
fs/btrfs/ioctl.c
between commit:
2911da32d543 ("btrfs: use btrfs_inode_lock/btrfs_inode_unlock inode lock helpers")
from the btrfs tree and commit:
d9b32b140987 ("btrfs: convert to fileattr")
from the vfs tree.
I fixed it up (I used the vfs tree version (which removed inode_lock()
in various places) 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:[~2021-04-12 1:59 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 1:59 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-11 0:34 linux-next: manual merge of the vfs tree with the btrfs tree Stephen Rothwell
2015-04-13 1:37 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=20210412115945.2f2c3485@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dsterba@suse.com \
--cc=dsterba@suse.cz \
--cc=josef@toxicpanda.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mszeredi@redhat.com \
--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).