Hi all,
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.
I fixed it up (I just used the latter) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
Hi all,
On Mon, 28 Feb 2022 11:45:23 +1100 Stephen Rothwell <[email protected]> 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
On 3/22/22 01:09, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 28 Feb 2022 11:45:23 +1100 Stephen Rothwell <[email protected]> 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))
On Tue, Mar 22, 2022 at 8:34 AM Helge Deller <[email protected]> wrote:
>
> On 3/22/22 01:09, Stephen Rothwell wrote:
> > Hi all,
> >
> > On Mon, 28 Feb 2022 11:45:23 +1100 Stephen Rothwell <[email protected]> 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.
Arnd
On 3/22/22 18:06, Arnd Bergmann wrote:
> On Tue, Mar 22, 2022 at 8:34 AM Helge Deller <[email protected]> wrote:
>>
>> On 3/22/22 01:09, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> On Mon, 28 Feb 2022 11:45:23 +1100 Stephen Rothwell <[email protected]> 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