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

[Helge Deller]

On 3/22/22 18:06, Arnd Bergmann wrote:
> On Tue, Mar 22, 2022 at 8:34 AM Helge Deller <deller@xxxxxx> wrote:
>>
>> On 3/22/22 01:09, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> On Mon, 28 Feb 2022 11:45:23 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> 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.
>>
>>
>> Arnd,
>> can you please drop the changes in your asm-generic tree for
>> arch/parisc/lib/memcpy.c
>> They are not needed any more.
>>
>
> Sorry I missed that earlier when the conflict happened originally.
>
> I can't really rebase my changes on top of your tree now, and just dropping
> the change without a rebase would break mine. I'll make sure to mention
> the conflict in the pull request then and have Linus resolve it.

Ok, Thanks!

Helge