All of lore.kernel.org
 help / color / mirror / Atom feed
From: Helge Deller <deller@gmx.de>
To: Arnd Bergmann <arnd@arndb.de>, Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Parisc List <linux-parisc@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the parisc-hd tree with the asm-generic tree
Date: Tue, 22 Mar 2022 08:34:32 +0100	[thread overview]
Message-ID: <8ce9d045-c3c9-c839-7b82-9f5ccdae2d52@gmx.de> (raw)
In-Reply-To: <20220322110925.7b295e54@canb.auug.org.au>

On 3/22/22 01:09, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 28 Feb 2022 11:45:23 +1100 Stephen Rothwell <sfr@canb.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.


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))





  reply	other threads:[~2022-03-22  7:39 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-28  0:45 linux-next: manual merge of the parisc-hd tree with the asm-generic tree Stephen Rothwell
2022-03-22  0:09 ` Stephen Rothwell
2022-03-22  7:34   ` Helge Deller [this message]
2022-03-22 17:06     ` Arnd Bergmann
2022-03-22 20:01       ` Helge Deller
  -- strict thread matches above, loose matches on Subject: below --
2020-11-02  1:38 Stephen Rothwell
2020-12-14 19:48 ` Stephen Rothwell
2020-12-15  4:45   ` Helge Deller
2020-12-15  5:05     ` Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8ce9d045-c3c9-c839-7b82-9f5ccdae2d52@gmx.de \
    --to=deller@gmx.de \
    --cc=arnd@arndb.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-parisc@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.