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

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Chris Metcalf <cmetcalf@tilera.com>
Subject: linux-next: manual merge of the signal tree with Linus' tree
Date: Tue, 12 Mar 2013 14:25:57 +1100	[thread overview]
Message-ID: <20130312142557.98fea7e3a6c51922e52f4d3c@canb.auug.org.au> (raw)

[-- 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 --]
