Google Git
Sign in
kernel / pub / scm / linux / kernel / git / mcgrof / linux-next / 6c6d91ac5dfb7a78ecbd9a715526da92355b748a / . / Next / merge.log
blob: 73da4b5f24947c2361131cf668d74bbc5a11d7f4 [file] [log] [blame]
$ date
Thursday 14 May 11:07:27 AEST 2015
$ git checkout master
Already on 'master'
$ git reset --hard stable
HEAD is now at 4cfceaf0c087 Merge branch 'for-4.1' of git://linux-nfs.org/~bfields/linux
Merging origin/master (110bc76729d4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge origin/master
Updating 4cfceaf0c087..110bc76729d4
Fast-forward
MAINTAINERS | 27 +-
arch/arm/net/bpf_jit_32.c | 42 ++-
arch/mips/include/asm/smp.h | 2 +-
arch/mips/kernel/elf.c | 32 +-
arch/mips/kernel/smp.c | 6 +-
arch/x86/net/bpf_jit_comp.c | 28 ++
drivers/bluetooth/bt3c_cs.c | 3 -
drivers/bluetooth/btbcm.c | 148 ++++----
drivers/bluetooth/btbcm.h | 6 +
drivers/bluetooth/btusb.c | 403 ++++++++++++++++++++-
drivers/bluetooth/hci_ath.c | 98 +++--
drivers/infiniband/core/iwpm_msg.c | 2 +-
drivers/infiniband/hw/cxgb4/cm.c | 16 +-
drivers/infiniband/hw/cxgb4/device.c | 4 +-
drivers/infiniband/hw/ehca/ehca_mcast.c | 4 +-
drivers/infiniband/hw/mlx4/main.c | 3 +-
drivers/infiniband/hw/mlx5/qp.c | 2 +-
drivers/infiniband/hw/qib/qib.h | 2 +-
drivers/infiniband/hw/qib/qib_wc_x86_64.c | 3 +-
drivers/net/can/xilinx_can.c | 7 +-
drivers/net/dsa/mv88e6xxx.c | 3 +
drivers/net/ethernet/amd/Kconfig | 1 +
drivers/net/ethernet/apm/xgene/Kconfig | 1 +
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 10 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 9 +-
drivers/net/ethernet/cadence/macb.c | 11 +-
drivers/net/ethernet/intel/e1000e/e1000.h | 1 +
drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 +-
drivers/net/ethernet/intel/igb/igb_main.c | 4 +-
drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +-
drivers/net/ethernet/mellanox/mlx4/en_port.c | 2 +-
.../net/ethernet/mellanox/mlx4/resource_tracker.c | 14 +-
.../net/ethernet/qlogic/netxen/netxen_nic_init.c | 4 +-
drivers/net/ethernet/qualcomm/qca_spi.c | 4 +-
drivers/net/ethernet/realtek/r8169.c | 4 +-
drivers/net/ethernet/smsc/smc91x.c | 20 +-
drivers/net/ethernet/smsc/smsc911x.c | 12 +-
.../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 +
drivers/net/ethernet/xilinx/ll_temac_main.c | 4 +-
drivers/net/hyperv/netvsc.c | 9 +-
drivers/net/ieee802154/at86rf230.c | 390 ++++++++++----------
drivers/net/macvlan.c | 15 +
drivers/net/phy/Kconfig | 1 +
drivers/net/phy/mdio-gpio.c | 5 +-
drivers/net/phy/micrel.c | 3 +-
drivers/net/ppp/pppoe.c | 4 +
drivers/net/usb/r8152.c | 1 +
drivers/net/usb/usbnet.c | 4 +-
drivers/net/wireless/ath/ath9k/xmit.c | 52 ++-
drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 +
drivers/net/wireless/iwlwifi/iwl-trans.h | 41 ++-
drivers/net/wireless/iwlwifi/mvm/d3.c | 2 +-
drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 34 ++
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 44 +--
drivers/net/wireless/iwlwifi/mvm/fw-api.h | 13 -
drivers/net/wireless/iwlwifi/mvm/fw.c | 54 ++-
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 26 +-
drivers/net/wireless/iwlwifi/mvm/mvm.h | 1 -
drivers/net/wireless/iwlwifi/mvm/ops.c | 10 +
drivers/net/wireless/iwlwifi/mvm/rx.c | 5 +
drivers/net/wireless/iwlwifi/mvm/scan.c | 2 +-
drivers/net/wireless/iwlwifi/pcie/trans.c | 17 +-
drivers/net/wireless/rtlwifi/usb.c | 2 +-
drivers/power/axp288_fuel_gauge.c | 1 +
drivers/power/bq27x00_battery.c | 8 +
drivers/power/collie_battery.c | 2 +-
drivers/power/reset/Kconfig | 1 +
drivers/power/reset/at91-reset.c | 4 +-
drivers/power/reset/ltc2952-poweroff.c | 18 +-
include/linux/netdevice.h | 3 -
include/linux/tcp.h | 8 +
include/net/cfg802154.h | 2 +
include/net/codel.h | 10 +-
include/net/mac80211.h | 2 +
include/net/mac802154.h | 94 ++++-
include/net/tcp.h | 7 +-
include/uapi/linux/inet_diag.h | 4 +
include/uapi/linux/mpls.h | 10 +
include/uapi/linux/tcp.h | 3 +
net/bluetooth/hci_core.c | 3 +-
net/core/dev.c | 2 +-
net/core/net_namespace.c | 2 +-
net/core/sock.c | 2 +-
net/ieee802154/Makefile | 4 +-
net/ieee802154/nl-phy.c | 5 +-
net/ieee802154/nl802154.c | 2 +-
net/ieee802154/rdev-ops.h | 85 ++++-
net/ieee802154/trace.c | 7 +
net/ieee802154/trace.h | 247 +++++++++++++
net/ipv4/inet_diag.c | 8 +-
net/ipv4/tcp.c | 28 +-
net/ipv4/tcp_dctcp.c | 20 +-
net/ipv4/tcp_fastopen.c | 1 +
net/ipv4/tcp_illinois.c | 21 +-
net/ipv4/tcp_input.c | 36 +-
net/ipv4/tcp_vegas.c | 19 +-
net/ipv4/tcp_vegas.h | 3 +-
net/ipv4/tcp_westwood.c | 15 +-
net/ipv6/ip6_output.c | 39 +-
net/ipv6/route.c | 5 +-
net/mac80211/iface.c | 12 +-
net/mac80211/sta_info.c | 19 +-
net/mac802154/cfg.c | 9 +-
net/mac802154/ieee802154_i.h | 3 +-
net/mac802154/iface.c | 5 +-
net/mac802154/llsec.c | 4 +-
net/mac802154/main.c | 7 +-
net/mpls/af_mpls.c | 18 +-
net/mpls/internal.h | 10 -
net/netlink/af_netlink.c | 1 -
net/packet/af_packet.c | 9 +-
net/rds/connection.c | 17 +-
net/rds/ib_cm.c | 13 +-
net/rds/tcp_connect.c | 1 +
net/rds/tcp_listen.c | 46 +++
net/sched/cls_api.c | 7 +-
net/sched/sch_codel.c | 2 +-
net/sched/sch_fq_codel.c | 2 +-
net/sched/sch_gred.c | 4 +-
119 files changed, 1906 insertions(+), 700 deletions(-)
create mode 100644 net/ieee802154/trace.c
create mode 100644 net/ieee802154/trace.h
Merging fixes/master (b94d525e58dc Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge fixes/master
Already up-to-date.
Merging kbuild-current/rc-fixes (c517d838eb7d Linux 4.0-rc1)
$ git merge kbuild-current/rc-fixes
Already up-to-date.
Merging arc-current/for-curr (e4140819dadc ARC: signal handling robustify)
$ git merge arc-current/for-curr
Already up-to-date.
Merging arm-current/fixes (3b8786ff7a1b ARM: 8352/1: perf: Fix the pmu node name in warning message)
$ git merge arm-current/fixes
Already up-to-date.
Merging m68k-current/for-linus (b24f670b7f5b m68k/mac: Fix out-of-bounds array index in OSS IRQ source initialization)
$ git merge m68k-current/for-linus
Already up-to-date.
Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors)
$ git merge metag-fixes/fixes
Already up-to-date.
Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5)
$ git merge mips-fixes/mips-fixes
Already up-to-date.
Merging powerpc-merge-mpe/fixes (ffb2d78eca08 powerpc/mce: fix off by one errors in mce event handling)
$ git merge powerpc-merge-mpe/fixes
Merge made by the 'recursive' strategy.
arch/powerpc/kernel/mce.c | 4 ++--
arch/powerpc/mm/hugetlbpage.c | 25 ++++++++++++++++---------
arch/powerpc/mm/pgtable_64.c | 11 +++++++++++
3 files changed, 29 insertions(+), 11 deletions(-)
Merging powerpc-merge/merge (c517d838eb7d Linux 4.0-rc1)
$ git merge powerpc-merge/merge
Already up-to-date.
Merging sparc/master (acc455cffa75 sparc64: Setup sysfs to mark LDOM sockets, cores and threads correctly)
$ git merge sparc/master
Merge made by the 'recursive' strategy.
arch/sparc/include/asm/cpudata_64.h | 3 +-
arch/sparc/include/asm/topology_64.h | 3 +-
arch/sparc/kernel/mdesc.c | 136 ++++++++++++++++++++++++++++-------
arch/sparc/kernel/smp_64.c | 13 ++++
4 files changed, 127 insertions(+), 28 deletions(-)
Merging net/master (110bc76729d4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
$ git merge net/master
Already up-to-date.
Merging ipsec/master (6d7258ca9370 esp6: Use high-order sequence number bits for IV generation)
$ git merge ipsec/master
Merge made by the 'recursive' strategy.
net/ipv4/esp4.c | 3 ++-
net/ipv6/esp6.c | 3 ++-
net/xfrm/xfrm_state.c | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
Merging sound-current/for-linus (9b5a4e395c2f ALSA: hda - Add headset mic quirk for Dell Inspiron 5548)
$ git merge sound-current/for-linus
Merge made by the 'recursive' strategy.
sound/pci/hda/patch_realtek.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
Merging pci-current/for-linus (5ebe6afaf005 Linux 4.1-rc2)
$ git merge pci-current/for-linus
Already up-to-date.
Merging wireless-drivers/master (f67382186489 ath9k: fix per-packet tx power configuration)
$ git merge wireless-drivers/master
Already up-to-date.
Merging driver-core.current/driver-core-linus (030bbdbf4c83 Linux 4.1-rc3)
$ git merge driver-core.current/driver-core-linus
Already up-to-date.
Merging tty.current/tty-linus (1a48632ffed6 pty: Fix input race when closing)
$ git merge tty.current/tty-linus
Merge made by the 'recursive' strategy.
Documentation/serial/tty.txt | 3 +++
drivers/tty/n_gsm.c | 5 ++---
drivers/tty/n_hdlc.c | 4 ++--
drivers/tty/n_tty.c | 22 +++++++++++++++++----
drivers/tty/pty.c | 5 +++--
drivers/tty/serial/amba-pl011.c | 5 ++++-
drivers/tty/serial/earlycon.c | 9 ++-------
drivers/tty/serial/omap-serial.c | 2 ++
drivers/tty/tty_buffer.c | 41 ++++++++++++++++++++++++++--------------
include/linux/tty.h | 2 +-
10 files changed, 64 insertions(+), 34 deletions(-)
Merging usb.current/usb-linus (172115090f5e usb-storage: Add NO_WP_DETECT quirk for Lacie 059f:0651 devices)
$ git merge usb.current/usb-linus
Merge made by the 'recursive' strategy.
drivers/usb/chipidea/debug.c | 6 +-
drivers/usb/core/quirks.c | 3 +
drivers/usb/dwc3/dwc3-omap.c | 94 +++++++++++++++---------------
drivers/usb/gadget/configfs.c | 1 +
drivers/usb/gadget/function/f_hid.c | 16 ++++-
drivers/usb/gadget/function/u_serial.c | 5 +-
drivers/usb/gadget/legacy/acm_ms.c | 10 ++--
drivers/usb/gadget/legacy/audio.c | 10 ++--
drivers/usb/gadget/legacy/cdc2.c | 10 ++--
drivers/usb/gadget/legacy/dbgp.c | 4 +-
drivers/usb/gadget/legacy/ether.c | 12 ++--
drivers/usb/gadget/legacy/g_ffs.c | 2 +-
drivers/usb/gadget/legacy/gmidi.c | 10 ++--
drivers/usb/gadget/legacy/hid.c | 12 ++--
drivers/usb/gadget/legacy/mass_storage.c | 6 +-
drivers/usb/gadget/legacy/multi.c | 10 ++--
drivers/usb/gadget/legacy/ncm.c | 10 ++--
drivers/usb/gadget/legacy/nokia.c | 10 ++--
drivers/usb/gadget/legacy/printer.c | 8 +--
drivers/usb/gadget/legacy/serial.c | 4 +-
drivers/usb/gadget/legacy/tcm_usb_gadget.c | 2 +-
drivers/usb/gadget/legacy/webcam.c | 8 +--
drivers/usb/gadget/legacy/zero.c | 4 +-
drivers/usb/gadget/udc/at91_udc.c | 4 +-
drivers/usb/gadget/udc/atmel_usba_udc.c | 4 +-
drivers/usb/gadget/udc/fsl_udc_core.c | 4 +-
drivers/usb/gadget/udc/fusb300_udc.c | 4 +-
drivers/usb/gadget/udc/m66592-udc.c | 4 +-
drivers/usb/gadget/udc/r8a66597-udc.c | 4 +-
drivers/usb/gadget/udc/udc-xilinx.c | 4 +-
drivers/usb/host/xhci-ring.c | 7 ++-
drivers/usb/host/xhci.h | 2 +-
drivers/usb/phy/phy-isp1301-omap.c | 2 +-
drivers/usb/storage/unusual_devs.h | 7 +++
34 files changed, 169 insertions(+), 134 deletions(-)
Merging usb-gadget-fixes/fixes (c94e289f195e usb: gadget: remove incorrect __init/__exit annotations)
$ git merge usb-gadget-fixes/fixes
Already up-to-date.
Merging usb-serial-fixes/usb-linus (82ee3aeb9295 USB: visor: Match I330 phone more precisely)
$ git merge usb-serial-fixes/usb-linus
Merge made by the 'recursive' strategy.
drivers/usb/serial/cp210x.c | 1 +
drivers/usb/serial/pl2303.c | 1 -
drivers/usb/serial/pl2303.h | 4 ----
drivers/usb/serial/visor.c | 2 +-
4 files changed, 2 insertions(+), 6 deletions(-)
Merging staging.current/staging-linus (ec94efcdadab Merge tag 'iio-fixes-for-4.1a-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus)
$ git merge staging.current/staging-linus
Merge made by the 'recursive' strategy.
drivers/iio/accel/mma9551_core.c | 21 +++++++--
drivers/iio/accel/mma9553.c | 18 ++++----
drivers/iio/accel/st_accel_core.c | 1 +
drivers/iio/adc/axp288_adc.c | 12 ++---
drivers/iio/adc/cc10001_adc.c | 60 ++++++++++++++-----------
drivers/iio/adc/mcp320x.c | 6 +--
drivers/iio/adc/qcom-spmi-vadc.c | 7 +--
drivers/iio/adc/xilinx-xadc-core.c | 5 ++-
drivers/iio/adc/xilinx-xadc.h | 6 +--
drivers/iio/common/st_sensors/st_sensors_core.c | 2 -
drivers/iio/gyro/st_gyro_core.c | 1 +
drivers/iio/kfifo_buf.c | 3 +-
drivers/iio/light/hid-sensor-prox.c | 12 +++--
drivers/iio/magnetometer/st_magn_core.c | 1 +
drivers/iio/pressure/bmp280.c | 1 +
drivers/iio/pressure/hid-sensor-press.c | 2 -
drivers/iio/pressure/st_pressure_core.c | 1 +
drivers/staging/gdm724x/gdm_mux.c | 16 +++----
drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 17 +++----
drivers/staging/sm750fb/sm750.c | 2 +-
drivers/staging/vt6655/card.c | 10 +++--
drivers/staging/vt6655/card.h | 2 +-
drivers/staging/vt6655/device_main.c | 42 ++++++++++-------
drivers/staging/vt6656/rxtx.c | 14 ++++--
24 files changed, 152 insertions(+), 110 deletions(-)
Merging char-misc.current/char-misc-linus (0f5b6ec67404 Merge tag 'extcon-fixes-for-4.1-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-linus)
$ git merge char-misc.current/char-misc-linus
Merge made by the 'recursive' strategy.
drivers/extcon/extcon-usb-gpio.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
Merging input-current/for-linus (48853389f206 Merge branch 'next' into for-linus)
$ git merge input-current/for-linus
Already up-to-date.
Merging crypto-current/master (ec59a65d694e crypto: arm64/sha2-ce - prevent asm code finalization in final() path)
$ git merge crypto-current/master
Already up-to-date.
Merging ide/master (d681f1166919 ide: remove deprecated use of pci api)
$ git merge ide/master
Already up-to-date.
Merging devicetree-current/devicetree/merge (41d9489319f2 drivers/of: Add empty ranges quirk for PA-Semi)
$ git merge devicetree-current/devicetree/merge
Already up-to-date.
Merging rr-fixes/fixes (f47689345931 lguest: update help text.)
$ git merge rr-fixes/fixes
Already up-to-date.
Merging vfio-fixes/for-linus (db7d4d7f4021 vfio: Fix runaway interruptible timeout)
$ git merge vfio-fixes/for-linus
Already up-to-date.
Merging kselftest-fixes/fixes (e9886ace222e selftests, x86: Rework x86 target architecture detection)
$ git merge kselftest-fixes/fixes
Removing tools/testing/selftests/x86/run_x86_tests.sh
Merge made by the 'recursive' strategy.
tools/testing/selftests/x86/Makefile | 53 +++++++++++++---------
tools/testing/selftests/x86/check_cc.sh | 16 +++++++
tools/testing/selftests/x86/run_x86_tests.sh | 13 ------
.../testing/selftests/x86/trivial_32bit_program.c | 4 ++
.../testing/selftests/x86/trivial_64bit_program.c | 18 ++++++++
5 files changed, 69 insertions(+), 35 deletions(-)
create mode 100755 tools/testing/selftests/x86/check_cc.sh
delete mode 100644 tools/testing/selftests/x86/run_x86_tests.sh
create mode 100644 tools/testing/selftests/x86/trivial_64bit_program.c
Merging drm-intel-fixes/for-linux-next-fixes (364aece01a2d drm/i915: Avoid GPU hang when coming out of s3 or s4)
$ git merge drm-intel-fixes/for-linux-next-fixes
Merge made by the 'recursive' strategy.
drivers/gpu/drm/i915/i915_drv.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
Merging asm-generic/master (643165c8bbc8 Merge tag 'uaccess_for_upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost into asm-generic)
$ git merge asm-generic/master
Already up-to-date.
Merging arc/for-next (4a8a224570ad ARC: inline cache flush toggle helpers)
$ git merge arc/for-next
Merge made by the 'recursive' strategy.
arch/arc/Kconfig.debug | 13 -------------
arch/arc/include/asm/atomic.h | 2 +-
arch/arc/mm/cache_arc700.c | 4 ++--
3 files changed, 3 insertions(+), 16 deletions(-)
Merging arm/for-next (b9254b93592a Merge branch 'bsym' into for-next)
$ git merge arm/for-next
Auto-merging arch/arm/mach-pxa/lubbock.c
Merge made by the 'recursive' strategy.
Documentation/devicetree/booting-without-of.txt | 4 +
arch/arm/Kconfig | 17 ++-
arch/arm/Makefile | 4 +
arch/arm/boot/compressed/head.S | 4 +-
arch/arm/common/mcpm_head.S | 2 +-
arch/arm/include/asm/assembler.h | 17 ++-
arch/arm/include/asm/entry-macro-multi.S | 4 +-
arch/arm/include/asm/io.h | 52 +++++--
arch/arm/include/asm/mach/arch.h | 2 +-
arch/arm/include/asm/memory.h | 16 ---
arch/arm/include/asm/module.h | 12 +-
arch/arm/include/asm/proc-fns.h | 7 -
arch/arm/include/asm/smp.h | 2 +-
arch/arm/include/asm/system_info.h | 1 +
arch/arm/include/asm/unified.h | 2 -
arch/arm/kernel/Makefile | 1 +
arch/arm/kernel/entry-armv.S | 12 +-
arch/arm/kernel/entry-common.S | 6 +-
arch/arm/kernel/entry-ftrace.S | 2 +-
arch/arm/kernel/entry-v7m.S | 13 +-
arch/arm/kernel/head-nommu.S | 8 +-
arch/arm/kernel/head.S | 50 +++++--
arch/arm/kernel/module-plts.c | 181 ++++++++++++++++++++++++
arch/arm/kernel/module.c | 32 ++++-
arch/arm/kernel/module.lds | 4 +
arch/arm/kernel/setup.c | 30 +++-
arch/arm/kernel/sleep.S | 2 +-
arch/arm/kernel/smp.c | 10 +-
arch/arm/kvm/interrupts.S | 2 +-
arch/arm/lib/call_with_stack.S | 2 +-
arch/arm/mach-davinci/da850.c | 1 +
arch/arm/mach-keystone/keystone.c | 41 +++---
arch/arm/mach-keystone/platsmp.c | 13 --
arch/arm/mach-lpc32xx/clock.c | 5 +-
arch/arm/mach-omap1/board-nokia770.c | 2 +-
arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 12 +-
arch/arm/mach-omap2/omap_device.c | 24 ++--
arch/arm/mach-pxa/eseries.c | 1 +
arch/arm/mach-pxa/lubbock.c | 1 +
arch/arm/mach-pxa/tosa.c | 1 +
arch/arm/mach-sa1100/irq.c | 2 +-
arch/arm/mm/Kconfig | 19 +++
arch/arm/mm/Makefile | 1 +
arch/arm/mm/mmu.c | 153 +++++++++-----------
arch/arm/mm/nommu.c | 9 --
arch/arm/mm/proc-v7-2level.S | 12 +-
arch/arm/mm/proc-v7-3level.S | 14 +-
arch/arm/mm/proc-v7.S | 26 ++--
arch/arm/mm/proc-v7m.S | 2 +-
arch/arm/mm/pv-fixup-asm.S | 88 ++++++++++++
arch/arm/plat-orion/common.c | 6 +-
arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 3 +-
arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 4 +-
arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 4 +-
arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 4 +-
arch/sh/kernel/cpu/sh4a/clock-shx3.c | 4 +-
drivers/clk/clk-s2mps11.c | 4 +-
drivers/clk/clkdev.c | 83 ++++++++---
include/linux/clk.h | 27 ++--
include/linux/clkdev.h | 6 +-
sound/soc/sh/migor.c | 3 +-
61 files changed, 729 insertions(+), 347 deletions(-)
create mode 100644 arch/arm/kernel/module-plts.c
create mode 100644 arch/arm/kernel/module.lds
create mode 100644 arch/arm/mm/pv-fixup-asm.S
Merging arm-perf/for-next/perf (b787f68c36d4 Linux 4.1-rc1)
$ git merge arm-perf/for-next/perf
Already up-to-date.
Merging arm-soc/for-next (4ffd5f4f90f2 arm-soc: document merges)
$ git merge arm-soc/for-next
Removing arch/arm64/boot/dts/skeleton.dtsi
Auto-merging arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
Removing arch/arm/boot/dts/kizbox.dts
Auto-merging arch/arm/Makefile
Auto-merging arch/arm/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/arm/CCN.txt | 17 +-
Documentation/devicetree/bindings/arm/cpus.txt | 1 +
.../bindings/fuse/nvidia,tegra20-fuse.txt | 2 +-
.../memory-controllers/nvidia,tegra-mc.txt | 84 +-
.../bindings/memory-controllers/tegra-emc.txt | 374 +++++++
Documentation/devicetree/bindings/mfd/mfd.txt | 41 +
.../bindings/misc/nvidia,tegra20-apbmisc.txt | 2 +
.../devicetree/bindings/vendor-prefixes.txt | 2 +
MAINTAINERS | 9 +-
arch/arm/Kconfig | 2 +
arch/arm/Kconfig.debug | 26 +-
arch/arm/Makefile | 1 +
arch/arm/arm-soc-for-next-contents.txt | 90 ++
arch/arm/boot/dts/Makefile | 34 +-
arch/arm/boot/dts/arm-realview-pb1176.dts | 2 +-
arch/arm/boot/dts/at91-kizbox.dts | 159 +++
arch/arm/boot/dts/at91-kizbox2.dts | 216 ++++
arch/arm/boot/dts/at91-kizboxmini.dts | 129 +++
arch/arm/boot/dts/at91-sama5d3_xplained.dts | 6 -
arch/arm/boot/dts/at91sam9rlek.dts | 6 -
arch/arm/boot/dts/at91sam9x5.dtsi | 46 +
arch/arm/boot/dts/axp209.dtsi | 5 -
arch/arm/boot/dts/cx92755.dtsi | 17 +
arch/arm/boot/dts/cx92755_equinox.dts | 4 +
arch/arm/boot/dts/hip04-d01.dts | 27 +
arch/arm/boot/dts/hip04.dtsi | 133 +++
arch/arm/boot/dts/integrator.dtsi | 4 +-
arch/arm/boot/dts/kizbox.dts | 150 ---
arch/arm/boot/dts/rk3188-radxarock.dts | 1 +
arch/arm/boot/dts/rk3288-evb.dtsi | 23 +
arch/arm/boot/dts/rk3288-firefly.dtsi | 14 +
arch/arm/boot/dts/rk3288-popmetal.dts | 6 +
arch/arm/boot/dts/rk3288.dtsi | 14 +
arch/arm/boot/dts/sama5d3xcm.dtsi | 6 -
arch/arm/boot/dts/socfpga.dtsi | 19 +-
arch/arm/boot/dts/socfpga_arria10.dtsi | 335 +++++-
...rria10_socdk.dts => socfpga_arria10_socdk.dtsi} | 12 +-
arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts | 26 +
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 16 +
arch/arm/boot/dts/ste-dbx5x0.dtsi | 154 +++
arch/arm/boot/dts/ste-href-stuib.dtsi | 50 +
arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 7 +-
arch/arm/boot/dts/ste-snowball.dts | 23 +-
arch/arm/boot/dts/stih407-family.dtsi | 180 ++++
arch/arm/boot/dts/stih407-pinctrl.dtsi | 2 +
arch/arm/boot/dts/stih410-b2120.dts | 10 +
arch/arm/boot/dts/stih418-b2199.dts | 12 +
arch/arm/boot/dts/stihxxx-b2120.dtsi | 8 +
arch/arm/boot/dts/sun4i-a10-a1000.dts | 207 ++--
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 181 ++--
arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 40 +-
arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 222 ++--
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 171 +++
arch/arm/boot/dts/sun4i-a10-hackberry.dts | 196 ++--
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 13 +-
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 123 ++-
arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 189 ++++
arch/arm/boot/dts/sun4i-a10-marsboard.dts | 16 +-
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 149 ++-
arch/arm/boot/dts/sun4i-a10-mk802.dts | 13 +-
arch/arm/boot/dts/sun4i-a10-mk802ii.dts | 13 +-
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 224 ++--
arch/arm/boot/dts/sun4i-a10-pcduino.dts | 185 ++--
arch/arm/boot/dts/sun4i-a10.dtsi | 163 ++-
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 154 +++
arch/arm/boot/dts/sun5i-a10s-mk802.dts | 13 +-
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 324 +++---
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 139 +--
arch/arm/boot/dts/sun5i-a10s.dtsi | 642 ++---------
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 143 ++-
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 155 ++-
arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 245 +++--
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 226 ++++
arch/arm/boot/dts/sun5i-a13.dtsi | 608 ++---------
arch/arm/boot/dts/sun5i.dtsi | 613 +++++++++++
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 63 +-
arch/arm/boot/dts/sun6i-a31-colombus.dts | 145 ++-
arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 108 +-
arch/arm/boot/dts/sun6i-a31-i7.dts | 149 +++
arch/arm/boot/dts/sun6i-a31-m9.dts | 159 ++-
arch/arm/boot/dts/sun6i-a31.dtsi | 133 ++-
arch/arm/boot/dts/sun6i-a31s-cs908.dts | 48 +-
arch/arm/boot/dts/sun6i-a31s.dtsi | 5 -
arch/arm/boot/dts/sun7i-a20-bananapi.dts | 271 +++--
arch/arm/boot/dts/sun7i-a20-bananapro.dts | 21 +-
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 205 ++--
arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 331 +++---
arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 426 ++++----
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 267 ++---
arch/arm/boot/dts/sun7i-a20-m3.dts | 191 ++--
arch/arm/boot/dts/sun7i-a20-mk808c.dts | 148 +++
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 197 ++--
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 301 +++---
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 411 +++----
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 250 +++++
arch/arm/boot/dts/sun7i-a20-orangepi.dts | 228 ++++
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 194 ++++
arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 217 ++--
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 183 ++++
arch/arm/boot/dts/sun7i-a20.dtsi | 186 +++-
arch/arm/boot/dts/sun8i-a23-ippo-q8h-v1.2.dts | 5 -
arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 117 +-
arch/arm/boot/dts/sun8i-a23.dtsi | 33 +-
arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 99 ++
arch/arm/boot/dts/sun9i-a80-optimus.dts | 72 +-
arch/arm/boot/dts/sun9i-a80.dtsi | 139 ++-
arch/arm/boot/dts/sunxi-common-regulators.dtsi | 5 -
arch/arm/boot/dts/tegra124-jetson-tk1.dts | 4 +
arch/arm/boot/dts/tegra124-venice2.dts | 3 +
arch/arm/boot/dts/tegra124.dtsi | 14 +-
arch/arm/boot/dts/tegra20-seaboard.dts | 12 +
arch/arm/boot/dts/tegra20.dtsi | 2 +-
arch/arm/boot/dts/tegra30-cardhu.dtsi | 30 +-
arch/arm/boot/dts/tegra30.dtsi | 15 +
arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts | 79 ++
arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 110 ++
arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts | 79 ++
arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 117 ++
arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts | 80 ++
arch/arm/boot/dts/uniphier-ph1-sld3.dtsi | 117 ++
arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts | 79 ++
arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 110 ++
arch/arm/boot/dts/uniphier-support-card.dtsi | 65 ++
arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 1 +
arch/arm/boot/dts/vexpress-v2p-ca9.dts | 11 +-
arch/arm/configs/hisi_defconfig | 2 +
arch/arm/configs/multi_v7_defconfig | 22 +-
arch/arm/configs/tegra_defconfig | 10 +
arch/arm/configs/u8500_defconfig | 5 +
arch/arm/include/debug/8250.S | 3 +
arch/arm/mach-gemini/common.h | 4 +-
arch/arm/mach-gemini/reset.c | 4 +-
arch/arm/mach-omap2/omap_hwmod.c | 68 +-
arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 70 ++
arch/arm/mach-omap2/prcm43xx.h | 3 +-
arch/arm/mach-omap2/prminst44xx.c | 20 +-
arch/arm/mach-omap2/timer.c | 13 +-
arch/arm/mach-rockchip/pm.c | 26 -
arch/arm/mach-rockchip/pm.h | 4 -
arch/arm/mach-socfpga/Kconfig | 1 +
arch/arm/mach-socfpga/core.h | 1 -
arch/arm/mach-socfpga/headsmp.S | 5 +-
arch/arm/mach-socfpga/platsmp.c | 33 +-
arch/arm/mach-socfpga/socfpga.c | 34 -
arch/arm/mach-sunxi/platsmp.c | 69 ++
arch/arm/mach-tegra/cpuidle-tegra20.c | 5 +-
arch/arm/mach-tegra/reset-handler.S | 10 +-
arch/arm/mach-tegra/reset.h | 4 +
arch/arm/mach-tegra/sleep-tegra20.S | 37 +-
arch/arm/mach-tegra/sleep-tegra30.S | 2 +-
arch/arm/mach-tegra/sleep.h | 4 +
arch/arm/mach-tegra/tegra.c | 1 -
arch/arm/mach-uniphier/Kconfig | 11 +
arch/arm/mach-uniphier/Makefile | 2 +
arch/arm/mach-uniphier/platsmp.c | 90 ++
arch/arm/mach-uniphier/uniphier.c | 30 +
arch/arm/mach-ux500/cpu-db8500.c | 13 +-
arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 99 +-
arch/arm64/boot/dts/skeleton.dtsi | 13 -
arch/arm64/configs/defconfig | 6 +
drivers/bus/arm-ccn.c | 270 ++++-
drivers/iommu/Kconfig | 2 +-
drivers/iommu/tegra-smmu.c | 109 ++
drivers/leds/leds-syscon.c | 170 +--
drivers/memory/tegra/Kconfig | 10 +
drivers/memory/tegra/Makefile | 3 +
drivers/memory/tegra/mc.c | 143 ++-
drivers/memory/tegra/mc.h | 4 +
drivers/memory/tegra/tegra114.c | 32 +-
drivers/memory/tegra/tegra124-emc.c | 1140 ++++++++++++++++++++
drivers/memory/tegra/tegra124.c | 123 ++-
drivers/memory/tegra/tegra30.c | 32 +-
drivers/of/platform.c | 1 +
drivers/soc/tegra/fuse/fuse-tegra20.c | 6 +-
drivers/soc/tegra/fuse/tegra-apbmisc.c | 21 +
drivers/soc/tegra/pmc.c | 23 +-
include/dt-bindings/mfd/st-lpc.h | 15 +
include/soc/tegra/emc.h | 19 +
include/soc/tegra/fuse.h | 1 +
include/soc/tegra/mc.h | 20 +-
include/soc/tegra/pmc.h | 2 -
181 files changed, 12165 insertions(+), 4814 deletions(-)
create mode 100644 Documentation/devicetree/bindings/memory-controllers/tegra-emc.txt
create mode 100644 Documentation/devicetree/bindings/mfd/mfd.txt
create mode 100644 arch/arm/arm-soc-for-next-contents.txt
create mode 100644 arch/arm/boot/dts/at91-kizbox.dts
create mode 100644 arch/arm/boot/dts/at91-kizbox2.dts
create mode 100644 arch/arm/boot/dts/at91-kizboxmini.dts
delete mode 100644 arch/arm/boot/dts/kizbox.dts
rename arch/arm/boot/dts/{socfpga_arria10_socdk.dts => socfpga_arria10_socdk.dtsi} (90%)
mode change 100755 => 100644
create mode 100644 arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts
create mode 100644 arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
create mode 100644 arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
create mode 100644 arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
create mode 100644 arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
create mode 100644 arch/arm/boot/dts/sun5i.dtsi
create mode 100644 arch/arm/boot/dts/sun6i-a31-i7.dts
create mode 100644 arch/arm/boot/dts/sun7i-a20-mk808c.dts
create mode 100644 arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
create mode 100644 arch/arm/boot/dts/sun7i-a20-orangepi.dts
create mode 100644 arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
create mode 100644 arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
create mode 100644 arch/arm/boot/dts/sun9i-a80-cubieboard4.dts
create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld4-ref.dts
create mode 100644 arch/arm/boot/dts/uniphier-ph1-ld4.dtsi
create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4-ref.dts
create mode 100644 arch/arm/boot/dts/uniphier-ph1-pro4.dtsi
create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld3-ref.dts
create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld3.dtsi
create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld8-ref.dts
create mode 100644 arch/arm/boot/dts/uniphier-ph1-sld8.dtsi
create mode 100644 arch/arm/boot/dts/uniphier-support-card.dtsi
create mode 100644 arch/arm/mach-uniphier/Kconfig
create mode 100644 arch/arm/mach-uniphier/Makefile
create mode 100644 arch/arm/mach-uniphier/platsmp.c
create mode 100644 arch/arm/mach-uniphier/uniphier.c
delete mode 100644 arch/arm64/boot/dts/skeleton.dtsi
create mode 100644 drivers/memory/tegra/tegra124-emc.c
create mode 100644 include/dt-bindings/mfd/st-lpc.h
create mode 100644 include/soc/tegra/emc.h
Merging at91/at91-next (3c6a00e39213 Merge branch 'at91-4.2-dt' into at91-next)
$ git merge at91/at91-next
Merge made by the 'recursive' strategy.
arch/arm/boot/dts/sama5d4.dtsi | 124 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 124 insertions(+)
Merging bcm2835/for-next (b2776bf7149b Linux 3.18)
$ git merge bcm2835/for-next
Already up-to-date.
Merging rpi/for-rpi-next (3bf2017780a5 ARM: bcm2835: Add the mailbox to the device tree)
$ git merge rpi/for-rpi-next
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
.../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 31 +++++++-
.../devicetree/bindings/vendor-prefixes.txt | 1 +
arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 +-
arch/arm/boot/dts/bcm2835-rpi-b.dts | 4 +-
arch/arm/boot/dts/bcm2835-rpi.dtsi | 8 +-
arch/arm/boot/dts/bcm2835.dtsi | 12 ++-
arch/arm/mach-bcm/board_bcm2835.c | 91 ----------------------
drivers/watchdog/bcm2835_wdt.c | 62 +++++++++++++++
include/dt-bindings/pinctrl/bcm2835.h | 27 +++++++
9 files changed, 137 insertions(+), 103 deletions(-)
create mode 100644 include/dt-bindings/pinctrl/bcm2835.h
Merging berlin/berlin/for-next (4412971984ea Merge branches 'berlin/soc', 'berlin/driver' and 'berlin/dt' into berlin/for-next)
$ git merge berlin/berlin/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/arm/marvell,berlin.txt | 100 +++----------
.../devicetree/bindings/clock/marvell,berlin.txt | 31 +++++
.../devicetree/bindings/pinctrl/berlin,pinctrl.txt | 43 ++++++
.../devicetree/bindings/reset/berlin,reset.txt | 23 +++
arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts | 34 ++++-
arch/arm/boot/dts/berlin2.dtsi | 125 +++++++++++------
arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 34 ++++-
arch/arm/boot/dts/berlin2cd.dtsi | 103 ++++++++++----
arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 34 ++++-
arch/arm/boot/dts/berlin2q.dtsi | 155 +++++++++++++--------
arch/arm/mach-berlin/Kconfig | 1 +
drivers/clk/berlin/bg2.c | 7 +-
drivers/clk/berlin/bg2q.c | 7 +-
drivers/pinctrl/berlin/berlin-bg2.c | 26 +---
drivers/pinctrl/berlin/berlin-bg2cd.c | 26 +---
drivers/pinctrl/berlin/berlin-bg2q.c | 26 +---
drivers/pinctrl/berlin/berlin.c | 9 +-
drivers/reset/reset-berlin.c | 71 ++++------
18 files changed, 518 insertions(+), 337 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/marvell,berlin.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/berlin,pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/reset/berlin,reset.txt
Merging cortex-m/for-next (e799b6f37e6c ARM: zImage: add support for ARMv7-M)
$ git merge cortex-m/for-next
Merge made by the 'recursive' strategy.
Merging imx-mxs/for-next (6aa6ad8384fb Merge branch 'imx/defconfig' into for-next)
$ git merge imx-mxs/for-next
Auto-merging drivers/clk/imx/clk.h
Auto-merging drivers/clk/imx/clk-pllv3.c
Auto-merging drivers/clk/imx/clk-pllv1.c
Auto-merging drivers/clk/imx/clk-imx6sx.c
Auto-merging drivers/clk/imx/clk-imx6sl.c
Auto-merging drivers/clk/imx/clk-imx6q.c
Auto-merging drivers/clk/imx/clk-imx51-imx53.c
Auto-merging drivers/clk/imx/clk-imx35.c
Auto-merging drivers/clk/imx/clk-imx31.c
Auto-merging drivers/clk/imx/clk-imx27.c
Auto-merging drivers/clk/imx/clk-imx25.c
Auto-merging drivers/clk/imx/clk-imx21.c
Auto-merging drivers/clk/imx/clk-imx1.c
Auto-merging drivers/clk/imx/clk-cpu.c
Removing arch/arm/mach-imx/mach-cpuimx35.c
Removing arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
Auto-merging arch/arm/boot/dts/Makefile
Auto-merging arch/arm/Kconfig.debug
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../devicetree/bindings/clock/imx7d-clock.txt | 13 +
.../bindings/pinctrl/fsl,imx7d-pinctrl.txt | 27 +
MAINTAINERS | 2 +
arch/arm/Kconfig.debug | 13 +-
arch/arm/boot/dts/Makefile | 2 +
arch/arm/boot/dts/imx23-olinuxino.dts | 6 +
arch/arm/boot/dts/imx23.dtsi | 40 +-
arch/arm/boot/dts/imx28-cfa10036.dts | 3 +
arch/arm/boot/dts/imx28-evk.dts | 2 +-
arch/arm/boot/dts/imx28-m28evk.dts | 2 +-
arch/arm/boot/dts/imx28-sps1.dts | 2 +-
arch/arm/boot/dts/imx50-evk.dts | 2 +-
arch/arm/boot/dts/imx53-smd.dts | 2 +-
arch/arm/boot/dts/imx6dl-gw551x.dts | 55 ++
arch/arm/boot/dts/imx6dl-rex-basic.dts | 2 +-
arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 2 +-
arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +-
arch/arm/boot/dts/imx6q-gw551x.dts | 55 ++
arch/arm/boot/dts/imx6q-rex-pro.dts | 2 +-
arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-dfi-fs700-m60.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 314 ++++++
arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 14 +-
arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +-
arch/arm/boot/dts/imx6qdl.dtsi | 57 +-
arch/arm/boot/dts/imx6sl-evk.dts | 2 +-
arch/arm/boot/dts/imx6sl-warp.dts | 39 +-
arch/arm/boot/dts/imx7d-pinfunc.h | 1038 ++++++++++++++++++++
arch/arm/configs/imx_v6_v7_defconfig | 3 +
arch/arm/include/debug/imx-uart.h | 15 +-
arch/arm/mach-imx/Kconfig | 41 +-
arch/arm/mach-imx/Makefile | 30 +-
arch/arm/mach-imx/anatop.c | 5 +-
arch/arm/mach-imx/common.h | 11 +-
arch/arm/mach-imx/cpu.c | 3 +
arch/arm/mach-imx/cpuidle-imx6q.c | 4 +-
arch/arm/mach-imx/cpuidle-imx6sl.c | 4 +-
arch/arm/mach-imx/cpuidle-imx6sx.c | 4 +-
arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c | 318 ------
arch/arm/mach-imx/gpc.c | 3 +-
arch/arm/mach-imx/hardware.h | 1 +
arch/arm/mach-imx/mach-cpuimx35.c | 206 ----
arch/arm/mach-imx/mach-imx6q.c | 1 +
arch/arm/mach-imx/mach-imx6sl.c | 1 +
arch/arm/mach-imx/mach-imx6sx.c | 1 +
arch/arm/mach-imx/mach-imx7d.c | 43 +
arch/arm/mach-imx/mmdc.c | 2 +
arch/arm/mach-imx/mx27.h | 4 -
arch/arm/mach-imx/mx3x.h | 7 -
arch/arm/mach-imx/mxc.h | 24 +-
arch/arm/mach-imx/pm-imx5.c | 9 +-
arch/arm/mach-imx/pm-imx6.c | 38 +-
arch/arm/mach-imx/time.c | 13 +-
drivers/clk/Makefile | 1 +
drivers/clk/imx/Makefile | 25 +
{arch/arm/mach-imx => drivers/clk/imx}/clk-busy.c | 0
{arch/arm/mach-imx => drivers/clk/imx}/clk-cpu.c | 1 +
.../mach-imx => drivers/clk/imx}/clk-fixup-div.c | 0
.../mach-imx => drivers/clk/imx}/clk-fixup-mux.c | 0
.../clk/imx}/clk-gate-exclusive.c | 0
{arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c | 0
{arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c | 16 +-
{arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c | 13 +-
{arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c | 6 +-
{arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c | 14 +-
{arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c | 34 +-
{arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c | 35 +-
.../mach-imx => drivers/clk/imx}/clk-imx51-imx53.c | 5 +-
{arch/arm/mach-imx => drivers/clk/imx}/clk-imx6q.c | 34 +-
.../arm/mach-imx => drivers/clk/imx}/clk-imx6sl.c | 7 -
.../arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c | 6 -
{arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c | 0
{arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c | 33 +-
{arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c | 0
{arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c | 4 +-
{arch/arm/mach-imx => drivers/clk/imx}/clk-vf610.c | 0
{arch/arm/mach-imx => drivers/clk/imx}/clk.c | 0
{arch/arm/mach-imx => drivers/clk/imx}/clk.h | 20 +-
include/soc/imx/revision.h | 37 +
83 files changed, 1977 insertions(+), 817 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/imx7d-clock.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx7d-pinctrl.txt
create mode 100644 arch/arm/boot/dts/imx6dl-gw551x.dts
create mode 100644 arch/arm/boot/dts/imx6q-gw551x.dts
create mode 100644 arch/arm/boot/dts/imx6qdl-gw551x.dtsi
create mode 100644 arch/arm/boot/dts/imx7d-pinfunc.h
delete mode 100644 arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
delete mode 100644 arch/arm/mach-imx/mach-cpuimx35.c
create mode 100644 arch/arm/mach-imx/mach-imx7d.c
create mode 100644 drivers/clk/imx/Makefile
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-busy.c (100%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-cpu.c (99%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-div.c (100%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-fixup-mux.c (100%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate-exclusive.c (100%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-gate2.c (100%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx1.c (92%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx21.c (96%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx25.c (98%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx27.c (97%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx31.c (92%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx35.c (94%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx51-imx53.c (99%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6q.c (98%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sl.c (99%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-imx6sx.c (99%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pfd.c (100%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv1.c (75%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv2.c (100%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-pllv3.c (99%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk-vf610.c (100%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk.c (100%)
rename {arch/arm/mach-imx => drivers/clk/imx}/clk.h (89%)
create mode 100644 include/soc/imx/revision.h
Merging keystone/next (a6ba4234e474 ARM: dts: k2l: fix the netcp range size)
$ git merge keystone/next
Merge made by the 'recursive' strategy.
arch/arm/boot/dts/k2e-evm.dts | 1 +
arch/arm/boot/dts/k2e-netcp.dtsi | 206 +++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/k2e.dtsi | 1 +
arch/arm/boot/dts/k2hk-evm.dts | 1 +
arch/arm/boot/dts/k2hk-netcp.dtsi | 208 ++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/k2hk.dtsi | 1 +
arch/arm/boot/dts/k2l-evm.dts | 1 +
arch/arm/boot/dts/k2l-netcp.dtsi | 189 ++++++++++++++++++++++++++++++++
arch/arm/boot/dts/k2l.dtsi | 1 +
arch/arm/configs/keystone_defconfig | 6 ++
10 files changed, 615 insertions(+)
create mode 100644 arch/arm/boot/dts/k2e-netcp.dtsi
create mode 100644 arch/arm/boot/dts/k2hk-netcp.dtsi
create mode 100644 arch/arm/boot/dts/k2l-netcp.dtsi
Merging mvebu/for-next (689bc92a6492 Merge branch 'mvebu/dt' into mvebu/for-next)
$ git merge mvebu/for-next
Removing arch/arm/boot/dts/dove-cm-a510.dts
Auto-merging arch/arm/boot/dts/Makefile
Merge made by the 'recursive' strategy.
arch/arm/boot/dts/Makefile | 4 +-
arch/arm/boot/dts/armada-375.dtsi | 2 +-
arch/arm/boot/dts/armada-38x.dtsi | 4 +-
arch/arm/boot/dts/armada-39x.dtsi | 2 +-
arch/arm/boot/dts/dove-cm-a510.dts | 38 -------
arch/arm/boot/dts/dove-cm-a510.dtsi | 195 ++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/dove-cubox.dts | 1 +
arch/arm/boot/dts/dove-sbc-a510.dts | 182 +++++++++++++++++++++++++++++++++
arch/arm/boot/dts/dove.dtsi | 40 +++++++-
9 files changed, 422 insertions(+), 46 deletions(-)
delete mode 100644 arch/arm/boot/dts/dove-cm-a510.dts
create mode 100644 arch/arm/boot/dts/dove-cm-a510.dtsi
create mode 100644 arch/arm/boot/dts/dove-sbc-a510.dts
Merging omap/for-next (8be7646999c7 Merge tag 'omap-for-v4.1/fixes-rc2' into for-next)
$ git merge omap/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data)
$ git merge omap-pending/for-next
Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution.
Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 038b6c0a582b] Merge remote-tracking branch 'omap-pending/for-next'
$ git diff -M --stat --summary HEAD^..
Merging renesas/next (19ab3cd76fc9 Merge branch 'heads/dt-for-v4.2' into next)
$ git merge renesas/next
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/spi/sh-msiof.txt | 2 +-
arch/arm/boot/dts/emev2-kzm9d.dts | 4 +-
arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +-
arch/arm/boot/dts/r8a73a4.dtsi | 11 ++++--
arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +-
arch/arm/boot/dts/r8a7740.dtsi | 10 ++---
arch/arm/boot/dts/r8a7778-bockw-reference.dts | 2 +-
arch/arm/boot/dts/r8a7778-bockw.dts | 4 +-
arch/arm/boot/dts/r8a7778.dtsi | 2 +-
arch/arm/boot/dts/r8a7779-marzen.dts | 6 +--
arch/arm/boot/dts/r8a7779.dtsi | 2 +-
arch/arm/boot/dts/r8a7790-lager.dts | 4 +-
arch/arm/boot/dts/r8a7790.dtsi | 44 +++++++++++++++++++---
arch/arm/boot/dts/r8a7791-henninger.dts | 2 +-
arch/arm/boot/dts/r8a7791-koelsch.dts | 4 +-
arch/arm/boot/dts/r8a7791.dtsi | 42 +++++++++++++++++++--
arch/arm/boot/dts/r8a7794.dtsi | 9 +++++
arch/arm/boot/dts/sh73a0-kzm9g.dts | 1 +
arch/arm/boot/dts/sh73a0.dtsi | 10 ++---
arch/arm/configs/shmobile_defconfig | 4 +-
include/dt-bindings/clock/r8a73a4-clock.h | 1 +
include/dt-bindings/clock/r8a7790-clock.h | 3 ++
include/dt-bindings/clock/r8a7791-clock.h | 3 ++
include/dt-bindings/clock/r8a7794-clock.h | 3 ++
24 files changed, 134 insertions(+), 43 deletions(-)
Merging samsung/for-next (9c0f5bf0a241 Merge branch 'samsung-fixes-v4.1-2nd' into for-next)
$ git merge samsung/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/arm/samsung/pmu.txt | 1 +
arch/arm/boot/dts/exynos3250.dtsi | 13 +
arch/arm/boot/dts/exynos5250-smdk5250.dts | 12 +
arch/arm/boot/dts/exynos5420-peach-pit.dts | 1 +
arch/arm/boot/dts/exynos5422-odroidxu3.dts | 33 +-
arch/arm/boot/dts/exynos5800-peach-pi.dts | 1 +
arch/arm/mach-exynos/pm_domains.c | 4 +-
arch/arm/mach-exynos/suspend.c | 4 +-
arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 698 +++++++++++++++
.../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 22 +
arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 231 +++++
arch/arm64/boot/dts/exynos/exynos5433.dtsi | 931 +++++++++++++++++++++
12 files changed, 1946 insertions(+), 5 deletions(-)
create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi
create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu-sensor-conf.dtsi
create mode 100644 arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi
create mode 100644 arch/arm64/boot/dts/exynos/exynos5433.dtsi
Merging sunxi/sunxi/for-next (a426b3379698 Merge branch 'sunxi/dt-for-4.2' into sunxi/for-next)
$ git merge sunxi/sunxi/for-next
Auto-merging arch/arm/configs/multi_v7_defconfig
Merge made by the 'recursive' strategy.
.../devicetree/bindings/soc/sunxi/sram.txt | 64 ++++++
arch/arm/configs/multi_v7_defconfig | 1 -
arch/arm/configs/sunxi_defconfig | 6 +-
drivers/clk/sunxi/clk-sun9i-core.c | 10 +-
drivers/clk/sunxi/clk-sunxi.c | 2 +
drivers/soc/Kconfig | 1 +
drivers/soc/Makefile | 1 +
drivers/soc/sunxi/Kconfig | 10 +
drivers/soc/sunxi/Makefile | 1 +
drivers/soc/sunxi/sunxi_sram.c | 236 +++++++++++++++++++++
include/linux/soc/sunxi/sunxi_sram.h | 24 +++
11 files changed, 349 insertions(+), 7 deletions(-)
create mode 100644 Documentation/devicetree/bindings/soc/sunxi/sram.txt
create mode 100644 drivers/soc/sunxi/Kconfig
create mode 100644 drivers/soc/sunxi/Makefile
create mode 100644 drivers/soc/sunxi/sunxi_sram.c
create mode 100644 include/linux/soc/sunxi/sunxi_sram.h
Merging tegra/for-next (a4b484d8d187 Merge branch for-4.2/fuse into for-next)
$ git merge tegra/for-next
Merge made by the 'recursive' strategy.
.../bindings/clock/nvidia,tegra124-car.txt | 44 +-
arch/arm/mach-tegra/iomap.h | 3 -
drivers/clk/Kconfig | 1 +
drivers/clk/clk.c | 8 +
drivers/clk/tegra/Kconfig | 3 +
drivers/clk/tegra/Makefile | 1 +
drivers/clk/tegra/clk-emc.c | 538 +++++++++++++++++++++
drivers/clk/tegra/clk-tegra124.c | 19 +-
drivers/clk/tegra/clk-tegra30.c | 2 +-
drivers/clk/tegra/clk.h | 12 +
drivers/soc/tegra/common.c | 2 +
drivers/soc/tegra/fuse/Makefile | 2 +
drivers/soc/tegra/fuse/fuse-tegra.c | 255 ++++++++--
drivers/soc/tegra/fuse/fuse-tegra20.c | 175 +++----
drivers/soc/tegra/fuse/fuse-tegra30.c | 232 ++++-----
drivers/soc/tegra/fuse/fuse.h | 95 ++--
drivers/soc/tegra/fuse/speedo-tegra114.c | 22 +-
drivers/soc/tegra/fuse/speedo-tegra124.c | 26 +-
drivers/soc/tegra/fuse/speedo-tegra20.c | 28 +-
drivers/soc/tegra/fuse/speedo-tegra210.c | 184 +++++++
drivers/soc/tegra/fuse/speedo-tegra30.c | 48 +-
drivers/soc/tegra/fuse/tegra-apbmisc.c | 76 ++-
drivers/soc/tegra/pmc.c | 104 +++-
include/linux/clk-provider.h | 1 +
include/soc/tegra/fuse.h | 6 +-
include/soc/tegra/pmc.h | 5 +
26 files changed, 1439 insertions(+), 453 deletions(-)
create mode 100644 drivers/clk/tegra/Kconfig
create mode 100644 drivers/clk/tegra/clk-emc.c
create mode 100644 drivers/soc/tegra/fuse/speedo-tegra210.c
Merging arm64/for-next/core (6d1966dfd6e0 arm64: fix midr range for Cortex-A57 erratum 832075)
$ git merge arm64/for-next/core
Already up-to-date.
Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe)
$ git merge blackfin/for-linus
Already up-to-date.
Merging c6x/for-linux-next (3083ca2376a7 c6x: platforms: cache: Export symbol L1P_cache_block_invalidate and L1D_cache_block_writeback)
$ git merge c6x/for-linux-next
Already up-to-date.
Merging cris/for-next (f5691735f6cd cris: arch-v32: gpio: Use kzalloc instead of kmalloc/memset)
$ git merge cris/for-next
Merge made by the 'recursive' strategy.
arch/cris/arch-v32/drivers/mach-fs/gpio.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
Merging h8300/h8300-next (5befaa907481 h8300: devicetree source)
$ git merge h8300/h8300-next
Auto-merging drivers/clk/Makefile
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
CREDITS | 5 -
.../bindings/clock/renesas,h8300-div-clock.txt | 24 ++
.../bindings/clock/renesas,h8s2678-pll-clock.txt | 23 ++
Documentation/devicetree/bindings/h8300/cpu.txt | 13 +
.../interrupt-controller/renesas,h8300h-intc.txt | 22 ++
.../interrupt-controller/renesas,h8s-intc.txt | 22 ++
.../memory-controllers/renesas,h8300-bsc.txt | 12 +
.../bindings/serial/renesas,sci-serial.txt | 1 +
.../bindings/timer/renesas,16bit-timer.txt | 25 ++
.../bindings/timer/renesas,8bit-timer.txt | 25 ++
.../devicetree/bindings/timer/renesas,tpu.txt | 21 ++
MAINTAINERS | 11 +
arch/h8300/Kconfig | 77 ++++
arch/h8300/Kconfig.cpu | 99 +++++
arch/h8300/Makefile | 55 +++
arch/h8300/boot/Makefile | 26 ++
arch/h8300/boot/compressed/Makefile | 37 ++
arch/h8300/boot/compressed/head.S | 48 +++
arch/h8300/boot/compressed/misc.c | 74 ++++
arch/h8300/boot/compressed/vmlinux.lds | 32 ++
arch/h8300/boot/compressed/vmlinux.scr | 9 +
arch/h8300/boot/dts/Makefile | 11 +
arch/h8300/boot/dts/edosk2674.dts | 107 ++++++
arch/h8300/boot/dts/h8300h_sim.dts | 96 +++++
arch/h8300/boot/dts/h8s_sim.dts | 99 +++++
arch/h8300/configs/edosk2674_defconfig | 49 +++
arch/h8300/configs/h8300h-sim_defconfig | 49 +++
arch/h8300/configs/h8s-sim_defconfig | 49 +++
arch/h8300/include/asm/Kbuild | 75 ++++
arch/h8300/include/asm/atomic.h | 159 ++++++++
arch/h8300/include/asm/bitops.h | 185 +++++++++
arch/h8300/include/asm/bitsperlong.h | 14 +
arch/h8300/include/asm/bug.h | 12 +
arch/h8300/include/asm/byteorder.h | 7 +
arch/h8300/include/asm/cache.h | 11 +
arch/h8300/include/asm/cmpxchg.h | 65 ++++
arch/h8300/include/asm/dma-mapping.h | 57 +++
arch/h8300/include/asm/elf.h | 101 +++++
arch/h8300/include/asm/flat.h | 28 ++
arch/h8300/include/asm/io.h | 57 +++
arch/h8300/include/asm/irq.h | 26 ++
arch/h8300/include/asm/irqflags.h | 96 +++++
arch/h8300/include/asm/mc146818rtc.h | 9 +
arch/h8300/include/asm/mutex.h | 9 +
arch/h8300/include/asm/page.h | 18 +
arch/h8300/include/asm/page_offset.h | 2 +
arch/h8300/include/asm/pci.h | 19 +
arch/h8300/include/asm/pgtable.h | 49 +++
arch/h8300/include/asm/processor.h | 144 +++++++
arch/h8300/include/asm/ptrace.h | 36 ++
arch/h8300/include/asm/segment.h | 45 +++
arch/h8300/include/asm/signal.h | 22 ++
arch/h8300/include/asm/smp.h | 1 +
arch/h8300/include/asm/string.h | 17 +
arch/h8300/include/asm/switch_to.h | 51 +++
arch/h8300/include/asm/syscall.h | 56 +++
arch/h8300/include/asm/thread_info.h | 111 ++++++
arch/h8300/include/asm/tlb.h | 8 +
arch/h8300/include/asm/traps.h | 41 ++
arch/h8300/include/asm/user.h | 74 ++++
arch/h8300/include/uapi/asm/Kbuild | 30 ++
arch/h8300/include/uapi/asm/byteorder.h | 6 +
arch/h8300/include/uapi/asm/ptrace.h | 42 +++
arch/h8300/include/uapi/asm/sigcontext.h | 18 +
arch/h8300/include/uapi/asm/signal.h | 115 ++++++
arch/h8300/include/uapi/asm/unistd.h | 3 +
arch/h8300/kernel/Makefile | 19 +
arch/h8300/kernel/asm-offsets.c | 67 ++++
arch/h8300/kernel/dma.c | 69 ++++
arch/h8300/kernel/entry.S | 414 +++++++++++++++++++++
arch/h8300/kernel/h8300_ksyms.c | 36 ++
arch/h8300/kernel/head_ram.S | 60 +++
arch/h8300/kernel/head_rom.S | 110 ++++++
arch/h8300/kernel/irq.c | 97 +++++
arch/h8300/kernel/module.c | 70 ++++
arch/h8300/kernel/process.c | 171 +++++++++
arch/h8300/kernel/ptrace.c | 203 ++++++++++
arch/h8300/kernel/ptrace_h.c | 256 +++++++++++++
arch/h8300/kernel/ptrace_s.c | 44 +++
arch/h8300/kernel/setup.c | 255 +++++++++++++
arch/h8300/kernel/signal.c | 289 ++++++++++++++
arch/h8300/kernel/sim-console.c | 79 ++++
arch/h8300/kernel/syscalls.c | 14 +
arch/h8300/kernel/traps.c | 161 ++++++++
arch/h8300/kernel/vmlinux.lds.S | 67 ++++
arch/h8300/lib/Makefile | 8 +
arch/h8300/lib/abs.S | 20 +
arch/h8300/lib/ashldi3.c | 24 ++
arch/h8300/lib/ashrdi3.c | 24 ++
arch/h8300/lib/delay.c | 40 ++
arch/h8300/lib/libgcc.h | 77 ++++
arch/h8300/lib/lshrdi3.c | 23 ++
arch/h8300/lib/memcpy.S | 85 +++++
arch/h8300/lib/memset.S | 69 ++++
arch/h8300/lib/moddivsi3.S | 72 ++++
arch/h8300/lib/modsi3.S | 72 ++++
arch/h8300/lib/muldi3.c | 44 +++
arch/h8300/lib/mulsi3.S | 38 ++
arch/h8300/lib/strncpy.S | 34 ++
arch/h8300/lib/ucmpdi2.c | 17 +
arch/h8300/lib/udivsi3.S | 76 ++++
arch/h8300/mm/Makefile | 5 +
arch/h8300/mm/fault.c | 57 +++
arch/h8300/mm/init.c | 128 +++++++
arch/h8300/mm/memory.c | 53 +++
drivers/clk/Makefile | 1 +
drivers/clk/h8300/Makefile | 2 +
drivers/clk/h8300/clk-div.c | 53 +++
drivers/clk/h8300/clk-h8s2678.c | 147 ++++++++
drivers/clocksource/Kconfig | 7 +
drivers/clocksource/Makefile | 3 +
drivers/clocksource/h8300_timer16.c | 254 +++++++++++++
drivers/clocksource/h8300_timer8.c | 313 ++++++++++++++++
drivers/clocksource/h8300_tpu.c | 207 +++++++++++
drivers/irqchip/Kconfig | 8 +
drivers/irqchip/Makefile | 2 +
drivers/irqchip/irq-renesas-h8300h.c | 95 +++++
drivers/irqchip/irq-renesas-h8s.c | 101 +++++
drivers/tty/serial/Kconfig | 2 +-
drivers/tty/serial/sh-sci.c | 6 +
include/asm-generic/asm-offsets.h | 1 +
include/uapi/linux/elf-em.h | 1 +
scripts/mksysmap | 2 +-
123 files changed, 7585 insertions(+), 7 deletions(-)
create mode 100644 Documentation/devicetree/bindings/clock/renesas,h8300-div-clock.txt
create mode 100644 Documentation/devicetree/bindings/clock/renesas,h8s2678-pll-clock.txt
create mode 100644 Documentation/devicetree/bindings/h8300/cpu.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8300h-intc.txt
create mode 100644 Documentation/devicetree/bindings/interrupt-controller/renesas,h8s-intc.txt
create mode 100644 Documentation/devicetree/bindings/memory-controllers/renesas,h8300-bsc.txt
create mode 100644 Documentation/devicetree/bindings/timer/renesas,16bit-timer.txt
create mode 100644 Documentation/devicetree/bindings/timer/renesas,8bit-timer.txt
create mode 100644 Documentation/devicetree/bindings/timer/renesas,tpu.txt
create mode 100644 arch/h8300/Kconfig
create mode 100644 arch/h8300/Kconfig.cpu
create mode 100644 arch/h8300/Makefile
create mode 100644 arch/h8300/boot/Makefile
create mode 100644 arch/h8300/boot/compressed/Makefile
create mode 100644 arch/h8300/boot/compressed/head.S
create mode 100644 arch/h8300/boot/compressed/misc.c
create mode 100644 arch/h8300/boot/compressed/vmlinux.lds
create mode 100644 arch/h8300/boot/compressed/vmlinux.scr
create mode 100644 arch/h8300/boot/dts/Makefile
create mode 100644 arch/h8300/boot/dts/edosk2674.dts
create mode 100644 arch/h8300/boot/dts/h8300h_sim.dts
create mode 100644 arch/h8300/boot/dts/h8s_sim.dts
create mode 100644 arch/h8300/configs/edosk2674_defconfig
create mode 100644 arch/h8300/configs/h8300h-sim_defconfig
create mode 100644 arch/h8300/configs/h8s-sim_defconfig
create mode 100644 arch/h8300/include/asm/Kbuild
create mode 100644 arch/h8300/include/asm/atomic.h
create mode 100644 arch/h8300/include/asm/bitops.h
create mode 100644 arch/h8300/include/asm/bitsperlong.h
create mode 100644 arch/h8300/include/asm/bug.h
create mode 100644 arch/h8300/include/asm/byteorder.h
create mode 100644 arch/h8300/include/asm/cache.h
create mode 100644 arch/h8300/include/asm/cmpxchg.h
create mode 100644 arch/h8300/include/asm/dma-mapping.h
create mode 100644 arch/h8300/include/asm/elf.h
create mode 100644 arch/h8300/include/asm/flat.h
create mode 100644 arch/h8300/include/asm/io.h
create mode 100644 arch/h8300/include/asm/irq.h
create mode 100644 arch/h8300/include/asm/irqflags.h
create mode 100644 arch/h8300/include/asm/mc146818rtc.h
create mode 100644 arch/h8300/include/asm/mutex.h
create mode 100644 arch/h8300/include/asm/page.h
create mode 100644 arch/h8300/include/asm/page_offset.h
create mode 100644 arch/h8300/include/asm/pci.h
create mode 100644 arch/h8300/include/asm/pgtable.h
create mode 100644 arch/h8300/include/asm/processor.h
create mode 100644 arch/h8300/include/asm/ptrace.h
create mode 100644 arch/h8300/include/asm/segment.h
create mode 100644 arch/h8300/include/asm/signal.h
create mode 100644 arch/h8300/include/asm/smp.h
create mode 100644 arch/h8300/include/asm/string.h
create mode 100644 arch/h8300/include/asm/switch_to.h
create mode 100644 arch/h8300/include/asm/syscall.h
create mode 100644 arch/h8300/include/asm/thread_info.h
create mode 100644 arch/h8300/include/asm/tlb.h
create mode 100644 arch/h8300/include/asm/traps.h
create mode 100644 arch/h8300/include/asm/user.h
create mode 100644 arch/h8300/include/uapi/asm/Kbuild
create mode 100644 arch/h8300/include/uapi/asm/byteorder.h
create mode 100644 arch/h8300/include/uapi/asm/ptrace.h
create mode 100644 arch/h8300/include/uapi/asm/sigcontext.h
create mode 100644 arch/h8300/include/uapi/asm/signal.h
create mode 100644 arch/h8300/include/uapi/asm/unistd.h
create mode 100644 arch/h8300/kernel/Makefile
create mode 100644 arch/h8300/kernel/asm-offsets.c
create mode 100644 arch/h8300/kernel/dma.c
create mode 100644 arch/h8300/kernel/entry.S
create mode 100644 arch/h8300/kernel/h8300_ksyms.c
create mode 100644 arch/h8300/kernel/head_ram.S
create mode 100644 arch/h8300/kernel/head_rom.S
create mode 100644 arch/h8300/kernel/irq.c
create mode 100644 arch/h8300/kernel/module.c
create mode 100644 arch/h8300/kernel/process.c
create mode 100644 arch/h8300/kernel/ptrace.c
create mode 100644 arch/h8300/kernel/ptrace_h.c
create mode 100644 arch/h8300/kernel/ptrace_s.c
create mode 100644 arch/h8300/kernel/setup.c
create mode 100644 arch/h8300/kernel/signal.c
create mode 100644 arch/h8300/kernel/sim-console.c
create mode 100644 arch/h8300/kernel/syscalls.c
create mode 100644 arch/h8300/kernel/traps.c
create mode 100644 arch/h8300/kernel/vmlinux.lds.S
create mode 100644 arch/h8300/lib/Makefile
create mode 100644 arch/h8300/lib/abs.S
create mode 100644 arch/h8300/lib/ashldi3.c
create mode 100644 arch/h8300/lib/ashrdi3.c
create mode 100644 arch/h8300/lib/delay.c
create mode 100644 arch/h8300/lib/libgcc.h
create mode 100644 arch/h8300/lib/lshrdi3.c
create mode 100644 arch/h8300/lib/memcpy.S
create mode 100644 arch/h8300/lib/memset.S
create mode 100644 arch/h8300/lib/moddivsi3.S
create mode 100644 arch/h8300/lib/modsi3.S
create mode 100644 arch/h8300/lib/muldi3.c
create mode 100644 arch/h8300/lib/mulsi3.S
create mode 100644 arch/h8300/lib/strncpy.S
create mode 100644 arch/h8300/lib/ucmpdi2.c
create mode 100644 arch/h8300/lib/udivsi3.S
create mode 100644 arch/h8300/mm/Makefile
create mode 100644 arch/h8300/mm/fault.c
create mode 100644 arch/h8300/mm/init.c
create mode 100644 arch/h8300/mm/memory.c
create mode 100644 drivers/clk/h8300/Makefile
create mode 100644 drivers/clk/h8300/clk-div.c
create mode 100644 drivers/clk/h8300/clk-h8s2678.c
create mode 100644 drivers/clocksource/h8300_timer16.c
create mode 100644 drivers/clocksource/h8300_timer8.c
create mode 100644 drivers/clocksource/h8300_tpu.c
create mode 100644 drivers/irqchip/irq-renesas-h8300h.c
create mode 100644 drivers/irqchip/irq-renesas-h8s.c
create mode 100644 include/asm-generic/asm-offsets.h
Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps)
$ git merge hexagon/linux-next
Already up-to-date.
Merging ia64/next (62f269ef8191 pstore: Fix the ramoops module parameters update)
$ git merge ia64/next
Already up-to-date.
Merging m68k/for-next (2b8520f1f256 m68k: Use for_each_sg())
$ git merge m68k/for-next
Merge made by the 'recursive' strategy.
arch/m68k/configs/amiga_defconfig | 9 +++++++--
arch/m68k/configs/apollo_defconfig | 9 +++++++--
arch/m68k/configs/atari_defconfig | 9 +++++++--
arch/m68k/configs/bvme6000_defconfig | 9 +++++++--
arch/m68k/configs/hp300_defconfig | 9 +++++++--
arch/m68k/configs/mac_defconfig | 9 +++++++--
arch/m68k/configs/multi_defconfig | 9 +++++++--
arch/m68k/configs/mvme147_defconfig | 9 +++++++--
arch/m68k/configs/mvme16x_defconfig | 9 +++++++--
arch/m68k/configs/q40_defconfig | 9 +++++++--
arch/m68k/configs/sun3_defconfig | 9 +++++++--
arch/m68k/configs/sun3x_defconfig | 9 +++++++--
arch/m68k/kernel/dma.c | 19 ++++++++++++-------
13 files changed, 96 insertions(+), 31 deletions(-)
Merging m68knommu/for-next (030bbdbf4c83 Linux 4.1-rc3)
$ git merge m68knommu/for-next
Already up-to-date.
Merging metag/for-next (40346a0327fe metag: copy_thread(): rename 'arg' argument to 'kthread_arg')
$ git merge metag/for-next
Already up-to-date.
Merging microblaze/next (c2219eda5478 microblaze: Fix syscall error recovery for invalid syscall IDs)
$ git merge microblaze/next
Already up-to-date.
Merging mips/mips-for-linux-next (1c55fd57cc6c Merge branch '4.1-fixes' into mips-for-linux-next)
$ git merge mips/mips-for-linux-next
Merge made by the 'recursive' strategy.
arch/mips/Kconfig | 1 +
arch/mips/Makefile | 2 +-
arch/mips/bcm47xx/nvram.c | 22 ++++++------
arch/mips/bcm47xx/setup.c | 3 --
arch/mips/bcm47xx/sprom.c | 51 ++++++++++++++++------------
arch/mips/configs/maltasmvp_defconfig | 17 +++++-----
arch/mips/include/asm/elf.h | 4 +--
arch/mips/include/asm/mach-bcm47xx/bcm47xx.h | 4 ---
arch/mips/kernel/ptrace.c | 2 +-
arch/mips/kernel/smp-cps.c | 2 +-
arch/mips/kernel/traps.c | 8 ++---
arch/mips/kvm/emulate.c | 6 ----
arch/mips/math-emu/cp1emu.c | 4 +--
arch/mips/sgi-ip32/ip32-platform.c | 4 +--
include/linux/ssb/ssb.h | 8 ++++-
15 files changed, 68 insertions(+), 70 deletions(-)
Merging nios2/nios2-next (1a70db49a735 nios2: rework cache)
$ git merge nios2/nios2-next
Already up-to-date.
Merging parisc-hd/for-next (d045c77c1a69 parisc,metag: Fix crashes due to stack randomization on stack-grows-upwards architectures)
$ git merge parisc-hd/for-next
Merge made by the 'recursive' strategy.
arch/parisc/include/asm/elf.h | 4 ++++
arch/parisc/kernel/process.c | 10 ++++++----
arch/parisc/kernel/sys_parisc.c | 3 +++
drivers/parisc/superio.c | 2 +-
fs/exec.c | 3 +++
5 files changed, 17 insertions(+), 5 deletions(-)
Merging powerpc-mpe/next (38c048877098 powerpc/powernv: Silence SYSPARAM warning on boot)
$ git merge powerpc-mpe/next
Auto-merging arch/powerpc/platforms/pasemi/msi.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 7 +-
arch/powerpc/Kconfig.debug | 8 ++
arch/powerpc/Makefile | 17 ++-
arch/powerpc/include/asm/page.h | 4 +-
arch/powerpc/include/asm/pgtable-ppc64.h | 2 +-
arch/powerpc/kernel/Makefile | 3 +-
arch/powerpc/kernel/setup_64.c | 3 +-
arch/powerpc/kernel/vdso.c | 135 +++++++++------------
arch/powerpc/platforms/Kconfig.cputype | 10 ++
arch/powerpc/platforms/pasemi/Makefile | 1 +
.../mpic_pasemi_msi.c => platforms/pasemi/msi.c} | 4 +-
arch/powerpc/platforms/powernv/opal-sysparam.c | 31 +++--
arch/powerpc/platforms/pseries/dlpar.c | 3 +-
arch/powerpc/sysdev/Makefile | 2 +-
arch/powerpc/sysdev/i8259.c | 2 +-
arch/powerpc/sysdev/ipic.c | 2 +-
arch/powerpc/sysdev/mpc8xx_pic.c | 2 +-
arch/powerpc/sysdev/mpic.c | 2 +-
arch/powerpc/sysdev/mpic.h | 10 +-
arch/powerpc/sysdev/mv64x60_pic.c | 2 +-
arch/powerpc/sysdev/qe_lib/qe_ic.c | 2 +-
arch/powerpc/sysdev/tsi108_pci.c | 2 +-
arch/powerpc/sysdev/uic.c | 2 +-
arch/powerpc/sysdev/xics/xics-common.c | 2 +-
arch/powerpc/sysdev/xilinx_intc.c | 2 +-
25 files changed, 134 insertions(+), 126 deletions(-)
rename arch/powerpc/{sysdev/mpic_pasemi_msi.c => platforms/pasemi/msi.c} (99%)
Merging powerpc/next (65e7bb2a34fe Merge branch 'next-sriov' into next)
$ git merge powerpc/next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging fsl/next (d41444daba1f powerpc/corenet: enable CONFIG_I2C_MUX and CONFIG_I2C_MUX_PCA954x)
$ git merge fsl/next
Already up-to-date.
Merging mpc5xxx/next (9e813308a5c1 powerpc/thp: Add tracepoints to track hugepage invalidate)
$ git merge mpc5xxx/next
Already up-to-date.
Merging s390/features (7c53fcb39fdd s390/dasd: Enable automatic loading of dasd_diag_mod)
$ git merge s390/features
Merge made by the 'recursive' strategy.
arch/s390/crypto/prng.c | 2 +-
arch/s390/hypfs/hypfs_sprp.c | 4 +-
arch/s390/include/asm/sclp.h | 34 +++++++-----
arch/s390/kernel/crash_dump.c | 8 +--
arch/s390/kernel/setup.c | 10 ++--
arch/s390/kernel/smp.c | 13 ++---
arch/s390/kvm/interrupt.c | 4 +-
arch/s390/kvm/kvm-s390.c | 8 +--
arch/s390/mm/init.c | 2 +-
arch/s390/mm/mem_detect.c | 4 +-
arch/s390/net/bpf_jit_comp.c | 19 +++----
drivers/s390/block/dasd.c | 17 ++++++
drivers/s390/char/sclp.c | 2 +-
drivers/s390/char/sclp.h | 15 ++----
drivers/s390/char/sclp_cmd.c | 27 ++++------
drivers/s390/char/sclp_early.c | 118 ++++++++---------------------------------
drivers/s390/char/zcore.c | 10 ++--
drivers/s390/crypto/ap_bus.c | 20 ++++---
drivers/s390/kvm/kvm_virtio.c | 4 +-
19 files changed, 129 insertions(+), 192 deletions(-)
Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input)
$ git merge sparc-next/master
Already up-to-date.
Merging tile/master (47ad7b9bbeaa tile: improve stack backtrace)
$ git merge tile/master
Auto-merging arch/tile/kernel/setup.c
Merge made by the 'recursive' strategy.
arch/tile/Kconfig | 3 +
arch/tile/include/asm/irq.h | 5 ++
arch/tile/include/asm/processor.h | 2 -
arch/tile/include/asm/spinlock_32.h | 6 +-
arch/tile/include/asm/spinlock_64.h | 5 +-
arch/tile/include/asm/stack.h | 13 ++--
arch/tile/include/asm/thread_info.h | 1 +
arch/tile/include/asm/traps.h | 8 ++
arch/tile/include/asm/uaccess.h | 66 +++-------------
arch/tile/include/asm/word-at-a-time.h | 36 +++++++++
arch/tile/include/hv/hypervisor.h | 60 +++++++++++++-
arch/tile/kernel/entry.S | 7 --
arch/tile/kernel/hvglue.S | 3 +-
arch/tile/kernel/hvglue_trace.c | 4 +
arch/tile/kernel/intvec_64.S | 6 ++
arch/tile/kernel/process.c | 138 +++++++++++++++++++++++++++++----
arch/tile/kernel/setup.c | 2 +-
arch/tile/kernel/stack.c | 125 +++++++++++++++++------------
arch/tile/kernel/traps.c | 15 ++++
arch/tile/lib/exports.c | 3 -
arch/tile/lib/spinlock_32.c | 11 ++-
arch/tile/lib/spinlock_64.c | 11 ++-
arch/tile/lib/usercopy_32.S | 46 -----------
arch/tile/lib/usercopy_64.S | 46 -----------
drivers/tty/hvc/hvc_tile.c | 3 +-
25 files changed, 384 insertions(+), 241 deletions(-)
create mode 100644 arch/tile/include/asm/word-at-a-time.h
Merging uml/linux-next (fe205bdd1321 um: Print minimum physical memory requirement)
$ git merge uml/linux-next
Already up-to-date.
Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option)
$ git merge unicore32/unicore32
Already up-to-date.
Merging xtensa/for_next (06a631433460 xtensa: Provide dummy dma_alloc_attrs() and dma_free_attrs())
$ git merge xtensa/for_next
Merge made by the 'recursive' strategy.
arch/xtensa/include/asm/dma-mapping.h | 13 +++++++++++++
1 file changed, 13 insertions(+)
Merging btrfs/next (e082f56313f3 btrfs: quota: Update quota tree after qgroup relationship change.)
$ git merge btrfs/next
Already up-to-date.
Merging ceph/master (84b54fefaa05 libceph: announce support for straw2 buckets)
$ git merge ceph/master
Merge made by the 'recursive' strategy.
Merging cifs/for-next (bc8ebdc4f54c Fix that several functions handle incorrect value of mapchars)
$ git merge cifs/for-next
Merge made by the 'recursive' strategy.
fs/cifs/cifs_dfs_ref.c | 3 ++-
fs/cifs/cifsfs.c | 2 ++
fs/cifs/cifsproto.h | 4 ++--
fs/cifs/cifssmb.c | 21 +++++++++++----------
fs/cifs/dir.c | 3 +--
fs/cifs/file.c | 3 +--
fs/cifs/inode.c | 6 ++----
fs/cifs/link.c | 3 ++-
fs/cifs/readdir.c | 2 ++
fs/cifs/smb1ops.c | 3 ++-
10 files changed, 27 insertions(+), 23 deletions(-)
Merging ecryptfs/next (6d65261a09ad eCryptfs: don't pass fs-specific ioctl commands through)
$ git merge ecryptfs/next
Already up-to-date.
Merging ext3/for_next (3adc12e96482 udf: Update ctime and mtime when directory is modified)
$ git merge ext3/for_next
Already up-to-date.
Merging ext4/dev (fd64e6fd4575 ext4 crypto: reorganize how we store keys in the inode)
$ git merge ext4/dev
Merge made by the 'recursive' strategy.
fs/ext4/crypto.c | 19 +-
fs/ext4/crypto_fname.c | 502 ++++++++++++++----------------------------------
fs/ext4/crypto_key.c | 87 ++++++---
fs/ext4/crypto_policy.c | 76 ++++----
fs/ext4/dir.c | 24 ++-
fs/ext4/ext4.h | 107 +++++++----
fs/ext4/ext4_crypto.h | 31 +--
fs/ext4/file.c | 4 +-
fs/ext4/inline.c | 31 ++-
fs/ext4/namei.c | 340 ++++++++++++--------------------
fs/ext4/super.c | 7 +-
fs/ext4/symlink.c | 16 +-
12 files changed, 515 insertions(+), 729 deletions(-)
Merging f2fs/dev (71e6dc5798f1 f2fs: fix building on 32-bit architectures)
$ git merge f2fs/dev
Merge made by the 'recursive' strategy.
fs/f2fs/Kconfig | 19 ++
fs/f2fs/Makefile | 2 +
fs/f2fs/acl.c | 48 ++--
fs/f2fs/checkpoint.c | 30 ++-
fs/f2fs/crypto.c | 557 +++++++++++++++++++++++++++++++++++++++
fs/f2fs/crypto_fname.c | 490 ++++++++++++++++++++++++++++++++++
fs/f2fs/crypto_key.c | 200 ++++++++++++++
fs/f2fs/crypto_policy.c | 206 +++++++++++++++
fs/f2fs/data.c | 623 +++++++++++++++++++++++++++++++++-----------
fs/f2fs/debug.c | 11 +-
fs/f2fs/dir.c | 194 +++++++++-----
fs/f2fs/f2fs.h | 323 +++++++++++++++++++++--
fs/f2fs/f2fs_crypto.h | 156 +++++++++++
fs/f2fs/file.c | 414 +++++++++++++++++++++++++++--
fs/f2fs/gc.c | 104 +++++++-
fs/f2fs/hash.c | 3 +-
fs/f2fs/inline.c | 43 ++-
fs/f2fs/inode.c | 9 +-
fs/f2fs/namei.c | 224 +++++++++++++---
fs/f2fs/node.c | 48 ++--
fs/f2fs/node.h | 22 --
fs/f2fs/recovery.c | 21 +-
fs/f2fs/segment.c | 202 +++++++++-----
fs/f2fs/segment.h | 1 +
fs/f2fs/super.c | 69 +++--
fs/f2fs/trace.c | 6 +-
fs/f2fs/trace.h | 4 +-
fs/f2fs/xattr.c | 3 +
fs/f2fs/xattr.h | 4 +
include/linux/f2fs_fs.h | 8 +
include/trace/events/f2fs.h | 33 ++-
31 files changed, 3560 insertions(+), 517 deletions(-)
create mode 100644 fs/f2fs/crypto.c
create mode 100644 fs/f2fs/crypto_fname.c
create mode 100644 fs/f2fs/crypto_key.c
create mode 100644 fs/f2fs/crypto_policy.c
create mode 100644 fs/f2fs/f2fs_crypto.h
Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed)
$ git merge fscache/fscache
Auto-merging fs/cachefiles/namei.c
Merge made by the 'recursive' strategy.
Documentation/filesystems/caching/backend-api.txt | 23 ++
Documentation/filesystems/caching/fscache.txt | 7 +-
fs/cachefiles/internal.h | 1 -
fs/cachefiles/namei.c | 33 ++-
fs/fscache/cookie.c | 8 +-
fs/fscache/internal.h | 12 +-
fs/fscache/netfs.c | 38 ++--
fs/fscache/object.c | 69 +++++-
fs/fscache/operation.c | 254 ++++++++++++++--------
fs/fscache/page.c | 86 ++++----
fs/fscache/stats.c | 14 +-
include/linux/fscache-cache.h | 55 +++--
12 files changed, 396 insertions(+), 204 deletions(-)
Merging fuse/for-next (94e4fe2cab3d fuse: explicitly set /dev/fuse file's private_data)
$ git merge fuse/for-next
Already up-to-date.
Merging gfs2/for-next (1272574bf948 gfs2: kerneldoc warning fixes)
$ git merge gfs2/for-next
Auto-merging fs/gfs2/ops_fstype.c
Auto-merging fs/gfs2/inode.c
Auto-merging fs/gfs2/file.c
Auto-merging fs/gfs2/aops.c
Merge made by the 'recursive' strategy.
fs/gfs2/aops.c | 12 ++-
fs/gfs2/file.c | 2 +-
fs/gfs2/inode.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++-----
fs/gfs2/ops_fstype.c | 1 +
fs/gfs2/rgrp.c | 21 ++++--
fs/gfs2/sys.c | 66 +++++++++++-----
6 files changed, 264 insertions(+), 47 deletions(-)
Merging jfs/jfs-next (7d2ac45611b0 jfs: %pf is only for function pointers)
$ git merge jfs/jfs-next
Already up-to-date.
Merging nfs/linux-next (feaff8e5b2cf nfs: take extra reference to fl->fl_file when running a setlk)
$ git merge nfs/linux-next
Merge made by the 'recursive' strategy.
fs/nfs/nfs4proc.c | 3 +++
fs/nfs/write.c | 13 ++++++++-----
2 files changed, 11 insertions(+), 5 deletions(-)
Merging nfsd/nfsd-next (d57a97bbdb5f nfsd: Pin to vfsmnt instead of mntget)
$ git merge nfsd/nfsd-next
Auto-merging fs/namei.c
Merge made by the 'recursive' strategy.
Documentation/filesystems/nfs/knfsd-stats.txt | 44 ++--------------
fs/fs_pin.c | 3 ++
fs/namei.c | 74 +++++++++++++++++++++++++++
fs/nfsd/export.c | 37 +++++++++++---
fs/nfsd/export.h | 10 +++-
fs/nfsd/nfs3xdr.c | 14 ++---
fs/nfsd/nfs4state.c | 2 +-
fs/nfsd/nfs4xdr.c | 8 +--
fs/nfsd/vfs.c | 42 +++++----------
fs/nfsd/vfs.h | 1 -
include/linux/fs_pin.h | 1 +
include/linux/namei.h | 1 +
include/linux/sunrpc/cache.h | 11 ++++
13 files changed, 160 insertions(+), 88 deletions(-)
Merging overlayfs/overlayfs-next (71cbad7e694e ovl: upper fs should not be R/O)
$ git merge overlayfs/overlayfs-next
Already up-to-date.
Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option)
$ git merge squashfs/master
Already up-to-date.
Merging v9fs/for-next (3d99e3fe13d4 Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile)
$ git merge v9fs/for-next
Already up-to-date.
Merging ubifs/linux-next (98fb1ffd8154 UBI: block: Add missing cache flushes)
$ git merge ubifs/linux-next
Merge made by the 'recursive' strategy.
drivers/mtd/ubi/block.c | 2 ++
1 file changed, 2 insertions(+)
Merging xfs/for-next (5ebe6afaf005 Linux 4.1-rc2)
$ git merge xfs/for-next
Already up-to-date.
Merging file-locks/linux-next (7505256626b0 Merge tag 'devicetree-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux)
$ git merge file-locks/linux-next
Already up-to-date.
Merging vfs/for-next (9f9775e474a8 update Documentation/filesystems/ regarding the follow_link/put_link changes)
$ git merge vfs/for-next
Resolved 'fs/ext4/symlink.c' using previous resolution.
Auto-merging include/linux/namei.h
Removing fs/sysv/symlink.c
Auto-merging fs/namei.c
Auto-merging fs/gfs2/inode.c
Auto-merging fs/f2fs/namei.c
Auto-merging fs/ext4/symlink.c
CONFLICT (content): Merge conflict in fs/ext4/symlink.c
Auto-merging fs/ext4/namei.c
Auto-merging fs/ext4/ext4.h
Removing fs/exofs/symlink.c
Auto-merging fs/cifs/link.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master c13a36b3a0a2] Merge remote-tracking branch 'vfs/for-next'
$ git diff -M --stat --summary HEAD^..
Documentation/filesystems/Locking | 4 +-
Documentation/filesystems/porting | 17 +
Documentation/filesystems/vfs.txt | 22 +-
drivers/staging/lustre/lustre/llite/symlink.c | 26 +-
fs/9p/v9fs.h | 2 -
fs/9p/vfs_inode.c | 122 +--
fs/9p/vfs_inode_dotl.c | 36 +-
fs/autofs4/symlink.c | 5 +-
fs/befs/linuxvfs.c | 57 +-
fs/ceph/inode.c | 11 +-
fs/cifs/cifsfs.h | 2 +-
fs/cifs/link.c | 28 +-
fs/configfs/symlink.c | 31 +-
fs/debugfs/file.c | 12 -
fs/debugfs/inode.c | 6 +-
fs/ecryptfs/inode.c | 8 +-
fs/exofs/Kbuild | 2 +-
fs/exofs/exofs.h | 4 -
fs/exofs/inode.c | 9 +-
fs/exofs/namei.c | 5 +-
fs/exofs/symlink.c | 55 --
fs/ext2/inode.c | 1 +
fs/ext2/namei.c | 3 +-
fs/ext2/symlink.c | 10 +-
fs/ext3/inode.c | 1 +
fs/ext3/namei.c | 3 +-
fs/ext3/symlink.c | 10 +-
fs/ext4/ext4.h | 1 +
fs/ext4/inode.c | 7 +-
fs/ext4/namei.c | 11 +-
fs/ext4/symlink.c | 46 +-
fs/f2fs/namei.c | 18 +-
fs/freevxfs/vxfs_extern.h | 3 -
fs/freevxfs/vxfs_immed.c | 34 -
fs/freevxfs/vxfs_inode.c | 7 +-
fs/fuse/dir.c | 22 +-
fs/gfs2/inode.c | 10 +-
fs/hostfs/hostfs_kern.c | 15 +-
fs/hppfs/hppfs.c | 13 +-
fs/inode.c | 31 +-
fs/jffs2/dir.c | 1 +
fs/jffs2/fs.c | 1 +
fs/jffs2/symlink.c | 45 +-
fs/jfs/inode.c | 3 +-
fs/jfs/namei.c | 5 +-
fs/jfs/symlink.c | 10 +-
fs/kernfs/symlink.c | 25 +-
fs/libfs.c | 25 +-
fs/logfs/dir.c | 1 +
fs/mount.h | 1 +
fs/namei.c | 1125 ++++++++++++++-----------
fs/namespace.c | 27 +-
fs/nfs/symlink.c | 19 +-
fs/open.c | 2 +-
fs/overlayfs/inode.c | 35 +-
fs/proc/base.c | 4 +-
fs/proc/inode.c | 9 +-
fs/proc/namespaces.c | 4 +-
fs/proc/self.c | 24 +-
fs/proc/thread_self.c | 22 +-
fs/sysv/Makefile | 2 +-
fs/sysv/inode.c | 5 +-
fs/sysv/symlink.c | 20 -
fs/sysv/sysv.h | 1 -
fs/ubifs/dir.c | 1 +
fs/ubifs/file.c | 11 +-
fs/ubifs/super.c | 1 +
fs/ufs/inode.c | 5 +-
fs/ufs/namei.c | 3 +-
fs/ufs/symlink.c | 13 +-
fs/xfs/xfs_iops.c | 11 +-
include/linux/debugfs.h | 1 -
include/linux/fs.h | 15 +-
include/linux/namei.h | 6 +-
include/linux/sched.h | 2 +-
include/linux/security.h | 13 +-
mm/shmem.c | 32 +-
security/capability.c | 4 +-
security/security.c | 7 +-
security/selinux/avc.c | 18 +-
security/selinux/hooks.c | 18 +-
security/selinux/include/avc.h | 9 +-
82 files changed, 1051 insertions(+), 1245 deletions(-)
delete mode 100644 fs/exofs/symlink.c
delete mode 100644 fs/sysv/symlink.c
$ git am -3 ../patches/0001-f2fs-merge-fix-for-follow_link-changes.patch
Applying: f2fs: merge fix for follow_link changes
$ git reset HEAD^
Unstaged changes after reset:
M fs/f2fs/namei.c
$ git add -A .
$ git commit -v -a --amend
[master b757f23446e0] Merge remote-tracking branch 'vfs/for-next'
Date: Thu May 14 12:08:33 2015 +1000
Merging pci/next (9b08ae0dde00 Merge branch 'pci/msi' into next)
$ git merge pci/next
Merge made by the 'recursive' strategy.
drivers/ntb/ntb_hw.c | 2 --
drivers/pci/msi.c | 53 +++++++-------------------------------
drivers/pci/pci.c | 33 ------------------------
drivers/pci/pci.h | 21 +++++++++++++++
drivers/pci/probe.c | 18 +++++++++++++
drivers/pci/quirks.c | 2 --
drivers/virtio/virtio_pci_common.c | 3 ---
include/linux/pci.h | 1 -
8 files changed, 49 insertions(+), 84 deletions(-)
Merging hid/for-next (2c869d7dc6ec Merge branch 'for-4.1/upstream-fixes' into for-next)
$ git merge hid/for-next
Merge made by the 'recursive' strategy.
.../ABI/testing/sysfs-driver-hid-logitech-lg4ff | 8 +-
drivers/hid/hid-core.c | 16 +-
drivers/hid/hid-ids.h | 23 +-
drivers/hid/hid-lenovo.c | 50 +++
drivers/hid/hid-lg.c | 24 +-
drivers/hid/hid-lg4ff.c | 458 ++++++++++++++-------
drivers/hid/hid-lg4ff.h | 4 +-
drivers/hid/hid-logitech-hidpp.c | 20 -
drivers/hid/hid-prodikeys.c | 3 +-
drivers/hid/hid-sensor-hub.c | 13 +-
drivers/hid/hid-sjoy.c | 3 +
drivers/hid/hid-sony.c | 213 ++++++++--
drivers/hid/i2c-hid/i2c-hid.c | 5 +-
drivers/hid/usbhid/hid-quirks.c | 5 +-
drivers/hid/wacom.h | 2 +-
drivers/hid/wacom_sys.c | 129 +++---
drivers/hid/wacom_wac.c | 41 +-
drivers/hid/wacom_wac.h | 12 +-
include/linux/hid-sensor-hub.h | 4 +-
19 files changed, 697 insertions(+), 336 deletions(-)
Merging i2c/i2c/for-next (f6505fbabc42 i2c: add SLIMpro I2C device driver on APM X-Gene platform)
$ git merge i2c/i2c/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/i2c/i2c-xgene-slimpro.txt | 15 +
drivers/i2c/busses/Kconfig | 13 +-
drivers/i2c/busses/Makefile | 1 +
drivers/i2c/busses/i2c-imx.c | 2 +-
drivers/i2c/busses/i2c-mxs.c | 2 +-
drivers/i2c/busses/i2c-omap.c | 74 +++-
drivers/i2c/busses/i2c-rcar.c | 2 +-
drivers/i2c/busses/i2c-rk3x.c | 2 +-
drivers/i2c/busses/i2c-s3c2410.c | 2 +-
drivers/i2c/busses/i2c-xgene-slimpro.c | 469 +++++++++++++++++++++
drivers/i2c/busses/i2c-xiic.c | 1 +
drivers/i2c/muxes/Kconfig | 5 +-
12 files changed, 575 insertions(+), 13 deletions(-)
create mode 100644 Documentation/devicetree/bindings/i2c/i2c-xgene-slimpro.txt
create mode 100644 drivers/i2c/busses/i2c-xgene-slimpro.c
Merging jdelvare-hwmon/master (26bc420b59a3 Linux 3.19-rc6)
$ git merge jdelvare-hwmon/master
Already up-to-date.
Merging dmi/master (9432bf142f77 firmware: dmi: List my quilt tree)
$ git merge dmi/master
Auto-merging MAINTAINERS
Auto-merging Documentation/ABI/testing/sysfs-firmware-dmi-entries
Merge made by the 'recursive' strategy.
...sfs-firmware-dmi => sysfs-firmware-dmi-entries} | 2 +-
.../ABI/testing/sysfs-firmware-dmi-tables | 22 ++++
MAINTAINERS | 2 +
drivers/firmware/dmi-sysfs.c | 17 ++-
drivers/firmware/dmi_scan.c | 115 ++++++++++++++++++---
include/linux/dmi.h | 2 +
6 files changed, 134 insertions(+), 26 deletions(-)
rename Documentation/ABI/testing/{sysfs-firmware-dmi => sysfs-firmware-dmi-entries} (99%)
create mode 100644 Documentation/ABI/testing/sysfs-firmware-dmi-tables
Merging hwmon-staging/hwmon-next (0f8b11419e2f hwmon: Allow compile test of GPIO consumers if !GPIOLIB)
$ git merge hwmon-staging/hwmon-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../devicetree/bindings/hwmon/ntc_thermistor.txt | 1 +
Documentation/hwmon/ntc_thermistor | 6 ++-
MAINTAINERS | 2 +-
drivers/hwmon/Kconfig | 8 ++--
drivers/hwmon/max197.c | 2 +-
drivers/hwmon/ntc_thermistor.c | 44 ++++++++++++++++++++++
drivers/hwmon/sht15.c | 2 +-
include/linux/platform_data/ntc_thermistor.h | 1 +
8 files changed, 57 insertions(+), 9 deletions(-)
Merging v4l-dvb/master (e7f8fd8aa7f2 Merge branch 'patchwork' into to_next)
$ git merge v4l-dvb/master
Removing drivers/staging/media/dt3155v4l/dt3155v4l.c
Removing drivers/staging/media/dt3155v4l/Makefile
Removing drivers/staging/media/dt3155v4l/Kconfig
Auto-merging drivers/media/pci/dt3155/dt3155.h
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/DocBook/media/v4l/controls.xml | 4 +-
.../DocBook/media/v4l/media-func-open.xml | 2 +-
Documentation/DocBook/media/v4l/vidioc-g-edid.xml | 7 +
.../devicetree/bindings/media/i2c/adp1653.txt | 37 +
Documentation/video4linux/v4l2-pci-skeleton.c | 2 -
MAINTAINERS | 8 +
drivers/input/touchscreen/Kconfig | 3 +-
drivers/media/dvb-frontends/af9013.c | 4 +
drivers/media/dvb-frontends/bcm3510.c | 4 +-
drivers/media/dvb-frontends/cx24116.c | 8 +-
drivers/media/dvb-frontends/cx24117.c | 2 +-
drivers/media/dvb-frontends/cx24123.h | 2 +-
drivers/media/dvb-frontends/dib0070.c | 575 ++++++------
drivers/media/dvb-frontends/dib3000mc.c | 18 +-
drivers/media/dvb-frontends/dib8000.h | 2 +-
drivers/media/dvb-frontends/drx39xyj/drxj.c | 38 +-
drivers/media/dvb-frontends/lgdt3306a.c | 2 +-
drivers/media/dvb-frontends/mb86a20s.h | 2 +-
drivers/media/dvb-frontends/s5h1420.c | 20 +-
drivers/media/dvb-frontends/s921.h | 2 +-
drivers/media/dvb-frontends/stv0288.c | 28 +-
drivers/media/dvb-frontends/stv0297.c | 8 +-
drivers/media/dvb-frontends/stv0900_sw.c | 6 +-
drivers/media/dvb-frontends/tda1004x.c | 2 +-
drivers/media/dvb-frontends/tda10086.c | 4 +-
drivers/media/dvb-frontends/zl10353.c | 10 +-
drivers/media/i2c/adp1653.c | 100 ++-
drivers/media/i2c/adv7170.c | 42 +-
drivers/media/i2c/adv7175.c | 42 +-
drivers/media/i2c/adv7183.c | 61 +-
drivers/media/i2c/adv7604.c | 69 +-
drivers/media/i2c/adv7842.c | 25 +-
drivers/media/i2c/ak881x.c | 39 +-
drivers/media/i2c/cx25840/cx25840-core.c | 17 +-
drivers/media/i2c/ml86v7667.c | 29 +-
drivers/media/i2c/mt9v011.c | 53 +-
drivers/media/i2c/ov2659.c | 2 +-
drivers/media/i2c/ov7670.c | 65 +-
drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +-
drivers/media/i2c/s5k5baf.c | 2 +-
drivers/media/i2c/s5k6aa.c | 2 +-
drivers/media/i2c/saa6752hs.c | 42 +-
drivers/media/i2c/saa7115.c | 16 +-
drivers/media/i2c/saa717x.c | 20 +-
drivers/media/i2c/smiapp/smiapp-core.c | 38 +-
drivers/media/i2c/soc_camera/imx074.c | 66 +-
drivers/media/i2c/soc_camera/mt9m001.c | 43 +-
drivers/media/i2c/soc_camera/mt9m111.c | 57 +-
drivers/media/i2c/soc_camera/mt9t031.c | 74 +-
drivers/media/i2c/soc_camera/mt9t112.c | 41 +-
drivers/media/i2c/soc_camera/mt9v022.c | 43 +-
drivers/media/i2c/soc_camera/ov2640.c | 62 +-
drivers/media/i2c/soc_camera/ov5642.c | 60 +-
drivers/media/i2c/soc_camera/ov6650.c | 43 +-
drivers/media/i2c/soc_camera/ov772x.c | 41 +-
drivers/media/i2c/soc_camera/ov9640.c | 32 +-
drivers/media/i2c/soc_camera/ov9740.c | 35 +-
drivers/media/i2c/soc_camera/rj54n1cb0c.c | 66 +-
drivers/media/i2c/soc_camera/tw9910.c | 41 +-
drivers/media/i2c/sr030pc30.c | 62 +-
drivers/media/i2c/tvp514x.c | 55 +-
drivers/media/i2c/tvp5150.c | 30 +-
drivers/media/i2c/tvp7002.c | 48 -
drivers/media/i2c/vs6624.c | 55 +-
drivers/media/pci/Kconfig | 1 +
drivers/media/pci/Makefile | 1 +
drivers/media/pci/bt8xx/bttv-audio-hook.c | 443 ++++++----
drivers/media/pci/bt8xx/bttv-driver.c | 5 +-
drivers/media/pci/cx18/cx18-av-core.c | 16 +-
drivers/media/pci/cx18/cx18-controls.c | 13 +-
drivers/media/pci/cx18/cx18-driver.c | 4 +-
drivers/media/pci/cx18/cx18-ioctl.c | 12 +-
drivers/media/pci/cx18/cx18-streams.c | 1 +
drivers/media/pci/cx23885/altera-ci.c | 2 +-
drivers/media/pci/cx23885/cx23885-video.c | 12 +-
drivers/media/pci/cx88/cx88-core.c | 2 +
drivers/media/pci/cx88/cx88-mpeg.c | 6 +-
drivers/media/pci/cx88/cx88-vbi.c | 6 +-
drivers/media/pci/cx88/cx88-video.c | 7 +-
drivers/media/pci/cx88/cx88.h | 1 -
drivers/media/pci/dt3155/Kconfig | 13 +
drivers/media/pci/dt3155/Makefile | 1 +
drivers/media/pci/dt3155/dt3155.c | 632 +++++++++++++
.../dt3155v4l.h => media/pci/dt3155/dt3155.h} | 64 +-
drivers/media/pci/ivtv/ivtv-controls.c | 12 +-
drivers/media/pci/ivtv/ivtv-driver.c | 4 +-
drivers/media/pci/ivtv/ivtv-ioctl.c | 12 +-
drivers/media/pci/mantis/mantis_cards.c | 3 -
drivers/media/pci/ngene/ngene-core.c | 10 +-
drivers/media/pci/saa7134/saa7134-cards.c | 19 +-
drivers/media/pci/saa7134/saa7134-dvb.c | 2 +-
drivers/media/pci/saa7134/saa7134-empress.c | 32 +-
drivers/media/pci/saa7164/saa7164-api.c | 22 +-
drivers/media/pci/saa7164/saa7164-buffer.c | 2 +-
drivers/media/pci/saa7164/saa7164-bus.c | 2 +-
drivers/media/pci/saa7164/saa7164-cards.c | 188 +++-
drivers/media/pci/saa7164/saa7164-cmd.c | 2 +-
drivers/media/pci/saa7164/saa7164-core.c | 16 +-
drivers/media/pci/saa7164/saa7164-dvb.c | 238 ++++-
drivers/media/pci/saa7164/saa7164-encoder.c | 13 +-
drivers/media/pci/saa7164/saa7164-fw.c | 2 +-
drivers/media/pci/saa7164/saa7164-i2c.c | 9 +-
drivers/media/pci/saa7164/saa7164-reg.h | 2 +-
drivers/media/pci/saa7164/saa7164-types.h | 2 +-
drivers/media/pci/saa7164/saa7164-vbi.c | 13 +-
drivers/media/pci/saa7164/saa7164.h | 7 +-
drivers/media/pci/zoran/zoran_device.c | 13 +-
drivers/media/platform/am437x/am437x-vpfe.c | 32 +-
drivers/media/platform/blackfin/bfin_capture.c | 40 +-
drivers/media/platform/davinci/vpfe_capture.c | 19 +-
drivers/media/platform/m2m-deinterlace.c | 1 -
drivers/media/platform/marvell-ccic/cafe-driver.c | 13 +-
drivers/media/platform/marvell-ccic/mcam-core.c | 471 ++++------
drivers/media/platform/marvell-ccic/mcam-core.h | 3 +-
drivers/media/platform/marvell-ccic/mmp-driver.c | 1 +
drivers/media/platform/s3c-camif/camif-capture.c | 13 +-
drivers/media/platform/s5p-mfc/s5p_mfc.c | 2 -
drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 2 +-
drivers/media/platform/s5p-tv/hdmi_drv.c | 12 +-
drivers/media/platform/s5p-tv/mixer_drv.c | 15 +-
drivers/media/platform/s5p-tv/sdo_drv.c | 14 +-
drivers/media/platform/sh_vou.c | 61 +-
drivers/media/platform/soc_camera/atmel-isi.c | 74 +-
drivers/media/platform/soc_camera/mx2_camera.c | 113 +--
drivers/media/platform/soc_camera/mx3_camera.c | 105 ++-
drivers/media/platform/soc_camera/omap1_camera.c | 106 ++-
drivers/media/platform/soc_camera/pxa_camera.c | 99 ++-
drivers/media/platform/soc_camera/rcar_vin.c | 109 ++-
.../platform/soc_camera/sh_mobile_ceu_camera.c | 115 +--
drivers/media/platform/soc_camera/sh_mobile_csi2.c | 35 +-
drivers/media/platform/soc_camera/soc_camera.c | 30 +-
.../platform/soc_camera/soc_camera_platform.c | 24 +-
drivers/media/platform/soc_camera/soc_scale_crop.c | 37 +-
drivers/media/platform/via-camera.c | 19 +-
drivers/media/platform/vim2m.c | 4 -
drivers/media/platform/vivid/vivid-core.c | 13 +-
drivers/media/platform/vivid/vivid-core.h | 1 -
drivers/media/platform/vivid/vivid-radio-rx.c | 2 +
drivers/media/platform/vivid/vivid-tpg.c | 109 ++-
drivers/media/platform/vivid/vivid-tpg.h | 1 +
drivers/media/platform/vivid/vivid-vid-cap.c | 17 +-
drivers/media/platform/vivid/vivid-vid-common.c | 50 --
drivers/media/platform/vivid/vivid-vid-out.c | 3 +-
drivers/media/platform/xilinx/Kconfig | 2 +-
drivers/media/radio/radio-si476x.c | 4 +-
drivers/media/radio/radio-timb.c | 4 +-
drivers/media/radio/si4713/si4713.c | 4 +-
drivers/media/radio/wl128x/fmdrv.h | 2 +-
drivers/media/rc/ir-sony-decoder.c | 28 +-
drivers/media/rc/rc-main.c | 2 +-
drivers/media/rc/redrat3.c | 2 +-
drivers/media/tuners/qt1010.c | 8 +-
drivers/media/tuners/r820t.c | 4 +-
drivers/media/usb/as102/as102_drv.c | 1 +
drivers/media/usb/cx231xx/cx231xx-417.c | 18 +-
drivers/media/usb/cx231xx/cx231xx-avcore.c | 44 +-
drivers/media/usb/cx231xx/cx231xx-core.c | 30 +-
drivers/media/usb/cx231xx/cx231xx-video.c | 23 +-
drivers/media/usb/dvb-usb/af9005-fe.c | 2 +-
drivers/media/usb/dvb-usb/dib0700_devices.c | 32 +-
drivers/media/usb/dvb-usb/dw2102.c | 2 +-
drivers/media/usb/dvb-usb/vp702x.c | 7 +-
drivers/media/usb/em28xx/em28xx-camera.c | 12 +-
drivers/media/usb/go7007/go7007-driver.c | 3 +-
drivers/media/usb/go7007/go7007-usb.c | 4 +
drivers/media/usb/go7007/go7007-v4l2.c | 12 +-
drivers/media/usb/go7007/s2250-board.c | 18 +-
drivers/media/usb/gspca/benq.c | 4 +-
drivers/media/usb/gspca/sonixj.c | 2 +-
drivers/media/usb/gspca/stk014.c | 2 +-
drivers/media/usb/gspca/xirlink_cit.c | 12 +-
drivers/media/usb/gspca/zc3xx.c | 16 +-
drivers/media/usb/pvrusb2/pvrusb2-context.c | 3 +-
drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 35 +-
drivers/media/usb/pvrusb2/pvrusb2-io.c | 30 +-
drivers/media/usb/pvrusb2/pvrusb2-ioread.c | 24 +-
drivers/media/usb/ttusb-dec/ttusb_dec.c | 4 +-
drivers/media/usb/usbtv/usbtv-video.c | 12 +-
drivers/media/usb/usbvision/usbvision-core.c | 4 +-
drivers/media/v4l2-core/Kconfig | 2 +-
drivers/media/v4l2-core/v4l2-dv-timings.c | 29 +-
drivers/media/v4l2-core/v4l2-ioctl.c | 199 ++++-
drivers/media/v4l2-core/v4l2-of.c | 92 +-
drivers/media/v4l2-core/videobuf2-core.c | 2 -
drivers/media/v4l2-core/videobuf2-dma-contig.c | 7 +
drivers/media/v4l2-core/videobuf2-dma-sg.c | 6 +
drivers/media/v4l2-core/videobuf2-vmalloc.c | 6 +-
drivers/staging/media/Kconfig | 2 -
drivers/staging/media/Makefile | 1 -
drivers/staging/media/bcm2048/radio-bcm2048.c | 3 +-
drivers/staging/media/dt3155v4l/Kconfig | 29 -
drivers/staging/media/dt3155v4l/Makefile | 1 -
drivers/staging/media/dt3155v4l/dt3155v4l.c | 981 ---------------------
include/media/adp1653.h | 8 +-
include/media/v4l2-of.h | 20 +-
include/media/v4l2-subdev.h | 16 -
196 files changed, 4424 insertions(+), 3448 deletions(-)
create mode 100644 Documentation/devicetree/bindings/media/i2c/adp1653.txt
create mode 100644 drivers/media/pci/dt3155/Kconfig
create mode 100644 drivers/media/pci/dt3155/Makefile
create mode 100644 drivers/media/pci/dt3155/dt3155.c
rename drivers/{staging/media/dt3155v4l/dt3155v4l.h => media/pci/dt3155/dt3155.h} (82%)
delete mode 100644 drivers/staging/media/dt3155v4l/Kconfig
delete mode 100644 drivers/staging/media/dt3155v4l/Makefile
delete mode 100644 drivers/staging/media/dt3155v4l/dt3155v4l.c
Merging kbuild/for-next (d1809fd6c20c Merge branch 'kbuild/misc' into kbuild/for-next)
$ git merge kbuild/for-next
Auto-merging lib/Kconfig.debug
Auto-merging Makefile
Merge made by the 'recursive' strategy.
Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++
Makefile | 35 +++++++---
arch/x86/Kconfig | 2 +-
init/Kconfig | 73 ++++++++++++++++++++
kernel/gcov/Kconfig | 2 +-
lib/Kconfig.debug | 2 +-
scripts/Makefile.lto | 84 +++++++++++++++++++++++
scripts/Makefile.modpost | 7 +-
scripts/link-vmlinux.sh | 2 +-
scripts/package/builddeb | 24 +++++--
scripts/package/mkspec | 4 +-
11 files changed, 381 insertions(+), 27 deletions(-)
create mode 100644 Documentation/lto-build
create mode 100644 scripts/Makefile.lto
Merging kconfig/for-next (bfa76d495765 Linux 3.19)
$ git merge kconfig/for-next
Already up-to-date.
Merging libata/for-next (beb856eebad6 Merge branch 'for-4.2' into for-next)
$ git merge libata/for-next
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/sysfs-ata | 11 ++++
Documentation/kernel-parameters.txt | 2 +
drivers/ata/ahci.h | 2 +
drivers/ata/ahci_xgene.c | 105 +++++++++++++++++++++++++++++-------
drivers/ata/libahci.c | 89 +++++++++++++++++++++++-------
drivers/ata/libata-core.c | 2 +
drivers/ata/libata-eh.c | 12 ++++-
drivers/ata/libata-transport.c | 22 ++++++++
drivers/ata/pata_samsung_cf.c | 2 +-
include/linux/ata.h | 12 ++++-
include/linux/libata.h | 1 +
11 files changed, 218 insertions(+), 42 deletions(-)
Merging pm/linux-next (d2715336d086 Merge branch 'acpica' into linux-next)
$ git merge pm/linux-next
Merge made by the 'recursive' strategy.
Documentation/cpu-freq/user-guide.txt | 2 -
drivers/acpi/Kconfig | 2 +-
drivers/acpi/acpica/utglobal.c | 13 +---
drivers/acpi/apei/ghes.c | 108 ++++++++++++++++----------------
drivers/acpi/osl.c | 6 +-
drivers/acpi/power.c | 2 -
drivers/acpi/property.c | 54 +++++++++-------
drivers/base/power/wakeup.c | 18 ++++++
drivers/cpufreq/arm_big_little.c | 13 +++-
drivers/cpufreq/cpufreq.c | 74 +++++++++++++---------
drivers/cpufreq/intel_pstate.c | 31 ++++++---
drivers/cpufreq/pxa2xx-cpufreq.c | 20 +++---
drivers/cpuidle/cpuidle.c | 32 +++++++---
drivers/cpuidle/governors/menu.c | 4 +-
drivers/pnp/pnpacpi/rsparser.c | 10 +--
drivers/powercap/intel_rapl.c | 50 ++++++++++++---
include/acpi/acpi_bus.h | 3 +-
include/acpi/actypes.h | 5 --
include/linux/cpuidle.h | 4 ++
include/trace/events/power.h | 25 +++++---
kernel/sched/idle.c | 114 ++++++++++++++++++----------------
21 files changed, 352 insertions(+), 238 deletions(-)
Merging idle/next (64887b6882de Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs)
$ git merge idle/next
Already up-to-date.
Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable)
$ git merge apm/for-next
Already up-to-date.
Merging thermal/next (699f417cbf8f Merge branches 'for-rc' and 'release' of .git into next)
$ git merge thermal/next
Merge made by the 'recursive' strategy.
drivers/thermal/Kconfig | 24 +-
drivers/thermal/Makefile | 2 +
.../int340x_thermal/processor_thermal_device.c | 59 ++-
drivers/thermal/intel_powerclamp.c | 90 ++--
drivers/thermal/intel_quark_dts_thermal.c | 473 ++++++++++++++++++++
drivers/thermal/intel_soc_dts_iosf.c | 478 +++++++++++++++++++++
drivers/thermal/intel_soc_dts_iosf.h | 62 +++
drivers/thermal/intel_soc_dts_thermal.c | 430 +-----------------
drivers/thermal/rockchip_thermal.c | 2 +-
drivers/thermal/thermal_core.h | 2 +-
tools/thermal/tmon/Makefile | 8 -
11 files changed, 1168 insertions(+), 462 deletions(-)
create mode 100644 drivers/thermal/intel_quark_dts_thermal.c
create mode 100644 drivers/thermal/intel_soc_dts_iosf.c
create mode 100644 drivers/thermal/intel_soc_dts_iosf.h
Merging thermal-soc/next (bcacb3e5fd10 Merge branch 'work-linus' into work-next)
$ git merge thermal-soc/next
Auto-merging drivers/thermal/thermal_core.h
Auto-merging drivers/thermal/Makefile
Auto-merging drivers/thermal/Kconfig
Merge made by the 'recursive' strategy.
.../bindings/thermal/qcom-spmi-temp-alarm.txt | 57 ++
.../devicetree/bindings/thermal/thermal.txt | 9 +
Documentation/thermal/cpu-cooling-api.txt | 156 +++++-
Documentation/thermal/power_allocator.txt | 247 +++++++++
Documentation/thermal/sysfs-api.txt | 83 ++-
drivers/acpi/thermal.c | 9 +-
drivers/platform/x86/acerhdf.c | 3 +-
drivers/thermal/Kconfig | 36 ++
drivers/thermal/Makefile | 2 +
drivers/thermal/armada_thermal.c | 6 +-
drivers/thermal/cpu_cooling.c | 585 ++++++++++++++++++++-
drivers/thermal/db8500_thermal.c | 2 +-
drivers/thermal/fair_share.c | 41 +-
drivers/thermal/imx_thermal.c | 3 +-
drivers/thermal/of-thermal.c | 15 +-
drivers/thermal/power_allocator.c | 539 +++++++++++++++++++
drivers/thermal/qcom-spmi-temp-alarm.c | 309 +++++++++++
drivers/thermal/samsung/exynos_tmu.c | 187 ++++++-
drivers/thermal/samsung/exynos_tmu.h | 1 +
drivers/thermal/thermal_core.c | 310 ++++++++++-
drivers/thermal/thermal_core.h | 11 +
.../thermal/ti-soc-thermal/dra752-thermal-data.c | 3 +-
.../thermal/ti-soc-thermal/omap5-thermal-data.c | 3 +-
drivers/thermal/ti-soc-thermal/ti-bandgap.c | 180 +++++--
drivers/thermal/ti-soc-thermal/ti-bandgap.h | 6 +
drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 +-
drivers/thermal/x86_pkg_temp_thermal.c | 2 +-
include/linux/cpu_cooling.h | 39 ++
include/linux/thermal.h | 86 ++-
include/trace/events/thermal.h | 58 ++
include/trace/events/thermal_power_allocator.h | 87 +++
31 files changed, 2939 insertions(+), 141 deletions(-)
create mode 100644 Documentation/devicetree/bindings/thermal/qcom-spmi-temp-alarm.txt
create mode 100644 Documentation/thermal/power_allocator.txt
create mode 100644 drivers/thermal/power_allocator.c
create mode 100644 drivers/thermal/qcom-spmi-temp-alarm.c
create mode 100644 include/trace/events/thermal_power_allocator.h
Merging ieee1394/for-next (d71e6a11737f firewire: core: use correct vendor/model IDs)
$ git merge ieee1394/for-next
Already up-to-date.
Merging dlm/next (2ab4bd8ea3a6 dlm: adopt orphan locks)
$ git merge dlm/next
Already up-to-date.
Merging swiotlb/linux-next (8e0629c1d4ce swiotlb: don't assume PA 0 is invalid)
$ git merge swiotlb/linux-next
Already up-to-date.
Merging slave-dma/next (23e257a2049f Merge branch 'topic/omap' into next)
$ git merge slave-dma/next
Removing include/linux/platform_data/dma-rcar-audmapp.h
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/dma/dma.txt | 28 +++++++
.../devicetree/bindings/dma/sun6i-dma.txt | 5 +-
.../devicetree/bindings/dma/ti-dma-crossbar.txt | 52 +++++++++++++
drivers/dma/amba-pl08x.c | 2 +-
drivers/dma/dmaengine.c | 7 ++
drivers/dma/ep93xx_dma.c | 2 +-
drivers/dma/imx-dma.c | 2 +-
drivers/dma/imx-sdma.c | 2 +-
drivers/dma/mxs-dma.c | 2 +-
drivers/dma/nbpfaxi.c | 2 +-
drivers/dma/of-dma.c | 89 ++++++++++++++++++++++
drivers/dma/omap-dma.c | 80 +++++++++++++++++--
drivers/dma/s3c24xx-dma.c | 2 +-
drivers/dma/sun6i-dma.c | 12 +++
include/linux/dmaengine.h | 17 +++++
include/linux/of_dma.h | 21 +++++
include/linux/platform_data/dma-rcar-audmapp.h | 34 ---------
17 files changed, 309 insertions(+), 50 deletions(-)
create mode 100644 Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt
delete mode 100644 include/linux/platform_data/dma-rcar-audmapp.h
Merging net-next/master (a080e7bd0a8e net: Reserve skb headroom and set skb->dev even if using __alloc_skb)
$ git merge net-next/master
Auto-merging net/ipv4/geneve_core.c
Removing include/net/flow_keys.h
Auto-merging drivers/staging/vt6655/device_main.c
Merge made by the 'recursive' strategy.
.../ABI/testing/sysfs-bus-pci-drivers-janz-cmodio | 8 +
Documentation/ABI/testing/sysfs-class-net | 19 +
.../ABI/testing/sysfs-class-net-janz-ican3 | 19 +
Documentation/devicetree/bindings/net/macb.txt | 1 +
Documentation/networking/bonding.txt | 84 +
Documentation/networking/can.txt | 3 +
Documentation/networking/ip-sysctl.txt | 8 +
Documentation/networking/pktgen.txt | 9 +
Documentation/networking/switchdev.txt | 417 +++-
Documentation/networking/tc-actions-env-rules.txt | 6 -
arch/arm/net/bpf_jit_32.c | 10 +
crypto/af_alg.c | 4 +-
drivers/block/drbd/drbd_receiver.c | 4 +-
drivers/isdn/mISDN/socket.c | 12 +-
drivers/mfd/janz-cmodio.c | 4 +
drivers/net/Kconfig | 14 +
drivers/net/Makefile | 1 +
drivers/net/bonding/bond_3ad.c | 26 +-
drivers/net/bonding/bond_main.c | 53 +-
drivers/net/bonding/bond_netlink.c | 50 +
drivers/net/bonding/bond_options.c | 91 +
drivers/net/bonding/bond_procfs.c | 8 +
drivers/net/bonding/bond_sysfs.c | 46 +
drivers/net/can/flexcan.c | 53 +-
drivers/net/can/janz-ican3.c | 125 +-
drivers/net/dsa/Kconfig | 12 +-
drivers/net/dsa/mv88e6123_61_65.c | 186 +-
drivers/net/dsa/mv88e6131.c | 185 +-
drivers/net/dsa/mv88e6171.c | 234 +-
drivers/net/dsa/mv88e6352.c | 188 +-
drivers/net/dsa/mv88e6xxx.c | 636 +++++-
drivers/net/dsa/mv88e6xxx.h | 99 +-
drivers/net/ethernet/apm/xgene/Makefile | 2 +-
drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 36 +-
drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 8 +-
drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 207 +-
drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 30 +-
drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c | 200 ++
drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h | 49 +
drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 62 +-
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 1 -
drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 20 +
drivers/net/ethernet/broadcom/bcmsysport.c | 63 +
drivers/net/ethernet/broadcom/bcmsysport.h | 2 +-
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +-
drivers/net/ethernet/broadcom/tg3.c | 2 +-
drivers/net/ethernet/cadence/macb.c | 52 +-
drivers/net/ethernet/cadence/macb.h | 9 +
drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 29 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 2 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 50 +-
drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 1 +
drivers/net/ethernet/chelsio/cxgb4/sge.c | 320 +--
drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 180 +-
drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 34 +-
drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 83 +-
drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 23 +
drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 4 +
.../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 13 +-
drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 88 +-
drivers/net/ethernet/cisco/enic/enic_clsf.c | 29 +-
drivers/net/ethernet/cisco/enic/enic_ethtool.c | 10 +-
drivers/net/ethernet/emulex/benet/be.h | 6 +-
drivers/net/ethernet/emulex/benet/be_cmds.c | 23 +-
drivers/net/ethernet/emulex/benet/be_cmds.h | 33 +-
drivers/net/ethernet/emulex/benet/be_ethtool.c | 10 +-
drivers/net/ethernet/emulex/benet/be_hw.h | 14 +-
drivers/net/ethernet/emulex/benet/be_main.c | 286 ++-
drivers/net/ethernet/emulex/benet/be_roce.c | 2 +-
drivers/net/ethernet/emulex/benet/be_roce.h | 2 +-
drivers/net/ethernet/freescale/fec_main.c | 78 +
drivers/net/ethernet/freescale/gianfar.c | 53 +-
drivers/net/ethernet/hisilicon/hip04_eth.c | 2 +-
drivers/net/ethernet/ibm/ibmveth.c | 41 +-
drivers/net/ethernet/ibm/ibmveth.h | 5 +-
drivers/net/ethernet/intel/e100.c | 2 +-
drivers/net/ethernet/intel/e1000/e1000_main.c | 19 +-
drivers/net/ethernet/intel/e1000e/82571.c | 2 +-
drivers/net/ethernet/intel/e1000e/ich8lan.c | 23 +-
drivers/net/ethernet/intel/e1000e/netdev.c | 32 +-
drivers/net/ethernet/intel/igb/igb_main.c | 38 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 10 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 4 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 8 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 106 +-
drivers/net/ethernet/marvell/mvneta.c | 2 +-
drivers/net/ethernet/qualcomm/qca_spi.c | 46 +-
drivers/net/ethernet/rocker/rocker.c | 977 ++++++---
drivers/net/ethernet/rocker/rocker.h | 28 +-
drivers/net/ethernet/sfc/Makefile | 2 +-
drivers/net/ethernet/sfc/ef10.c | 373 +++-
drivers/net/ethernet/sfc/ef10_sriov.c | 430 ++++
drivers/net/ethernet/sfc/ef10_sriov.h | 70 +
drivers/net/ethernet/sfc/efx.c | 198 +-
drivers/net/ethernet/sfc/efx.h | 10 +
drivers/net/ethernet/sfc/ethtool.c | 5 +-
drivers/net/ethernet/sfc/falcon.c | 33 +-
drivers/net/ethernet/sfc/farch.c | 64 +-
drivers/net/ethernet/sfc/mcdi.c | 118 +-
drivers/net/ethernet/sfc/mcdi.h | 2 +
drivers/net/ethernet/sfc/mcdi_pcol.h | 23 +
drivers/net/ethernet/sfc/net_driver.h | 21 +-
drivers/net/ethernet/sfc/nic.h | 133 +-
drivers/net/ethernet/sfc/ptp.c | 34 +-
drivers/net/ethernet/sfc/siena.c | 25 +-
drivers/net/ethernet/sfc/siena_sriov.c | 142 +-
drivers/net/ethernet/sfc/siena_sriov.h | 79 +
drivers/net/ethernet/sfc/sriov.c | 60 +
drivers/net/ethernet/sfc/sriov.h | 27 +
drivers/net/ethernet/ti/netcp_core.c | 2 +-
drivers/net/ethernet/via/via-rhine.c | 249 ++-
drivers/net/ethernet/xilinx/ll_temac_main.c | 4 +-
drivers/net/ethernet/xilinx/xilinx_axienet.h | 108 +-
drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 288 +--
drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 30 +-
drivers/net/geneve.c | 503 +++++
drivers/net/hyperv/netvsc.c | 43 +-
drivers/net/hyperv/netvsc_drv.c | 8 +-
drivers/net/ipvlan/ipvlan.h | 5 +
drivers/net/ipvlan/ipvlan_core.c | 138 +-
drivers/net/ipvlan/ipvlan_main.c | 25 +-
drivers/net/macvtap.c | 34 +-
drivers/net/ppp/pppoe.c | 4 +-
drivers/net/ppp/pppox.c | 2 +-
drivers/net/ppp/pptp.c | 4 +-
drivers/net/team/team.c | 7 +-
drivers/net/tun.c | 26 +-
drivers/net/vxlan.c | 5 +-
drivers/net/wireless/adm8211.c | 7 +-
drivers/net/wireless/at76c50x-usb.h | 2 +-
drivers/net/wireless/ath/ar5523/ar5523.c | 3 +-
drivers/net/wireless/ath/ath10k/mac.c | 7 +-
drivers/net/wireless/ath/ath5k/ath5k.h | 1 -
drivers/net/wireless/ath/ath5k/led.c | 2 +-
drivers/net/wireless/ath/ath5k/mac80211-ops.c | 16 +-
drivers/net/wireless/ath/ath9k/htc_drv_main.c | 3 +-
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 9 +-
drivers/net/wireless/ath/ath9k/main.c | 3 +-
drivers/net/wireless/ath/ath9k/recv.c | 5 -
drivers/net/wireless/ath/carl9170/fw.c | 3 +-
drivers/net/wireless/ath/carl9170/led.c | 2 +-
drivers/net/wireless/ath/carl9170/main.c | 7 +-
drivers/net/wireless/b43/main.c | 8 +-
drivers/net/wireless/b43legacy/main.c | 8 +-
.../net/wireless/brcm80211/brcmsmac/mac80211_if.c | 5 +-
drivers/net/wireless/brcm80211/brcmsmac/main.c | 2 +-
drivers/net/wireless/cw1200/sta.c | 10 +-
drivers/net/wireless/iwlegacy/3945-mac.c | 4 +-
drivers/net/wireless/iwlegacy/4965-mac.c | 4 +-
drivers/net/wireless/iwlwifi/dvm/mac80211.c | 8 +-
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 2 +-
drivers/net/wireless/libertas_tf/main.c | 7 +-
drivers/net/wireless/mac80211_hwsim.c | 55 +-
drivers/net/wireless/mwl8k.c | 2 +-
drivers/net/wireless/p54/fwio.c | 3 +-
drivers/net/wireless/p54/led.c | 2 +-
drivers/net/wireless/p54/main.c | 6 +-
drivers/net/wireless/rt2x00/rt2400pci.c | 4 +-
drivers/net/wireless/rt2x00/rt2500pci.c | 4 +-
drivers/net/wireless/rt2x00/rt2500usb.c | 4 +-
drivers/net/wireless/rt2x00/rt2800lib.c | 19 +-
drivers/net/wireless/rt2x00/rt2800lib.h | 5 +-
drivers/net/wireless/rt2x00/rt2800pci.c | 2 +-
drivers/net/wireless/rt2x00/rt2800soc.c | 2 +-
drivers/net/wireless/rt2x00/rt2800usb.c | 2 +-
drivers/net/wireless/rt2x00/rt2x00mac.c | 6 +-
drivers/net/wireless/rt2x00/rt61pci.c | 4 +-
drivers/net/wireless/rt2x00/rt73usb.c | 4 +-
drivers/net/wireless/rtlwifi/core.h | 3 +-
drivers/net/wireless/ti/wl1251/main.c | 9 +-
drivers/net/wireless/ti/wlcore/main.c | 6 +-
drivers/net/wireless/zd1211rw/zd_mac.c | 4 +-
drivers/staging/vt6655/device_main.c | 11 +-
drivers/staging/vt6656/main_usb.c | 11 +-
fs/afs/rxrpc.c | 2 +-
fs/dlm/lowcomms.c | 16 +-
include/linux/etherdevice.h | 42 +-
include/linux/filter.h | 20 +-
include/linux/gfp.h | 5 +
include/linux/if_pppox.h | 2 +-
include/linux/if_vlan.h | 2 +-
include/linux/igmp.h | 1 +
include/linux/mm_types.h | 18 +
include/linux/net.h | 3 +-
include/linux/netdev_features.h | 5 +-
include/linux/netdevice.h | 23 +-
include/linux/netlink.h | 2 +
include/linux/rtnetlink.h | 8 -
include/linux/skbuff.h | 28 +-
include/linux/tcp.h | 8 +
include/net/addrconf.h | 1 +
include/net/af_vsock.h | 2 +-
include/net/bond_options.h | 3 +
include/net/bonding.h | 3 +
include/net/cfg80211.h | 4 +-
include/net/codel.h | 12 +-
include/net/dst.h | 18 -
include/net/flow_dissector.h | 167 ++
include/net/flow_keys.h | 45 -
include/net/geneve.h | 5 +
include/net/inet_common.h | 2 +-
include/net/ip.h | 10 +-
include/net/ip6_fib.h | 41 +-
include/net/ipv6.h | 19 +-
include/net/llc_conn.h | 2 +-
include/net/mac80211.h | 161 +-
include/net/net_namespace.h | 2 +
include/net/netns/ipv6.h | 1 +
include/net/request_sock.h | 4 +-
include/net/sch_generic.h | 23 -
include/net/sock.h | 21 +-
include/net/switchdev.h | 213 +-
include/net/tcp.h | 29 +-
include/uapi/linux/can.h | 6 +
include/uapi/linux/if_link.h | 12 +
include/uapi/linux/if_packet.h | 7 +
include/uapi/linux/netlink.h | 1 +
include/uapi/linux/nl80211.h | 28 +-
include/uapi/linux/pkt_cls.h | 35 +
include/uapi/linux/pkt_sched.h | 7 +-
include/uapi/linux/snmp.h | 2 +
include/uapi/linux/tcp.h | 2 +
kernel/seccomp.c | 70 +-
lib/rhashtable.c | 8 +-
lib/test_bpf.c | 2281 +++++++++++++++++++-
lib/test_rhashtable.c | 215 +-
mm/page_alloc.c | 98 +
net/appletalk/ddp.c | 2 +-
net/atm/common.c | 4 +-
net/atm/common.h | 2 +-
net/atm/pvc.c | 2 +-
net/atm/svc.c | 2 +-
net/ax25/af_ax25.c | 4 +-
net/bluetooth/bnep/sock.c | 2 +-
net/bluetooth/cmtp/sock.c | 2 +-
net/bluetooth/hci_sock.c | 2 +-
net/bluetooth/hidp/sock.c | 2 +-
net/bluetooth/l2cap_sock.c | 10 +-
net/bluetooth/rfcomm/core.c | 2 +-
net/bluetooth/rfcomm/sock.c | 8 +-
net/bluetooth/sco.c | 8 +-
net/bridge/br.c | 22 +-
net/bridge/br_multicast.c | 238 +-
net/bridge/br_netlink.c | 24 +-
net/bridge/br_private.h | 4 +-
net/bridge/br_stp.c | 6 +-
net/bridge/netfilter/ebtables.c | 2 +-
net/caif/caif_socket.c | 2 +-
net/can/af_can.c | 2 +-
net/ceph/messenger.c | 4 +-
net/core/dev.c | 176 +-
net/core/ethtool.c | 1 -
net/core/filter.c | 83 +-
net/core/flow_dissector.c | 429 ++--
net/core/net-sysfs.c | 10 +-
net/core/net_namespace.c | 132 +-
net/core/pktgen.c | 94 +-
net/core/rtnetlink.c | 12 +-
net/core/skbuff.c | 323 +--
net/core/sock.c | 30 +-
net/core/stream.c | 6 +-
net/decnet/af_decnet.c | 8 +-
net/dsa/slave.c | 54 +-
net/ethernet/eth.c | 14 +-
net/ieee802154/socket.c | 2 +-
net/ipv4/Kconfig | 4 +-
net/ipv4/Makefile | 2 +-
net/ipv4/af_inet.c | 6 +-
net/ipv4/fib_semantics.c | 4 -
net/ipv4/fib_trie.c | 40 +-
net/ipv4/{geneve.c => geneve_core.c} | 10 +-
net/ipv4/igmp.c | 162 ++
net/ipv4/inet_timewait_sock.c | 2 +-
net/ipv4/ip_output.c | 2 +-
net/ipv4/ip_tunnel_core.c | 2 +-
net/ipv4/proc.c | 2 +
net/ipv4/route.c | 23 +-
net/ipv4/tcp.c | 35 +
net/ipv4/tcp_input.c | 106 +-
net/ipv4/tcp_ipv4.c | 1 +
net/ipv4/tcp_minisocks.c | 3 +
net/ipv4/tcp_output.c | 15 +-
net/ipv4/tcp_timer.c | 2 +-
net/ipv4/udp_tunnel.c | 8 +-
net/ipv6/Makefile | 1 +
net/ipv6/addrconf.c | 2 +
net/ipv6/af_inet6.c | 3 +-
net/ipv6/ip6_flowlabel.c | 4 +
net/ipv6/ip6_udp_tunnel.c | 6 +-
net/ipv6/mcast_snoop.c | 213 ++
net/ipv6/route.c | 176 +-
net/ipv6/sysctl_net_ipv6.c | 8 +
net/ipv6/xfrm6_policy.c | 14 -
net/ipx/af_ipx.c | 2 +-
net/irda/af_irda.c | 2 +-
net/iucv/af_iucv.c | 10 +-
net/key/af_key.c | 2 +-
net/l2tp/l2tp_core.c | 15 +-
net/l2tp/l2tp_ppp.c | 4 +-
net/llc/af_llc.c | 2 +-
net/llc/llc_conn.c | 6 +-
net/mac80211/Kconfig | 16 +-
net/mac80211/cfg.c | 117 +-
net/mac80211/chan.c | 6 +
net/mac80211/debugfs.c | 74 +-
net/mac80211/debugfs_sta.c | 85 -
net/mac80211/driver-ops.h | 11 +-
net/mac80211/ethtool.c | 3 +-
net/mac80211/ieee80211_i.h | 35 +-
net/mac80211/iface.c | 64 +-
net/mac80211/key.c | 12 +-
net/mac80211/key.h | 3 +-
net/mac80211/led.c | 256 ++-
net/mac80211/led.h | 44 +-
net/mac80211/main.c | 15 +-
net/mac80211/mesh_plink.c | 37 +-
net/mac80211/mlme.c | 57 +-
net/mac80211/rate.c | 8 +-
net/mac80211/rate.h | 14 +-
net/mac80211/rx.c | 201 +-
net/mac80211/sta_info.c | 10 +-
net/mac80211/sta_info.h | 41 +-
net/mac80211/status.c | 28 +-
net/mac80211/trace.h | 42 +-
net/mac80211/tx.c | 528 ++++-
net/netfilter/ipvs/ip_vs_sync.c | 30 +-
net/netlink/af_netlink.c | 132 +-
net/netrom/af_netrom.c | 4 +-
net/nfc/af_nfc.c | 2 +-
net/nfc/llcp.h | 2 +-
net/nfc/llcp_core.c | 2 +-
net/nfc/llcp_sock.c | 8 +-
net/nfc/nfc.h | 2 +-
net/nfc/rawsock.c | 4 +-
net/openvswitch/Kconfig | 2 +-
net/openvswitch/datapath.c | 2 +-
net/openvswitch/flow.c | 4 +-
net/openvswitch/flow_netlink.c | 2 +-
net/openvswitch/vport-geneve.c | 5 -
net/packet/af_packet.c | 174 +-
net/packet/internal.h | 12 +-
net/phonet/af_phonet.c | 2 +-
net/phonet/pep.c | 2 +-
net/rds/af_rds.c | 2 +-
net/rose/af_rose.c | 4 +-
net/rxrpc/af_rxrpc.c | 2 +-
net/rxrpc/ar-local.c | 4 +-
net/sched/Kconfig | 10 +
net/sched/Makefile | 1 +
net/sched/act_api.c | 5 -
net/sched/act_mirred.c | 2 +-
net/sched/act_pedit.c | 5 +-
net/sched/cls_flow.c | 22 +-
net/sched/cls_flower.c | 688 ++++++
net/sched/sch_api.c | 12 +-
net/sched/sch_choke.c | 20 +-
net/sched/sch_codel.c | 15 +-
net/sched/sch_fq_codel.c | 26 +-
net/sched/sch_gred.c | 28 +-
net/sched/sch_hhf.c | 19 +-
net/sched/sch_ingress.c | 59 +-
net/sched/sch_netem.c | 4 +-
net/sched/sch_sfb.c | 24 +-
net/sched/sch_sfq.c | 27 +-
net/sctp/ipv6.c | 2 +-
net/sctp/protocol.c | 2 +-
net/socket.c | 7 +-
net/switchdev/switchdev.c | 664 ++++--
net/tipc/bcast.c | 21 +
net/tipc/bcast.h | 1 +
net/tipc/bearer.c | 2 +-
net/tipc/core.c | 4 +-
net/tipc/link.c | 66 +-
net/tipc/name_table.c | 34 +-
net/tipc/netlink_compat.c | 137 +-
net/tipc/server.c | 4 +
net/tipc/socket.c | 2 +-
net/tipc/subscr.c | 242 +--
net/tipc/subscr.h | 18 +-
net/unix/af_unix.c | 8 +-
net/vmw_vsock/af_vsock.c | 7 +-
net/vmw_vsock/vmci_transport.c | 2 +-
net/wireless/chan.c | 65 +-
net/wireless/nl80211.c | 7 +-
net/wireless/reg.c | 4 +-
net/x25/af_x25.c | 8 +-
net/xfrm/xfrm_output.c | 12 +
samples/bpf/Makefile | 2 +-
389 files changed, 14687 insertions(+), 5797 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-bus-pci-drivers-janz-cmodio
create mode 100644 Documentation/ABI/testing/sysfs-class-net-janz-ican3
create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_ring2.c
create mode 100644 drivers/net/ethernet/apm/xgene/xgene_enet_ring2.h
create mode 100644 drivers/net/ethernet/sfc/ef10_sriov.c
create mode 100644 drivers/net/ethernet/sfc/ef10_sriov.h
create mode 100644 drivers/net/ethernet/sfc/siena_sriov.h
create mode 100644 drivers/net/ethernet/sfc/sriov.c
create mode 100644 drivers/net/ethernet/sfc/sriov.h
create mode 100644 drivers/net/geneve.c
create mode 100644 include/net/flow_dissector.h
delete mode 100644 include/net/flow_keys.h
rename net/ipv4/{geneve.c => geneve_core.c} (97%)
create mode 100644 net/ipv6/mcast_snoop.c
create mode 100644 net/sched/cls_flower.c
Merging ipsec-next/master (de2ad486cb6c xfrm: move the checking for old xfrm_policy hold_queue to beginning)
$ git merge ipsec-next/master
Auto-merging net/xfrm/xfrm_state.c
Merge made by the 'recursive' strategy.
net/xfrm/xfrm_input.c | 12 ++++++------
net/xfrm/xfrm_policy.c | 31 ++++++++++++-------------------
net/xfrm/xfrm_state.c | 4 ++--
3 files changed, 20 insertions(+), 27 deletions(-)
Merging wireless-drivers-next/master (6e65104504fe brcmfmac: check result of USB firmware request)
$ git merge wireless-drivers-next/master
Resolved 'drivers/net/wireless/ath/ath10k/mac.c' using previous resolution.
Auto-merging drivers/net/wireless/ti/wlcore/main.c
Auto-merging drivers/net/wireless/ath/ath10k/mac.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/mac.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 9431980b981e] Merge remote-tracking branch 'wireless-drivers-next/master'
$ git diff -M --stat --summary HEAD^..
drivers/bcma/driver_gpio.c | 20 +-
drivers/net/wireless/ath/ath.h | 2 +
drivers/net/wireless/ath/ath10k/Makefile | 4 +-
drivers/net/wireless/ath/ath10k/core.c | 161 +-
drivers/net/wireless/ath/ath10k/core.h | 48 +-
drivers/net/wireless/ath/ath10k/debug.c | 127 +-
drivers/net/wireless/ath/ath10k/htc.c | 50 +-
drivers/net/wireless/ath/ath10k/htt.c | 98 +
drivers/net/wireless/ath/ath10k/htt.h | 132 +-
drivers/net/wireless/ath/ath10k/htt_rx.c | 194 +-
drivers/net/wireless/ath/ath10k/htt_tx.c | 34 +-
drivers/net/wireless/ath/ath10k/hw.h | 53 +-
drivers/net/wireless/ath/ath10k/mac.c | 2819 +++++++++++++++-----
drivers/net/wireless/ath/ath10k/mac.h | 29 +
drivers/net/wireless/ath/ath10k/p2p.c | 156 ++
drivers/net/wireless/ath/ath10k/p2p.h | 28 +
drivers/net/wireless/ath/ath10k/pci.c | 101 +-
drivers/net/wireless/ath/ath10k/rx_desc.h | 22 +
drivers/net/wireless/ath/ath10k/thermal.c | 134 +-
drivers/net/wireless/ath/ath10k/thermal.h | 10 +-
drivers/net/wireless/ath/ath10k/trace.h | 22 +-
drivers/net/wireless/ath/ath10k/txrx.c | 9 +-
drivers/net/wireless/ath/ath10k/wmi-ops.h | 194 +-
drivers/net/wireless/ath/ath10k/wmi-tlv.c | 579 +++-
drivers/net/wireless/ath/ath10k/wmi-tlv.h | 168 ++
drivers/net/wireless/ath/ath10k/wmi.c | 272 +-
drivers/net/wireless/ath/ath10k/wmi.h | 230 +-
drivers/net/wireless/ath/ath10k/wow.c | 321 +++
drivers/net/wireless/ath/ath10k/wow.h | 40 +
drivers/net/wireless/ath/ath9k/common-spectral.c | 740 ++++-
drivers/net/wireless/ath/ath9k/common-spectral.h | 35 +-
drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 +-
drivers/net/wireless/ath/dfs_pattern_detector.c | 72 +-
drivers/net/wireless/ath/dfs_pattern_detector.h | 4 +
drivers/net/wireless/ath/dfs_pri_detector.c | 4 +
drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 18 +-
drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 202 +-
drivers/net/wireless/brcm80211/brcmfmac/chip.c | 1 +
drivers/net/wireless/brcm80211/brcmfmac/feature.c | 1 +
drivers/net/wireless/brcm80211/brcmfmac/feature.h | 4 +
drivers/net/wireless/brcm80211/brcmfmac/firmware.c | 189 +-
drivers/net/wireless/brcm80211/brcmfmac/firmware.h | 6 +
drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 27 +-
drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 11 +-
drivers/net/wireless/brcm80211/brcmfmac/usb.c | 9 +-
.../net/wireless/brcm80211/include/brcm_hw_ids.h | 3 +
drivers/net/wireless/iwlwifi/Kconfig | 12 +-
drivers/net/wireless/iwlwifi/iwl-7000.c | 23 +
drivers/net/wireless/iwlwifi/iwl-config.h | 44 +
drivers/net/wireless/iwlwifi/iwl-fw-file.h | 8 +-
drivers/net/wireless/iwlwifi/iwl-prph.h | 3 +
drivers/net/wireless/iwlwifi/mvm/d3.c | 7 +-
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 56 +-
drivers/net/wireless/iwlwifi/mvm/fw-api.h | 7 -
drivers/net/wireless/iwlwifi/mvm/fw.c | 15 -
drivers/net/wireless/iwlwifi/mvm/mac80211.c | 157 +-
drivers/net/wireless/iwlwifi/mvm/mvm.h | 109 +-
drivers/net/wireless/iwlwifi/mvm/ops.c | 9 +-
drivers/net/wireless/iwlwifi/mvm/rs.c | 20 +-
drivers/net/wireless/iwlwifi/mvm/rs.h | 2 -
drivers/net/wireless/iwlwifi/mvm/scan.c | 988 ++++---
drivers/net/wireless/iwlwifi/mvm/tt.c | 40 +-
drivers/net/wireless/iwlwifi/pcie/trans.c | 77 +-
drivers/net/wireless/mwifiex/join.c | 12 +-
drivers/net/wireless/mwifiex/main.c | 11 +-
drivers/net/wireless/mwifiex/sta_ioctl.c | 2 +
drivers/net/wireless/mwifiex/tdls.c | 2 +-
drivers/net/wireless/mwifiex/uap_cmd.c | 2 +-
drivers/net/wireless/mwifiex/util.c | 7 +-
drivers/net/wireless/mwifiex/wmm.c | 9 +
drivers/net/wireless/rtlwifi/rtl8192ee/fw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8723be/fw.c | 2 +-
drivers/net/wireless/ti/wl18xx/main.c | 71 +-
drivers/net/wireless/ti/wl18xx/reg.h | 1 +
drivers/net/wireless/ti/wlcore/main.c | 26 +-
75 files changed, 6729 insertions(+), 2380 deletions(-)
create mode 100644 drivers/net/wireless/ath/ath10k/p2p.c
create mode 100644 drivers/net/wireless/ath/ath10k/p2p.h
create mode 100644 drivers/net/wireless/ath/ath10k/wow.c
create mode 100644 drivers/net/wireless/ath/ath10k/wow.h
Merging bluetooth/master (a1e85f04d8c7 Bluetooth: btmrvl: fix compilation warning)
$ git merge bluetooth/master
Merge made by the 'recursive' strategy.
drivers/bluetooth/btmrvl_sdio.c | 2 +-
drivers/bluetooth/btwilink.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Merging infiniband/for-next (c1c2fef6cfb0 Merge branches 'cve-fixup', 'ipoib', 'iser', 'misc-4.1', 'or-mlx4' and 'srp' into for-4.1)
$ git merge infiniband/for-next
Already up-to-date.
Merging mtd/master (b787f68c36d4 Linux 4.1-rc1)
$ git merge mtd/master
Already up-to-date.
Merging l2-mtd/master (073db4a51ee4 mtd: fix: avoid race condition when accessing mtd->usecount)
$ git merge l2-mtd/master
Auto-merging fs/jffs2/fs.c
Merge made by the 'recursive' strategy.
drivers/mtd/devices/docg3.c | 2 +-
drivers/mtd/devices/m25p80.c | 60 ++++++++++++++++-----------------------
drivers/mtd/maps/physmap_of.c | 4 +--
drivers/mtd/mtd_blkdevs.c | 5 ++++
drivers/mtd/mtdcore.c | 44 +++++++++++++++-------------
drivers/mtd/nand/diskonchip.c | 27 +++++++++++-------
drivers/mtd/nand/fsmc_nand.c | 8 +++---
drivers/mtd/nand/mpc5121_nfc.c | 2 +-
drivers/mtd/nand/mxc_nand.c | 2 +-
drivers/mtd/nand/nand_base.c | 44 ++++++++++++++++++++++++++--
drivers/mtd/nand/nand_bbt.c | 24 +++++++++-------
drivers/mtd/nand/pxa3xx_nand.c | 43 +++++++++++++---------------
drivers/mtd/nand/s3c2410.c | 2 +-
drivers/mtd/onenand/samsung.c | 2 +-
drivers/mtd/spi-nor/fsl-quadspi.c | 2 +-
drivers/mtd/spi-nor/spi-nor.c | 4 +++
fs/jffs2/fs.c | 7 ++---
fs/jffs2/readinode.c | 27 +++---------------
include/linux/mtd/nand.h | 6 +++-
19 files changed, 171 insertions(+), 144 deletions(-)
Merging crypto/master (ca7fc7e962fa lib: correct 842 decompress for 32 bit)
$ git merge crypto/master
Auto-merging net/mac802154/llsec.c
Auto-merging lib/Makefile
Auto-merging lib/Kconfig
Auto-merging drivers/crypto/Kconfig
Removing arch/arm/crypto/sha512_neon_glue.c
Removing arch/arm/crypto/sha512-armv7-neon.S
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../devicetree/bindings/crypto/fsl-sec2.txt | 6 +-
MAINTAINERS | 5 +-
arch/arm/crypto/Kconfig | 15 +-
arch/arm/crypto/Makefile | 10 +-
arch/arm/crypto/aes-ce-core.S | 7 +-
arch/arm/crypto/sha512-armv4.pl | 649 +++++++
arch/arm/crypto/sha512-armv7-neon.S | 455 -----
arch/arm/crypto/sha512-core.S_shipped | 1861 ++++++++++++++++++++
arch/arm/crypto/sha512-glue.c | 121 ++
arch/arm/crypto/sha512-neon-glue.c | 98 ++
arch/arm/crypto/sha512.h | 8 +
arch/arm/crypto/sha512_neon_glue.c | 305 ----
arch/arm64/crypto/aes-ce-ccm-glue.c | 2 +-
arch/powerpc/include/asm/icswx.h | 184 ++
arch/powerpc/include/asm/ppc-opcode.h | 13 +
arch/powerpc/kernel/prom.c | 1 +
arch/x86/crypto/aesni-intel_glue.c | 5 +-
arch/x86/crypto/sha-mb/sha1_mb.c | 3 +-
crypto/842.c | 174 +-
crypto/Kconfig | 7 +-
crypto/ablkcipher.c | 2 +-
crypto/aead.c | 163 +-
crypto/algapi.c | 30 +-
crypto/algif_aead.c | 1 +
crypto/algif_rng.c | 2 +-
crypto/ansi_cprng.c | 88 +-
crypto/authenc.c | 17 +-
crypto/authencesn.c | 17 +-
crypto/blkcipher.c | 1 +
crypto/ccm.c | 14 +-
crypto/cryptd.c | 3 +-
crypto/drbg.c | 380 ++--
crypto/fips.c | 53 +-
crypto/gcm.c | 22 +-
crypto/internal.h | 3 +-
crypto/krng.c | 33 +-
crypto/pcompress.c | 7 +-
crypto/pcrypt.c | 7 +-
crypto/proc.c | 41 -
crypto/rng.c | 105 +-
crypto/seqiv.c | 3 +-
crypto/shash.c | 7 +-
crypto/tcrypt.c | 9 +-
crypto/testmgr.c | 11 +
crypto/testmgr.h | 442 ++++-
crypto/zlib.c | 4 +-
drivers/crypto/Kconfig | 28 +-
drivers/crypto/caam/caamalg.c | 100 +-
drivers/crypto/caam/compat.h | 2 +-
drivers/crypto/ixp4xx_crypto.c | 5 +-
drivers/crypto/mv_cesa.c | 2 +-
drivers/crypto/nx/Kconfig | 55 +-
drivers/crypto/nx/Makefile | 6 +
drivers/crypto/nx/nx-842-crypto.c | 585 ++++++
drivers/crypto/nx/nx-842-powernv.c | 625 +++++++
drivers/crypto/nx/nx-842-pseries.c | 1128 ++++++++++++
drivers/crypto/nx/nx-842.c | 1623 ++---------------
drivers/crypto/nx/nx-842.h | 131 ++
drivers/crypto/nx/nx-sha256.c | 84 +-
drivers/crypto/nx/nx-sha512.c | 85 +-
drivers/crypto/nx/nx.c | 69 +-
drivers/crypto/nx/nx.h | 2 -
drivers/crypto/picoxcell_crypto.c | 5 +-
drivers/crypto/qat/qat_common/adf_common_drv.h | 7 +
drivers/crypto/qat/qat_common/adf_ctl_drv.c | 1 +
drivers/crypto/qat/qat_common/qat_algs.c | 7 +-
drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 3 +-
drivers/crypto/talitos.c | 743 +++++---
drivers/crypto/talitos.h | 153 +-
include/crypto/aead.h | 436 ++++-
include/crypto/algapi.h | 35 +-
include/crypto/compress.h | 8 +-
include/crypto/cryptd.h | 1 +
include/crypto/drbg.h | 54 +-
include/crypto/internal/aead.h | 44 +-
include/crypto/internal/rng.h | 12 +-
include/crypto/rng.h | 100 +-
include/linux/crypto.h | 484 +----
include/linux/module.h | 12 +
include/linux/nx842.h | 21 +-
include/linux/sw842.h | 12 +
lib/842/842.h | 127 ++
lib/842/842_compress.c | 626 +++++++
lib/842/842_debugfs.h | 52 +
lib/842/842_decompress.c | 405 +++++
lib/842/Makefile | 2 +
lib/Kconfig | 6 +
lib/Makefile | 2 +
net/mac80211/aes_ccm.c | 3 +-
net/mac80211/aes_gcm.c | 3 +-
net/mac80211/aes_gmac.c | 2 +-
net/mac802154/llsec.c | 3 +-
92 files changed, 9224 insertions(+), 4069 deletions(-)
create mode 100644 arch/arm/crypto/sha512-armv4.pl
delete mode 100644 arch/arm/crypto/sha512-armv7-neon.S
create mode 100644 arch/arm/crypto/sha512-core.S_shipped
create mode 100644 arch/arm/crypto/sha512-glue.c
create mode 100644 arch/arm/crypto/sha512-neon-glue.c
create mode 100644 arch/arm/crypto/sha512.h
delete mode 100644 arch/arm/crypto/sha512_neon_glue.c
create mode 100644 arch/powerpc/include/asm/icswx.h
create mode 100644 drivers/crypto/nx/nx-842-crypto.c
create mode 100644 drivers/crypto/nx/nx-842-powernv.c
create mode 100644 drivers/crypto/nx/nx-842-pseries.c
create mode 100644 drivers/crypto/nx/nx-842.h
create mode 100644 include/linux/sw842.h
create mode 100644 lib/842/842.h
create mode 100644 lib/842/842_compress.c
create mode 100644 lib/842/842_debugfs.h
create mode 100644 lib/842/842_decompress.c
create mode 100644 lib/842/Makefile
Merging drm/drm-next (e1dee1973c74 Merge tag 'drm-intel-next-2015-04-23-fixed' of git://anongit.freedesktop.org/drm-intel into drm-next)
$ git merge drm/drm-next
Resolved 'drivers/gpu/drm/drm_irq.c' using previous resolution.
Auto-merging drivers/gpu/drm/i915/intel_lvds.c
Auto-merging drivers/gpu/drm/i915/intel_dp.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Auto-merging drivers/gpu/drm/drm_irq.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_irq.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 87ba39b9bb80] Merge remote-tracking branch 'drm/drm-next'
$ git diff -M --stat --summary HEAD^..
Documentation/DocBook/drm.tmpl | 4 +-
arch/x86/kernel/early-quirks.c | 1 +
drivers/gpu/drm/drm_atomic_helper.c | 9 +-
drivers/gpu/drm/drm_auth.c | 178 +---
drivers/gpu/drm/drm_crtc.c | 23 +
drivers/gpu/drm/drm_dp_helper.c | 12 +-
drivers/gpu/drm/drm_drv.c | 20 +-
drivers/gpu/drm/drm_fops.c | 7 +-
drivers/gpu/drm/drm_internal.h | 1 -
drivers/gpu/drm/drm_irq.c | 102 ++-
drivers/gpu/drm/drm_modeset_lock.c | 8 +-
drivers/gpu/drm/drm_probe_helper.c | 4 +-
drivers/gpu/drm/i915/dvo_ivch.c | 21 +-
drivers/gpu/drm/i915/dvo_ns2501.c | 670 +++++++-------
drivers/gpu/drm/i915/i915_cmd_parser.c | 12 +-
drivers/gpu/drm/i915/i915_debugfs.c | 460 +++++++---
drivers/gpu/drm/i915/i915_dma.c | 270 +++---
drivers/gpu/drm/i915/i915_drv.c | 68 +-
drivers/gpu/drm/i915/i915_drv.h | 171 ++--
drivers/gpu/drm/i915/i915_gem.c | 236 ++---
drivers/gpu/drm/i915/i915_gem_batch_pool.c | 84 +-
drivers/gpu/drm/i915/i915_gem_batch_pool.h | 42 +
drivers/gpu/drm/i915/i915_gem_context.c | 37 +-
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 50 +-
drivers/gpu/drm/i915/i915_gem_gtt.c | 1046 +++++++++++-----------
drivers/gpu/drm/i915/i915_gem_gtt.h | 101 ++-
drivers/gpu/drm/i915/i915_gem_shrinker.c | 8 +-
drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +-
drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +-
drivers/gpu/drm/i915/i915_gpu_error.c | 10 +-
drivers/gpu/drm/i915/i915_irq.c | 282 +++---
drivers/gpu/drm/i915/i915_reg.h | 489 ++++++++++-
drivers/gpu/drm/i915/i915_trace.h | 44 +-
drivers/gpu/drm/i915/intel_atomic.c | 173 ++++
drivers/gpu/drm/i915/intel_atomic_plane.c | 28 +-
drivers/gpu/drm/i915/intel_audio.c | 4 +-
drivers/gpu/drm/i915/intel_bios.c | 30 +-
drivers/gpu/drm/i915/intel_bios.h | 4 +-
drivers/gpu/drm/i915/intel_crt.c | 2 +-
drivers/gpu/drm/i915/intel_ddi.c | 763 +++++++++++++---
drivers/gpu/drm/i915/intel_display.c | 1295 ++++++++++++++++++++++------
drivers/gpu/drm/i915/intel_dp.c | 215 ++++-
drivers/gpu/drm/i915/intel_dp_mst.c | 14 +-
drivers/gpu/drm/i915/intel_drv.h | 105 ++-
drivers/gpu/drm/i915/intel_dvo.c | 27 +-
drivers/gpu/drm/i915/intel_frontbuffer.c | 2 +
drivers/gpu/drm/i915/intel_hdmi.c | 30 +-
drivers/gpu/drm/i915/intel_i2c.c | 97 ++-
drivers/gpu/drm/i915/intel_lrc.c | 502 +++++------
drivers/gpu/drm/i915/intel_lrc.h | 5 +-
drivers/gpu/drm/i915/intel_lvds.c | 4 +-
drivers/gpu/drm/i915/intel_overlay.c | 66 +-
drivers/gpu/drm/i915/intel_pm.c | 115 ++-
drivers/gpu/drm/i915/intel_psr.c | 118 ++-
drivers/gpu/drm/i915/intel_ringbuffer.c | 121 +--
drivers/gpu/drm/i915/intel_ringbuffer.h | 10 +
drivers/gpu/drm/i915/intel_runtime_pm.c | 121 +++
drivers/gpu/drm/i915/intel_sdvo.c | 5 +-
drivers/gpu/drm/i915/intel_sprite.c | 80 +-
drivers/gpu/drm/i915/intel_uncore.c | 98 ++-
drivers/gpu/drm/qxl/qxl_drv.c | 2 +-
drivers/gpu/drm/qxl/qxl_fb.c | 275 ++----
include/drm/drmP.h | 14 +-
include/drm/drm_crtc.h | 1 +
include/drm/i915_pciids.h | 6 +
include/uapi/drm/i915_drm.h | 1 +
66 files changed, 5911 insertions(+), 2896 deletions(-)
create mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.h
Merging drm-panel/drm/panel/for-next (1c550fa193d0 drm/panel: Add support for Ampire AM-800480R3TMQW-A1H 800x480 7" panel)
$ git merge drm-panel/drm/panel/for-next
Already up-to-date.
Merging drm-intel/for-linux-next (65de797816ea drm/edid: fix a debug message)
$ git merge drm-intel/for-linux-next
Auto-merging drivers/gpu/drm/i915/intel_dp.c
Auto-merging drivers/gpu/drm/i915/intel_display.c
Auto-merging drivers/gpu/drm/i915/i915_drv.c
Merge made by the 'recursive' strategy.
drivers/gpu/drm/drm_atomic_helper.c | 5 +
drivers/gpu/drm/drm_edid.c | 32 +-
drivers/gpu/drm/drm_edid_load.c | 7 +-
drivers/gpu/drm/i915/Makefile | 3 +-
drivers/gpu/drm/i915/i915_debugfs.c | 240 +++-
drivers/gpu/drm/i915/i915_dma.c | 11 +-
drivers/gpu/drm/i915/i915_drv.c | 64 +-
drivers/gpu/drm/i915/i915_drv.h | 55 +-
drivers/gpu/drm/i915/i915_gem.c | 201 +--
drivers/gpu/drm/i915/i915_gem_execbuffer.c | 32 +-
drivers/gpu/drm/i915/i915_gem_gtt.c | 87 +-
drivers/gpu/drm/i915/i915_gem_gtt.h | 20 +-
drivers/gpu/drm/i915/i915_gpu_error.c | 1 +
drivers/gpu/drm/i915/i915_irq.c | 14 +-
drivers/gpu/drm/i915/i915_params.c | 8 +
drivers/gpu/drm/i915/i915_reg.h | 100 +-
drivers/gpu/drm/i915/intel_atomic.c | 13 +-
drivers/gpu/drm/i915/intel_atomic_plane.c | 20 +-
drivers/gpu/drm/i915/intel_audio.c | 20 +-
drivers/gpu/drm/i915/intel_bios.c | 118 +-
drivers/gpu/drm/i915/intel_csr.c | 414 ++++++
drivers/gpu/drm/i915/intel_ddi.c | 101 +-
drivers/gpu/drm/i915/intel_display.c | 1894 +++++++++++++---------------
drivers/gpu/drm/i915/intel_dp.c | 151 ++-
drivers/gpu/drm/i915/intel_dp_mst.c | 13 +-
drivers/gpu/drm/i915/intel_drv.h | 61 +-
drivers/gpu/drm/i915/intel_dsi_pll.c | 53 +-
drivers/gpu/drm/i915/intel_fbc.c | 2 +-
drivers/gpu/drm/i915/intel_hdmi.c | 46 +-
drivers/gpu/drm/i915/intel_i2c.c | 21 +
drivers/gpu/drm/i915/intel_lrc.c | 13 +-
drivers/gpu/drm/i915/intel_panel.c | 87 +-
drivers/gpu/drm/i915/intel_pm.c | 165 +--
drivers/gpu/drm/i915/intel_ringbuffer.c | 67 +-
drivers/gpu/drm/i915/intel_runtime_pm.c | 255 +++-
drivers/gpu/drm/i915/intel_sdvo.c | 6 +-
drivers/gpu/drm/i915/intel_sprite.c | 272 ++--
include/drm/drm_crtc.h | 9 +-
38 files changed, 2964 insertions(+), 1717 deletions(-)
create mode 100644 drivers/gpu/drm/i915/intel_csr.c
Merging drm-tegra/drm/tegra/for-next (535a65db484f drm/tegra: sor: Reset during initialization)
$ git merge drm-tegra/drm/tegra/for-next
Already up-to-date.
Merging drm-misc/topic/drm-misc (1b26a5e1932b drm/atomic: add drm_atomic_get_existing_*_state helpers)
$ git merge drm-misc/topic/drm-misc
Auto-merging include/drm/drm_crtc.h
Auto-merging drivers/gpu/drm/i915/Makefile
Auto-merging drivers/gpu/drm/drm_edid.c
Auto-merging drivers/gpu/drm/drm_crtc.c
Auto-merging drivers/gpu/drm/drm_atomic_helper.c
Merge made by the 'recursive' strategy.
drivers/gpu/drm/Makefile | 2 -
drivers/gpu/drm/drm_atomic.c | 18 +-
drivers/gpu/drm/drm_atomic_helper.c | 27 ++-
drivers/gpu/drm/drm_crtc.c | 325 ++++++++++++++++++++++++++------
drivers/gpu/drm/drm_crtc_helper.c | 7 +-
drivers/gpu/drm/drm_edid.c | 206 +++++++++++---------
drivers/gpu/drm/drm_flip_work.c | 4 +-
drivers/gpu/drm/drm_prime.c | 6 +-
drivers/gpu/drm/drm_sysfs.c | 160 ++++++++++------
drivers/gpu/drm/i915/Makefile | 2 -
drivers/gpu/drm/i915/i915_gem_userptr.c | 4 +-
include/drm/drm_atomic.h | 50 +++++
include/drm/drm_atomic_helper.h | 4 +
include/drm/drm_crtc.h | 20 +-
14 files changed, 594 insertions(+), 241 deletions(-)
Merging drm-exynos/exynos-drm/for-next (f4462d92e946 drm/exynos: cleanup exynos_drm_plane)
$ git merge drm-exynos/exynos-drm/for-next
Removing drivers/gpu/drm/exynos/exynos_drm_fimd.h
Merge made by the 'recursive' strategy.
drivers/gpu/drm/exynos/exynos7_drm_decon.c | 4 +-
drivers/gpu/drm/exynos/exynos_dp_core.c | 11 +++--
drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 ++---
drivers/gpu/drm/exynos/exynos_drm_crtc.h | 10 ++---
drivers/gpu/drm/exynos/exynos_drm_drv.h | 20 +++------
drivers/gpu/drm/exynos/exynos_drm_fb.c | 39 +---------------
drivers/gpu/drm/exynos/exynos_drm_fimd.c | 53 ++++++++++------------
drivers/gpu/drm/exynos/exynos_drm_fimd.h | 15 -------
drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +-
drivers/gpu/drm/exynos/exynos_drm_vidi.c | 2 +-
drivers/gpu/drm/exynos/exynos_mixer.c | 72 ++++++++++++++++--------------
11 files changed, 91 insertions(+), 147 deletions(-)
delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_fimd.h
Merging drm-msm/msm-next (d5af49c92a8a drm/msm/mdp5: Enable DSI connector in msm drm driver)
$ git merge drm-msm/msm-next
Already up-to-date.
Merging sound/for-next (1a5bc8d95020 ALSA: hda/realtek - Support headset mode for ALC298)
$ git merge sound/for-next
Auto-merging sound/pci/hda/patch_realtek.c
Auto-merging drivers/gpu/drm/i915/intel_audio.c
Auto-merging drivers/gpu/drm/i915/i915_reg.h
Merge made by the 'recursive' strategy.
Documentation/sound/alsa/Jack-Controls.txt | 43 +
drivers/gpu/drm/i915/i915_reg.h | 3 +
drivers/gpu/drm/i915/intel_audio.c | 27 +
include/drm/i915_component.h | 1 +
include/sound/control.h | 2 +-
include/sound/core.h | 4 -
include/sound/hda_register.h | 152 ++++
include/sound/hdaudio.h | 290 +++++-
include/sound/info.h | 29 +-
include/sound/jack.h | 13 +-
include/sound/pcm.h | 5 +-
sound/core/Kconfig | 3 -
sound/core/Makefile | 11 +-
sound/core/ctljack.c | 41 +-
sound/core/info.c | 779 +++++++---------
sound/core/info_oss.c | 29 +-
sound/core/init.c | 33 +-
sound/core/jack.c | 142 ++-
sound/core/seq/Makefile | 3 +-
sound/core/seq/seq_info.c | 19 +-
sound/core/sound.c | 24 +-
sound/core/sound_oss.c | 30 +-
sound/hda/Kconfig | 3 +
sound/hda/Makefile | 2 +-
sound/hda/hdac_bus.c | 20 +-
sound/hda/hdac_controller.c | 507 +++++++++++
sound/hda/hdac_device.c | 315 +++++++
sound/hda/hdac_stream.c | 686 ++++++++++++++
sound/pci/ad1889.c | 4 +-
sound/pci/ali5451/ali5451.c | 4 +-
sound/pci/als300.c | 4 +-
sound/pci/als4000.c | 4 +-
sound/pci/au88x0/au88x0.c | 4 +-
sound/pci/aw2/aw2-alsa.c | 4 +-
sound/pci/azt3328.c | 4 +-
sound/pci/ca0106/ca0106_main.c | 4 +-
sound/pci/cs5535audio/cs5535audio.c | 4 +-
sound/pci/ctxfi/cthw20k1.c | 4 +-
sound/pci/ctxfi/cthw20k2.c | 4 +-
sound/pci/emu10k1/emu10k1_main.c | 4 +-
sound/pci/es1938.c | 4 +-
sound/pci/es1968.c | 4 +-
sound/pci/hda/Kconfig | 13 +-
sound/pci/hda/Makefile | 3 +-
sound/pci/hda/hda_codec.c | 425 +--------
sound/pci/hda/hda_codec.h | 82 +-
sound/pci/hda/hda_controller.c | 1341 ++++++----------------------
sound/pci/hda/hda_controller.h | 272 +-----
sound/pci/hda/hda_i915.c | 39 +-
sound/pci/hda/hda_intel.c | 309 ++++---
sound/pci/hda/hda_intel.h | 10 +-
sound/pci/hda/hda_intel_trace.h | 4 +-
sound/pci/hda/hda_jack.c | 90 +-
sound/pci/hda/hda_jack.h | 5 +-
sound/pci/hda/hda_tegra.c | 76 +-
sound/pci/hda/patch_ca0132.c | 7 +-
sound/pci/hda/patch_hdmi.c | 15 +-
sound/pci/hda/patch_realtek.c | 12 +
sound/pci/ice1712/ice1712.c | 4 +-
sound/pci/lx6464es/lx6464es.c | 2 +-
sound/pci/maestro3.c | 4 +-
sound/pci/mixart/mixart.c | 2 +-
sound/pci/oxygen/xonar_wm87x6.c | 2 +-
sound/pci/pcxhr/pcxhr.c | 2 +-
sound/pci/sis7019.c | 10 +-
sound/pci/sonicvibes.c | 4 +-
sound/pci/trident/trident_main.c | 4 +-
sound/soc/soc-jack.c | 3 +-
68 files changed, 3318 insertions(+), 2694 deletions(-)
create mode 100644 Documentation/sound/alsa/Jack-Controls.txt
create mode 100644 include/sound/hda_register.h
create mode 100644 sound/hda/hdac_controller.c
create mode 100644 sound/hda/hdac_stream.c
Merging sound-asoc/for-next (74d7076604b9 Merge remote-tracking branch 'asoc/topic/wm8996' into asoc-next)
$ git merge sound-asoc/for-next
Auto-merging MAINTAINERS
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
.../devicetree/bindings/sound/adi,adau1701.txt | 4 +
Documentation/devicetree/bindings/sound/bt-sco.txt | 13 +
Documentation/devicetree/bindings/sound/gtm601.txt | 13 +
.../devicetree/bindings/sound/renesas,rsnd.txt | 2 +-
.../devicetree/bindings/sound/tas571x.txt | 41 +
.../devicetree/bindings/vendor-prefixes.txt | 1 +
MAINTAINERS | 6 +
include/sound/dmaengine_pcm.h | 5 -
include/sound/rt5645.h | 3 -
include/sound/soc-dapm.h | 46 +
include/sound/soc.h | 104 +-
sound/soc/atmel/atmel-pcm-dma.c | 3 +-
sound/soc/atmel/sam9g20_wm8731.c | 10 +-
sound/soc/au1x/db1200.c | 2 +-
sound/soc/cirrus/ep93xx-pcm.c | 1 -
sound/soc/codecs/88pm860x-codec.c | 3 +-
sound/soc/codecs/Kconfig | 7 +-
sound/soc/codecs/Makefile | 2 +
sound/soc/codecs/ab8500-codec.c | 20 +-
sound/soc/codecs/ac97.c | 8 +-
sound/soc/codecs/ad1836.c | 2 +-
sound/soc/codecs/adau1373.c | 1 -
sound/soc/codecs/adau1701.c | 126 ++-
sound/soc/codecs/adau1761.c | 27 +-
sound/soc/codecs/adau1781.c | 10 +-
sound/soc/codecs/adau17x1.c | 20 +-
sound/soc/codecs/adau1977.c | 14 +-
sound/soc/codecs/adav80x.c | 11 +-
sound/soc/codecs/ak4535.c | 1 -
sound/soc/codecs/ak4641.c | 3 +-
sound/soc/codecs/ak4642.c | 1 -
sound/soc/codecs/ak4671.c | 1 -
sound/soc/codecs/alc5623.c | 1 -
sound/soc/codecs/alc5632.c | 1 -
sound/soc/codecs/arizona.h | 4 +-
sound/soc/codecs/bt-sco.c | 11 +-
sound/soc/codecs/cq93vc.c | 1 -
sound/soc/codecs/cs35l32.c | 1 -
sound/soc/codecs/cs4265.c | 1 -
sound/soc/codecs/cs42l52.c | 1 -
sound/soc/codecs/cs42l56.c | 1 -
sound/soc/codecs/cs42l73.c | 1 -
sound/soc/codecs/cx20442.c | 6 +-
sound/soc/codecs/da7213.c | 1 -
sound/soc/codecs/da732x.c | 2 -
sound/soc/codecs/da9055.c | 1 -
sound/soc/codecs/es8328.c | 3 +-
sound/soc/codecs/isabelle.c | 2 -
sound/soc/codecs/jz4740.c | 4 +-
sound/soc/codecs/lm4857.c | 114 +-
sound/soc/codecs/lm49453.c | 2 -
sound/soc/codecs/max98088.c | 1 -
sound/soc/codecs/max98090.c | 1 -
sound/soc/codecs/max98095.c | 9 +-
sound/soc/codecs/max9850.c | 1 -
sound/soc/codecs/mc13783.c | 4 +-
sound/soc/codecs/ml26124.c | 3 +-
sound/soc/codecs/pcm512x.c | 2 -
sound/soc/codecs/rt286.c | 1 -
sound/soc/codecs/rt5631.c | 1 -
sound/soc/codecs/rt5640.c | 5 +-
sound/soc/codecs/rt5645.c | 1080 ++++++++++++++-----
sound/soc/codecs/rt5645.h | 30 +-
sound/soc/codecs/rt5651.c | 3 +-
sound/soc/codecs/rt5670.c | 1 -
sound/soc/codecs/rt5677.c | 114 +-
sound/soc/codecs/rt5677.h | 14 +
sound/soc/codecs/sgtl5000.c | 56 +-
sound/soc/codecs/sirf-audio-codec.c | 2 +-
sound/soc/codecs/sn95031.c | 1 -
sound/soc/codecs/ssm2518.c | 9 +-
sound/soc/codecs/ssm2602.c | 5 +-
sound/soc/codecs/ssm4567.c | 9 +-
sound/soc/codecs/sta32x.c | 17 +-
sound/soc/codecs/sta350.c | 7 +-
sound/soc/codecs/sta529.c | 6 -
sound/soc/codecs/stac9766.c | 1 -
sound/soc/codecs/tas571x.c | 514 +++++++++
sound/soc/codecs/tas571x.h | 33 +
sound/soc/codecs/tlv320aic23.c | 1 -
sound/soc/codecs/tlv320aic31xx.c | 1 -
sound/soc/codecs/tlv320aic32x4.c | 1 -
sound/soc/codecs/tlv320aic3x.c | 1 -
sound/soc/codecs/tlv320dac33.c | 1 -
sound/soc/codecs/twl4030.c | 1 -
sound/soc/codecs/twl6040.c | 7 +-
sound/soc/codecs/uda134x.c | 4 +-
sound/soc/codecs/uda1380.c | 8 +-
sound/soc/codecs/wm0010.c | 2 -
sound/soc/codecs/wm1250-ev1.c | 2 -
sound/soc/codecs/wm5100.c | 6 +-
sound/soc/codecs/wm8350.c | 1 -
sound/soc/codecs/wm8400.c | 1 -
sound/soc/codecs/wm8510.c | 1 -
sound/soc/codecs/wm8523.c | 1 -
sound/soc/codecs/wm8580.c | 1 -
sound/soc/codecs/wm8711.c | 1 -
sound/soc/codecs/wm8728.c | 1 -
sound/soc/codecs/wm8731.c | 3 +-
sound/soc/codecs/wm8737.c | 3 +-
sound/soc/codecs/wm8750.c | 1 -
sound/soc/codecs/wm8753.c | 1 -
sound/soc/codecs/wm8770.c | 1 -
sound/soc/codecs/wm8776.c | 1 -
sound/soc/codecs/wm8900.c | 7 +-
sound/soc/codecs/wm8903.c | 2 -
sound/soc/codecs/wm8904.c | 1 -
sound/soc/codecs/wm8940.c | 4 +-
sound/soc/codecs/wm8955.c | 3 +-
sound/soc/codecs/wm8960.c | 115 +-
sound/soc/codecs/wm8961.c | 2 -
sound/soc/codecs/wm8962.c | 1 -
sound/soc/codecs/wm8971.c | 1 -
sound/soc/codecs/wm8974.c | 1 -
sound/soc/codecs/wm8978.c | 5 +-
sound/soc/codecs/wm8983.c | 1 -
sound/soc/codecs/wm8985.c | 1 -
sound/soc/codecs/wm8988.c | 1 -
sound/soc/codecs/wm8990.c | 3 +-
sound/soc/codecs/wm8991.c | 1 -
sound/soc/codecs/wm8993.c | 6 +-
sound/soc/codecs/wm8994.c | 12 +-
sound/soc/codecs/wm8995.c | 1 -
sound/soc/codecs/wm8996.c | 8 +-
sound/soc/codecs/wm9081.c | 2 -
sound/soc/codecs/wm9090.c | 2 -
sound/soc/codecs/wm9712.c | 3 +-
sound/soc/codecs/wm9713.c | 3 +-
sound/soc/codecs/wm_adsp.c | 1132 ++++++++++++--------
sound/soc/codecs/wm_adsp.h | 6 +-
sound/soc/codecs/wmfw.h | 44 +-
sound/soc/davinci/davinci-mcasp.c | 169 +--
sound/soc/fsl/fsl_dma.c | 4 +-
sound/soc/fsl/fsl_sai.c | 144 ++-
sound/soc/fsl/fsl_sai.h | 9 +-
sound/soc/fsl/fsl_ssi.c | 7 -
sound/soc/fsl/imx-audmux.c | 2 +-
sound/soc/fsl/imx-mc13783.c | 6 +-
sound/soc/generic/simple-card.c | 16 +-
sound/soc/intel/Kconfig | 16 +-
sound/soc/intel/atom/sst-atom-controls.c | 167 ++-
sound/soc/intel/atom/sst-atom-controls.h | 9 +-
sound/soc/intel/atom/sst-mfld-platform-pcm.c | 47 +-
sound/soc/intel/atom/sst-mfld-platform.h | 2 +
sound/soc/intel/atom/sst/sst_acpi.c | 4 +
sound/soc/intel/boards/Makefile | 2 +
sound/soc/intel/boards/cht_bsw_max98090_ti.c | 318 ++++++
sound/soc/intel/boards/cht_bsw_rt5645.c | 118 +-
sound/soc/omap/omap-twl4030.c | 3 +-
sound/soc/pxa/brownstone.c | 25 +-
sound/soc/pxa/poodle.c | 19 +-
sound/soc/pxa/tosa.c | 13 +-
sound/soc/pxa/z2.c | 9 +-
sound/soc/qcom/lpass-cpu.c | 10 +-
sound/soc/qcom/lpass-platform.c | 6 -
sound/soc/samsung/Kconfig | 15 +-
sound/soc/samsung/i2s.c | 2 +-
sound/soc/samsung/lowland.c | 2 +-
sound/soc/samsung/smartq_wm8987.c | 6 +-
sound/soc/samsung/smdk_wm8994.c | 3 +-
sound/soc/samsung/speyside.c | 2 +-
sound/soc/sh/rcar/core.c | 7 +-
sound/soc/sh/rcar/ssi.c | 52 +-
sound/soc/soc-dapm.c | 323 +++++-
sound/soc/soc-generic-dmaengine-pcm.c | 25 +-
sound/soc/ux500/ux500_pcm.c | 1 -
166 files changed, 4134 insertions(+), 1448 deletions(-)
create mode 100644 Documentation/devicetree/bindings/sound/bt-sco.txt
create mode 100644 Documentation/devicetree/bindings/sound/gtm601.txt
create mode 100644 Documentation/devicetree/bindings/sound/tas571x.txt
create mode 100644 sound/soc/codecs/tas571x.c
create mode 100644 sound/soc/codecs/tas571x.h
create mode 100644 sound/soc/intel/boards/cht_bsw_max98090_ti.c
Merging modules/modules-next (4a3893d069b7 modpost: don't emit section mismatch warnings for compiler optimizations)
$ git merge modules/modules-next
Already up-to-date.
Merging input/next (4d10da13467e Input: add TI drv2665 haptics driver)
$ git merge input/next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/input/ti,drv2665.txt | 17 ++
drivers/input/ff-core.c | 2 +-
drivers/input/keyboard/adp5589-keys.c | 6 +-
drivers/input/keyboard/samsung-keypad.c | 2 +-
drivers/input/misc/Kconfig | 13 +-
drivers/input/misc/Makefile | 1 +
drivers/input/misc/drv2665.c | 322 +++++++++++++++++++++
drivers/input/touchscreen/goodix.c | 3 +
drivers/input/touchscreen/s3c2410_ts.c | 2 +-
drivers/input/touchscreen/stmpe-ts.c | 2 +-
10 files changed, 362 insertions(+), 8 deletions(-)
create mode 100644 Documentation/devicetree/bindings/input/ti,drv2665.txt
create mode 100644 drivers/input/misc/drv2665.c
Merging block/for-next (a66bcf6fe8e5 Merge branch 'for-4.2/core' into for-next)
$ git merge block/for-next
Auto-merging include/linux/blk_types.h
Removing include/asm-generic/scatterlist.h
Auto-merging drivers/block/loop.c
Auto-merging block/blk-mq.c
Auto-merging block/blk-core.c
Merge made by the 'recursive' strategy.
arch/alpha/include/asm/pci.h | 2 +-
arch/arm/include/asm/dma.h | 2 +-
arch/arm/mach-footbridge/dma.c | 2 +-
arch/blackfin/include/asm/pci.h | 2 +-
arch/cris/include/asm/dma-mapping.h | 2 +-
arch/cris/include/asm/pci.h | 2 +-
arch/frv/include/asm/dma-mapping.h | 2 +-
arch/frv/include/asm/pci.h | 2 +-
arch/ia64/include/asm/pci.h | 2 +-
arch/microblaze/include/asm/pci.h | 2 +-
arch/mips/include/asm/dma-mapping.h | 2 +-
arch/mips/include/asm/pci.h | 2 +-
arch/mn10300/include/asm/pci.h | 2 +-
arch/parisc/include/asm/dma-mapping.h | 2 +-
arch/parisc/include/asm/pci.h | 2 +-
arch/powerpc/include/asm/pci.h | 2 +-
arch/powerpc/include/asm/vio.h | 2 +-
arch/sparc/kernel/iommu_common.h | 2 +-
arch/x86/include/asm/pci.h | 2 +-
arch/xtensa/include/asm/pci.h | 2 +-
block/bio.c | 56 ++++++++++-----
block/blk-core.c | 40 +++++++----
block/blk-exec.c | 10 ---
block/blk-mq.c | 124 ++++++++++++++++++++++------------
block/blk.h | 5 +-
drivers/block/loop.c | 30 ++++----
drivers/block/loop.h | 1 +
drivers/block/nbd.c | 50 +++++++-------
drivers/block/paride/pd.c | 4 +-
drivers/block/sx8.c | 4 +-
drivers/block/virtio_blk.c | 6 +-
drivers/ide/ide-atapi.c | 10 +--
drivers/ide/ide-cd.c | 10 +--
drivers/ide/ide-cd_ioctl.c | 2 +-
drivers/ide/ide-devsets.c | 2 +-
drivers/ide/ide-eh.c | 4 +-
drivers/ide/ide-floppy.c | 8 +--
drivers/ide/ide-io.c | 12 ++--
drivers/ide/ide-ioctls.c | 2 +-
drivers/ide/ide-park.c | 4 +-
drivers/ide/ide-pm.c | 56 +++++++++++----
drivers/ide/ide-tape.c | 6 +-
drivers/ide/ide-taskfile.c | 2 +-
drivers/md/bcache/request.c | 2 +-
drivers/md/dm-cache-target.c | 2 +-
drivers/md/dm-raid1.c | 2 +-
drivers/md/dm-snap.c | 2 +-
drivers/md/dm-thin.c | 4 +-
drivers/mmc/host/android-goldfish.c | 2 +-
fs/btrfs/volumes.c | 2 +-
fs/xfs/xfs_aops.c | 1 -
include/asm-generic/scatterlist.h | 34 ----------
include/linux/bio.h | 27 +++++++-
include/linux/blk_types.h | 6 +-
include/linux/blkdev.h | 37 ++--------
include/linux/dmapool.h | 2 +-
include/linux/ide.h | 27 ++++++++
include/linux/scatterlist.h | 39 +++++++++--
include/uapi/linux/nbd.h | 2 -
kernel/sched/core.c | 5 +-
lib/swiotlb.c | 2 +-
61 files changed, 390 insertions(+), 296 deletions(-)
delete mode 100644 include/asm-generic/scatterlist.h
Merging device-mapper/for-next (cb31ef485dd4 init: fix regression by supporting devices with major:minor:offset format)
$ git merge device-mapper/for-next
Already up-to-date.
Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet)
$ git merge mmc/mmc-next
Already up-to-date.
Merging mmc-uh/next (d689a660983c mmc: cast unsigned int to typeof(sector_t) to avoid unexpected error)
$ git merge mmc-uh/next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
.../devicetree/bindings/mmc/arasan,sdhci.txt | 3 +-
.../devicetree/bindings/mmc/mmc-pwrseq-simple.txt | 4 +-
Documentation/devicetree/bindings/mmc/mmc.txt | 5 +
MAINTAINERS | 2 +-
drivers/mmc/card/block.c | 17 ++-
drivers/mmc/card/mmc_test.c | 100 +++--------------
drivers/mmc/card/queue.h | 1 +
drivers/mmc/core/core.c | 57 ++++++++--
drivers/mmc/core/core.h | 2 +
drivers/mmc/core/host.c | 88 +++++++++++++++
drivers/mmc/core/host.h | 6 ++
drivers/mmc/core/mmc.c | 104 +++++++++++++++++-
drivers/mmc/core/mmc_ops.c | 44 +++++---
drivers/mmc/core/mmc_ops.h | 1 +
drivers/mmc/core/sd.c | 30 ++++--
drivers/mmc/core/sdio.c | 13 ++-
drivers/mmc/host/Kconfig | 1 +
drivers/mmc/host/atmel-mci.c | 9 +-
drivers/mmc/host/davinci_mmc.c | 2 +-
drivers/mmc/host/mxcmmc.c | 6 +-
drivers/mmc/host/mxs-mmc.c | 2 +-
drivers/mmc/host/rtsx_pci_sdmmc.c | 2 +-
drivers/mmc/host/rtsx_usb_sdmmc.c | 2 +-
drivers/mmc/host/s3cmci.c | 2 +-
drivers/mmc/host/sdhci-esdhc-imx.c | 50 +++++++--
drivers/mmc/host/sdhci-of-arasan.c | 7 ++
drivers/mmc/host/sdhci-of-esdhc.c | 35 ++----
drivers/mmc/host/sdhci-pxav2.c | 4 +-
drivers/mmc/host/sdhci-pxav3.c | 4 +-
drivers/mmc/host/sdhci-s3c.c | 2 +-
drivers/mmc/host/sdhci-sirf.c | 44 +++++++-
drivers/mmc/host/sdhci.c | 118 +++------------------
drivers/mmc/host/sdhci.h | 3 -
drivers/mmc/host/sdhci_f_sdh30.c | 9 +-
drivers/mmc/host/sh_mmcif.c | 90 ++++++++--------
drivers/mmc/host/tmio_mmc.c | 10 +-
drivers/mmc/host/tmio_mmc_pio.c | 5 +-
include/linux/mmc/host.h | 24 +++++
38 files changed, 561 insertions(+), 347 deletions(-)
Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value)
$ git merge kgdb/kgdb-next
Merge made by the 'recursive' strategy.
kernel/debug/kdb/kdb_io.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Merging md/for-next (bb27051f9fd7 md/raid5: fix handling of degraded stripes in batches.)
$ git merge md/for-next
Already up-to-date.
Merging mfd/for-mfd-next (71e6042cbb0d mfd: wm5110: Add delay before releasing reset line)
$ git merge mfd/for-mfd-next
Auto-merging drivers/rtc/Makefile
Auto-merging drivers/rtc/Kconfig
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/mfd/max77686.txt | 2 +-
Documentation/devicetree/bindings/mfd/max77693.txt | 67 ++++
.../devicetree/bindings/rtc/rtc-st-lpc.txt | 25 ++
.../devicetree/bindings/watchdog/st_lpc_wdt.txt | 38 +++
MAINTAINERS | 17 +-
drivers/mfd/88pm860x-core.c | 2 +-
drivers/mfd/Kconfig | 6 +-
drivers/mfd/ab8500-core.c | 2 +-
drivers/mfd/arizona-core.c | 352 ++++++++++++++++----
drivers/mfd/arizona-irq.c | 2 +-
drivers/mfd/da9052-irq.c | 4 +-
drivers/mfd/da9055-core.c | 6 +-
drivers/mfd/da9063-irq.c | 4 +-
drivers/mfd/da9150-core.c | 4 +-
drivers/mfd/db8500-prcmu.c | 2 +-
drivers/mfd/intel_soc_pmic_core.h | 2 +-
drivers/mfd/intel_soc_pmic_crc.c | 2 +-
drivers/mfd/lp8788-irq.c | 2 +-
drivers/mfd/max8925-core.c | 2 +-
drivers/mfd/max8997-irq.c | 2 +-
drivers/mfd/max8998-irq.c | 2 +-
drivers/mfd/mt6397-core.c | 2 +-
drivers/mfd/stmpe.c | 2 +-
drivers/mfd/tc3589x.c | 2 +-
drivers/mfd/tps6586x.c | 2 +-
drivers/mfd/twl4030-power.c | 45 ++-
drivers/mfd/twl6030-irq.c | 2 +-
drivers/mfd/wm831x-irq.c | 2 +-
drivers/mfd/wm8994-irq.c | 6 +-
drivers/rtc/Kconfig | 11 +
drivers/rtc/Makefile | 1 +
drivers/rtc/rtc-st-lpc.c | 354 +++++++++++++++++++++
drivers/watchdog/Kconfig | 12 +
drivers/watchdog/Makefile | 1 +
drivers/watchdog/st_lpc_wdt.c | 344 ++++++++++++++++++++
include/linux/i2c/twl.h | 1 +
include/linux/mfd/arizona/core.h | 1 +
include/linux/mfd/da9055/core.h | 2 +-
include/linux/mfd/max77686.h | 5 -
39 files changed, 1231 insertions(+), 109 deletions(-)
create mode 100644 Documentation/devicetree/bindings/rtc/rtc-st-lpc.txt
create mode 100644 Documentation/devicetree/bindings/watchdog/st_lpc_wdt.txt
create mode 100644 drivers/rtc/rtc-st-lpc.c
create mode 100644 drivers/watchdog/st_lpc_wdt.c
Merging backlight/for-backlight-next (d57184f49f13 backlight: Allow compile test of GPIO consumers if !GPIOLIB)
$ git merge backlight/for-backlight-next
Merge made by the 'recursive' strategy.
drivers/video/backlight/Kconfig | 8 +++++---
drivers/video/backlight/da9052_bl.c | 2 +-
drivers/video/backlight/gpio_backlight.c | 2 ++
drivers/video/fbdev/imxfb.c | 2 +-
drivers/video/fbdev/mxsfb.c | 2 +-
drivers/video/fbdev/s3c-fb.c | 2 +-
6 files changed, 11 insertions(+), 7 deletions(-)
Merging battery/master (8ebb7e9c1a50 power: bq27x00_battery: Add missing MODULE_ALIAS)
$ git merge battery/master
Already up-to-date.
Merging omap_dss2/for-next (72fc8b7187cd Merge branches '4.1/fbdev' and '4.1/omapdss' into for-next)
$ git merge omap_dss2/for-next
Merge made by the 'recursive' strategy.
drivers/video/fbdev/omap2/dss/hdmi4.c | 50 +++++++++++++++++++++++++++++++++++
drivers/video/fbdev/omap2/dss/hdmi5.c | 50 +++++++++++++++++++++++++++++++++++
2 files changed, 100 insertions(+)
Merging regulator/for-next (6e8d612d6f2f Merge remote-tracking branches 'regulator/topic/max14577', 'regulator/topic/max77693', 'regulator/topic/max77843' and 'regulator/topic/max8973' into regulator-next)
$ git merge regulator/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/regulator/regulator.txt | 2 +-
drivers/regulator/88pm8607.c | 2 +-
drivers/regulator/Kconfig | 2 +-
drivers/regulator/arizona-ldo1.c | 15 +++
drivers/regulator/helpers.c | 2 +-
drivers/regulator/max14577.c | 128 ++++++++-------------
drivers/regulator/max77686.c | 2 +-
drivers/regulator/max77693.c | 17 +--
drivers/regulator/max77843.c | 68 ++++-------
drivers/regulator/max8973-regulator.c | 6 +-
drivers/regulator/of_regulator.c | 2 +-
drivers/regulator/s2mps11.c | 10 +-
12 files changed, 102 insertions(+), 154 deletions(-)
Merging security/next (1ddd3b4e07a4 LSM: Remove unused capability.c)
$ git merge security/next
Resolved 'include/linux/security.h' using previous resolution.
Resolved 'security/security.c' using previous resolution.
Auto-merging security/selinux/hooks.c
Auto-merging security/security.c
CONFLICT (content): Merge conflict in security/security.c
CONFLICT (modify/delete): security/capability.c deleted in security/next and modified in HEAD. Version HEAD of security/capability.c left in tree.
Auto-merging include/linux/security.h
CONFLICT (content): Merge conflict in include/linux/security.h
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f security/capability.c
security/capability.c: needs merge
rm 'security/capability.c'
$ git commit -v -a
[master 4f0391f7a6e2] Merge remote-tracking branch 'security/next'
$ git diff -M --stat --summary HEAD^..
include/linux/lsm_hooks.h | 1886 ++++++++++++++++++++++++++++++++++++++++++++
include/linux/security.h | 1623 +-------------------------------------
security/Makefile | 2 +-
security/apparmor/domain.c | 12 +-
security/apparmor/lsm.c | 131 ++-
security/capability.c | 1158 ---------------------------
security/commoncap.c | 41 +-
security/security.c | 955 +++++++++++++++-------
security/selinux/hooks.c | 490 +++++-------
security/smack/smack.h | 4 +-
security/smack/smack_lsm.c | 307 ++++---
security/smack/smackfs.c | 2 +-
security/tomoyo/tomoyo.c | 72 +-
security/yama/yama_lsm.c | 60 +-
14 files changed, 3064 insertions(+), 3679 deletions(-)
create mode 100644 include/linux/lsm_hooks.h
delete mode 100644 security/capability.c
$ git am -3 ../patches/0001-LSM-merge-fix-for-follow_link-API-changes.patch
Applying: LSM: merge fix for follow_link API changes
$ git reset HEAD^
Unstaged changes after reset:
M include/linux/lsm_hooks.h
$ git add -A .
$ git commit -v -a --amend
[master 620dc395465e] Merge remote-tracking branch 'security/next'
Date: Thu May 14 13:52:07 2015 +1000
Merging integrity/next (88096f774d71 ima: pass iint to ima_add_violation())
$ git merge integrity/next
Auto-merging Documentation/kernel-parameters.txt
Merge made by the 'recursive' strategy.
Documentation/ABI/testing/ima_policy | 20 ++++++---
Documentation/kernel-parameters.txt | 2 +-
crypto/asymmetric_keys/asymmetric_keys.h | 3 ++
crypto/asymmetric_keys/asymmetric_type.c | 20 ++++++---
crypto/asymmetric_keys/x509_public_key.c | 27 ++++++++++--
fs/xattr.c | 10 ++---
security/integrity/digsig.c | 2 +-
security/integrity/evm/evm_main.c | 18 ++++++--
security/integrity/iint.c | 3 ++
security/integrity/ima/ima.h | 27 +++++++-----
security/integrity/ima/ima_api.c | 20 ++++-----
security/integrity/ima/ima_appraise.c | 8 +++-
security/integrity/ima/ima_init.c | 13 ++----
security/integrity/ima/ima_main.c | 5 ++-
security/integrity/ima/ima_policy.c | 17 ++++----
security/integrity/ima/ima_template_lib.c | 71 +++++++++++++------------------
security/integrity/ima/ima_template_lib.h | 22 +++-------
security/integrity/integrity.h | 2 +-
18 files changed, 163 insertions(+), 127 deletions(-)
Merging selinux/next (6a878464e21a signals: don't abuse __flush_signals() in selinux_bprm_committed_creds())
$ git merge selinux/next
Auto-merging security/selinux/hooks.c
Auto-merging kernel/signal.c
Auto-merging include/linux/sched.h
Merge made by the 'recursive' strategy.
include/linux/sched.h | 1 -
kernel/signal.c | 13 ++++---------
security/selinux/hooks.c | 11 +++++++----
3 files changed, 11 insertions(+), 14 deletions(-)
Merging lblnet/next (b2776bf7149b Linux 3.18)
$ git merge lblnet/next
Already up-to-date.
Merging watchdog/master (fe92a2e35727 watchdog: octeon: use fixed length string for register names)
$ git merge watchdog/master
Merge made by the 'recursive' strategy.
Merging iommu/next (60dcc6f0bcf4 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/exynos' and 'core' into next)
$ git merge iommu/next
Merge made by the 'recursive' strategy.
drivers/iommu/exynos-iommu.c | 1 +
drivers/iommu/iova.c | 4 ++++
drivers/iommu/rockchip-iommu.c | 23 +++++++++++++++++------
3 files changed, 22 insertions(+), 6 deletions(-)
Merging dwmw2-iommu/master (4ed6a540fab8 iommu/vt-d: Fix passthrough mode with translation-disabled devices)
$ git merge dwmw2-iommu/master
Merge made by the 'recursive' strategy.
drivers/iommu/intel-iommu.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
Merging vfio/next (5a0ff17741c1 vfio-pci: Fix use after free)
$ git merge vfio/next
Already up-to-date.
Merging osd/linux-next (1fa3a002b254 Boaz Harrosh - fix email in Documentation)
$ git merge osd/linux-next
Already up-to-date.
Merging jc_docs/docs-next (8547aa131495 Documentation: tracing: fix grammar)
$ git merge jc_docs/docs-next
Auto-merging Documentation/kasan.txt
Merge made by the 'recursive' strategy.
Documentation/CodingStyle | 2 +-
Documentation/blackfin/gptimers-example.c | 14 +++++++++++---
Documentation/filesystems/proc.txt | 3 ++-
Documentation/kasan.txt | 2 +-
Documentation/magic-number.txt | 2 --
Documentation/trace/ftrace.txt | 4 ++--
Documentation/usb/usb-serial.txt | 12 +++++++-----
Documentation/zh_CN/magic-number.txt | 2 --
firmware/README.AddingFirmware | 14 ++++++++++++--
9 files changed, 36 insertions(+), 19 deletions(-)
Merging trivial/for-next (0e4f93e5017d goldfish: goldfish_tty_probe() is not using 'i' any more)
$ git merge trivial/for-next
Already up-to-date.
Merging audit/next (39a8804455fb Linux 4.0)
$ git merge audit/next
Already up-to-date.
Merging devicetree/devicetree/next (a2166ca5f320 Merge remote-tracking branch 'robh/for-next' into devicetree/next)
$ git merge devicetree/devicetree/next
Already up-to-date.
Merging dt-rh/for-next (4760597116e3 scripts/dtc: Update to upstream version 9d3649bd3be245c9)
$ git merge dt-rh/for-next
Merge made by the 'recursive' strategy.
arch/arm/boot/compressed/libfdt_env.h | 4 +
arch/powerpc/boot/libfdt_env.h | 4 +
arch/powerpc/boot/of.h | 2 +
include/linux/libfdt_env.h | 4 +
scripts/dtc/checks.c | 31 +-
scripts/dtc/data.c | 12 +-
scripts/dtc/dtc-lexer.l | 65 +-
scripts/dtc/dtc-lexer.lex.c_shipped | 516 +++++-----
scripts/dtc/dtc-parser.tab.c_shipped | 1773 ++++++++++++++++-----------------
scripts/dtc/dtc-parser.tab.h_shipped | 114 +--
scripts/dtc/dtc-parser.y | 147 +--
scripts/dtc/dtc.c | 14 +-
scripts/dtc/dtc.h | 18 +-
scripts/dtc/flattree.c | 4 +-
scripts/dtc/fstree.c | 17 +-
scripts/dtc/libfdt/Makefile.libfdt | 3 +-
scripts/dtc/libfdt/fdt.c | 30 +-
scripts/dtc/libfdt/fdt.h | 93 +-
scripts/dtc/libfdt/fdt_empty_tree.c | 1 +
scripts/dtc/libfdt/fdt_ro.c | 29 +-
scripts/dtc/libfdt/fdt_rw.c | 10 +-
scripts/dtc/libfdt/fdt_sw.c | 36 +-
scripts/dtc/libfdt/fdt_wip.c | 2 +-
scripts/dtc/libfdt/libfdt.h | 148 ++-
scripts/dtc/libfdt/libfdt_env.h | 104 +-
scripts/dtc/libfdt/libfdt_internal.h | 6 +-
scripts/dtc/livetree.c | 4 +-
scripts/dtc/srcpos.c | 49 +-
scripts/dtc/srcpos.h | 15 +-
scripts/dtc/treesource.c | 15 +-
scripts/dtc/update-dtc-source.sh | 9 +
scripts/dtc/util.c | 18 +-
scripts/dtc/util.h | 4 +-
scripts/dtc/version_gen.h | 2 +-
34 files changed, 1768 insertions(+), 1535 deletions(-)
Merging mailbox/mailbox-for-next (4c0f74bf82e8 mailbox: Enable BCM2835 mailbox support)
$ git merge mailbox/mailbox-for-next
Merge made by the 'recursive' strategy.
.../bindings/mailbox/brcm,bcm2835-mbox.txt | 26 ++
.../bindings/mailbox/nvidia,tegra124-xusb-mbox.txt | 30 +++
drivers/mailbox/Kconfig | 17 ++
drivers/mailbox/Makefile | 4 +
drivers/mailbox/arm_mhu.c | 2 +-
drivers/mailbox/bcm2835-mailbox.c | 216 +++++++++++++++
drivers/mailbox/mailbox-altera.c | 2 +-
drivers/mailbox/mailbox.c | 11 +-
drivers/mailbox/omap-mailbox.c | 8 +-
drivers/mailbox/pcc.c | 2 +-
drivers/mailbox/tegra-xusb-mailbox.c | 290 +++++++++++++++++++++
include/linux/mailbox_controller.h | 2 +-
include/soc/tegra/xusb.h | 43 +++
13 files changed, 642 insertions(+), 11 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mailbox/brcm,bcm2835-mbox.txt
create mode 100644 Documentation/devicetree/bindings/mailbox/nvidia,tegra124-xusb-mbox.txt
create mode 100644 drivers/mailbox/bcm2835-mailbox.c
create mode 100644 drivers/mailbox/tegra-xusb-mailbox.c
create mode 100644 include/soc/tegra/xusb.h
Merging spi/for-next (17258abbb56b Merge remote-tracking branches 'spi/topic/sirf' and 'spi/topic/spidev' into spi-next)
$ git merge spi/for-next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/spi/spi-ath79.txt | 24 ++
.../devicetree/bindings/spi/spi_pl022.txt | 2 +-
.../include/asm/mach-ath79/ath79_spi_platform.h | 4 -
drivers/spi/Kconfig | 11 +-
drivers/spi/Makefile | 1 +
drivers/spi/spi-ath79.c | 34 +-
drivers/spi/spi-bcm2835.c | 392 +++++++++++++++++++--
drivers/spi/spi-fsl-dspi.c | 2 +-
drivers/spi/spi-imx.c | 2 +-
drivers/spi/spi-omap2-mcspi.c | 267 +++++++-------
drivers/spi/spi-rb4xx.c | 210 +++++++++++
drivers/spi/spi-rspi.c | 15 +-
drivers/spi/spi-s3c64xx.c | 2 +-
drivers/spi/spi-sh-msiof.c | 2 +-
drivers/spi/spi-sirf.c | 65 ++--
drivers/spi/spi.c | 11 +-
drivers/spi/spidev.c | 33 +-
17 files changed, 808 insertions(+), 269 deletions(-)
create mode 100644 Documentation/devicetree/bindings/spi/spi-ath79.txt
create mode 100644 drivers/spi/spi-rb4xx.c
Merging tip/auto-latest (0b8e04adb97c Merge branch 'x86/urgent')
$ git merge tip/auto-latest
Recorded preimage for 'tools/testing/selftests/x86/Makefile'
CONFLICT (modify/delete): tools/testing/selftests/x86/run_x86_tests.sh deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of tools/testing/selftests/x86/run_x86_tests.sh left in tree.
Auto-merging tools/testing/selftests/x86/Makefile
CONFLICT (content): Merge conflict in tools/testing/selftests/x86/Makefile
Auto-merging net/sched/sch_api.c
Auto-merging net/core/pktgen.c
Auto-merging kernel/signal.c
Auto-merging kernel/sched/loadavg.c
Auto-merging kernel/sched/core.c
Auto-merging init/Kconfig
Auto-merging include/linux/sched.h
Removing include/linux/platform_data/irq-renesas-irqc.h
Auto-merging drivers/pci/quirks.c
Auto-merging arch/x86/include/asm/pci.h
Auto-merging arch/x86/Kconfig
Auto-merging Makefile
Auto-merging Documentation/kernel-parameters.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f tools/testing/selftests/x86/run_x86_tests.sh
tools/testing/selftests/x86/run_x86_tests.sh: needs merge
rm 'tools/testing/selftests/x86/run_x86_tests.sh'
$ git commit -v -a
Recorded resolution for 'tools/testing/selftests/x86/Makefile'.
[master e3bd71437ec1] Merge remote-tracking branch 'tip/auto-latest'
$ git diff -M --stat --summary HEAD^..
Documentation/kernel-parameters.txt | 6 +
Documentation/x86/boot.txt | 2 +-
Makefile | 5 +-
arch/ia64/include/asm/irq_remapping.h | 2 -
arch/ia64/kernel/msi_ia64.c | 30 +-
arch/x86/Kconfig | 18 +-
arch/x86/Kconfig.debug | 11 +
arch/x86/Makefile | 3 +
arch/x86/ia32/ia32entry.S | 52 +-
arch/x86/include/asm/alternative-asm.h | 18 +
arch/x86/include/asm/amd_nb.h | 11 +
arch/x86/include/asm/atomic.h | 30 +-
arch/x86/include/asm/atomic64_64.h | 8 +-
arch/x86/include/asm/dma-mapping.h | 46 +-
arch/x86/include/asm/entry_arch.h | 3 +
arch/x86/include/asm/hardirq.h | 3 +
arch/x86/include/asm/hpet.h | 16 +-
arch/x86/include/asm/hw_irq.h | 135 +-
arch/x86/include/asm/io.h | 1 +
arch/x86/include/asm/io_apic.h | 114 +-
arch/x86/include/asm/irq_remapping.h | 69 +-
arch/x86/include/asm/irq_vectors.h | 50 +-
arch/x86/include/asm/irqdomain.h | 63 +
arch/x86/include/asm/mce.h | 18 +-
arch/x86/include/asm/microcode.h | 8 +-
arch/x86/include/asm/microcode_amd.h | 4 +-
arch/x86/include/asm/microcode_intel.h | 8 +-
arch/x86/include/asm/msi.h | 7 +
arch/x86/include/asm/paravirt.h | 29 +-
arch/x86/include/asm/paravirt_types.h | 17 +-
arch/x86/include/asm/pci.h | 5 -
arch/x86/include/asm/qspinlock.h | 57 +
arch/x86/include/asm/qspinlock_paravirt.h | 6 +
arch/x86/include/asm/special_insns.h | 38 +
arch/x86/include/asm/spinlock.h | 5 +
arch/x86/include/asm/spinlock_types.h | 4 +
arch/x86/include/asm/thread_info.h | 8 +-
arch/x86/include/asm/trace/irq_vectors.h | 6 +
arch/x86/include/asm/traps.h | 3 +-
arch/x86/include/asm/uaccess_32.h | 4 +
arch/x86/include/asm/x86_init.h | 21 -
arch/x86/kernel/acpi/boot.c | 71 +-
arch/x86/kernel/acpi/wakeup_64.S | 6 +-
arch/x86/kernel/alternative.c | 9 +
arch/x86/kernel/amd_nb.c | 4 +-
arch/x86/kernel/apb_timer.c | 4 -
arch/x86/kernel/aperture_64.c | 8 +-
arch/x86/kernel/apic/htirq.c | 173 ++-
arch/x86/kernel/apic/io_apic.c | 1303 +++++++++----------
arch/x86/kernel/apic/msi.c | 416 +++---
arch/x86/kernel/apic/vector.c | 437 ++++---
arch/x86/kernel/apic/x2apic_phys.c | 2 +
arch/x86/kernel/asm-offsets.c | 21 +
arch/x86/kernel/asm-offsets_32.c | 18 -
arch/x86/kernel/asm-offsets_64.c | 21 -
arch/x86/kernel/cpu/amd.c | 12 +-
arch/x86/kernel/cpu/common.c | 4 -
arch/x86/kernel/cpu/mcheck/mce.c | 10 +-
arch/x86/kernel/cpu/mcheck/mce_amd.c | 141 +-
arch/x86/kernel/cpu/microcode/amd_early.c | 19 +-
arch/x86/kernel/cpu/microcode/core.c | 76 +-
arch/x86/kernel/cpu/microcode/core_early.c | 23 +-
arch/x86/kernel/cpu/microcode/intel.c | 75 +-
arch/x86/kernel/cpu/microcode/intel_early.c | 30 +-
arch/x86/kernel/cpu/microcode/intel_lib.c | 8 +-
arch/x86/kernel/cpu/mtrr/generic.c | 2 +-
arch/x86/kernel/cpu/perf_event_intel.c | 7 +-
arch/x86/kernel/cpu/perf_event_intel_rapl.c | 6 +-
arch/x86/kernel/cpu/perf_event_intel_uncore.c | 8 +-
arch/x86/kernel/cpu/perf_event_intel_uncore.h | 1 +
arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 20 +
arch/x86/kernel/devicetree.c | 41 +-
arch/x86/kernel/entry_64.S | 72 +-
arch/x86/kernel/hpet.c | 57 +-
arch/x86/kernel/i8259.c | 8 +-
arch/x86/kernel/irq.c | 12 +
arch/x86/kernel/irq_32.c | 6 -
arch/x86/kernel/irq_64.c | 6 -
arch/x86/kernel/irqinit.c | 8 +-
arch/x86/kernel/kvm.c | 43 +
arch/x86/kernel/mpparse.c | 7 +-
arch/x86/kernel/paravirt-spinlocks.c | 24 +-
arch/x86/kernel/paravirt.c | 4 +-
arch/x86/kernel/paravirt_patch_32.c | 22 +-
arch/x86/kernel/paravirt_patch_64.c | 23 +-
arch/x86/kernel/pci-dma.c | 45 +
arch/x86/kernel/process_32.c | 5 +-
arch/x86/kernel/process_64.c | 3 -
arch/x86/kernel/setup.c | 3 +-
arch/x86/kernel/smpboot.c | 43 +-
arch/x86/kernel/traps.c | 16 +-
arch/x86/kernel/x86_init.c | 9 -
arch/x86/lguest/boot.c | 4 +-
arch/x86/mm/ioremap.c | 43 +-
arch/x86/mm/pageattr.c | 18 +-
arch/x86/pci/intel_mid_pci.c | 6 +-
arch/x86/platform/Makefile | 1 +
arch/x86/platform/atom/Makefile | 1 +
arch/x86/platform/atom/punit_atom_debug.c | 183 +++
.../platform/intel-mid/device_libs/platform_wdt.c | 5 +-
arch/x86/platform/intel-mid/intel-mid.c | 18 +-
arch/x86/platform/intel-mid/sfi.c | 30 +-
arch/x86/platform/sfi/sfi.c | 7 +-
arch/x86/platform/uv/uv_irq.c | 298 ++---
arch/x86/power/hibernate_asm_64.S | 8 +-
arch/x86/vdso/Makefile | 2 +-
arch/x86/xen/enlighten.c | 3 +-
arch/x86/xen/spinlock.c | 64 +-
arch/x86/xen/xen-asm_64.S | 22 +-
arch/x86/xen/xen-ops.h | 2 +
drivers/clocksource/asm9260_timer.c | 2 +-
drivers/clocksource/timer-integrator-ap.c | 2 +-
drivers/clocksource/timer-sun5i.c | 2 +-
drivers/iommu/amd_iommu.c | 477 ++++---
drivers/iommu/amd_iommu_init.c | 4 +
drivers/iommu/amd_iommu_proto.h | 9 +
drivers/iommu/amd_iommu_types.h | 5 +
drivers/iommu/dmar.c | 19 +-
drivers/iommu/intel_irq_remapping.c | 573 ++++-----
drivers/iommu/irq_remapping.c | 242 +---
drivers/iommu/irq_remapping.h | 36 +-
drivers/irqchip/exynos-combiner.c | 2 +-
drivers/irqchip/irq-armada-370-xp.c | 2 +-
drivers/irqchip/irq-bcm2835.c | 2 +-
drivers/irqchip/irq-keystone.c | 2 +-
drivers/irqchip/irq-mips-gic.c | 2 +-
drivers/irqchip/irq-mtk-sysirq.c | 2 +-
drivers/irqchip/irq-mxs.c | 2 +-
drivers/irqchip/irq-renesas-intc-irqpin.c | 2 +-
drivers/irqchip/irq-renesas-irqc.c | 19 +-
drivers/irqchip/irq-s3c24xx.c | 4 +-
drivers/irqchip/irq-sun4i.c | 2 +-
drivers/irqchip/irq-versatile-fpga.c | 2 +-
drivers/irqchip/irq-vf610-mscm-ir.c | 5 +-
drivers/irqchip/irq-vic.c | 2 +-
drivers/irqchip/irq-vt8500.c | 2 +-
drivers/lguest/interrupts_and_traps.c | 10 +-
drivers/pci/htirq.c | 48 +-
drivers/pci/quirks.c | 7 -
drivers/power/reset/ltc2952-poweroff.c | 1 -
include/asm-generic/io.h | 8 +
include/asm-generic/qspinlock.h | 139 ++
include/asm-generic/qspinlock_types.h | 79 ++
include/linux/alarmtimer.h | 4 +-
include/linux/clocksource.h | 1 -
include/linux/compiler.h | 2 +-
include/linux/context_tracking.h | 10 -
include/linux/context_tracking_state.h | 1 +
include/linux/dmar.h | 3 +-
include/linux/hrtimer.h | 118 +-
include/linux/htirq.h | 22 +-
include/linux/init_task.h | 5 +-
include/linux/intel-iommu.h | 4 +
include/linux/interrupt.h | 9 +-
include/linux/osq_lock.h | 5 +
include/linux/perf_event.h | 24 +
include/linux/platform_data/irq-renesas-irqc.h | 27 -
include/linux/rcupdate.h | 6 +-
include/linux/rcutree.h | 2 +-
include/linux/sched.h | 113 +-
include/linux/sched/rt.h | 7 +-
include/linux/tick.h | 7 +
include/linux/timekeeper_internal.h | 2 +
include/linux/timer.h | 7 -
include/linux/timerqueue.h | 8 +-
include/linux/wait.h | 17 +-
init/Kconfig | 2 +-
ipc/mqueue.c | 54 +-
kernel/Kconfig.locks | 13 +-
kernel/context_tracking.c | 67 +-
kernel/events/core.c | 137 +-
kernel/fork.c | 5 +-
kernel/futex.c | 38 +-
kernel/irq/irqdesc.c | 4 +-
kernel/irq/msi.c | 2 +-
kernel/locking/Makefile | 3 +-
kernel/locking/mcs_spinlock.h | 1 +
kernel/locking/qrwlock.c | 2 +-
kernel/locking/qspinlock.c | 473 +++++++
kernel/locking/qspinlock_paravirt.h | 325 +++++
kernel/locking/rtmutex.c | 17 +-
kernel/locking/rwsem-xadd.c | 44 +
kernel/rcu/tree_plugin.h | 14 +-
kernel/sched/Makefile | 2 +-
kernel/sched/auto_group.c | 6 +-
kernel/sched/auto_group.h | 2 +-
kernel/sched/core.c | 160 ++-
kernel/sched/cputime.c | 2 +-
kernel/sched/deadline.c | 14 +-
kernel/sched/debug.c | 2 -
kernel/sched/fair.c | 271 +++-
kernel/sched/{proc.c => loadavg.c} | 236 +---
kernel/sched/rt.c | 16 +-
kernel/sched/sched.h | 14 +-
kernel/sched/stats.h | 15 +-
kernel/sched/wait.c | 4 +-
kernel/signal.c | 6 +-
kernel/time/alarmtimer.c | 17 +-
kernel/time/hrtimer.c | 545 +++-----
kernel/time/posix-cpu-timers.c | 87 +-
kernel/time/posix-timers.c | 17 +-
kernel/time/tick-broadcast-hrtimer.c | 18 +-
kernel/time/tick-broadcast.c | 81 +-
kernel/time/tick-common.c | 10 +
kernel/time/tick-internal.h | 2 +
kernel/time/tick-sched.c | 297 ++---
kernel/time/tick-sched.h | 2 +-
kernel/time/timekeeping.c | 55 +-
kernel/time/timekeeping.h | 11 +-
kernel/time/timer.c | 81 +-
kernel/time/timer_list.c | 43 +-
lib/timerqueue.c | 10 +-
net/core/pktgen.c | 2 -
net/sched/sch_api.c | 5 +-
sound/core/hrtimer.c | 9 +-
sound/drivers/pcsp/pcsp.c | 17 +-
tools/Makefile | 20 +-
tools/arch/alpha/include/asm/barrier.h | 8 +
tools/arch/arm/include/asm/barrier.h | 12 +
tools/arch/arm64/include/asm/barrier.h | 16 +
tools/arch/ia64/include/asm/barrier.h | 48 +
tools/arch/mips/include/asm/barrier.h | 20 +
tools/arch/powerpc/include/asm/barrier.h | 29 +
tools/arch/s390/include/asm/barrier.h | 30 +
tools/arch/sh/include/asm/barrier.h | 32 +
tools/arch/sparc/include/asm/barrier.h | 8 +
tools/arch/sparc/include/asm/barrier_32.h | 6 +
tools/arch/sparc/include/asm/barrier_64.h | 42 +
tools/arch/tile/include/asm/barrier.h | 15 +
tools/arch/x86/include/asm/atomic.h | 65 +
tools/arch/x86/include/asm/barrier.h | 28 +
tools/arch/x86/include/asm/rmwcc.h | 41 +
tools/arch/xtensa/include/asm/barrier.h | 18 +
tools/include/asm-generic/atomic-gcc.h | 63 +
tools/include/asm-generic/barrier.h | 44 +
tools/include/asm/atomic.h | 10 +
tools/include/asm/barrier.h | 27 +
tools/include/linux/atomic.h | 6 +
tools/include/linux/compiler.h | 4 +
tools/include/linux/types.h | 4 +
tools/lib/traceevent/event-parse.c | 6 +-
tools/lib/traceevent/event-parse.h | 1 +
.../callchain-overhead-calculation.txt | 108 ++
tools/perf/Documentation/perf-bench.txt | 3 +
tools/perf/Documentation/perf-inject.txt | 27 +
tools/perf/Documentation/perf-kmem.txt | 11 +-
tools/perf/Documentation/perf-probe.txt | 17 +-
tools/perf/Documentation/perf-record.txt | 9 +
tools/perf/Documentation/perf-report.txt | 32 +
tools/perf/Documentation/perf-script.txt | 37 +-
tools/perf/Documentation/perf-top.txt | 3 +-
tools/perf/Documentation/perf-trace.txt | 2 +-
tools/perf/MANIFEST | 19 +
tools/perf/Makefile | 2 +-
tools/perf/Makefile.perf | 2 +
tools/perf/arch/powerpc/util/Build | 1 +
tools/perf/arch/powerpc/util/sym-handling.c | 82 ++
tools/perf/bench/Build | 1 +
tools/perf/bench/bench.h | 2 +
tools/perf/bench/futex-wake-parallel.c | 294 +++++
tools/perf/bench/futex-wake.c | 7 +-
tools/perf/bench/numa.c | 32 +-
tools/perf/builtin-annotate.c | 10 +-
tools/perf/builtin-bench.c | 1 +
tools/perf/builtin-buildid-list.c | 9 +
tools/perf/builtin-diff.c | 9 +-
tools/perf/builtin-inject.c | 175 ++-
tools/perf/builtin-kmem.c | 988 ++++++++++++--
tools/perf/builtin-kvm.c | 6 +-
tools/perf/builtin-lock.c | 8 +-
tools/perf/builtin-mem.c | 5 +-
tools/perf/builtin-probe.c | 193 ++-
tools/perf/builtin-record.c | 274 +++-
tools/perf/builtin-report.c | 20 +-
tools/perf/builtin-sched.c | 82 +-
tools/perf/builtin-script.c | 94 +-
tools/perf/builtin-stat.c | 146 ++-
tools/perf/builtin-timechart.c | 5 +-
tools/perf/builtin-top.c | 2 +-
tools/perf/builtin-trace.c | 43 +-
tools/perf/config/Makefile | 9 +
tools/perf/perf-sys.h | 73 +-
tools/perf/perf.h | 5 +
tools/perf/tests/code-reading.c | 24 +-
tools/perf/tests/dwarf-unwind.c | 1 +
tools/perf/tests/evsel-roundtrip-name.c | 4 +-
tools/perf/tests/hists_common.c | 1 +
tools/perf/tests/hists_cumulate.c | 6 +-
tools/perf/tests/hists_filter.c | 8 +-
tools/perf/tests/hists_link.c | 12 +-
tools/perf/tests/hists_output.c | 6 +-
tools/perf/tests/keep-tracking.c | 4 +-
tools/perf/tests/make | 18 +-
tools/perf/tests/mmap-thread-lookup.c | 2 +
tools/perf/tests/parse-events.c | 2 +-
tools/perf/tests/perf-time-to-tsc.c | 2 +-
tools/perf/tests/pmu.c | 3 +-
tools/perf/tests/switch-tracking.c | 8 +-
tools/perf/tests/thread-mg-share.c | 12 +-
tools/perf/ui/browsers/hists.c | 633 +++++----
tools/perf/util/Build | 3 +-
tools/perf/util/auxtrace.c | 1352 ++++++++++++++++++++
tools/perf/util/auxtrace.h | 643 ++++++++++
tools/perf/util/build-id.c | 5 +-
tools/perf/util/callchain.h | 4 +
tools/perf/util/data-convert-bt.c | 410 +++++-
tools/perf/util/db-export.c | 14 +-
tools/perf/util/dso.c | 2 +
tools/perf/util/dso.h | 3 +
tools/perf/util/dwarf-aux.c | 16 +
tools/perf/util/dwarf-aux.h | 3 +
tools/perf/util/event.c | 57 +
tools/perf/util/event.h | 72 ++
tools/perf/util/evlist.c | 73 +-
tools/perf/util/evlist.h | 6 +
tools/perf/util/evsel.c | 1 +
tools/perf/util/header.c | 37 +
tools/perf/util/header.h | 1 +
tools/perf/util/hist.c | 2 +-
tools/perf/util/machine.c | 110 +-
tools/perf/util/machine.h | 9 +-
tools/perf/util/map.c | 5 +
tools/perf/util/map.h | 3 +-
tools/perf/util/parse-events.c | 194 ++-
tools/perf/util/parse-events.h | 36 +-
tools/perf/util/parse-events.l | 41 +-
tools/perf/util/parse-events.y | 48 +-
tools/perf/util/parse-options.h | 4 +
tools/perf/util/pmu.c | 57 +-
tools/perf/util/pmu.h | 6 +-
tools/perf/util/probe-event.c | 334 ++---
tools/perf/util/probe-event.h | 22 +-
tools/perf/util/probe-finder.c | 73 +-
tools/perf/util/probe-finder.h | 10 +-
tools/perf/util/pstack.c | 7 +
tools/perf/util/pstack.h | 1 +
tools/perf/util/record.c | 15 +-
tools/perf/util/session.c | 184 ++-
tools/perf/util/session.h | 6 +
tools/perf/util/sort.h | 38 +-
tools/perf/util/strfilter.c | 107 ++
tools/perf/util/strfilter.h | 35 +
tools/perf/util/symbol-elf.c | 13 +-
tools/perf/util/symbol.c | 25 +-
tools/perf/util/symbol.h | 12 +-
tools/perf/util/thread.c | 14 +-
tools/perf/util/thread.h | 3 +-
tools/perf/util/tool.h | 12 +-
tools/perf/util/util.h | 4 +
tools/testing/selftests/x86/Makefile | 5 +-
tools/testing/selftests/x86/sysret_ss_attrs.c | 112 ++
tools/testing/selftests/x86/thunks.S | 67 +
tools/vm/Makefile | 2 +-
353 files changed, 13325 insertions(+), 5620 deletions(-)
create mode 100644 arch/x86/include/asm/irqdomain.h
create mode 100644 arch/x86/include/asm/msi.h
create mode 100644 arch/x86/include/asm/qspinlock.h
create mode 100644 arch/x86/include/asm/qspinlock_paravirt.h
create mode 100644 arch/x86/platform/atom/Makefile
create mode 100644 arch/x86/platform/atom/punit_atom_debug.c
create mode 100644 include/asm-generic/qspinlock.h
create mode 100644 include/asm-generic/qspinlock_types.h
delete mode 100644 include/linux/platform_data/irq-renesas-irqc.h
create mode 100644 kernel/locking/qspinlock.c
create mode 100644 kernel/locking/qspinlock_paravirt.h
rename kernel/sched/{proc.c => loadavg.c} (62%)
create mode 100644 tools/arch/alpha/include/asm/barrier.h
create mode 100644 tools/arch/arm/include/asm/barrier.h
create mode 100644 tools/arch/arm64/include/asm/barrier.h
create mode 100644 tools/arch/ia64/include/asm/barrier.h
create mode 100644 tools/arch/mips/include/asm/barrier.h
create mode 100644 tools/arch/powerpc/include/asm/barrier.h
create mode 100644 tools/arch/s390/include/asm/barrier.h
create mode 100644 tools/arch/sh/include/asm/barrier.h
create mode 100644 tools/arch/sparc/include/asm/barrier.h
create mode 100644 tools/arch/sparc/include/asm/barrier_32.h
create mode 100644 tools/arch/sparc/include/asm/barrier_64.h
create mode 100644 tools/arch/tile/include/asm/barrier.h
create mode 100644 tools/arch/x86/include/asm/atomic.h
create mode 100644 tools/arch/x86/include/asm/barrier.h
create mode 100644 tools/arch/x86/include/asm/rmwcc.h
create mode 100644 tools/arch/xtensa/include/asm/barrier.h
create mode 100644 tools/include/asm-generic/atomic-gcc.h
create mode 100644 tools/include/asm-generic/barrier.h
create mode 100644 tools/include/asm/atomic.h
create mode 100644 tools/include/asm/barrier.h
create mode 100644 tools/include/linux/atomic.h
create mode 100644 tools/perf/Documentation/callchain-overhead-calculation.txt
create mode 100644 tools/perf/arch/powerpc/util/sym-handling.c
create mode 100644 tools/perf/bench/futex-wake-parallel.c
create mode 100644 tools/perf/util/auxtrace.c
create mode 100644 tools/perf/util/auxtrace.h
create mode 100644 tools/testing/selftests/x86/sysret_ss_attrs.c
create mode 100644 tools/testing/selftests/x86/thunks.S
Merging clockevents/clockevents/next (d44c80d0cbb2 clocksource: exynos_mct: Remove old platform mct_init())
$ git merge clockevents/clockevents/next
Merge made by the 'recursive' strategy.
drivers/clocksource/exynos_mct.c | 22 ++-------------
drivers/clocksource/qcom-timer.c | 59 ----------------------------------------
2 files changed, 3 insertions(+), 78 deletions(-)
Merging edac/linux_next (fec53af531dd sb_edac: Fix typo computing number of banks)
$ git merge edac/linux_next
Already up-to-date.
Merging edac-amd/for-next (30c7469ba6f5 MAINTAINERS: Change Johannes Thumshirn's email address)
$ git merge edac-amd/for-next
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 10 +++++-----
drivers/edac/Kconfig | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
Merging irqchip/irqchip/for-next (a8bcdc32fafb Merge branch 'irqchip/core' into irqchip/for-next)
$ git merge irqchip/irqchip/for-next
Already up-to-date!
Merge made by the 'recursive' strategy.
Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1)
$ git merge tiny/tiny/next
Already up-to-date.
Merging ftrace/for-next (030bbdbf4c83 Linux 4.1-rc3)
$ git merge ftrace/for-next
Already up-to-date.
Merging rcu/rcu/next (707f97183675 Merge branches 'array.2015.05.12a', 'doc.2015.05.12a', 'fixes.2015.05.12a', 'hotplug.2015.05.12a', 'init.2015.05.12a', 'list.2015.05.12a', 'tiny.2015.05.12a' and 'torture.2015.05.12a' into HEAD)
$ git merge rcu/rcu/next
Resolved 'include/linux/rcupdate.h' using previous resolution.
Resolved 'include/linux/rcutree.h' using previous resolution.
Resolved 'kernel/rcu/tree.c' using previous resolution.
Resolved 'kernel/rcu/tree_plugin.h' using previous resolution.
Auto-merging lib/Kconfig.debug
Auto-merging kernel/rcu/tree_plugin.h
CONFLICT (content): Merge conflict in kernel/rcu/tree_plugin.h
Auto-merging kernel/rcu/tree.c
CONFLICT (content): Merge conflict in kernel/rcu/tree.c
Auto-merging init/Kconfig
Auto-merging include/linux/rcutree.h
CONFLICT (content): Merge conflict in include/linux/rcutree.h
Auto-merging include/linux/rcupdate.h
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
Auto-merging include/linux/compiler.h
Auto-merging arch/x86/kernel/cpu/mcheck/mce.c
Auto-merging arch/arm/kernel/smp.c
Auto-merging Documentation/kernel-parameters.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master b5ec158a627e] Merge remote-tracking branch 'rcu/rcu/next'
$ git diff -M --stat --summary HEAD^..
Documentation/RCU/arrayRCU.txt | 20 +-
Documentation/RCU/lockdep.txt | 10 -
Documentation/RCU/rcu_dereference.txt | 38 +-
Documentation/RCU/whatisRCU.txt | 6 +-
Documentation/kernel-parameters.txt | 27 +-
Documentation/memory-barriers.txt | 62 +--
arch/arm/kernel/smp.c | 6 +-
arch/arm64/kernel/smp.c | 6 +-
arch/powerpc/include/asm/barrier.h | 1 +
arch/x86/kernel/cpu/mcheck/mce.c | 15 +-
drivers/md/bitmap.c | 2 +-
include/linux/compiler.h | 16 +
include/linux/rculist.h | 15 +-
include/linux/rcupdate.h | 70 +---
include/linux/rcutiny.h | 16 +
include/linux/rcutree.h | 7 +-
include/linux/spinlock.h | 2 +-
init/Kconfig | 72 ++--
kernel/cpu.c | 4 +-
kernel/events/ring_buffer.c | 2 +-
kernel/locking/locktorture.c | 14 +-
kernel/rcu/rcutorture.c | 103 +++--
kernel/rcu/srcu.c | 10 +-
kernel/rcu/tiny.c | 38 +-
kernel/rcu/tiny_plugin.h | 12 +-
kernel/rcu/tree.c | 460 +++++++++++----------
kernel/rcu/tree.h | 66 +--
kernel/rcu/tree_plugin.h | 220 +++++-----
kernel/rcu/tree_trace.c | 6 +-
kernel/rcu/update.c | 30 +-
kernel/torture.c | 26 +-
lib/Kconfig.debug | 66 ++-
net/netfilter/core.c | 2 +-
.../testing/selftests/rcutorture/bin/configinit.sh | 2 +-
.../selftests/rcutorture/bin/kvm-recheck.sh | 4 +
tools/testing/selftests/rcutorture/bin/kvm.sh | 25 +-
.../selftests/rcutorture/configs/rcu/CFcommon | 2 +
.../selftests/rcutorture/configs/rcu/SRCU-N | 1 +
.../selftests/rcutorture/configs/rcu/SRCU-P | 1 +
.../selftests/rcutorture/configs/rcu/SRCU-P.boot | 2 +-
.../selftests/rcutorture/configs/rcu/TASKS01 | 5 +-
.../selftests/rcutorture/configs/rcu/TASKS02 | 1 -
.../selftests/rcutorture/configs/rcu/TASKS03 | 2 +-
.../selftests/rcutorture/configs/rcu/TINY02 | 2 +-
.../selftests/rcutorture/configs/rcu/TINY02.boot | 1 +
.../selftests/rcutorture/configs/rcu/TREE01 | 1 +
.../selftests/rcutorture/configs/rcu/TREE02 | 2 +-
.../selftests/rcutorture/configs/rcu/TREE02-T | 1 -
.../selftests/rcutorture/configs/rcu/TREE03 | 8 +-
.../selftests/rcutorture/configs/rcu/TREE03.boot | 1 +
.../selftests/rcutorture/configs/rcu/TREE04 | 8 +-
.../selftests/rcutorture/configs/rcu/TREE05 | 4 +-
.../selftests/rcutorture/configs/rcu/TREE06 | 4 +-
.../selftests/rcutorture/configs/rcu/TREE06.boot | 1 +
.../selftests/rcutorture/configs/rcu/TREE07 | 4 +-
.../selftests/rcutorture/configs/rcu/TREE08 | 6 +-
.../selftests/rcutorture/configs/rcu/TREE08-T | 1 -
.../selftests/rcutorture/configs/rcu/TREE08-T.boot | 1 +
.../selftests/rcutorture/configs/rcu/TREE08.boot | 1 +
.../selftests/rcutorture/configs/rcu/TREE09 | 1 +
.../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 36 +-
61 files changed, 869 insertions(+), 709 deletions(-)
create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE03.boot
create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot
Merging kvm/linux-next (cba3d2765e9f Merge tag 'kvm-s390-next-20150508' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD)
$ git merge kvm/linux-next
Auto-merging arch/s390/kvm/kvm-s390.c
Auto-merging arch/s390/kvm/interrupt.c
Merge made by the 'recursive' strategy.
Documentation/virtual/kvm/api.txt | 3 +-
arch/arm/kvm/arm.c | 4 +-
arch/mips/kvm/mips.c | 4 +-
arch/powerpc/kvm/booke.c | 6 +-
arch/powerpc/kvm/powerpc.c | 2 +-
arch/s390/include/asm/kvm_host.h | 4 +-
arch/s390/kernel/entry.S | 2 +-
arch/s390/kvm/intercept.c | 16 ---
arch/s390/kvm/interrupt.c | 87 ++++++++-------
arch/s390/kvm/kvm-s390.c | 61 +++++++----
arch/s390/kvm/kvm-s390.h | 25 ++++-
arch/s390/kvm/priv.c | 8 +-
arch/x86/include/asm/kvm_host.h | 17 +--
arch/x86/include/asm/pvclock.h | 1 -
arch/x86/include/uapi/asm/kvm.h | 3 +
arch/x86/kernel/kvmclock.c | 3 +
arch/x86/kvm/emulate.c | 2 +-
arch/x86/kvm/ioapic.c | 9 +-
arch/x86/kvm/irq_comm.c | 14 ++-
arch/x86/kvm/lapic.c | 26 +++--
arch/x86/kvm/lapic.h | 8 +-
arch/x86/kvm/mmu.c | 2 +-
arch/x86/kvm/mmu.h | 2 +
arch/x86/kvm/paging_tmpl.h | 7 ++
arch/x86/kvm/svm.c | 32 +++---
arch/x86/kvm/vmx.c | 221 ++++++++++++++++++++++++++++++++------
arch/x86/kvm/x86.c | 67 ++++++++++--
arch/x86/kvm/x86.h | 2 +
include/linux/kvm_host.h | 28 +++--
include/uapi/linux/kvm.h | 1 +
virt/kvm/kvm_main.c | 12 +--
31 files changed, 477 insertions(+), 202 deletions(-)
Merging kvm-arm/next (2fa462f82621 Merge tag 'kvm-arm-for-4.1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master)
$ git merge kvm-arm/next
Already up-to-date.
Merging kvm-ppc/kvm-ppc-next (b79013b2449c Merge tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging)
$ git merge kvm-ppc/kvm-ppc-next
Already up-to-date.
Merging kvms390/next (06b36753a646 KVM: s390: drop handling of interception code 12)
$ git merge kvms390/next
Already up-to-date.
Merging xen-tip/linux-next (0b97b03d88b4 xen/pci: Try harder to get PXM information for Xen)
$ git merge xen-tip/linux-next
Already up-to-date.
Merging percpu/for-next (4c907baf36d8 percpu_ref: implement percpu_ref_is_dying())
$ git merge percpu/for-next
Already up-to-date.
Merging workqueues/for-next (b749b1b67351 workqueue: fix a typo)
$ git merge workqueues/for-next
Merge made by the 'recursive' strategy.
Documentation/workqueue.txt | 2 +-
include/linux/workqueue.h | 1 +
kernel/workqueue.c | 355 ++++++++++++++++++++++++++++++++------------
3 files changed, 262 insertions(+), 96 deletions(-)
Merging drivers-x86/for-next (53e755c21afc asus-wmi: add fan control)
$ git merge drivers-x86/for-next
Merge made by the 'recursive' strategy.
.../ABI/testing/sysfs-driver-toshiba_haps | 20 ++
drivers/platform/x86/Kconfig | 2 +-
drivers/platform/x86/asus-wmi.c | 344 +++++++++++++++++++--
drivers/platform/x86/toshiba_acpi.c | 246 +++------------
drivers/platform/x86/toshiba_bluetooth.c | 174 ++++++++---
drivers/platform/x86/toshiba_haps.c | 32 +-
6 files changed, 548 insertions(+), 270 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-driver-toshiba_haps
Merging chrome-platform/for-next (96cba9b00e29 platform/chrome: chromeos_laptop - instantiate Atmel at primary address)
$ git merge chrome-platform/for-next
Already up-to-date.
Merging regmap/for-next (637733e01bd4 Merge remote-tracking branches 'regmap/topic/defaults' and 'regmap/topic/irq' into regmap-next)
$ git merge regmap/for-next
Merge made by the 'recursive' strategy.
drivers/base/regmap/internal.h | 3 +++
drivers/base/regmap/regcache.c | 45 ++++++++++++++++++++++++++--------------
drivers/base/regmap/regmap-irq.c | 2 +-
3 files changed, 34 insertions(+), 16 deletions(-)
Merging hsi/for-next (265ef3ee9575 HSI: cmt_speech: fix error return code)
$ git merge hsi/for-next
Already up-to-date.
Merging leds/for-next (ebb66c25577a Documentation: leds-lp5523: describe master fader attributes)
$ git merge leds/for-next
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Merge made by the 'recursive' strategy.
.../devicetree/bindings/leds/leds-aat1290.txt | 41 +
.../devicetree/bindings/leds/leds-bcm6328.txt | 309 +++++++
.../devicetree/bindings/leds/leds-ktd2692.txt | 50 ++
.../devicetree/bindings/leds/leds-tlc591xx.txt | 40 +
.../devicetree/bindings/vendor-prefixes.txt | 1 +
Documentation/leds/leds-class-flash.txt | 47 +
Documentation/leds/leds-lp5523.txt | 30 +
drivers/leds/Kconfig | 45 +-
drivers/leds/Makefile | 5 +
drivers/leds/leds-aat1290.c | 451 ++++++++++
drivers/leds/leds-bcm6328.c | 413 +++++++++
drivers/leds/leds-gpio.c | 12 +-
drivers/leds/leds-ktd2692.c | 443 ++++++++++
drivers/leds/leds-lp5523.c | 148 ++++
drivers/leds/leds-max77693.c | 980 +++++++++++++++++++++
drivers/leds/leds-tlc591xx.c | 300 +++++++
drivers/leds/leds.h | 24 -
include/linux/gpio/consumer.h | 15 +
include/linux/leds.h | 25 +
19 files changed, 3350 insertions(+), 29 deletions(-)
create mode 100644 Documentation/devicetree/bindings/leds/leds-aat1290.txt
create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm6328.txt
create mode 100644 Documentation/devicetree/bindings/leds/leds-ktd2692.txt
create mode 100644 Documentation/devicetree/bindings/leds/leds-tlc591xx.txt
create mode 100644 drivers/leds/leds-aat1290.c
create mode 100644 drivers/leds/leds-bcm6328.c
create mode 100644 drivers/leds/leds-ktd2692.c
create mode 100644 drivers/leds/leds-max77693.c
create mode 100644 drivers/leds/leds-tlc591xx.c
Merging ipmi/for-next (c32e9840e96a ipmi: Add a comment in how messages are delivered from the lower layer)
$ git merge ipmi/for-next
Merge made by the 'recursive' strategy.
drivers/char/ipmi/ipmi_msghandler.c | 4 ++++
1 file changed, 4 insertions(+)
Merging driver-core/driver-core-next (030bbdbf4c83 Linux 4.1-rc3)
$ git merge driver-core/driver-core-next
Already up-to-date.
Merging tty/tty-next (c1c325d703d3 tty: serial: 8250_mtk: Add support for bus clock)
$ git merge tty/tty-next
Auto-merging include/linux/tty.h
Auto-merging drivers/tty/serial/amba-pl011.c
Auto-merging drivers/tty/serial/Kconfig
Auto-merging drivers/tty/n_tty.c
Auto-merging drivers/tty/n_gsm.c
Merge made by the 'recursive' strategy.
.../devicetree/bindings/serial/mtk-uart.txt | 12 ++-
.../devicetree/bindings/serial/sirf-uart.txt | 15 +--
arch/alpha/include/asm/serial.h | 2 +-
arch/arm/common/edma.c | 3 +
arch/blackfin/include/asm/bfin_serial.h | 8 +-
arch/m68k/include/asm/serial.h | 2 +-
arch/mn10300/include/asm/serial.h | 4 +-
arch/x86/include/asm/serial.h | 2 +-
drivers/dma/edma.c | 7 +-
drivers/input/serio/serport.c | 5 +-
drivers/tty/amiserial.c | 8 +-
drivers/tty/cyclades.c | 8 +-
drivers/tty/n_gsm.c | 3 +-
drivers/tty/n_tty.c | 7 +-
drivers/tty/serial/8250/8250_core.c | 13 ---
drivers/tty/serial/8250/8250_mtk.c | 104 ++++++++++--------
drivers/tty/serial/8250/8250_omap.c | 65 +++++++++---
drivers/tty/serial/Kconfig | 2 +-
drivers/tty/serial/altera_jtaguart.c | 2 +-
drivers/tty/serial/altera_uart.c | 2 +-
drivers/tty/serial/amba-pl011.c | 116 +++++----------------
drivers/tty/serial/atmel_serial.c | 13 +--
drivers/tty/serial/bfin_uart.c | 24 ++---
drivers/tty/serial/crisv10.c | 94 ++---------------
drivers/tty/serial/ifx6x60.c | 19 ++--
drivers/tty/serial/imx.c | 16 ++-
drivers/tty/serial/kgdb_nmi.c | 6 +-
drivers/tty/serial/mcf.c | 2 +-
drivers/tty/serial/meson_uart.c | 2 +-
drivers/tty/serial/mpc52xx_uart.c | 2 +-
drivers/tty/serial/serial_core.c | 4 +-
drivers/tty/serial/sh-sci.h | 1 -
drivers/tty/serial/sirfsoc_uart.c | 27 +----
drivers/tty/serial/sirfsoc_uart.h | 4 -
drivers/tty/tty_io.c | 34 +++---
drivers/tty/tty_ioctl.c | 4 +-
drivers/tty/tty_ldisc.c | 8 +-
include/linux/serial_core.h | 2 +-
include/linux/tty.h | 2 +-
39 files changed, 240 insertions(+), 414 deletions(-)
$ git am -3 ../patches/0001-serial-amba-pl011-fix-mismerge.patch
Applying: serial/amba-pl011: fix mismerge
$ git reset HEAD^
Unstaged changes after reset:
M drivers/tty/serial/amba-pl011.c
$ git add -A .
$ git commit -v -a --amend
[master fedfdb4b49bc] Merge remote-tracking branch 'tty/tty-next'
Date: Thu May 14 15:33:10 2015 +1000
Merging usb/usb-next (aa519be34f45 usb: storage: fix module reference for scsi host)
$ git merge usb/usb-next
Removing include/linux/platform_data/usb-rcar-gen2-phy.h
Removing drivers/usb/phy/phy-rcar-gen2-usb.c
Merge made by the 'recursive' strategy.
drivers/usb/atm/speedtch.c | 18 +-
drivers/usb/atm/usbatm.c | 6 +-
drivers/usb/atm/xusbatm.c | 6 +-
drivers/usb/class/usblp.c | 15 +-
drivers/usb/core/buffer.c | 3 +-
drivers/usb/core/hcd.c | 3 +-
drivers/usb/core/hub.c | 40 ++--
drivers/usb/gadget/legacy/inode.c | 9 +-
drivers/usb/host/Makefile | 4 +-
drivers/usb/host/ehci-dbg.c | 3 +-
drivers/usb/host/ehci-tegra.c | 12 +-
drivers/usb/host/fusbh200-hcd.c | 3 +-
drivers/usb/host/isp116x-hcd.c | 3 +-
drivers/usb/host/ohci-dbg.c | 6 +-
drivers/usb/host/ohci-hcd.c | 3 +-
drivers/usb/host/ohci-q.c | 3 +-
drivers/usb/misc/sisusbvga/sisusb.c | 39 ++--
drivers/usb/misc/sisusbvga/sisusb_con.c | 54 ++++--
drivers/usb/misc/uss720.c | 6 +-
drivers/usb/mon/mon_bin.c | 7 +-
drivers/usb/mon/mon_main.c | 12 +-
drivers/usb/mon/mon_stat.c | 3 +-
drivers/usb/musb/musb_host.c | 9 +-
drivers/usb/phy/Kconfig | 13 --
drivers/usb/phy/Makefile | 1 -
drivers/usb/phy/phy-ab8500-usb.c | 2 +-
drivers/usb/phy/phy-rcar-gen2-usb.c | 246 ------------------------
drivers/usb/storage/alauda.c | 12 +-
drivers/usb/storage/cypress_atacb.c | 10 +-
drivers/usb/storage/datafab.c | 12 +-
drivers/usb/storage/ene_ub6250.c | 11 +-
drivers/usb/storage/freecom.c | 12 +-
drivers/usb/storage/isd200.c | 11 +-
drivers/usb/storage/jumpshot.c | 11 +-
drivers/usb/storage/karma.c | 12 +-
drivers/usb/storage/onetouch.c | 12 +-
drivers/usb/storage/realtek_cr.c | 12 +-
drivers/usb/storage/scsiglue.c | 30 +--
drivers/usb/storage/scsiglue.h | 3 +-
drivers/usb/storage/sddr09.c | 12 +-
drivers/usb/storage/sddr55.c | 11 +-
drivers/usb/storage/shuttle_usbat.c | 12 +-
drivers/usb/storage/usb.c | 16 +-
drivers/usb/storage/usb.h | 16 +-
include/linux/platform_data/usb-rcar-gen2-phy.h | 22 ---
45 files changed, 334 insertions(+), 432 deletions(-)
delete mode 100644 drivers/usb/phy/phy-rcar-gen2-usb.c
delete mode 100644 include/linux/platform_data/usb-rcar-gen2-phy.h
Merging usb-gadget/next (b787f68c36d4 Linux 4.1-rc1)
$ git merge usb-gadget/next
Already up-to-date.
Merging usb-serial/usb-next (b787f68c36d4 Linux 4.1-rc1)
$ git merge usb-serial/usb-next
Already up-to-date.
Merging staging/staging-next (1645b55b50f0 staging: comedi: ni_mio_common: fix build warning)
$ git merge staging/staging-next
Auto-merging tools/Makefile
Auto-merging drivers/staging/vt6655/device_main.c
Removing drivers/staging/unisys/visorutil/visorkmodutils.c
Removing drivers/staging/unisys/visorutil/memregion_direct.c
Removing drivers/staging/unisys/visorutil/memregion.h
Removing drivers/staging/unisys/visorutil/charqueue.h
Removing drivers/staging/unisys/visorutil/charqueue.c
Removing drivers/staging/unisys/visorutil/Makefile
Removing drivers/staging/unisys/visorutil/Kconfig
Removing drivers/staging/unisys/visorchipset/visorchipset_umode.h
Removing drivers/staging/unisys/visorchipset/parser.h
Removing drivers/staging/unisys/visorchipset/parser.c
Removing drivers/staging/unisys/visorchipset/globals.h
Removing drivers/staging/unisys/visorchipset/file.h
Removing drivers/staging/unisys/visorchipset/file.c
Removing drivers/staging/unisys/visorchipset/Makefile
Removing drivers/staging/unisys/visorchipset/Kconfig
Removing drivers/staging/unisys/visorchannel/visorchannel.h
Auto-merging drivers/staging/unisys/visorbus/visorchipset.c
Auto-merging drivers/staging/unisys/visorbus/visorchannel.c
Auto-merging drivers/staging/unisys/visorbus/visorbus_private.h
Auto-merging drivers/staging/unisys/visorbus/periodic_work.c
Removing drivers/staging/unisys/virtpci/virtpci.h
Removing drivers/staging/unisys/virtpci/virtpci.c
Removing drivers/staging/unisys/virtpci/Makefile
Removing drivers/staging/unisys/virtpci/Kconfig
Removing drivers/staging/unisys/virthba/virthba.h
Removing drivers/staging/unisys/virthba/virthba.c
Removing drivers/staging/unisys/virthba/Makefile
Removing drivers/staging/unisys/virthba/Kconfig
Removing drivers/staging/unisys/uislib/uisutils.c
Removing drivers/staging/unisys/uislib/uisthread.c
Removing drivers/staging/unisys/uislib/uisqueue.c
Removing drivers/staging/unisys/uislib/uislib.c
Removing drivers/staging/unisys/uislib/Makefile
Removing drivers/staging/unisys/uislib/Kconfig
Removing drivers/staging/unisys/include/timskmod.h
Removing drivers/staging/unisys/include/procobjecttree.h
Auto-merging drivers/staging/sm750fb/sm750.c
Removing drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h
CONFLICT (modify/delete): drivers/staging/media/dt3155v4l/dt3155v4l.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/dt3155v4l/dt3155v4l.c left in tree.
Auto-merging drivers/staging/media/bcm2048/radio-bcm2048.c
Removing drivers/staging/i2o/pci.c
Removing drivers/staging/i2o/memory.c
Removing drivers/staging/i2o/iop.c
Removing drivers/staging/i2o/i2o_scsi.c
Removing drivers/staging/i2o/i2o_proc.c
Removing drivers/staging/i2o/i2o_config.c
Removing drivers/staging/i2o/i2o_block.h
Removing drivers/staging/i2o/i2o_block.c
Removing drivers/staging/i2o/i2o.h
Removing drivers/staging/i2o/exec-osm.c
Removing drivers/staging/i2o/driver.c
Removing drivers/staging/i2o/device.c
Removing drivers/staging/i2o/debug.c
Removing drivers/staging/i2o/core.h
Removing drivers/staging/i2o/config-osm.c
Removing drivers/staging/i2o/bus-osm.c
Removing drivers/staging/i2o/README.ioctl
Removing drivers/staging/i2o/README
Removing drivers/staging/i2o/Makefile
Removing drivers/staging/i2o/Kconfig
Auto-merging drivers/iio/magnetometer/st_magn_core.c
Auto-merging drivers/iio/common/st_sensors/st_sensors_core.c
Auto-merging drivers/iio/accel/mma9553.c
Auto-merging drivers/iio/accel/mma9551_core.c
Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
Automatic merge failed; fix conflicts and then commit the result.
$ git rm -f drivers/staging/media/dt3155v4l/dt3155v4l.c
drivers/staging/media/dt3155v4l/dt3155v4l.c: needs merge
rm 'drivers/staging/media/dt3155v4l/dt3155v4l.c'
$ git commit -v -a
[master b1761b9aeb4e] Merge remote-tracking branch 'staging/staging-next'
$ git diff -M --stat --summary HEAD^..
Documentation/ABI/testing/sysfs-bus-iio | 11 +
.../devicetree/bindings/iio/st-sensors.txt | 1 +
.../bindings/iio/temperature/mlx90614.txt | 24 +
.../devicetree/bindings/vendor-prefixes.txt | 1 +
drivers/iio/accel/kxcjk-1013.c | 42 +-
drivers/iio/accel/mma9551_core.c | 8 +-
drivers/iio/accel/mma9551_core.h | 2 +-
drivers/iio/accel/mma9553.c | 148 +-
drivers/iio/adc/ti_am335x_adc.c | 29 +-
drivers/iio/common/st_sensors/st_sensors_core.c | 23 +-
drivers/iio/common/st_sensors/st_sensors_trigger.c | 4 +-
drivers/iio/industrialio-core.c | 1 +
drivers/iio/light/Kconfig | 3 +-
drivers/iio/light/ltr501.c | 1233 +++++++++-
drivers/iio/light/tsl2563.c | 36 +-
drivers/iio/light/tsl4531.c | 10 +-
drivers/iio/magnetometer/st_magn.h | 1 +
drivers/iio/magnetometer/st_magn_core.c | 116 +
drivers/iio/magnetometer/st_magn_i2c.c | 5 +
drivers/iio/proximity/sx9500.c | 457 +++-
drivers/iio/temperature/mlx90614.c | 355 ++-
drivers/iio/temperature/tmp006.c | 6 +-
drivers/staging/Kconfig | 2 -
drivers/staging/Makefile | 3 +-
drivers/staging/android/ion/ion_chunk_heap.c | 2 +-
drivers/staging/android/ion/ion_priv.h | 6 +-
drivers/staging/android/ion/ion_test.c | 20 +-
drivers/staging/android/ion/tegra/tegra_ion.c | 1 +
drivers/staging/android/lowmemorykiller.c | 17 +-
drivers/staging/android/uapi/ion.h | 2 +-
drivers/staging/comedi/comedi_fops.c | 43 +-
drivers/staging/comedi/comedi_internal.h | 1 +
drivers/staging/comedi/comedidev.h | 18 +-
drivers/staging/comedi/drivers.c | 2 +-
.../staging/comedi/drivers/amplc_dio200_common.c | 6 +-
drivers/staging/comedi/drivers/cb_pcimdda.c | 6 +-
drivers/staging/comedi/drivers/comedi_bond.c | 3 +-
drivers/staging/comedi/drivers/daqboard2000.c | 196 +-
drivers/staging/comedi/drivers/das16m1.c | 4 +-
drivers/staging/comedi/drivers/gsc_hpdi.c | 191 +-
drivers/staging/comedi/drivers/mite.c | 110 +-
drivers/staging/comedi/drivers/mite.h | 88 +-
drivers/staging/comedi/drivers/ni_mio_common.c | 2408 +++++++++-----------
drivers/staging/comedi/drivers/ni_pcimio.c | 17 +-
drivers/staging/comedi/drivers/ni_stc.h | 2237 ++++++++----------
drivers/staging/comedi/drivers/serial2002.c | 2 +-
drivers/staging/dgap/dgap.c | 131 +-
drivers/staging/dgnc/TODO | 6 +-
drivers/staging/dgnc/dgnc_cls.c | 4 +-
drivers/staging/dgnc/dgnc_neo.c | 4 +-
drivers/staging/dgnc/dgnc_tty.c | 106 +-
drivers/staging/emxx_udc/emxx_udc.c | 39 +-
drivers/staging/fbtft/Kconfig | 2 +-
drivers/staging/fbtft/fb_st7735r.c | 8 +-
drivers/staging/fbtft/fb_tls8204.c | 1 +
drivers/staging/fbtft/fbtft-bus.c | 8 +-
drivers/staging/fbtft/fbtft-core.c | 7 +-
drivers/staging/fbtft/internal.h | 2 +-
drivers/staging/fsl-mc/bus/mc-bus.c | 1 -
drivers/staging/fwserial/dma_fifo.c | 2 +-
drivers/staging/fwserial/fwserial.h | 2 +-
drivers/staging/i2o/Kconfig | 120 -
drivers/staging/i2o/Makefile | 16 -
drivers/staging/i2o/README | 98 -
drivers/staging/i2o/README.ioctl | 394 ----
drivers/staging/i2o/bus-osm.c | 177 --
drivers/staging/i2o/config-osm.c | 90 -
drivers/staging/i2o/core.h | 69 -
drivers/staging/i2o/debug.c | 473 ----
drivers/staging/i2o/device.c | 592 -----
drivers/staging/i2o/driver.c | 381 ----
drivers/staging/i2o/exec-osm.c | 612 -----
drivers/staging/i2o/i2o.h | 988 --------
drivers/staging/i2o/i2o_block.c | 1228 ----------
drivers/staging/i2o/i2o_block.h | 103 -
drivers/staging/i2o/i2o_config.c | 1162 ----------
drivers/staging/i2o/i2o_proc.c | 2049 -----------------
drivers/staging/i2o/i2o_scsi.c | 814 -------
drivers/staging/i2o/iop.c | 1255 ----------
drivers/staging/i2o/memory.c | 312 ---
drivers/staging/i2o/pci.c | 500 ----
drivers/staging/iio/Documentation/device.txt | 2 +-
drivers/staging/iio/adc/ad7606_par.c | 2 +-
drivers/staging/iio/iio_simple_dummy.h | 2 +-
drivers/staging/iio/iio_simple_dummy_events.c | 2 +
drivers/staging/iio/light/isl29018.c | 297 +--
drivers/staging/lustre/TODO | 2 +-
.../staging/lustre/include/linux/libcfs/libcfs.h | 4 +
drivers/staging/lustre/lustre/fid/fid_request.c | 10 +-
drivers/staging/lustre/lustre/fld/fld_cache.c | 16 +-
drivers/staging/lustre/lustre/fld/fld_request.c | 8 +-
.../staging/lustre/lustre/include/obd_support.h | 24 +-
drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 10 +-
drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 7 +-
drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 11 +-
drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 14 +-
drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 10 +-
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 12 +-
drivers/staging/lustre/lustre/libcfs/Makefile | 1 +
.../staging/lustre/lustre/libcfs/linux/linux-mem.c | 59 +
.../lustre/lustre/libcfs/linux/linux-tracefile.c | 9 +-
drivers/staging/lustre/lustre/llite/dcache.c | 6 +-
drivers/staging/lustre/lustre/llite/dir.c | 42 +-
drivers/staging/lustre/lustre/llite/file.c | 55 +-
drivers/staging/lustre/lustre/llite/llite_close.c | 6 +-
.../staging/lustre/lustre/llite/llite_internal.h | 4 -
drivers/staging/lustre/lustre/llite/llite_lib.c | 47 +-
drivers/staging/lustre/lustre/llite/llite_nfs.c | 2 +-
drivers/staging/lustre/lustre/llite/llite_rmtacl.c | 4 +-
drivers/staging/lustre/lustre/llite/lloop.c | 8 +-
drivers/staging/lustre/lustre/llite/namei.c | 2 +-
drivers/staging/lustre/lustre/llite/rw26.c | 20 -
drivers/staging/lustre/lustre/llite/statahead.c | 21 +-
drivers/staging/lustre/lustre/llite/xattr_cache.c | 6 +-
drivers/staging/lustre/lustre/lmv/lmv_intent.c | 4 +-
drivers/staging/lustre/lustre/lmv/lmv_obd.c | 30 +-
drivers/staging/lustre/lustre/lov/lov_dev.c | 19 +-
drivers/staging/lustre/lustre/lov/lov_io.c | 5 +-
drivers/staging/lustre/lustre/lov/lov_obd.c | 22 +-
drivers/staging/lustre/lustre/lov/lov_pool.c | 18 +-
drivers/staging/lustre/lustre/lov/lov_request.c | 35 +-
drivers/staging/lustre/lustre/lov/lovsub_dev.c | 4 +-
drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 6 +-
drivers/staging/lustre/lustre/mdc/mdc_locks.c | 2 +-
drivers/staging/lustre/lustre/mdc/mdc_request.c | 31 +-
drivers/staging/lustre/lustre/mgc/mgc_request.c | 20 +-
drivers/staging/lustre/lustre/obdclass/acl.c | 29 +-
drivers/staging/lustre/lustre/obdclass/capa.c | 4 +-
drivers/staging/lustre/lustre/obdclass/cl_io.c | 13 +-
drivers/staging/lustre/lustre/obdclass/cl_page.c | 20 +-
drivers/staging/lustre/lustre/obdclass/class_obd.c | 4 +-
drivers/staging/lustre/lustre/obdclass/genops.c | 45 +-
drivers/staging/lustre/lustre/obdclass/llog.c | 25 +-
drivers/staging/lustre/lustre/obdclass/llog_obd.c | 4 +-
.../lustre/lustre/obdclass/lprocfs_status.c | 14 +-
drivers/staging/lustre/lustre/obdclass/lu_object.c | 6 +-
.../lustre/lustre/obdclass/lustre_handles.c | 2 +-
.../staging/lustre/lustre/obdclass/lustre_peer.c | 6 +-
.../staging/lustre/lustre/obdclass/obd_config.c | 64 +-
drivers/staging/lustre/lustre/obdclass/obd_mount.c | 107 +-
.../staging/lustre/lustre/obdecho/echo_client.c | 44 +-
drivers/staging/lustre/lustre/osc/osc_dev.c | 4 +-
drivers/staging/lustre/lustre/osc/osc_request.c | 34 +-
drivers/staging/lustre/lustre/ptlrpc/client.c | 18 +-
drivers/staging/lustre/lustre/ptlrpc/connection.c | 6 +-
.../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 44 +-
drivers/staging/lustre/lustre/ptlrpc/nrs.c | 30 +-
drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 6 +-
drivers/staging/lustre/lustre/ptlrpc/pinger.c | 6 +-
drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 14 +-
drivers/staging/lustre/lustre/ptlrpc/sec.c | 2 +-
drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 17 +-
drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 16 +-
drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 11 +-
drivers/staging/lustre/lustre/ptlrpc/service.c | 96 +-
drivers/staging/media/bcm2048/radio-bcm2048.c | 4 +-
drivers/staging/octeon-usb/octeon-hcd.c | 16 +-
drivers/staging/octeon-usb/octeon-hcd.h | 2 +-
drivers/staging/octeon/ethernet-defines.h | 62 +-
drivers/staging/octeon/ethernet-mdio.c | 48 +-
drivers/staging/octeon/ethernet-mdio.h | 24 +-
drivers/staging/octeon/ethernet-mem.c | 30 +-
drivers/staging/octeon/ethernet-mem.h | 23 +-
drivers/staging/octeon/ethernet-rgmii.c | 306 +--
drivers/staging/octeon/ethernet-rx.c | 38 +-
drivers/staging/octeon/ethernet-rx.h | 24 +-
drivers/staging/octeon/ethernet-sgmii.c | 112 +-
drivers/staging/octeon/ethernet-spi.c | 237 +-
drivers/staging/octeon/ethernet-tx.c | 28 +-
drivers/staging/octeon/ethernet-tx.h | 23 +-
drivers/staging/octeon/ethernet-util.h | 23 +-
drivers/staging/octeon/ethernet-xaui.c | 114 +-
drivers/staging/octeon/ethernet.c | 115 +-
drivers/staging/octeon/octeon-ethernet.h | 35 +-
drivers/staging/panel/panel.c | 14 -
drivers/staging/rtl8188eu/core/rtw_ap.c | 2 +
drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 10 +-
drivers/staging/rtl8188eu/core/rtw_recv.c | 2 +
drivers/staging/rtl8188eu/include/ieee80211.h | 29 +-
drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 4 +-
drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 +-
drivers/staging/rtl8188eu/include/wifi.h | 77 -
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 8 +-
drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 2 +-
drivers/staging/rtl8188eu/os_dep/os_intfs.c | 77 +-
drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 5 +-
drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +-
drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 1496 ++++++------
drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h | 908 --------
drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 11 +-
drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 20 +-
drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 825 ++-----
drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 9 +
drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 2 +-
drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 9 +-
drivers/staging/rtl8192e/rtllib.h | 39 -
drivers/staging/rtl8192e/rtllib_debug.h | 3 +-
drivers/staging/rtl8192e/rtllib_rx.c | 23 +-
drivers/staging/rtl8192e/rtllib_softmac.c | 5 +-
drivers/staging/rtl8192u/ieee80211/ieee80211.h | 188 +-
.../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 10 +-
.../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 26 +-
drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 76 +-
.../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 32 +-
drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 14 +-
.../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 48 +-
drivers/staging/rtl8192u/r8192U_core.c | 26 +-
drivers/staging/rtl8192u/r8192U_dm.c | 2 +-
drivers/staging/rtl8712/ieee80211.h | 29 -
drivers/staging/rtl8712/rtl8712_xmit.c | 2 +-
drivers/staging/rtl8712/rtl871x_mp_phy_regdef.h | 2 +-
drivers/staging/rtl8723au/hal/HalPwrSeqCmd.c | 2 +-
drivers/staging/rtl8723au/hal/odm.c | 4 +-
drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 2 +-
drivers/staging/rtl8723au/hal/rtl8723a_phycfg.c | 2 +-
drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 4 +-
drivers/staging/rtl8723au/hal/rtl8723au_xmit.c | 2 +-
drivers/staging/rtl8723au/hal/usb_halinit.c | 2 +-
drivers/staging/rtl8723au/include/odm_debug.h | 2 +-
drivers/staging/rtl8723au/include/rtl8723a_hal.h | 2 +-
drivers/staging/rtl8723au/include/rtw_cmd.h | 2 +-
drivers/staging/rtl8723au/include/rtw_mlme.h | 10 +-
drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 2 +-
drivers/staging/rtl8723au/include/sta_info.h | 2 +-
drivers/staging/rts5208/rtsx.h | 25 +-
drivers/staging/sm750fb/TODO | 2 +-
drivers/staging/sm750fb/ddk750_chip.c | 4 +-
drivers/staging/sm750fb/ddk750_help.h | 2 +-
drivers/staging/sm750fb/ddk750_mode.c | 2 +-
drivers/staging/sm750fb/ddk750_reg.h | 4 +-
drivers/staging/sm750fb/ddk750_sii164.c | 4 +-
drivers/staging/sm750fb/readme | 8 +-
drivers/staging/sm750fb/sm750.c | 12 +-
drivers/staging/sm750fb/sm750_accel.c | 4 +-
drivers/staging/sm750fb/sm750_hw.h | 2 +-
drivers/staging/sm7xxfb/sm7xxfb.c | 228 +-
drivers/staging/unisys/Kconfig | 9 +-
drivers/staging/unisys/Makefile | 7 +-
.../include/channels/controlvmchannel.h | 272 +--
.../common-spar/include/channels/iochannel.h | 381 +---
.../common-spar/include/channels/vbuschannel.h | 2 +-
drivers/staging/unisys/include/guestlinuxdebug.h | 2 +-
drivers/staging/unisys/include/periodic_work.h | 10 +-
drivers/staging/unisys/include/procobjecttree.h | 47 -
drivers/staging/unisys/include/sparstop.h | 1 -
drivers/staging/unisys/include/timskmod.h | 153 --
drivers/staging/unisys/include/uisutils.h | 5 -
drivers/staging/unisys/include/visorbus.h | 201 ++
drivers/staging/unisys/uislib/Kconfig | 10 -
drivers/staging/unisys/uislib/Makefile | 12 -
drivers/staging/unisys/uislib/uislib.c | 1372 -----------
drivers/staging/unisys/uislib/uisqueue.c | 322 ---
drivers/staging/unisys/uislib/uisthread.c | 69 -
drivers/staging/unisys/uislib/uisutils.c | 137 --
drivers/staging/unisys/virthba/Kconfig | 13 -
drivers/staging/unisys/virthba/Makefile | 12 -
drivers/staging/unisys/virthba/virthba.c | 1572 -------------
drivers/staging/unisys/virthba/virthba.h | 27 -
drivers/staging/unisys/virtpci/Kconfig | 10 -
drivers/staging/unisys/virtpci/Makefile | 10 -
drivers/staging/unisys/virtpci/virtpci.c | 1394 -----------
drivers/staging/unisys/virtpci/virtpci.h | 103 -
drivers/staging/unisys/visorbus/Kconfig | 9 +
drivers/staging/unisys/visorbus/Makefile | 15 +
.../unisys/{visorutil => visorbus}/periodic_work.c | 57 +-
drivers/staging/unisys/visorbus/visorbus_main.c | 2137 +++++++++++++++++
.../visorchipset.h => visorbus/visorbus_private.h} | 127 +-
.../visorchannel.c} | 429 ++--
.../visorchipset.c} | 1101 +++++----
drivers/staging/unisys/visorchannel/globals.h | 2 -
drivers/staging/unisys/visorchannel/visorchannel.h | 76 -
drivers/staging/unisys/visorchipset/Kconfig | 11 -
drivers/staging/unisys/visorchipset/Makefile | 15 -
drivers/staging/unisys/visorchipset/file.c | 160 --
drivers/staging/unisys/visorchipset/file.h | 27 -
drivers/staging/unisys/visorchipset/globals.h | 42 -
drivers/staging/unisys/visorchipset/parser.c | 430 ----
drivers/staging/unisys/visorchipset/parser.h | 46 -
.../unisys/visorchipset/visorchipset_umode.h | 35 -
drivers/staging/unisys/visorutil/Kconfig | 9 -
drivers/staging/unisys/visorutil/Makefile | 9 -
drivers/staging/unisys/visorutil/charqueue.c | 127 --
drivers/staging/unisys/visorutil/charqueue.h | 37 -
drivers/staging/unisys/visorutil/memregion.h | 43 -
.../staging/unisys/visorutil/memregion_direct.c | 207 --
drivers/staging/unisys/visorutil/visorkmodutils.c | 71 -
drivers/staging/vt6655/device_main.c | 21 +-
drivers/staging/vt6655/mac.c | 49 +-
drivers/staging/vt6655/rxtx.c | 2 +-
include/linux/iio/iio.h | 1 +
tools/Makefile | 7 +-
291 files changed, 10723 insertions(+), 27639 deletions(-)
create mode 100644 Documentation/devicetree/bindings/iio/temperature/mlx90614.txt
delete mode 100644 drivers/staging/i2o/Kconfig
delete mode 100644 drivers/staging/i2o/Makefile
delete mode 100644 drivers/staging/i2o/README
delete mode 100644 drivers/staging/i2o/README.ioctl
delete mode 100644 drivers/staging/i2o/bus-osm.c
delete mode 100644 drivers/staging/i2o/config-osm.c
delete mode 100644 drivers/staging/i2o/core.h
delete mode 100644 drivers/staging/i2o/debug.c
delete mode 100644 drivers/staging/i2o/device.c
delete mode 100644 drivers/staging/i2o/driver.c
delete mode 100644 drivers/staging/i2o/exec-osm.c
delete mode 100644 drivers/staging/i2o/i2o.h
delete mode 100644 drivers/staging/i2o/i2o_block.c
delete mode 100644 drivers/staging/i2o/i2o_block.h
delete mode 100644 drivers/staging/i2o/i2o_config.c
delete mode 100644 drivers/staging/i2o/i2o_proc.c
delete mode 100644 drivers/staging/i2o/i2o_scsi.c
delete mode 100644 drivers/staging/i2o/iop.c
delete mode 100644 drivers/staging/i2o/memory.c
delete mode 100644 drivers/staging/i2o/pci.c
create mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-mem.c
delete mode 100644 drivers/staging/rtl8192e/rtl8192e/r819xE_phyreg.h
delete mode 100644 drivers/staging/unisys/include/procobjecttree.h
delete mode 100644 drivers/staging/unisys/include/timskmod.h
create mode 100644 drivers/staging/unisys/include/visorbus.h
delete mode 100644 drivers/staging/unisys/uislib/Kconfig
delete mode 100644 drivers/staging/unisys/uislib/Makefile
delete mode 100644 drivers/staging/unisys/uislib/uislib.c
delete mode 100644 drivers/staging/unisys/uislib/uisqueue.c
delete mode 100644 drivers/staging/unisys/uislib/uisthread.c
delete mode 100644 drivers/staging/unisys/uislib/uisutils.c
delete mode 100644 drivers/staging/unisys/virthba/Kconfig
delete mode 100644 drivers/staging/unisys/virthba/Makefile
delete mode 100644 drivers/staging/unisys/virthba/virthba.c
delete mode 100644 drivers/staging/unisys/virthba/virthba.h
delete mode 100644 drivers/staging/unisys/virtpci/Kconfig
delete mode 100644 drivers/staging/unisys/virtpci/Makefile
delete mode 100644 drivers/staging/unisys/virtpci/virtpci.c
delete mode 100644 drivers/staging/unisys/virtpci/virtpci.h
create mode 100644 drivers/staging/unisys/visorbus/Kconfig
create mode 100644 drivers/staging/unisys/visorbus/Makefile
rename drivers/staging/unisys/{visorutil => visorbus}/periodic_work.c (84%)
create mode 100644 drivers/staging/unisys/visorbus/visorbus_main.c
rename drivers/staging/unisys/{visorchipset/visorchipset.h => visorbus/visorbus_private.h} (54%)
rename drivers/staging/unisys/{visorchannel/visorchannel_funcs.c => visorbus/visorchannel.c} (61%)
rename drivers/staging/unisys/{visorchipset/visorchipset_main.c => visorbus/visorchipset.c} (75%)
delete mode 100644 drivers/staging/unisys/visorchannel/visorchannel.h
delete mode 100644 drivers/staging/unisys/visorchipset/Kconfig
delete mode 100644 drivers/staging/unisys/visorchipset/Makefile
delete mode 100644 drivers/staging/unisys/visorchipset/file.c
delete mode 100644 drivers/staging/unisys/visorchipset/file.h
delete mode 100644 drivers/staging/unisys/visorchipset/globals.h
delete mode 100644 drivers/staging/unisys/visorchipset/parser.c
delete mode 100644 drivers/staging/unisys/visorchipset/parser.h
delete mode 100644 drivers/staging/unisys/visorchipset/visorchipset_umode.h
delete mode 100644 drivers/staging/unisys/visorutil/Kconfig
delete mode 100644 drivers/staging/unisys/visorutil/Makefile
delete mode 100644 drivers/staging/unisys/visorutil/charqueue.c
delete mode 100644 drivers/staging/unisys/visorutil/charqueue.h
delete mode 100644 drivers/staging/unisys/visorutil/memregion.h
delete mode 100644 drivers/staging/unisys/visorutil/memregion_direct.c
delete mode 100644 drivers/staging/unisys/visorutil/visorkmodutils.c
Merging char-misc/char-misc-next (5ebe6afaf005 Linux 4.1-rc2)
$ git merge char-misc/char-misc-next
Already up-to-date.
Merging extcon/extcon-next (1ebabdaaf64a extcon: Remove the optional name of extcon device)
$ git merge extcon/extcon-next
Merge made by the 'recursive' strategy.
Documentation/devicetree/bindings/mfd/arizona.txt | 6 +
drivers/extcon/Kconfig | 25 +-
drivers/extcon/Makefile | 1 +
drivers/extcon/extcon-adc-jack.c | 13 -
drivers/extcon/extcon-arizona.c | 50 ++-
drivers/extcon/extcon-axp288.c | 385 ++++++++++++++++++++++
drivers/extcon/extcon-gpio.c | 1 -
drivers/extcon/extcon-max14577.c | 21 +-
drivers/extcon/extcon-max77693.c | 67 ++--
drivers/extcon/extcon-max77843.c | 43 +--
drivers/extcon/extcon-max8997.c | 11 +-
drivers/extcon/extcon-palmas.c | 1 -
drivers/extcon/extcon-rt8973a.c | 23 +-
drivers/extcon/extcon-sm5502.c | 1 -
drivers/extcon/extcon-usb-gpio.c | 1 +
drivers/extcon/extcon.c | 27 +-
include/dt-bindings/mfd/arizona.h | 4 +
include/linux/extcon.h | 11 +-
include/linux/mfd/arizona/pdata.h | 3 +
include/linux/mfd/axp20x.h | 5 +
20 files changed, 530 insertions(+), 169 deletions(-)
create mode 100644 drivers/extcon/extcon-axp288.c
Merging kdbus/kdbus (9fb9cd0f4434 kdbus: avoid the use of struct timespec)
$ git merge kdbus/kdbus
Resolved 'Documentation/Makefile' using previous resolution.
Auto-merging tools/testing/selftests/Makefile
Auto-merging init/Kconfig
Auto-merging include/uapi/linux/magic.h
Auto-merging include/uapi/linux/Kbuild
Auto-merging Makefile
Auto-merging MAINTAINERS
Auto-merging Documentation/ioctl/ioctl-number.txt
Auto-merging Documentation/Makefile
CONFLICT (content): Merge conflict in Documentation/Makefile
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 161baec0bca2] Merge remote-tracking branch 'kdbus/kdbus'
$ git diff -M --stat --summary HEAD^..
Documentation/Makefile | 2 +-
Documentation/ioctl/ioctl-number.txt | 1 +
Documentation/kdbus/.gitignore | 2 +
Documentation/kdbus/Makefile | 40 +
Documentation/kdbus/kdbus.bus.xml | 359 ++++
Documentation/kdbus/kdbus.connection.xml | 1250 ++++++++++++
Documentation/kdbus/kdbus.endpoint.xml | 429 ++++
Documentation/kdbus/kdbus.fs.xml | 124 ++
Documentation/kdbus/kdbus.item.xml | 839 ++++++++
Documentation/kdbus/kdbus.match.xml | 555 ++++++
Documentation/kdbus/kdbus.message.xml | 1276 ++++++++++++
Documentation/kdbus/kdbus.name.xml | 711 +++++++
Documentation/kdbus/kdbus.policy.xml | 406 ++++
Documentation/kdbus/kdbus.pool.xml | 326 +++
Documentation/kdbus/kdbus.xml | 1012 ++++++++++
Documentation/kdbus/stylesheet.xsl | 16 +
MAINTAINERS | 13 +
Makefile | 1 +
include/uapi/linux/Kbuild | 1 +
include/uapi/linux/kdbus.h | 979 +++++++++
include/uapi/linux/magic.h | 2 +
init/Kconfig | 13 +
ipc/Makefile | 2 +-
ipc/kdbus/Makefile | 22 +
ipc/kdbus/bus.c | 560 ++++++
ipc/kdbus/bus.h | 101 +
ipc/kdbus/connection.c | 2214 +++++++++++++++++++++
ipc/kdbus/connection.h | 257 +++
ipc/kdbus/domain.c | 296 +++
ipc/kdbus/domain.h | 77 +
ipc/kdbus/endpoint.c | 275 +++
ipc/kdbus/endpoint.h | 67 +
ipc/kdbus/fs.c | 510 +++++
ipc/kdbus/fs.h | 28 +
ipc/kdbus/handle.c | 617 ++++++
ipc/kdbus/handle.h | 85 +
ipc/kdbus/item.c | 339 ++++
ipc/kdbus/item.h | 64 +
ipc/kdbus/limits.h | 64 +
ipc/kdbus/main.c | 125 ++
ipc/kdbus/match.c | 559 ++++++
ipc/kdbus/match.h | 35 +
ipc/kdbus/message.c | 616 ++++++
ipc/kdbus/message.h | 133 ++
ipc/kdbus/metadata.c | 1159 +++++++++++
ipc/kdbus/metadata.h | 57 +
ipc/kdbus/names.c | 772 +++++++
ipc/kdbus/names.h | 74 +
ipc/kdbus/node.c | 910 +++++++++
ipc/kdbus/node.h | 84 +
ipc/kdbus/notify.c | 248 +++
ipc/kdbus/notify.h | 30 +
ipc/kdbus/policy.c | 489 +++++
ipc/kdbus/policy.h | 51 +
ipc/kdbus/pool.c | 728 +++++++
ipc/kdbus/pool.h | 46 +
ipc/kdbus/queue.c | 678 +++++++
ipc/kdbus/queue.h | 92 +
ipc/kdbus/reply.c | 257 +++
ipc/kdbus/reply.h | 68 +
ipc/kdbus/util.c | 201 ++
ipc/kdbus/util.h | 74 +
samples/Kconfig | 7 +
samples/Makefile | 3 +-
samples/kdbus/.gitignore | 1 +
samples/kdbus/Makefile | 9 +
samples/kdbus/kdbus-api.h | 114 ++
samples/kdbus/kdbus-workers.c | 1326 ++++++++++++
tools/testing/selftests/Makefile | 1 +
tools/testing/selftests/kdbus/.gitignore | 1 +
tools/testing/selftests/kdbus/Makefile | 48 +
tools/testing/selftests/kdbus/kdbus-enum.c | 94 +
tools/testing/selftests/kdbus/kdbus-enum.h | 14 +
tools/testing/selftests/kdbus/kdbus-test.c | 923 +++++++++
tools/testing/selftests/kdbus/kdbus-test.h | 85 +
tools/testing/selftests/kdbus/kdbus-util.c | 1615 +++++++++++++++
tools/testing/selftests/kdbus/kdbus-util.h | 222 +++
tools/testing/selftests/kdbus/test-activator.c | 318 +++
tools/testing/selftests/kdbus/test-attach-flags.c | 750 +++++++
tools/testing/selftests/kdbus/test-benchmark.c | 451 +++++
tools/testing/selftests/kdbus/test-bus.c | 175 ++
tools/testing/selftests/kdbus/test-chat.c | 122 ++
tools/testing/selftests/kdbus/test-connection.c | 616 ++++++
tools/testing/selftests/kdbus/test-daemon.c | 65 +
tools/testing/selftests/kdbus/test-endpoint.c | 341 ++++
tools/testing/selftests/kdbus/test-fd.c | 789 ++++++++
tools/testing/selftests/kdbus/test-free.c | 64 +
tools/testing/selftests/kdbus/test-match.c | 441 ++++
tools/testing/selftests/kdbus/test-message.c | 731 +++++++
tools/testing/selftests/kdbus/test-metadata-ns.c | 506 +++++
tools/testing/selftests/kdbus/test-monitor.c | 176 ++
tools/testing/selftests/kdbus/test-names.c | 194 ++
tools/testing/selftests/kdbus/test-policy-ns.c | 632 ++++++
tools/testing/selftests/kdbus/test-policy-priv.c | 1269 ++++++++++++
tools/testing/selftests/kdbus/test-policy.c | 80 +
tools/testing/selftests/kdbus/test-sync.c | 369 ++++
tools/testing/selftests/kdbus/test-timeout.c | 99 +
97 files changed, 34069 insertions(+), 3 deletions(-)
create mode 100644 Documentation/kdbus/.gitignore
create mode 100644 Documentation/kdbus/Makefile
create mode 100644 Documentation/kdbus/kdbus.bus.xml
create mode 100644 Documentation/kdbus/kdbus.connection.xml
create mode 100644 Documentation/kdbus/kdbus.endpoint.xml
create mode 100644 Documentation/kdbus/kdbus.fs.xml
create mode 100644 Documentation/kdbus/kdbus.item.xml
create mode 100644 Documentation/kdbus/kdbus.match.xml
create mode 100644 Documentation/kdbus/kdbus.message.xml
create mode 100644 Documentation/kdbus/kdbus.name.xml
create mode 100644 Documentation/kdbus/kdbus.policy.xml
create mode 100644 Documentation/kdbus/kdbus.pool.xml
create mode 100644 Documentation/kdbus/kdbus.xml
create mode 100644 Documentation/kdbus/stylesheet.xsl
create mode 100644 include/uapi/linux/kdbus.h
create mode 100644 ipc/kdbus/Makefile
create mode 100644 ipc/kdbus/bus.c
create mode 100644 ipc/kdbus/bus.h
create mode 100644 ipc/kdbus/connection.c
create mode 100644 ipc/kdbus/connection.h
create mode 100644 ipc/kdbus/domain.c
create mode 100644 ipc/kdbus/domain.h
create mode 100644 ipc/kdbus/endpoint.c
create mode 100644 ipc/kdbus/endpoint.h
create mode 100644 ipc/kdbus/fs.c
create mode 100644 ipc/kdbus/fs.h
create mode 100644 ipc/kdbus/handle.c
create mode 100644 ipc/kdbus/handle.h
create mode 100644 ipc/kdbus/item.c
create mode 100644 ipc/kdbus/item.h
create mode 100644 ipc/kdbus/limits.h
create mode 100644 ipc/kdbus/main.c
create mode 100644 ipc/kdbus/match.c
create mode 100644 ipc/kdbus/match.h
create mode 100644 ipc/kdbus/message.c
create mode 100644 ipc/kdbus/message.h
create mode 100644 ipc/kdbus/metadata.c
create mode 100644 ipc/kdbus/metadata.h
create mode 100644 ipc/kdbus/names.c
create mode 100644 ipc/kdbus/names.h
create mode 100644 ipc/kdbus/node.c
create mode 100644 ipc/kdbus/node.h
create mode 100644 ipc/kdbus/notify.c
create mode 100644 ipc/kdbus/notify.h
create mode 100644 ipc/kdbus/policy.c
create mode 100644 ipc/kdbus/policy.h
create mode 100644 ipc/kdbus/pool.c
create mode 100644 ipc/kdbus/pool.h
create mode 100644 ipc/kdbus/queue.c
create mode 100644 ipc/kdbus/queue.h
create mode 100644 ipc/kdbus/reply.c
create mode 100644 ipc/kdbus/reply.h
create mode 100644 ipc/kdbus/util.c
create mode 100644 ipc/kdbus/util.h
create mode 100644 samples/kdbus/.gitignore
create mode 100644 samples/kdbus/Makefile
create mode 100644 samples/kdbus/kdbus-api.h
create mode 100644 samples/kdbus/kdbus-workers.c
create mode 100644 tools/testing/selftests/kdbus/.gitignore
create mode 100644 tools/testing/selftests/kdbus/Makefile
create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.c
create mode 100644 tools/testing/selftests/kdbus/kdbus-enum.h
create mode 100644 tools/testing/selftests/kdbus/kdbus-test.c
create mode 100644 tools/testing/selftests/kdbus/kdbus-test.h
create mode 100644 tools/testing/selftests/kdbus/kdbus-util.c
create mode 100644 tools/testing/selftests/kdbus/kdbus-util.h
create mode 100644 tools/testing/selftests/kdbus/test-activator.c
create mode 100644 tools/testing/selftests/kdbus/test-attach-flags.c
create mode 100644 tools/testing/selftests/kdbus/test-benchmark.c
create mode 100644 tools/testing/selftests/kdbus/test-bus.c
create mode 100644 tools/testing/selftests/kdbus/test-chat.c
create mode 100644 tools/testing/selftests/kdbus/test-connection.c
create mode 100644 tools/testing/selftests/kdbus/test-daemon.c
create mode 100644 tools/testing/selftests/kdbus/test-endpoint.c
create mode 100644 tools/testing/selftests/kdbus/test-fd.c
create mode 100644 tools/testing/selftests/kdbus/test-free.c
create mode 100644 tools/testing/selftests/kdbus/test-match.c
create mode 100644 tools/testing/selftests/kdbus/test-message.c
create mode 100644 tools/testing/selftests/kdbus/test-metadata-ns.c
create mode 100644 tools/testing/selftests/kdbus/test-monitor.c
create mode 100644 tools/testing/selftests/kdbus/test-names.c
create mode 100644 tools/testing/selftests/kdbus/test-policy-ns.c
create mode 100644 tools/testing/selftests/kdbus/test-policy-priv.c
create mode 100644 tools/testing/selftests/kdbus/test-policy.c
create mode 100644 tools/testing/selftests/kdbus/test-sync.c
create mode 100644 tools/testing/selftests/kdbus/test-timeout.c
Merging cgroup/for-next (d0f702e648dc cgroup: fix some comment typos)
$ git merge cgroup/for-next
Merge made by the 'recursive' strategy.
kernel/cgroup.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Merging scsi/for-next (8b2564ec7410 lpfc: Fix breakage on big endian kernels)
$ git merge scsi/for-next
Merge made by the 'recursive' strategy.
drivers/scsi/lpfc/lpfc_scsi.c | 41 +++++++++++++++++++++--------------------
drivers/scsi/storvsc_drv.c | 3 +--
2 files changed, 22 insertions(+), 22 deletions(-)
Merging target-updates/for-next (3215c948d2d7 target: Use kfree_rcu instead of target_lun_callrcu)
$ git merge target-updates/for-next
Removing include/target/target_core_backend_configfs.h
Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c
Merge made by the 'recursive' strategy.
Documentation/target/tcm_mod_builder.py | 277 +------
Documentation/target/tcm_mod_builder.txt | 4 +-
Documentation/target/tcmu-design.txt | 2 +-
drivers/infiniband/ulp/isert/ib_isert.c | 6 +-
drivers/infiniband/ulp/srpt/ib_srpt.c | 181 +----
drivers/infiniband/ulp/srpt/ib_srpt.h | 23 +-
drivers/scsi/qla2xxx/qla_target.c | 52 +-
drivers/scsi/qla2xxx/qla_target.h | 1 -
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 232 +-----
drivers/scsi/qla2xxx/tcm_qla2xxx.h | 6 +-
drivers/target/iscsi/iscsi_target.c | 38 +-
drivers/target/iscsi/iscsi_target_configfs.c | 136 +---
drivers/target/iscsi/iscsi_target_erl0.c | 53 --
drivers/target/iscsi/iscsi_target_erl0.h | 1 -
drivers/target/iscsi/iscsi_target_login.c | 58 +-
drivers/target/iscsi/iscsi_target_login.h | 1 -
drivers/target/iscsi/iscsi_target_parameters.c | 275 +------
drivers/target/iscsi/iscsi_target_parameters.h | 11 +-
drivers/target/iscsi/iscsi_target_tpg.c | 6 +-
drivers/target/iscsi/iscsi_target_util.c | 53 +-
drivers/target/iscsi/iscsi_target_util.h | 1 -
drivers/target/loopback/tcm_loop.c | 177 +----
drivers/target/loopback/tcm_loop.h | 9 -
drivers/target/sbp/sbp_target.c | 189 +----
drivers/target/sbp/sbp_target.h | 9 -
drivers/target/target_core_alua.c | 1 -
drivers/target/target_core_configfs.c | 760 ++++++++++++++++---
drivers/target/target_core_device.c | 972 +++++--------------------
drivers/target/target_core_fabric_configfs.c | 175 +++--
drivers/target/target_core_fabric_lib.c | 283 ++++---
drivers/target/target_core_file.c | 188 +----
drivers/target/target_core_file.h | 6 -
drivers/target/target_core_hba.c | 97 +--
drivers/target/target_core_iblock.c | 54 +-
drivers/target/target_core_internal.h | 47 +-
drivers/target/target_core_pr.c | 300 ++++----
drivers/target/target_core_pscsi.c | 42 +-
drivers/target/target_core_rd.c | 78 +-
drivers/target/target_core_sbc.c | 230 +++---
drivers/target/target_core_spc.c | 41 +-
drivers/target/target_core_stat.c | 181 +++--
drivers/target/target_core_tmr.c | 24 +-
drivers/target/target_core_tpg.c | 438 +++--------
drivers/target/target_core_transport.c | 161 ++--
drivers/target/target_core_ua.c | 52 +-
drivers/target/target_core_user.c | 268 +++----
drivers/target/target_core_xcopy.c | 23 +-
drivers/target/tcm_fc/tcm_fc.h | 3 +-
drivers/target/tcm_fc/tfc_cmd.c | 11 +-
drivers/target/tcm_fc/tfc_conf.c | 109 +--
drivers/target/tcm_fc/tfc_io.c | 1 -
drivers/target/tcm_fc/tfc_sess.c | 1 -
drivers/usb/gadget/legacy/tcm_usb_gadget.c | 191 +----
drivers/usb/gadget/legacy/tcm_usb_gadget.h | 11 -
drivers/vhost/scsi.c | 225 +-----
drivers/xen/xen-scsiback.c | 187 +----
include/linux/crc-t10dif.h | 1 +
include/target/iscsi/iscsi_target_core.h | 12 +-
include/target/target_core_backend.h | 64 +-
include/target/target_core_backend_configfs.h | 118 ---
include/target/target_core_base.h | 68 +-
include/target/target_core_configfs.h | 59 +-
include/target/target_core_fabric.h | 64 +-
lib/crc-t10dif.c | 12 +-
64 files changed, 2266 insertions(+), 5093 deletions(-)
delete mode 100644 include/target/target_core_backend_configfs.h
$ git reset --hard HEAD^
HEAD is now at 441e598d5485 Merge remote-tracking branch 'scsi/for-next'
Merging next-20150511 version of target-updates
$ git merge -m next-20150511/target-updates b2e965f1fc28ba4c15e409be7a4daea6450b7d2f
Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c
Merge made by the 'recursive' strategy.
Documentation/target/tcm_mod_builder.py | 277 +-----------------------
Documentation/target/tcm_mod_builder.txt | 4 +-
Documentation/target/tcmu-design.txt | 2 +-
drivers/infiniband/ulp/isert/ib_isert.c | 6 +-
drivers/infiniband/ulp/srpt/ib_srpt.c | 181 +++-------------
drivers/infiniband/ulp/srpt/ib_srpt.h | 23 +-
drivers/scsi/qla2xxx/qla_target.c | 52 ++---
drivers/scsi/qla2xxx/qla_target.h | 1 -
drivers/scsi/qla2xxx/tcm_qla2xxx.c | 232 ++------------------
drivers/scsi/qla2xxx/tcm_qla2xxx.h | 6 +-
drivers/target/iscsi/iscsi_target.c | 38 ++--
drivers/target/iscsi/iscsi_target_configfs.c | 136 +++---------
drivers/target/iscsi/iscsi_target_erl0.c | 53 -----
drivers/target/iscsi/iscsi_target_erl0.h | 1 -
drivers/target/iscsi/iscsi_target_login.c | 58 +----
drivers/target/iscsi/iscsi_target_login.h | 1 -
drivers/target/iscsi/iscsi_target_parameters.c | 275 +-----------------------
drivers/target/iscsi/iscsi_target_parameters.h | 11 +-
drivers/target/iscsi/iscsi_target_tpg.c | 4 +-
drivers/target/iscsi/iscsi_target_util.c | 53 +----
drivers/target/iscsi/iscsi_target_util.h | 1 -
drivers/target/loopback/tcm_loop.c | 177 +---------------
drivers/target/loopback/tcm_loop.h | 9 -
drivers/target/sbp/sbp_target.c | 173 +--------------
drivers/target/sbp/sbp_target.h | 9 -
drivers/target/target_core_alua.c | 1 -
drivers/target/target_core_configfs.c | 97 +++------
drivers/target/target_core_device.c | 32 +--
drivers/target/target_core_fabric_configfs.c | 102 ++++-----
drivers/target/target_core_fabric_lib.c | 283 ++++++++++++-------------
drivers/target/target_core_file.c | 136 +++---------
drivers/target/target_core_file.h | 6 -
drivers/target/target_core_hba.c | 1 -
drivers/target/target_core_internal.h | 17 +-
drivers/target/target_core_pr.c | 90 +++-----
drivers/target/target_core_rd.c | 20 +-
drivers/target/target_core_sbc.c | 230 +++++++++-----------
drivers/target/target_core_spc.c | 24 +--
drivers/target/target_core_stat.c | 1 -
drivers/target/target_core_tmr.c | 24 +--
drivers/target/target_core_tpg.c | 206 +++++++-----------
drivers/target/target_core_transport.c | 139 ++++++------
drivers/target/target_core_ua.c | 1 -
drivers/target/target_core_user.c | 221 +++++++++++--------
drivers/target/target_core_xcopy.c | 23 +-
drivers/target/tcm_fc/tcm_fc.h | 3 +-
drivers/target/tcm_fc/tfc_cmd.c | 11 +-
drivers/target/tcm_fc/tfc_conf.c | 105 ++-------
drivers/target/tcm_fc/tfc_io.c | 1 -
drivers/target/tcm_fc/tfc_sess.c | 1 -
drivers/usb/gadget/legacy/tcm_usb_gadget.c | 191 ++---------------
drivers/usb/gadget/legacy/tcm_usb_gadget.h | 11 -
drivers/vhost/scsi.c | 225 +-------------------
drivers/xen/xen-scsiback.c | 160 +-------------
include/linux/crc-t10dif.h | 1 +
include/target/iscsi/iscsi_target_core.h | 12 +-
include/target/target_core_backend.h | 8 +-
include/target/target_core_base.h | 26 +--
include/target/target_core_configfs.h | 59 ++----
include/target/target_core_fabric.h | 63 +-----
lib/crc-t10dif.c | 12 +-
61 files changed, 973 insertions(+), 3353 deletions(-)
Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2)
$ git merge target-merge/for-next-merge
Already up-to-date.
Merging pinctrl/for-next (1050c8f7b3f8 Merge branch 'devel' into for-next)
$ git merge pinctrl/for-next
Merge made by the 'recursive' strategy.
.../bindings/pinctrl/img,pistachio-pinctrl.txt | 217 +++
.../bindings/pinctrl/nxp,lpc1850-scu.txt | 57 +
.../bindings/pinctrl/renesas,pfc-pinctrl.txt | 3 +-
.../bindings/pinctrl/xlnx,zynq-pinctrl.txt | 7 +-
Documentation/pinctrl.txt | 11 +
drivers/gpio/gpio-bcm-kona.c | 2 +-
drivers/gpio/gpio-em.c | 2 +-
drivers/gpio/gpio-grgpio.c | 2 +-
drivers/gpio/gpio-mpc8xxx.c | 2 +-
drivers/gpio/gpio-sa1100.c | 2 +-
drivers/gpio/gpio-sodaville.c | 2 +-
drivers/pinctrl/Kconfig | 17 +
drivers/pinctrl/Makefile | 2 +
drivers/pinctrl/core.c | 2 +-
drivers/pinctrl/freescale/Kconfig | 7 +
drivers/pinctrl/freescale/Makefile | 1 +
drivers/pinctrl/freescale/pinctrl-imx.c | 55 +-
drivers/pinctrl/freescale/pinctrl-imx7d.c | 385 +++++
drivers/pinctrl/intel/pinctrl-cherryview.c | 44 +
drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 263 ++++
drivers/pinctrl/nomadik/pinctrl-abx500.c | 1 +
drivers/pinctrl/nomadik/pinctrl-nomadik.c | 62 +-
drivers/pinctrl/pinctrl-adi2.c | 1 +
drivers/pinctrl/pinctrl-at91.c | 16 +
drivers/pinctrl/pinctrl-lpc18xx.c | 1151 +++++++++++++++
drivers/pinctrl/pinctrl-pistachio.c | 1504 ++++++++++++++++++++
drivers/pinctrl/pinctrl-single.c | 2 +-
drivers/pinctrl/pinctrl-zynq.c | 70 +-
drivers/pinctrl/pinmux.c | 13 +
drivers/pinctrl/sh-pfc/Kconfig | 5 +
drivers/pinctrl/sh-pfc/Makefile | 1 +
drivers/pinctrl/sh-pfc/core.c | 9 +-
drivers/pinctrl/sh-pfc/core.h | 1 +
drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 4 -
drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 2 +-
drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 23 +
include/linux/pinctrl/consumer.h | 2 +-
include/linux/pinctrl/pinmux.h | 4 +
38 files changed, 3886 insertions(+), 68 deletions(-)
create mode 100644 Documentation/devicetree/bindings/pinctrl/img,pistachio-pinctrl.txt
create mode 100644 Documentation/devicetree/bindings/pinctrl/nxp,lpc1850-scu.txt
create mode 100644 drivers/pinctrl/freescale/pinctrl-imx7d.c
create mode 100644 drivers/pinctrl/pinctrl-lpc18xx.c
create mode 100644 drivers/pinctrl/pinctrl-pistachio.c
Merging vhost/linux-next (f4aaa799cf9a tun, macvtap: higher order allocations for skbs)
$ git merge vhost/linux-next
Auto-merging include/linux/pci.h
Auto-merging drivers/pci/msi.c
Auto-merging drivers/net/tun.c
Auto-merging drivers/net/macvtap.c
Merge made by the 'recursive' strategy.
drivers/net/macvtap.c | 2 +-
drivers/net/tun.c | 2 +-
drivers/pci/msi.c | 4 ++--
drivers/pci/pci-driver.c | 2 --
include/linux/pci.h | 4 ----
5 files changed, 4 insertions(+), 10 deletions(-)
Merging remoteproc/for-next (172e6ab1caff remoteproc: fix various checkpatch warnings)
$ git merge remoteproc/for-next
Merge made by the 'recursive' strategy.
drivers/remoteproc/da8xx_remoteproc.c | 3 +--
drivers/remoteproc/remoteproc_core.c | 27 +++++++++------------------
drivers/remoteproc/remoteproc_internal.h | 2 +-
drivers/remoteproc/ste_modem_rproc.c | 4 ++--
4 files changed, 13 insertions(+), 23 deletions(-)
Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small)
$ git merge rpmsg/for-next
Already up-to-date.
Merging gpio/for-next (1ab4363bd9fb Merge branch 'devel' into for-next)
$ git merge gpio/for-next
Auto-merging include/linux/gpio/consumer.h
Auto-merging drivers/gpio/gpio-bcm-kona.c
Merge made by the 'recursive' strategy.
.../devicetree/bindings/gpio/brcm,brcmstb-gpio.txt | 65 +++
.../devicetree/bindings/gpio/gpio-xlp.txt | 47 ++
.../devicetree/bindings/gpio/nxp,lpc1850-gpio.txt | 39 ++
Documentation/gpio/gpio-legacy.txt | 9 -
Documentation/gpio/sysfs.txt | 8 -
Documentation/zh_CN/gpio.txt | 8 -
drivers/gpio/Kconfig | 21 +-
drivers/gpio/Makefile | 2 +
drivers/gpio/gpio-bcm-kona.c | 26 +-
drivers/gpio/gpio-crystalcove.c | 1 +
drivers/gpio/gpio-dln2.c | 1 -
drivers/gpio/gpio-generic.c | 22 +-
drivers/gpio/gpio-kempld.c | 2 +-
drivers/gpio/gpio-lpc18xx.c | 180 +++++++
drivers/gpio/gpio-max732x.c | 21 +-
drivers/gpio/gpio-moxart.c | 17 +-
drivers/gpio/gpio-mxc.c | 5 +-
drivers/gpio/gpio-mxs.c | 2 +-
drivers/gpio/gpio-omap.c | 24 +
drivers/gpio/gpio-ts5500.c | 2 +-
drivers/gpio/gpio-xgene-sb.c | 1 -
drivers/gpio/gpio-xilinx.c | 4 +-
drivers/gpio/gpio-xlp.c | 427 ++++++++++++++++
drivers/gpio/gpiolib-acpi.c | 29 ++
drivers/gpio/gpiolib-sysfs.c | 567 ++++++++++-----------
drivers/gpio/gpiolib.c | 35 +-
drivers/gpio/gpiolib.h | 16 +-
drivers/i2c/i2c-core.c | 12 +-
include/asm-generic/gpio.h | 5 -
include/linux/acpi.h | 7 +
include/linux/basic_mmio_gpio.h | 1 +
include/linux/gpio.h | 7 -
include/linux/gpio/consumer.h | 6 -
include/linux/gpio/driver.h | 13 +-
include/linux/platform_data/gpio-omap.h | 12 +-
35 files changed, 1216 insertions(+), 428 deletions(-)
create mode 100644 Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt
create mode 100644 Documentation/devicetree/bindings/gpio/gpio-xlp.txt
create mode 100644 Documentation/devicetree/bindings/gpio/nxp,lpc1850-gpio.txt
create mode 100644 drivers/gpio/gpio-lpc18xx.c
create mode 100644 drivers/gpio/gpio-xlp.c
Merging dma-mapping/dma-mapping-next (5ebe6afaf005 Linux 4.1-rc2)
$ git merge dma-mapping/dma-mapping-next
Already up-to-date.
Merging pwm/for-next (efb0de55b6a2 pwm: Add support to remove registered consumer lookup tables)
$ git merge pwm/for-next
Merge made by the 'recursive' strategy.
drivers/pwm/core.c | 17 +++++++++++++++++
include/linux/pwm.h | 5 +++++
2 files changed, 22 insertions(+)
Merging dma-buf/for-next (9abdffe286c1 dma-buf: add ref counting for module as exporter)
$ git merge dma-buf/for-next
Merge made by the 'recursive' strategy.
drivers/dma-buf/dma-buf.c | 10 +++++++++-
include/linux/dma-buf.h | 10 ++++++++--
2 files changed, 17 insertions(+), 3 deletions(-)
Merging userns/for-next (7e96c1b0e0f4 mnt: Fix fs_fully_visible to verify the root directory is visible)
$ git merge userns/for-next
Already up-to-date.
Merging ktest/for-next (7c2c49eceb79 ktest: Place quotes around item variable)
$ git merge ktest/for-next
Already up-to-date.
Merging clk/clk-next (beb7a2a97103 clk: axm55xx: Use %zu in pr_info for size_t)
$ git merge clk/clk-next
Auto-merging include/linux/clk-provider.h
Auto-merging drivers/clk/clk.c
Auto-merging drivers/clk/Makefile
Merge made by the 'recursive' strategy.
Documentation/clk.txt | 27 +-
.../bindings/arm/mediatek/mediatek,apmixedsys.txt | 23 +
.../bindings/arm/mediatek/mediatek,infracfg.txt | 30 +
.../bindings/arm/mediatek/mediatek,pericfg.txt | 30 +
.../bindings/arm/mediatek/mediatek,topckgen.txt | 23 +
.../devicetree/bindings/clock/clock-bindings.txt | 7 +-
.../devicetree/bindings/clock/emev2-clock.txt | 2 +-
.../devicetree/bindings/clock/silabs,si5351.txt | 4 +-
drivers/clk/Makefile | 1 +
drivers/clk/at91/pmc.c | 2 +-
drivers/clk/clk-asm9260.c | 2 +-
drivers/clk/clk-axm5516.c | 2 +-
drivers/clk/clk-cdce706.c | 4 +-
drivers/clk/clk-composite.c | 2 +-
drivers/clk/clk-ls1x.c | 6 +-
drivers/clk/clk-mux.c | 6 +-
drivers/clk/clk-si5351.c | 89 +-
drivers/clk/clk.c | 1933 ++++++++++----------
drivers/clk/mediatek/Makefile | 4 +
drivers/clk/mediatek/clk-gate.c | 137 ++
drivers/clk/mediatek/clk-gate.h | 49 +
drivers/clk/mediatek/clk-mt8135.c | 644 +++++++
drivers/clk/mediatek/clk-mt8173.c | 830 +++++++++
drivers/clk/mediatek/clk-mtk.c | 220 +++
drivers/clk/mediatek/clk-mtk.h | 169 ++
drivers/clk/mediatek/clk-pll.c | 332 ++++
drivers/clk/mediatek/reset.c | 97 +
drivers/clk/qcom/gcc-msm8916.c | 4 +-
drivers/clk/rockchip/clk-rk3188.c | 2 +-
drivers/clk/rockchip/clk-rk3288.c | 2 +-
drivers/clk/samsung/Makefile | 2 +-
drivers/clk/samsung/clk-exynos5260.c | 74 +-
drivers/clk/samsung/clk-exynos5420.c | 11 +-
drivers/clk/samsung/clk-exynos5433.c | 12 +-
drivers/clk/samsung/clk-s3c2410-dclk.c | 6 +-
drivers/clk/sirf/clk-common.c | 12 +-
drivers/clk/ux500/u8500_clk.c | 7 +-
drivers/clk/ux500/u8500_of_clk.c | 4 +-
include/dt-bindings/clock/mt8135-clk.h | 194 ++
include/dt-bindings/clock/mt8173-clk.h | 235 +++
.../dt-bindings/reset-controller/mt8135-resets.h | 64 +
.../dt-bindings/reset-controller/mt8173-resets.h | 63 +
include/linux/clk-provider.h | 10 +-
include/linux/platform_data/si5351.h | 4 -
44 files changed, 4251 insertions(+), 1130 deletions(-)
create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,apmixedsys.txt
create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,infracfg.txt
create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt
create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,topckgen.txt
create mode 100644 drivers/clk/mediatek/Makefile
create mode 100644 drivers/clk/mediatek/clk-gate.c
create mode 100644 drivers/clk/mediatek/clk-gate.h
create mode 100644 drivers/clk/mediatek/clk-mt8135.c
create mode 100644 drivers/clk/mediatek/clk-mt8173.c
create mode 100644 drivers/clk/mediatek/clk-mtk.c
create mode 100644 drivers/clk/mediatek/clk-mtk.h
create mode 100644 drivers/clk/mediatek/clk-pll.c
create mode 100644 drivers/clk/mediatek/reset.c
create mode 100644 include/dt-bindings/clock/mt8135-clk.h
create mode 100644 include/dt-bindings/clock/mt8173-clk.h
create mode 100644 include/dt-bindings/reset-controller/mt8135-resets.h
create mode 100644 include/dt-bindings/reset-controller/mt8173-resets.h
Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data)
$ git merge random/dev
Already up-to-date.
Merging aio/master (5f785de58873 aio: Skip timer for io_getevents if timeout=0)
$ git merge aio/master
Already up-to-date.
Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu)
$ git merge llvmlinux/for-next
Merge made by the 'recursive' strategy.
Merging kselftest/next (c7a8b87a95df selftests/futex: Add .gitignore)
$ git merge kselftest/next
Auto-merging tools/testing/selftests/Makefile
Merge made by the 'recursive' strategy.
tools/testing/selftests/Makefile | 1 +
tools/testing/selftests/exec/Makefile | 2 +-
tools/testing/selftests/ftrace/Makefile | 1 +
tools/testing/selftests/futex/Makefile | 29 ++
tools/testing/selftests/futex/README | 62 ++++
.../testing/selftests/futex/functional/.gitignore | 7 +
tools/testing/selftests/futex/functional/Makefile | 25 ++
.../selftests/futex/functional/futex_requeue_pi.c | 409 +++++++++++++++++++++
.../functional/futex_requeue_pi_mismatched_ops.c | 135 +++++++
.../functional/futex_requeue_pi_signal_restart.c | 223 +++++++++++
.../functional/futex_wait_private_mapped_file.c | 125 +++++++
.../futex/functional/futex_wait_timeout.c | 86 +++++
.../functional/futex_wait_uninitialized_heap.c | 124 +++++++
.../futex/functional/futex_wait_wouldblock.c | 79 ++++
tools/testing/selftests/futex/functional/run.sh | 79 ++++
tools/testing/selftests/futex/include/atomic.h | 83 +++++
tools/testing/selftests/futex/include/futextest.h | 266 ++++++++++++++
tools/testing/selftests/futex/include/logging.h | 153 ++++++++
tools/testing/selftests/futex/run.sh | 33 ++
tools/testing/selftests/kselftest.h | 17 +-
tools/testing/selftests/lib.mk | 3 +
tools/testing/selftests/mount/Makefile | 7 +-
tools/testing/selftests/timers/.gitignore | 18 +
.../testing/selftests/timers/alarmtimer-suspend.c | 10 +-
tools/testing/selftests/vm/Makefile | 7 +-
tools/testing/selftests/vm/compaction_test.c | 225 ++++++++++++
tools/testing/selftests/vm/run_vmtests | 12 +
27 files changed, 2210 insertions(+), 11 deletions(-)
create mode 100644 tools/testing/selftests/futex/Makefile
create mode 100644 tools/testing/selftests/futex/README
create mode 100644 tools/testing/selftests/futex/functional/.gitignore
create mode 100644 tools/testing/selftests/futex/functional/Makefile
create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi.c
create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi_mismatched_ops.c
create mode 100644 tools/testing/selftests/futex/functional/futex_requeue_pi_signal_restart.c
create mode 100644 tools/testing/selftests/futex/functional/futex_wait_private_mapped_file.c
create mode 100644 tools/testing/selftests/futex/functional/futex_wait_timeout.c
create mode 100644 tools/testing/selftests/futex/functional/futex_wait_uninitialized_heap.c
create mode 100644 tools/testing/selftests/futex/functional/futex_wait_wouldblock.c
create mode 100755 tools/testing/selftests/futex/functional/run.sh
create mode 100644 tools/testing/selftests/futex/include/atomic.h
create mode 100644 tools/testing/selftests/futex/include/futextest.h
create mode 100644 tools/testing/selftests/futex/include/logging.h
create mode 100755 tools/testing/selftests/futex/run.sh
create mode 100644 tools/testing/selftests/timers/.gitignore
create mode 100644 tools/testing/selftests/vm/compaction_test.c
Merging y2038/y2038 (ed8c2241c1ae coredump: Use 64bit time for unix time of coredump)
$ git merge y2038/y2038
Resolved 'drivers/staging/media/lirc/lirc_parallel.c' using previous resolution.
Auto-merging kernel/cpuset.c
Auto-merging fs/coredump.c
Auto-merging drivers/staging/media/lirc/lirc_serial.c
Auto-merging drivers/staging/media/lirc/lirc_sasem.c
Auto-merging drivers/staging/media/lirc/lirc_parallel.c
CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_parallel.c
Auto-merging drivers/staging/gdm72xx/gdm_sdio.c
Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 115d06c9b86c] Merge remote-tracking branch 'y2038/y2038'
$ git diff -M --stat --summary HEAD^..
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 4 +-
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 4 +-
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 4 +-
drivers/staging/ft1000/ft1000.h | 4 +-
drivers/staging/gdm72xx/gdm_sdio.c | 13 +++---
drivers/staging/gdm72xx/gdm_sdio.h | 4 +-
drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++----------
drivers/staging/media/lirc/lirc_sasem.c | 20 +++++-----
drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++----------------
fs/coredump.c | 8 ++--
kernel/cpuset.c | 12 ++++--
11 files changed, 68 insertions(+), 90 deletions(-)
Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux)
$ git merge luto-misc/next
Already up-to-date.
Merging access_once/linux-next (bc465aa9d045 Linux 4.0-rc5)
$ git merge access_once/linux-next
Already up-to-date.
Merging livepatching/for-next (4098cabe3262 Merge branch 'for-4.2/upstream' into for-next)
$ git merge livepatching/for-next
Auto-merging arch/x86/kernel/setup.c
Merge made by the 'recursive' strategy.
arch/x86/include/asm/livepatch.h | 1 +
arch/x86/include/asm/setup.h | 7 +++++++
arch/x86/kernel/machine_kexec_64.c | 3 ++-
arch/x86/kernel/setup.c | 2 +-
kernel/livepatch/core.c | 7 ++++---
5 files changed, 15 insertions(+), 5 deletions(-)
Merging coresight/next (48582dcacc6b coresight: fix typo in of_coresight.c)
$ git merge coresight/next
Merge made by the 'recursive' strategy.
.../devicetree/bindings/arm/coresight.txt | 13 ++-
drivers/hwtracing/coresight/coresight-etb10.c | 79 +++++++++------
drivers/hwtracing/coresight/coresight-etm.h | 4 +-
drivers/hwtracing/coresight/coresight-etm3x.c | 112 ++++++++++-----------
drivers/hwtracing/coresight/coresight-funnel.c | 61 +++++++----
drivers/hwtracing/coresight/coresight-replicator.c | 71 ++++++++++++-
drivers/hwtracing/coresight/coresight-tmc.c | 31 ++----
drivers/hwtracing/coresight/coresight-tpiu.c | 60 ++++++++---
drivers/hwtracing/coresight/of_coresight.c | 2 +-
9 files changed, 281 insertions(+), 152 deletions(-)
Merging rtc/rtc-next (529a4c385f04 rtc: mc13xxx: fix obfuscated and wrong format string)
$ git merge rtc/rtc-next
Auto-merging drivers/rtc/Makefile
Auto-merging drivers/rtc/Kconfig
Auto-merging drivers/mfd/mt6397-core.c
Auto-merging MAINTAINERS
Merge made by the 'recursive' strategy.
MAINTAINERS | 7 +
drivers/mfd/mt6397-core.c | 18 ++
drivers/rtc/Kconfig | 11 +
drivers/rtc/Makefile | 1 +
drivers/rtc/interface.c | 4 +-
drivers/rtc/rtc-ab8500.c | 2 +-
drivers/rtc/rtc-at32ap700x.c | 2 +-
drivers/rtc/rtc-efi.c | 4 +-
drivers/rtc/rtc-hid-sensor-time.c | 2 +-
drivers/rtc/rtc-imxdi.c | 438 +++++++++++++++++++++++++++++++++-----
drivers/rtc/rtc-mc13xxx.c | 2 +-
drivers/rtc/rtc-mt6397.c | 394 ++++++++++++++++++++++++++++++++++
drivers/rtc/rtc-mxc.c | 2 +-
drivers/rtc/rtc-s3c.c | 14 +-
include/linux/rtc.h | 11 +-
15 files changed, 825 insertions(+), 87 deletions(-)
create mode 100644 drivers/rtc/rtc-mt6397.c
Merging akpm-current/current (52503264595b lib/scatterlist: mark input buffer parameters as 'const')
$ git merge --no-ff akpm-current/current
Resolved 'arch/x86/kernel/machine_kexec_64.c' using previous resolution.
Auto-merging mm/shmem.c
Auto-merging mm/page_alloc.c
Auto-merging lib/Makefile
Auto-merging lib/Kconfig
Auto-merging kernel/fork.c
Auto-merging include/linux/sched.h
Auto-merging include/linux/scatterlist.h
Auto-merging include/linux/rtc.h
Auto-merging include/linux/gfp.h
Removing include/linux/compiler-gcc5.h
Removing include/linux/compiler-gcc4.h
Removing include/linux/compiler-gcc3.h
Auto-merging fs/proc/base.c
Auto-merging fs/cifs/file.c
Auto-merging drivers/rtc/interface.c
Auto-merging arch/xtensa/include/asm/dma-mapping.h
Auto-merging arch/x86/kernel/process_64.c
Auto-merging arch/x86/kernel/process_32.c
Auto-merging arch/x86/kernel/machine_kexec_64.c
CONFLICT (content): Merge conflict in arch/x86/kernel/machine_kexec_64.c
Auto-merging arch/x86/ia32/ia32entry.S
Auto-merging arch/x86/Kconfig
Auto-merging arch/powerpc/mm/pgtable_64.c
Auto-merging arch/powerpc/mm/hugetlbpage.c
Auto-merging arch/powerpc/include/asm/pgtable-ppc64.h
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
$ git commit -v -a
[master 4f129e8a3ffa] Merge branch 'akpm-current/current'
$ git diff -M --stat --summary HEAD^..
.mailmap | 2 +
.../ABI/testing/configfs-spear-pcie-gadget | 2 +-
Documentation/ABI/testing/sysfs-bus-usb-lvstest | 12 +-
Documentation/ABI/testing/sysfs-class-zram | 24 +
Documentation/blockdev/zram.txt | 29 +-
Documentation/filesystems/vfat.txt | 10 +
Documentation/lockup-watchdogs.txt | 18 +
Documentation/misc-devices/spear-pcie-gadget.txt | 2 +-
Documentation/printk-formats.txt | 8 +
Documentation/sysctl/kernel.txt | 21 +
MAINTAINERS | 33 +-
arch/Kconfig | 7 +
arch/alpha/include/asm/mm-arch-hooks.h | 15 +
arch/alpha/include/uapi/asm/mman.h | 1 +
arch/arc/include/asm/dma-mapping.h | 12 +-
arch/arc/include/asm/mm-arch-hooks.h | 15 +
arch/arm/include/asm/hugetlb.h | 4 -
arch/arm/include/asm/mm-arch-hooks.h | 15 +
arch/arm/include/asm/pgtable-3level.h | 1 +
arch/arm/mm/hugetlbpage.c | 5 -
arch/arm64/include/asm/hugetlb.h | 4 -
arch/arm64/include/asm/mm-arch-hooks.h | 15 +
arch/arm64/include/asm/pgtable.h | 2 +
arch/arm64/mm/hugetlbpage.c | 7 -
arch/avr32/include/asm/dma-mapping.h | 19 +-
arch/avr32/include/asm/mm-arch-hooks.h | 15 +
arch/blackfin/include/asm/mm-arch-hooks.h | 15 +
arch/c6x/include/asm/mm-arch-hooks.h | 15 +
arch/cris/include/asm/mm-arch-hooks.h | 15 +
arch/frv/include/asm/mm-arch-hooks.h | 15 +
arch/frv/include/asm/sections.h | 6 -
arch/frv/mb93090-mb00/pci-dma-nommu.c | 10 +-
arch/frv/mb93090-mb00/pci-dma.c | 7 +-
arch/hexagon/include/asm/mm-arch-hooks.h | 15 +
arch/ia64/include/asm/hugetlb.h | 4 -
arch/ia64/include/asm/mm-arch-hooks.h | 15 +
arch/ia64/mm/hugetlbpage.c | 5 -
arch/ia64/mm/numa.c | 19 +-
arch/m32r/include/asm/mm-arch-hooks.h | 15 +
arch/m68k/include/asm/mm-arch-hooks.h | 15 +
arch/metag/include/asm/hugetlb.h | 4 -
arch/metag/include/asm/mm-arch-hooks.h | 15 +
arch/metag/mm/hugetlbpage.c | 5 -
arch/microblaze/include/asm/mm-arch-hooks.h | 15 +
arch/mips/include/asm/hugetlb.h | 4 -
arch/mips/include/asm/mm-arch-hooks.h | 15 +
arch/mips/include/asm/pgtable.h | 8 +-
arch/mips/include/uapi/asm/mman.h | 1 +
arch/mips/mm/dma-default.c | 30 +-
arch/mips/mm/hugetlbpage.c | 5 -
arch/mn10300/include/asm/mm-arch-hooks.h | 15 +
arch/nios2/include/asm/mm-arch-hooks.h | 15 +
arch/openrisc/include/asm/mm-arch-hooks.h | 15 +
arch/parisc/include/asm/mm-arch-hooks.h | 15 +
arch/parisc/include/uapi/asm/mman.h | 1 +
arch/parisc/kernel/pci-dma.c | 27 +-
arch/powerpc/include/asm/hugetlb.h | 5 -
arch/powerpc/include/asm/mm-arch-hooks.h | 28 +
arch/powerpc/include/asm/mmu_context.h | 23 +-
arch/powerpc/include/asm/pgtable-ppc64.h | 16 +-
arch/powerpc/kernel/vio.c | 10 +-
arch/powerpc/mm/hugetlbpage.c | 5 -
arch/powerpc/mm/pgtable_64.c | 73 +-
arch/s390/include/asm/hugetlb.h | 1 -
arch/s390/include/asm/mm-arch-hooks.h | 15 +
arch/s390/include/asm/pgtable.h | 22 +-
arch/s390/mm/hugetlbpage.c | 5 -
arch/score/include/asm/mm-arch-hooks.h | 15 +
arch/sh/include/asm/hugetlb.h | 3 -
arch/sh/include/asm/mm-arch-hooks.h | 15 +
arch/sh/mm/hugetlbpage.c | 5 -
arch/sparc/include/asm/hugetlb.h | 4 -
arch/sparc/include/asm/mm-arch-hooks.h | 15 +
arch/sparc/include/asm/pgtable_64.h | 17 +-
arch/sparc/kernel/ldc.c | 8 +-
arch/sparc/mm/hugetlbpage.c | 5 -
arch/tile/include/asm/hugetlb.h | 4 -
arch/tile/include/asm/mm-arch-hooks.h | 15 +
arch/tile/include/asm/pgtable.h | 8 +-
arch/tile/mm/hugetlbpage.c | 5 -
arch/um/include/asm/mm-arch-hooks.h | 15 +
arch/unicore32/include/asm/mm-arch-hooks.h | 15 +
arch/x86/Kconfig | 2 +
arch/x86/ia32/ia32entry.S | 2 +-
arch/x86/include/asm/hugetlb.h | 3 -
arch/x86/include/asm/mm-arch-hooks.h | 15 +
arch/x86/include/asm/pgtable.h | 9 +-
arch/x86/kernel/kexec-bzimage64.c | 11 +-
arch/x86/kernel/machine_kexec_64.c | 1 +
arch/x86/kernel/process_32.c | 6 +-
arch/x86/kernel/process_64.c | 8 +-
arch/xtensa/include/asm/dma-mapping.h | 19 +-
arch/xtensa/include/asm/mm-arch-hooks.h | 15 +
arch/xtensa/include/uapi/asm/mman.h | 1 +
block/genhd.c | 2 +-
drivers/base/node.c | 6 +-
drivers/block/zram/Kconfig | 10 +-
drivers/block/zram/zram_drv.c | 1020 +++++++++++---------
drivers/block/zram/zram_drv.h | 10 +-
drivers/memstick/host/jmb38x_ms.c | 12 +-
drivers/memstick/host/r592.c | 10 +-
drivers/misc/kgdbts.c | 2 +-
drivers/misc/spear13xx_pcie_gadget.c | 2 +-
drivers/pci/host/pcie-spear13xx.c | 6 +-
drivers/phy/phy-spear1310-miphy.c | 6 +-
drivers/phy/phy-spear1340-miphy.c | 6 +-
drivers/rtc/class.c | 24 +
drivers/rtc/interface.c | 13 +-
drivers/rtc/rtc-armada38x.c | 2 +-
drivers/rtc/rtc-ds1307.c | 12 +-
drivers/rtc/rtc-omap.c | 14 +-
drivers/usb/misc/lvstest.c | 2 +-
fs/adfs/super.c | 2 +-
fs/affs/amigaffs.c | 2 +-
fs/affs/inode.c | 2 +-
fs/befs/btree.c | 6 +-
fs/cifs/file.c | 8 +-
fs/configfs/item.c | 3 +-
fs/devpts/inode.c | 31 +-
fs/efs/super.c | 2 +-
fs/ext4/fsync.c | 5 +-
fs/fat/cache.c | 79 +-
fs/fat/dir.c | 2 +-
fs/fat/fat.h | 6 +-
fs/fat/file.c | 61 ++
fs/fat/inode.c | 75 +-
fs/hugetlbfs/inode.c | 1 -
fs/jbd2/journal.c | 11 +-
fs/jbd2/transaction.c | 20 +-
fs/kernfs/dir.c | 9 +-
fs/minix/inode.c | 2 +-
fs/mpage.c | 23 +-
fs/ocfs2/alloc.c | 282 +++---
fs/ocfs2/aops.c | 55 +-
fs/ocfs2/buffer_head_io.c | 6 +
fs/ocfs2/cluster/heartbeat.c | 49 +-
fs/ocfs2/cluster/masklog.c | 34 +
fs/ocfs2/cluster/masklog.h | 42 +-
fs/ocfs2/dir.c | 90 +-
fs/ocfs2/dlm/dlmcommon.h | 1 -
fs/ocfs2/dlm/dlmmaster.c | 22 +-
fs/ocfs2/dlm/dlmthread.c | 10 +
fs/ocfs2/dlmglue.c | 10 +-
fs/ocfs2/extent_map.c | 22 +-
fs/ocfs2/inode.c | 40 +-
fs/ocfs2/journal.c | 62 +-
fs/ocfs2/localalloc.c | 3 +-
fs/ocfs2/move_extents.c | 8 +-
fs/ocfs2/namei.c | 46 +-
fs/ocfs2/namei.h | 4 +-
fs/ocfs2/ocfs2.h | 2 +
fs/ocfs2/quota_local.c | 3 +-
fs/ocfs2/refcounttree.c | 81 +-
fs/ocfs2/suballoc.c | 90 +-
fs/ocfs2/super.c | 67 +-
fs/ocfs2/super.h | 8 +-
fs/ocfs2/xattr.c | 51 +-
fs/posix_acl.c | 46 +-
fs/proc/array.c | 8 +
fs/proc/base.c | 204 +++-
fs/reiserfs/super.c | 3 +-
include/asm-generic/pgtable.h | 43 +-
include/linux/bootmem.h | 8 +-
include/linux/compiler-gcc.h | 207 +++-
include/linux/compiler-gcc3.h | 23 -
include/linux/compiler-gcc4.h | 91 --
include/linux/compiler-gcc5.h | 67 --
include/linux/configfs.h | 1 -
include/linux/crc64_ecma.h | 56 ++
include/linux/gfp.h | 10 +
include/linux/huge_mm.h | 4 +
include/linux/kexec.h | 2 +
include/linux/memblock.h | 18 +
include/linux/memcontrol.h | 4 +
include/linux/mm-arch-hooks.h | 25 +
include/linux/mm.h | 85 +-
include/linux/mmu_notifier.h | 12 +-
include/linux/mmzone.h | 23 +-
include/linux/nmi.h | 3 +
include/linux/page-flags.h | 237 +++--
include/linux/pagemap.h | 25 +-
include/linux/poison.h | 4 +
include/linux/rmap.h | 9 +-
include/linux/rtc.h | 4 +
include/linux/scatterlist.h | 4 +-
include/linux/sched.h | 15 +
include/linux/slab.h | 36 +-
include/linux/smpboot.h | 5 +
include/linux/string.h | 1 +
include/linux/swap.h | 1 +
include/linux/syscalls.h | 6 +-
include/linux/uidgid.h | 4 +-
include/linux/vm_event_item.h | 1 +
include/ras/ras_event.h | 85 ++
include/trace/events/kmem.h | 26 +-
include/uapi/asm-generic/mman-common.h | 1 +
init/main.c | 2 +
ipc/msg.c | 5 +-
kernel/exit.c | 2 +-
kernel/fork.c | 48 +-
kernel/smpboot.c | 60 +-
kernel/sysctl.c | 7 +
kernel/watchdog.c | 69 +-
lib/Kconfig | 7 +
lib/Makefile | 1 +
lib/bitmap.c | 32 +-
lib/crc64_ecma.c | 341 +++++++
lib/radix-tree.c | 28 +-
lib/scatterlist.c | 12 +-
lib/sort.c | 35 +-
lib/test-hexdump.c | 6 +-
lib/vsprintf.c | 20 +-
mm/Kconfig | 18 +
mm/bootmem.c | 13 +-
mm/compaction.c | 25 +-
mm/filemap.c | 15 +-
mm/huge_memory.c | 59 +-
mm/hugetlb.c | 8 +-
mm/hwpoison-inject.c | 4 +-
mm/internal.h | 11 +-
mm/kasan/kasan.h | 1 -
mm/kmemleak.c | 3 +-
mm/ksm.c | 2 +-
mm/madvise.c | 176 ++++
mm/memblock.c | 34 +-
mm/memory-failure.c | 354 +++----
mm/memory.c | 2 +-
mm/memory_hotplug.c | 11 +-
mm/mempolicy.c | 2 +-
mm/migrate.c | 13 +-
mm/mm_init.c | 9 +-
mm/mmap.c | 2 +-
mm/mprotect.c | 11 +
mm/mremap.c | 17 +-
mm/nobootmem.c | 7 +-
mm/page_alloc.c | 468 +++++++--
mm/page_isolation.c | 10 +-
mm/pgtable-generic.c | 9 +-
mm/rmap.c | 55 +-
mm/shmem.c | 4 +-
mm/slab.c | 14 +
mm/slab.h | 10 +
mm/slab_common.c | 121 ++-
mm/slob.c | 13 +
mm/slub.c | 69 ++
mm/swap.c | 47 +-
mm/swap_state.c | 4 +-
mm/util.c | 40 +-
mm/vmscan.c | 132 ++-
mm/vmstat.c | 1 +
mm/zsmalloc.c | 4 -
mm/zswap.c | 4 +-
scripts/get_maintainer.pl | 32 +
253 files changed, 5248 insertions(+), 2368 deletions(-)
create mode 100644 Documentation/ABI/testing/sysfs-class-zram
create mode 100644 arch/alpha/include/asm/mm-arch-hooks.h
create mode 100644 arch/arc/include/asm/mm-arch-hooks.h
create mode 100644 arch/arm/include/asm/mm-arch-hooks.h
create mode 100644 arch/arm64/include/asm/mm-arch-hooks.h
create mode 100644 arch/avr32/include/asm/mm-arch-hooks.h
create mode 100644 arch/blackfin/include/asm/mm-arch-hooks.h
create mode 100644 arch/c6x/include/asm/mm-arch-hooks.h
create mode 100644 arch/cris/include/asm/mm-arch-hooks.h
create mode 100644 arch/frv/include/asm/mm-arch-hooks.h
create mode 100644 arch/hexagon/include/asm/mm-arch-hooks.h
create mode 100644 arch/ia64/include/asm/mm-arch-hooks.h
create mode 100644 arch/m32r/include/asm/mm-arch-hooks.h
create mode 100644 arch/m68k/include/asm/mm-arch-hooks.h
create mode 100644 arch/metag/include/asm/mm-arch-hooks.h
create mode 100644 arch/microblaze/include/asm/mm-arch-hooks.h
create mode 100644 arch/mips/include/asm/mm-arch-hooks.h
create mode 100644 arch/mn10300/include/asm/mm-arch-hooks.h
create mode 100644 arch/nios2/include/asm/mm-arch-hooks.h
create mode 100644 arch/openrisc/include/asm/mm-arch-hooks.h
create mode 100644 arch/parisc/include/asm/mm-arch-hooks.h
create mode 100644 arch/powerpc/include/asm/mm-arch-hooks.h
create mode 100644 arch/s390/include/asm/mm-arch-hooks.h
create mode 100644 arch/score/include/asm/mm-arch-hooks.h
create mode 100644 arch/sh/include/asm/mm-arch-hooks.h
create mode 100644 arch/sparc/include/asm/mm-arch-hooks.h
create mode 100644 arch/tile/include/asm/mm-arch-hooks.h
create mode 100644 arch/um/include/asm/mm-arch-hooks.h
create mode 100644 arch/unicore32/include/asm/mm-arch-hooks.h
create mode 100644 arch/x86/include/asm/mm-arch-hooks.h
create mode 100644 arch/xtensa/include/asm/mm-arch-hooks.h
delete mode 100644 include/linux/compiler-gcc3.h
delete mode 100644 include/linux/compiler-gcc4.h
delete mode 100644 include/linux/compiler-gcc5.h
create mode 100644 include/linux/crc64_ecma.h
create mode 100644 include/linux/mm-arch-hooks.h
create mode 100644 lib/crc64_ecma.c
$ 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: arch/unicore32/kernel/fpu-ucf64.c: remove unnecessary KERN_ERR
Applying: printk: improve the description of /dev/kmsg line format
Applying: drivers/w1/w1_int.c: call put_device if device_register fails
$ cd ../next
$ git fetch -f ../rebase-tmp akpm:akpm/master
From ../rebase-tmp
+ 1cf6143c29b9...f93d6339a169 akpm -> akpm/master (forced update)
$ rm -rf ../rebase-tmp
Merging akpm/master (f93d6339a169 drivers/w1/w1_int.c: call put_device if device_register fails)
$ git merge --no-ff akpm/master
Merge made by the 'recursive' strategy.
arch/unicore32/kernel/fpu-ucf64.c | 4 ++--
drivers/w1/w1_int.c | 3 +--
kernel/printk/printk.c | 8 ++++----
3 files changed, 7 insertions(+), 8 deletions(-)
$ git am -3 ../patches/0001-temporary-fix-for-sparc-32-no-having-__pmd.patch
Applying: temporary fix for sparc 32 no having __pmd()
$ git am -3 ../patches/0001-temporary-fix-for-sparc-32-no-having-__pmd.patch
Applying: temporary fix for sparc 32 no having __pmd()
$ git am -3 ../patches/0001-temporary-fix-for-sparc-32-no-having-__pmd.patch
Applying: temporary fix for sparc 32 no having __pmd()