linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jingbo Xu <jefflexu@linux.alibaba.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
	Gao Xiang <xiang@kernel.org>,
	Christian Brauner <christian@brauner.io>,
	Seth Forshee <sforshee@kernel.org>
Cc: "Christian Brauner (Microsoft)" <brauner@kernel.org>,
	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: Re: linux-next: manual merge of the erofs tree with the vfs-idmapping tree
Date: Wed, 12 Apr 2023 10:35:19 +0800	[thread overview]
Message-ID: <67aed69a-b28a-587b-b88b-3d8ffc88e767@linux.alibaba.com> (raw)
In-Reply-To: <20230412101942.75e3efa9@canb.auug.org.au>



On 4/12/23 8:19 AM, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the erofs tree got a conflict in:
> 
>   fs/erofs/xattr.c
> 
> between commit:
> 
>   a5488f29835c ("fs: simplify ->listxattr() implementation")
> 
> from the vfs-idmapping tree and commit:
> 
>   3f43a25918ac ("erofs: handle long xattr name prefixes properly")
> 
> from the erofs 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.
> 

Hi,

Thanks for the fix up. It looks good to me.

It passes the corresponding testcase [1].

[1]
https://lore.kernel.org/all/20230411103004.104064-1-jefflexu@linux.alibaba.com/

-- 
Thanks,
Jingbo

  parent reply	other threads:[~2023-04-12  2:35 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-12  0:19 linux-next: manual merge of the erofs tree with the vfs-idmapping tree Stephen Rothwell
2023-04-12  2:01 ` Gao Xiang
2023-04-12  2:35 ` Jingbo Xu [this message]
2023-04-13 14:46 broonie
2023-04-13 15:49 ` Mark Brown
2023-04-13 16:16   ` Gao Xiang
2023-04-13 16:23     ` Mark Brown
2023-04-13 16:27       ` Gao Xiang
2023-04-20  9:36   ` Christian Brauner

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=67aed69a-b28a-587b-b88b-3d8ffc88e767@linux.alibaba.com \
    --to=jefflexu@linux.alibaba.com \
    --cc=brauner@kernel.org \
    --cc=christian@brauner.io \
    --cc=hsiangkao@linux.alibaba.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sforshee@kernel.org \
    --cc=sfr@canb.auug.org.au \
    --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 NNTP newsgroup(s).