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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20091214143917.f5b90e15.sfr@canb.auug.org.au>
Date:	Mon, 14 Dec 2009 14:39:17 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Slaby <jirislaby@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Arnd Bergmann <arnd@...db.de>,
	Neil Horman <nhorman@...driver.com>
Subject: linux-next: manual merge of the limits tree with Linus' tree

Hi Jiri,

Today's linux-next merge of the limits tree got a conflict in
include/asm-generic/unistd.h between commits
9ab87644393d789b950ba984fa360f45c4df02e5 ("asm-generic: add sys_accept4
to unistd.h") and 3d7703870633dd454f6554e6d8d7f70441d0fd2d ("asm-generic:
add sys_recvmmsg to unistd.h") from Linus' tree and commit
cf8b57cd6af6ccbb8f6de90e677b1e5aca99c472 ("unistd: add __NR_[get|set]
prlimit syscall numbers") from the limits tree.

I fixed it up (see below) and can carry the fix for a while.  Jiri, you
should fix this by doing a merge of Linus' tree before asking him to pull
yours.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc include/asm-generic/unistd.h
index 6a0b30f,950587d..0000000
--- a/include/asm-generic/unistd.h
+++ b/include/asm-generic/unistd.h
@@@ -622,13 -622,13 +622,17 @@@ __SYSCALL(__NR_move_pages, sys_move_pag
  __SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
  #define __NR_perf_event_open 241
  __SYSCALL(__NR_perf_event_open, sys_perf_event_open)
 -#define __NR_getprlimit 242
 +#define __NR_accept4 242
 +__SYSCALL(__NR_accept4, sys_accept4)
 +#define __NR_recvmmsg 243
 +__SYSCALL(__NR_recvmmsg, sys_recvmmsg)
++#define __NR_getprlimit 244
+ __SYSCALL(__NR_getprlimit, sys_getprlimit)
 -#define __NR_setprlimit 243
++#define __NR_setprlimit 245
+ __SYSCALL(__NR_setprlimit, sys_setprlimit)
  
  #undef __NR_syscalls
--#define __NR_syscalls 244
++#define __NR_syscalls 246
  
  /*
   * All syscalls below here should go away really,
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/