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.
Helge
diff --git a/arch/parisc/lib/memcpy.c b/arch/parisc/lib/memcpy.c
index 468704ce8a1c..ea70a0e08321 100644
--- a/arch/parisc/lib/memcpy.c
+++ b/arch/parisc/lib/memcpy.c
@@ -13,7 +13,7 @@
#include <linux/compiler.h>
#include <linux/uaccess.h>
-#define get_user_space() (mfsp(3))
+#define get_user_space() (uaccess_kernel() ? 0 : mfsp(3))
