From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jun 2014 18:31:16 +0000 (-0700)
Subject: Merge branch 'next' (accumulated 3.16 merge window patches) into master
X-Git-Tag: v3.16-rc1~82
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f17ea6dea8ba5668873afa54628a91aaa3fb1c0;p=platform%2Fkernel%2Flinux-exynos.git

Merge branch 'next' (accumulated 3.16 merge window patches) into master

Now that 3.15 is released, this merges the 'next' branch into 'master',
bringing us to the normal situation where my 'master' branch is the
merge window.

* accumulated work in next: (6809 commits)
  ufs: sb mutex merge + mutex_destroy
  powerpc: update comments for generic idle conversion
  cris: update comments for generic idle conversion
  idle: remove cpu_idle() forward declarations
  nbd: zero from and len fields in NBD_CMD_DISCONNECT.
  mm: convert some level-less printks to pr_*
  MAINTAINERS: adi-buildroot-devel is moderated
  MAINTAINERS: add linux-api for review of API/ABI changes
  mm/kmemleak-test.c: use pr_fmt for logging
  fs/dlm/debug_fs.c: replace seq_printf by seq_puts
  fs/dlm/lockspace.c: convert simple_str to kstr
  fs/dlm/config.c: convert simple_str to kstr
  mm: mark remap_file_pages() syscall as deprecated
  mm: memcontrol: remove unnecessary memcg argument from soft limit functions
  mm: memcontrol: clean up memcg zoneinfo lookup
  mm/memblock.c: call kmemleak directly from memblock_(alloc|free)
  mm/mempool.c: update the kmemleak stack trace for mempool allocations
  lib/radix-tree.c: update the kmemleak stack trace for radix tree allocations
  mm: introduce kmemleak_update_trace()
  mm/kmemleak.c: use %u to print ->checksum
  ...
---

3f17ea6dea8ba5668873afa54628a91aaa3fb1c0
diff --cc drivers/staging/speakup/speakup_acntsa.c
index 5079dbd,1f37484..3f2b569
--- a/drivers/staging/speakup/speakup_acntsa.c
+++ b/drivers/staging/speakup/speakup_acntsa.c
@@@ -47,28 -47,28 +47,28 @@@ static struct var_t vars[] = 
   * These attributes will appear in /sys/accessibility/speakup/acntsa.
   */
  static struct kobj_attribute caps_start_attribute =
- 	__ATTR(caps_start, S_IWUGO|S_IRUGO, spk_var_show, spk_var_store);
+ 	__ATTR(caps_start, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
  static struct kobj_attribute caps_stop_attribute =
- 	__ATTR(caps_stop, S_IWUGO|S_IRUGO, spk_var_show, spk_var_store);
+ 	__ATTR(caps_stop, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
  static struct kobj_attribute pitch_attribute =
- 	__ATTR(pitch, S_IWUGO|S_IRUGO, spk_var_show, spk_var_store);
+ 	__ATTR(pitch, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
  static struct kobj_attribute rate_attribute =
- 	__ATTR(rate, S_IWUGO|S_IRUGO, spk_var_show, spk_var_store);
+ 	__ATTR(rate, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
  static struct kobj_attribute tone_attribute =
- 	__ATTR(tone, S_IWUGO|S_IRUGO, spk_var_show, spk_var_store);
+ 	__ATTR(tone, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
  static struct kobj_attribute vol_attribute =
- 	__ATTR(vol, S_IWUGO|S_IRUGO, spk_var_show, spk_var_store);
+ 	__ATTR(vol, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
  
  static struct kobj_attribute delay_time_attribute =
 -	__ATTR(delay_time, S_IRUSR|S_IRUGO, spk_var_show, spk_var_store);
 +	__ATTR(delay_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
  static struct kobj_attribute direct_attribute =
- 	__ATTR(direct, S_IWUGO|S_IRUGO, spk_var_show, spk_var_store);
+ 	__ATTR(direct, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
  static struct kobj_attribute full_time_attribute =
 -	__ATTR(full_time, S_IRUSR|S_IRUGO, spk_var_show, spk_var_store);
 +	__ATTR(full_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
  static struct kobj_attribute jiffy_delta_attribute =
 -	__ATTR(jiffy_delta, S_IRUSR|S_IRUGO, spk_var_show, spk_var_store);
 +	__ATTR(jiffy_delta, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
  static struct kobj_attribute trigger_time_attribute =
 -	__ATTR(trigger_time, S_IRUSR|S_IRUGO, spk_var_show, spk_var_store);
 +	__ATTR(trigger_time, S_IWUSR|S_IRUGO, spk_var_show, spk_var_store);
  
  /*
   * Create a group of attributes so that we can create and destroy them all
diff --cc drivers/usb/host/xhci-mem.c
index b1a8a5f,6a57e81..8056d90
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@@ -1816,22 -1816,8 +1816,18 @@@ void xhci_mem_cleanup(struct xhci_hcd *
  		xhci_ring_free(xhci, xhci->cmd_ring);
  	xhci->cmd_ring = NULL;
  	xhci_dbg_trace(xhci, trace_xhci_dbg_init, "Freed command ring");
- 	list_for_each_entry_safe(cur_cd, next_cd,
- 			&xhci->cancel_cmd_list, cancel_cmd_list) {
- 		list_del(&cur_cd->cancel_cmd_list);
- 		kfree(cur_cd);
- 	}
+ 	xhci_cleanup_command_queue(xhci);
  
 +	num_ports = HCS_MAX_PORTS(xhci->hcs_params1);
 +	for (i = 0; i < num_ports; i++) {
 +		struct xhci_interval_bw_table *bwt = &xhci->rh_bw[i].bw_table;
 +		for (j = 0; j < XHCI_MAX_INTERVAL; j++) {
 +			struct list_head *ep = &bwt->interval_bw[j].endpoints;
 +			while (!list_empty(ep))
 +				list_del_init(ep->next);
 +		}
 +	}
 +
  	for (i = 1; i < MAX_HC_SLOTS; ++i)
  		xhci_free_virt_device(xhci, i);