Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Eric B Munson <emunson@akamai.com>,
	Ralf Baechle <ralf@linux-mips.org>
Subject: linux-next: manual merge of the akpm-current tree with Linus' tree
Date: Tue, 6 Oct 2015 16:46:01 +1100
Message-ID: <20151006164601.3d96d7a4@canb.auug.org.au> (raw)

Hi Andrew,

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

  arch/mips/include/uapi/asm/unistd.h
  arch/mips/kernel/scall32-o32.S
  arch/mips/kernel/scall64-n32.S
  arch/mips/kernel/scall64-64.S
  arch/mips/kernel/scall64-o32.S

between commit:

  96fc7a9cee67 ("MIPS: Wire up userfaultfd and membarrier syscalls.")

from Linus' tree and commit:

  4f9b011b10e7 ("mips: add entry for new mlock2 syscall")

from the akpm-current 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/mips/include/uapi/asm/unistd.h
index cfabadb135d9,d0bdfaa13ee9..000000000000
--- a/arch/mips/include/uapi/asm/unistd.h
+++ b/arch/mips/include/uapi/asm/unistd.h
@@@ -377,18 -377,17 +377,19 @@@
  #define __NR_memfd_create		(__NR_Linux + 354)
  #define __NR_bpf			(__NR_Linux + 355)
  #define __NR_execveat			(__NR_Linux + 356)
 -#define __NR_mlock2			(__NR_Linux + 357)
 +#define __NR_userfaultfd		(__NR_Linux + 357)
 +#define __NR_membarrier			(__NR_Linux + 358)
++#define __NR_mlock2			(__NR_Linux + 359)
  
  /*
   * Offset of the last Linux o32 flavoured syscall
   */
- #define __NR_Linux_syscalls		358
 -#define __NR_Linux_syscalls		357
++#define __NR_Linux_syscalls		359
  
  #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
  
  #define __NR_O32_Linux			4000
- #define __NR_O32_Linux_syscalls		358
 -#define __NR_O32_Linux_syscalls		357
++#define __NR_O32_Linux_syscalls		359
  
  #if _MIPS_SIM == _MIPS_SIM_ABI64
  
@@@ -713,18 -712,17 +714,19 @@@
  #define __NR_memfd_create		(__NR_Linux + 314)
  #define __NR_bpf			(__NR_Linux + 315)
  #define __NR_execveat			(__NR_Linux + 316)
 -#define __NR_mlock2			(__NR_Linux + 317)
 +#define __NR_userfaultfd		(__NR_Linux + 317)
 +#define __NR_membarrier			(__NR_Linux + 318)
++#define __NR_mlock2			(__NR_Linux + 319)
  
  /*
   * Offset of the last Linux 64-bit flavoured syscall
   */
- #define __NR_Linux_syscalls		318
 -#define __NR_Linux_syscalls		317
++#define __NR_Linux_syscalls		319
  
  #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
  
  #define __NR_64_Linux			5000
- #define __NR_64_Linux_syscalls		318
 -#define __NR_64_Linux_syscalls		317
++#define __NR_64_Linux_syscalls		319
  
  #if _MIPS_SIM == _MIPS_SIM_NABI32
  
@@@ -1053,17 -1051,16 +1055,18 @@@
  #define __NR_memfd_create		(__NR_Linux + 318)
  #define __NR_bpf			(__NR_Linux + 319)
  #define __NR_execveat			(__NR_Linux + 320)
 -#define __NR_mlock2			(__NR_Linux + 321)
 +#define __NR_userfaultfd		(__NR_Linux + 321)
 +#define __NR_membarrier			(__NR_Linux + 322)
++#define __NR_mlock2			(__NR_Linux + 323)
  
  /*
   * Offset of the last N32 flavoured syscall
   */
- #define __NR_Linux_syscalls		322
 -#define __NR_Linux_syscalls		321
++#define __NR_Linux_syscalls		323
  
  #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
  
  #define __NR_N32_Linux			6000
- #define __NR_N32_Linux_syscalls		322
 -#define __NR_N32_Linux_syscalls		321
++#define __NR_N32_Linux_syscalls		323
  
  #endif /* _UAPI_ASM_UNISTD_H */
