Merge tag 'v3.14.31' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into ti-linux-3.14.y

This is the 3.14.31 stable release

* tag 'v3.14.31' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (77 commits)
  Linux 3.14.31
  md/raid5: fetch_block must fetch all the blocks handle_stripe_dirtying wants.
  mm: get rid of radix tree gfp mask for pagecache_get_page
  mm: page_alloc: reduce cost of the fair zone allocation policy
  mm: page_alloc: abort fair zone allocation policy when remotes nodes are encountered
  mm: vmscan: only update per-cpu thresholds for online CPU
  mm: move zone->pages_scanned into a vmstat counter
  mm: rearrange zone fields into read-only, page alloc, statistics and page reclaim lines
  mm: pagemap: avoid unnecessary overhead when tracepoints are deactivated
  memcg, vmscan: Fix forced scan of anonymous pages
  vmalloc: use rcu list iterator to reduce vmap_area_lock contention
  mm: make copy_pte_range static again
  mm, thp: only collapse hugepages to nodes with affinity for zone_reclaim_mode
  mm/memory.c: use entry = ACCESS_ONCE(*pte) in handle_pte_fault()
  shmem: fix init_page_accessed use to stop !PageLRU bug
  mm: avoid unnecessary atomic operations during end_page_writeback()
  mm: non-atomically mark page accessed during page cache allocation where possible
  fs: buffer: do not use unnecessary atomic operations when discarding buffers
  mm: do not use unnecessary atomic operations when adding pages to the LRU
  mm: do not use atomic operations when releasing pages
  ...

Signed-off-by: Texas Instruments Auto Merger <lcpd_integration@list.ti.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/crypto/ccm.c b/crypto/ccm.c
index 1df84217f7c..003bbbd21a2 100644
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -879,5 +879,6 @@ module_exit(crypto_ccm_module_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Counter with CBC MAC");
-MODULE_ALIAS("ccm_base");
-MODULE_ALIAS("rfc4309");
+MODULE_ALIAS_CRYPTO("ccm_base");
+MODULE_ALIAS_CRYPTO("rfc4309");
+MODULE_ALIAS_CRYPTO("ccm");