From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Paul Mundt <lethal@linux-sh•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Howells <dhowells@redhat•com>
Subject: linux-next: manual merge of the sh tree with Linus' tree
Date: Thu, 19 Aug 2010 11:00:40 +1000 [thread overview]
Message-ID: <20100819110040.9b65bf5e.sfr@canb.auug.org.au> (raw)
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/
next reply other threads:[~2010-08-19 1:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-19 1:00 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-08-08 2:36 linux-next: manual merge of the sh tree with Linus' tree Stephen Rothwell
2011-08-08 7:26 ` Paul Mundt
2019-07-28 23:25 Stephen Rothwell
2019-12-04 4:55 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100819110040.9b65bf5e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=lethal@linux-sh$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox