$ date Tuesday 12 March 10:26:52 EST 2013 $ git checkout master Already on 'master' $ git reset --hard stable HEAD is now at 9f22578 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc Merging origin/master (7c6baa3 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) $ git merge origin/master Updating 9f22578..7c6baa3 Fast-forward CREDITS | 6 +- Documentation/SubmittingPatches | 3 +- Documentation/hwmon/adm1275 | 2 +- Documentation/hwmon/adt7410 | 11 +- Documentation/hwmon/jc42 | 2 +- Documentation/hwmon/lineage-pem | 2 +- Documentation/hwmon/lm25066 | 2 +- Documentation/hwmon/ltc2978 | 6 +- Documentation/hwmon/ltc4261 | 2 +- Documentation/hwmon/max16064 | 2 +- Documentation/hwmon/max16065 | 2 +- Documentation/hwmon/max34440 | 2 +- Documentation/hwmon/max8688 | 2 +- Documentation/hwmon/pmbus | 2 +- Documentation/hwmon/smm665 | 2 +- Documentation/hwmon/ucd9000 | 2 +- Documentation/hwmon/ucd9200 | 2 +- Documentation/hwmon/zl6100 | 2 +- Documentation/input/alps.txt | 67 +++++- Documentation/networking/tuntap.txt | 77 ++++++ Documentation/power/opp.txt | 25 +- Documentation/printk-formats.txt | 2 +- Documentation/trace/ftrace.txt | 2 +- MAINTAINERS | 2 + Makefile | 2 +- arch/alpha/boot/head.S | 1 + arch/arm/boot/compressed/Makefile | 2 +- arch/arm/include/asm/mmu.h | 8 +- arch/arm/include/asm/mmu_context.h | 2 +- arch/arm/include/asm/tlbflush.h | 34 ++- arch/arm/include/uapi/asm/unistd.h | 2 +- arch/arm/kernel/asm-offsets.c | 2 +- arch/arm/kernel/calls.S | 2 +- arch/arm/kernel/head.S | 26 +- arch/arm/kernel/hw_breakpoint.c | 2 +- arch/arm/kernel/perf_event.c | 4 +- arch/arm/kernel/perf_event_v7.c | 2 +- arch/arm/kernel/smp.c | 1 + arch/arm/kernel/smp_tlb.c | 12 + arch/arm/kernel/smp_twd.c | 4 + arch/arm/kernel/suspend.c | 1 + arch/arm/lib/memset.S | 85 +++---- arch/arm/mach-netx/generic.c | 2 +- arch/arm/mach-netx/include/mach/irqs.h | 64 ++--- arch/arm/mm/context.c | 29 ++- arch/arm/mm/idmap.c | 1 + arch/arm/mm/proc-v7-3level.S | 2 +- arch/ia64/kernel/perfmon.c | 1 + arch/metag/include/asm/elf.h | 3 - arch/metag/mm/Kconfig | 1 + arch/powerpc/platforms/cell/spufs/inode.c | 1 + arch/s390/hypfs/inode.c | 1 + arch/s390/include/asm/cpu_mf.h | 1 + arch/tile/include/asm/compat.h | 3 + arch/tile/kernel/compat.c | 42 +++- arch/um/drivers/chan.h | 2 +- arch/um/drivers/chan_kern.c | 4 +- arch/um/drivers/chan_user.c | 12 +- arch/um/drivers/chan_user.h | 6 +- arch/um/drivers/line.c | 42 ++-- arch/um/drivers/net_kern.c | 2 + arch/um/drivers/ssl.c | 1 - arch/um/drivers/stdio_console.c | 1 - arch/um/os-Linux/signal.c | 2 +- arch/um/os-Linux/start_up.c | 2 + arch/x86/include/asm/bootparam_utils.h | 20 +- arch/x86/kernel/setup.c | 10 +- arch/x86/kernel/smpboot.c | 3 +- arch/x86/mm/init.c | 5 +- arch/x86/mm/pat.c | 7 + drivers/acpi/glue.c | 55 +---- drivers/acpi/processor_core.c | 3 +- drivers/acpi/processor_driver.c | 2 +- drivers/acpi/sleep.c | 16 +- drivers/ata/libata-acpi.c | 7 +- drivers/base/power/main.c | 2 - drivers/base/power/power.h | 8 +- drivers/base/power/qos.c | 217 +++++++++-------- drivers/base/power/sysfs.c | 1 + drivers/base/regmap/regmap-irq.c | 1 + drivers/char/random.c | 12 +- drivers/cpufreq/cpufreq_governor.h | 2 +- drivers/cpufreq/highbank-cpufreq.c | 8 +- drivers/cpufreq/intel_pstate.c | 42 ++-- drivers/firmware/dmi_scan.c | 5 +- drivers/firmware/efivars.c | 131 +++++++--- drivers/gpu/drm/i915/i915_drv.c | 25 +- drivers/gpu/drm/i915/i915_irq.c | 26 +- drivers/gpu/drm/i915/i915_reg.h | 4 +- drivers/gpu/drm/i915/intel_crt.c | 2 +- drivers/gpu/drm/i915/intel_ddi.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 37 ++- drivers/gpu/drm/i915/intel_dp.c | 3 +- drivers/gpu/drm/i915/intel_pm.c | 2 +- drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - drivers/gpu/drm/mgag200/mgag200_i2c.c | 1 + drivers/gpu/drm/mgag200/mgag200_mode.c | 27 +++ drivers/gpu/drm/nouveau/core/engine/graph/nve0.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/bios/init.c | 2 +- drivers/gpu/drm/nouveau/core/subdev/i2c/base.c | 1 + drivers/gpu/drm/nouveau/nouveau_agp.c | 12 + drivers/gpu/drm/nouveau/nv50_display.c | 173 ++++++++------ drivers/gpu/drm/radeon/evergreen.c | 6 + drivers/gpu/drm/radeon/evergreen_cs.c | 2 +- drivers/gpu/drm/radeon/ni.c | 6 + drivers/gpu/drm/radeon/r600.c | 6 + drivers/gpu/drm/radeon/radeon_combios.c | 9 + drivers/gpu/drm/radeon/radeon_drv.c | 3 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 + drivers/gpu/drm/radeon/si.c | 6 + drivers/gpu/drm/tegra/Kconfig | 1 - drivers/hid/hid-logitech-dj.c | 22 +- drivers/hwmon/pmbus/ltc2978.c | 30 +-- drivers/hwmon/sht15.c | 8 +- drivers/infiniband/hw/ipath/ipath_fs.c | 1 + drivers/infiniband/hw/qib/qib_fs.c | 1 + drivers/input/keyboard/tc3589x-keypad.c | 8 +- drivers/input/mouse/alps.c | 85 ++++++- drivers/input/mouse/alps.h | 1 + drivers/input/mouse/cypress_ps2.c | 19 +- drivers/input/tablet/wacom_wac.c | 4 + drivers/input/touchscreen/ads7846.c | 7 +- drivers/input/touchscreen/atmel_mxt_ts.c | 68 +++++- drivers/input/touchscreen/mms114.c | 34 ++- drivers/iommu/dmar.c | 1 + drivers/isdn/i4l/isdn_tty.c | 4 +- drivers/mailbox/pl320-ipc.c | 3 +- drivers/misc/ibmasm/ibmasmfs.c | 1 + drivers/mtd/mtdchar.c | 1 + drivers/net/bonding/bond_main.c | 5 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 17 +- drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h | 4 +- drivers/net/ethernet/broadcom/tg3.c | 14 +- drivers/net/ethernet/emulex/benet/be.h | 1 + drivers/net/ethernet/emulex/benet/be_cmds.c | 36 ++- drivers/net/ethernet/emulex/benet/be_hw.h | 4 +- drivers/net/ethernet/emulex/benet/be_main.c | 10 + drivers/net/ethernet/intel/e1000e/ethtool.c | 13 + drivers/net/ethernet/intel/e1000e/ich8lan.c | 71 +++++- drivers/net/ethernet/intel/e1000e/ich8lan.h | 2 + drivers/net/ethernet/intel/e1000e/netdev.c | 82 ++----- drivers/net/ethernet/intel/e1000e/regs.h | 1 + drivers/net/ethernet/intel/igb/e1000_82575.c | 11 +- drivers/net/ethernet/intel/igb/igb.h | 2 +- drivers/net/ethernet/intel/igb/igb_hwmon.c | 14 ++ drivers/net/ethernet/intel/igb/igb_main.c | 76 +----- drivers/net/ethernet/marvell/mv643xx_eth.c | 55 ++++- drivers/net/ethernet/mellanox/mlx4/cq.c | 2 +- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 86 +++---- drivers/net/ethernet/mellanox/mlx4/fw.c | 8 + drivers/net/ethernet/mellanox/mlx4/main.c | 2 +- drivers/net/ethernet/mellanox/mlx4/mlx4.h | 2 +- drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 - drivers/net/ethernet/mellanox/mlx4/mr.c | 10 +- drivers/net/ethernet/mellanox/mlx4/pd.c | 2 +- drivers/net/ethernet/mellanox/mlx4/port.c | 8 +- drivers/net/ethernet/mellanox/mlx4/qp.c | 8 +- .../net/ethernet/mellanox/mlx4/resource_tracker.c | 3 + drivers/net/ethernet/mellanox/mlx4/srq.c | 2 +- drivers/net/ethernet/sfc/efx.h | 4 +- drivers/net/ethernet/sfc/rx.c | 2 +- drivers/net/hippi/rrunner.c | 3 + drivers/net/macvlan.c | 1 + drivers/net/team/team.c | 2 + drivers/net/tun.c | 2 + drivers/net/vmxnet3/vmxnet3_drv.c | 1 + drivers/net/vmxnet3/vmxnet3_ethtool.c | 6 + drivers/net/vmxnet3/vmxnet3_int.h | 4 +- drivers/net/vxlan.c | 10 + drivers/net/wireless/iwlwifi/dvm/sta.c | 2 +- drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +- drivers/net/wireless/iwlwifi/iwl-drv.c | 3 +- drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 +- drivers/net/wireless/iwlwifi/iwl-trans.h | 20 +- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 18 +- drivers/net/wireless/iwlwifi/mvm/fw.c | 133 +---------- drivers/net/wireless/iwlwifi/mvm/mvm.h | 3 +- drivers/net/wireless/iwlwifi/mvm/ops.c | 18 +- drivers/net/wireless/iwlwifi/mvm/rx.c | 37 +-- drivers/net/wireless/iwlwifi/mvm/sta.c | 10 + drivers/net/wireless/iwlwifi/mvm/tx.c | 6 +- drivers/net/wireless/iwlwifi/pcie/internal.h | 34 ++- drivers/net/wireless/iwlwifi/pcie/rx.c | 14 +- drivers/net/wireless/iwlwifi/pcie/tx.c | 266 ++++++++++----------- drivers/oprofile/oprofilefs.c | 1 + drivers/pci/pci-acpi.c | 8 +- drivers/platform/x86/chromeos_laptop.c | 41 +++- drivers/pnp/pnpacpi/core.c | 8 +- drivers/regulator/core.c | 12 +- drivers/regulator/db8500-prcmu.c | 4 +- drivers/regulator/palmas-regulator.c | 3 +- drivers/regulator/twl-regulator.c | 9 +- drivers/scsi/scsi_lib.c | 7 +- drivers/staging/ccg/f_fs.c | 1 + drivers/usb/core/usb-acpi.c | 9 +- drivers/usb/gadget/f_fs.c | 1 + drivers/usb/gadget/inode.c | 1 + drivers/xen/xenfs/super.c | 1 + fs/9p/vfs_super.c | 1 + fs/adfs/super.c | 1 + fs/affs/super.c | 1 + fs/afs/super.c | 1 + fs/autofs4/init.c | 1 + fs/befs/linuxvfs.c | 1 + fs/bfs/inode.c | 1 + fs/binfmt_misc.c | 1 + fs/btrfs/delayed-inode.c | 151 +++++++----- fs/btrfs/delayed-inode.h | 2 + fs/btrfs/disk-io.c | 16 +- fs/btrfs/inode.c | 6 +- fs/btrfs/ioctl.c | 18 +- fs/btrfs/relocation.c | 74 ++++-- fs/btrfs/super.c | 1 + fs/btrfs/transaction.c | 65 +++-- fs/btrfs/tree-log.c | 5 +- fs/btrfs/volumes.c | 14 +- fs/ceph/super.c | 1 + fs/cifs/cifssmb.c | 2 +- fs/cifs/connect.c | 16 +- fs/cifs/inode.c | 11 +- fs/cifs/smb2ops.c | 1 + fs/coda/inode.c | 1 + fs/configfs/mount.c | 1 + fs/cramfs/inode.c | 1 + fs/debugfs/inode.c | 1 + fs/ecryptfs/Kconfig | 8 + fs/ecryptfs/Makefile | 7 +- fs/ecryptfs/crypto.c | 9 +- fs/ecryptfs/dentry.c | 2 - fs/ecryptfs/ecryptfs_kernel.h | 40 +++- fs/ecryptfs/file.c | 2 - fs/ecryptfs/inode.c | 8 +- fs/ecryptfs/keystore.c | 9 +- fs/ecryptfs/main.c | 1 + fs/ecryptfs/messaging.c | 5 +- fs/efs/super.c | 1 + fs/exofs/super.c | 1 + fs/ext2/super.c | 1 + fs/ext3/super.c | 1 + fs/ext4/super.c | 5 +- fs/f2fs/super.c | 1 + fs/fat/namei_msdos.c | 1 + fs/fat/namei_vfat.c | 1 + fs/filesystems.c | 2 +- fs/freevxfs/vxfs_super.c | 2 +- fs/fuse/control.c | 1 + fs/fuse/inode.c | 2 + fs/gfs2/ops_fstype.c | 4 +- fs/hfs/super.c | 1 + fs/hfsplus/super.c | 1 + fs/hostfs/hostfs_kern.c | 9 +- fs/hppfs/hppfs.c | 1 + fs/hugetlbfs/inode.c | 1 + fs/isofs/inode.c | 3 +- fs/jffs2/super.c | 1 + fs/jfs/super.c | 1 + fs/logfs/super.c | 1 + fs/minix/inode.c | 1 + fs/namei.c | 2 - fs/ncpfs/inode.c | 1 + fs/nfs/super.c | 3 +- fs/nfsd/nfsctl.c | 1 + fs/nilfs2/super.c | 1 + fs/ntfs/super.c | 1 + fs/ocfs2/dlmfs/dlmfs.c | 1 + fs/ocfs2/super.c | 1 + fs/omfs/inode.c | 1 + fs/openpromfs/inode.c | 1 + fs/proc/namespaces.c | 12 +- fs/qnx4/inode.c | 1 + fs/qnx6/inode.c | 1 + fs/reiserfs/super.c | 1 + fs/romfs/super.c | 1 + fs/sysv/super.c | 3 +- fs/ubifs/super.c | 1 + fs/ufs/super.c | 1 + fs/xfs/xfs_super.c | 1 + include/acpi/acpi_bus.h | 6 +- include/drm/drm_crtc.h | 6 +- include/linux/ecryptfs.h | 12 +- include/linux/fs.h | 2 + include/linux/i2c/atmel_mxt_ts.h | 5 + include/linux/regulator/driver.h | 2 + ipc/msg.c | 6 +- ipc/msgutil.c | 3 - kernel/smpboot.c | 2 +- kernel/trace/Kconfig | 24 +- kernel/trace/trace.c | 27 ++- lib/idr.c | 16 +- mm/ksm.c | 2 +- mm/memcontrol.c | 8 +- mm/mempolicy.c | 4 +- net/9p/trans_virtio.c | 2 +- net/bridge/br_device.c | 2 +- net/bridge/br_input.c | 2 +- net/bridge/br_mdb.c | 4 + net/bridge/br_multicast.c | 3 +- net/bridge/br_private.h | 4 +- net/core/dev.c | 5 +- net/core/rtnetlink.c | 1 + net/dcb/dcbnl.c | 8 + net/ieee802154/6lowpan.h | 2 +- net/ipv4/inet_connection_sock.c | 1 + net/ipv4/ip_options.c | 2 +- net/ipv6/ip6_input.c | 3 +- net/irda/ircomm/ircomm_tty.c | 29 ++- net/key/af_key.c | 8 +- net/mac80211/cfg.c | 21 +- net/mac80211/iface.c | 6 + net/mac80211/mlme.c | 28 ++- net/mac80211/tx.c | 3 +- net/netfilter/nf_conntrack_helper.c | 11 +- net/netfilter/nfnetlink.c | 7 +- net/netfilter/xt_AUDIT.c | 3 + net/netlabel/netlabel_unlabeled.c | 27 +-- net/rds/stats.c | 1 + net/sched/sch_qfq.c | 66 +++-- net/sunrpc/rpc_pipe.c | 4 +- net/wireless/core.c | 3 +- net/wireless/nl80211.c | 51 ++-- security/keys/process_keys.c | 2 +- sound/core/seq/oss/seq_oss_event.c | 14 +- sound/core/vmaster.c | 5 +- sound/pci/hda/hda_codec.c | 11 +- sound/pci/hda/patch_ca0132.c | 8 +- sound/pci/hda/patch_realtek.c | 2 + sound/pci/ice1712/ice1712.c | 2 + sound/soc/codecs/wm5102.c | 15 +- sound/soc/codecs/wm5110.c | 16 +- sound/soc/codecs/wm8350.c | 4 +- sound/soc/codecs/wm8960.c | 8 +- sound/soc/tegra/tegra20_i2s.h | 2 +- sound/soc/tegra/tegra30_i2s.h | 2 +- tools/testing/selftests/efivarfs/efivarfs.sh | 59 +++++ 334 files changed, 2677 insertions(+), 1602 deletions(-) Merging fixes/master (d287b87 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) $ git merge fixes/master Already up-to-date. Merging kbuild-current/rc-fixes (02f3e53 Merge branch 'yem-kconfig-rc-fixes' of git://gitorious.org/linux-kconfig/linux-kconfig into kbuild/rc-fixes) $ git merge kbuild-current/rc-fixes Already up-to-date. Merging arc-current/for-curr (180d406 ARC: ABIv3: fork/vfork wrappers not needed in "no-legacy-syscall" ABI) $ git merge arc-current/for-curr Auto-merging MAINTAINERS Merge made by the 'recursive' strategy. MAINTAINERS | 3 ++- arch/arc/include/asm/kgdb.h | 6 ++---- arch/arc/include/asm/syscalls.h | 2 -- arch/arc/include/uapi/asm/ptrace.h | 4 ++-- arch/arc/kernel/entry.S | 25 ------------------------- arch/arc/kernel/kgdb.c | 1 + arch/arc/kernel/setup.c | 4 +--- arch/arc/kernel/sys.c | 2 -- 8 files changed, 8 insertions(+), 39 deletions(-) Merging arm-current/fixes (455bd4c ARM: 7668/1: fix memset-related crashes caused by recent GCC (4.7.2) optimizations) $ git merge arm-current/fixes Already up-to-date. Merging m68k-current/for-linus (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA) $ git merge m68k-current/for-linus Already up-to-date. Merging powerpc-merge/merge (54c9b225 powerpc: Set DSCR bit in FSCR setup) $ git merge powerpc-merge/merge Already up-to-date. Merging sparc/master (76950e6 sparc64: correctly recognize SPARC64-X chips) $ git merge sparc/master Merge made by the 'recursive' strategy. arch/sparc/include/asm/spitfire.h | 1 + arch/sparc/kernel/cpu.c | 6 ++++++ arch/sparc/kernel/head_64.S | 25 ++++++++++++++++++++-- arch/sparc/kernel/leon_pci_grpci2.c | 41 +++++++++++++++++++++++-------------- drivers/tty/serial/sunsu.c | 21 ++++++++----------- 5 files changed, 65 insertions(+), 29 deletions(-) Merging net/master (7c6baa3 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) $ git merge net/master Already up-to-date. Merging ipsec/master (85dfb74 af_key: initialize satype in key_notify_policy_flush()) $ git merge ipsec/master Auto-merging net/key/af_key.c Merge made by the 'recursive' strategy. net/key/af_key.c | 1 + 1 file changed, 1 insertion(+) Merging sound-current/for-linus (66efdc7 ALSA: seq: Fix missing error handling in snd_seq_timer_open()) $ git merge sound-current/for-linus Merge made by the 'recursive' strategy. sound/core/seq/seq_timer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) Merging pci-current/for-linus (249bfb8 PCI/PM: Clean up PME state when removing a device) $ git merge pci-current/for-linus Already up-to-date. Merging wireless/master (de12198 Merge tag 'nfc-fixes-3.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-fixes) $ git merge wireless/master Merge made by the 'recursive' strategy. drivers/net/wireless/mwifiex/join.c | 7 ++-- drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 - net/nfc/llcp/llcp.c | 62 ++++++++++++++++++++++++----- net/nfc/llcp/sock.c | 2 + 4 files changed, 58 insertions(+), 15 deletions(-) Merging driver-core.current/driver-core-linus (f6161aa Linux 3.9-rc2) $ git merge driver-core.current/driver-core-linus Already up-to-date. Merging tty.current/tty-linus (34dcfb8 TTY: disable debugging warning) $ git merge tty.current/tty-linus Merge made by the 'recursive' strategy. drivers/tty/tty_buffer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging usb.current/usb-linus (2d90e63 qcaux: add Franklin U600) $ git merge usb.current/usb-linus Merge made by the 'recursive' strategy. drivers/usb/Makefile | 2 +- drivers/usb/c67x00/c67x00-sched.c | 4 +- drivers/usb/chipidea/udc.c | 6 +- drivers/usb/dwc3/core.c | 1 + drivers/usb/dwc3/dwc3-exynos.c | 2 - drivers/usb/dwc3/dwc3-omap.c | 8 +- drivers/usb/dwc3/dwc3-pci.c | 2 - drivers/usb/dwc3/ep0.c | 7 +- drivers/usb/dwc3/gadget.c | 3 - drivers/usb/gadget/Makefile | 12 +- drivers/usb/gadget/composite.c | 5 +- drivers/usb/gadget/f_uac1.c | 1 + drivers/usb/gadget/imx_udc.c | 20 +-- drivers/usb/gadget/omap_udc.c | 3 +- drivers/usb/gadget/pxa25x_udc.c | 24 ++- drivers/usb/gadget/pxa27x_udc.c | 18 +- drivers/usb/gadget/s3c2410_udc.c | 28 ++- drivers/usb/gadget/u_uac1.c | 3 + drivers/usb/host/ehci-hcd.c | 6 +- drivers/usb/host/ehci-q.c | 36 +++- drivers/usb/musb/Kconfig | 5 - drivers/usb/musb/musb_core.c | 6 - drivers/usb/musb/omap2430.c | 12 +- drivers/usb/otg/otg.c | 10 +- drivers/usb/phy/omap-control-usb.c | 24 +-- drivers/usb/phy/omap-usb3.c | 8 +- drivers/usb/phy/samsung-usbphy.c | 8 +- drivers/usb/serial/cp210x.c | 19 +++ drivers/usb/serial/option.c | 5 + drivers/usb/serial/qcaux.c | 1 + drivers/usb/storage/initializers.c | 76 +-------- drivers/usb/storage/initializers.h | 4 +- drivers/usb/storage/unusual_devs.h | 337 ++++++++++++++++++++++++++++++++++++- include/linux/usb/composite.h | 3 +- tools/usb/ffs-test.c | 2 +- 35 files changed, 500 insertions(+), 211 deletions(-) Merging staging.current/staging-linus (564c526 staging: comedi: dt9812: use CR_CHAN() for channel number) $ git merge staging.current/staging-linus Merge made by the 'recursive' strategy. drivers/iio/common/st_sensors/st_sensors_core.c | 9 ++-- drivers/iio/dac/ad5064.c | 64 +++++++++++++++---------- drivers/iio/imu/inv_mpu6050/Kconfig | 1 + drivers/staging/comedi/drivers/dt9812.c | 16 ++++--- drivers/staging/comedi/drivers/usbdux.c | 31 +++++++----- drivers/staging/comedi/drivers/usbduxfast.c | 30 +++++++----- drivers/staging/comedi/drivers/usbduxsigma.c | 27 +++++++---- drivers/staging/imx-drm/ipuv3-crtc.c | 23 ++++----- drivers/staging/vt6656/card.c | 2 +- drivers/staging/vt6656/main_usb.c | 4 -- include/linux/iio/common/st_sensors.h | 9 ++-- 11 files changed, 126 insertions(+), 90 deletions(-) Merging char-misc.current/char-misc-linus (f6161aa Linux 3.9-rc2) $ git merge char-misc.current/char-misc-linus Already up-to-date. Merging input-current/for-linus (4b7d293 Input: mms114 - Fix regulator enable and disable paths) $ git merge input-current/for-linus Already up-to-date. Merging md-current/for-linus (f3378b4 md: expedite metadata update when switching read-auto -> active) $ git merge md-current/for-linus Already up-to-date. Merging audit-current/for-linus (c158a35 audit: no leading space in audit_log_d_path prefix) $ git merge audit-current/for-linus Already up-to-date. Merging crypto-current/master (8fd61d3 crypto: user - ensure user supplied strings are nul-terminated) $ git merge crypto-current/master Already up-to-date. Merging ide/master (bf6b438 ide: gayle: use module_platform_driver_probe()) $ git merge ide/master Merge made by the 'recursive' strategy. drivers/ide/gayle.c | 15 +-------------- drivers/ide/tx4938ide.c | 13 +------------ drivers/ide/tx4939ide.c | 13 +------------ 3 files changed, 3 insertions(+), 38 deletions(-) Merging dwmw2/master (084a0ec x86: add CONFIG_X86_MOVBE option) $ git merge dwmw2/master Resolved 'arch/powerpc/Kconfig' using previous resolution. Resolved 'arch/x86/Kconfig' using previous resolution. Auto-merging arch/x86/Makefile Auto-merging arch/x86/Kconfig CONFLICT (content): Merge conflict in arch/x86/Kconfig Auto-merging arch/powerpc/Kconfig CONFLICT (content): Merge conflict in arch/powerpc/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master b677b0b] Merge remote-tracking branch 'dwmw2/master' $ git diff -M --stat --summary HEAD^.. arch/x86/Kconfig.cpu | 4 ++++ arch/x86/Makefile | 1 + 2 files changed, 5 insertions(+) Merging sh-current/sh-fixes-for-linus (4403310 SH: Convert out[bwl] macros to inline functions) $ git merge sh-current/sh-fixes-for-linus Already up-to-date. Merging irqdomain-current/irqdomain/merge (a0d271c Linux 3.6) $ git merge irqdomain-current/irqdomain/merge Already up-to-date. Merging devicetree-current/devicetree/merge (ab28698 of: define struct device in of_platform.h if !OF_DEVICE and !OF_ADDRESS) $ git merge devicetree-current/devicetree/merge Already up-to-date. Merging spi-current/spi/merge (d3601e5 spi/sh-hspi: fix return value check in hspi_probe().) $ git merge spi-current/spi/merge Already up-to-date. Merging gpio-current/gpio/merge (e97f9b5 gpio/gpio-ich: fix ichx_gpio_check_available() return what callers expect) $ git merge gpio-current/gpio/merge Already up-to-date. Merging rr-fixes/fixes (f7f154f hw_random: make buffer usable in scatterlist.) $ git merge rr-fixes/fixes Already up-to-date. Merging asm-generic/master (fb9de7e xtensa: Use generic asm/mmu.h for nommu) $ git merge asm-generic/master Already up-to-date. Merging arc/for-next (fcf0c3d ARC: Remove duplicate inclusion of header files) $ git merge arc/for-next Merge made by the 'recursive' strategy. arch/arc/include/asm/elf.h | 3 --- arch/arc/kernel/asm-offsets.c | 2 +- arch/arc/kernel/clk.c | 2 +- arch/arc/kernel/disasm.c | 2 +- arch/arc/kernel/irq.c | 2 +- arch/arc/kernel/kprobes.c | 1 - arch/arc/kernel/module.c | 4 ++-- arch/arc/kernel/setup.c | 3 +-- arch/arc/kernel/time.c | 1 - arch/arc/kernel/traps.c | 6 +++--- arch/arc/mm/extable.c | 4 ++-- arch/arc/mm/fault.c | 1 - arch/arc/mm/ioremap.c | 2 +- arch/arc/mm/tlb.c | 2 +- 14 files changed, 14 insertions(+), 21 deletions(-) Merging arm/for-next (41a3485 Merge branch 'fixes' into for-next) $ git merge arm/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging arm-perf/for-next/perf (5ef1240 Merge branches 'for-rmk/hw-breakpoint' and 'for-rmk/perf' into for-next/perf) $ git merge arm-perf/for-next/perf Already up-to-date! Merge made by the 'recursive' strategy. Merging davinci/davinci-next (fe0d422 Linux 3.0-rc6) $ git merge davinci/davinci-next Already up-to-date. Merging xilinx/arm-next (42ead3a arm: zynq: timer: Set clock_event cpumask) $ git merge xilinx/arm-next Resolved 'arch/arm/mach-zynq/common.c' using previous resolution. Auto-merging arch/arm/mach-zynq/common.c CONFLICT (content): Merge conflict in arch/arm/mach-zynq/common.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 07a63d0] Merge remote-tracking branch 'xilinx/arm-next' $ git diff -M --stat --summary HEAD^.. Merging arm64/upstream (ec45d1c arm64: mm: update CONTEXTIDR register to contain PID of current process) $ git merge arm64/upstream Already up-to-date. Merging blackfin/for-linus (f656c24 blackfin: time-ts: Remove duplicate assignment) $ git merge blackfin/for-linus Already up-to-date. Merging c6x/for-linux-next (93bbd0c c6x: use generic kvm_para.h) $ git merge c6x/for-linux-next Already up-to-date. Merging cris/for-next (77c8006 UAPI: Fix up empty files in arch/cris/) $ git merge cris/for-next Already up-to-date. Merging hexagon/linux-next (e1858b2 Hexagon: Copyright marking changes) $ git merge hexagon/linux-next Already up-to-date. Merging ia64/next (c9500a7 Merge branch 'pstore' into next) $ git merge ia64/next Already up-to-date! Merge made by the 'recursive' strategy. Merging m68k/for-next (5618395 m68k: Sort out !CONFIG_MMU_SUN3 vs. CONFIG_HAS_DMA) $ git merge m68k/for-next Already up-to-date. Merging m68knommu/for-next (7538a2c m68k: drop "select EMAC_INC") $ git merge m68knommu/for-next Merge made by the 'recursive' strategy. arch/m68k/Kconfig.machine | 1 - arch/m68k/include/asm/MC68328.h | 10 +++++----- arch/m68k/kernel/setup_no.c | 3 +++ arch/m68k/mm/init.c | 2 +- arch/m68k/platform/coldfire/m528x.c | 2 +- 5 files changed, 10 insertions(+), 8 deletions(-) Merging metag/for-next (40f09f3 metag: Inhibit NUMA balancing.) $ git merge metag/for-next Already up-to-date. Merging microblaze/next (a7c1120 Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4) $ git merge microblaze/next Already up-to-date. Merging mips/mips-for-linux-next (63981a4 MIPS: compat: Return same error ENOSYS as native for invalid operation.) $ git merge mips/mips-for-linux-next Merge made by the 'recursive' strategy. arch/mips/kernel/linux32.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging openrisc/for-upstream (545ebd0 openrisc: require gpiolib) $ git merge openrisc/for-upstream Merge made by the 'recursive' strategy. arch/openrisc/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging parisc/for-next (6c700d7 [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) $ git merge parisc/for-next Already up-to-date. Merging powerpc/next (9e2d59a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal) $ git merge powerpc/next Already up-to-date. Merging 4xx/next (2074b1d powerpc: Fix irq distribution) $ git merge 4xx/next Already up-to-date. Merging mpc5xxx/next (6dbe51c Linux 3.9-rc1) $ git merge mpc5xxx/next Already up-to-date. Merging galak/next (12c7e8f powerpc/85xx: l2sram - Add compatible string for BSC9131 platform) $ git merge galak/next Already up-to-date. Merging s390/features (043f620 s390/monreader: Remove redundant NULL check before kfree) $ git merge s390/features Merge made by the 'recursive' strategy. Documentation/s390/s390dbf.txt | 3 +- arch/s390/include/asm/eadm.h | 6 +++- arch/s390/include/asm/processor.h | 3 +- arch/s390/include/asm/tlbflush.h | 2 -- arch/s390/kernel/dis.c | 9 ++--- arch/s390/kernel/entry.S | 3 +- arch/s390/kernel/entry64.S | 5 +-- arch/s390/kernel/setup.c | 2 ++ arch/s390/kvm/trace.h | 2 +- arch/s390/mm/init.c | 10 +++++- arch/s390/pci/pci.c | 3 +- drivers/i2c/Kconfig | 2 +- drivers/i2c/busses/Kconfig | 6 ++-- drivers/s390/block/scm_blk.c | 69 +++++++++++++++++++++++++++++++++++---- drivers/s390/block/scm_blk.h | 2 ++ drivers/s390/block/scm_drv.c | 23 +++++++++---- drivers/s390/char/monreader.c | 3 +- drivers/s390/char/sclp_cmd.c | 2 ++ drivers/s390/cio/chsc.c | 17 ++++++++++ drivers/s390/cio/chsc.h | 2 ++ drivers/s390/cio/scm.c | 18 +++++++++- 21 files changed, 157 insertions(+), 35 deletions(-) Merging sh/sh-latest (37284bd Merge branches 'sh/hw-breakpoints' and 'sh/serial-of' into sh-latest) $ git merge sh/sh-latest Merge made by the 'recursive' strategy. .../bindings/tty/serial/renesas,sci-serial.txt | 53 +++++++ arch/sh/include/asm/hw_breakpoint.h | 12 +- arch/sh/include/cpu-common/cpu/ubc.h | 17 +++ arch/sh/include/cpu-sh2a/cpu/ubc.h | 14 ++ arch/sh/kernel/cpu/sh2a/Makefile | 3 +- arch/sh/kernel/cpu/sh2a/ubc.c | 154 +++++++++++++++++++++ arch/sh/kernel/hw_breakpoint.c | 8 ++ drivers/tty/serial/sh-sci.c | 127 ++++++++++++++++- include/linux/serial_sci.h | 4 + 9 files changed, 376 insertions(+), 16 deletions(-) create mode 100644 Documentation/devicetree/bindings/tty/serial/renesas,sci-serial.txt create mode 100644 arch/sh/include/cpu-common/cpu/ubc.h create mode 100644 arch/sh/include/cpu-sh2a/cpu/ubc.h create mode 100644 arch/sh/kernel/cpu/sh2a/ubc.c Merging sparc-next/master (c4271c6 NFS: Kill fscache warnings when mounting without -ofsc) $ git merge sparc-next/master Already up-to-date. Merging tile/master (ecc46c5 tile: support atomic64_dec_if_positive()) $ git merge tile/master Auto-merging arch/tile/kernel/intvec_64.S Auto-merging arch/tile/include/asm/syscalls.h Auto-merging arch/tile/Kconfig Merge made by the 'recursive' strategy. arch/tile/Kconfig | 3 +++ arch/tile/include/asm/atomic.h | 21 ++++++++++++++++++++ arch/tile/include/asm/ptrace.h | 3 ++- arch/tile/include/asm/syscall.h | 6 ++++++ arch/tile/include/asm/syscalls.h | 6 ------ arch/tile/include/asm/thread_info.h | 8 ++++++++ arch/tile/include/uapi/asm/unistd.h | 2 ++ arch/tile/kernel/intvec_32.S | 10 ++++++++-- arch/tile/kernel/intvec_64.S | 24 +++++++++++++++++------ arch/tile/kernel/ptrace.c | 39 +++++++++++++++++++------------------ 10 files changed, 88 insertions(+), 34 deletions(-) Merging unicore32/unicore32 (c284464 arch/unicore32: remove CONFIG_EXPERIMENTAL) $ git merge unicore32/unicore32 Already up-to-date. Merging xtensa/for_next (9cf81c7 xtensa: add accept4 syscall) $ git merge xtensa/for_next Already up-to-date. Merging btrfs/next (6aec51f Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-linus-3.9) $ git merge btrfs/next Already up-to-date! Merge made by the 'recursive' strategy. Merging ceph/master (d6c0dd6 libceph: fix decoding of pgids) $ git merge ceph/master Merge made by the 'recursive' strategy. net/ceph/osdmap.c | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) Merging cifs/for-next (7c6baa3 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) $ git merge cifs/for-next Already up-to-date. Merging configfs/linux-next (b930c26 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) $ git merge configfs/linux-next Already up-to-date. Merging ecryptfs/next (f6161aa Linux 3.9-rc2) $ git merge ecryptfs/next Already up-to-date. Merging ext3/for_next (af591ad reiserfs: Use kstrdup instead of kmalloc/strcpy) $ git merge ext3/for_next Merge made by the 'recursive' strategy. fs/ext3/super.c | 4 ++-- fs/quota/dquot.c | 5 ++++- fs/reiserfs/super.c | 4 +--- 3 files changed, 7 insertions(+), 6 deletions(-) Merging ext4/dev (256956a jbd2: fix use after free in jbd2_journal_dirty_metadata()) $ git merge ext4/dev Auto-merging fs/ext4/move_extent.c Auto-merging fs/ext4/inode.c Auto-merging fs/ext4/extents.c Merge made by the 'recursive' strategy. fs/ext4/ext4.h | 1 + fs/ext4/extents.c | 103 ++++++++++++++++++----- fs/ext4/extents_status.c | 212 +++++++++++++++++++++++++++++++++++++++++++++-- fs/ext4/extents_status.h | 9 ++ fs/ext4/inode.c | 202 +++++++++++++++++++++++++++++++++++++++++--- fs/ext4/mballoc.c | 11 +-- fs/ext4/move_extent.c | 8 ++ fs/jbd2/transaction.c | 15 ++-- 8 files changed, 510 insertions(+), 51 deletions(-) Merging f2fs/dev (330900b f2fs: avoid extra ++ while returning from get_node_path) $ git merge f2fs/dev Auto-merging fs/f2fs/super.c Merge made by the 'recursive' strategy. fs/f2fs/data.c | 12 ++++++------ fs/f2fs/dir.c | 3 +++ fs/f2fs/f2fs.h | 12 ++++++++---- fs/f2fs/file.c | 8 ++++---- fs/f2fs/namei.c | 2 +- fs/f2fs/node.c | 44 +++++++++++++++++++++----------------------- fs/f2fs/recovery.c | 2 +- fs/f2fs/segment.h | 3 +-- fs/f2fs/super.c | 2 +- include/linux/f2fs_fs.h | 17 +++++++++-------- 10 files changed, 55 insertions(+), 50 deletions(-) Merging fuse/for-next (634734b fuse: allow control of adaptive readdirplus use) $ git merge fuse/for-next Already up-to-date. Merging gfs2/master (4d16e2c GFS2: return error if malloc failed in gfs2_rs_alloc()) $ git merge gfs2/master Merge made by the 'recursive' strategy. fs/gfs2/glock.c | 13 ---- fs/gfs2/glock.h | 1 - fs/gfs2/incore.h | 1 + fs/gfs2/inode.c | 188 ++++++++++++++++++----------------------------------- fs/gfs2/lock_dlm.c | 39 +++++------ fs/gfs2/rgrp.c | 10 +-- 6 files changed, 87 insertions(+), 165 deletions(-) Merging jfs/jfs-next (9d48017 jfs: avoid undefined behavior from left-shifting by 32 bits) $ git merge jfs/jfs-next Merge made by the 'recursive' strategy. fs/jfs/jfs_imap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging logfs/master (3394661 Fix the call to BUG() caused by no free segment found) $ git merge logfs/master Auto-merging fs/logfs/super.c Merge made by the 'recursive' strategy. fs/logfs/dev_mtd.c | 2 +- fs/logfs/super.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) Merging nfs/linux-next (90eabc5 NFSv4: Fix the string length returned by the idmapper) $ git merge nfs/linux-next Merge made by the 'recursive' strategy. fs/nfs/idmap.c | 13 ++++++++----- net/sunrpc/clnt.c | 24 ++++++++++++++---------- net/sunrpc/xprtsock.c | 8 ++++---- 3 files changed, 26 insertions(+), 19 deletions(-) Merging nfsd/nfsd-next (6dbe51c Linux 3.9-rc1) $ git merge nfsd/nfsd-next Already up-to-date. Merging ocfs2/linux-next (4538df6 ocfs2: Don't spam on -EDQUOT.) $ git merge ocfs2/linux-next Auto-merging fs/ocfs2/dlm/dlmrecovery.c Auto-merging fs/ocfs2/dlm/dlmmaster.c Auto-merging fs/ocfs2/cluster/heartbeat.c Merge made by the 'recursive' strategy. fs/ocfs2/cluster/heartbeat.c | 40 +++++++++------------------------------- fs/ocfs2/cluster/masklog.h | 3 ++- fs/ocfs2/dlm/dlmmaster.c | 8 +++++++- fs/ocfs2/dlm/dlmrecovery.c | 7 +++++++ 4 files changed, 25 insertions(+), 33 deletions(-) Merging omfs/for-next (976d167 Linux 3.1-rc9) $ git merge omfs/for-next Already up-to-date. Merging squashfs/master (4b0180a Squashfs: add mount time sanity check for block_size and block_log match) $ git merge squashfs/master Already up-to-date. Merging v9fs/for-next (b6f4bee fs/9p: Fix atomic_open) $ git merge v9fs/for-next Already up-to-date. Merging ubifs/linux-next (8afd500 UBIFS: fix double free of ubifs_orphan objects) $ git merge ubifs/linux-next Already up-to-date. Merging xfs/for-next (9e5987a xfs: rearrange some code in xfs_bmap for better locality) $ git merge xfs/for-next Merge made by the 'recursive' strategy. fs/xfs/xfs_alloc.c | 2 +- fs/xfs/xfs_bmap.c | 10659 +++++++++++++++++++++++++------------------------- fs/xfs/xfs_buf.c | 4 +- fs/xfs/xfs_error.c | 2 +- fs/xfs/xfs_ialloc.c | 2 +- fs/xfs/xfs_iomap.c | 6 +- fs/xfs/xfs_log.c | 2 +- 7 files changed, 5271 insertions(+), 5406 deletions(-) Merging vfs/for-next (dcf787f constify path_get/path_put and fs_struct.c stuff) $ git merge vfs/for-next Already up-to-date. Merging pci/next (f6161aa Linux 3.9-rc2) $ git merge pci/next Already up-to-date. Merging hid/for-next (e618f2e Merge branch 'for-3.10/hid-driver-transport-cleanups' into for-next) $ git merge hid/for-next Merge made by the 'recursive' strategy. drivers/hid/Kconfig | 100 ++++++++++++++++++------------------ drivers/hid/hid-apple.c | 1 - drivers/hid/hid-axff.c | 6 +-- drivers/hid/hid-core.c | 27 ++++++++-- drivers/hid/hid-dr.c | 8 ++- drivers/hid/hid-emsff.c | 6 +-- drivers/hid/hid-gaff.c | 10 ++-- drivers/hid/hid-holtekff.c | 4 +- drivers/hid/hid-kye.c | 4 +- drivers/hid/hid-lenovo-tpkbd.c | 4 +- drivers/hid/hid-lg2ff.c | 6 +-- drivers/hid/hid-lg3ff.c | 6 +-- drivers/hid/hid-lg4ff.c | 18 +++---- drivers/hid/hid-lgff.c | 8 ++- drivers/hid/hid-logitech-dj.c | 53 ++----------------- drivers/hid/hid-logitech-dj.h | 1 - drivers/hid/hid-magicmouse.c | 1 - drivers/hid/hid-multitouch.c | 55 +++++++------------- drivers/hid/hid-ntrig.c | 10 ++-- drivers/hid/hid-picolcd.h | 4 +- drivers/hid/hid-picolcd_backlight.c | 4 +- drivers/hid/hid-picolcd_cir.c | 2 - drivers/hid/hid-picolcd_core.c | 8 ++- drivers/hid/hid-picolcd_debugfs.c | 2 - drivers/hid/hid-picolcd_fb.c | 12 ++--- drivers/hid/hid-picolcd_lcd.c | 4 +- drivers/hid/hid-picolcd_leds.c | 4 +- drivers/hid/hid-pl.c | 6 +-- drivers/hid/hid-prodikeys.c | 3 +- drivers/hid/hid-sensor-hub.c | 12 ++--- drivers/hid/hid-sjoy.c | 6 +-- drivers/hid/hid-speedlink.c | 2 - drivers/hid/hid-steelseries.c | 3 +- drivers/hid/hid-thingm.c | 1 - drivers/hid/hid-tmff.c | 6 +-- drivers/hid/hid-zpff.c | 6 +-- drivers/hid/i2c-hid/i2c-hid.c | 32 ++++++++++++ drivers/hid/usbhid/hid-core.c | 35 +++++++++++-- drivers/hid/usbhid/hid-pidff.c | 80 ++++++++++++++--------------- drivers/hid/usbhid/hiddev.c | 8 +-- drivers/hid/usbhid/usbhid.h | 3 -- include/linux/hid.h | 99 ++++++++++++++++++++++++++++++++++- 42 files changed, 365 insertions(+), 305 deletions(-) Merging i2c/i2c/for-next (21ea3f4 i2c: core: Pick i2c bus number from dt alias if present) $ git merge i2c/i2c/for-next Merge made by the 'recursive' strategy. drivers/i2c/i2c-core.c | 45 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 34 insertions(+), 11 deletions(-) Merging jdelvare-hwmon/master (2a7d2b9 Merge branch 'akpm' (final batch from Andrew)) $ git merge jdelvare-hwmon/master Already up-to-date. Merging hwmon-staging/hwmon-next (2bed34b hwmon: (mc13783-adc.c) use module_platform_driver_probe()) $ git merge hwmon-staging/hwmon-next Merge made by the 'recursive' strategy. drivers/hwmon/mc13783-adc.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) Merging v4l-dvb/master (eccaaad Merge /home/v4l/v4l/patchwork) $ git merge v4l-dvb/master Already up-to-date! Merge made by the 'recursive' strategy. Merging kbuild/for-next (4382a99 Merge branch 'kbuild/kbuild' into kbuild/for-next) $ git merge kbuild/for-next Merge made by the 'recursive' strategy. scripts/Makefile.headersinst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) Merging kconfig/for-next (4eae518 localmodconfig: Fix localyesconfig to set to 'y' not 'm') $ git merge kconfig/for-next Already up-to-date. Merging libata/NEXT (b186aff pata_samsung_cf: use module_platform_driver_probe()) $ git merge libata/NEXT Auto-merging drivers/ata/libata-acpi.c Merge made by the 'recursive' strategy. drivers/ata/Kconfig | 13 +++++++------ drivers/ata/ahci.c | 2 ++ drivers/ata/ata_piix.c | 4 ++++ drivers/ata/libata-acpi.c | 2 +- drivers/ata/pata_samsung_cf.c | 13 +------------ drivers/ata/sata_fsl.c | 3 +-- 6 files changed, 16 insertions(+), 21 deletions(-) Merging infiniband/for-next (ef4e359 Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'misc', 'mlx4', 'qib' and 'srp' into for-next) $ git merge infiniband/for-next Already up-to-date. Merging pstore/master (ebacfd1 pstore/ftrace: Adjust for ftrace_ops->func prototype change) $ git merge pstore/master Already up-to-date. Merging pm/linux-next (6bd5165 Merge branch 'pm-fixes' into fixes) $ git merge pm/linux-next Already up-to-date. Merging idle/next (ca62cf5 Merge branch 'misc' into release) $ git merge idle/next Already up-to-date. Merging apm/for-next (fb9d78a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm) $ git merge apm/for-next Already up-to-date. Merging cpuidle/cpuidle-next (d1c3ed6 Linux 3.8-rc2) $ git merge cpuidle/cpuidle-next Already up-to-date. Merging cpupowerutils/master (f166033 cpupower tools: add install target to the debug tools' makefiles) $ git merge cpupowerutils/master Already up-to-date. Merging thermal/next (043e465 thermal: exynos_thermal: return a proper error code while thermal_zone_device_register fail.) $ git merge thermal/next Merge made by the 'recursive' strategy. drivers/thermal/dove_thermal.c | 16 ++++++---------- drivers/thermal/exynos_thermal.c | 2 +- drivers/thermal/kirkwood_thermal.c | 8 +++----- drivers/thermal/rcar_thermal.c | 29 ++++++++++++++--------------- 4 files changed, 24 insertions(+), 31 deletions(-) Merging ieee1394/for-next (db2cad2 firewire: net: remove unused variable in fwnet_receive_broadcast()) $ git merge ieee1394/for-next Already up-to-date. Merging ubi/linux-next (19f949f Linux 3.8) $ git merge ubi/linux-next Already up-to-date. Merging dlm/next (f117228 dlm: avoid scanning unchanged toss lists) $ git merge dlm/next Already up-to-date. Merging swiotlb/linux-next (af51a9f swiotlb: Do not export swiotlb_bounce since there are no external consumers) $ git merge swiotlb/linux-next Already up-to-date. Merging scsi/for-next (6dbe51c Linux 3.9-rc1) $ git merge scsi/for-next Already up-to-date. Merging target-updates/for-next (2dbe10a target/pscsi: Rename sg_num to nr_vecs in pscsi_get_bio()) $ git merge target-updates/for-next Already up-to-date. Merging target-merge/for-next-merge (d1c3ed6 Linux 3.8-rc2) $ git merge target-merge/for-next-merge Already up-to-date. Merging ibft/linux-next (935a9fe ibft: Fix finding IBFT ACPI table on UEFI) $ git merge ibft/linux-next Already up-to-date. Merging isci/all (6734092 isci: add a couple __iomem annotations) $ git merge isci/all Already up-to-date. Merging slave-dma/next (ca85cb8 Merge branch 'for-linus' into next) $ git merge slave-dma/next Merge made by the 'recursive' strategy. drivers/dma/at_hdmac.c | 4 ++-- drivers/dma/coh901318.c | 4 ++-- drivers/dma/dw_dmac.c | 23 +++++++++++++++++++---- drivers/dma/dw_dmac_regs.h | 1 + drivers/dma/imx-dma.c | 4 ++-- drivers/dma/imx-sdma.c | 4 ++-- drivers/dma/ioat/dma.h | 2 +- drivers/dma/ioat/dma_v3.c | 15 +++++---------- drivers/dma/ipu/ipu_idmac.c | 4 ++-- drivers/dma/pch_dma.c | 2 +- drivers/dma/pl330.c | 3 +-- drivers/dma/timb_dma.c | 2 +- drivers/dma/txx9dmac.c | 8 ++++---- 13 files changed, 43 insertions(+), 33 deletions(-) Merging dmaengine/next (7f34986 dma: ipu: Drop unused spinlock) $ git merge dmaengine/next Resolved 'drivers/dma/ioat/dma_v3.c' using previous resolution. Auto-merging drivers/dma/ioat/dma_v3.c CONFLICT (content): Merge conflict in drivers/dma/ioat/dma_v3.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 0204353] Merge remote-tracking branch 'dmaengine/next' $ git diff -M --stat --summary HEAD^.. Merging net-next/master (f4f3efd net: can: af_can.c: Fix checkpatch warnings) $ git merge net-next/master Recorded preimage for 'drivers/net/ethernet/intel/e1000e/netdev.c' Auto-merging net/core/rtnetlink.c Auto-merging net/core/dev.c Auto-merging net/bridge/br_multicast.c Auto-merging drivers/net/vxlan.c Auto-merging drivers/net/team/team.c Auto-merging drivers/net/ethernet/mellanox/mlx4/en_netdev.c Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/e1000e/netdev.c Auto-merging drivers/net/ethernet/intel/e1000e/ich8lan.c Auto-merging drivers/net/ethernet/intel/e1000e/ethtool.c Auto-merging drivers/net/ethernet/emulex/benet/be_main.c Auto-merging drivers/net/ethernet/emulex/benet/be_hw.h Auto-merging drivers/net/ethernet/emulex/benet/be_cmds.c Auto-merging drivers/net/ethernet/emulex/benet/be.h Auto-merging drivers/net/ethernet/broadcom/tg3.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/net/ethernet/intel/e1000e/netdev.c'. [master 2d77dcc] Merge remote-tracking branch 'net-next/master' $ git diff -M --stat --summary HEAD^.. drivers/net/caif/caif_shmcore.c | 5 +- drivers/net/ethernet/adi/bfin_mac.c | 6 +- drivers/net/ethernet/amd/7990.c | 2 - drivers/net/ethernet/amd/a2065.c | 1 - drivers/net/ethernet/amd/am79c961a.c | 1 - drivers/net/ethernet/amd/ariadne.c | 1 - drivers/net/ethernet/amd/atarilance.c | 2 - drivers/net/ethernet/amd/au1000_eth.c | 1 - drivers/net/ethernet/amd/declance.c | 2 - drivers/net/ethernet/amd/pcnet32.c | 1 - drivers/net/ethernet/amd/sun3lance.c | 3 - drivers/net/ethernet/amd/sunlance.c | 4 - drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 6 +- drivers/net/ethernet/atheros/atlx/atl2.c | 3 - drivers/net/ethernet/broadcom/bcm63xx_enet.c | 63 +--- drivers/net/ethernet/broadcom/bgmac.c | 84 ++++- drivers/net/ethernet/broadcom/bgmac.h | 1 + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 - drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 4 +- drivers/net/ethernet/broadcom/sb1250-mac.c | 5 +- drivers/net/ethernet/broadcom/tg3.c | 378 +++++++++++++++------ drivers/net/ethernet/broadcom/tg3.h | 18 +- drivers/net/ethernet/brocade/bna/bfa_ioc.c | 2 +- drivers/net/ethernet/cadence/at91_ether.c | 14 +- drivers/net/ethernet/cadence/macb.c | 13 +- drivers/net/ethernet/cirrus/cs89x0.c | 20 +- drivers/net/ethernet/dlink/dl2k.c | 7 +- drivers/net/ethernet/emulex/benet/be.h | 2 +- drivers/net/ethernet/emulex/benet/be_cmds.c | 2 +- drivers/net/ethernet/emulex/benet/be_cmds.h | 2 +- drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 +- drivers/net/ethernet/emulex/benet/be_hw.h | 2 +- drivers/net/ethernet/emulex/benet/be_main.c | 2 +- drivers/net/ethernet/emulex/benet/be_roce.c | 2 +- drivers/net/ethernet/emulex/benet/be_roce.h | 2 +- drivers/net/ethernet/freescale/fec.c | 2 - .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 17 +- drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 2 - drivers/net/ethernet/i825xx/82596.c | 8 +- drivers/net/ethernet/i825xx/lib82596.c | 6 +- drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 +- drivers/net/ethernet/intel/e1000e/80003es2lan.c | 131 ++++--- drivers/net/ethernet/intel/e1000e/82571.c | 38 +-- drivers/net/ethernet/intel/e1000e/82571.h | 2 + drivers/net/ethernet/intel/e1000e/defines.h | 25 +- drivers/net/ethernet/intel/e1000e/e1000.h | 18 +- drivers/net/ethernet/intel/e1000e/ethtool.c | 177 +++++----- drivers/net/ethernet/intel/e1000e/hw.h | 4 +- drivers/net/ethernet/intel/e1000e/ich8lan.c | 195 ++++++----- drivers/net/ethernet/intel/e1000e/mac.c | 10 +- drivers/net/ethernet/intel/e1000e/netdev.c | 266 +++++++-------- drivers/net/ethernet/intel/e1000e/nvm.c | 2 +- drivers/net/ethernet/intel/e1000e/param.c | 62 ++-- drivers/net/ethernet/intel/e1000e/phy.c | 130 +++---- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 42 +-- drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 2 +- drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 80 ++--- drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 76 ----- drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 5 +- drivers/net/ethernet/natsemi/sonic.c | 1 - drivers/net/ethernet/netx-eth.c | 2 - drivers/net/ethernet/nuvoton/w90p910_ether.c | 1 - drivers/net/ethernet/nvidia/forcedeth.c | 1 - drivers/net/ethernet/qlogic/qla3xxx.c | 1 - drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 4 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c | 151 ++++++-- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h | 18 +- .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 33 +- .../net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 14 +- drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 21 +- drivers/net/ethernet/qlogic/qlge/qlge_main.c | 6 - drivers/net/ethernet/rdc/r6040.c | 12 +- drivers/net/ethernet/realtek/8139too.c | 2 - drivers/net/ethernet/realtek/atp.c | 2 - drivers/net/ethernet/seeq/ether3.c | 22 +- drivers/net/ethernet/seeq/sgiseeq.c | 2 - drivers/net/ethernet/sis/sis900.c | 7 +- drivers/net/ethernet/smsc/smc9194.c | 2 - drivers/net/ethernet/smsc/smc91x.c | 2 - drivers/net/ethernet/smsc/smsc9420.c | 4 +- drivers/net/ethernet/sun/sunqe.c | 5 +- drivers/net/ethernet/tehuti/tehuti.c | 5 +- drivers/net/ethernet/ti/tlan.c | 4 +- drivers/net/ethernet/xilinx/ll_temac_main.c | 10 +- drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 9 +- drivers/net/ethernet/xircom/xirc2ps_cs.c | 1 - drivers/net/phy/lxt.c | 2 +- drivers/net/phy/vitesse.c | 3 +- drivers/net/team/Kconfig | 12 + drivers/net/team/Makefile | 1 + drivers/net/team/team.c | 25 +- drivers/net/team/team_mode_broadcast.c | 14 +- drivers/net/team/team_mode_random.c | 71 ++++ drivers/net/team/team_mode_roundrobin.c | 36 +- drivers/net/vxlan.c | 35 +- include/linux/if_team.h | 25 +- include/linux/netdev_features.h | 7 +- include/linux/netdevice.h | 18 + include/linux/rtnetlink.h | 9 + include/linux/skbuff.h | 36 ++ include/linux/tcp.h | 4 - include/linux/vm_sockets.h | 23 ++ include/net/ip6_tunnel.h | 20 ++ include/net/ipip.h | 3 - include/net/ipv6.h | 20 +- include/net/tcp.h | 45 +-- include/uapi/linux/pkt_sched.h | 1 + include/uapi/linux/vm_sockets.h | 23 +- net/bridge/br_multicast.c | 2 +- net/caif/caif_dev.c | 9 +- net/caif/caif_socket.c | 22 +- net/caif/caif_usb.c | 4 +- net/caif/cfcnfg.c | 19 +- net/caif/cfctrl.c | 14 +- net/caif/cffrml.c | 4 +- net/caif/cfmuxl.c | 4 +- net/caif/cfpkt_skbuff.c | 8 +- net/caif/cfrfml.c | 4 +- net/caif/cfserl.c | 4 +- net/caif/cfsrvl.c | 13 +- net/caif/chnl_net.c | 6 +- net/can/af_can.c | 21 +- net/core/dev.c | 70 ++-- net/core/ethtool.c | 1 + net/core/rtnetlink.c | 81 ++++- net/core/skbuff.c | 49 +-- net/dcb/dcbevent.c | 1 + net/ipv4/af_inet.c | 9 +- net/ipv4/devinet.c | 70 +++- net/ipv4/ip_gre.c | 16 +- net/ipv4/ipip.c | 14 +- net/ipv4/tcp.c | 1 + net/ipv4/tcp_ipv4.c | 44 +++ net/ipv4/udp.c | 115 +++++-- net/ipv6/addrconf.c | 70 +++- net/ipv6/addrlabel.c | 6 - net/ipv6/af_inet6.c | 6 +- net/ipv6/datagram.c | 20 +- net/ipv6/icmp.c | 2 +- net/ipv6/inet6_connection_sock.c | 10 +- net/ipv6/ip6_flowlabel.c | 11 +- net/ipv6/ip6_gre.c | 17 +- net/ipv6/ip6_offload.c | 4 +- net/ipv6/ip6_tunnel.c | 15 +- net/ipv6/ndisc.c | 2 - net/ipv6/raw.c | 9 +- net/ipv6/sit.c | 2 + net/ipv6/udp.c | 13 +- net/ipv6/udp_offload.c | 8 +- net/sched/sch_htb.c | 31 +- 150 files changed, 2066 insertions(+), 1513 deletions(-) create mode 100644 drivers/net/team/team_mode_random.c create mode 100644 include/linux/vm_sockets.h Merging ipsec-next/master (05600a7 xfrm_user: constify netlink dispatch table) $ git merge ipsec-next/master Merge made by the 'recursive' strategy. include/net/xfrm.h | 1 + include/uapi/linux/xfrm.h | 3 +++ net/ipv4/ipcomp.c | 1 + net/ipv4/xfrm4_mode_tunnel.c | 8 ++++++-- net/ipv6/xfrm6_mode_tunnel.c | 7 +++++-- net/xfrm/xfrm_state.c | 1 + net/xfrm/xfrm_user.c | 17 +++++++++++++++-- 7 files changed, 32 insertions(+), 6 deletions(-) Merging wireless-next/master (c3f251a mwl8k: don't overwrite regulatory settings on fw reload) $ git merge wireless-next/master Recorded preimage for 'net/nfc/llcp/llcp.c' Auto-merging net/nfc/llcp/sock.c Auto-merging net/nfc/llcp/llcp.c CONFLICT (content): Merge conflict in net/nfc/llcp/llcp.c Auto-merging drivers/net/wireless/mwifiex/pcie.c Removing drivers/net/wireless/iwlwifi/pcie/cfg.h Auto-merging drivers/net/wireless/iwlwifi/iwl-7000.c Auto-merging drivers/net/wireless/iwlwifi/iwl-6000.c Auto-merging drivers/net/wireless/iwlwifi/iwl-5000.c Auto-merging drivers/net/wireless/iwlwifi/iwl-2000.c Auto-merging drivers/net/wireless/iwlwifi/iwl-1000.c Auto-merging drivers/net/wireless/ath/ath9k/hw.c Auto-merging drivers/net/wireless/ath/ath9k/common.h Auto-merging MAINTAINERS Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'net/nfc/llcp/llcp.c'. [master 8acb9c4] Merge remote-tracking branch 'wireless-next/master' $ git diff -M --stat --summary HEAD^.. MAINTAINERS | 2 +- drivers/bcma/core.c | 8 +- drivers/bcma/main.c | 5 + drivers/net/wireless/ath/ath5k/ath5k.h | 3 +- drivers/net/wireless/ath/ath5k/eeprom.c | 6 +- drivers/net/wireless/ath/ath5k/eeprom.h | 3 - drivers/net/wireless/ath/ath5k/phy.c | 20 +- drivers/net/wireless/ath/ath5k/reset.c | 4 +- drivers/net/wireless/ath/ath6kl/cfg80211.c | 8 +- drivers/net/wireless/ath/ath6kl/htc_pipe.c | 3 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 17 + .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 49 +- drivers/net/wireless/ath/ath9k/calib.c | 4 +- drivers/net/wireless/ath/ath9k/common.h | 2 +- drivers/net/wireless/ath/ath9k/debug.c | 5 + drivers/net/wireless/ath/ath9k/debug.h | 2 + drivers/net/wireless/ath/ath9k/hw.c | 188 +- drivers/net/wireless/ath/ath9k/hw.h | 1 - drivers/net/wireless/ath/carl9170/tx.c | 69 +- drivers/net/wireless/ath/wil6210/Makefile | 4 +- drivers/net/wireless/ath/wil6210/debugfs.c | 14 +- drivers/net/wireless/b43/Kconfig | 6 +- drivers/net/wireless/b43/b43.h | 6 + drivers/net/wireless/b43/main.c | 7 +- drivers/net/wireless/b43/phy_ht.c | 5 + drivers/net/wireless/brcm80211/Kconfig | 5 +- drivers/net/wireless/brcm80211/brcmfmac/Makefile | 3 + drivers/net/wireless/brcm80211/brcmfmac/dhd.h | 7 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 2 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_cdc.c | 30 +- .../net/wireless/brcm80211/brcmfmac/dhd_common.c | 33 + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.c | 42 + drivers/net/wireless/brcm80211/brcmfmac/dhd_dbg.h | 34 +- .../net/wireless/brcm80211/brcmfmac/dhd_linux.c | 39 +- .../net/wireless/brcm80211/brcmfmac/dhd_proto.h | 2 +- drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 28 +- drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 382 ++++ drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h | 25 + .../net/wireless/brcm80211/brcmfmac/tracepoint.c | 22 + .../net/wireless/brcm80211/brcmfmac/tracepoint.h | 87 + drivers/net/wireless/brcm80211/brcmfmac/usb.c | 37 +- .../net/wireless/brcm80211/brcmfmac/wl_cfg80211.c | 6 +- drivers/net/wireless/brcm80211/brcmsmac/Makefile | 4 + drivers/net/wireless/brcm80211/brcmsmac/led.c | 126 ++ drivers/net/wireless/brcm80211/brcmsmac/led.h | 36 + .../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 4 + .../net/wireless/brcm80211/brcmsmac/mac80211_if.h | 4 + drivers/net/wireless/brcm80211/brcmsmac/main.c | 11 +- drivers/net/wireless/brcm80211/brcmutil/utils.c | 25 + .../net/wireless/brcm80211/include/brcmu_utils.h | 27 + drivers/net/wireless/iwlegacy/3945-mac.c | 2 +- drivers/net/wireless/iwlegacy/3945.h | 4 - drivers/net/wireless/iwlegacy/4965-mac.c | 29 +- drivers/net/wireless/iwlegacy/common.c | 2 +- drivers/net/wireless/iwlegacy/common.h | 4 - drivers/net/wireless/iwlwifi/Kconfig | 11 +- drivers/net/wireless/iwlwifi/Makefile | 3 +- drivers/net/wireless/iwlwifi/dvm/agn.h | 2 +- drivers/net/wireless/iwlwifi/dvm/calib.c | 2 +- drivers/net/wireless/iwlwifi/dvm/calib.h | 2 +- drivers/net/wireless/iwlwifi/dvm/commands.h | 3 +- drivers/net/wireless/iwlwifi/dvm/debugfs.c | 26 +- drivers/net/wireless/iwlwifi/dvm/lib.c | 2 +- drivers/net/wireless/iwlwifi/dvm/mac80211.c | 3 +- drivers/net/wireless/iwlwifi/dvm/scan.c | 2 +- drivers/net/wireless/iwlwifi/dvm/testmode.c | 2 +- drivers/net/wireless/iwlwifi/dvm/tx.c | 13 +- drivers/net/wireless/iwlwifi/dvm/ucode.c | 2 +- .../wireless/iwlwifi/{pcie/1000.c => iwl-1000.c} | 1 - .../wireless/iwlwifi/{pcie/2000.c => iwl-2000.c} | 1 - .../wireless/iwlwifi/{pcie/5000.c => iwl-5000.c} | 1 - .../wireless/iwlwifi/{pcie/6000.c => iwl-6000.c} | 1 - .../wireless/iwlwifi/{pcie/7000.c => iwl-7000.c} | 63 +- drivers/net/wireless/iwlwifi/iwl-agn-hw.h | 2 +- drivers/net/wireless/iwlwifi/iwl-config.h | 49 +- drivers/net/wireless/iwlwifi/iwl-csr.h | 2 +- drivers/net/wireless/iwlwifi/iwl-debug.c | 13 +- drivers/net/wireless/iwlwifi/iwl-devtrace.h | 2 +- drivers/net/wireless/iwlwifi/iwl-drv.c | 14 +- drivers/net/wireless/iwlwifi/iwl-drv.h | 17 +- drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 9 +- drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 2 +- drivers/net/wireless/iwlwifi/iwl-eeprom-read.c | 5 +- drivers/net/wireless/iwlwifi/iwl-eeprom-read.h | 2 +- drivers/net/wireless/iwlwifi/iwl-fh.h | 2 +- drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 +- drivers/net/wireless/iwlwifi/iwl-fw.h | 4 +- drivers/net/wireless/iwlwifi/iwl-io.c | 19 +- drivers/net/wireless/iwlwifi/iwl-modparams.h | 4 +- drivers/net/wireless/iwlwifi/iwl-notif-wait.c | 15 +- drivers/net/wireless/iwlwifi/iwl-notif-wait.h | 2 +- drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 51 +- drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 2 +- drivers/net/wireless/iwlwifi/iwl-op-mode.h | 2 +- drivers/net/wireless/iwlwifi/iwl-phy-db.c | 11 +- drivers/net/wireless/iwlwifi/iwl-phy-db.h | 2 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 2 +- drivers/net/wireless/iwlwifi/iwl-test.c | 11 +- drivers/net/wireless/iwlwifi/iwl-test.h | 2 +- drivers/net/wireless/iwlwifi/iwl-testmode.h | 2 +- drivers/net/wireless/iwlwifi/iwl-trans.h | 5 +- drivers/net/wireless/iwlwifi/mvm/Makefile | 2 +- drivers/net/wireless/iwlwifi/mvm/binding.c | 2 +- drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 347 ++++ drivers/net/wireless/iwlwifi/mvm/d3.c | 260 ++- drivers/net/wireless/iwlwifi/mvm/debugfs.c | 138 +- drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h | 319 ++++ drivers/net/wireless/iwlwifi/mvm/fw-api-d3.h | 53 +- drivers/net/wireless/iwlwifi/mvm/fw-api-mac.h | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api-sta.h | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 2 +- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 12 +- drivers/net/wireless/iwlwifi/mvm/fw.c | 14 +- drivers/net/wireless/iwlwifi/mvm/led.c | 2 +- drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 45 +- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 57 +- drivers/net/wireless/iwlwifi/mvm/mvm.h | 17 +- drivers/net/wireless/iwlwifi/mvm/nvm.c | 11 +- drivers/net/wireless/iwlwifi/mvm/ops.c | 12 +- drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 2 +- drivers/net/wireless/iwlwifi/mvm/power.c | 2 +- drivers/net/wireless/iwlwifi/mvm/quota.c | 2 +- drivers/net/wireless/iwlwifi/mvm/rs.c | 14 +- drivers/net/wireless/iwlwifi/mvm/rx.c | 2 +- drivers/net/wireless/iwlwifi/mvm/scan.c | 2 +- drivers/net/wireless/iwlwifi/mvm/sta.c | 91 +- drivers/net/wireless/iwlwifi/mvm/sta.h | 4 +- drivers/net/wireless/iwlwifi/mvm/time-event.c | 2 +- drivers/net/wireless/iwlwifi/mvm/time-event.h | 2 +- drivers/net/wireless/iwlwifi/mvm/tx.c | 4 +- drivers/net/wireless/iwlwifi/mvm/utils.c | 2 +- drivers/net/wireless/iwlwifi/pcie/cfg.h | 115 -- drivers/net/wireless/iwlwifi/pcie/drv.c | 4 +- drivers/net/wireless/iwlwifi/pcie/trans.c | 25 +- drivers/net/wireless/iwlwifi/pcie/tx.c | 2 +- drivers/net/wireless/mac80211_hwsim.c | 3 +- drivers/net/wireless/mwifiex/Makefile | 1 + drivers/net/wireless/mwifiex/cfg80211.c | 160 ++ drivers/net/wireless/mwifiex/cmdevt.c | 2 +- drivers/net/wireless/mwifiex/ethtool.c | 70 + drivers/net/wireless/mwifiex/fw.h | 44 +- drivers/net/wireless/mwifiex/init.c | 6 +- drivers/net/wireless/mwifiex/ioctl.h | 23 + drivers/net/wireless/mwifiex/main.c | 15 +- drivers/net/wireless/mwifiex/main.h | 9 + drivers/net/wireless/mwifiex/pcie.c | 156 +- drivers/net/wireless/mwifiex/sta_cmd.c | 79 +- drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 + drivers/net/wireless/mwifiex/sta_ioctl.c | 10 +- drivers/net/wireless/mwifiex/txrx.c | 2 + drivers/net/wireless/mwifiex/util.c | 5 +- drivers/net/wireless/mwl8k.c | 111 +- drivers/net/wireless/orinoco/orinoco_usb.c | 2 +- drivers/net/wireless/ray_cs.c | 6 +- drivers/net/wireless/rndis_wlan.c | 5 +- drivers/net/wireless/rt2x00/rt2x00pci.c | 4 +- drivers/net/wireless/rtlwifi/usb.c | 3 +- drivers/net/wireless/rtlwifi/wifi.h | 3 - drivers/net/wireless/ti/wlcore/main.c | 3 +- drivers/nfc/microread/mei.c | 2 +- drivers/ssb/driver_chipcommon.c | 2 +- drivers/ssb/driver_chipcommon_pmu.c | 41 +- drivers/ssb/driver_mipscore.c | 25 +- drivers/ssb/driver_pcicore.c | 15 +- drivers/ssb/embedded.c | 5 +- drivers/ssb/main.c | 51 +- drivers/ssb/pci.c | 97 +- drivers/ssb/pcmcia.c | 46 +- drivers/ssb/scan.c | 31 +- drivers/ssb/sprom.c | 4 +- drivers/ssb/ssb_private.h | 19 +- include/linux/ieee80211.h | 52 +- include/linux/socket.h | 1 + include/linux/ssb/ssb.h | 6 +- include/net/cfg80211.h | 126 +- include/net/mac80211.h | 29 +- include/uapi/linux/nfc.h | 16 + include/uapi/linux/nl80211.h | 117 +- net/mac80211/cfg.c | 151 +- net/mac80211/debugfs_sta.c | 31 + net/mac80211/driver-ops.h | 7 +- net/mac80211/ht.c | 52 +- net/mac80211/ibss.c | 29 +- net/mac80211/ieee80211_i.h | 26 +- net/mac80211/iface.c | 14 +- net/mac80211/key.c | 103 +- net/mac80211/key.h | 5 +- net/mac80211/main.c | 55 +- net/mac80211/mesh.c | 59 +- net/mac80211/mesh.h | 12 - net/mac80211/mesh_plink.c | 37 +- net/mac80211/mlme.c | 100 +- net/mac80211/offchannel.c | 2 +- net/mac80211/pm.c | 117 +- net/mac80211/rc80211_minstrel.c | 204 ++- net/mac80211/rc80211_minstrel.h | 31 +- net/mac80211/rc80211_minstrel_debugfs.c | 12 +- net/mac80211/rc80211_minstrel_ht.c | 79 +- net/mac80211/rc80211_minstrel_ht.h | 6 +- net/mac80211/rx.c | 61 +- net/mac80211/sta_info.c | 11 +- net/mac80211/sta_info.h | 2 - net/mac80211/trace.h | 11 +- net/mac80211/util.c | 73 +- net/mac80211/vht.c | 212 ++- net/nfc/llcp/commands.c | 205 ++- net/nfc/llcp/llcp.c | 112 +- net/nfc/llcp/llcp.h | 36 +- net/nfc/llcp/sock.c | 130 +- net/nfc/netlink.c | 172 ++ net/nfc/nfc.h | 14 + net/rfkill/rfkill-regulator.c | 2 +- net/wireless/ap.c | 62 - net/wireless/core.c | 73 +- net/wireless/core.h | 22 +- net/wireless/mesh.c | 15 +- net/wireless/mlme.c | 230 +-- net/wireless/nl80211.c | 1885 +++++++++++++------- net/wireless/nl80211.h | 68 - net/wireless/rdev-ops.h | 20 +- net/wireless/reg.c | 6 +- net/wireless/sme.c | 26 +- net/wireless/sysfs.c | 25 +- net/wireless/trace.h | 46 + 227 files changed, 6677 insertions(+), 2859 deletions(-) create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/fwsignal.h create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/tracepoint.c create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/tracepoint.h create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/led.c create mode 100644 drivers/net/wireless/brcm80211/brcmsmac/led.h rename drivers/net/wireless/iwlwifi/{pcie/1000.c => iwl-1000.c} (99%) rename drivers/net/wireless/iwlwifi/{pcie/2000.c => iwl-2000.c} (99%) rename drivers/net/wireless/iwlwifi/{pcie/5000.c => iwl-5000.c} (99%) rename drivers/net/wireless/iwlwifi/{pcie/6000.c => iwl-6000.c} (99%) rename drivers/net/wireless/iwlwifi/{pcie/7000.c => iwl-7000.c} (58%) create mode 100644 drivers/net/wireless/iwlwifi/mvm/bt-coex.c create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-bt-coex.h delete mode 100644 drivers/net/wireless/iwlwifi/pcie/cfg.h create mode 100644 drivers/net/wireless/mwifiex/ethtool.c Merging bluetooth/master (ad82cdd Bluetooth: Fix endianness handling of cmd_status/complete opcodes) $ git merge bluetooth/master Merge made by the 'recursive' strategy. include/net/bluetooth/bluetooth.h | 12 +- include/net/bluetooth/hci_core.h | 22 +- include/net/bluetooth/rfcomm.h | 6 - net/bluetooth/af_bluetooth.c | 15 +- net/bluetooth/bnep/sock.c | 4 +- net/bluetooth/cmtp/sock.c | 4 +- net/bluetooth/hci_conn.c | 4 +- net/bluetooth/hci_core.c | 687 ++++++++++++++++++++++++++++++++------ net/bluetooth/hci_event.c | 512 +--------------------------- net/bluetooth/hci_sock.c | 9 +- net/bluetooth/hidp/core.c | 4 + net/bluetooth/hidp/sock.c | 4 +- net/bluetooth/l2cap_sock.c | 4 +- net/bluetooth/rfcomm/core.c | 163 +++++---- net/bluetooth/rfcomm/sock.c | 3 +- net/bluetooth/sco.c | 3 +- 16 files changed, 724 insertions(+), 732 deletions(-) Merging mtd/master (91d542f mtd: bcm47xxpart: look for NVRAM at the end of device) $ git merge mtd/master Merge made by the 'recursive' strategy. drivers/mtd/bcm47xxpart.c | 52 ++++++++++++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 19 deletions(-) Merging l2-mtd/master (a70c811 mtd: devices: elm: check for device's presence before configuration) $ git merge l2-mtd/master Removing drivers/mtd/nand/rtc_from4.c Removing drivers/mtd/devices/docprobe.c Removing drivers/mtd/devices/docecc.c Removing drivers/mtd/devices/doc2001plus.c Removing drivers/mtd/devices/doc2001.c Removing drivers/mtd/devices/doc2000.c Merge made by the 'recursive' strategy. .../devicetree/bindings/mtd/partition.txt | 36 +- arch/arm/configs/lpc32xx_defconfig | 1 - drivers/mtd/devices/Kconfig | 63 -- drivers/mtd/devices/Makefile | 5 - drivers/mtd/devices/doc2000.c | 1178 -------------------- drivers/mtd/devices/doc2001.c | 824 -------------- drivers/mtd/devices/doc2001plus.c | 1080 ------------------ drivers/mtd/devices/docecc.c | 521 --------- drivers/mtd/devices/docprobe.c | 325 ------ drivers/mtd/devices/elm.c | 9 +- drivers/mtd/devices/m25p80.c | 25 +- drivers/mtd/maps/ck804xrom.c | 3 +- drivers/mtd/mtdchar.c | 24 +- drivers/mtd/nand/Kconfig | 18 - drivers/mtd/nand/Makefile | 1 - drivers/mtd/nand/cafe_nand.c | 6 - drivers/mtd/nand/nand_base.c | 101 +- drivers/mtd/nand/nand_bbt.c | 25 - drivers/mtd/nand/nand_ids.c | 220 ++-- drivers/mtd/nand/nandsim.c | 24 +- drivers/mtd/nand/nuc900_nand.c | 9 - drivers/mtd/nand/omap2.c | 5 +- drivers/mtd/nand/pxa3xx_nand.c | 2 +- drivers/mtd/nand/rtc_from4.c | 624 ----------- drivers/mtd/nand/sm_common.c | 61 +- drivers/mtd/ofpart.c | 7 +- include/linux/mtd/nand.h | 99 +- include/linux/platform_data/elm.h | 2 +- 28 files changed, 260 insertions(+), 5038 deletions(-) delete mode 100644 drivers/mtd/devices/doc2000.c delete mode 100644 drivers/mtd/devices/doc2001.c delete mode 100644 drivers/mtd/devices/doc2001plus.c delete mode 100644 drivers/mtd/devices/docecc.c delete mode 100644 drivers/mtd/devices/docprobe.c delete mode 100644 drivers/mtd/nand/rtc_from4.c Merging crypto/master (6375bcf hwrng: Fix a wrong comment in Documentation/hw_random.txt) $ git merge crypto/master Removing include/linux/platform_data/atmel-aes.h Merge made by the 'recursive' strategy. Documentation/hw_random.txt | 2 +- arch/arm/mach-at91/at91sam9g45_devices.c | 14 +- arch/x86/crypto/Makefile | 2 +- arch/x86/crypto/crc32c-pcl-intel-asm_64.S | 5 +- crypto/Kconfig | 10 - crypto/crypto_user.c | 4 +- drivers/crypto/Kconfig | 8 +- drivers/crypto/atmel-aes.c | 471 +++++++++++++++++------ drivers/crypto/atmel-sha-regs.h | 7 +- drivers/crypto/atmel-sha.c | 586 ++++++++++++++++++++++++----- drivers/crypto/atmel-tdes-regs.h | 2 + drivers/crypto/atmel-tdes.c | 394 ++++++++++++++++--- drivers/crypto/bfin_crc.c | 6 +- drivers/crypto/caam/Kconfig | 2 +- drivers/crypto/omap-aes.c | 15 +- drivers/crypto/omap-sham.c | 15 +- include/linux/platform_data/atmel-aes.h | 22 -- include/linux/platform_data/crypto-atmel.h | 22 ++ 18 files changed, 1236 insertions(+), 351 deletions(-) delete mode 100644 include/linux/platform_data/atmel-aes.h create mode 100644 include/linux/platform_data/crypto-atmel.h Merging drm/drm-next (be88298 drm/tilcdc: only build on arm) $ git merge drm/drm-next Already up-to-date. Merging drm-intel/drm-intel-next-queued (99e35fd drm/i915: clarify reasoning for the access_ok call) $ git merge drm-intel/drm-intel-next-queued Resolved 'drivers/gpu/drm/i915/intel_hdmi.c' using previous resolution. Resolved 'drivers/gpu/drm/i915/intel_sdvo.c' using previous resolution. Auto-merging include/linux/pm.h Auto-merging drivers/video/fbmem.c Auto-merging drivers/gpu/drm/i915/intel_sdvo.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_sdvo.c Auto-merging drivers/gpu/drm/i915/intel_pm.c Auto-merging drivers/gpu/drm/i915/intel_lvds.c Auto-merging drivers/gpu/drm/i915/intel_hdmi.c CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_hdmi.c Auto-merging drivers/gpu/drm/i915/intel_fb.c Auto-merging drivers/gpu/drm/i915/intel_drv.h Auto-merging drivers/gpu/drm/i915/intel_dp.c Auto-merging drivers/gpu/drm/i915/intel_display.c Auto-merging drivers/gpu/drm/i915/intel_ddi.c Auto-merging drivers/gpu/drm/i915/i915_reg.h Auto-merging drivers/gpu/drm/i915/i915_irq.c Auto-merging drivers/gpu/drm/i915/i915_gem.c Auto-merging drivers/gpu/drm/i915/i915_drv.c Auto-merging drivers/gpu/drm/i915/i915_debugfs.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master fa8df16] Merge remote-tracking branch 'drm-intel/drm-intel-next-queued' $ git diff -M --stat --summary HEAD^.. drivers/gpu/drm/i915/i915_debugfs.c | 411 ++++++++--------------------- drivers/gpu/drm/i915/i915_dma.c | 18 ++ drivers/gpu/drm/i915/i915_drv.c | 37 ++- drivers/gpu/drm/i915/i915_drv.h | 8 +- drivers/gpu/drm/i915/i915_gem.c | 14 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 26 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 204 +++++++++----- drivers/gpu/drm/i915/i915_reg.h | 129 +++++---- drivers/gpu/drm/i915/i915_suspend.c | 8 +- drivers/gpu/drm/i915/i915_sysfs.c | 16 +- drivers/gpu/drm/i915/intel_ddi.c | 4 +- drivers/gpu/drm/i915/intel_display.c | 139 ++++++---- drivers/gpu/drm/i915/intel_dp.c | 88 +++--- drivers/gpu/drm/i915/intel_drv.h | 7 +- drivers/gpu/drm/i915/intel_fb.c | 2 - drivers/gpu/drm/i915/intel_hdmi.c | 106 ++++---- drivers/gpu/drm/i915/intel_lvds.c | 3 + drivers/gpu/drm/i915/intel_pm.c | 21 +- drivers/gpu/drm/i915/intel_sdvo.c | 48 ++-- drivers/video/fbmem.c | 7 + include/linux/fb.h | 2 + include/linux/pm.h | 13 + kernel/power/console.c | 116 ++++++++ 24 files changed, 748 insertions(+), 681 deletions(-) Merging sound/for-next (a817650 ALSA: hdspm - Enable new TCO ALSA controls) $ git merge sound/for-next Auto-merging sound/pci/hda/patch_realtek.c Merge made by the 'recursive' strategy. Documentation/DocBook/writing-an-alsa-driver.tmpl | 12 +- Documentation/sound/alsa/HD-Audio.txt | 10 +- include/sound/core.h | 24 +- sound/pci/hda/hda_generic.c | 356 +++++++++++++---- sound/pci/hda/hda_generic.h | 10 +- sound/pci/hda/patch_realtek.c | 35 +- sound/pci/rme9652/hdspm.c | 382 +++++++++++------- sound/usb/caiaq/audio.c | 459 +++++++++++----------- sound/usb/caiaq/audio.h | 4 +- sound/usb/caiaq/control.c | 67 ++-- sound/usb/caiaq/control.h | 2 +- sound/usb/caiaq/device.c | 248 ++++++------ sound/usb/caiaq/device.h | 18 +- sound/usb/caiaq/input.c | 328 ++++++++-------- sound/usb/caiaq/input.h | 6 +- sound/usb/caiaq/midi.c | 63 +-- sound/usb/caiaq/midi.h | 5 +- 17 files changed, 1180 insertions(+), 849 deletions(-) Merging sound-asoc/for-next (57f92b6 Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next) $ git merge sound-asoc/for-next Removing include/sound/tegra_wm8903.h Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/sound/ak5386.txt | 19 + .../devicetree/bindings/sound/ti,tas5086.txt | 32 ++ drivers/mfd/wm5102-tables.c | 8 + include/linux/mfd/arizona/registers.h | 40 ++ include/sound/soc-dapm.h | 2 +- include/sound/soc.h | 1 - include/sound/tas5086.h | 7 + include/sound/tegra_wm8903.h | 26 - sound/soc/atmel/atmel_ssc_dai.c | 43 ++ sound/soc/codecs/Kconfig | 8 + sound/soc/codecs/Makefile | 4 + sound/soc/codecs/ak4104.c | 55 +- sound/soc/codecs/ak5386.c | 152 ++++++ sound/soc/codecs/arizona.c | 274 +++++++--- sound/soc/codecs/arizona.h | 12 +- sound/soc/codecs/cs42l73.c | 6 +- sound/soc/codecs/max98088.c | 30 +- sound/soc/codecs/max98090.c | 45 +- sound/soc/codecs/si476x.c | 48 +- sound/soc/codecs/tas5086.c | 601 +++++++++++++++++++++ sound/soc/codecs/wm5102.c | 32 +- sound/soc/codecs/wm5102.h | 6 +- sound/soc/codecs/wm5110.c | 40 +- sound/soc/codecs/wm5110.h | 6 +- sound/soc/codecs/wm8960.c | 10 + sound/soc/davinci/davinci-mcasp.c | 66 ++- sound/soc/davinci/davinci-pcm.c | 16 +- sound/soc/davinci/davinci-pcm.h | 1 + sound/soc/omap/omap-dmic.c | 11 +- sound/soc/omap/omap-mcpdm.c | 14 +- sound/soc/omap/omap3pandora.c | 8 +- sound/soc/soc-core.c | 23 +- sound/soc/soc-dapm.c | 16 +- sound/soc/tegra/tegra_alc5632.c | 15 +- sound/soc/tegra/tegra_asoc_utils.c | 4 - sound/soc/tegra/tegra_wm8753.c | 15 +- sound/soc/tegra/tegra_wm8903.c | 179 +++--- sound/soc/tegra/tegra_wm9712.c | 5 - sound/soc/tegra/trimslice.c | 56 +- 39 files changed, 1536 insertions(+), 400 deletions(-) create mode 100644 Documentation/devicetree/bindings/sound/ak5386.txt create mode 100644 Documentation/devicetree/bindings/sound/ti,tas5086.txt create mode 100644 include/sound/tas5086.h delete mode 100644 include/sound/tegra_wm8903.h create mode 100644 sound/soc/codecs/ak5386.c create mode 100644 sound/soc/codecs/tas5086.c Merging modules/modules-next (6dbe51c Linux 3.9-rc1) $ git merge modules/modules-next Already up-to-date. Merging pekey/devel-pekey (4ea349d MODSIGN: Fix including certificate twice when the signing_key.x509 already exists) $ git merge pekey/devel-pekey Auto-merging kernel/system_certificates.S Removing kernel/modsign_pubkey.c Auto-merging kernel/Makefile Auto-merging init/Kconfig Merge made by the 'recursive' strategy. crypto/asymmetric_keys/Kconfig | 20 +- crypto/asymmetric_keys/Makefile | 30 ++ crypto/asymmetric_keys/mscode.asn1 | 28 ++ crypto/asymmetric_keys/mscode_parser.c | 110 +++++ crypto/asymmetric_keys/pefile_parser.c | 479 +++++++++++++++++++++ crypto/asymmetric_keys/pefile_parser.h | 36 ++ crypto/asymmetric_keys/pkcs7.asn1 | 127 ++++++ crypto/asymmetric_keys/pkcs7_parser.c | 326 ++++++++++++++ crypto/asymmetric_keys/pkcs7_parser.h | 72 ++++ crypto/asymmetric_keys/pkcs7_trust.c | 149 +++++++ crypto/asymmetric_keys/pkcs7_verify.c | 260 +++++++++++ crypto/asymmetric_keys/public_key.c | 60 ++- crypto/asymmetric_keys/public_key.h | 6 + crypto/asymmetric_keys/x509.asn1 | 2 +- crypto/asymmetric_keys/x509_cert_parser.c | 55 ++- crypto/asymmetric_keys/x509_parser.h | 28 +- crypto/asymmetric_keys/x509_public_key.c | 119 ++--- include/crypto/public_key.h | 9 +- include/keys/system_keyring.h | 23 + include/linux/key-type.h | 1 + include/linux/key.h | 3 + include/linux/oid_registry.h | 7 +- include/linux/pe.h | 448 +++++++++++++++++++ init/Kconfig | 13 + kernel/Makefile | 47 +- kernel/modsign_pubkey.c | 104 ----- kernel/module-internal.h | 2 - kernel/module_signing.c | 7 +- ...modsign_certificate.S => system_certificates.S} | 7 +- kernel/system_keyring.c | 103 +++++ security/keys/key.c | 8 + security/keys/keyring.c | 4 + 32 files changed, 2478 insertions(+), 215 deletions(-) create mode 100644 crypto/asymmetric_keys/mscode.asn1 create mode 100644 crypto/asymmetric_keys/mscode_parser.c create mode 100644 crypto/asymmetric_keys/pefile_parser.c create mode 100644 crypto/asymmetric_keys/pefile_parser.h create mode 100644 crypto/asymmetric_keys/pkcs7.asn1 create mode 100644 crypto/asymmetric_keys/pkcs7_parser.c create mode 100644 crypto/asymmetric_keys/pkcs7_parser.h create mode 100644 crypto/asymmetric_keys/pkcs7_trust.c create mode 100644 crypto/asymmetric_keys/pkcs7_verify.c create mode 100644 include/keys/system_keyring.h create mode 100644 include/linux/pe.h delete mode 100644 kernel/modsign_pubkey.c rename kernel/{modsign_certificate.S => system_certificates.S} (72%) create mode 100644 kernel/system_keyring.c Merging virtio/virtio-next (289d105 lguest: fix paths in comments) $ git merge virtio/virtio-next Merge made by the 'recursive' strategy. drivers/lguest/Kconfig | 5 ++--- tools/lguest/lguest.txt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) Merging input/next (d3f0d95 USB: cdc-acm - blacklist IMS PCU device) $ git merge input/next Auto-merging include/uapi/linux/input.h Auto-merging include/linux/device.h Auto-merging drivers/usb/class/cdc-acm.c Auto-merging drivers/input/serio/Kconfig Auto-merging drivers/input/misc/Makefile Auto-merging drivers/input/misc/Kconfig Auto-merging drivers/base/devres.c Merge made by the 'recursive' strategy. .../bindings/input/ps2keyb-mouse-apbps2.txt | 16 + .../bindings/input/touchscreen/auo_pixcir_ts.txt | 30 + drivers/base/devres.c | 74 + drivers/input/misc/Kconfig | 10 + drivers/input/misc/Makefile | 1 + drivers/input/misc/ims-pcu.c | 1900 ++++++++++++++++++++ drivers/input/serio/Kconfig | 10 + drivers/input/serio/Makefile | 1 + drivers/input/serio/apbps2.c | 229 +++ drivers/input/touchscreen/auo-pixcir-ts.c | 226 ++- drivers/input/touchscreen/wm9712.c | 28 +- drivers/input/touchscreen/wm97xx-core.c | 11 + drivers/usb/class/cdc-acm.c | 13 + drivers/usb/class/cdc-acm.h | 1 + include/linux/device.h | 4 + include/linux/input/auo-pixcir-ts.h | 4 +- include/uapi/linux/input.h | 5 + 17 files changed, 2466 insertions(+), 97 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/ps2keyb-mouse-apbps2.txt create mode 100644 Documentation/devicetree/bindings/input/touchscreen/auo_pixcir_ts.txt create mode 100644 drivers/input/misc/ims-pcu.c create mode 100644 drivers/input/serio/apbps2.c Merging input-mt/for-next (6f0c058 Linux 3.7-rc2) $ git merge input-mt/for-next Already up-to-date. Merging cgroup/for-next (ff794de cpuset: remove include of cgroup.h from cpuset.h) $ git merge cgroup/for-next Merge made by the 'recursive' strategy. block/blk-cgroup.h | 2 - include/linux/cgroup.h | 41 ++++++++- include/linux/cpuset.h | 1 - include/linux/res_counter.h | 2 +- kernel/cgroup.c | 201 +++++++++++++++++++++----------------------- kernel/cpuset.c | 32 ++----- 6 files changed, 146 insertions(+), 133 deletions(-) Merging block/for-next (833dd2e Merge branch 'for-3.9/drivers' into for-next) $ git merge block/for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging device-mapper/master (28467d5 We have found a race in the optimisation used in the dm cache writethrough implementation. Currently, dm core sends the cache target two bios, one for the origin device and one for the cache device and these are processed in parallel. This patch avoids the race by changing the code back to a simpler (slower) implementation which processes the two writes in series, one after the other, until we can find a complete fix for the problem.) $ git merge device-mapper/master Merge made by the 'recursive' strategy. drivers/md/dm-bufio.c | 2 + drivers/md/dm-cache-metadata.c | 2 +- drivers/md/dm-cache-target.c | 164 +++++++++++++++++---------- drivers/md/dm-verity.c | 37 +++++- drivers/md/persistent-data/dm-btree-remove.c | 46 ++++---- 5 files changed, 167 insertions(+), 84 deletions(-) Merging embedded/master (4744b43 embedded: fix vc_translate operator precedence) $ git merge embedded/master Already up-to-date. Merging firmware/master (6e03a20 firmware: speed up request_firmware(), v3) $ git merge firmware/master Already up-to-date. Merging pcmcia/master (80af9e6 pcmcia at91_cf: fix raw gpio number usage) $ git merge pcmcia/master Already up-to-date. Merging mmc/mmc-next (5ebf255 mmc: sdhci-tegra: add basic support for Tegra114) $ git merge mmc/mmc-next Merge made by the 'recursive' strategy. drivers/mmc/host/sdhci-tegra.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) Merging kgdb/kgdb-next (6bedf31 kdb: Remove unhandled ssb command) $ git merge kgdb/kgdb-next Merge made by the 'recursive' strategy. Merging slab/for-next (7d557b3 slub: correctly bootstrap boot caches) $ git merge slab/for-next Auto-merging mm/slub.c Auto-merging mm/slab.c Removing include/linux/kmalloc_sizes.h Merge made by the 'recursive' strategy. fs/proc/stat.c | 2 +- include/linux/kmalloc_sizes.h | 45 --- include/linux/slab.h | 231 +++++++++---- include/linux/slab_def.h | 48 +-- include/linux/slub_def.h | 136 +------- mm/slab.c | 789 ++++++++++++++++++------------------------ mm/slab.h | 43 ++- mm/slab_common.c | 165 ++++++++- mm/slub.c | 188 ++-------- 9 files changed, 745 insertions(+), 902 deletions(-) delete mode 100644 include/linux/kmalloc_sizes.h Merging uclinux/for-next (6dbe51c Linux 3.9-rc1) $ git merge uclinux/for-next Already up-to-date. Merging md/for-next (f1e79ce raid5: create multiple threads to handle stripes) $ git merge md/for-next Auto-merging drivers/md/raid5.c Merge made by the 'recursive' strategy. drivers/md/md.c | 8 +- drivers/md/md.h | 8 ++ drivers/md/raid5.c | 408 ++++++++++++++++++++++++++++++++++++++++++++++++++--- drivers/md/raid5.h | 19 +++ 4 files changed, 419 insertions(+), 24 deletions(-) Merging mfd/for-next (ff7109f mfd: lpc_ich: Use devres API to allocate private data) $ git merge mfd/for-next Already up-to-date. Merging battery/master (845e37e Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux) $ git merge battery/master Resolved 'include/linux/mfd/abx500/ab8500-bm.h' using previous resolution. Auto-merging include/linux/mfd/abx500/ab8500-bm.h CONFLICT (content): Merge conflict in include/linux/mfd/abx500/ab8500-bm.h Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master a859c2d] Merge remote-tracking branch 'battery/master' $ git diff -M --stat --summary HEAD^.. Merging fbdev/fbdev-next (a49f0d1 Linux 3.8-rc1) $ git merge fbdev/fbdev-next Already up-to-date. Merging viafb/viafb-next (838ac78 viafb: avoid refresh and mode lookup in set_par) $ git merge viafb/viafb-next Already up-to-date. Merging omap_dss2/for-next (e7f5c9a Merge tag 'omapdss-for-3.8' of git://gitorious.org/linux-omap-dss2/linux into for-linus) $ git merge omap_dss2/for-next Already up-to-date. Merging regulator/for-next (a953fda Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next) $ git merge regulator/for-next Auto-merging drivers/regulator/palmas-regulator.c Auto-merging drivers/regulator/core.c Merge made by the 'recursive' strategy. drivers/regulator/88pm8607.c | 36 +------ drivers/regulator/core.c | 166 ++++++++++++++++++++++++++++----- drivers/regulator/lp8788-ldo.c | 98 ++++--------------- drivers/regulator/max8649.c | 39 ++------ drivers/regulator/max8925-regulator.c | 5 +- drivers/regulator/max8998.c | 9 +- drivers/regulator/palmas-regulator.c | 38 ++++---- drivers/regulator/s5m8767.c | 2 +- drivers/regulator/tps6586x-regulator.c | 6 +- include/linux/regulator/consumer.h | 14 +-- include/linux/regulator/driver.h | 7 +- 11 files changed, 214 insertions(+), 206 deletions(-) Merging security/next (2c4cdf5 Merge tag 'v3.9-rc2' into next) $ git merge security/next Already up-to-date! Merge made by the 'recursive' strategy. Merging selinux/master (c2d7b24 Merge tag 'v3.4' into 20120409) $ git merge selinux/master Already up-to-date! Merge made by the 'recursive' strategy. Merging lblnet/master (7e27d6e Linux 2.6.35-rc3) $ git merge lblnet/master Already up-to-date. Merging watchdog/master (6595dfb Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux) $ git merge watchdog/master Already up-to-date! Merge made by the 'recursive' strategy. Merging dwmw2-iommu/master (6491d4d intel-iommu: Free old page tables before creating superpage) $ git merge dwmw2-iommu/master Already up-to-date. Merging iommu/next (ae19158 iommu: OMAP: build only on OMAP2+) $ git merge iommu/next Merge made by the 'recursive' strategy. drivers/iommu/Kconfig | 2 +- drivers/iommu/amd_iommu_init.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Merging vfio/next (dad9f89 VFIO-AER: Vfio-pci driver changes for supporting AER) $ git merge vfio/next Merge made by the 'recursive' strategy. drivers/vfio/pci/vfio_pci.c | 44 ++++++++++++++++++++++++- drivers/vfio/pci/vfio_pci_intrs.c | 64 +++++++++++++++++++++++++++++++++++++ drivers/vfio/pci/vfio_pci_private.h | 1 + drivers/vfio/vfio.c | 30 ++++++++++++++++- include/linux/vfio.h | 3 ++ include/uapi/linux/vfio.h | 1 + 6 files changed, 141 insertions(+), 2 deletions(-) Merging osd/linux-next (861d666 exofs: don't leak io_state and pages on read error) $ git merge osd/linux-next Already up-to-date. Merging jc_docs/docs-next (5c050fb docs: update the development process document) $ git merge jc_docs/docs-next Already up-to-date. Merging trivial/for-next (d097dda doc: virtual: Fix typos in virtio-spec.txt) $ git merge trivial/for-next Auto-merging mm/hugetlb.c Merge made by the 'recursive' strategy. Documentation/virtual/virtio-spec.txt | 6 +++--- kernel/.gitignore | 1 + mm/hugetlb.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) Merging audit/for-next (dcd6c92 Linux 3.3-rc1) $ git merge audit/for-next Already up-to-date. Merging fsnotify/for-next (1ca39ab inotify: automatically restart syscalls) $ git merge fsnotify/for-next Already up-to-date. Merging edac/linux_next (b076989 i5100_edac: convert to use simple_open()) $ git merge edac/linux_next Already up-to-date. Merging edac-amd/for-next (fbe2d36 EDAC: Make sysfs functions static) $ git merge edac-amd/for-next Merge made by the 'recursive' strategy. drivers/edac/edac_mc_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Merging devicetree/devicetree/next (02bbde7 Revert "of: use platform_device_add") $ git merge devicetree/devicetree/next Already up-to-date. Merging dt-rh/for-next (1421954 documentation/devicetree: Fix a typo in exynos-dw-mshc.txt) $ git merge dt-rh/for-next Already up-to-date. Merging spi/spi/next (095c375 spi: Document cs_gpios and cs_gpio in kernel-doc) $ git merge spi/spi/next Already up-to-date. Merging spi-mb/spi-next (468050c spi: fix return value check in ce4100_spi_probe()) $ git merge spi-mb/spi-next Merge made by the 'recursive' strategy. drivers/spi/spi-pxa2xx-pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Merging tip/auto-latest (c56c948 Merge branch 'x86/paravirt') $ git merge tip/auto-latest Auto-merging init/Kconfig Merge made by the 'recursive' strategy. arch/x86/Kconfig | 89 +++++++------- arch/x86/boot/compressed/head_64.S | 2 +- arch/x86/include/asm/context_tracking.h | 21 ---- arch/x86/include/asm/hypervisor.h | 16 ++- arch/x86/kernel/cpu/Makefile | 3 +- arch/x86/kernel/kvm.c | 8 +- arch/x86/kernel/traps.c | 68 ++++++----- arch/x86/lguest/Kconfig | 3 +- arch/x86/mm/fault.c | 8 +- arch/x86/xen/Kconfig | 2 +- drivers/hv/Kconfig | 2 +- drivers/misc/Kconfig | 2 +- include/linux/clockchips.h | 5 + include/linux/context_tracking.h | 24 +++- include/linux/perf_event.h | 18 +-- include/linux/sched.h | 198 +------------------------------- init/Kconfig | 1 + init/main.c | 2 +- kernel/events/core.c | 15 +++ kernel/events/ring_buffer.c | 40 +++++-- kernel/fork.c | 2 +- kernel/printk.c | 2 +- kernel/sched/core.c | 20 +++- kernel/sched/cputime.c | 154 +++++++++++++------------ kernel/sched/fair.c | 6 +- kernel/sched/sched.h | 159 ++++++++++++++++++++++++- kernel/time/tick-broadcast.c | 129 ++++++++++++--------- kernel/time/tick-common.c | 1 + kernel/time/tick-internal.h | 3 +- 29 files changed, 529 insertions(+), 474 deletions(-) Merging ftrace/for-next (2227b79 tracing: Fix the branch tracer that broke with buffer change) $ git merge ftrace/for-next Auto-merging kernel/trace/trace_output.c Auto-merging kernel/trace/ring_buffer.c Auto-merging kernel/trace/blktrace.c Auto-merging kernel/trace/Kconfig Auto-merging include/linux/kernel.h Auto-merging Documentation/kernel-parameters.txt Merge made by the 'recursive' strategy. Documentation/kernel-parameters.txt | 7 + include/linux/ftrace_event.h | 74 +- include/linux/kernel.h | 4 + include/linux/ring_buffer.h | 6 + include/trace/ftrace.h | 39 +- kernel/trace/Kconfig | 26 + kernel/trace/blktrace.c | 4 +- kernel/trace/ring_buffer.c | 181 +++- kernel/trace/trace.c | 1788 +++++++++++++++++++++++----------- kernel/trace/trace.h | 120 ++- kernel/trace/trace_branch.c | 8 +- kernel/trace/trace_events.c | 1022 ++++++++++++++----- kernel/trace/trace_events_filter.c | 5 +- kernel/trace/trace_export.c | 4 +- kernel/trace/trace_functions.c | 8 +- kernel/trace/trace_functions_graph.c | 12 +- kernel/trace/trace_irqsoff.c | 10 +- kernel/trace/trace_kdb.c | 12 +- kernel/trace/trace_mmiotrace.c | 12 +- kernel/trace/trace_output.c | 28 +- kernel/trace/trace_sched_switch.c | 8 +- kernel/trace/trace_sched_wakeup.c | 16 +- kernel/trace/trace_selftest.c | 42 +- kernel/trace/trace_syscalls.c | 88 +- 24 files changed, 2506 insertions(+), 1018 deletions(-) Merging rcu/rcu/next (7a6b55e srcu: use ACCESS_ONCE() to access sp->completed in srcu_read_lock()) $ git merge rcu/rcu/next Already up-to-date. Merging cputime/cputime (c3e0ef9 [S390] fix cputime overflow in uptime_proc_show) $ git merge cputime/cputime Already up-to-date. Merging uprobes/for-next (0326f5a uprobes/core: Handle breakpoint and singlestep exceptions) $ git merge uprobes/for-next Already up-to-date. Merging kvm/linux-next (5da5960 KVM: MMU: Introduce a helper function for FIFO zapping) $ git merge kvm/linux-next Merge made by the 'recursive' strategy. Documentation/virtual/kvm/api.txt | 8 + arch/arm/kvm/arm.c | 15 +- arch/ia64/kvm/kvm-ia64.c | 25 +- arch/powerpc/include/asm/kvm_ppc.h | 2 +- arch/powerpc/kvm/book3s_hv.c | 4 +- arch/powerpc/kvm/book3s_pr.c | 2 +- arch/powerpc/kvm/booke.c | 2 +- arch/powerpc/kvm/powerpc.c | 13 +- arch/s390/include/asm/pgtable.h | 2 + arch/s390/include/uapi/asm/Kbuild | 1 + arch/s390/include/uapi/asm/virtio-ccw.h | 21 ++ arch/s390/kvm/Kconfig | 1 + arch/s390/kvm/Makefile | 2 +- arch/s390/kvm/diag.c | 26 ++ arch/s390/kvm/gaccess.h | 429 ++++++-------------------------- arch/s390/kvm/intercept.c | 10 +- arch/s390/kvm/interrupt.c | 245 ++++++------------ arch/s390/kvm/kvm-s390.c | 11 +- arch/s390/kvm/priv.c | 89 +++---- arch/s390/mm/pgtable.c | 107 ++++++-- arch/x86/include/asm/vmx.h | 4 + arch/x86/kernel/kvmclock.c | 9 +- arch/x86/kvm/mmu.c | 78 +++--- arch/x86/kvm/vmx.c | 176 +++++++++---- arch/x86/kvm/x86.c | 27 +- drivers/s390/kvm/virtio_ccw.c | 16 +- include/linux/kvm_host.h | 49 +++- include/uapi/linux/kvm.h | 3 + virt/kvm/eventfd.c | 24 +- virt/kvm/kvm_main.c | 46 ++-- 30 files changed, 627 insertions(+), 820 deletions(-) create mode 100644 arch/s390/include/uapi/asm/virtio-ccw.h Merging kvm-ppc/kvm-ppc-next (bd31a7f KVM: nVMX: Trap unconditionally if msr bitmap access fails) $ git merge kvm-ppc/kvm-ppc-next Already up-to-date. Merging oprofile/for-next (4400910 oprofile, x86: Fix wrapping bug in op_x86_get_ctrl()) $ git merge oprofile/for-next Already up-to-date. Merging fw-nohz/nohz/next (74876a9 printk: Wake up klogd using irq_work) $ git merge fw-nohz/nohz/next Already up-to-date. Merging xen/upstream/xen (af3a3ab Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes) $ git merge xen/upstream/xen Already up-to-date. Merging xen-two/linux-next (849b022 Merge branch 'stable/for-linus-3.9-take-two' into linux-next) $ git merge xen-two/linux-next Auto-merging arch/x86/xen/Kconfig Merge made by the 'recursive' strategy. arch/arm/Kconfig | 3 +- arch/arm/include/asm/xen/events.h | 25 +----- arch/x86/include/asm/xen/interface.h | 11 ++- arch/x86/include/asm/xen/page.h | 3 + arch/x86/xen/Kconfig | 8 ++ arch/x86/xen/enlighten.c | 76 ++++++++++++---- arch/x86/xen/irq.c | 5 +- arch/x86/xen/mmu.c | 158 +++++++++++++++++++++++++++++++--- arch/x86/xen/mmu.h | 2 + arch/x86/xen/p2m.c | 2 +- arch/x86/xen/setup.c | 59 ++++++++++--- arch/x86/xen/smp.c | 39 ++++++--- arch/x86/xen/xen-head.S | 10 ++- drivers/acpi/processor_perflib.c | 4 +- drivers/xen/balloon.c | 14 +-- drivers/xen/cpu_hotplug.c | 4 +- drivers/xen/events.c | 9 +- drivers/xen/gntdev.c | 3 +- drivers/xen/grant-table.c | 64 +++++++++++++- drivers/xen/privcmd.c | 2 +- drivers/xen/xen-acpi-processor.c | 8 +- drivers/xen/xen-pciback/pciback_ops.c | 3 +- drivers/xen/xen-stub.c | 1 - drivers/xen/xenbus/xenbus_client.c | 3 +- include/acpi/processor.h | 3 + 25 files changed, 418 insertions(+), 101 deletions(-) Merging xen-pvhvm/linux-next (b056b6a xen: suspend: remove xen_hvm_suspend) $ git merge xen-pvhvm/linux-next Already up-to-date. Merging percpu/for-next (5479c78 mm, percpu: Make sure percpu_alloc early parameter has an argument) $ git merge percpu/for-next Already up-to-date. Merging workqueues/for-next (38ff3ad Merge branch 'for-3.10' into for-next) $ git merge workqueues/for-next Merge made by the 'recursive' strategy. include/linux/workqueue.h | 2 +- kernel/workqueue.c | 70 ++++++++++++++++++++++++--------------------- kernel/workqueue_internal.h | 1 + 3 files changed, 40 insertions(+), 33 deletions(-) Merging drivers-x86/linux-next (e6e5224 ideapad-laptop: Depend on BACKLIGHT_CLASS_DEVICE instead of selecting it) $ git merge drivers-x86/linux-next Recorded preimage for 'drivers/platform/x86/chromeos_laptop.c' Auto-merging drivers/platform/x86/chromeos_laptop.c CONFLICT (content): Merge conflict in drivers/platform/x86/chromeos_laptop.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'drivers/platform/x86/chromeos_laptop.c'. [master 0c864cd] Merge remote-tracking branch 'drivers-x86/linux-next' $ git diff -M --stat --summary HEAD^.. Merging hwpoison/hwpoison (46e387b Merge branch 'hwpoison-hugepages' into hwpoison) $ git merge hwpoison/hwpoison Already up-to-date. Merging sysctl/master (4e474a0 sysctl: protect poll() in entries that may go away) $ git merge sysctl/master Already up-to-date. Merging regmap/for-next (d04f1a3 Merge remote-tracking branch 'regmap/topic/range' into regmap-next) $ git merge regmap/for-next Merge made by the 'recursive' strategy. drivers/base/regmap/internal.h | 12 +++-- drivers/base/regmap/regcache-lzo.c | 6 +-- drivers/base/regmap/regcache-rbtree.c | 56 ++++++++++----------- drivers/base/regmap/regcache.c | 43 +++++++++------- drivers/base/regmap/regmap-debugfs.c | 94 ++++++++++++++++++++++++++++++++--- drivers/base/regmap/regmap.c | 60 ++++++++++++++++------ include/trace/events/regmap.h | 48 ++++++++++++++++++ 7 files changed, 238 insertions(+), 81 deletions(-) Merging hsi/for-next (43139a6 HSI: hsi_char: Update ioctl-number.txt) $ git merge hsi/for-next Already up-to-date. Merging leds/for-next (4b07c5d leds: leds-sunfire: use dev_err()/pr_err() instead of printk()) $ git merge leds/for-next Already up-to-date. Merging driver-core/driver-core-next (f6161aa Linux 3.9-rc2) $ git merge driver-core/driver-core-next Already up-to-date. Merging tty/tty-next (f6161aa Linux 3.9-rc2) $ git merge tty/tty-next Already up-to-date. Merging usb/usb-next (f6161aa Linux 3.9-rc2) $ git merge usb/usb-next Already up-to-date. Merging usb-gadget/next (6dbe51c Linux 3.9-rc1) $ git merge usb-gadget/next Already up-to-date. Merging staging/staging-next (6f98b1a Staging: Netlogic XLR/XLS GMAC driver) $ git merge staging/staging-next Removing drivers/staging/vt6656/ttype.h Auto-merging drivers/staging/vt6656/main_usb.c Auto-merging drivers/staging/vt6656/card.c Auto-merging drivers/staging/omap-thermal/omap5-thermal-data.c Auto-merging drivers/staging/omap-thermal/omap4-thermal-data.c Auto-merging drivers/staging/comedi/drivers/usbduxsigma.c Auto-merging drivers/staging/comedi/drivers/usbdux.c Merge made by the 'recursive' strategy. drivers/staging/Kconfig | 2 + drivers/staging/Makefile | 1 + drivers/staging/android/Kconfig | 27 + drivers/staging/android/Makefile | 2 + drivers/staging/android/ashmem.c | 66 +- drivers/staging/android/ashmem.h | 7 + drivers/staging/android/logger.c | 196 +- drivers/staging/android/logger.h | 40 +- drivers/staging/android/lowmemorykiller.c | 5 +- drivers/staging/android/sw_sync.c | 263 +++ drivers/staging/android/sw_sync.h | 58 + drivers/staging/android/sync.c | 1016 ++++++++++ drivers/staging/android/sync.h | 426 ++++ drivers/staging/android/trace/sync.h | 82 + drivers/staging/bcm/Bcmchar.c | 2 +- drivers/staging/bcm/InterfaceDld.c | 32 +- drivers/staging/bcm/PHSModule.c | 1906 +++++++++--------- drivers/staging/bcm/nvm.c | 14 +- drivers/staging/comedi/comedi_pci.c | 6 +- drivers/staging/comedi/comedidev.h | 3 +- drivers/staging/comedi/drivers/8255_pci.c | 160 +- .../comedi/drivers/addi-data/APCI1710_Ssi.c | 4 +- .../staging/comedi/drivers/addi-data/addi_common.c | 23 +- .../staging/comedi/drivers/addi-data/addi_common.h | 2 - drivers/staging/comedi/drivers/addi_apci_035.c | 19 +- drivers/staging/comedi/drivers/addi_apci_1032.c | 4 +- drivers/staging/comedi/drivers/addi_apci_1500.c | 19 +- drivers/staging/comedi/drivers/addi_apci_1516.c | 56 +- drivers/staging/comedi/drivers/addi_apci_1564.c | 19 +- drivers/staging/comedi/drivers/addi_apci_16xx.c | 55 +- drivers/staging/comedi/drivers/addi_apci_1710.c | 40 +- drivers/staging/comedi/drivers/addi_apci_2032.c | 4 +- drivers/staging/comedi/drivers/addi_apci_2200.c | 4 +- drivers/staging/comedi/drivers/addi_apci_3120.c | 44 +- drivers/staging/comedi/drivers/addi_apci_3200.c | 49 +- drivers/staging/comedi/drivers/addi_apci_3501.c | 4 +- drivers/staging/comedi/drivers/addi_apci_3xxx.c | 225 ++- drivers/staging/comedi/drivers/adl_pci6208.c | 49 +- drivers/staging/comedi/drivers/adl_pci7x3x.c | 81 +- drivers/staging/comedi/drivers/adl_pci8164.c | 330 +--- drivers/staging/comedi/drivers/adl_pci9111.c | 5 +- drivers/staging/comedi/drivers/adl_pci9118.c | 5 +- drivers/staging/comedi/drivers/adv_pci1710.c | 101 +- drivers/staging/comedi/drivers/adv_pci1723.c | 5 +- drivers/staging/comedi/drivers/adv_pci_dio.c | 156 +- drivers/staging/comedi/drivers/amplc_dio200.c | 6 +- drivers/staging/comedi/drivers/amplc_pc236.c | 5 +- drivers/staging/comedi/drivers/amplc_pc263.c | 6 +- drivers/staging/comedi/drivers/amplc_pci224.c | 6 +- drivers/staging/comedi/drivers/amplc_pci230.c | 5 +- drivers/staging/comedi/drivers/cb_pcidas.c | 85 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 913 +++++---- drivers/staging/comedi/drivers/cb_pcidda.c | 81 +- drivers/staging/comedi/drivers/cb_pcimdas.c | 5 +- drivers/staging/comedi/drivers/cb_pcimdda.c | 5 +- drivers/staging/comedi/drivers/contec_pci_dio.c | 5 +- drivers/staging/comedi/drivers/daqboard2000.c | 5 +- drivers/staging/comedi/drivers/das08.h | 1 - drivers/staging/comedi/drivers/das08_cs.c | 1 - drivers/staging/comedi/drivers/das08_pci.c | 6 +- drivers/staging/comedi/drivers/dt3000.c | 88 +- drivers/staging/comedi/drivers/dyna_pci10xx.c | 5 +- drivers/staging/comedi/drivers/gsc_hpdi.c | 4 +- drivers/staging/comedi/drivers/icp_multi.c | 6 +- drivers/staging/comedi/drivers/jr3_pci.c | 4 +- drivers/staging/comedi/drivers/ke_counter.c | 5 +- drivers/staging/comedi/drivers/me4000.c | 135 +- drivers/staging/comedi/drivers/me_daq.c | 53 +- drivers/staging/comedi/drivers/ni_6527.c | 77 +- drivers/staging/comedi/drivers/ni_65xx.c | 378 ++-- drivers/staging/comedi/drivers/ni_660x.c | 91 +- drivers/staging/comedi/drivers/ni_670x.c | 57 +- drivers/staging/comedi/drivers/ni_labpc.c | 4 +- drivers/staging/comedi/drivers/ni_mio_common.c | 343 ++-- drivers/staging/comedi/drivers/ni_pcidio.c | 61 +- drivers/staging/comedi/drivers/ni_pcimio.c | 2050 +++++++++----------- drivers/staging/comedi/drivers/ni_stc.h | 4 - drivers/staging/comedi/drivers/pcl816.c | 2 +- drivers/staging/comedi/drivers/rtd520.c | 42 +- drivers/staging/comedi/drivers/s626.c | 4 +- drivers/staging/comedi/drivers/skel.c | 111 +- drivers/staging/comedi/drivers/usbdux.c | 2 +- drivers/staging/comedi/drivers/usbduxsigma.c | 2 +- drivers/staging/csr/csr_time.c | 8 +- drivers/staging/dgrp/dgrp_net_ops.c | 2 +- drivers/staging/gdm72xx/gdm_qos.c | 47 +- drivers/staging/gdm72xx/netlink_k.c | 1 + drivers/staging/gdm72xx/sdio_boot.c | 1 + drivers/staging/line6/pod.c | 3 +- drivers/staging/netlogic/Kconfig | 7 + drivers/staging/netlogic/Makefile | 1 + drivers/staging/netlogic/TODO | 12 + drivers/staging/netlogic/platform_net.c | 223 +++ drivers/staging/netlogic/platform_net.h | 46 + drivers/staging/netlogic/xlr_net.c | 1116 +++++++++++ drivers/staging/netlogic/xlr_net.h | 1099 +++++++++++ drivers/staging/omap-thermal/Makefile | 4 +- drivers/staging/omap-thermal/omap-bandgap.c | 89 +- drivers/staging/omap-thermal/omap-bandgap.h | 94 +- .../{omap4-thermal.c => omap4-thermal-data.c} | 3 + .../{omap5-thermal.c => omap5-thermal-data.c} | 252 ++- drivers/staging/omap-thermal/omap_bandgap.txt | 36 +- drivers/staging/rtl8712/rtl8712_led.c | 8 +- drivers/staging/rtl8712/rtl871x_recv.h | 108 -- drivers/staging/sep/sep_main.c | 7 +- drivers/staging/sep/sep_trace_events.h | 11 +- drivers/staging/silicom/bp_mod.c | 10 +- drivers/staging/silicom/bypasslib/bypass.c | 94 +- drivers/staging/slicoss/slicoss.c | 132 +- drivers/staging/sm7xxfb/sm7xxfb.c | 10 +- drivers/staging/usbip/stub_dev.c | 6 +- drivers/staging/usbip/userspace/libsrc/names.c | 532 ++--- drivers/staging/usbip/userspace/libsrc/names.h | 3 +- .../staging/usbip/userspace/libsrc/usbip_common.c | 28 +- .../staging/usbip/userspace/libsrc/usbip_common.h | 11 +- .../staging/usbip/userspace/libsrc/vhci_driver.c | 40 +- drivers/staging/usbip/userspace/src/usbip_detach.c | 2 +- .../staging/usbip/userspace/src/usbip_network.c | 2 +- .../staging/usbip/userspace/src/usbip_network.h | 4 +- drivers/staging/usbip/userspace/src/usbipd.c | 4 +- drivers/staging/usbip/vhci_hcd.c | 5 +- drivers/staging/vt6656/80211hdr.h | 122 +- drivers/staging/vt6656/80211mgr.c | 108 +- drivers/staging/vt6656/80211mgr.h | 309 ++- drivers/staging/vt6656/TODO | 2 +- drivers/staging/vt6656/aes_ccmp.c | 104 +- drivers/staging/vt6656/aes_ccmp.h | 4 +- drivers/staging/vt6656/baseband.c | 48 +- drivers/staging/vt6656/baseband.h | 7 +- drivers/staging/vt6656/bssdb.c | 25 +- drivers/staging/vt6656/bssdb.h | 108 +- drivers/staging/vt6656/card.c | 64 +- drivers/staging/vt6656/card.h | 9 +- drivers/staging/vt6656/channel.c | 14 +- drivers/staging/vt6656/channel.h | 7 +- drivers/staging/vt6656/control.h | 1 - drivers/staging/vt6656/datarate.c | 37 +- drivers/staging/vt6656/datarate.h | 10 +- drivers/staging/vt6656/desc.h | 230 +-- drivers/staging/vt6656/device.h | 23 +- drivers/staging/vt6656/device_cfg.h | 2 - drivers/staging/vt6656/dpc.c | 122 +- drivers/staging/vt6656/dpc.h | 1 - drivers/staging/vt6656/firmware.c | 2 +- drivers/staging/vt6656/firmware.h | 1 - drivers/staging/vt6656/hostap.c | 12 +- drivers/staging/vt6656/int.c | 16 +- drivers/staging/vt6656/int.h | 39 +- drivers/staging/vt6656/iocmd.h | 2 - drivers/staging/vt6656/iwctl.c | 24 +- drivers/staging/vt6656/key.c | 14 +- drivers/staging/vt6656/key.h | 23 +- drivers/staging/vt6656/mac.c | 52 +- drivers/staging/vt6656/mac.h | 1 - drivers/staging/vt6656/main_usb.c | 18 +- drivers/staging/vt6656/mib.c | 36 +- drivers/staging/vt6656/mib.h | 269 ++- drivers/staging/vt6656/michael.c | 40 +- drivers/staging/vt6656/michael.h | 8 +- drivers/staging/vt6656/power.c | 3 +- drivers/staging/vt6656/rc4.c | 22 +- drivers/staging/vt6656/rc4.h | 8 +- drivers/staging/vt6656/rf.c | 8 +- drivers/staging/vt6656/rf.h | 1 - drivers/staging/vt6656/rndis.h | 78 +- drivers/staging/vt6656/rxtx.c | 386 ++-- drivers/staging/vt6656/rxtx.h | 655 ++++--- drivers/staging/vt6656/srom.h | 58 +- drivers/staging/vt6656/tcrc.c | 12 +- drivers/staging/vt6656/tcrc.h | 8 +- drivers/staging/vt6656/tether.c | 14 +- drivers/staging/vt6656/tether.h | 33 +- drivers/staging/vt6656/tkip.c | 14 +- drivers/staging/vt6656/tkip.h | 11 +- drivers/staging/vt6656/tmacro.h | 14 +- drivers/staging/vt6656/ttype.h | 55 - drivers/staging/vt6656/usbpipe.h | 1 - drivers/staging/vt6656/wcmd.c | 7 +- drivers/staging/vt6656/wcmd.h | 6 +- drivers/staging/vt6656/wctl.c | 6 +- drivers/staging/vt6656/wctl.h | 1 - drivers/staging/vt6656/wmgr.c | 118 +- drivers/staging/vt6656/wmgr.h | 1 - drivers/staging/vt6656/wpa.c | 29 +- drivers/staging/vt6656/wpa.h | 5 +- drivers/staging/vt6656/wpa2.c | 40 +- drivers/staging/vt6656/wpa2.h | 5 +- drivers/staging/vt6656/wpactl.c | 20 +- drivers/staging/wlan-ng/prism2sta.c | 51 +- drivers/staging/zcache/Kconfig | 8 + drivers/staging/zcache/Makefile | 1 + drivers/staging/zcache/debug.c | 71 + drivers/staging/zcache/debug.h | 231 +++ drivers/staging/zcache/zcache-main.c | 405 +--- 194 files changed, 11332 insertions(+), 7309 deletions(-) create mode 100644 drivers/staging/android/sw_sync.c create mode 100644 drivers/staging/android/sw_sync.h create mode 100644 drivers/staging/android/sync.c create mode 100644 drivers/staging/android/sync.h create mode 100644 drivers/staging/android/trace/sync.h create mode 100644 drivers/staging/netlogic/Kconfig create mode 100644 drivers/staging/netlogic/Makefile create mode 100644 drivers/staging/netlogic/TODO create mode 100644 drivers/staging/netlogic/platform_net.c create mode 100644 drivers/staging/netlogic/platform_net.h create mode 100644 drivers/staging/netlogic/xlr_net.c create mode 100644 drivers/staging/netlogic/xlr_net.h rename drivers/staging/omap-thermal/{omap4-thermal.c => omap4-thermal-data.c} (98%) rename drivers/staging/omap-thermal/{omap5-thermal.c => omap5-thermal-data.c} (50%) delete mode 100644 drivers/staging/vt6656/ttype.h create mode 100644 drivers/staging/zcache/debug.c create mode 100644 drivers/staging/zcache/debug.h Merging char-misc/char-misc-next (f6161aa Linux 3.9-rc2) $ git merge char-misc/char-misc-next Already up-to-date. Merging tmem/linux-next (8f0d816 Linux 3.7-rc3) $ git merge tmem/linux-next Already up-to-date. Merging writeback/writeback-for-next (ed84825 Negative (setpoint-dirty) in bdi_position_ratio()) $ git merge writeback/writeback-for-next Already up-to-date. Merging arm-dt/devicetree/arm-next (ede338f dt: add documentation of ARM dt boot interface) $ git merge arm-dt/devicetree/arm-next Already up-to-date. Merging hwspinlock/linux-next (8b37fcf hwspinlock: add MAINTAINERS entries) $ git merge hwspinlock/linux-next Already up-to-date. Merging pinctrl/for-next (cac7a14 Merge branch 'devel' into for-next) $ git merge pinctrl/for-next Merge made by the 'recursive' strategy. Documentation/devicetree/bindings/gpio/gpio.txt | 6 +- .../devicetree/bindings/pinctrl/pinctrl-single.txt | 107 ++- arch/arm/boot/dts/spear1310.dtsi | 4 +- arch/arm/boot/dts/spear1340.dtsi | 4 +- arch/arm/boot/dts/spear310.dtsi | 4 +- arch/arm/boot/dts/spear320.dtsi | 4 +- drivers/gpio/gpio-pl061.c | 117 ++- drivers/gpio/gpiolib-of.c | 20 +- drivers/pinctrl/Kconfig | 1 + drivers/pinctrl/core.c | 39 +- drivers/pinctrl/devicetree.c | 4 +- drivers/pinctrl/mvebu/pinctrl-mvebu.c | 6 +- drivers/pinctrl/pinconf-generic.c | 14 + drivers/pinctrl/pinconf.c | 2 +- drivers/pinctrl/pinconf.h | 8 + drivers/pinctrl/pinctrl-abx500.c | 7 +- drivers/pinctrl/pinctrl-at91.c | 6 +- drivers/pinctrl/pinctrl-bcm2835.c | 6 +- drivers/pinctrl/pinctrl-exynos5440.c | 6 +- drivers/pinctrl/pinctrl-falcon.c | 2 +- drivers/pinctrl/pinctrl-imx.c | 6 +- drivers/pinctrl/pinctrl-lantiq.c | 4 +- drivers/pinctrl/pinctrl-mxs.c | 6 +- drivers/pinctrl/pinctrl-nomadik.c | 6 +- drivers/pinctrl/pinctrl-pxa3xx.c | 4 +- drivers/pinctrl/pinctrl-samsung.c | 6 +- drivers/pinctrl/pinctrl-single.c | 515 ++++++++++- drivers/pinctrl/pinctrl-sirf.c | 4 +- drivers/pinctrl/pinctrl-sunxi.c | 978 ++++++++++++++++----- drivers/pinctrl/pinctrl-tegra.c | 6 +- drivers/pinctrl/pinctrl-u300.c | 6 +- drivers/pinctrl/pinctrl-xway.c | 2 +- drivers/pinctrl/spear/pinctrl-spear.c | 4 +- include/linux/pinctrl/pinctrl.h | 6 +- 34 files changed, 1550 insertions(+), 370 deletions(-) Merging vhost/linux-next (0e9ff68 vhost-blk: add eventfd dependency) $ git merge vhost/linux-next Auto-merging drivers/vhost/Kconfig Merge made by the 'recursive' strategy. drivers/vhost/Kconfig | 1 + drivers/vhost/Kconfig.blk | 10 + drivers/vhost/Makefile | 2 + drivers/vhost/blk.c | 727 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/vhost/blk.h | 8 + 5 files changed, 748 insertions(+) create mode 100644 drivers/vhost/Kconfig.blk create mode 100644 drivers/vhost/blk.c create mode 100644 drivers/vhost/blk.h Merging memblock/memblock-kill-early_node_map (7bd0b0f memblock: Reimplement memblock allocation using reverse free area iterator) $ git merge memblock/memblock-kill-early_node_map Already up-to-date. Merging remoteproc/for-next (6f0c058 Linux 3.7-rc2) $ git merge remoteproc/for-next Already up-to-date. Merging irqdomain/irqdomain/next (560aa53 irqdomain: document the simple domain first_irq) $ git merge irqdomain/irqdomain/next Merge made by the 'recursive' strategy. kernel/irq/irqdomain.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) Merging gpio/gpio/next (7ff2db4 gpio/em: Add Device Tree support) $ git merge gpio/gpio/next Merge made by the 'recursive' strategy. drivers/gpio/gpio-em.c | 45 ++++++++++++++++++++++++++-- drivers/gpio/gpio-omap.c | 75 +++++++++++++++++++++------------------------- drivers/gpio/gpio-palmas.c | 75 ++++++++++++++++++++++++++++++++++++++-------- drivers/gpio/gpio-tegra.c | 11 ++++--- include/linux/mfd/palmas.h | 12 +++++++- 5 files changed, 154 insertions(+), 64 deletions(-) $ git revert 82d4d6637fdf [master 2603596] Revert "gpio/palmas: add in GPIO support for palmas charger" 2 files changed, 14 insertions(+), 73 deletions(-) Merging gpio-lw/for-next (c7886b1 gpio: em: Use irq_domain_add_simple() to fix runtime error) $ git merge gpio-lw/for-next Already up-to-date. Merging arm-soc/for-next (0d8abbf Arm: socfpga: pl330: Add #dma-cells for generic dma binding support) $ git merge arm-soc/for-next Auto-merging arch/arm/Kconfig Merge made by the 'recursive' strategy. arch/arm/Kconfig | 8 ++++--- arch/arm/Kconfig.debug | 2 +- arch/arm/boot/Makefile | 2 +- arch/arm/boot/dts/armada-370-rd.dts | 8 +++++++ arch/arm/boot/dts/armada-370-xp.dtsi | 5 ++-- arch/arm/boot/dts/armada-xp.dtsi | 4 ++-- arch/arm/boot/dts/bcm2835.dtsi | 2 +- arch/arm/boot/dts/dove.dtsi | 5 ++++ arch/arm/boot/dts/imx53-mba53.dts | 3 +-- arch/arm/boot/dts/kirkwood-dns320.dts | 2 -- arch/arm/boot/dts/kirkwood-dns325.dts | 1 - arch/arm/boot/dts/kirkwood-dockstar.dts | 1 - arch/arm/boot/dts/kirkwood-dreamplug.dts | 1 - arch/arm/boot/dts/kirkwood-goflexnet.dts | 1 - arch/arm/boot/dts/kirkwood-ib62x0.dts | 1 - arch/arm/boot/dts/kirkwood-iconnect.dts | 1 - arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 1 - arch/arm/boot/dts/kirkwood-km_kirkwood.dts | 1 - arch/arm/boot/dts/kirkwood-lschlv2.dts | 1 - arch/arm/boot/dts/kirkwood-lsxhl.dts | 1 - arch/arm/boot/dts/kirkwood-mplcec4.dts | 1 - arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 1 - arch/arm/boot/dts/kirkwood-nsa310.dts | 1 - arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 -- arch/arm/boot/dts/kirkwood-topkick.dts | 1 - arch/arm/boot/dts/kirkwood.dtsi | 5 ++-- .../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 2 +- arch/arm/boot/dts/socfpga.dtsi | 3 +++ arch/arm/boot/dts/tegra20.dtsi | 1 + arch/arm/boot/dts/tegra30.dtsi | 1 + arch/arm/configs/mxs_defconfig | 1 + arch/arm/configs/omap2plus_defconfig | 2 ++ arch/arm/mach-imx/clk-imx6q.c | 2 +- arch/arm/mach-imx/headsmp.S | 18 +++++++------- arch/arm/mach-imx/pm-imx6q.c | 15 ------------ arch/arm/mach-kirkwood/board-dt.c | 25 +++++++++++++------ arch/arm/mach-mxs/icoll.c | 2 +- arch/arm/mach-mxs/mach-mxs.c | 10 ++++---- arch/arm/mach-mxs/mm.c | 1 + arch/arm/mach-mxs/ocotp.c | 1 + arch/arm/mach-omap1/common.h | 2 ++ arch/arm/mach-omap2/Kconfig | 6 ----- arch/arm/mach-omap2/board-generic.c | 2 ++ arch/arm/mach-omap2/board-rx51.c | 2 ++ arch/arm/mach-omap2/common.h | 1 - arch/arm/mach-omap2/gpmc.c | 6 ++--- arch/arm/mach-omap2/mux.c | 9 +++---- arch/arm/plat-orion/addr-map.c | 7 ++++-- arch/arm/plat-spear/Kconfig | 2 +- drivers/clk/tegra/clk-tegra20.c | 1 - drivers/clk/tegra/clk-tegra30.c | 1 - drivers/gpio/gpio-mvebu.c | 7 ++++++ drivers/irqchip/irq-gic.c | 2 +- drivers/rtc/rtc-mv.c | 28 ++++++++++++++++++---- drivers/video/omap/lcd_ams_delta.c | 1 + drivers/video/omap/lcd_osk.c | 3 +++ 56 files changed, 130 insertions(+), 96 deletions(-) Merging bcm2835/for-next (836dc9e Linux 3.8-rc7) $ git merge bcm2835/for-next Already up-to-date. Merging cortex/for-next (6ebd4d0 ARM: stub out read_cpuid and read_cpuid_ext for CPU_CP15=n) $ git merge cortex/for-next Resolved 'arch/arm/include/asm/cputype.h' using previous resolution. Auto-merging arch/arm/mm/mmu.c Auto-merging arch/arm/mm/alignment.c Auto-merging arch/arm/mm/Kconfig Auto-merging arch/arm/mach-omap2/omap-smp.c Auto-merging arch/arm/mach-omap2/id.c Auto-merging arch/arm/kernel/smp_scu.c Auto-merging arch/arm/include/asm/cputype.h CONFLICT (content): Merge conflict in arch/arm/include/asm/cputype.h Auto-merging arch/arm/Kconfig Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a [master 6f3a5ae] Merge remote-tracking branch 'cortex/for-next' $ git diff -M --stat --summary HEAD^.. arch/arm/Kconfig | 3 ++- arch/arm/include/asm/cp15.h | 16 +++++++++++++++- arch/arm/include/asm/cputype.h | 31 +++++++++++++++++++++++++++---- arch/arm/include/asm/glue-df.h | 20 ++++++++++---------- arch/arm/kernel/head-common.S | 9 +++++++-- arch/arm/kernel/head-nommu.S | 8 +++++++- arch/arm/kernel/setup.c | 2 +- arch/arm/kernel/smp_scu.c | 2 +- arch/arm/mach-omap2/id.c | 4 ++-- arch/arm/mach-omap2/omap-smp.c | 2 +- arch/arm/mm/Kconfig | 9 ++++++++- arch/arm/mm/alignment.c | 2 ++ arch/arm/mm/mmu.c | 17 +++++++++++++++++ 13 files changed, 100 insertions(+), 25 deletions(-) Merging ep93xx/ep93xx-for-next (cf92d86 Merge branch 'ep93xx-fixes' into ep93xx-for-next) $ git merge ep93xx/ep93xx-for-next Already up-to-date! Merge made by the 'recursive' strategy. Merging ixp4xx/next (19f949f Linux 3.8) $ git merge ixp4xx/next Already up-to-date. Merging msm/for-next (6f09953 Merge branch 'msm-defconfig' into for-next) $ git merge msm/for-next Removing arch/arm/mach-msm/include/mach/cpu.h Merge made by the 'recursive' strategy. arch/arm/configs/msm_defconfig | 153 +++++++++++++++++------- arch/arm/mach-msm/board-halibut.c | 1 + arch/arm/mach-msm/board-msm7x30.c | 1 + arch/arm/mach-msm/board-qsd8x50.c | 1 + arch/arm/mach-msm/board-trout.c | 1 + arch/arm/mach-msm/devices-msm7x00.c | 31 +++++ arch/arm/mach-msm/devices-msm7x30.c | 31 +++++ arch/arm/mach-msm/devices-qsd8x50.c | 31 +++++ arch/arm/mach-msm/devices.h | 4 + arch/arm/mach-msm/dma.c | 26 +++++ arch/arm/mach-msm/include/mach/cpu.h | 54 --------- arch/arm/mach-msm/include/mach/dma.h | 26 ----- drivers/gpio/gpio-msm-v1.c | 220 ++++++++++++++++++++++++----------- drivers/mmc/host/msm_sdcc.c | 1 - 14 files changed, 384 insertions(+), 197 deletions(-) delete mode 100644 arch/arm/mach-msm/include/mach/cpu.h Merging renesas/next (d34cef5 Merge branches 'heads/defconfig', 'heads/boards3', 'heads/clocksource' and 'heads/intc-external-irq' into next) $ git merge renesas/next Recorded preimage for 'arch/arm/mach-shmobile/setup-sh73a0.c' Auto-merging drivers/irqchip/Makefile Auto-merging arch/arm/mach-shmobile/setup-sh73a0.c CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/setup-sh73a0.c Removing arch/arm/mach-shmobile/hotplug.c Auto-merging arch/arm/mach-shmobile/headsmp-scu.S Auto-merging arch/arm/mach-shmobile/board-mackerel.c Auto-merging arch/arm/mach-shmobile/board-kzm9g.c Auto-merging arch/arm/mach-shmobile/board-armadillo800eva.c Auto-merging arch/arm/configs/marzen_defconfig Auto-merging arch/arm/boot/dts/Makefile Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/arm/mach-shmobile/setup-sh73a0.c'. [master 4c2a0a9] Merge remote-tracking branch 'renesas/next' $ git diff -M --stat --summary HEAD^.. arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/r8a7779-marzen-reference.dts | 47 ++ arch/arm/boot/dts/r8a7779.dtsi | 98 +++++ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 77 ++++ arch/arm/configs/armadillo800eva_defconfig | 8 +- arch/arm/configs/kzm9g_defconfig | 2 - arch/arm/configs/mackerel_defconfig | 4 + arch/arm/configs/marzen_defconfig | 4 + arch/arm/mach-shmobile/Kconfig | 29 ++ arch/arm/mach-shmobile/Makefile | 9 +- arch/arm/mach-shmobile/board-armadillo800eva.c | 110 ++++- arch/arm/mach-shmobile/board-kzm9g-reference.c | 104 +++++ arch/arm/mach-shmobile/board-kzm9g.c | 18 +- arch/arm/mach-shmobile/board-mackerel.c | 106 ++--- arch/arm/mach-shmobile/board-marzen-reference.c | 72 ++++ arch/arm/mach-shmobile/board-marzen.c | 13 +- arch/arm/mach-shmobile/clock-r8a7740.c | 13 + arch/arm/mach-shmobile/clock-r8a7779.c | 4 + arch/arm/mach-shmobile/clock-sh73a0.c | 7 +- .../{headsmp-sh73a0.S => headsmp-scu.S} | 15 +- arch/arm/mach-shmobile/hotplug.c | 68 --- arch/arm/mach-shmobile/include/mach/common.h | 22 +- arch/arm/mach-shmobile/include/mach/irqs.h | 5 + arch/arm/mach-shmobile/intc-r8a7779.c | 78 +++- arch/arm/mach-shmobile/intc-sh73a0.c | 125 ------ arch/arm/mach-shmobile/setup-emev2.c | 4 +- arch/arm/mach-shmobile/setup-r8a7779.c | 104 ++++- arch/arm/mach-shmobile/setup-sh73a0.c | 162 +++++-- arch/arm/mach-shmobile/smp-emev2.c | 86 +--- arch/arm/mach-shmobile/smp-r8a7779.c | 129 +++--- arch/arm/mach-shmobile/smp-sh73a0.c | 36 +- drivers/clocksource/sh_cmt.c | 187 +++++--- drivers/irqchip/Kconfig | 8 + drivers/irqchip/Makefile | 2 + drivers/irqchip/irq-renesas-intc-irqpin.c | 471 +++++++++++++++++++++ drivers/irqchip/irq-renesas-irqc.c | 307 ++++++++++++++ drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 6 +- .../linux/platform_data/irq-renesas-intc-irqpin.h | 29 ++ include/linux/platform_data/irq-renesas-irqc.h | 27 ++ 39 files changed, 1993 insertions(+), 605 deletions(-) create mode 100644 arch/arm/boot/dts/r8a7779-marzen-reference.dts create mode 100644 arch/arm/boot/dts/r8a7779.dtsi create mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts create mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c create mode 100644 arch/arm/mach-shmobile/board-marzen-reference.c rename arch/arm/mach-shmobile/{headsmp-sh73a0.S => headsmp-scu.S} (85%) delete mode 100644 arch/arm/mach-shmobile/hotplug.c create mode 100644 drivers/irqchip/irq-renesas-intc-irqpin.c create mode 100644 drivers/irqchip/irq-renesas-irqc.c create mode 100644 include/linux/platform_data/irq-renesas-intc-irqpin.h create mode 100644 include/linux/platform_data/irq-renesas-irqc.h Merging samsung/for-next (9daee5a Merge branch 'next/clk-exynos' into for-next) $ git merge samsung/for-next Auto-merging drivers/pinctrl/pinctrl-samsung.c Auto-merging drivers/clocksource/exynos_mct.c Removing arch/arm/plat-samsung/time.c Auto-merging arch/arm/plat-samsung/samsung-time.c Removing arch/arm/plat-samsung/include/plat/s5p-time.h Removing arch/arm/plat-samsung/include/plat/s3c244x.h Removing arch/arm/plat-samsung/include/plat/s3c2443.h Removing arch/arm/plat-samsung/include/plat/s3c2416.h Removing arch/arm/plat-samsung/include/plat/s3c2412.h Removing arch/arm/plat-samsung/include/plat/s3c2410.h Removing arch/arm/plat-samsung/include/plat/irq.h Removing arch/arm/mach-s3c24xx/irq-s3c244x.c Removing arch/arm/mach-s3c24xx/irq-s3c2440.c Removing arch/arm/mach-s3c24xx/irq-s3c2412.c Removing arch/arm/mach-s3c24xx/include/mach/regs-sdi.h Removing arch/arm/mach-s3c24xx/include/mach/entry-macro.S Auto-merging arch/arm/mach-s3c24xx/common-smdk.h Removing arch/arm/mach-exynos/include/mach/regs-mct.h Removing arch/arm/mach-exynos/clock-exynos5.c Removing arch/arm/mach-exynos/clock-exynos4212.c Removing arch/arm/mach-exynos/clock-exynos4210.c Removing arch/arm/mach-exynos/clock-exynos4.h Removing arch/arm/mach-exynos/clock-exynos4.c Auto-merging arch/arm/boot/dts/Makefile Auto-merging arch/arm/Kconfig Merge made by the 'recursive' strategy. Documentation/arm/firmware.txt | 88 ++ .../devicetree/bindings/arm/samsung-boards.txt | 10 + .../devicetree/bindings/clock/exynos4-clock.txt | 215 +++ .../devicetree/bindings/clock/exynos5250-clock.txt | 171 ++ .../devicetree/bindings/clock/exynos5440-clock.txt | 61 + .../devicetree/bindings/media/s5p-mfc.txt | 21 + .../bindings/timer/samsung,exynos4210-mct.txt | 68 + .../devicetree/bindings/usb/exynos-usb.txt | 40 + arch/arm/Kconfig | 15 +- arch/arm/boot/dts/Makefile | 3 + arch/arm/boot/dts/cros5250-common.dtsi | 138 ++ arch/arm/boot/dts/exynos4.dtsi | 67 + arch/arm/boot/dts/exynos4210-origen.dts | 18 + arch/arm/boot/dts/exynos4210-smdkv310.dts | 18 + arch/arm/boot/dts/exynos4210-trats.dts | 12 + arch/arm/boot/dts/exynos4210.dtsi | 36 + arch/arm/boot/dts/exynos4212.dtsi | 22 + arch/arm/boot/dts/exynos4412-odroidx.dts | 109 ++ arch/arm/boot/dts/exynos4412-origen.dts | 430 +++++ arch/arm/boot/dts/exynos4412-smdk4412.dts | 25 + arch/arm/boot/dts/exynos4412.dtsi | 26 + arch/arm/boot/dts/exynos4x12.dtsi | 6 + arch/arm/boot/dts/exynos5250-arndale.dts | 129 ++ arch/arm/boot/dts/exynos5250-smdk5250.dts | 20 + arch/arm/boot/dts/exynos5250-snow.dts | 11 + arch/arm/boot/dts/exynos5250.dtsi | 148 ++ arch/arm/boot/dts/exynos5440-ssdk5440.dts | 19 +- arch/arm/boot/dts/exynos5440.dtsi | 72 +- arch/arm/common/Makefile | 2 + arch/arm/common/firmware.c | 18 + arch/arm/include/asm/firmware.h | 66 + arch/arm/mach-exynos/Kconfig | 12 +- arch/arm/mach-exynos/Makefile | 12 +- arch/arm/mach-exynos/clock-exynos4.c | 1601 ------------------- arch/arm/mach-exynos/clock-exynos4.h | 35 - arch/arm/mach-exynos/clock-exynos4210.c | 187 --- arch/arm/mach-exynos/clock-exynos4212.c | 201 --- arch/arm/mach-exynos/clock-exynos5.c | 1645 -------------------- arch/arm/mach-exynos/common.c | 121 +- arch/arm/mach-exynos/common.h | 12 +- arch/arm/mach-exynos/cpuidle.c | 58 +- arch/arm/mach-exynos/dev-ohci.c | 2 +- arch/arm/mach-exynos/exynos-smc.S | 22 + arch/arm/mach-exynos/firmware.c | 70 + arch/arm/mach-exynos/include/mach/irqs.h | 19 +- arch/arm/mach-exynos/include/mach/map.h | 4 +- arch/arm/mach-exynos/include/mach/regs-clock.h | 107 -- arch/arm/mach-exynos/include/mach/regs-mct.h | 53 - arch/arm/mach-exynos/mach-armlex4210.c | 3 +- arch/arm/mach-exynos/mach-exynos4-dt.c | 123 +- arch/arm/mach-exynos/mach-exynos5-dt.c | 141 +- arch/arm/mach-exynos/mach-nuri.c | 5 +- arch/arm/mach-exynos/mach-origen.c | 7 +- arch/arm/mach-exynos/mach-smdk4x12.c | 5 +- arch/arm/mach-exynos/mach-smdkv310.c | 9 +- arch/arm/mach-exynos/mach-universal_c210.c | 9 +- arch/arm/mach-exynos/platsmp.c | 32 +- arch/arm/mach-exynos/smc.h | 31 + arch/arm/mach-s3c24xx/Kconfig | 7 + arch/arm/mach-s3c24xx/Makefile | 6 +- arch/arm/mach-s3c24xx/bast-irq.c | 2 - arch/arm/mach-s3c24xx/clock-s3c2410.c | 1 - arch/arm/mach-s3c24xx/clock-s3c2412.c | 1 - arch/arm/mach-s3c24xx/clock-s3c2416.c | 1 - arch/arm/mach-s3c24xx/clock-s3c2443.c | 1 - arch/arm/mach-s3c24xx/common-smdk.c | 3 +- .../include/plat => mach-s3c24xx}/common-smdk.h | 3 +- arch/arm/mach-s3c24xx/common.c | 7 +- arch/arm/mach-s3c24xx/common.h | 94 +- arch/arm/mach-s3c24xx/dma-s3c2410.c | 1 - arch/arm/mach-s3c24xx/dma-s3c2412.c | 1 - arch/arm/mach-s3c24xx/dma-s3c2440.c | 1 - arch/arm/mach-s3c24xx/dma-s3c2443.c | 1 - arch/arm/mach-s3c24xx/include/mach/entry-macro.S | 70 - arch/arm/mach-s3c24xx/include/mach/irqs.h | 58 +- arch/arm/mach-s3c24xx/include/mach/regs-sdi.h | 127 -- arch/arm/mach-s3c24xx/irq-pm.c | 7 +- arch/arm/mach-s3c24xx/irq-s3c2412.c | 215 --- arch/arm/mach-s3c24xx/irq-s3c2440.c | 128 -- arch/arm/mach-s3c24xx/irq-s3c244x.c | 142 -- arch/arm/mach-s3c24xx/irq.c | 391 ++++- arch/arm/mach-s3c24xx/mach-amlm5900.c | 7 +- arch/arm/mach-s3c24xx/mach-anubis.c | 6 +- arch/arm/mach-s3c24xx/mach-at2440evb.c | 6 +- arch/arm/mach-s3c24xx/mach-bast.c | 6 +- arch/arm/mach-s3c24xx/mach-gta02.c | 6 +- arch/arm/mach-s3c24xx/mach-h1940.c | 12 +- arch/arm/mach-s3c24xx/mach-jive.c | 8 +- arch/arm/mach-s3c24xx/mach-mini2440.c | 6 +- arch/arm/mach-s3c24xx/mach-n30.c | 11 +- arch/arm/mach-s3c24xx/mach-nexcoder.c | 8 +- arch/arm/mach-s3c24xx/mach-osiris.c | 6 +- arch/arm/mach-s3c24xx/mach-otom.c | 7 +- arch/arm/mach-s3c24xx/mach-qt2410.c | 8 +- arch/arm/mach-s3c24xx/mach-rx1950.c | 6 +- arch/arm/mach-s3c24xx/mach-rx3715.c | 11 +- arch/arm/mach-s3c24xx/mach-smdk2410.c | 9 +- arch/arm/mach-s3c24xx/mach-smdk2413.c | 19 +- arch/arm/mach-s3c24xx/mach-smdk2416.c | 8 +- arch/arm/mach-s3c24xx/mach-smdk2440.c | 11 +- arch/arm/mach-s3c24xx/mach-smdk2443.c | 9 +- arch/arm/mach-s3c24xx/mach-tct_hammer.c | 6 +- arch/arm/mach-s3c24xx/mach-vr1000.c | 6 +- arch/arm/mach-s3c24xx/mach-vstms.c | 9 +- arch/arm/mach-s3c24xx/pm-s3c2412.c | 9 +- arch/arm/mach-s3c24xx/s3c2410.c | 1 - arch/arm/mach-s3c24xx/s3c2412.c | 1 - arch/arm/mach-s3c24xx/s3c2416.c | 1 - arch/arm/mach-s3c24xx/s3c2440.c | 1 - arch/arm/mach-s3c24xx/s3c2442.c | 1 - arch/arm/mach-s3c24xx/s3c2443.c | 1 - arch/arm/mach-s3c24xx/s3c244x.c | 2 - arch/arm/mach-s3c64xx/Kconfig | 2 + arch/arm/mach-s3c64xx/mach-anw6410.c | 4 +- arch/arm/mach-s3c64xx/mach-crag6410.c | 4 +- arch/arm/mach-s3c64xx/mach-hmt.c | 4 +- arch/arm/mach-s3c64xx/mach-mini6410.c | 4 +- arch/arm/mach-s3c64xx/mach-ncp.c | 4 +- arch/arm/mach-s3c64xx/mach-real6410.c | 4 +- arch/arm/mach-s3c64xx/mach-smartq.c | 2 + arch/arm/mach-s3c64xx/mach-smartq5.c | 3 +- arch/arm/mach-s3c64xx/mach-smartq7.c | 3 +- arch/arm/mach-s3c64xx/mach-smdk6400.c | 4 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 4 +- arch/arm/mach-s5p64x0/Kconfig | 4 +- arch/arm/mach-s5p64x0/mach-smdk6440.c | 6 +- arch/arm/mach-s5p64x0/mach-smdk6450.c | 6 +- arch/arm/mach-s5pc100/Kconfig | 1 + arch/arm/mach-s5pc100/common.h | 9 - arch/arm/mach-s5pc100/mach-smdkc100.c | 4 +- arch/arm/mach-s5pv210/Kconfig | 2 +- arch/arm/mach-s5pv210/clock.c | 36 +- arch/arm/mach-s5pv210/common.h | 9 - arch/arm/mach-s5pv210/mach-aquila.c | 6 +- arch/arm/mach-s5pv210/mach-goni.c | 6 +- arch/arm/mach-s5pv210/mach-smdkc110.c | 6 +- arch/arm/mach-s5pv210/mach-smdkv210.c | 6 +- arch/arm/mach-s5pv210/mach-torbreck.c | 6 +- arch/arm/plat-samsung/Kconfig | 6 +- arch/arm/plat-samsung/Makefile | 3 +- arch/arm/plat-samsung/devs.c | 2 +- arch/arm/plat-samsung/include/plat/cpu.h | 15 +- arch/arm/plat-samsung/include/plat/irq.h | 116 -- arch/arm/plat-samsung/include/plat/map-s5p.h | 1 + arch/arm/plat-samsung/include/plat/s3c2410.h | 31 - arch/arm/plat-samsung/include/plat/s3c2412.h | 32 - arch/arm/plat-samsung/include/plat/s3c2416.h | 37 - arch/arm/plat-samsung/include/plat/s3c2443.h | 36 - arch/arm/plat-samsung/include/plat/s3c244x.h | 42 - arch/arm/plat-samsung/include/plat/s5p-time.h | 40 - arch/arm/plat-samsung/include/plat/samsung-time.h | 53 + .../plat-samsung/{s5p-time.c => samsung-time.c} | 138 +- arch/arm/plat-samsung/setup-mipiphy.c | 3 + arch/arm/plat-samsung/time.c | 287 ---- drivers/clk/Makefile | 1 + drivers/clk/samsung/Makefile | 8 + drivers/clk/samsung/clk-exynos4.c | 843 ++++++++++ drivers/clk/samsung/clk-exynos5250.c | 514 ++++++ drivers/clk/samsung/clk-exynos5440.c | 139 ++ drivers/clk/samsung/clk-pll.c | 499 ++++++ drivers/clk/samsung/clk-pll.h | 41 + drivers/clk/samsung/clk.c | 273 ++++ drivers/clk/samsung/clk.h | 262 ++++ drivers/clocksource/Kconfig | 5 + drivers/clocksource/Makefile | 1 + .../mct.c => drivers/clocksource/exynos_mct.c | 209 ++- drivers/gpio/gpio-samsung.c | 9 +- drivers/irqchip/exynos-combiner.c | 80 +- drivers/mmc/host/s3cmci.c | 83 +- drivers/pinctrl/pinctrl-exynos.c | 108 ++ drivers/pinctrl/pinctrl-samsung.c | 2 + drivers/pinctrl/pinctrl-samsung.h | 1 + drivers/usb/host/ohci-exynos.c | 3 +- .../{usb-exynos.h => usb-ohci-exynos.h} | 0 174 files changed, 6184 insertions(+), 5974 deletions(-) create mode 100644 Documentation/arm/firmware.txt create mode 100644 Documentation/devicetree/bindings/clock/exynos4-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/exynos5250-clock.txt create mode 100644 Documentation/devicetree/bindings/clock/exynos5440-clock.txt create mode 100644 Documentation/devicetree/bindings/timer/samsung,exynos4210-mct.txt create mode 100644 Documentation/devicetree/bindings/usb/exynos-usb.txt create mode 100644 arch/arm/boot/dts/exynos4412-odroidx.dts create mode 100644 arch/arm/boot/dts/exynos4412-origen.dts create mode 100644 arch/arm/boot/dts/exynos5250-arndale.dts create mode 100644 arch/arm/common/firmware.c create mode 100644 arch/arm/include/asm/firmware.h delete mode 100644 arch/arm/mach-exynos/clock-exynos4.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4.h delete mode 100644 arch/arm/mach-exynos/clock-exynos4210.c delete mode 100644 arch/arm/mach-exynos/clock-exynos4212.c delete mode 100644 arch/arm/mach-exynos/clock-exynos5.c create mode 100644 arch/arm/mach-exynos/exynos-smc.S create mode 100644 arch/arm/mach-exynos/firmware.c delete mode 100644 arch/arm/mach-exynos/include/mach/regs-mct.h create mode 100644 arch/arm/mach-exynos/smc.h rename arch/arm/{plat-samsung/include/plat => mach-s3c24xx}/common-smdk.h (86%) delete mode 100644 arch/arm/mach-s3c24xx/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-s3c24xx/include/mach/regs-sdi.h delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c2412.c delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c2440.c delete mode 100644 arch/arm/mach-s3c24xx/irq-s3c244x.c delete mode 100644 arch/arm/plat-samsung/include/plat/irq.h delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2410.h delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2412.h delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2416.h delete mode 100644 arch/arm/plat-samsung/include/plat/s3c2443.h delete mode 100644 arch/arm/plat-samsung/include/plat/s3c244x.h delete mode 100644 arch/arm/plat-samsung/include/plat/s5p-time.h create mode 100644 arch/arm/plat-samsung/include/plat/samsung-time.h rename arch/arm/plat-samsung/{s5p-time.c => samsung-time.c} (68%) delete mode 100644 arch/arm/plat-samsung/time.c create mode 100644 drivers/clk/samsung/Makefile create mode 100644 drivers/clk/samsung/clk-exynos4.c create mode 100644 drivers/clk/samsung/clk-exynos5250.c create mode 100644 drivers/clk/samsung/clk-exynos5440.c create mode 100644 drivers/clk/samsung/clk-pll.c create mode 100644 drivers/clk/samsung/clk-pll.h create mode 100644 drivers/clk/samsung/clk.c create mode 100644 drivers/clk/samsung/clk.h rename arch/arm/mach-exynos/mct.c => drivers/clocksource/exynos_mct.c (65%) rename include/linux/platform_data/{usb-exynos.h => usb-ohci-exynos.h} (100%) Merging tegra/for-next (e19120b Merge branch 'for-3.10/dt' into for-next) $ git merge tegra/for-next Auto-merging drivers/clk/tegra/clk-tegra20.c Auto-merging arch/arm/mach-tegra/tegra.c Removing arch/arm/mach-tegra/board-dt-tegra30.c Removing arch/arm/mach-tegra/board-dt-tegra114.c Auto-merging arch/arm/boot/dts/tegra30.dtsi Auto-merging arch/arm/boot/dts/tegra20.dtsi Merge made by the 'recursive' strategy. arch/arm/boot/dts/tegra114-dalmore.dts | 714 +++++++++++++++++++++ arch/arm/boot/dts/tegra114.dtsi | 34 +- arch/arm/boot/dts/tegra20-colibri-512.dtsi | 2 +- arch/arm/boot/dts/tegra20-harmony.dts | 4 +- arch/arm/boot/dts/tegra20-paz00.dts | 2 +- arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- arch/arm/boot/dts/tegra20-tamonten.dtsi | 2 +- arch/arm/boot/dts/tegra20-trimslice.dts | 2 +- arch/arm/boot/dts/tegra20-ventana.dts | 2 +- arch/arm/boot/dts/tegra20-whistler.dts | 1 + arch/arm/boot/dts/tegra20.dtsi | 54 +- arch/arm/boot/dts/tegra30-beaver.dts | 2 +- arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- arch/arm/boot/dts/tegra30.dtsi | 4 +- arch/arm/mach-tegra/Makefile | 4 +- arch/arm/mach-tegra/board-dt-tegra114.c | 46 -- arch/arm/mach-tegra/board-dt-tegra30.c | 60 -- arch/arm/mach-tegra/board-harmony-pcie.c | 7 +- arch/arm/mach-tegra/board.h | 4 +- arch/arm/mach-tegra/common.c | 26 +- arch/arm/mach-tegra/cpuidle-tegra30.c | 4 - arch/arm/mach-tegra/headsmp.S | 3 - arch/arm/mach-tegra/hotplug.c | 23 +- arch/arm/mach-tegra/platsmp.c | 119 ++-- arch/arm/mach-tegra/pm.c | 19 - arch/arm/mach-tegra/pmc.c | 152 ++++- arch/arm/mach-tegra/pmc.h | 4 + arch/arm/mach-tegra/reset-handler.S | 48 +- arch/arm/mach-tegra/sleep.h | 10 +- .../arm/mach-tegra/{board-dt-tegra20.c => tegra.c} | 16 +- drivers/clk/tegra/clk-tegra20.c | 36 +- drivers/clocksource/tegra20_timer.c | 4 +- 32 files changed, 1046 insertions(+), 366 deletions(-) delete mode 100644 arch/arm/mach-tegra/board-dt-tegra114.c delete mode 100644 arch/arm/mach-tegra/board-dt-tegra30.c rename arch/arm/mach-tegra/{board-dt-tegra20.c => tegra.c} (89%) Merging dma-mapping/dma-mapping-next (6dbe51c Linux 3.9-rc1) $ git merge dma-mapping/dma-mapping-next Already up-to-date. Merging pwm/for-next (a32e1d1 pwm_backlight: remove unnecessary ifdefs) $ git merge pwm/for-next Auto-merging drivers/video/backlight/pwm_bl.c Merge made by the 'recursive' strategy. drivers/video/backlight/pwm_bl.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) Merging dma-buf/for-next (6dbe51c Linux 3.9-rc1) $ git merge dma-buf/for-next Already up-to-date. Merging userns/for-next (3e64fe5 fs: Limit sys_mount to only request filesystem modules. (Part 3)) $ git merge userns/for-next Auto-merging fs/hostfs/hostfs_kern.c Merge made by the 'recursive' strategy. fs/cifs/cifsfs.c | 1 + fs/hostfs/hostfs_kern.c | 1 + fs/hpfs/super.c | 1 + fs/squashfs/super.c | 1 + fs/udf/super.c | 1 + 5 files changed, 5 insertions(+) Merging ktest/for-next (7328735 ktest: Remove indexes from warnings check) $ git merge ktest/for-next Already up-to-date. Merging signal/for-next (99e621f syscalls.h: slightly reduce the jungles of macros) $ git merge signal/for-next Recorded preimage for 'arch/mips/kernel/linux32.c' Recorded preimage for 'arch/tile/kernel/compat.c' Auto-merging kernel/fork.c Removing arch/x86/ia32/ipc32.c Auto-merging arch/tile/kernel/compat.c CONFLICT (content): Merge conflict in arch/tile/kernel/compat.c Auto-merging arch/tile/Kconfig Removing arch/powerpc/include/uapi/asm/linkage.h Auto-merging arch/powerpc/include/asm/unistd.h Auto-merging arch/powerpc/include/asm/systbl.h Auto-merging arch/mips/kernel/linux32.c CONFLICT (content): Merge conflict in arch/mips/kernel/linux32.c Automatic merge failed; fix conflicts and then commit the result. $ git commit -v -a Recorded resolution for 'arch/mips/kernel/linux32.c'. Recorded resolution for 'arch/tile/kernel/compat.c'. [master 0f79dc3] Merge remote-tracking branch 'signal/for-next' $ git diff -M --stat --summary HEAD^.. arch/Kconfig | 3 - arch/alpha/Kconfig | 1 - arch/alpha/include/asm/linkage.h | 4 +- arch/alpha/include/asm/unistd.h | 12 --- arch/arm/include/asm/unistd.h | 8 -- arch/arm64/kernel/sys32.S | 7 -- arch/avr32/include/asm/unistd.h | 8 -- arch/blackfin/include/asm/unistd.h | 8 -- arch/cris/include/asm/unistd.h | 8 -- arch/frv/include/asm/unistd.h | 10 -- arch/h8300/include/asm/linkage.h | 2 - arch/h8300/include/asm/unistd.h | 7 -- arch/ia64/include/asm/linkage.h | 4 + arch/ia64/include/asm/unistd.h | 10 -- arch/m32r/include/asm/unistd.h | 10 -- arch/m68k/include/asm/unistd.h | 8 -- arch/microblaze/include/asm/unistd.h | 8 -- arch/mips/Kconfig | 1 - arch/mips/include/asm/linkage.h | 3 + arch/mips/include/asm/unistd.h | 8 -- arch/mips/kernel/linux32.c | 119 ---------------------- arch/mips/kernel/scall64-n32.S | 8 +- arch/mips/kernel/scall64-o32.S | 6 +- arch/mn10300/include/asm/unistd.h | 10 -- arch/parisc/include/asm/unistd.h | 8 -- arch/parisc/kernel/sys_parisc32.c | 41 -------- arch/parisc/kernel/syscall_table.S | 8 +- arch/powerpc/Kconfig | 1 - arch/powerpc/include/asm/linkage.h | 13 +++ arch/powerpc/include/asm/systbl.h | 10 +- arch/powerpc/include/asm/unistd.h | 6 -- arch/powerpc/include/uapi/asm/linkage.h | 6 -- arch/powerpc/kernel/sys_ppc32.c | 109 -------------------- arch/s390/Kconfig | 1 - arch/s390/include/asm/unistd.h | 8 -- arch/s390/kernel/compat_linux.c | 86 +--------------- arch/s390/kernel/compat_linux.h | 5 - arch/s390/kernel/compat_wrapper.S | 64 ------------ arch/s390/kernel/sys_s390.c | 14 +-- arch/s390/kernel/syscalls.S | 18 ++-- arch/sh/include/asm/unistd.h | 8 -- arch/sparc/Kconfig | 1 - arch/sparc/include/asm/unistd.h | 8 -- arch/sparc/kernel/sys32.S | 4 - arch/sparc/kernel/sys_sparc32.c | 75 +------------- arch/sparc/kernel/sys_sparc_64.c | 6 +- arch/sparc/kernel/systbls_64.S | 8 +- arch/tile/Kconfig | 1 - arch/tile/kernel/compat.c | 6 -- arch/x86/ia32/Makefile | 3 - arch/x86/ia32/ipc32.c | 54 ---------- arch/x86/ia32/sys_ia32.c | 37 ------- arch/x86/include/asm/sys_ia32.h | 12 --- arch/x86/include/asm/syscalls.h | 4 +- arch/x86/include/asm/unistd.h | 8 -- arch/x86/kernel/tls.c | 14 +-- arch/x86/syscalls/syscall_32.tbl | 10 +- arch/x86/um/tls_32.c | 5 +- arch/xtensa/include/asm/unistd.h | 8 -- fs/aio.c | 2 - fs/compat.c | 121 ---------------------- fs/dcookies.c | 15 ++- fs/eventpoll.c | 47 +++++++++ fs/notify/fanotify/fanotify_user.c | 17 +--- fs/open.c | 52 ++-------- fs/read_write.c | 68 +++++++++---- fs/read_write.h | 2 - fs/signalfd.c | 31 ++++++ fs/splice.c | 22 ++++ fs/sync.c | 26 +---- include/asm-generic/unistd.h | 17 ---- include/linux/compat.h | 51 +++------- include/linux/linkage.h | 21 ++++ include/linux/mm.h | 3 - include/linux/syscalls.h | 156 +++++++++------------------- ipc/compat.c | 174 ++++++++++++++++++-------------- ipc/sem.c | 123 +++++++++++++--------- ipc/syscall.c | 6 +- kernel/compat.c | 19 ---- kernel/exit.c | 5 - kernel/fork.c | 5 +- kernel/sys.c | 14 +++ kernel/sys_ni.c | 3 +- kernel/uid16.c | 55 ++-------- mm/fadvise.c | 18 +--- mm/nommu.c | 3 +- mm/readahead.c | 9 +- 87 files changed, 539 insertions(+), 1489 deletions(-) create mode 100644 arch/powerpc/include/asm/linkage.h delete mode 100644 arch/powerpc/include/uapi/asm/linkage.h delete mode 100644 arch/x86/ia32/ipc32.c Merging clk/clk-next (fde8bc5 clk: sunxi: remove stale Makefile entry) $ git merge clk/clk-next Already up-to-date. Merging random/dev (b980955 random: fix locking dependency with the tasklist_lock) $ git merge random/dev Already up-to-date. Merging lzo-update/lzo-update (42b775a lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) $ git merge lzo-update/lzo-update Merge made by the 'recursive' strategy. lib/lzo/lzo1x_decompress_safe.c | 4 ++++ lib/lzo/lzodefs.h | 6 ++++++ 2 files changed, 10 insertions(+) Merging scsi-post-merge/merge-base:master (65112dc Merge git://git.samba.org/sfrench/cifs-2.6) Merging akpm-current/current (9f22578 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc) $ git merge akpm-current/current Already up-to-date. $ git clone -s -l -n -q . ../rebase-tmp $ cd ../rebase-tmp $ git checkout -b akpm remotes/origin/akpm/master Switched to a new branch 'akpm' $ git rebase --onto master remotes/origin/akpm/master-base First, rewinding head to replay your work on top of it... Applying: include/linux/res_counter.h needs errno.h Applying: kmsg: honor dmesg_restrict sysctl on /dev/kmsg Applying: thinkpad-acpi: kill hotkey_thread_mutex Applying: x86: make 'mem=' option to work for efi platform Applying: mm: remove free_area_cache use in powerpc architecture Applying: mm: use vm_unmapped_area() on powerpc architecture Applying: drm/fb-helper: don't sleep for screen unblank when an oops is in progress Applying: matroxfb: convert struct i2c_msg initialization to C99 format Applying: drivers/video/exynos/exynos_mipi_dsi.c: convert to devm_ioremap_resource() Applying: cyber2000fb: avoid palette corruption at higher clocks Applying: timer_list: split timer_list_show_tickdevices() Applying: timer_list-split-timer_list_show_tickdevices-v4 Applying: timer_list: convert timer list to be a proper seq_file Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v3 Applying: timer_list-convert-timer-list-to-be-a-proper-seq_file-v3-fix Applying: mkcapflags.pl: convert to mkcapflags.sh Using index info to reconstruct a base tree... M arch/x86/kernel/cpu/Makefile Falling back to patching base and 3-way merge... Removing arch/x86/kernel/cpu/mkcapflags.pl Auto-merging arch/x86/kernel/cpu/Makefile Applying: headers_install.pl: convert to headers_install.sh Applying: scripts/decodecode: make faulting insn ptr more robust Applying: ipvs: change type of netns_ipvs->sysctl_sync_qlen_max Applying: debug_locks.h: make warning more verbose Applying: lockdep: introduce lock_acquire_exclusive/shared helper macros Applying: lglock: update lockdep annotations to report recursive local locks Applying: block: restore /proc/partitions to not display non-partitionable removable devices Applying: fs/block_dev.c: no need to check inode->i_bdev in bd_forget() Applying: fs: return EAGAIN when O_NONBLOCK write should block on frozen fs Applying: fs: fix hang with BSD accounting on frozen filesystem Applying: ocfs2: add freeze protection to ocfs2_file_splice_write() Applying: watchdog: trigger all-cpu backtrace when locked up and going to panic Applying: HWPOISON: check dirty flag to match against clean page Applying: mm: trace filemap add and del Applying: mm-trace-filemap-add-and-del-v2 Applying: mm, show_mem: suppress page counts in non-blockable contexts Applying: mm/shmem.c: remove an ifdef Applying: vm: adjust ifdef for TINY_RCU Applying: mm: frontswap: lazy initialization to allow tmem backends to build/run as modules Applying: frontswap: make frontswap_init use a pointer for the ops Applying: mm: frontswap: cleanup code Applying: frontswap: get rid of swap_lock dependency Applying: mm: cleancache: lazy initialization to allow tmem backends to build/run as modules Applying: cleancache: Make cleancache_init use a pointer for the ops Applying: mm: cleancache: clean up cleancache_enabled Applying: xen: tmem: enable Xen tmem shim to be built/loaded as a module Applying: zcache/tmem: Better error checking on frontswap_register_ops return value. Applying: staging: zcache: enable ramster to be built/loaded as a module Applying: staging: zcache: enable zcache to be built/loaded as a module Applying: rmap: recompute pgoff for unmapping huge page Applying: memblock: add assertion for zero allocation alignment Applying: mm: remove free_area_cache Applying: include/linux/mmzone.h: cleanups Applying: include-linux-mmzoneh-cleanups-fix Applying: mm: memmap_init_zone() performance improvement Applying: drop_caches: add some documentation and info message Applying: drivers/usb/gadget/amd5536udc.c: avoid calling dma_pool_create() with NULL dev Applying: mm/dmapool.c: fix null dev in dma_pool_create() Applying: memcg: debugging facility to access dangling memcgs Applying: memcg-debugging-facility-to-access-dangling-memcgs-fix Applying: mm: add vm event counters for balloon pages compaction Applying: smp: Give WARN()ing when calling smp_call_function_many()/single() in serving irq Applying: include/linux/fs.h: disable preempt when acquire i_size_seqcount write lock Applying: kernel/smp.c: cleanups Applying: printk/tracing: rework console tracing Applying: drivers/video/backlight/ams369fg06.c: convert ams369fg06 to dev_pm_ops Applying: drivers-video-backlight-ams369fg06c-convert-ams369fg06-to-dev_pm_ops-fix Applying: drivers/video/backlight/platform_lcd.c: remove unnecessary ifdefs Applying: drivers/video/backlight/ep93xx_bl.c: remove incorrect __init annotation Applying: drivers/video/backlight/atmel-pwm-bl.c: use module_platform_driver_probe() Applying: drivers/video/backlight/atmel-pwm-bl.c: add __init annotation Applying: drivers/leds/leds-ot200.c: fix error caused by shifted mask Applying: lib/int_sqrt.c: optimize square root algorithm Applying: epoll: trim epitem by one cache line Applying: epoll-trim-epitem-by-one-cache-line-on-x86_64-fix Applying: epoll: support for disabling items, and a self-test app Applying: epoll: stop comparing pointers with 0 in self-test app Applying: binfmt_elf.c: use get_random_int() to fix entropy depleting Applying: dmi_scan: refactor dmi_scan_machine(), {smbios,dmi}_present() Applying: i2o: check copy_from_user() size parameter Applying: rtc: rtc-mv: add __init annotation Applying: rtc: rtc-davinci: add __exit annotation Applying: rtc: rtc-ds1302: add __exit annotation Applying: rtc: rtc-imxdi: add __init/__exit annotation Applying: rtc: rtc-nuc900: add __init/__exit annotation Applying: rtc: rtc-pcap: add __init/__exit annotation Applying: rtc: rtc-tegra: add __init/__exit annotation Applying: rtc: add devm_rtc_device_{register,unregister}() Applying: drivers/rtc/rtc-max77686.c: use module_platform_driver() Applying: drivers/rtc/rtc-max77686.c: add missing module author name Applying: drivers/rtc/rtc-max77686.c: use devm_kzalloc() Applying: drivers/rtc/rtc-max77686.c: fix indentation of bit definitions Applying: drivers/rtc/rtc-max77686.c: use dev_info()/dev_emerg() instead of pr_info()/pr_emerg() Applying: drivers/rtc/rtc-v3020.c: use gpio_request_array() Applying: drivers/rtc/class.c: use struct device as the first argument for devm_rtc_device_register() Applying: rtc: rtc-ab3100: use module_platform_driver_probe() Applying: rtc: rtc-at32ap700x: use module_platform_driver_probe() Applying: rtc: rtc-at91rm9200: use module_platform_driver_probe() Applying: rtc: rtc-au1xxx: use module_platform_driver_probe() Applying: rtc: rtc-coh901331: use module_platform_driver_probe() Applying: rtc: rtc-davinci: use module_platform_driver_probe() Applying: rtc: rtc-ds1302: use module_platform_driver_probe() Applying: rtc: rtc-efi: use module_platform_driver_probe() Applying: rtc: rtc-generic: use module_platform_driver_probe() Applying: rtc: rtc-imxdi: use module_platform_driver_probe() Applying: rtc: rtc-mc13xxx: use module_platform_driver_probe() Applying: rtc: rtc-msm6242: use module_platform_driver_probe() Applying: rtc: rtc-mv: use module_platform_driver_probe() Applying: rtc: rtc-nuc900: use module_platform_driver_probe() Applying: rtc: rtc-omap: use module_platform_driver_probe() Applying: rtc: rtc-pcap: use module_platform_driver_probe() Applying: rtc: rtc-ps3: use module_platform_driver_probe() Applying: rtc: rtc-pxa: use module_platform_driver_probe() Applying: rtc: rtc-rp5c01: use module_platform_driver_probe() Applying: rtc: rtc-sh: use module_platform_driver_probe() Applying: rtc: rtc-starfire: use module_platform_driver_probe() Applying: rtc: rtc-sun4v: use module_platform_driver_probe() Applying: rtc: rtc-tegra: use module_platform_driver_probe() Applying: rtc: rtc-tx4939: use module_platform_driver_probe() Applying: rtc: rtc-88pm80x: use devm_rtc_device_register() Applying: rtc: rtc-coh90133: use devm_rtc_device_register() Applying: rtc: rtc-da9052: use devm_rtc_device_register() Applying: rtc: rtc-da9055: use devm_rtc_device_register() Applying: rtc: rtc-davinci: use devm_rtc_device_register() Applying: rtc: rtc-ds1511: use devm_rtc_device_register() Applying: rtc: rtc-ds1553: use devm_rtc_device_register() Applying: rtc: rtc-ds1742: use devm_rtc_device_register() Applying: rtc: rtc-ep93xx: use devm_rtc_device_register() Applying: rtc: rtc-imxdi: use devm_rtc_device_register() Applying: rtc: rtc-lp8788: use devm_rtc_device_register() Applying: rtc: rtc-lpc32xx: use devm_rtc_device_register() Applying: rtc: rtc-max77686: use devm_rtc_device_register() Applying: rtc: rtc-max8907: use devm_rtc_device_register() Applying: rtc: rtc-max8997: use devm_rtc_device_register() Applying: rtc: rtc-mv: use devm_rtc_device_register() Using index info to reconstruct a base tree... M drivers/rtc/rtc-mv.c Falling back to patching base and 3-way merge... Auto-merging drivers/rtc/rtc-mv.c CONFLICT (content): Merge conflict in drivers/rtc/rtc-mv.c Failed to merge in the changes. Patch failed at 0145 rtc: rtc-mv: use devm_rtc_device_register() The copy of the patch that failed is found in: /home/sfr/kernels/next/rebase-tmp/.git/rebase-apply/patch When you have resolved this problem, run "git rebase --continue". If you prefer to skip this patch, run "git rebase --skip" instead. To check out the original branch and stop rebasing, run "git rebase --abort". $ git rebase --continue Applying: rtc: rtc-mxc: use devm_rtc_device_register() Applying: rtc: rtc-palmas: use devm_rtc_device_register() Applying: rtc: rtc-pcf8523: use devm_rtc_device_register() Applying: rtc: rtc-s3c: use devm_rtc_device_register() Applying: rtc: rtc-snvs: use devm_rtc_device_register() Applying: rtc: rtc-spear: use devm_rtc_device_register() Applying: rtc: rtc-stk17ta8: use devm_rtc_device_register() Applying: rtc: rtc-tegra: use devm_rtc_device_register() Applying: rtc: rtc-tps6586x: use devm_rtc_device_register() Applying: rtc: rtc-tps65910: use devm_rtc_device_register() Applying: rtc: rtc-tps80031: use devm_rtc_device_register() Applying: rtc: rtc-tx4939: use devm_rtc_device_register() Applying: rtc: rtc-vt8500: use devm_rtc_device_register() Applying: rtc: rtc-wm831x: use devm_rtc_device_register() Applying: drivers/rtc/rtc-pxa.c: fix set time sync time issue Applying: drivers-rtc-rtc-pxac-fix-set-time-sync-time-issue-fix Applying: drivers/rtc/rtc-ds1307.c: long block operations bugfix Applying: rtc: rtc-palmas: use devm_request_threaded_irq() Applying: hfsplus: fix warnings in fs/hfsplus/bfind.c Applying: hfsplus-fix-warnings-in-fs-hfsplus-bfindc-in-function-hfs_find_1st_rec_by_cnid-fix Applying: ptrace: add ability to retrieve signals without removing from a queue (v4) Applying: selftest: add a test case for PTRACE_PEEKSIGINFO Applying: coredump: only SIGKILL should interrupt the coredumping task Applying: coredump: ensure that SIGKILL always kills the dumping thread Applying: coredump: sanitize the setting of signal->group_exit_code Applying: coredump: factor out the setting of PF_DUMPCORE Applying: freezer: do not send a fake signal to a PF_DUMPCORE thread Applying: coredump: make wait_for_dump_helpers() freezable Applying: procfs: improve scaling in proc Applying: procfs-improve-scaling-in-proc-v5 Applying: kexec: fix wrong types of some local variables Applying: kexec: Use min() and min_t() to simplify logic Applying: kexec-use-min_t-to-simplify-logic-fix Applying: nfsd: remove unused get_new_stid() Applying: nfsd: convert to idr_alloc() Applying: workqueue: convert to idr_alloc() Applying: mlx4: remove leftover idr_pre_get() call Applying: zcache: convert to idr_alloc() Applying: tidspbridge: convert to idr_alloc() Applying: idr: deprecate idr_pre_get() and idr_get_new[_above]() Applying: ipc: clamp with min() Applying: ipc: separate msg allocation from userspace copy Applying: ipc: tighten msg copy loops Applying: ipc: set EFAULT as default error in load_msg() Applying: ipc: remove msg handling from queue scan Applying: ipc: implement MSG_COPY as a new receive mode Applying: ipc: simplify msg list search Applying: ipc: refactor msg list search into separate function Applying: ipc/msgutil.c: use linux/uaccess.h Applying: ipc/sem.c: alternatives to preempt_disable() Applying: pid_namespace.c/.h: simplify defines Applying: pid_namespacec-h-simplify-defines-fix Applying: raid6test: use prandom_bytes() Applying: uuid: use prandom_bytes() Applying: x86: pageattr-test: remove srandom32 call Applying: x86: rename random32() to prandom_u32() Applying: lib/: rename random32() to prandom_u32() Applying: mm/: rename random32() to prandom_u32() Applying: kernel/: rename random32() to prandom_u32() Applying: drbd: rename random32() to prandom_u32() Applying: infiniband: rename random32() to prandom_u32() Applying: mmc: rename random32() to prandom_u32() Applying: video/uvesafb: rename random32() to prandom_u32() Applying: uwb: rename random32() to prandom_u32() Applying: lguest: rename random32() to prandom_u32() Applying: scsi: rename random32() to prandom_u32() Applying: drivers/net: rename random32() to prandom_u32() Applying: drivers-net-rename-random32-to-prandom_u32-fix Applying: net/sunrpc: rename random32() to prandom_u32() Applying: net/sched: rename random32() to prandom_u32() Applying: net/netfilter: rename random32() to prandom_u32() Applying: net/core: rename random32() to prandom_u32() Applying: net/core: remove duplicate statements by do-while loop Applying: net: rename random32 to prandom Applying: remove unused random32() and srandom32() Applying: futex: fix kernel-doc notation and spello Applying: semaphore: use unlikely() for down's timeout Applying: semaphore: use `bool' type for semaphore_waiter's up Applying: mm: remove old aio use_mm() comment Applying: aio: remove dead code from aio.h Applying: gadget: remove only user of aio retry Applying: aio: remove retry-based AIO Applying: char: add aio_{read,write} to /dev/{null,zero} Applying: aio: kill return value of aio_complete() Applying: aio: add kiocb_cancel() Applying: aio-kiocb_cancel-fix Applying: aio: move private stuff out of aio.h Applying: aio: dprintk() -> pr_debug() Applying: aio: do fget() after aio_get_req() Applying: aio: make aio_put_req() lockless Applying: aio: refcounting cleanup Applying: wait: add wait_event_hrtimeout() Applying: wait-add-wait_event_hrtimeout-fix Applying: aio: make aio_read_evt() more efficient, convert to hrtimers Applying: aio: use flush_dcache_page() Applying: aio: use cancellation list lazily Applying: aio-use-cancellation-list-lazily-fix Applying: aio-use-cancellation-list-lazily-fix-fix Applying: aio: change reqs_active to include unreaped completions Applying: aio: kill batch allocation Applying: aio: kill struct aio_ring_info Applying: aio: give shared kioctx fields their own cachelines Applying: aio-give-shared-kioctx-fields-their-own-cachelines-fix Applying: aio: reqs_active -> reqs_available Applying: aio: percpu reqs_available Applying: generic dynamic per cpu refcounting Applying: generic-dynamic-per-cpu-refcounting-fix Applying: percpu-refcount: sparse fixes Applying: generic-dynamic-per-cpu-refcounting-sparse-fixes-fix Applying: generic-dynamic-per-cpu-refcounting-doc Applying: generic-dynamic-per-cpu-refcounting-doc-fix Applying: aio: percpu ioctx refcount Applying: aio: use xchg() instead of completion_lock Applying: aio: don't include aio.h in sched.h Applying: aio-dont-include-aioh-in-schedh-fix Applying: aio-dont-include-aioh-in-schedh-fix-fix Applying: aio-dont-include-aioh-in-schedh-fix-3 Applying: aio-dont-include-aioh-in-schedh-fix-3-fix Applying: aio-dont-include-aioh-in-schedh-fix-3-fix-fix Applying: aio: kill ki_key Applying: aio: kill ki_retry Applying: aio-kill-ki_retry-fix Applying: aio-kill-ki_retry-fix-fix Applying: block, aio: batch completion for bios/kiocbs Applying: block-aio-batch-completion-for-bios-kiocbs-fix Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix Applying: Fix build error due to bio_endio_batch Applying: block-aio-batch-completion-for-bios-kiocbs-fix-fix-fix-fix-fix-fix Applying: aio: Fix a null pointer deref in batch_complete_aio Applying: virtio-blk: convert to batch completion Applying: mtip32xx: convert to batch completion Applying: conversion to bio batch completion Applying: aio: fix aio_read_events_ring() types Applying: aio: document, clarify aio_read_events() and shadow_tail Applying: aio: correct calculation of available events Applying: aio: fix kioctx not being freed after cancellation at exit time Applying: aio: v3: fix kioctx not being freed after cancellation at exit time Applying: Kconfig: consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECKS Applying: kernel/sys.c: make prctl(PR_SET_MM) generally available Applying: decompressor: add LZ4 decompressor module Applying: lib: add support for LZ4-compressed kernel Applying: arm: add support for LZ4-compressed kernel Applying: x86: add support for LZ4-compressed kernel $ cd ../next $ git fetch -f ../rebase-tmp akpm:akpm/master From ../rebase-tmp + 255b90c...a9240f8 akpm -> akpm/master (forced update) $ rm -rf ../rebase-tmp Merging akpm/master (a9240f8 x86: add support for LZ4-compressed kernel) $ git merge --no-ff akpm/master Removing scripts/headers_install.pl Auto-merging lib/usercopy.c Removing arch/x86/kernel/cpu/mkcapflags.pl Removing arch/sparc/lib/usercopy.c Merge made by the 'recursive' strategy. Documentation/cgroups/memory.txt | 16 + Documentation/sysctl/vm.txt | 33 +- arch/arm/Kconfig | 1 + arch/arm/boot/compressed/.gitignore | 1 + arch/arm/boot/compressed/Makefile | 6 +- arch/arm/boot/compressed/decompress.c | 4 + arch/arm/boot/compressed/piggy.lz4.S | 6 + arch/arm/mm/init.c | 3 + arch/arm/mm/mmap.c | 2 - arch/arm64/mm/mmap.c | 2 - arch/ia64/mm/contig.c | 2 + arch/ia64/mm/discontig.c | 2 + arch/mips/mm/mmap.c | 2 - arch/parisc/Kconfig | 1 + arch/parisc/Kconfig.debug | 14 - arch/parisc/mm/init.c | 2 + arch/powerpc/include/asm/page_64.h | 3 +- arch/powerpc/mm/hugetlbpage.c | 2 +- arch/powerpc/mm/mmap_64.c | 2 - arch/powerpc/mm/slice.c | 223 +-- arch/powerpc/platforms/cell/spufs/file.c | 2 +- arch/s390/Kconfig | 1 + arch/s390/Kconfig.debug | 14 - arch/s390/hypfs/inode.c | 1 + arch/s390/lib/Makefile | 1 - arch/s390/mm/mmap.c | 4 - arch/sparc/kernel/sys_sparc_64.c | 2 - arch/sparc/lib/Makefile | 1 - arch/sparc/lib/usercopy.c | 9 - arch/tile/Kconfig | 8 +- arch/tile/include/asm/uaccess.h | 7 +- arch/tile/lib/uaccess.c | 8 - arch/tile/mm/mmap.c | 2 - arch/unicore32/mm/init.c | 3 + arch/x86/Kconfig | 2 + arch/x86/Kconfig.debug | 14 - arch/x86/boot/compressed/Makefile | 5 +- arch/x86/boot/compressed/misc.c | 4 + arch/x86/ia32/ia32_aout.c | 3 - arch/x86/include/asm/e820.h | 2 + arch/x86/kernel/cpu/Makefile | 4 +- arch/x86/kernel/cpu/mkcapflags.pl | 48 - arch/x86/kernel/cpu/mkcapflags.sh | 41 + arch/x86/kernel/e820.c | 72 +- arch/x86/lib/usercopy_32.c | 6 - arch/x86/mm/mmap.c | 2 - arch/x86/mm/pageattr-test.c | 5 +- arch/x86/platform/efi/efi.c | 15 +- block/blk-core.c | 34 +- block/blk-flush.c | 2 +- block/blk.h | 3 +- block/genhd.c | 2 +- block/scsi_ioctl.c | 1 + crypto/async_tx/raid6test.c | 9 +- drivers/block/drbd/drbd_receiver.c | 5 +- drivers/block/mtip32xx/mtip32xx.c | 86 +- drivers/block/mtip32xx/mtip32xx.h | 8 +- drivers/block/swim3.c | 2 +- drivers/block/virtio_blk.c | 31 +- drivers/char/mem.c | 36 + drivers/firmware/dmi_scan.c | 80 +- drivers/gpu/drm/drm_fb_helper.c | 8 + drivers/infiniband/hw/cxgb3/cxio_resource.c | 4 +- drivers/infiniband/hw/cxgb4/id_table.c | 4 +- drivers/infiniband/hw/ipath/ipath_file_ops.c | 1 + drivers/infiniband/hw/mlx4/cm.c | 1 - drivers/infiniband/hw/mlx4/mad.c | 2 +- drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- drivers/leds/leds-ot200.c | 14 +- drivers/lguest/page_tables.c | 2 +- drivers/md/dm.c | 2 +- drivers/message/i2o/i2o_config.c | 10 + drivers/mmc/core/core.c | 4 +- drivers/net/ethernet/broadcom/cnic.c | 4 +- drivers/net/hamradio/baycom_epp.c | 2 +- drivers/net/hamradio/hdlcdrv.c | 2 +- drivers/net/hamradio/yam.c | 2 +- drivers/net/team/team_mode_random.c | 2 +- drivers/net/wireless/brcm80211/brcmfmac/p2p.c | 2 +- drivers/net/wireless/mwifiex/cfg80211.c | 4 +- drivers/platform/x86/thinkpad_acpi.c | 10 - drivers/rtc/class.c | 70 + drivers/rtc/rtc-88pm80x.c | 3 +- drivers/rtc/rtc-ab3100.c | 14 +- drivers/rtc/rtc-at32ap700x.c | 12 +- drivers/rtc/rtc-at91rm9200.c | 13 +- drivers/rtc/rtc-au1xxx.c | 13 +- drivers/rtc/rtc-coh901331.c | 18 +- drivers/rtc/rtc-da9052.c | 5 +- drivers/rtc/rtc-da9055.c | 5 +- drivers/rtc/rtc-davinci.c | 24 +- drivers/rtc/rtc-ds1302.c | 17 +- drivers/rtc/rtc-ds1307.c | 60 +- drivers/rtc/rtc-ds1511.c | 8 +- drivers/rtc/rtc-ds1553.c | 6 +- drivers/rtc/rtc-ds1742.c | 8 +- drivers/rtc/rtc-efi.c | 13 +- drivers/rtc/rtc-ep93xx.c | 11 +- drivers/rtc/rtc-generic.c | 13 +- drivers/rtc/rtc-imxdi.c | 23 +- drivers/rtc/rtc-lp8788.c | 5 +- drivers/rtc/rtc-lpc32xx.c | 5 +- drivers/rtc/rtc-max77686.c | 63 +- drivers/rtc/rtc-max8907.c | 7 +- drivers/rtc/rtc-max8997.c | 10 +- drivers/rtc/rtc-mc13xxx.c | 12 +- drivers/rtc/rtc-msm6242.c | 13 +- drivers/rtc/rtc-mv.c | 23 +- drivers/rtc/rtc-mxc.c | 4 +- drivers/rtc/rtc-nuc900.c | 19 +- drivers/rtc/rtc-omap.c | 12 +- drivers/rtc/rtc-palmas.c | 9 +- drivers/rtc/rtc-pcap.c | 19 +- drivers/rtc/rtc-pcf8523.c | 6 +- drivers/rtc/rtc-ps3.c | 13 +- drivers/rtc/rtc-pxa.c | 77 +- drivers/rtc/rtc-rp5c01.c | 13 +- drivers/rtc/rtc-s3c.c | 6 +- drivers/rtc/rtc-sh.c | 13 +- drivers/rtc/rtc-snvs.c | 6 +- drivers/rtc/rtc-spear.c | 5 +- drivers/rtc/rtc-starfire.c | 13 +- drivers/rtc/rtc-stk17ta8.c | 6 +- drivers/rtc/rtc-sun4v.c | 13 +- drivers/rtc/rtc-tegra.c | 28 +- drivers/rtc/rtc-tps6586x.c | 4 +- drivers/rtc/rtc-tps65910.c | 6 +- drivers/rtc/rtc-tps80031.c | 6 +- drivers/rtc/rtc-tx4939.c | 19 +- drivers/rtc/rtc-v3020.c | 37 +- drivers/rtc/rtc-vt8500.c | 8 +- drivers/rtc/rtc-wm831x.c | 6 +- drivers/scsi/fcoe/fcoe_ctlr.c | 4 +- drivers/scsi/lpfc/lpfc_hbadisc.c | 6 +- drivers/scsi/qla2xxx/qla_attr.c | 7 +- drivers/scsi/sg.c | 1 + drivers/staging/android/logger.c | 1 + drivers/staging/tidspbridge/rmgr/drv.c | 70 +- drivers/staging/zcache/Kconfig | 6 +- drivers/staging/zcache/ramster.h | 6 +- drivers/staging/zcache/ramster/nodemanager.c | 9 +- drivers/staging/zcache/ramster/ramster.c | 29 +- drivers/staging/zcache/ramster/ramster.h | 2 +- .../staging/zcache/ramster/ramster_nodemanager.h | 2 + drivers/staging/zcache/ramster/tcp.c | 25 +- drivers/staging/zcache/tmem.c | 6 +- drivers/staging/zcache/tmem.h | 8 +- drivers/staging/zcache/zcache-main.c | 64 +- drivers/staging/zcache/zcache.h | 2 +- drivers/usb/gadget/amd5536udc.c | 16 +- drivers/usb/gadget/inode.c | 42 +- drivers/uwb/rsv.c | 4 +- drivers/video/backlight/ams369fg06.c | 21 +- drivers/video/backlight/atmel-pwm-bl.c | 14 +- drivers/video/backlight/ep93xx_bl.c | 2 +- drivers/video/backlight/platform_lcd.c | 6 +- drivers/video/cyber2000fb.c | 3 + drivers/video/exynos/exynos_mipi_dsi.c | 8 +- drivers/video/matrox/matroxfb_maven.c | 16 +- drivers/video/uvesafb.c | 2 +- drivers/xen/Kconfig | 4 +- drivers/xen/tmem.c | 53 +- drivers/xen/xen-selfballoon.c | 13 +- fs/9p/vfs_addr.c | 1 + fs/afs/write.c | 1 + fs/aio.c | 1785 ++++++++------------ fs/binfmt_aout.c | 3 - fs/binfmt_elf.c | 26 +- fs/binfmt_elf_fdpic.c | 2 - fs/bio.c | 52 +- fs/block_dev.c | 9 +- fs/btrfs/file.c | 4 +- fs/btrfs/inode.c | 1 + fs/ceph/file.c | 1 + fs/cifs/file.c | 3 +- fs/compat.c | 1 + fs/coredump.c | 46 +- fs/direct-io.c | 21 +- fs/drop_caches.c | 2 + fs/ecryptfs/file.c | 1 + fs/eventpoll.c | 42 +- fs/ext2/inode.c | 1 + fs/ext3/inode.c | 1 + fs/ext4/file.c | 1 + fs/ext4/indirect.c | 1 + fs/ext4/inode.c | 1 + fs/ext4/page-io.c | 1 + fs/f2fs/data.c | 1 + fs/fat/inode.c | 1 + fs/fuse/cuse.c | 1 + fs/fuse/dev.c | 1 + fs/fuse/file.c | 4 +- fs/gfs2/aops.c | 1 + fs/gfs2/file.c | 1 + fs/hfs/inode.c | 1 + fs/hfsplus/bfind.c | 8 +- fs/hfsplus/inode.c | 1 + fs/jfs/inode.c | 1 + fs/nfsd/nfs4state.c | 36 +- fs/nilfs2/inode.c | 2 +- fs/ntfs/file.c | 4 +- fs/ntfs/inode.c | 1 + fs/ocfs2/aops.h | 2 + fs/ocfs2/dlmglue.c | 2 +- fs/ocfs2/file.c | 7 +- fs/ocfs2/inode.h | 2 + fs/pipe.c | 1 + fs/proc/generic.c | 62 +- fs/proc/inode.c | 176 +- fs/read_write.c | 35 +- fs/reiserfs/inode.c | 1 + fs/splice.c | 3 +- fs/ubifs/file.c | 1 + fs/udf/inode.c | 1 + fs/xfs/xfs_aops.c | 1 + fs/xfs/xfs_file.c | 4 +- include/linux/aio.h | 199 +-- include/linux/balloon_compaction.h | 7 + include/linux/batch_complete.h | 23 + include/linux/bio.h | 36 +- include/linux/blk_types.h | 11 +- include/linux/blkdev.h | 12 +- include/linux/cgroup.h | 1 + include/linux/cleancache.h | 4 +- include/linux/debug_locks.h | 2 +- include/linux/decompress/unlz4.h | 10 + include/linux/errno.h | 1 - include/linux/frontswap.h | 36 +- include/linux/fs.h | 12 + include/linux/hardirq.h | 5 + include/linux/idr.h | 66 +- include/linux/lockdep.h | 92 +- include/linux/lz4.h | 51 + include/linux/mm.h | 3 +- include/linux/mm_types.h | 3 - include/linux/mmzone.h | 20 +- include/linux/net.h | 4 +- include/linux/pagemap.h | 2 +- include/linux/percpu-refcount.h | 114 ++ include/linux/pid_namespace.h | 5 +- include/linux/proc_fs.h | 6 +- include/linux/ramfs.h | 8 +- include/linux/random.h | 7 - include/linux/res_counter.h | 1 + include/linux/rtc-pxa.h | 18 + include/linux/rtc.h | 6 + include/linux/sched.h | 5 +- include/linux/vm_event_item.h | 7 +- include/linux/wait.h | 86 + include/linux/writeback.h | 1 + include/net/ip_vs.h | 8 +- include/trace/events/filemap.h | 58 + include/trace/events/printk.h | 25 +- include/uapi/linux/eventpoll.h | 1 + include/uapi/linux/ptrace.h | 12 + include/xen/tmem.h | 8 + init/Kconfig | 34 +- ipc/msg.c | 82 +- ipc/msgutil.c | 110 +- ipc/sem.c | 250 ++- kernel/acct.c | 3 +- kernel/fork.c | 5 +- kernel/freezer.c | 19 +- kernel/futex.c | 46 +- kernel/kexec.c | 30 +- kernel/lglock.c | 12 +- kernel/pid.c | 3 - kernel/pid_namespace.c | 2 - kernel/printk.c | 6 +- kernel/ptrace.c | 81 + kernel/rcutree.c | 2 +- kernel/semaphore.c | 8 +- kernel/signal.c | 6 +- kernel/smp.c | 102 +- kernel/sys.c | 10 +- kernel/test_kprobes.c | 2 +- kernel/time/timer_list.c | 112 +- kernel/watchdog.c | 10 +- kernel/workqueue.c | 7 +- lib/Kconfig | 7 + lib/Kconfig.debug | 18 + lib/Makefile | 5 +- lib/decompress.c | 5 + lib/decompress_unlz4.c | 187 ++ lib/fault-inject.c | 2 +- lib/idr.c | 41 +- lib/int_sqrt.c | 32 +- lib/list_sort.c | 2 +- lib/lz4/Makefile | 1 + lib/lz4/lz4_decompress.c | 326 ++++ lib/lz4/lz4defs.h | 94 ++ lib/percpu-refcount.c | 243 +++ lib/show_mem.c | 3 + {arch/s390/lib => lib}/usercopy.c | 3 +- lib/uuid.c | 8 +- mm/balloon_compaction.c | 2 + mm/cleancache.c | 265 ++- mm/dmapool.c | 5 +- mm/filemap.c | 8 +- mm/frontswap.c | 156 +- mm/memblock.c | 3 + mm/memcontrol.c | 192 ++- mm/memory-failure.c | 4 +- mm/migrate.c | 1 + mm/mmap.c | 28 - mm/mmu_context.c | 3 - mm/nommu.c | 4 - mm/page_alloc.c | 12 +- mm/page_io.c | 1 + mm/rmap.c | 3 + mm/shmem.c | 6 +- mm/swap.c | 1 + mm/swapfile.c | 19 +- mm/util.c | 1 - mm/vmstat.c | 9 +- net/core/pktgen.c | 42 +- net/netfilter/ipvs/ip_vs_ctl.c | 4 +- net/netfilter/nf_conntrack_core.c | 4 +- net/sched/sch_choke.c | 2 +- net/sunrpc/auth_gss/gss_krb5_wrap.c | 4 +- scripts/Makefile.headersinst | 4 +- scripts/Makefile.lib | 5 + scripts/decodecode | 8 +- scripts/headers_install.pl | 63 - scripts/headers_install.sh | 43 + security/keys/internal.h | 2 + security/keys/keyctl.c | 1 + sound/core/pcm_native.c | 2 +- tools/testing/selftests/Makefile | 2 + tools/testing/selftests/epoll/Makefile | 11 + tools/testing/selftests/epoll/test_epoll.c | 364 ++++ tools/testing/selftests/ptrace/Makefile | 10 + tools/testing/selftests/ptrace/peeksiginfo.c | 214 +++ usr/Kconfig | 9 + 335 files changed, 5619 insertions(+), 3432 deletions(-) create mode 100644 arch/arm/boot/compressed/piggy.lz4.S delete mode 100644 arch/sparc/lib/usercopy.c delete mode 100644 arch/x86/kernel/cpu/mkcapflags.pl create mode 100644 arch/x86/kernel/cpu/mkcapflags.sh create mode 100644 include/linux/batch_complete.h create mode 100644 include/linux/decompress/unlz4.h create mode 100644 include/linux/lz4.h create mode 100644 include/linux/percpu-refcount.h create mode 100644 include/linux/rtc-pxa.h create mode 100644 include/trace/events/filemap.h create mode 100644 lib/decompress_unlz4.c create mode 100644 lib/lz4/Makefile create mode 100644 lib/lz4/lz4_decompress.c create mode 100644 lib/lz4/lz4defs.h create mode 100644 lib/percpu-refcount.c rename {arch/s390/lib => lib}/usercopy.c (73%) delete mode 100644 scripts/headers_install.pl create mode 100644 scripts/headers_install.sh create mode 100644 tools/testing/selftests/epoll/Makefile create mode 100644 tools/testing/selftests/epoll/test_epoll.c create mode 100644 tools/testing/selftests/ptrace/Makefile create mode 100644 tools/testing/selftests/ptrace/peeksiginfo.c $ git revert 2389cc500686 [master acef26d] Revert "drm/i915: use simple attribute in debugfs routines" 1 file changed, 296 insertions(+), 98 deletions(-) $ git revert 928a48c9e40e [master 71d7d62] Revert "Input: add support for GRLIB APBPS2 PS/2 Keyboard/Mouse" 4 files changed, 256 deletions(-) delete mode 100644 Documentation/devicetree/bindings/input/ps2keyb-mouse-apbps2.txt delete mode 100644 drivers/input/serio/apbps2.c