Merge tag 'v3.10.50' into linux-3.10.x-grsecurity-2.9.1

This is the 3.10.50 stable release

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event_intel.c
Simple merge

diff --cc drivers/irqchip/irq-gic.c
Simple merge

diff --cc drivers/md/dm-thin-metadata.c
Simple merge

diff --cc drivers/net/ethernet/emulex/benet/be_main.c
Simple merge

diff --cc drivers/usb/core/hub.c
Simple merge

diff --cc include/net/sock.h
Simple merge

diff --cc kernel/power/process.c
Simple merge

diff --cc kernel/time/alarmtimer.c
Simple merge

diff --cc kernel/trace/ftrace.c
Simple merge

diff --cc kernel/trace/ring_buffer.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc mm/shmem.c
index 49ecfea2bc5ec89f1cadf354e84e469a30a6d0a8,16cc1d77f70a0e6ae0b63c8599300d7a3db00289..d14804f592aa7b02e78184231e9f7e232eb4b1a9
--- 1/mm/shmem.c
--- 2/mm/shmem.c
+++ b/mm/shmem.c
@@@ -77,14 -77,15 +77,15 @@@ struct vfsmount *shm_mnt
  #define BOGO_DIRENT_SIZE 20
  
  /* Symlink up to this size is kmalloc'ed instead of using a swappable page */
 -#define SHORT_SYMLINK_LEN 128
 +#define SHORT_SYMLINK_LEN 64
  
  /*
-  * shmem_fallocate and shmem_writepage communicate via inode->i_private
-  * (with i_mutex making sure that it has only one user at a time):
-  * we would prefer not to enlarge the shmem inode just for that.
+  * shmem_fallocate communicates with shmem_fault or shmem_writepage via
+  * inode->i_private (with i_mutex making sure that it has only one user at
+  * a time): we would prefer not to enlarge the shmem inode just for that.
   */
  struct shmem_falloc {
+       wait_queue_head_t *waitq; /* faults into hole wait for punch to end */
        pgoff_t start;          /* start of range currently being fallocated */
        pgoff_t next;           /* the next page offset to be fallocated */
        pgoff_t nr_falloced;    /* how many new pages have been fallocated */

diff --cc net/ipv4/route.c
Simple merge

diff --cc net/ipv4/tcp_input.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc net/sctp/sysctl.c
Simple merge