Merge branch 'linux-3.10.59' into dev-kernel-3.10
Ishan Mittal [Mon, 17 Nov 2014 09:11:55 +0000 (14:11 +0530)]
Bug 200023519

Conflicts:
        arch/arm/kernel/entry-common.S
        arch/arm64/Kconfig
        drivers/cpufreq/cpufreq_ondemand.c
        drivers/usb/core/hub.c
        kernel/fork.c
        net/wireless/nl80211.c
        sound/soc/codecs/max98090.c

Change-Id: I45bfefe48d0ae23c7a989c79e889213c18ca8ff7
Signed-off-by: Ishan Mittal <imittal@nvidia.com>

73 files changed:
1  2 
Makefile
arch/arm/Kconfig
arch/arm/kernel/entry-common.S
arch/arm/mm/idmap.c
arch/arm64/Kconfig
arch/arm64/include/asm/compat.h
arch/arm64/kernel/process.c
arch/arm64/kernel/ptrace.c
arch/arm64/kernel/sys_compat.c
arch/powerpc/Kconfig
arch/sparc/Kconfig
arch/sparc/mm/fault_64.c
arch/x86/Kconfig
block/genhd.c
block/partition-generic.c
drivers/base/firmware_class.c
drivers/base/regmap/regmap.c
drivers/cpufreq/cpufreq_ondemand.c
drivers/cpufreq/cpufreq_stats.c
drivers/hid/hid-magicmouse.c
drivers/iio/inkern.c
drivers/input/input.c
drivers/irqchip/irq-gic.c
drivers/net/ethernet/intel/igb/igb_main.c
drivers/pci/quirks.c
drivers/tty/serial/serial_core.c
drivers/usb/core/hub.c
drivers/usb/dwc3/dwc3-omap.c
drivers/usb/host/ehci-hcd.c
drivers/usb/host/xhci-hub.c
drivers/usb/host/xhci-ring.c
drivers/usb/host/xhci.c
fs/buffer.c
fs/ext4/mballoc.c
fs/nfs/nfs4proc.c
include/linux/sched.h
include/net/ip.h
include/net/ipv6.h
include/net/sock.h
include/net/tcp.h
init/Kconfig
init/main.c
kernel/fork.c
kernel/power/power.h
kernel/power/process.c
kernel/power/suspend.c
kernel/printk.c
kernel/sched/core.c
kernel/sched/debug.c
kernel/sched/rt.c
kernel/smp.c
kernel/time/alarmtimer.c
kernel/trace/trace.c
mm/oom_kill.c
mm/page_alloc.c
mm/shmem.c
mm/util.c
net/bluetooth/l2cap_sock.c
net/bluetooth/rfcomm/core.c
net/bluetooth/sco.c
net/ipv4/icmp.c
net/ipv4/ip_output.c
net/ipv4/raw.c
net/ipv4/route.c
net/ipv4/tcp.c
net/ipv4/tcp_input.c
net/ipv4/tcp_ipv4.c
net/ipv4/tcp_output.c
net/ipv6/addrconf.c
net/ipv6/tcp_ipv6.c
net/netlink/af_netlink.c
security/commoncap.c
sound/soc/soc-pcm.c

diff --cc Makefile
Simple merge
Simple merge
@@@ -397,25 -406,9 +407,25 @@@ ENTRY(vector_swi
  
  #else
        /* Legacy ABI only. */
-       ldr     scno, [lr, #-4]                 @ get SWI instruction
+  USER(        ldr     scno, [lr, #-4]         )       @ get SWI instruction
  #endif
  
 +#ifdef CONFIG_ALIGNMENT_TRAP
 +      ldr     ip, __cr_alignment
 +      ldr     ip, [ip]
 +      /*
 +       * Update alignment bit in control register only if it is different
 +       * from what's expected.
 +       */
 +      mrc     p15, 0, r8, c1, c0
 +      eor     r8, r8, ip
 +      ands    r8, r8, #CR_A
 +      mcrne   p15, 0, ip, c1, c0
 +#endif
 +      enable_irq
 +      ct_user_exit
 +
 +      get_thread_info tsk
        adr     tbl, sys_call_table             @ load syscall table pointer
  
  #if defined(CONFIG_OABI_COMPAT)
Simple merge
@@@ -1,9 -1,7 +1,10 @@@
  config ARM64
        def_bool y
        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
 +      select ARCH_HAVE_CUSTOM_GPIO_H
 +      select ARCH_USE_CMPXCHG_LOCKREF
 +      select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+       select ARCH_SUPPORTS_ATOMIC_RMW
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
        select ARCH_WANT_FRAME_POINTERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc block/genhd.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
  #include <linux/interrupt.h>
  #include <linux/percpu.h>
  #include <linux/slab.h>
 +#include <linux/ftrace.h>
  #include <linux/irqchip/chained_irq.h>
  #include <linux/irqchip/arm-gic.h>
 +#include <trace/events/irq.h>
  
+ #include <asm/cputype.h>
  #include <asm/irq.h>
  #include <asm/exception.h>
  #include <asm/smp_plat.h>
@@@ -1200,13 -859,10 +1203,14 @@@ int __init gic_of_init(struct device_no
        gic_cnt++;
        return 0;
  }
 +IRQCHIP_DECLARE(gic_400, "arm,gic-400", gic_of_init);
  IRQCHIP_DECLARE(cortex_a15_gic, "arm,cortex-a15-gic", gic_of_init);
  IRQCHIP_DECLARE(cortex_a9_gic, "arm,cortex-a9-gic", gic_of_init);
+ IRQCHIP_DECLARE(cortex_a7_gic, "arm,cortex-a7-gic", gic_of_init);
  IRQCHIP_DECLARE(msm_8660_qgic, "qcom,msm-8660-qgic", gic_of_init);
  IRQCHIP_DECLARE(msm_qgic2, "qcom,msm-qgic2", gic_of_init);
 +#ifdef CONFIG_TEGRA_APE_AGIC
 +IRQCHIP_DECLARE(tegra_agic, TEGRA_AGIC_COMPAT, gic_of_init);
 +#endif
  
  #endif
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/buffer.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc init/Kconfig
Simple merge
diff --cc init/main.c
Simple merge
diff --cc kernel/fork.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/printk.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc kernel/smp.c
Simple merge
Simple merge
Simple merge
diff --cc mm/oom_kill.c
Simple merge
diff --cc mm/page_alloc.c
Simple merge
diff --cc mm/shmem.c
Simple merge
diff --cc mm/util.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/icmp.c
Simple merge
Simple merge
diff --cc net/ipv4/raw.c
Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
@@@ -1242,10 -1238,8 +1242,11 @@@ wait_for_memory
  out:
        if (copied)
                tcp_push(sk, flags, mss_now, tp->nonagle);
+ out_nopush:
        release_sock(sk);
 +
 +      if (copied + copied_syn)
 +              uid_stat_tcp_snd(current_uid(), copied + copied_syn);
        return copied + copied_syn;
  
  do_fault:
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge