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

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

[Stephen Rothwell]

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

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/tile/kernel/compat.c between commit 87c319a2c3c2 ("tile: properly
use COMPAT_SYSCALL_DEFINEx") from Linus' tree and commit d5dc77bfeeab
("consolidate compat lookup_dcookie()") from the signal tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc arch/tile/kernel/compat.c
index 6ea4cdb,c262a02..0000000
--- a/arch/tile/kernel/compat.c
+++ b/arch/tile/kernel/compat.c
@@@ -56,15 -54,9 +56,9 @@@ COMPAT_SYSCALL_DEFINE6(pwrite64, unsign
  	return sys_pwrite64(fd, ubuf, count, ((loff_t)high << 32) | low);
  }
  
- COMPAT_SYSCALL_DEFINE4(lookup_dcookie, u32, low, u32, high,
-                        char __user *, buf, size_t, len)
- {
- 	return sys_lookup_dcookie(((loff_t)high << 32) | low, buf, len);
- }
- 
 -long compat_sys_sync_file_range2(int fd, unsigned int flags,
 -				 u32 offset_lo, u32 offset_hi,
 -				 u32 nbytes_lo, u32 nbytes_hi)
 +COMPAT_SYSCALL_DEFINE6(sync_file_range2, int, fd, unsigned int, flags,
 +                       u32, offset_lo, u32, offset_hi,
 +                       u32, nbytes_lo, u32, nbytes_hi)
  {
  	return sys_sync_file_range(fd, ((loff_t)offset_hi << 32) | offset_lo,
  				   ((loff_t)nbytes_hi << 32) | nbytes_lo,

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

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

[Stephen Rothwell]

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

Hi Al,

Today's linux-next merge of the signal tree got a conflict in fs/splice.c
between commit 06ae43f34bcc ("Don't bother with redoing rw_verify_area()
from default_file_splice_from()") from Linus' tree and commit
76b021d053ed ("convert vmsplice to COMPAT_SYSCALL_DEFINE") from the
signal tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc fs/splice.c
index 29e394e,23ade0e..0000000
--- a/fs/splice.c
+++ b/fs/splice.c
@@@ -31,7 -31,7 +31,8 @@@
  #include <linux/security.h>
  #include <linux/gfp.h>
  #include <linux/socket.h>
+ #include <linux/compat.h>
 +#include "internal.h"
  
  /*
   * Attempt to steal a page from a pipe buffer. This should perhaps go into

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

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

[James Hogan]

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

On 04/03/13 02:03, Stephen Rothwell wrote:
> Hi Al,
> 
> Today's linux-next merge of the signal tree got a conflict in
> include/asm-generic/unistd.h between commit 4dd3c95940b8
> ("asm-generic/unistd.h: handle symbol prefixes in cond_syscall") from
> Linus' tree and commit 24a2641326f1 ("consolidate cond_syscall and
> SYSCALL_ALIAS declarations") from the signal tree.
> 
> I fixed it up (I used the signal tree version as I think it supersedes
> the former) and can carry the fix as necessary (no action is required).

Hi Stephen, Al,

It needs this change too, to match the change to arch/blackfin,
otherwise the build breaks for metag.

Cheers
James

diff --git a/arch/metag/include/asm/linkage.h b/arch/metag/include/asm/linkage.h
index 73bf25b..79c69bb 100644
--- a/arch/metag/include/asm/linkage.h
+++ b/arch/metag/include/asm/linkage.h
@@ -4,4 +4,6 @@
 #define __ALIGN .p2align 2
 #define __ALIGN_STR ".p2align 2"
 
+#define SYMBOL_NAME(_name_) _##_name_
+
 #endif


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

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

[Stephen Rothwell]

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

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
include/asm-generic/unistd.h between commit 4dd3c95940b8
("asm-generic/unistd.h: handle symbol prefixes in cond_syscall") from
Linus' tree and commit 24a2641326f1 ("consolidate cond_syscall and
SYSCALL_ALIAS declarations") from the signal tree.

I fixed it up (I used the signal tree version as I think it supersedes
the former) 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 --]

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

[Stephen Rothwell]

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

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/tile/Kconfig between commit 887cbce0adea ("arch Kconfig: centralise
CONFIG_ARCH_NO_VIRT_TO_BUS") from Linus' tree and commit 15d9a5d9296a
("make HAVE_SYSCALL_WRAPPERS unconditional") from the signal tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc arch/tile/Kconfig
index 1404497,4069d87..0000000
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@@ -16,8 -16,6 +16,7 @@@ config TIL
  	select GENERIC_PENDING_IRQ if SMP
  	select GENERIC_IRQ_SHOW
  	select HAVE_DEBUG_BUGVERBOSE
- 	select HAVE_SYSCALL_WRAPPERS if TILEGX
 +	select HAVE_VIRT_TO_BUS
  	select SYS_HYPERVISOR
  	select ARCH_HAVE_NMI_SAFE_CMPXCHG
  	select GENERIC_CLOCKEVENTS

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

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

[Stephen Rothwell]

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

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/h8300/include/asm/signal.h between commit 1ec94e75def5 ("UAPI:
(Scripted) Disintegrate arch/h8300/include/asm") from Linus' tree and
commit 031b6566983a ("unify SS_ONSTACK/SS_DISABLE definitions") from the
signal tree.

I just used the former version, but removed the SS_* constants from the
uap version of the include files as well 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 --]

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

[Stephen Rothwell]

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

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/m32r/include/asm/signal.h between commit f7f4dc10e1eb ("UAPI:
(Scripted) Disintegrate arch/m32r/include/asm") from Linus' tree and
commit 031b6566983a ("unify SS_ONSTACK/SS_DISABLE definitions") from the
signal tree.

I just used the former version, but removed the SS_* constants from the
uap version of the include files as well 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 --]

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

[Stephen Rothwell]

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

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/h8300/include/asm/ptrace.h between commit 1ec94e75def5 ("UAPI:
(Scripted) Disintegrate arch/h8300/include/asm") from Linus' tree and
commit 1ca97bb541a1 ("new helper: current_user_stack_pointer()") from the
signal tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc arch/h8300/include/asm/ptrace.h
index 79c9a91,6183371..0000000
--- a/arch/h8300/include/asm/ptrace.h
+++ b/arch/h8300/include/asm/ptrace.h
@@@ -28,5 -63,7 +28,6 @@@
  #define current_pt_regs() ((struct pt_regs *) \
  	(THREAD_SIZE + (unsigned long)current_thread_info()) - 1)
  #define signal_pt_regs() ((struct pt_regs *)current->thread.esp0)
+ #define current_user_stack_pointer() rdusp()
 -#endif /* __KERNEL__ */
  #endif /* __ASSEMBLY__ */
  #endif /* _H8300_PTRACE_H */

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

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

[Stephen Rothwell]

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

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/alpha/kernel/process.c between commit 28d353d9891c ("alpha: take
kernel_execve() out of entry.S") from Linus' tree and commit 68f596a7a045
("alpha: rewrite kernel_execve in C") from the signal tree.

These appear to be the same patch with a slight difference in this file.
I just used the version from Linus' tree.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

[Stephen Rothwell]

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

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
arch/powerpc/kernel/entry_64.S between commit c58ce2b1e3c7 ("ppc64: fix
missing to check all bits of _TIF_USER_WORK_MASK in preempt") from Linus'
tree and commit d07644a97726 ("powerpc: missing NOTIFY_RESUME check on
64bit if CONFIG_PREEMPT is set") from the signal tree.

I *think* that the former is a superset of the latter, so I just used the
former.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

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

[Stephen Rothwell]

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

Hi Al,

Today's linux-next merge of the signal tree got a conflict in
kernel/irq/manage.c between commit f5d89470f91f ("genirq: Be more
informative on irq type mismatch") from Linus' tree and commit
501a0effacfa ("genirq: reimplement exit_irq_thread() hook via
task_work_add()") from the signal tree.

The latter removed the code modified by the former, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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