linux-kernel - Re: linux-next: manual merge of the parisc-hd 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220322110925.7b295e54@canb.auug.org.au>
Date:   Tue, 22 Mar 2022 11:09:25 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Arnd Bergmann <arnd@...db.de>
Cc:     Helge Deller <deller@....de>,
        Parisc List <linux-parisc@...r.kernel.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 parisc-hd tree with the
 asm-generic tree

Hi all,

On Mon, 28 Feb 2022 11:45:23 +1100 Stephen Rothwell <sfr@...b.auug.org.au> wrote:
>
> Today's linux-next merge of the parisc-hd tree got a conflict in:
> 
>   arch/parisc/lib/memcpy.c
> 
> between commit:
> 
>   967747bbc084 ("uaccess: remove CONFIG_SET_FS")
> 
> from the asm-generic tree and commit:
> 
>   d4a767ea8b0e ("parisc: Use constants to encode the space registers like SR_KERNEL")
> 
> from the parisc-hd tree.

This is now a conflict between the asm-generic tree and commit

  360bd6c65807 ("parisc: Use constants to encode the space registers like SR_KERNEL")

in Linus' tree.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped