From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Christian Brauner <brauner@kernel.org>, Gao Xiang <xiang@kernel.org>
Cc: Baokun Li <libaokun1@huawei.com>,
Gao Xiang <hsiangkao@linux.alibaba.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the vfs-brauner tree with the erofs-fixes tree
Date: Wed, 24 Apr 2024 10:24:45 +1000 [thread overview]
Message-ID: <20240424102445.53ba5ba2@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 843 bytes --]
Hi all,
Today's linux-next merge of the vfs-brauner tree got a conflict in:
fs/erofs/super.c
between commits:
ab1bbc1735ff ("erofs: get rid of erofs_fs_context")
569a48fed355 ("erofs: reliably distinguish block based and fscache mode")
from the erofs-fixes tree and commit:
e4f586a41748 ("erofs: reliably distinguish block based and fscache mode")
from the vfs-brauner tree.
I fixed it up (I think - I used the former version) 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:[~2024-04-24 0:24 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-24 0:24 Stephen Rothwell [this message]
2024-04-24 1:26 ` linux-next: manual merge of the vfs-brauner tree with the erofs-fixes tree Baokun Li
2024-04-24 2:13 ` Gao Xiang
2024-04-24 12:51 ` Christian Brauner
2024-04-25 1:55 ` Gao Xiang
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=20240424102445.53ba5ba2@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=brauner@kernel.org \
--cc=hsiangkao@linux.alibaba.com \
--cc=libaokun1@huawei.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=xiang@kernel.org \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).