Merge tag 'v3.14.55' into linux-3.14.x-grsecurity-3.1

This is the 3.14.55 stable release

diff --cc Makefile
Simple merge

diff --cc arch/arm/kernel/signal.c
Simple merge

diff --cc arch/x86/kernel/apic/apic.c
Simple merge

diff --cc arch/x86/kernel/entry_64.S
Simple merge

diff --cc arch/x86/kernel/paravirt.c
Simple merge

diff --cc arch/x86/kernel/tsc.c
Simple merge

diff --cc arch/x86/kvm/svm.c
Simple merge

diff --cc arch/x86/mm/init_64.c
Simple merge

diff --cc arch/x86/xen/enlighten.c
Simple merge

diff --cc drivers/hwmon/nct6775.c
Simple merge

diff --cc drivers/md/md.c
Simple merge

diff --cc drivers/spi/spi.c
Simple merge

diff --cc fs/cifs/smb2ops.c
Simple merge

diff --cc fs/dcache.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc include/linux/security.h
Simple merge

diff --cc ipc/msg.c
Simple merge

diff --cc ipc/shm.c
Simple merge

diff --cc ipc/util.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/sched.h
Simple merge

diff --cc mm/hugetlb.c
Simple merge

diff --cc mm/slab.c
Simple merge

diff --cc net/netfilter/ipvs/ip_vs_sync.c
index f5521e740a6230e80af975554893c525a531647f,a108953a8c2c8d089c9b798699b57fa10d39f6ba..a7745ab44da7bccfa4180cf931da2aa88ec3b890
--- 1/net/netfilter/ipvs/ip_vs_sync.c
--- 2/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@@ -609,10 -609,10 +609,10 @@@ static void ip_vs_sync_conn_v0(struct n
        cp = cp->control;
        if (cp) {
                if (cp->flags & IP_VS_CONN_F_TEMPLATE)
 -                      pkts = atomic_add_return(1, &cp->in_pkts);
 +                      pkts = atomic_add_return_unchecked(1, &cp->in_pkts);
                else
                        pkts = sysctl_sync_threshold(ipvs);
-               ip_vs_sync_conn(net, cp->control, pkts);
+               ip_vs_sync_conn(net, cp, pkts);
        }
  }
  

diff --cc net/netfilter/ipvs/ip_vs_xmit.c
Simple merge

diff --cc net/netfilter/nft_compat.c
Simple merge

diff --cc virt/kvm/kvm_main.c
Simple merge