linux-kernel - Re: linux-next: manual merge of the block tree with the asm-generic 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: <20231101092347.01bc2eec@canb.auug.org.au>
Date:   Wed, 1 Nov 2023 09:23:47 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Arnd Bergmann <arnd@...db.de>
Cc:     Jens Axboe <axboe@...nel.dk>,
        "Peter Zijlstra (Intel)" <peterz@...radead.org>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>,
        "H. Peter Anvin" <hpa@...or.com>, Ard Biesheuvel <ardb@...nel.org>,
        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 block tree with the asm-generic
 tree

Hi all,

On Mon, 25 Sep 2023 12:09:08 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> 
> On Mon, 25 Sep 2023 12:05:44 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
> >
> > Today's linux-next merge of the block tree got a conflict in:
> > 
> >   arch/ia64/kernel/syscalls/syscall.tbl
> > 
> > between commit:
> > 
> >   cf8e8658100d ("arch: Remove Itanium (IA-64) architecture")
> > 
> > from the asm-generic tree and commits:
> > 
> >   9f6c532f59b2 ("futex: Add sys_futex_wake()")
> >   cb8c4312afca ("futex: Add sys_futex_wait()")
> >   0f4b5f972216 ("futex: Add sys_futex_requeue()")
> > 
> > from the block tree.  
> 
> These three commits are also in the tip tree.
> 
> > I fixed it up (I just removed the file) and can carry the fix as
> > necessary.

This is now a conflict between the asm-generic tree and Linus' tree.
-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped