* linux-next: manual merge of the arm64 tree with the asm-generic tree
@ 2020-10-11 22:51 Stephen Rothwell
2020-10-12 8:02 ` Arnd Bergmann
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2020-10-11 22:51 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon, Arnd Bergmann
Cc: Jean-Philippe Brucker, Linux Kernel Mailing List,
Linux Next Mailing List, Nicholas Piggin
[-- Attachment #1: Type: text/plain, Size: 2030 bytes --]
Hi all,
Today's linux-next merge of the arm64 tree got a conflict in:
arch/arm64/include/asm/mmu_context.h
between commit:
f911c2a7c096 ("arm64: use asm-generic/mmu_context.h for no-op implementations")
from the asm-generic tree and commit:
48118151d8cc ("arm64: mm: Pin down ASIDs for sharing mm with devices")
from the arm64 tree.
I fixed it up (see below) 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
diff --cc arch/arm64/include/asm/mmu_context.h
index fe2862aa1dad,0672236e1aea..000000000000
--- a/arch/arm64/include/asm/mmu_context.h
+++ b/arch/arm64/include/asm/mmu_context.h
@@@ -174,9 -174,16 +174,15 @@@ static inline void cpu_replace_ttbr1(pg
* Setting a reserved TTBR0 or EPD0 would work, but it all gets ugly when you
* take CPU migration into account.
*/
-#define destroy_context(mm) do { } while(0)
void check_and_switch_context(struct mm_struct *mm);
- #define init_new_context(tsk,mm) ({ atomic64_set(&(mm)->context.id, 0); 0; })
+ static inline int
+ init_new_context(struct task_struct *tsk, struct mm_struct *mm)
+ {
+ atomic64_set(&mm->context.id, 0);
+ refcount_set(&mm->context.pinned, 0);
+ return 0;
+ }
#ifdef CONFIG_ARM64_SW_TTBR0_PAN
static inline void update_saved_ttbr0(struct task_struct *tsk,
@@@ -245,8 -251,12 +251,11 @@@ switch_mm(struct mm_struct *prev, struc
void verify_cpu_asid_bits(void);
void post_ttbr_update_workaround(void);
+ unsigned long arm64_mm_context_get(struct mm_struct *mm);
+ void arm64_mm_context_put(struct mm_struct *mm);
+
+#include <asm-generic/mmu_context.h>
+
#endif /* !__ASSEMBLY__ */
#endif /* !__ASM_MMU_CONTEXT_H */
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the arm64 tree with the asm-generic tree
2020-10-11 22:51 linux-next: manual merge of the arm64 tree with the asm-generic tree Stephen Rothwell
@ 2020-10-12 8:02 ` Arnd Bergmann
2020-10-12 16:55 ` Naresh Kamboju
0 siblings, 1 reply; 6+ messages in thread
From: Arnd Bergmann @ 2020-10-12 8:02 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Catalin Marinas, Will Deacon, Jean-Philippe Brucker,
Linux Kernel Mailing List, Linux Next Mailing List,
Nicholas Piggin
On Mon, Oct 12, 2020 at 12:52 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> arch/arm64/include/asm/mmu_context.h
>
> between commit:
>
> f911c2a7c096 ("arm64: use asm-generic/mmu_context.h for no-op implementations")
>
> from the asm-generic tree and commit:
>
> 48118151d8cc ("arm64: mm: Pin down ASIDs for sharing mm with devices")
>
> from the arm64 tree.
>
> I fixed it up (see below) 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.
>
Sorry about that, I had pushed my asm-generic branch to the correct
location on Friday after I noticed it was missing. Removed it again now
until the end up the merge window.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the arm64 tree with the asm-generic tree
2020-10-12 8:02 ` Arnd Bergmann
@ 2020-10-12 16:55 ` Naresh Kamboju
0 siblings, 0 replies; 6+ messages in thread
From: Naresh Kamboju @ 2020-10-12 16:55 UTC (permalink / raw)
To: Arnd Bergmann, Stephen Rothwell
Cc: Catalin Marinas, Will Deacon, Jean-Philippe Brucker,
Linux Kernel Mailing List, Linux Next Mailing List,
Nicholas Piggin, Qian Cai, lkft-triage
On Mon, 12 Oct 2020 at 13:33, Arnd Bergmann <arnd@arndb.de> wrote:
>
> On Mon, Oct 12, 2020 at 12:52 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the arm64 tree got a conflict in:
> >
> > arch/arm64/include/asm/mmu_context.h
> >
> > between commit:
> >
> > f911c2a7c096 ("arm64: use asm-generic/mmu_context.h for no-op implementations")
> >
> > from the asm-generic tree and commit:
> >
> > 48118151d8cc ("arm64: mm: Pin down ASIDs for sharing mm with devices")
> >
> > from the arm64 tree.
> >
> > I fixed it up (see below) 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.
> >
>
> Sorry about that, I had pushed my asm-generic branch to the correct
> location on Friday after I noticed it was missing. Removed it again now
> until the end up the merge window.
arm64 build failed on today's tag 20201012.
make -sk KBUILD_BUILD_USER=TuxBuild -C/linux -j16 ARCH=arm64
CROSS_COMPILE=aarch64-linux-gnu- HOSTCC=gcc CC="sccache
aarch64-linux-gnu-gcc" O=build Image
#
In file included from ../arch/arm64/include/asm/mmu_context.h:257,
from ../arch/arm64/include/asm/efi.h:10,
from ../arch/arm64/xen/../../arm/xen/enlighten.c:19:
../include/asm-generic/mmu_context.h:34:19: error: redefinition of
‘init_new_context’
34 | static inline int init_new_context(struct task_struct *tsk,
| ^~~~~~~~~~~~~~~~
In file included from ../arch/arm64/include/asm/efi.h:10,
from ../arch/arm64/xen/../../arm/xen/enlighten.c:19:
../arch/arm64/include/asm/mmu_context.h:180:1: note: previous
definition of ‘init_new_context’ was here
180 | init_new_context(struct task_struct *tsk, struct mm_struct *mm)
| ^~~~~~~~~~~~~~~~
make[3]: *** [../scripts/Makefile.build:283:
arch/arm64/xen/../../arm/xen/enlighten.o] Error 1
In file included from ../arch/arm64/include/asm/mmu_context.h:257,
from ../include/linux/mmu_context.h:5,
from ../kernel/sched/sched.h:54,
from ../kernel/sched/core.c:13:
../include/asm-generic/mmu_context.h:34:19: error: redefinition of
‘init_new_context’
34 | static inline int init_new_context(struct task_struct *tsk,
| ^~~~~~~~~~~~~~~~
In file included from ../include/linux/mmu_context.h:5,
from ../kernel/sched/sched.h:54,
from ../kernel/sched/core.c:13:
../arch/arm64/include/asm/mmu_context.h:180:1: note: previous
definition of ‘init_new_context’ was here
180 | init_new_context(struct task_struct *tsk, struct mm_struct *mm)
| ^~~~~~~~~~~~~~~~
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
ref:
https://gitlab.com/Linaro/lkft/mirrors/next/linux-next/-/jobs/785569731
>
> Arnd
- Naresh
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the arm64 tree with the asm-generic tree
@ 2018-03-21 12:06 Dave Martin
0 siblings, 0 replies; 6+ messages in thread
From: Dave Martin @ 2018-03-21 12:06 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Stephen Rothwell, Catalin Marinas, Will Deacon,
Linux-Next Mailing List, Linux Kernel Mailing List,
Eric W. Biederman
On Wed, Mar 21, 2018 at 09:38:28AM +0000, Arnd Bergmann wrote:
> On Wed, Mar 21, 2018 at 6:50 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Hi all,
> >
> > Today's linux-next merge of the arm64 tree got a conflict in:
> >
> > include/uapi/asm-generic/siginfo.h
> >
> > between commit:
> >
> > 0d7d2a23a347 ("asm-generic: siginfo: define ia64 si_codes unconditionally")
> >
> > from the asm-generic tree and commit:
> >
> > 266da65e9156 ("signal: Add FPE_FLTUNK si_code for undiagnosable fp exceptions")
> >
> > from the arm64 tree.
> >
> > I fixed it up (see below) 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.
>
> > +#define __FPE_INVDEC 13 /* invalid decimal digit */
> > - #define NSIGFPE 13
> > + #define FPE_FLTUNK 14 /* undiagnosed floating-point exception */
> > + #define NSIGFPE 14
>
> The merge looks correct to me. I'm still rebasing my asm-generic tree
> to integrate incoming Acks, so I think we're stuck with this one for a
> bit.
Ack.
There are some overlapping patches here due to Eric's signal rework,
related arch fixes and apparently some other unrelated updates.
IIUC, some patches overlap between arm64's and Eric's -next trees for
dependency reasons, but I believe the affected arm64 patches are due to
merge via Eric's tree for v4.17.
Cheers
---Dave
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: linux-next: manual merge of the arm64 tree with the asm-generic tree
2018-03-20 22:50 Stephen Rothwell
@ 2018-03-21 9:38 ` Arnd Bergmann
0 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2018-03-21 9:38 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Catalin Marinas, Will Deacon, Linux-Next Mailing List,
Linux Kernel Mailing List, Dave Martin, Eric W. Biederman
On Wed, Mar 21, 2018 at 6:50 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi all,
>
> Today's linux-next merge of the arm64 tree got a conflict in:
>
> include/uapi/asm-generic/siginfo.h
>
> between commit:
>
> 0d7d2a23a347 ("asm-generic: siginfo: define ia64 si_codes unconditionally")
>
> from the asm-generic tree and commit:
>
> 266da65e9156 ("signal: Add FPE_FLTUNK si_code for undiagnosable fp exceptions")
>
> from the arm64 tree.
>
> I fixed it up (see below) 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.
> +#define __FPE_INVDEC 13 /* invalid decimal digit */
> - #define NSIGFPE 13
> + #define FPE_FLTUNK 14 /* undiagnosed floating-point exception */
> + #define NSIGFPE 14
The merge looks correct to me. I'm still rebasing my asm-generic tree
to integrate incoming Acks, so I think we're stuck with this one for a
bit.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread
* linux-next: manual merge of the arm64 tree with the asm-generic tree
@ 2018-03-20 22:50 Stephen Rothwell
2018-03-21 9:38 ` Arnd Bergmann
0 siblings, 1 reply; 6+ messages in thread
From: Stephen Rothwell @ 2018-03-20 22:50 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon, Arnd Bergmann
Cc: Linux-Next Mailing List, Linux Kernel Mailing List, Dave Martin,
Eric W. Biederman
[-- Attachment #1: Type: text/plain, Size: 1980 bytes --]
Hi all,
Today's linux-next merge of the arm64 tree got a conflict in:
include/uapi/asm-generic/siginfo.h
between commit:
0d7d2a23a347 ("asm-generic: siginfo: define ia64 si_codes unconditionally")
from the asm-generic tree and commit:
266da65e9156 ("signal: Add FPE_FLTUNK si_code for undiagnosable fp exceptions")
from the arm64 tree.
I fixed it up (see below) 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
diff --cc include/uapi/asm-generic/siginfo.h
index 5528cdb0b54a,4b3520bf67ba..000000000000
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
@@@ -202,12 -219,18 +202,13 @@@ typedef struct siginfo
#define FPE_FLTRES 6 /* floating point inexact result */
#define FPE_FLTINV 7 /* floating point invalid operation */
#define FPE_FLTSUB 8 /* subscript out of range */
-#ifdef __frv__
-# define FPE_MDAOVF 9 /* media overflow */
-#endif
-#ifdef __ia64__
-# define __FPE_DECOVF 9 /* decimal overflow */
-# define __FPE_DECDIV 10 /* decimal division by zero */
-# define __FPE_DECERR 11 /* packed decimal error */
-# define __FPE_INVASC 12 /* invalid ASCII digit */
-# define __FPE_INVDEC 13 /* invalid decimal digit */
-#endif
+#define __FPE_DECOVF 9 /* decimal overflow */
+#define __FPE_DECDIV 10 /* decimal division by zero */
+#define __FPE_DECERR 11 /* packed decimal error */
+#define __FPE_INVASC 12 /* invalid ASCII digit */
+#define __FPE_INVDEC 13 /* invalid decimal digit */
- #define NSIGFPE 13
+ #define FPE_FLTUNK 14 /* undiagnosed floating-point exception */
+ #define NSIGFPE 14
/*
* SIGSEGV si_codes
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-12 16:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-11 22:51 linux-next: manual merge of the arm64 tree with the asm-generic tree Stephen Rothwell
2020-10-12 8:02 ` Arnd Bergmann
2020-10-12 16:55 ` Naresh Kamboju
-- strict thread matches above, loose matches on Subject: below --
2018-03-21 12:06 Dave Martin
2018-03-20 22:50 Stephen Rothwell
2018-03-21 9:38 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).