Subject: Re: linux-next: manual merge of the parisc-hd tree with the asm-generic tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 22 Mar 2022 11:09:25 +1100

Hi all,

On Mon, 28 Feb 2022 11:45:23 +1100 Stephen Rothwell <[email-masked]> 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