Commit 3e85fb9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (Andrew's patch bomb) 

Merge the emailed seties of 19 patches from Andrew Morton

* akpm:
  rapidio/tsi721: fix queue wrapping bug in inbound doorbell handler
  memcg: fix mapcount check in move charge code for anonymous page
  mm: thp: fix BUG on mm->nr_ptes
  alpha: fix 32/64-bit bug in futex support
  memcg: fix GPF when cgroup removal races with last exit
  debugobjects: Fix selftest for static warnings
  floppy/scsi: fix setting of BIO flags
  memcg: fix deadlock by inverting lrucare nesting
  drivers/rtc/rtc-r9701.c: fix crash in r9701_remove()
  c2port: class_create() returns an ERR_PTR
  pps: class_create() returns an ERR_PTR, not NULL
  hung_task: fix the broken rcu_lock_break() logic
  vfork: kill PF_STARTING
  coredump_wait: don't call complete_vfork_done()
  vfork: make it killable
  vfork: introduce complete_vfork_done()
  aio: wake up waiters when freeing unused kiocbs
  kprobes: return proper error code from register_kprobe()
  kmsg_dump: don't run on non-error paths by default
parents 055bf38d b24823e6

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -2211,6 +2211,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 


			default: off.



	printk.always_kmsg_dump=

			Trigger kmsg_dump for cases other than kernel oops or

			panics

			Format: <bool>  (1/Y/y=enable, 0/N/n=disable)

			default: disabled



	printk.time=	Show timing data prefixed to each printk message line

			Format: <bool>  (1/Y/y=enable, 0/N/n=disable)

arch/alpha/include/asm/futex.h

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 
	"	lda	$31,3b-2b(%0)\n"

	"	.previous\n"

	:	"+r"(ret), "=&r"(prev), "=&r"(cmp)

	:	"r"(uaddr), "r"((long)oldval), "r"(newval)

	:	"r"(uaddr), "r"((long)(int)oldval), "r"(newval)

	:	"memory");



	*uval = prev;

drivers/block/floppy.c

+1 −1
Original line number Diff line number Diff line
@@ -3832,7 +3832,7 @@ static int __floppy_read_block_0(struct block_device *bdev) 
	bio.bi_size = size;

	bio.bi_bdev = bdev;

	bio.bi_sector = 0;

	bio.bi_flags = BIO_QUIET;

	bio.bi_flags = (1 << BIO_QUIET);

	init_completion(&complete);

	bio.bi_private = &complete;

	bio.bi_end_io = floppy_rb0_complete;

drivers/misc/c2port/core.c

+2 −2
Original line number Diff line number Diff line
@@ -984,9 +984,9 @@ static int __init c2port_init(void) 
		" - (C) 2007 Rodolfo Giometti\n");



	c2port_class = class_create(THIS_MODULE, "c2port");

	if (!c2port_class) {

	if (IS_ERR(c2port_class)) {

		printk(KERN_ERR "c2port: failed to allocate class\n");

		return -ENOMEM;

		return PTR_ERR(c2port_class);

	}

	c2port_class->dev_attrs = c2port_attrs;

drivers/pps/pps.c

+2 −2
Original line number Diff line number Diff line
@@ -369,9 +369,9 @@ static int __init pps_init(void) 
	int err;



	pps_class = class_create(THIS_MODULE, "pps");

	if (!pps_class) {

	if (IS_ERR(pps_class)) {

		pr_err("failed to allocate class\n");

		return -ENOMEM;

		return PTR_ERR(pps_class);

	}

	pps_class->dev_attrs = pps_attrs;

CRA Git | Maintained and supported by SUSTech CRA and CCSE