From: Miaohe Lin <linmiaohe@huawei•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
Andrew Morton <akpm@linux-foundation•org>,
Christian Brauner <christian.brauner@ubuntu•com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the pidfd tree
Date: Thu, 28 Jan 2021 10:04:46 +0800 [thread overview]
Message-ID: <873d99fe-ef52-0844-5b49-6c66d10ddd30@huawei.com> (raw)
In-Reply-To: <20210127224351.486fd977@canb.auug.org.au>
Hi:
On 2021/1/27 19:43, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> fs/hugetlbfs/inode.c
>
> between commit:
>
> 2f221d6f7b88 ("attr: handle idmapped mounts")
>
> from the pidfd tree and commit:
>
> 57d3629b7a9a ("hugetlbfs: remove useless BUG_ON(!inode) in hugetlbfs_setattr()")
>
> from the akpm-current 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.
>
This fix is what I want. Many thanks for doing this.
next prev parent reply other threads:[~2021-01-28 2:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-27 11:43 linux-next: manual merge of the akpm-current tree with the pidfd tree Stephen Rothwell
2021-01-28 2:04 ` Miaohe Lin [this message]
2021-02-14 21:54 ` Stephen Rothwell
2021-02-24 22:41 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2020-09-22 8:54 Stephen Rothwell
2019-05-22 1:43 Stephen Rothwell
2019-05-24 8:15 ` Joel Fernandes
2019-07-08 23:12 ` Stephen Rothwell
2019-05-15 3:16 Stephen Rothwell
2019-07-08 2:01 ` Stephen Rothwell
2019-07-12 12:53 ` Joel Fernandes
2019-07-12 13:02 ` Christian Brauner
2019-07-12 13:54 ` Joel Fernandes
2019-04-23 8:46 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=873d99fe-ef52-0844-5b49-6c66d10ddd30@huawei.com \
--to=linmiaohe@huawei$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=christian.brauner@ubuntu$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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