linux-next: manual merge of the akpm tree with the tree

linux-next: manual merge of the akpm tree with the tree

[Stephen Rothwell]

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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in ipc/sem.c
between commit 321310ced2d6 ("ipc: move sem_obtain_lock() rcu locking
into the only caller") from Linus' tree and commit "ipc/sem.c:
alternatives to preempt_disable()" from the akpm tree.

I just dropped the akpm tree commit for now.

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

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

Re: linux-next: manual merge of the akpm tree with the tree

[Manfred Spraul]

Hi,

On 05/06/2013 05:51 AM, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in ipc/sem.c
> between commit 321310ced2d6 ("ipc: move sem_obtain_lock() rcu locking
> into the only caller") from Linus' tree and commit "ipc/sem.c:
> alternatives to preempt_disable()" from the akpm tree.
I would propose that 'ipc/sem.c: alternatives to preempt_disable()' is 
dropped.

As explained in the commit:
That patch is for CONFIG_PREEMPT_RT, it should go into their tree.

--
     Manfred

linux-next: manual merge of the akpm tree with the tree

[Stephen Rothwell]

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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
fs/proc/base.c between commit c8506285ded8 ("procfs: Move /proc/pid/fd
[info] handling code to fd.[ch]") from the vfs tree and commit
"coredump-use-suid_dumpable_enabled-rather-than-hardcoded-1-checkpatch-fixes"
from the akpm 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 --git a/fs/proc/internal.h b/fs/proc/internal.h
index 863b8c7..cceaab0 100644
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -103,7 +103,7 @@ static inline int task_dumpable(struct task_struct *task)
 	if (mm)
 		dumpable = get_dumpable(mm);
 	task_unlock(task);
-	if(dumpable == SUID_DUMPABLE_ENABLED)
+	if (dumpable == SUID_DUMPABLE_ENABLED)
 		return 1;
 	return 0;
 }

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

linux-next: manual merge of the akpm tree with the tree

[Stephen Rothwell]

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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in fs/exec.c
between commits b40b89c2da16 ("new helper: replace_fd()") and
be28f112a5e5 ("do_coredump(): make sure that descriptor table isn't
shared") from the vfs tree and commit "coredump: move core dump
functionality into its own file" from the akpm 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/exec.c
index 6b2e20b,d9bd87b..0000000
--- a/fs/exec.c
+++ b/fs/exec.c
diff --git a/fs/coredump.c b/fs/coredump.c
index 9692329..6ef9888 100644
--- a/fs/coredump.c
+++ b/fs/coredump.c
@@ -438,23 +438,14 @@ static void wait_for_dump_helpers(struct file *file)
 static int umh_pipe_setup(struct subprocess_info *info, struct cred *new)
 {
 	struct file *files[2];
-	struct fdtable *fdt;
 	struct coredump_params *cp = (struct coredump_params *)info->data;
-	struct files_struct *cf = current->files;
 	int err = create_pipe_files(files, 0);
 	if (err)
 		return err;
 
 	cp->file = files[1];
 
-	sys_close(0);
-	fd_install(0, files[0]);
-	spin_lock(&cf->file_lock);
-	fdt = files_fdtable(cf);
-	__set_open_fd(0, fdt);
-	__clear_close_on_exec(0, fdt);
-	spin_unlock(&cf->file_lock);
-
+	replace_fd(0, files[0], 0);
 	/* and disallow core files too */
 	current->signal->rlim[RLIMIT_CORE] = (struct rlimit){1, 1};
 
@@ -472,6 +463,7 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
 	int retval = 0;
 	int flag = 0;
 	int ispipe;
+	struct files_struct *displaced;
 	bool need_nonrelative = false;
 	static atomic_t core_dump_count = ATOMIC_INIT(0);
 	struct coredump_params cprm = {
@@ -625,6 +617,12 @@ void do_coredump(long signr, int exit_code, struct pt_regs *regs)
 			goto close_fail;
 	}
 
+	/* get us an unshared descriptor table; almost always a no-op */
+	retval = unshare_files(&displaced);
+	if (retval)
+		goto close_fail;
+	if (displaced)
+		put_files_struct(displaced);
 	retval = binfmt->core_dump(&cprm);
 	if (retval)
 		current->signal->group_exit_code |= 0x80;

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

linux-next: manual merge of the akpm tree with the tree

[Stephen Rothwell]

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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
mm/memcontrol.c between commit a0db00fcf5da ("memcg: remove redundant
parentheses") from Linus' tree and commit "memcg: track resource index in
cftype private" from the akpm tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc mm/memcontrol.c
index ffa9490,4ebe680..0000000
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@@ -404,9 -391,14 +404,14 @@@ enum charge_type 
  #define _MEM			(0)
  #define _MEMSWAP		(1)
  #define _OOM_TYPE		(2)
- #define MEMFILE_PRIVATE(x, val)	((x) << 16 | (val))
- #define MEMFILE_TYPE(val)	((val) >> 16 & 0xffff)
- #define MEMFILE_ATTR(val)	((val) & 0xffff)
+ #define _MEMHUGETLB		(3)
+ 
+ /*  0 ... val ...16.... x...24...idx...32*/
 -#define __MEMFILE_PRIVATE(idx, x, val)	(((idx) << 24) | ((x) << 16) | (val))
++#define __MEMFILE_PRIVATE(idx, x, val)	((idx) << 24 | (x) << 16 | (val))
+ #define MEMFILE_PRIVATE(x, val)		__MEMFILE_PRIVATE(0, x, val)
 -#define MEMFILE_TYPE(val)		(((val) >> 16) & 0xff)
 -#define MEMFILE_IDX(val)		(((val) >> 24) & 0xff)
++#define MEMFILE_TYPE(val)		((val) >> 16 & 0xff)
++#define MEMFILE_IDX(val)		((val) >> 24 & 0xff)
+ #define MEMFILE_ATTR(val)		((val) & 0xffff)
  /* Used for OOM nofiier */
  #define OOM_CONTROL		(0)
  

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

linux-next: manual merge of the akpm tree with the tree

[Stephen Rothwell]

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

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/x86/kernel/apic/io_apic.c between commit d1ecad6eee86 ("x86/apic:
Only compile local function if used with !CONFIG_GENERIC_PENDING_IRQ")
from the tip tree and commit "arch/x86/kernel/apic/io_apic.c: move
io_apic_level_ack_pending() inside CONFIG_GENERIC_PENDING_IRQ" from the
akpm tree.

These are the same patch with different commit messages and authors.  I
dropped the one from the akpm tree.

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

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

Re: linux-next: manual merge of the akpm tree with the tree

[Stephen Rothwell]

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

Hi,

On Tue, 27 Sep 2011 09:52:27 -0700 Vaibhav Nagarnaik <vnagarnaik@google.com> wrote:
>
> Looks good to me. Do I need to provide Acked-by?

Not to me, that is just a merge fixup patch in linux-next.  It is not
permanent until Andrew or Linus actually take the original patches and
merge them.

But it good to know that it is probablt correct, thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: manual merge of the akpm tree with the tree

[Vaibhav Nagarnaik]

On Mon, Sep 26, 2011 at 11:59 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Andrew,
>
> Today's linux-next merge of the scsi-post-merge tree got conflicts in
> arch/x86/kernel/apic/apic.c, arch/x86/kernel/cpu/mcheck/therm_throt.c,
> arch/x86/kernel/cpu/mcheck/threshold.c and arch/x86/kernel/irq.c between
> commit ef14aea88fee ("x86: Call idle notifier after irq_enter()") from
> the rcu tree and commit 6a541324a31f ("The current interrupt traces from
> irq_handler_entry and irq_handler_exit") from the akpm tree.
>
> Just context changes. I fixed them up (see below) and can carry the fixes
> as necessary.


Looks good to me. Do I need to provide Acked-by?

Vaibhav Nagarnaik

Re: linux-next: manual merge of the akpm tree with the tree

[Frederic Weisbecker]

On Tue, Sep 27, 2011 at 04:59:20PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the scsi-post-merge tree got conflicts in
> arch/x86/kernel/apic/apic.c, arch/x86/kernel/cpu/mcheck/therm_throt.c,
> arch/x86/kernel/cpu/mcheck/threshold.c and arch/x86/kernel/irq.c between
> commit ef14aea88fee ("x86: Call idle notifier after irq_enter()") from
> the rcu tree and commit 6a541324a31f ("The current interrupt traces from
> irq_handler_entry and irq_handler_exit") from the akpm tree.
> 
> Just context changes. I fixed them up (see below) and can carry the fixes
> as necessary.

Looks good as well.

Thanks!

linux-next: manual merge of the akpm tree with the tree

[Stephen Rothwell]

Hi Andrew,

Today's linux-next merge of the scsi-post-merge tree got conflicts in
arch/x86/kernel/apic/apic.c, arch/x86/kernel/cpu/mcheck/therm_throt.c,
arch/x86/kernel/cpu/mcheck/threshold.c and arch/x86/kernel/irq.c between
commit ef14aea88fee ("x86: Call idle notifier after irq_enter()") from
the rcu tree and commit 6a541324a31f ("The current interrupt traces from
irq_handler_entry and irq_handler_exit") from the akpm tree.

Just context changes. I fixed them up (see below) and can carry the fixes
as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/kernel/apic/apic.c
index 4af04d4,0fe559f..0000000
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@@ -857,9 -858,11 +858,11 @@@ void __irq_entry smp_apic_timer_interru
  	 * Besides, if we don't timer interrupts ignore the global
  	 * interrupt lock, which is the WrongThing (tm) to do.
  	 */
 -	exit_idle();
  	irq_enter();
 +	exit_idle();
+ 	trace_irq_vector_entry(LOCAL_TIMER_VECTOR);
  	local_apic_timer_interrupt();
+ 	trace_irq_vector_exit(LOCAL_TIMER_VECTOR);
  	irq_exit();
  
  	set_irq_regs(old_regs);
@@@ -1790,8 -1794,9 +1793,9 @@@ void smp_spurious_interrupt(struct pt_r
  {
  	u32 v;
  
 -	exit_idle();
  	irq_enter();
 +	exit_idle();
+ 	trace_irq_vector_entry(SPURIOUS_APIC_VECTOR);
  	/*
  	 * Check if this really is a spurious interrupt and ACK it
  	 * if it is a vectored one.  Just in case...
@@@ -1827,8 -1833,9 +1832,9 @@@ void smp_error_interrupt(struct pt_reg
  		"Illegal register address",	/* APIC Error Bit 7 */
  	};
  
 -	exit_idle();
  	irq_enter();
 +	exit_idle();
+ 	trace_irq_vector_entry(ERROR_APIC_VECTOR);
  	/* First tickle the hardware, only then report what went on. -- REW */
  	v0 = apic_read(APIC_ESR);
  	apic_write(APIC_ESR, 0);
diff --cc arch/x86/kernel/cpu/mcheck/therm_throt.c
index ce21561,6b7edb5..0000000
--- a/arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@@ -397,10 -398,12 +398,12 @@@ static void (*smp_thermal_vector)(void
  
  asmlinkage void smp_thermal_interrupt(struct pt_regs *regs)
  {
 -	exit_idle();
  	irq_enter();
 +	exit_idle();
+ 	trace_irq_vector_entry(THERMAL_APIC_VECTOR);
  	inc_irq_stat(irq_thermal_count);
  	smp_thermal_vector();
+ 	trace_irq_vector_exit(THERMAL_APIC_VECTOR);
  	irq_exit();
  	/* Ack only at the end to avoid potential reentry */
  	ack_APIC_irq();
diff --cc arch/x86/kernel/cpu/mcheck/threshold.c
index aa578ca,ffde17b..0000000
--- a/arch/x86/kernel/cpu/mcheck/threshold.c
+++ b/arch/x86/kernel/cpu/mcheck/threshold.c
@@@ -19,10 -20,12 +20,12 @@@ void (*mce_threshold_vector)(void) = de
  
  asmlinkage void smp_threshold_interrupt(void)
  {
 -	exit_idle();
  	irq_enter();
 +	exit_idle();
+ 	trace_irq_vector_entry(THRESHOLD_APIC_VECTOR);
  	inc_irq_stat(irq_threshold_count);
  	mce_threshold_vector();
+ 	trace_irq_vector_exit(THRESHOLD_APIC_VECTOR);
  	irq_exit();
  	/* Ack only at the end to avoid potential reentry */
  	ack_APIC_irq();
diff --cc arch/x86/kernel/irq.c
index 5d31e5b,64aad37..0000000
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@@ -209,10 -212,10 +212,9 @@@ void smp_x86_platform_ipi(struct pt_reg
  
  	ack_APIC_irq();
  
 -	exit_idle();
 -
  	irq_enter();
- 
 +	exit_idle();
- 
+ 	trace_irq_vector_entry(X86_PLATFORM_IPI_VECTOR);
  	inc_irq_stat(x86_platform_ipis);
  
  	if (x86_platform_ipi_callback)