From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 6 Sep 2013 16:36:28 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
X-Git-Tag: firefly_0821_release~176^2~5412
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2e515bf096c245ba87f20ab4b4ea20f911afaeda;p=firefly-linux-kernel-4.4.55.git

Merge branch 'for-linus' of git://git./linux/kernel/git/jikos/trivial

Pull trivial tree from Jiri Kosina:
 "The usual trivial updates all over the tree -- mostly typo fixes and
  documentation updates"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (52 commits)
  doc: Documentation/cputopology.txt fix typo
  treewide: Convert retrun typos to return
  Fix comment typo for init_cma_reserved_pageblock
  Documentation/trace: Correcting and extending tracepoint documentation
  mm/hotplug: fix a typo in Documentation/memory-hotplug.txt
  power: Documentation: Update s2ram link
  doc: fix a typo in Documentation/00-INDEX
  Documentation/printk-formats.txt: No casts needed for u64/s64
  doc: Fix typo "is is" in Documentations
  treewide: Fix printks with 0x%#
  zram: doc fixes
  Documentation/kmemcheck: update kmemcheck documentation
  doc: documentation/hwspinlock.txt fix typo
  PM / Hibernate: add section for resume options
  doc: filesystems : Fix typo in Documentations/filesystems
  scsi/megaraid fixed several typos in comments
  ppc: init_32: Fix error typo "CONFIG_START_KERNEL"
  treewide: Add __GFP_NOWARN to k.alloc calls with v.alloc fallbacks
  page_isolation: Fix a comment typo in test_pages_isolated()
  doc: fix a typo about irq affinity
  ...
---

2e515bf096c245ba87f20ab4b4ea20f911afaeda
diff --cc drivers/net/wireless/iwlwifi/mvm/time-event.c
index c17b74c31398,39b3ffbc53b0..76a3c177e100
--- a/drivers/net/wireless/iwlwifi/mvm/time-event.c
+++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c
@@@ -198,12 -180,19 +198,12 @@@ static void iwl_mvm_te_handle_notif(str
  		 * By now, we should have finished association
  		 * and know the dtim period.
  		 */
 -		if (te_data->vif->type == NL80211_IFTYPE_STATION &&
 -		    (!te_data->vif->bss_conf.assoc ||
 -		     !te_data->vif->bss_conf.dtim_period)) {
 -			IWL_ERR(mvm,
 -				"No association and the time event is over already...\n");
 -			ieee80211_connection_loss(te_data->vif);
 -		}
 -
 +		iwl_mvm_te_check_disconnect(mvm, te_data->vif,
- 			"No assocation and the time event is over already...");
++			"No association and the time event is over already...");
  		iwl_mvm_te_clear_data(mvm, te_data);
 -	} else if (le32_to_cpu(notif->action) & TE_NOTIF_HOST_EVENT_START) {
 +	} else if (le32_to_cpu(notif->action) & TE_V2_NOTIF_HOST_EVENT_START) {
  		te_data->running = true;
 -		te_data->end_jiffies = jiffies +
 -			TU_TO_JIFFIES(te_data->duration);
 +		te_data->end_jiffies = TU_TO_EXP_TIME(te_data->duration);
  
  		if (te_data->vif->type == NL80211_IFTYPE_P2P_DEVICE) {
  			set_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status);
diff --cc kernel/workqueue.c
index 29b79852a845,7f01a3eeaf95..987293d03ebc
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@@ -2033,12 -2038,9 +2039,12 @@@ static bool maybe_destroy_workers(struc
   * spin_lock_irq(pool->lock) which may be released and regrabbed
   * multiple times.  Does GFP_KERNEL allocations.
   *
-  * RETURNS:
+  * Return:
 - * spin_lock_irq(pool->lock) which may be released and regrabbed
 - * multiple times.  Does GFP_KERNEL allocations.
 + * %false if the pool don't need management and the caller can safely start
 + * processing works, %true indicates that the function released pool->lock
 + * and reacquired it to perform some management function and that the
 + * conditions that the caller verified while holding the lock before
 + * calling the function might no longer be true.
   */
  static bool manage_workers(struct worker *worker)
  {