linux-kernel - Re: linux-next: manual merge of the pidfd tree with the vfs tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20210225093852.668345a1@canb.auug.org.au>
Date:   Thu, 25 Feb 2021 09:38:52 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Al Viro <viro@...iv.linux.org.uk>
Cc:     Christian Brauner <christian@...uner.io>,
        Christian Brauner <christian.brauner@...ntu.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the pidfd tree with the vfs tree

Hi all,

On Mon, 15 Feb 2021 07:55:14 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> On Mon, 25 Jan 2021 16:17:06 +1100 Stephen Rothwell <sfr@...b.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

Content of type "application/pgp-signature" skipped