Hi all,
Today's linux-next merge of the xtensa tree got a conflict in:
arch/xtensa/Makefile
between commit:
37c8a5fafa3b ("kbuild: consolidate Devicetree dtb build rules")
from Linus' tree (it precedes v4.20-rc1) and commit:
7c17225f2059 ("xtensa: generate uapi header and syscall table
Hi all,
Today's linux-next merge of the xtensa tree got a conflict in:
arch/xtensa/Makefile
between commit:
37c8a5fafa3b ("kbuild: consolidate Devicetree dtb build rules")
from Linus' tree (it precedes v4.20-rc1) and commit:
7c17225f2059 ("xtensa: generate uapi header and syscall table
Hi Max,
Today's linux-next merge of the xtensa tree got a conflict in:
Documentation/features/debug/KASAN/arch-support.txt
between commit:
d19cd4bb2343 ("Documentation/features/KASAN: mark KASAN as supported only on
64-bit on x86")
from Linus' tree and commit:
c633544a6154 ("xtensa:
Hi Max,
Today's linux-next merge of the xtensa tree got a conflict in:
Documentation/features/debug/KASAN/arch-support.txt
between commit:
d19cd4bb2343 ("Documentation/features/KASAN: mark KASAN as supported only on
64-bit on x86")
from Linus' tree and commit:
c633544a6154 ("xtensa:
Hi Max,
Today's linux-next merge of the xtensa tree got a conflict in:
arch/xtensa/kernel/setup.c
between commits:
69d99e6c0d62 ("xtensa: Remove unnecessary of_platform_populate with default
match table")
e973f4ec130a ("xtensa: Partially Revert "xtensa: Remove unnecessary
Hi Max,
Today's linux-next merge of the xtensa tree got a conflict in:
arch/xtensa/kernel/setup.c
between commits:
69d99e6c0d62 ("xtensa: Remove unnecessary of_platform_populate with default
match table")
e973f4ec130a ("xtensa: Partially Revert "xtensa: Remove unnecessary
Hi Chris,
Today's linux-next merge of the xtensa tree got a conflict in
arch/xtensa/kernel/process.c between commit 3e41f9ba611c ("xtensa: switch
to generic clone()") from Linus' tree and commit 8daa277ae436 ("xtensa:
clean up files to make them code-style compliant") from the xtensa tree.
The
Hi Chris,
Today's linux-next merge of the xtensa tree got a conflict in
arch/xtensa/kernel/process.c between commit 3e41f9ba611c (xtensa: switch
to generic clone()) from Linus' tree and commit 8daa277ae436 (xtensa:
clean up files to make them code-style compliant) from the xtensa tree.
The
Hi Stephen,
Sorry, I accidentally pushed this patch up; should be fixed the next
next time you pull.
Thanks,
-Chris
On 10/21/2012 04:40 PM, Stephen Rothwell wrote:
Hi Chris,
Today's linux-next merge of the xtensa tree got a conflict in
arch/xtensa/include/uapi/asm/unistd.h between commit
Hi Chris,
Today's linux-next merge of the xtensa tree got a conflict in
arch/xtensa/include/uapi/asm/unistd.h between commit 7216cabfff51
("xtensa: add missing system calls to the syscall table") from Linus'
tree and commit daff2ab722aa ("xtensa: add missing system calls to the
syscall table")
Hi Chris,
Today's linux-next merge of the xtensa tree got a conflict in
arch/xtensa/include/uapi/asm/unistd.h between commit 7216cabfff51
(xtensa: add missing system calls to the syscall table) from Linus'
tree and commit daff2ab722aa (xtensa: add missing system calls to the
syscall table) from
Hi Stephen,
Sorry, I accidentally pushed this patch up; should be fixed the next
next time you pull.
Thanks,
-Chris
On 10/21/2012 04:40 PM, Stephen Rothwell wrote:
Hi Chris,
Today's linux-next merge of the xtensa tree got a conflict in
arch/xtensa/include/uapi/asm/unistd.h between commit
12 matches
Mail list logo
