public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Gao Xiang <hsiangkao@redhat•com>
To: Al Viro <viro@zeniv•linux.org.uk>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
	Gao Xiang <xiang@kernel•org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Chengguang Xu <cgxu519@mykernel•net>,
	Chao Yu <yuchao0@huawei•com>
Subject: Re: linux-next: manual merge of the vfs tree with the erofs tree
Date: Fri, 29 May 2020 11:40:07 +0800	[thread overview]
Message-ID: <20200529034007.GA12648@xiangao.remote.csb> (raw)
In-Reply-To: <20200529015111.GA23230@ZenIV.linux.org.uk>

Hi Al,

On Fri, May 29, 2020 at 02:51:11AM +0100, Al Viro wrote:
> On Fri, May 29, 2020 at 11:45:01AM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > Today's linux-next merge of the vfs tree got a conflict in:
> > 
> >   fs/erofs/super.c
> > 
> > between commit:
> > 
> >   e7cda1ee94f4 ("erofs: code cleanup by removing ifdef macro surrounding")
> > 
> > from the erofs tree and commit:
> > 
> >   91a7c5e1d30e ("erofs: convert to use the new mount fs_context api")
> > 
> > from the vfs 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.
> > 
> > -- 
> > Cheers,
> > Stephen Rothwell
> > 
> > diff --cc fs/erofs/super.c
> > index 8e46d204a0c2,2c0bad903fa6..000000000000
> > --- a/fs/erofs/super.c
> > +++ b/fs/erofs/super.c
> > @@@ -408,16 -365,12 +365,9 @@@ static int erofs_fc_fill_super(struct s
> >   	sb->s_time_gran = 1;
> >   
> >   	sb->s_op = &erofs_sops;
> >  -
> >  -#ifdef CONFIG_EROFS_FS_XATTR
> >   	sb->s_xattr = erofs_xattr_handlers;
> >  -#endif
> >   
> > - 	/* set erofs default mount options */
> > - 	erofs_default_options(sbi);
> > - 
> > - 	err = erofs_parse_options(sb, data);
> > - 	if (err)
> > - 		return err;
> > - 
> > - 	if (test_opt(sbi, POSIX_ACL))
> > + 	if (test_opt(ctx, POSIX_ACL))
> >   		sb->s_flags |= SB_POSIXACL;
> >   	else
> >   		sb->s_flags &= ~SB_POSIXACL;
> 
> FWIW, I would be glad to have that old erofs commit moved over to
> erofs tree...  Folks?

I'm fine with that, although I think it's mainly with vfs changes
so could be better though with vfs tree. I will add this patch
tomorrow anyway... Thanks for reminder!

Thanks,
Gao Xiang

next prev parent reply	other threads:[~2020-05-29  3:40 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-05-29  1:45 linux-next: manual merge of the vfs tree with the erofs tree Stephen Rothwell
2020-05-29  1:51 ` Al Viro
2020-05-29  3:40   ` Gao Xiang [this message]
2020-05-29 14:36     ` Al Viro
2020-05-29 14:50       ` Gao Xiang
  -- strict thread matches above, loose matches on Subject: below --
2022-11-27 22:13 Stephen Rothwell
2022-11-28  2:12 ` Jingbo Xu
2022-12-04 22:24 Stephen Rothwell
2022-12-05  3:13 ` Gao Xiang
2022-12-05  4:11   ` Stephen Rothwell
2022-12-05  4:43     ` 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=20200529034007.GA12648@xiangao.remote.csb \
    --to=hsiangkao@redhat$(echo .)com \
    --cc=cgxu519@mykernel$(echo .)net \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    --cc=viro@zeniv$(echo .)linux.org.uk \
    --cc=xiang@kernel$(echo .)org \
    --cc=yuchao0@huawei$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox