linux-next: manual merge of the xtensa tree with Linus' tree

linux-next: manual merge of the xtensa tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 691 bytes --]

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 the xtensa tree.

These clearly were meant to be the same patch but the on in Linus' tree
has a later date, so I used it and can carry the fix as necessary (no
action is required).

Also, the top most commit in the xtensa tree has no signed-off-by line or
any real commit message.  Please fix that up.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the xtensa tree with Linus' tree

[Chris Zankel]

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 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 the xtensa tree.
>
> These clearly were meant to be the same patch but the on in Linus' tree
> has a later date, so I used it and can carry the fix as necessary (no
> action is required).
>
> Also, the top most commit in the xtensa tree has no signed-off-by line or
> any real commit message.  Please fix that up.
>

linux-next: manual merge of the xtensa tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1401 bytes --]

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 header files")

from the xtensa 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/xtensa/Makefile
index be060dfb1cc3,1e7b179eb6fe..000000000000
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@@ -90,6 -93,15 +90,9 @@@ boot		:= arch/xtensa/boo
  all Image zImage uImage: vmlinux
  	$(Q)$(MAKE) $(build)=$(boot) $@
  
 -%.dtb:
 -	$(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@
 -
 -dtbs: scripts
 -	$(Q)$(MAKE) $(build)=$(boot)/dts
 -
+ archheaders:
+ 	$(Q)$(MAKE) $(build)=arch/xtensa/kernel/syscalls all
+ 
  define archhelp
    @echo '* Image       - Kernel ELF image with reset vector'
    @echo '* zImage      - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the xtensa tree with Linus' tree

[Stephen Rothwell]

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: add support for KASAN")

from the xtensa 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

7d580ca2ecda7312f7f328dd64ec34bf75e811f5
diff --cc Documentation/features/debug/KASAN/arch-support.txt
index f377290fe48e,8abb013db8d1..3406fae833c3
--- a/Documentation/features/debug/KASAN/arch-support.txt
+++ b/Documentation/features/debug/KASAN/arch-support.txt
@@@ -34,6 -34,6 +34,6 @@@
      |        tile: | TODO |
      |          um: | TODO |
      |   unicore32: | TODO |
 -    |         x86: |  ok  |
 +    |         x86: |  ok  | 64-bit only
-     |      xtensa: | TODO |
+     |      xtensa: |  ok  |
      -----------------------

linux-next: manual merge of the xtensa tree with Linus' tree

[Stephen Rothwell]

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 of_platform_populate with default match table"")

from Linus' tree and commit:

  205ad548a742 ("xtensa: rearrange CCOUNT calibration")

from the xtensa 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/xtensa/kernel/setup.c
index 143251ede897,d61c8468abea..000000000000
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@@ -252,14 -246,14 +245,6 @@@ void __init early_init_devtree(void *pa
  		strlcpy(command_line, boot_command_line, COMMAND_LINE_SIZE);
  }
  
--static int __init xtensa_device_probe(void)
--{
- 	of_clk_init(NULL);
 -	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
--	return 0;
--}
--
--device_initcall(xtensa_device_probe);
--
  #endif /* CONFIG_OF */
  
  /*

linux-next: manual merge of the xtensa tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 521 bytes --]

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 former removes the function that is fixed up by the latter, so I just
removed it and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]