From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Al Viro <viro@zeniv•linux.org.uk>
Cc: Christian Brauner <christian@brauner•io>,
Christian Brauner <christian.brauner@ubuntu•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 pidfd tree with the vfs tree
Date: Thu, 25 Feb 2021 09:38:52 +1100 [thread overview]
Message-ID: <20210225093852.668345a1@canb.auug.org.au> (raw)
In-Reply-To: <20210215075514.2d1f8728@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1247 bytes --]
Hi all,
On Mon, 15 Feb 2021 07:55:14 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> On Mon, 25 Jan 2021 16:17:06 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >
> > Today's linux-next merge of the pidfd tree got a conflict in:
> >
> > fs/coredump.c
> >
> > between commit:
> >
> > 8a3cc755b138 ("coredump: don't bother with do_truncate()")
Now:
0016c9bb87a7 ("coredump: don't bother with do_truncate()")
> >
> > from the vfs tree and commit:
> >
> > 643fe55a0679 ("open: handle idmapped mounts in do_truncate()")
> >
> > from the pidfd tree.
> >
> > I fixed it up (the former removes dump_truncate(), so I did that) 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.
>
> With the merge window about to open, this is a reminder that this
> conflict still exists.
This is now a conflict between the vfs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2021-02-24 22:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 5:17 linux-next: manual merge of the pidfd tree with the vfs tree Stephen Rothwell
2021-02-14 20:55 ` Stephen Rothwell
2021-02-24 22:38 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-01-25 6:00 Stephen Rothwell
2021-02-14 21:05 ` Stephen Rothwell
2021-02-21 22:51 ` 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=20210225093852.668345a1@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=christian.brauner@ubuntu$(echo .)com \
--cc=christian@brauner$(echo .)io \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=viro@zeniv$(echo .)linux.org.uk \
/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