diff --cc arch/mips/kernel/scall32-o32.S
index 65a74e4f0f45,b0b377aa1d5d..000000000000
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@@ -592,5 -599,4 +592,6 @@@ EXPORT(sys_call_table
  	PTR	sys_memfd_create
  	PTR	sys_bpf				/* 4355 */
  	PTR	sys_execveat
 +	PTR	sys_userfaultfd
 +	PTR	sys_membarrier
+ 	PTR	sys_mlock2
diff --cc arch/mips/kernel/scall64-64.S
index e732981cf99f,f12eb03c0961..000000000000
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@@ -430,6 -436,5 +430,7 @@@ EXPORT(sys_call_table
  	PTR	sys_memfd_create
  	PTR	sys_bpf				/* 5315 */
  	PTR	sys_execveat
 +	PTR	sys_userfaultfd
 +	PTR	sys_membarrier
+ 	PTR	sys_mlock2
  	.size	sys_call_table,.-sys_call_table
diff --cc arch/mips/kernel/scall64-n32.S
index c79484397584,ecdd65a2b02c..000000000000
--- a/arch/mips/kernel/scall64-n32.S
+++ b/arch/mips/kernel/scall64-n32.S
@@@ -420,6 -429,5 +420,7 @@@ EXPORT(sysn32_call_table
  	PTR	sys_memfd_create
  	PTR	sys_bpf
  	PTR	compat_sys_execveat		/* 6320 */
 +	PTR	sys_userfaultfd
 +	PTR	sys_membarrier
+ 	PTR	sys_mlock2
  	.size	sysn32_call_table,.-sysn32_call_table
diff --cc arch/mips/kernel/scall64-o32.S
index 6369cfd390c6,7a8b2dff16d3..000000000000
--- a/arch/mips/kernel/scall64-o32.S
+++ b/arch/mips/kernel/scall64-o32.S
@@@ -575,6 -584,5 +575,7 @@@ EXPORT(sys32_call_table
  	PTR	sys_memfd_create
  	PTR	sys_bpf				/* 4355 */
  	PTR	compat_sys_execveat
 +	PTR	sys_userfaultfd
 +	PTR	sys_membarrier
+ 	PTR	sys_mlock2
  	.size	sys32_call_table,.-sys32_call_table

             reply index

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-06  5:46 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-04-06 11:29 Stephen Rothwell
2021-02-08 12:10 Stephen Rothwell
2020-09-08  9:24 Stephen Rothwell
2020-09-08  9:17 Stephen Rothwell
2020-06-03  8:07 Stephen Rothwell
2020-06-03  7:53 Stephen Rothwell
2019-02-18  6:51 Stephen Rothwell
2019-02-20  1:00 ` Stephen Rothwell
2019-01-11  2:51 Stephen Rothwell
2019-01-11 15:08 ` Jerome Glisse
2019-01-07  2:16 Stephen Rothwell
2018-08-15  8:05 Stephen Rothwell
2018-07-23  8:00 Stephen Rothwell
2018-06-14  1:43 Stephen Rothwell
2018-06-14  1:36 Stephen Rothwell
2018-03-16  5:56 Stephen Rothwell
2017-11-02  8:10 Stephen Rothwell
2017-11-02  7:37 Stephen Rothwell
2017-05-08  3:48 Stephen Rothwell
2017-04-24  7:25 Stephen Rothwell
2017-04-24  9:11 ` Mel Gorman
2016-12-05  5:38 Stephen Rothwell
2016-12-05  5:56 ` Michal Hocko
2016-12-05  6:08   ` Stephen Rothwell
2016-01-18  3:22 Stephen Rothwell
2015-12-18  5:09 Stephen Rothwell
2015-07-20  3:54 Stephen Rothwell
2015-05-19  6:40 Stephen Rothwell
2014-08-08  5:46 Stephen Rothwell
2014-08-07  6:51 Stephen Rothwell
2014-05-29  9:08 Stephen Rothwell
2014-04-29  4:47 Stephen Rothwell
2014-04-24  5:38 Stephen Rothwell
2014-04-07  4:18 Stephen Rothwell
2014-01-29  3:46 Stephen Rothwell
2013-12-23  3:58 Stephen Rothwell
2013-12-03  1:52 Stephen Rothwell
2013-12-03  7:16 ` Richard Weinberger
2013-12-03  7:31   ` Andrew Morton
2013-12-03  7:36     ` Richard Weinberger
2013-02-02 12: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=20151006164601.3d96d7a4@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=emunson@akamai.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=ralf@linux-mips.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git