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

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

[Stephen Rothwell]

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

Hi Paul,

Today's linux-next merge of the sh tree got a conflict in
drivers/tty/serial/sh-sci.c between commit fc97114b8d67 ("sh: Fix boot
crash related to SCI") from Linus' tree and commit ad75b88ac379 ("serial:
sh-sci: Fix up default regtype probing") from the sh tree.

These do the same thing slightly differently ("ret" v. "ret != 0").  I
used the version from Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Paul Mundt]

On Mon, Aug 08, 2011 at 12:36:27PM +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the sh tree got a conflict in
> drivers/tty/serial/sh-sci.c between commit fc97114b8d67 ("sh: Fix boot
> crash related to SCI") from Linus' tree and commit ad75b88ac379 ("serial:
> sh-sci: Fix up default regtype probing") from the sh tree.
> 
> These do the same thing slightly differently ("ret" v. "ret != 0").  I
> used the version from Linus' tree.

I've done the same, should be fixed for tomorrow, thanks.

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

[Stephen Rothwell]

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

Hi all,

On Mon, 29 Jul 2019 09:25:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the sh tree got conflicts in:
> 
>   arch/sh/include/uapi/asm/setup.h
>   arch/sh/include/uapi/asm/types.h
> 
> between commit:
> 
>   d9c525229521 ("treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers")
> 
> from Linus' tree and commit:
> 
>   cd10afbc932d ("sh: remove unneeded uapi asm-generic wrappers")
> 
> from the sh tree.
> 
> I fixed it up (I just removed the files) 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.

Ping?
-- 
Cheers,
Stephen Rothwell

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

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

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the sh tree got conflicts in:

  arch/sh/include/uapi/asm/setup.h
  arch/sh/include/uapi/asm/types.h

between commit:

  d9c525229521 ("treewide: add "WITH Linux-syscall-note" to SPDX tag of uapi headers")

from Linus' tree and commit:

  cd10afbc932d ("sh: remove unneeded uapi asm-generic wrappers")

from the sh tree.

I fixed it up (I just removed the files) 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

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

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

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the sh tree got a conflict in
arch/sh/kernel/process_32.c between commit
d7627467b7a8dd6944885290a03a07ceb28c10eb ("Make do_execve() take a const
filename pointer") from Linus' tree and commit
d5b7fb7bb8a014ee96cd39b410fc57a7dc239a91 ("sh: fix up fallout from
syscall arg constification") from the sh tree.

I used the version from Linus' tree as it was more complete.

I also applied this merge fixup patch to make the header file prototype
match:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 19 Aug 2010 10:56:12 +1000
Subject: [PATCH] sh: fix prototype of sys_execve to match the new one

Commit d7627467b7 ("Make do_execve() take a const filename pointer")
missed some.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/sh/include/asm/syscalls_32.h |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/sh/include/asm/syscalls_32.h b/arch/sh/include/asm/syscalls_32.h
index be201fd..6089a4e 100644
--- a/arch/sh/include/asm/syscalls_32.h
+++ b/arch/sh/include/asm/syscalls_32.h
@@ -19,9 +19,10 @@ asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
 asmlinkage int sys_vfork(unsigned long r4, unsigned long r5,
 			 unsigned long r6, unsigned long r7,
 			 struct pt_regs __regs);
-asmlinkage int sys_execve(const char __user *ufilename, char __user * __user *uargv,
-			  char __user * __user *uenvp, unsigned long r7,
-			  struct pt_regs __regs);
+asmlinkage int sys_execve(const char __user *ufilename,
+			  const char __user * const __user *uargv,
+			  const char __user * const __user *uenvp,
+			  unsigned long r7, struct pt_regs __regs);
 asmlinkage int sys_sigsuspend(old_sigset_t mask, unsigned long r5,
 			      unsigned long r6, unsigned long r7,
 			      struct pt_regs __regs);
-- 
1.7.1

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/