diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 6127 |
1 files changed, 6127 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..ea0cbb5b793c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6127 @@ +$ date +Monday 19 January 10:39:12 AEDT 2015 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at f800c25b7a76 Merge branch 'thermal-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux +Merging origin/master (ec6f34e5b552 Linux 3.19-rc5) +$ git merge origin/master +Updating f800c25b7a76..ec6f34e5b552 +Fast-forward + Documentation/ABI/testing/sysfs-class-mei | 15 +++++ + MAINTAINERS | 5 +- + Makefile | 2 +- + arch/arm/boot/dts/at91sam9263.dtsi | 2 + + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 2 + + arch/arm/boot/dts/berlin2q.dtsi | 63 ++++++++--------- + arch/arm/boot/dts/dra7-evm.dts | 10 +-- + arch/arm/boot/dts/exynos5250.dtsi | 2 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 ++ + arch/arm/boot/dts/exynos5420.dtsi | 6 +- + arch/arm/boot/dts/imx25.dtsi | 2 +- + arch/arm/boot/dts/imx51-babbage.dts | 22 ++---- + arch/arm/boot/dts/imx6qdl.dtsi | 4 +- + arch/arm/boot/dts/ls1021a.dtsi | 1 + + arch/arm/boot/dts/omap3-n900.dts | 4 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 30 +++++++++ + arch/arm/boot/dts/sama5d3xmb.dtsi | 2 +- + arch/arm/boot/dts/sama5d4.dtsi | 2 +- + arch/arm/boot/dts/ste-nomadik-nhk15.dts | 8 +-- + arch/arm/configs/exynos_defconfig | 18 ++++- + arch/arm/configs/omap2plus_defconfig | 2 +- + arch/arm/mach-at91/board-dt-sama5.c | 18 +++++ + arch/arm/mach-imx/clk-imx6q.c | 2 +- + arch/arm/mach-imx/clk-imx6sx.c | 3 + + arch/arm/mach-omap2/board-generic.c | 18 +++++ + arch/arm/mach-omap2/common.h | 1 + + arch/arm/mach-omap2/control.h | 4 ++ + arch/arm/mach-omap2/omap-headsmp.S | 21 ++++++ + arch/arm/mach-omap2/omap-smp.c | 13 +++- + arch/arm/mach-omap2/timer.c | 44 ++++++++++-- + arch/arm/mach-rockchip/rockchip.c | 27 ++++++++ + arch/arm/mach-shmobile/setup-r8a7740.c | 7 ++ + arch/arm/mach-shmobile/setup-sh73a0.c | 3 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/mm/init.c | 8 +-- + arch/m68k/include/asm/unistd.h | 2 +- + arch/m68k/include/uapi/asm/unistd.h | 1 + + arch/m68k/kernel/syscalltable.S | 1 + + arch/powerpc/include/asm/thread_info.h | 13 ++-- + arch/powerpc/platforms/powernv/opal-wrappers.S | 1 - + arch/x86/kernel/cpu/perf_event_intel_ds.c | 4 +- + arch/x86/kernel/cpu/perf_event_intel_rapl.c | 44 ++++++++---- + arch/x86/kernel/kprobes/core.c | 20 ++++-- + drivers/bus/arm-cci.c | 3 + + drivers/clk/at91/clk-slow.c | 27 ++++++++ + drivers/clk/berlin/bg2q.c | 1 - + drivers/clk/clk-ppc-corenet.c | 2 +- + drivers/clk/clk.c | 2 +- + drivers/clk/rockchip/clk-cpu.c | 10 +-- + drivers/clk/rockchip/clk-rk3188.c | 27 ++++++-- + drivers/clk/rockchip/clk-rk3288.c | 28 ++++---- + drivers/dma/dw/core.c | 2 - + drivers/dma/dw/platform.c | 5 ++ + drivers/iio/adc/ad799x.c | 15 ++++- + drivers/iio/inkern.c | 3 + + drivers/mcb/mcb-internal.h | 1 + + drivers/mcb/mcb-pci.c | 27 +++++--- + drivers/misc/cxl/context.c | 82 +++++++++++++++++------ + drivers/misc/cxl/file.c | 14 ++-- + drivers/misc/mei/hw-me.c | 12 ++++ + drivers/mmc/host/sdhci.c | 6 ++ + drivers/phy/phy-miphy28lp.c | 3 +- + drivers/phy/phy-omap-control.c | 7 +- + drivers/phy/phy-sun4i-usb.c | 3 +- + drivers/phy/phy-ti-pipe3.c | 10 +-- + drivers/reset/reset-sunxi.c | 4 ++ + drivers/scsi/scsi_lib.c | 3 +- + drivers/staging/vt6655/baseband.c | 2 +- + drivers/staging/vt6655/channel.c | 8 +++ + drivers/staging/vt6655/device_main.c | 13 +++- + drivers/staging/vt6655/rxtx.c | 5 +- + drivers/tty/n_tty.c | 9 +-- + drivers/tty/serial/8250/8250_pci.c | 29 +++++++- + drivers/tty/serial/samsung.c | 56 ++++++++++------ + drivers/tty/serial/serial_core.c | 4 +- + drivers/tty/tty_io.c | 7 +- + drivers/usb/chipidea/core.c | 2 +- + drivers/usb/chipidea/host.c | 1 + + drivers/usb/dwc2/gadget.c | 10 ++- + drivers/usb/dwc3/dwc3-pci.c | 4 ++ + drivers/usb/dwc3/gadget.c | 6 +- + drivers/usb/gadget/function/f_hid.c | 5 +- + drivers/usb/gadget/function/f_midi.c | 2 +- + drivers/usb/gadget/function/f_uac1.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 2 + + drivers/usb/gadget/udc/atmel_usba_udc.c | 19 ++++-- + drivers/usb/gadget/udc/bdc/bdc_ep.c | 3 +- + drivers/usb/host/ehci-sched.c | 14 ++-- + drivers/usb/host/ehci-tegra.c | 2 +- + drivers/usb/host/pci-quirks.c | 18 ++++- + drivers/usb/host/xhci-pci.c | 2 + + drivers/usb/host/xhci.c | 9 +++ + drivers/usb/musb/Kconfig | 4 ++ + drivers/usb/musb/blackfin.c | 2 +- + drivers/usb/musb/musb_cppi41.c | 4 +- + drivers/usb/musb/musb_debugfs.c | 34 +++++----- + drivers/usb/musb/musb_host.c | 1 - + drivers/usb/phy/phy-mv-usb.c | 5 +- + drivers/usb/phy/phy.c | 16 +++-- + drivers/usb/serial/console.c | 16 +++-- + drivers/usb/serial/cp210x.c | 4 +- + drivers/usb/serial/generic.c | 4 +- + drivers/usb/serial/keyspan.c | 20 ++++-- + drivers/usb/serial/option.c | 11 ++- + drivers/usb/serial/qcserial.c | 1 - + drivers/usb/storage/uas-detect.h | 33 +++++++-- + drivers/usb/storage/unusual_uas.h | 46 ++++++++++--- + drivers/video/fbdev/broadsheetfb.c | 8 ++- + drivers/video/fbdev/simplefb.c | 2 +- + fs/fuse/dev.c | 51 +++++++++++++- + fs/fuse/dir.c | 31 ++------- + fs/fuse/fuse_i.h | 2 + + fs/fuse/inode.c | 5 +- + fs/kernfs/dir.c | 12 ++-- + fs/lockd/svc.c | 8 +-- + fs/nfs/nfs4client.c | 42 +++++++----- + fs/nfs/nfs4proc.c | 21 ++++-- + include/linux/nfs_fs_sb.h | 3 + + include/linux/phy/omap_control_phy.h | 6 +- + kernel/range.c | 10 +-- + kernel/trace/ftrace.c | 53 ++++++++++++--- + kernel/trace/trace.c | 1 - + kernel/trace/trace_events.c | 69 +++++++++++++++---- + tools/include/asm-generic/bitops.h | 2 + + tools/include/asm-generic/bitops/arch_hweight.h | 1 + + tools/include/asm-generic/bitops/const_hweight.h | 1 + + tools/include/asm-generic/bitops/hweight.h | 7 ++ + tools/include/linux/bitops.h | 7 +- + tools/lib/api/fs/debugfs.c | 2 +- + tools/lib/api/fs/fs.c | 2 +- + tools/perf/MANIFEST | 6 ++ + tools/perf/Makefile.perf | 11 ++- + tools/perf/arch/powerpc/util/skip-callchain-idx.c | 19 +++--- + tools/perf/bench/sched-pipe.c | 2 +- + tools/perf/builtin-top.c | 1 - + tools/perf/config/Makefile | 2 +- + tools/perf/config/Makefile.arch | 26 +++---- + tools/perf/perf-sys.h | 1 - + tools/perf/tests/dwarf-unwind.c | 36 +++++++++- + tools/perf/util/annotate.h | 8 +-- + tools/perf/util/cache.h | 2 + + tools/perf/util/hweight.c | 31 --------- + tools/perf/util/include/asm/hweight.h | 8 --- + tools/perf/util/machine.c | 4 +- + tools/perf/util/probe-event.c | 4 +- + tools/perf/util/python-ext-sources | 2 +- + tools/perf/util/unwind-libunwind.c | 28 +++++++- + 148 files changed, 1236 insertions(+), 498 deletions(-) + create mode 100644 tools/include/asm-generic/bitops/arch_hweight.h + create mode 100644 tools/include/asm-generic/bitops/const_hweight.h + create mode 100644 tools/include/asm-generic/bitops/hweight.h + delete mode 100644 tools/perf/util/hweight.c + delete mode 100644 tools/perf/util/include/asm/hweight.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 (a16c5f99a28c kbuild: Fix removal of the debian/ directory) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (2ce7598c9a45 Linux 3.17-rc4) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (2d9ed7406fd2 ARM: 8255/1: perf: Prevent wraparound during overflow) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/kernel/entry-header.S | 13 +++++++------ + arch/arm/kernel/perf_event.c | 10 ++++++++-- + 2 files changed, 15 insertions(+), 8 deletions(-) +Merging m68k-current/for-linus (f27bd5bfeda5 m68k: Wire up execveat) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (ffe6902b66aa asm-generic: remove _STK_LIM_MAX) +$ 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/merge (31345e1a071e powerpc/pci: Remove unused force_32bit_msi quirk) +$ git merge powerpc-merge/merge +Already up-to-date. +Merging powerpc-merge-mpe/fixes (a87e810f61b4 powerpc: Work around gcc bug in current_thread_info()) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (66d0f7ec9f10 sparc32: destroy_context() and switch_mm() needs to disable interrupts.) +$ git merge sparc/master +Already up-to-date. +Merging net/master (2061dcd6bff8 net: sctp: fix race for one-to-many sockets in sendmsg's auto associate) +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/davinci_emac.txt | 3 +- + MAINTAINERS | 6 +- + drivers/infiniband/hw/mlx4/main.c | 3 +- + drivers/net/can/c_can/c_can_platform.c | 29 ++++--- + drivers/net/can/dev.c | 8 +- + drivers/net/can/m_can/m_can.c | 5 ++ + drivers/net/can/usb/kvaser_usb.c | 31 ++++--- + drivers/net/ethernet/emulex/benet/be_main.c | 41 ++++++++- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 3 +- + drivers/net/ethernet/renesas/sh_eth.c | 4 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 21 +++-- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 8 +- + drivers/net/ethernet/ti/cpsw.c | 27 +++--- + drivers/net/ethernet/ti/davinci_emac.c | 96 +++++++++++++++++----- + include/linux/genetlink.h | 4 + + include/net/genetlink.h | 7 +- + include/uapi/linux/can/netlink.h | 1 + + net/core/dev.c | 20 +++-- + net/ipv4/ip_sockglue.c | 8 +- + net/ipv6/datagram.c | 10 +-- + net/mac80211/mlme.c | 2 +- + net/netlink/af_netlink.c | 24 ++++-- + net/netlink/af_netlink.h | 1 + + net/netlink/genetlink.c | 18 ++-- + net/sctp/socket.c | 8 +- + net/wireless/reg.c | 56 ++++++++----- + 27 files changed, 302 insertions(+), 145 deletions(-) +Merging ipsec/master (f855691975bb xfrm6: Fix the nexthdr offset in _decode_session6.) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv6/xfrm6_policy.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging sound-current/for-linus (6455931186bf ALSA: usb-audio: Add mic volume fix quirk for Logitech Webcam C210) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/firewire/amdtp.c | 71 +++++++++++++++++++++++++---- + sound/firewire/amdtp.h | 5 +- + sound/firewire/bebob/bebob_stream.c | 7 --- + sound/firewire/fireworks/fireworks_stream.c | 5 -- + sound/usb/mixer.c | 1 + + 5 files changed, 65 insertions(+), 24 deletions(-) +Merging pci-current/for-linus (d63e2e1f3df9 sparc/PCI: Clip bridge windows to fit in upstream windows) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + arch/alpha/kernel/pci.c | 8 +++-- + arch/frv/mb93090-mb00/pci-frv.c | 2 +- + arch/ia64/pci/pci.c | 48 +++++++++++++--------------- + arch/microblaze/pci/pci-common.c | 13 +++++++- + arch/mn10300/unit-asb2305/pci-asb2305.c | 2 +- + arch/mn10300/unit-asb2305/pci.c | 47 +++++++++++++-------------- + arch/powerpc/kernel/pci-common.c | 12 ++++++- + arch/sparc/kernel/pci.c | 5 ++- + arch/x86/pci/i386.c | 2 +- + drivers/parisc/lba_pci.c | 5 ++- + drivers/pci/bus.c | 43 +++++++++++++++++++++++++ + drivers/pci/pci.c | 40 ++++++++++++++++++++--- + drivers/pci/pci.h | 1 + + drivers/pci/quirks.c | 14 +++++++++ + drivers/pci/setup-bus.c | 56 ++++++++++++++++++++++++++------- + include/linux/pci.h | 3 ++ + 16 files changed, 221 insertions(+), 80 deletions(-) +Merging wireless-drivers/master (781f51d4c203 Merge tag 'iwlwifi-for-kalle-2015-01-13' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 ++ + drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 7 ++-- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 20 +++++------ + drivers/net/wireless/iwlwifi/mvm/scan.c | 46 +++++++++++++++++++------- + drivers/net/wireless/iwlwifi/mvm/tx.c | 11 ++++-- + 5 files changed, 59 insertions(+), 27 deletions(-) +Merging driver-core.current/driver-core-linus (72392ed0eb6f kernfs: Fix kernfs_name_compare) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (31ec77aca72e serial: samsung: Add the support for Exynos5433 SoC) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (f8359dae68bd Merge tag 'fixes-for-v3.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (39e60635a015 usb: dwc3: gadget: Stop TRB preparation after limit is reached) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (04f9c6e6d175 usb: serial: handle -ENODEV quietly in generic_submit_read_urb) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging staging.current/staging-linus (a307d1d6d4cf staging: vt6655: fix sparse warning: argument type) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (7b7c54914f73 mcb: mcb-pci: Only remap the 1st 0x200 bytes of BAR 0) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (029b18361921 Input: uinput - fix ioctl nr overflow for UI_GET_SYSNAME/VERSION) +$ git merge input-current/for-linus +Auto-merging drivers/input/serio/i8042.c +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 1 + + MAINTAINERS | 1 - + drivers/input/mouse/elantech.c | 2 ++ + drivers/input/serio/i8042-x86ia64io.h | 39 +++++++++++++++++++++++++++++++++++ + drivers/input/serio/i8042.c | 14 +++++++++++++ + include/uapi/linux/uinput.h | 4 ++-- + 6 files changed, 58 insertions(+), 3 deletions(-) +Merging md-current/for-linus (d47648fcf061 raid5: avoid finding "discard" stripe) +$ git merge md-current/for-linus +Already up-to-date. +Merging crypto-current/master (3e14dcf7cb80 crypto: add missing crypto module aliases) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + arch/powerpc/crypto/sha1.c | 1 + + arch/x86/crypto/sha-mb/sha1_mb.c | 2 +- + crypto/aes_generic.c | 1 + + crypto/ansi_cprng.c | 1 + + crypto/blowfish_generic.c | 1 + + crypto/camellia_generic.c | 1 + + crypto/cast5_generic.c | 1 + + crypto/cast6_generic.c | 1 + + crypto/crc32c_generic.c | 1 + + crypto/crct10dif_generic.c | 1 + + crypto/des_generic.c | 7 ++++--- + crypto/ghash-generic.c | 1 + + crypto/krng.c | 1 + + crypto/salsa20_generic.c | 1 + + crypto/serpent_generic.c | 1 + + crypto/sha1_generic.c | 1 + + crypto/sha256_generic.c | 2 ++ + crypto/sha512_generic.c | 2 ++ + crypto/tea.c | 1 + + crypto/tgr192.c | 1 + + crypto/twofish_generic.c | 1 + + crypto/wp512.c | 1 + + 22 files changed, 27 insertions(+), 4 deletions(-) +Merging ide/master (f96fe225677b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge ide/master +Already up-to-date. +Merging dwmw2/master (5950f0803ca9 pcmcia: remove RPX board stuff) +$ git merge dwmw2/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (094cb98179f1 of/fdt: memblock_reserve /memreserve/ regions in the case of partial overlap) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (574732c73d15 param: initialize store function to NULL if not available.) +$ git merge rr-fixes/fixes +Merge made by the 'recursive' strategy. + kernel/params.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging vfio-fixes/for-linus (7c2e211f3c95 vfio-pci: Fix the check on pci device type in vfio_pci_probe()) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (f5db310d77ef selftests/vm: fix link error for transhuge-stress test) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (226e5ae9e5f9 drm/i915: Fix mutex->owner inspection race under DEBUG_MUTEXES) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 20 ++++++++++++++++++-- + drivers/gpu/drm/i915/intel_display.c | 2 +- + drivers/gpu/drm/i915/intel_drv.h | 1 + + drivers/gpu/drm/i915/intel_pm.c | 14 +++----------- + 5 files changed, 24 insertions(+), 15 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 +Merge made by the 'recursive' strategy. + arch/alpha/include/asm/uaccess.h | 86 ++++----- + arch/arm/include/asm/uaccess.h | 96 +++++----- + arch/arm64/include/asm/uaccess.h | 4 +- + arch/avr32/include/asm/uaccess.h | 24 +-- + arch/blackfin/include/asm/uaccess.h | 32 ++-- + arch/cris/include/asm/uaccess.h | 117 +++++++------ + arch/frv/include/asm/segment.h | 2 +- + arch/ia64/include/asm/uaccess.h | 11 +- + arch/m32r/include/asm/uaccess.h | 88 +++++----- + arch/m68k/include/asm/segment.h | 2 +- + arch/m68k/include/asm/uaccess_mm.h | 40 ++--- + arch/metag/include/asm/uaccess.h | 25 +-- + arch/openrisc/include/asm/uaccess.h | 4 +- + arch/parisc/include/asm/uaccess.h | 116 ++++++------ + arch/sh/include/asm/segment.h | 2 +- + arch/sh/include/asm/uaccess.h | 4 +- + arch/sh/include/asm/uaccess_64.h | 8 +- + arch/sparc/include/asm/uaccess_32.h | 339 +++++++++++++++++++++--------------- + arch/sparc/include/asm/uaccess_64.h | 222 ++++++++++++----------- + arch/x86/include/asm/uaccess.h | 2 +- + arch/xtensa/include/asm/uaccess.h | 90 +++++----- + 21 files changed, 700 insertions(+), 614 deletions(-) +Merging arc/for-next (5840adceb962 arc: Remove unused prepare_to_copy()) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/include/asm/processor.h | 3 --- + arch/arc/kernel/entry.S | 14 +++++++++----- + arch/arc/kernel/setup.c | 7 ++++++- + arch/arc/kernel/smp.c | 2 +- + 4 files changed, 16 insertions(+), 10 deletions(-) +Merging arm/for-next (6aa99fe6afee Merge branches 'fixes', 'l2c' (early part), 'misc' and 'sa1100' into for-next) +$ git merge arm/for-next +Removing arch/arm/mach-sa1100/time.c +Auto-merging arch/arm/mach-omap2/common.h +Auto-merging arch/arm/mach-omap2/board-generic.c +Removing arch/arm/lib/uaccess.S +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/l2cc.txt | 10 + + arch/arm/Kconfig | 1 + + arch/arm/boot/dts/exynos4210.dtsi | 9 + + arch/arm/boot/dts/exynos4x12.dtsi | 14 + + arch/arm/include/asm/bitrev.h | 20 + + arch/arm/include/asm/outercache.h | 3 + + arch/arm/kernel/irq.c | 3 +- + arch/arm/lib/Makefile | 15 +- + arch/arm/lib/uaccess.S | 564 ------------------------- + arch/arm/mach-exynos/firmware.c | 50 +++ + arch/arm/mach-exynos/sleep.S | 46 ++ + arch/arm/mach-omap2/board-generic.c | 6 + + arch/arm/mach-omap2/common.h | 8 + + arch/arm/mach-omap2/omap4-common.c | 16 +- + arch/arm/mach-sa1100/Makefile | 2 +- + arch/arm/mach-sa1100/clock.c | 12 + + arch/arm/mach-sa1100/generic.c | 6 + + arch/arm/mach-sa1100/time.c | 139 ------ + arch/arm/mm/cache-l2x0.c | 272 +++++++----- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/bitrev.h | 19 + + drivers/clocksource/Kconfig | 7 + + drivers/clocksource/Makefile | 2 +- + include/linux/amba/bus.h | 12 +- + include/linux/bitrev.h | 77 +++- + lib/Kconfig | 9 + + lib/bitrev.c | 17 +- + 27 files changed, 487 insertions(+), 853 deletions(-) + create mode 100644 arch/arm/include/asm/bitrev.h + delete mode 100644 arch/arm/lib/uaccess.S + delete mode 100644 arch/arm/mach-sa1100/time.c + create mode 100644 arch/arm64/include/asm/bitrev.h +Merging arm-perf/for-next/perf (97bf6af1f928 Linux 3.19-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (bca0d2e77e37 arm-soc: document merges) +$ git merge arm-soc/for-next +Auto-merging arch/arm64/Kconfig +Removing arch/arm/mach-shmobile/clock-r8a7790.c +Removing arch/arm/mach-shmobile/board-lager.c +Removing arch/arm/mach-shmobile/board-lager-reference.c +Removing arch/arm/configs/lager_defconfig +Auto-merging arch/arm/boot/dts/armada-388-rd.dts +Auto-merging arch/arm/boot/dts/armada-388-db.dts +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/armada-38x.txt | 7 + + .../bindings/arm/mediatek/mediatek,sysirq.txt | 1 + + .../devicetree/bindings/arm/samsung/pmu.txt | 1 + + .../bindings/clock/renesas,sh73a0-cpg-clocks.txt | 35 + + .../devicetree/bindings/serial/mtk-uart.txt | 2 + + MAINTAINERS | 7 +- + arch/arm/Kconfig.debug | 35 +- + arch/arm/arm-soc-for-next-contents.txt | 80 ++ + arch/arm/boot/dts/Makefile | 224 ++++-- + arch/arm/boot/dts/armada-380.dtsi | 3 +- + arch/arm/boot/dts/armada-385-db-ap.dts | 178 +++++ + arch/arm/boot/dts/armada-385.dtsi | 3 +- + .../dts/{armada-385-db.dts => armada-388-db.dts} | 9 +- + arch/arm/boot/dts/armada-388-gp.dts | 288 +++++++ + .../dts/{armada-385-rd.dts => armada-388-rd.dts} | 9 +- + arch/arm/boot/dts/armada-388.dtsi | 70 ++ + arch/arm/boot/dts/armada-38x.dtsi | 93 ++- + arch/arm/boot/dts/berlin2.dtsi | 2 +- + arch/arm/boot/dts/berlin2cd.dtsi | 7 +- + arch/arm/boot/dts/berlin2q.dtsi | 10 +- + arch/arm/boot/dts/kirkwood-6192.dtsi | 2 + + arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts | 173 +++++ + arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 8 +- + arch/arm/boot/dts/mt6589-aquaris5.dts | 12 +- + arch/arm/boot/dts/mt6589.dtsi | 52 +- + arch/arm/boot/dts/mt6592.dtsi | 15 +- + arch/arm/boot/dts/mt8127-moose.dts | 4 + + arch/arm/boot/dts/mt8127.dtsi | 52 +- + arch/arm/boot/dts/mt8135-evbp1.dts | 4 + + arch/arm/boot/dts/mt8135.dtsi | 54 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- + arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 2 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 173 ++++- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 4 +- + arch/arm/boot/dts/r8a7740.dtsi | 10 +- + arch/arm/boot/dts/r8a7779.dtsi | 39 +- + arch/arm/boot/dts/r8a7790-lager.dts | 20 +- + arch/arm/boot/dts/r8a7790.dtsi | 33 +- + arch/arm/boot/dts/r8a7791-henninger.dts | 4 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 22 +- + arch/arm/boot/dts/r8a7791.dtsi | 40 +- + arch/arm/boot/dts/r8a7794-alt.dts | 4 +- + arch/arm/boot/dts/r8a7794.dtsi | 82 +- + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 6 +- + arch/arm/boot/dts/sh73a0.dtsi | 358 +++++++++ + arch/arm/configs/efm32_defconfig | 5 +- + arch/arm/configs/kzm9g_defconfig | 2 +- + arch/arm/configs/lager_defconfig | 150 ---- + arch/arm/configs/multi_v7_defconfig | 14 + + arch/arm/configs/mvebu_v7_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 31 +- + arch/arm/mach-bcm/platsmp-brcmstb.c | 85 ++- + arch/arm/mach-mvebu/mvebu-soc-id.h | 18 + + arch/arm/mach-shmobile/Kconfig | 25 +- + arch/arm/mach-shmobile/Makefile | 3 - + arch/arm/mach-shmobile/Makefile.boot | 1 - + arch/arm/mach-shmobile/board-lager-reference.c | 39 - + arch/arm/mach-shmobile/board-lager.c | 827 --------------------- + arch/arm/mach-shmobile/clock-r8a7790.c | 459 ------------ + arch/arm/mach-shmobile/clock-sh73a0.c | 10 + + arch/arm/mach-shmobile/r8a7790.h | 28 - + arch/arm/mach-shmobile/setup-r8a7790.c | 284 +------ + arch/arm/mach-shmobile/setup-rcar-gen2.c | 4 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 5 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 2 +- + arch/arm/mach-versatile/core.c | 37 - + arch/arm64/Kconfig | 17 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/exynos/Makefile | 5 + + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 84 +++ + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 588 +++++++++++++++ + arch/arm64/boot/dts/exynos/exynos7.dtsi | 530 +++++++++++++ + drivers/clk/shmobile/Makefile | 1 + + drivers/clk/shmobile/clk-sh73a0.c | 218 ++++++ + include/dt-bindings/clock/r8a7790-clock.h | 1 + + include/dt-bindings/clock/r8a7791-clock.h | 2 + + include/dt-bindings/clock/r8a7794-clock.h | 17 + + include/dt-bindings/clock/sh73a0-clock.h | 79 ++ + 78 files changed, 3695 insertions(+), 2117 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/renesas,sh73a0-cpg-clocks.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/armada-385-db-ap.dts + rename arch/arm/boot/dts/{armada-385-db.dts => armada-388-db.dts} (92%) + create mode 100644 arch/arm/boot/dts/armada-388-gp.dts + rename arch/arm/boot/dts/{armada-385-rd.dts => armada-388-rd.dts} (88%) + create mode 100644 arch/arm/boot/dts/armada-388.dtsi + create mode 100644 arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts + delete mode 100644 arch/arm/configs/lager_defconfig + delete mode 100644 arch/arm/mach-shmobile/board-lager-reference.c + delete mode 100644 arch/arm/mach-shmobile/board-lager.c + delete mode 100644 arch/arm/mach-shmobile/clock-r8a7790.c + create mode 100644 arch/arm64/boot/dts/exynos/Makefile + create mode 100644 arch/arm64/boot/dts/exynos/exynos7-espresso.dts + create mode 100644 arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos7.dtsi + create mode 100644 drivers/clk/shmobile/clk-sh73a0.c + create mode 100644 include/dt-bindings/clock/sh73a0-clock.h +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (8553bf8fd181 Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +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. + arch/arm/boot/compressed/head.S | 33 +++++++++++++++++++++++++++------ + arch/arm/include/asm/unified.h | 8 ++++++++ + 2 files changed, 35 insertions(+), 6 deletions(-) +Merging ep93xx/ep93xx-for-next (bfb0709fd17b Merge branch 'ep93xx-fixes' into ep93xx-for-next) +$ git merge ep93xx/ep93xx-for-next +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (bc8127e027df Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Resolved 'arch/arm/boot/dts/Makefile' using previous resolution. +Auto-merging arch/arm/boot/dts/imx6sx-sdb.dts +Auto-merging arch/arm/boot/dts/Makefile +CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d9c1d1ad2029] Merge remote-tracking branch 'imx-mxs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/fsl.txt | 12 +++ + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/imx27-apf27dev.dts | 21 ++++ + arch/arm/boot/dts/imx27.dtsi | 2 +- + arch/arm/boot/dts/imx28-evk.dts | 1 - + arch/arm/boot/dts/imx51-apf51dev.dts | 14 +++ + arch/arm/boot/dts/imx53.dtsi | 11 +- + arch/arm/boot/dts/imx6dl-udoo.dts | 18 ++++ + arch/arm/boot/dts/imx6dl.dtsi | 2 +- + arch/arm/boot/dts/imx6q-udoo.dts | 124 +--------------------- + arch/arm/boot/dts/imx6q.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 33 ++++++ + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 134 +++++++++++++++++++++++ + arch/arm/boot/dts/imx6qdl.dtsi | 5 +- + arch/arm/boot/dts/imx6sx-sabreauto.dts | 146 ++++++++++++++++++++++++++ + arch/arm/boot/dts/imx6sx-sdb.dts | 39 +++++++ + arch/arm/boot/dts/vf-colibri.dtsi | 1 + + arch/arm/boot/dts/vf500.dtsi | 9 ++ + arch/arm/boot/dts/vfxxx.dtsi | 14 ++- + arch/arm/configs/imx_v6_v7_defconfig | 9 +- + arch/arm/mach-imx/Makefile | 3 +- + arch/arm/mach-imx/clk-gate2.c | 23 +++- + arch/arm/mach-imx/clk-pllv3.c | 10 +- + arch/arm/mach-imx/clk-vf610.c | 4 +- + arch/arm/mach-imx/clk.h | 1 + + arch/arm/mach-imx/common.h | 4 + + arch/arm/mach-imx/cpuidle-imx6sx.c | 105 ++++++++++++++++++ + arch/arm/mach-imx/cpuidle.h | 5 + + arch/arm/mach-imx/gpc.c | 25 ++++- + arch/arm/mach-imx/mach-imx6sx.c | 2 +- + arch/arm/mach-imx/mach-vf610.c | 5 +- + arch/arm/mach-imx/pm-imx6.c | 7 +- + 32 files changed, 638 insertions(+), 155 deletions(-) + create mode 100644 arch/arm/boot/dts/imx6dl-udoo.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-udoo.dtsi + create mode 100644 arch/arm/boot/dts/imx6sx-sabreauto.dts + create mode 100644 arch/arm/mach-imx/cpuidle-imx6sx.c +Merging ixp4xx/next (19f949f52599 Linux 3.8) +$ git merge ixp4xx/next +Already up-to-date. +Merging keystone/next (b17275a4a6cc Merge branch 'for_3.19/soc' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging msm/for-next (81cf1e061d00 ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix) +$ git merge msm/for-next +Already up-to-date. +Merging mvebu/for-next (411e0175c248 Merge branch 'mvebu/defconfig' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/bus/mvebu-mbus.txt | 4 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/armada-375.dtsi | 2 +- + arch/arm/boot/dts/armada-38x.dtsi | 3 +- + arch/arm/boot/dts/kirkwood-pogo_e02.dts | 134 ++++++++++ + arch/arm/mach-mvebu/coherency.c | 51 +--- + drivers/bus/mvebu-mbus.c | 275 ++++++++++++++++----- + 8 files changed, 361 insertions(+), 110 deletions(-) + create mode 100644 arch/arm/boot/dts/kirkwood-pogo_e02.dts +Merging omap/for-next (0ccb4d1d525a Merge branch 'omap-for-v3.20/cleanup' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/mach-omap2/common.h +Removing arch/arm/mach-omap2/clkt2xxx_apll.c +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/am4372.dtsi | 16 ++ + arch/arm/boot/dts/am437x-gp-evm.dts | 106 ++++++++ + arch/arm/boot/dts/am437x-idk-evm.dts | 405 ++++++++++++++++++++++++++++ + arch/arm/boot/dts/am437x-sk-evm.dts | 217 ++++++++++----- + arch/arm/boot/dts/am43x-epos-evm.dts | 53 ++++ + arch/arm/boot/dts/am57xx-beagle-x15.dts | 120 +++++++++ + arch/arm/boot/dts/dra7.dtsi | 2 - + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 58 ++++ + arch/arm/boot/dts/omap3-cm-t3x30.dtsi | 3 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 49 ++++ + arch/arm/boot/dts/omap3-n900.dts | 3 +- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 5 + + arch/arm/boot/dts/omap3-sbc-t3517.dts | 4 + + arch/arm/boot/dts/omap3-sbc-t3530.dts | 10 +- + arch/arm/boot/dts/omap3-sbc-t3730.dts | 5 +- + arch/arm/configs/omap2plus_defconfig | 116 +++++--- + arch/arm/mach-omap1/irq.c | 5 - + arch/arm/mach-omap1/timer32k.c | 5 - + arch/arm/mach-omap2/Makefile | 2 +- + arch/arm/mach-omap2/cclock3xxx_data.c | 6 +- + arch/arm/mach-omap2/clkt2xxx_apll.c | 142 ---------- + arch/arm/mach-omap2/clock.c | 3 + + arch/arm/mach-omap2/clock.h | 1 - + arch/arm/mach-omap2/clock2xxx.h | 11 - + arch/arm/mach-omap2/cm2xxx.c | 10 - + arch/arm/mach-omap2/cm2xxx.h | 2 - + arch/arm/mach-omap2/cm33xx.c | 21 -- + arch/arm/mach-omap2/common.h | 11 +- + arch/arm/mach-omap2/control.h | 4 + + arch/arm/mach-omap2/dpll44xx.c | 20 -- + arch/arm/mach-omap2/id.c | 2 + + arch/arm/mach-omap2/io.c | 26 +- + arch/arm/mach-omap2/omap-pm-noop.c | 196 -------------- + arch/arm/mach-omap2/omap-pm.h | 192 ------------- + arch/arm/mach-omap2/omap_hwmod.c | 232 ---------------- + arch/arm/mach-omap2/omap_hwmod.h | 16 -- + arch/arm/mach-omap2/omap_phy_internal.c | 35 --- + arch/arm/mach-omap2/powerdomain.c | 82 ------ + arch/arm/mach-omap2/powerdomain.h | 5 - + arch/arm/mach-omap2/powerdomains3xxx_data.c | 2 +- + arch/arm/mach-omap2/prm3xxx.h | 1 - + arch/arm/mach-omap2/prm44xx_54xx.h | 1 - + arch/arm/mach-omap2/prm_common.c | 4 + + arch/arm/mach-omap2/soc.h | 4 +- + arch/arm/mach-omap2/ti81xx-restart.c | 34 +++ + arch/arm/mach-omap2/timer.c | 2 + + arch/arm/mach-omap2/twl-common.c | 307 +-------------------- + arch/arm/mach-omap2/twl-common.h | 8 - + arch/arm/mach-omap2/usb-musb.c | 12 +- + arch/arm/mach-omap2/usb.h | 2 - + arch/arm/mach-omap2/voltage.c | 110 -------- + arch/arm/mach-omap2/voltage.h | 13 - + arch/arm/plat-omap/dma.c | 8 - + 54 files changed, 1140 insertions(+), 1570 deletions(-) + create mode 100644 arch/arm/boot/dts/am437x-idk-evm.dts + delete mode 100644 arch/arm/mach-omap2/clkt2xxx_apll.c + create mode 100644 arch/arm/mach-omap2/ti81xx-restart.c +Merging omap-pending/for-next (99d076b74745 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 ++++++ + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 2 ++ + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 ++ + 3 files changed, 10 insertions(+) +Merging renesas/next (c20c776cff55 Merge branch 'heads/sh73a0-multiplatform-for-v3.20' into next) +$ git merge renesas/next +Resolved 'arch/arm/boot/dts/Makefile' using previous resolution. +Removing arch/arm/mach-shmobile/board-kzm9g-reference.c +Removing arch/arm/boot/dts/sh73a0-kzm9g-reference.dts +Auto-merging arch/arm/boot/dts/Makefile +CONFLICT (content): Merge conflict in arch/arm/boot/dts/Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 308af26680e0] Merge remote-tracking branch 'renesas/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/shmobile.txt | 2 - + .../devicetree/bindings/bus/simple-pm-bus.txt | 52 +++ + .../renesas-memory-controllers.txt | 44 +++ + .../bindings/power/renesas,sysc-rmobile.txt | 99 ++++++ + arch/arm/boot/dts/Makefile | 6 +- + arch/arm/boot/dts/r8a73a4.dtsi | 10 + + arch/arm/boot/dts/r8a7740.dtsi | 105 ++++++ + arch/arm/boot/dts/r8a7790-lager.dts | 1 + + arch/arm/boot/dts/r8a7790.dtsi | 29 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 1 + + arch/arm/boot/dts/r8a7791.dtsi | 31 +- + arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 366 -------------------- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 378 ++++++++++++++++++++- + arch/arm/boot/dts/sh73a0.dtsi | 262 ++++++++++++-- + arch/arm/configs/shmobile_defconfig | 19 +- + arch/arm/mach-shmobile/Kconfig | 22 +- + arch/arm/mach-shmobile/Makefile | 5 +- + arch/arm/mach-shmobile/Makefile.boot | 1 - + arch/arm/mach-shmobile/board-kzm9g-reference.c | 62 ---- + arch/arm/mach-shmobile/include/mach/zboot.h | 2 +- + arch/arm/mach-shmobile/pm-r8a7740.c | 14 + + arch/arm/mach-shmobile/pm-rmobile.c | 314 ++++++++++++++++- + arch/arm/mach-shmobile/pm-rmobile.h | 3 +- + arch/arm/mach-shmobile/pm-sh7372.c | 11 + + arch/arm/mach-shmobile/setup-r8a7778.c | 9 +- + arch/arm/mach-shmobile/setup-r8a7779.c | 9 +- + arch/arm/mach-shmobile/setup-sh73a0.c | 16 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 2 +- + drivers/bus/Kconfig | 53 +-- + drivers/bus/Makefile | 15 +- + drivers/bus/simple-pm-bus.c | 51 +++ + drivers/clk/shmobile/clk-sh73a0.c | 2 +- + drivers/sh/pm_runtime.c | 6 +- + include/dt-bindings/clock/sh73a0-clock.h | 3 + + 34 files changed, 1448 insertions(+), 557 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/simple-pm-bus.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/renesas-memory-controllers.txt + create mode 100644 Documentation/devicetree/bindings/power/renesas,sysc-rmobile.txt + delete mode 100644 arch/arm/boot/dts/sh73a0-kzm9g-reference.dts + delete mode 100644 arch/arm/mach-shmobile/board-kzm9g-reference.c + create mode 100644 drivers/bus/simple-pm-bus.c +Merging samsung/for-next (9663ad71912b Merge branch 'v3.20-next/update-samsung' into for-next) +$ git merge samsung/for-next +Removing arch/arm/mach-exynos/regs-sys.h +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../bindings/arm/samsung/exynos-chipid.txt | 12 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/exynos3250-monk.dts | 15 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 85 ++++- + arch/arm/boot/dts/exynos3250.dtsi | 21 ++ + arch/arm/boot/dts/exynos5250-snow.dts | 16 + + arch/arm/boot/dts/exynos5420-peach-pit.dts | 100 +++++- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 371 +++++++++++++++++++++ + arch/arm/boot/dts/exynos5800-peach-pi.dts | 101 +++++- + arch/arm/mach-exynos/exynos.c | 40 +-- + arch/arm/mach-exynos/include/mach/map.h | 3 - + arch/arm/mach-exynos/pm.c | 3 +- + arch/arm/mach-exynos/regs-pmu.h | 3 + + arch/arm/mach-exynos/regs-sys.h | 22 -- + arch/arm/mach-exynos/suspend.c | 84 ++++- + arch/arm/plat-samsung/cpu.c | 4 + + 16 files changed, 803 insertions(+), 78 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/samsung/exynos-chipid.txt + create mode 100644 arch/arm/boot/dts/exynos5422-odroidxu3.dts + delete mode 100644 arch/arm/mach-exynos/regs-sys.h +Merging sunxi/sunxi/for-next (ca735dafe21d Merge branches 'sunxi/dt-for-3.20' and 'sunxi/core-for-3.20' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/arm/sunxi/README | 1 - + Documentation/devicetree/bindings/clock/sunxi.txt | 2 +- + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/axp209.dtsi | 97 +++++++ + arch/arm/boot/dts/sun4i-a10-a1000.dts | 23 +- + arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts | 10 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 23 +- + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 21 +- + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 8 +- + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 11 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 21 +- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 68 ++++- + arch/arm/boot/dts/sun4i-a10.dtsi | 175 +++++++++--- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 72 ++++- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 25 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 70 +++-- + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 13 +- + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 25 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 66 ++++- + arch/arm/boot/dts/sun5i-a13.dtsi | 116 ++++++-- + arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 13 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 21 +- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 24 +- + arch/arm/boot/dts/sun6i-a31-m9.dts | 31 ++- + arch/arm/boot/dts/sun6i-a31.dtsi | 179 ++++++------ + arch/arm/boot/dts/sun6i-a31s-cs908.dts | 104 +++++++ + arch/arm/boot/dts/sun6i-a31s.dtsi | 58 ++++ + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 28 +- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 20 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 44 +-- + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 38 +-- + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 40 +-- + arch/arm/boot/dts/sun7i-a20-m3.dts | 18 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 24 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 24 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 79 +++++- + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 21 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 315 ++++++++++++++-------- + arch/arm/boot/dts/sun8i-a23-ippo-q8h-v5.dts | 17 +- + arch/arm/boot/dts/sun8i-a23.dtsi | 135 ++++++---- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 17 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 68 ++--- + arch/arm/boot/dts/sunxi-common-regulators.dtsi | 27 +- + arch/arm/configs/multi_v7_defconfig | 5 + + arch/arm/configs/sunxi_defconfig | 10 +- + arch/arm/mach-sunxi/platsmp.c | 2 +- + arch/arm/mach-sunxi/sunxi.c | 11 + + drivers/clk/sunxi/clk-factors.c | 10 +- + drivers/clk/sunxi/clk-factors.h | 7 +- + drivers/clk/sunxi/clk-mod0.c | 63 ++++- + drivers/clk/sunxi/clk-sun8i-mbus.c | 13 +- + drivers/clk/sunxi/clk-sun9i-core.c | 62 ++++- + drivers/clk/sunxi/clk-sunxi.c | 223 ++++++++++++++- + include/dt-bindings/dma/sun4i-a10.h | 56 ++++ + include/dt-bindings/pinctrl/sun4i-a10.h | 62 +++++ + 55 files changed, 2057 insertions(+), 662 deletions(-) + create mode 100644 arch/arm/boot/dts/axp209.dtsi + create mode 100644 arch/arm/boot/dts/sun6i-a31s-cs908.dts + create mode 100644 arch/arm/boot/dts/sun6i-a31s.dtsi + create mode 100644 include/dt-bindings/dma/sun4i-a10.h + create mode 100644 include/dt-bindings/pinctrl/sun4i-a10.h +Merging tegra/for-next (4fd40ac71480 Merge branch for-3.20/soc into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra124-nyan-big.dts | 2 ++ + arch/arm/boot/dts/tegra20.dtsi | 10 +++++----- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 +- + arch/arm/boot/dts/tegra30.dtsi | 2 +- + arch/arm/configs/tegra_defconfig | 2 -- + drivers/soc/tegra/pmc.c | 7 +++++-- + include/soc/tegra/pm.h | 2 +- + 7 files changed, 15 insertions(+), 12 deletions(-) +Merging arm64/for-next/core (6083fe74b7bf arm64: respect mem= for EFI) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/kvm/hyp.S +Auto-merging arch/arm64/include/asm/kvm_emulate.h +Merge made by the 'recursive' strategy. + arch/arm64/Makefile | 3 - + arch/arm64/include/asm/cachetype.h | 29 +- + arch/arm64/include/asm/efi.h | 38 ++- + arch/arm64/include/asm/esr.h | 117 +++++--- + arch/arm64/include/asm/kvm_arm.h | 73 +---- + arch/arm64/include/asm/kvm_emulate.h | 28 +- + arch/arm64/include/asm/mmu.h | 5 +- + arch/arm64/include/asm/pgtable.h | 5 + + arch/arm64/kernel/Makefile | 2 +- + arch/arm64/kernel/cacheinfo.c | 128 +++++++++ + arch/arm64/kernel/cpuinfo.c | 12 - + arch/arm64/kernel/efi.c | 379 +++++++++---------------- + arch/arm64/kernel/entry.S | 64 ++--- + arch/arm64/kernel/setup.c | 21 +- + arch/arm64/kernel/signal32.c | 2 +- + arch/arm64/kernel/traps.c | 50 +++- + arch/arm64/kvm/emulate.c | 5 +- + arch/arm64/kvm/handle_exit.c | 39 +-- + arch/arm64/kvm/hyp.S | 17 +- + arch/arm64/kvm/inject_fault.c | 14 +- + arch/arm64/kvm/sys_regs.c | 23 +- + arch/arm64/mm/fault.c | 2 +- + arch/arm64/mm/init.c | 19 ++ + arch/arm64/mm/mmu.c | 134 ++------- + drivers/firmware/efi/efi.c | 56 ++-- + drivers/firmware/efi/libstub/arm-stub.c | 59 ++++ + drivers/firmware/efi/libstub/efi-stub-helper.c | 25 +- + drivers/firmware/efi/libstub/efistub.h | 4 + + drivers/firmware/efi/libstub/fdt.c | 62 +++- + include/linux/efi.h | 2 + + 30 files changed, 776 insertions(+), 641 deletions(-) + create mode 100644 arch/arm64/kernel/cacheinfo.c +Merging blackfin/for-linus (275f5a8573e7 blackfin: defconfigs: cleanup unused CONFIG_MTD_CHAR, add MTD_SPI_NOR for BF537-STAMP) +$ git merge blackfin/for-linus +Merge made by the 'recursive' strategy. + arch/blackfin/configs/BF518F-EZBRD_defconfig | 1 - + arch/blackfin/configs/BF527-TLL6527M_defconfig | 1 - + arch/blackfin/configs/BF533-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF533-STAMP_defconfig | 1 - + arch/blackfin/configs/BF537-STAMP_defconfig | 3 ++- + arch/blackfin/configs/BF538-EZKIT_defconfig | 1 - + arch/blackfin/configs/BF561-ACVILON_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT-SMP_defconfig | 1 - + arch/blackfin/configs/BF561-EZKIT_defconfig | 1 - + arch/blackfin/configs/CM-BF527_defconfig | 1 - + arch/blackfin/configs/CM-BF533_defconfig | 1 - + arch/blackfin/configs/CM-BF537E_defconfig | 1 - + arch/blackfin/configs/CM-BF537U_defconfig | 1 - + arch/blackfin/configs/CM-BF548_defconfig | 1 - + arch/blackfin/configs/CM-BF561_defconfig | 1 - + arch/blackfin/configs/DNP5370_defconfig | 1 - + arch/blackfin/configs/IP0X_defconfig | 1 - + arch/blackfin/configs/PNAV-10_defconfig | 1 - + arch/blackfin/configs/SRV1_defconfig | 1 - + arch/blackfin/configs/TCM-BF518_defconfig | 1 - + arch/blackfin/configs/TCM-BF537_defconfig | 1 - + arch/blackfin/kernel/kgdb.c | 12 ++++-------- + arch/blackfin/mach-bf609/boards/ezkit.c | 8 ++++---- + 23 files changed, 10 insertions(+), 33 deletions(-) +Merging c6x/for-linux-next (ae72758f1dd9 c6x: fix build failure caused by cache.h) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (79a8480adf0e CRIS: Fix missing NR_CPUS in menuconfig) +$ git merge cris/for-next +Merge made by the 'recursive' strategy. + arch/cris/Kconfig | 4 ++++ + arch/cris/arch-v32/drivers/sync_serial.c | 2 +- + arch/cris/arch-v32/kernel/time.c | 2 ++ + arch/cris/kernel/crisksyms.c | 1 + + arch/cris/mm/fault.c | 4 +++- + 5 files changed, 11 insertions(+), 2 deletions(-) +Merging hexagon/linux-next (8914d7e85780 Hexagon: fix signal delivery for debug traps) +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (0fd2468fd035 Merge branch 'misc-3.19' into next) +$ git merge ia64/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging m68k/for-next (87511d09206d m68k/atari: Remove obsolete IRQ_TYPE_*) +$ git merge m68k/for-next +Removing arch/m68k/include/asm/futex.h +Merge made by the 'recursive' strategy. + arch/m68k/atari/atakeyb.c | 72 +-------------------------- + arch/m68k/atari/stdma.c | 2 +- + arch/m68k/atari/time.c | 3 +- + arch/m68k/include/asm/Kbuild | 1 + + arch/m68k/include/asm/atariints.h | 5 -- + arch/m68k/include/asm/futex.h | 94 ----------------------------------- + arch/m68k/include/asm/macintosh.h | 2 +- + arch/m68k/mac/config.c | 32 ++++++------ + arch/m68k/mvme147/config.c | 46 ----------------- + arch/m68k/mvme16x/rtc.c | 2 +- + drivers/net/ethernet/amd/atarilance.c | 8 +-- + drivers/parport/parport_atari.c | 4 +- + drivers/video/fbdev/atafb.c | 3 +- + sound/oss/dmasound/dmasound_atari.c | 2 +- + 14 files changed, 32 insertions(+), 244 deletions(-) + delete mode 100644 arch/m68k/include/asm/futex.h +Merging m68knommu/for-next (8d84d4aaf311 arch: m68k: 68360: config: Remove unused function) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/68360/commproc.c | 8 ++++---- + arch/m68k/68360/config.c | 13 ------------- + arch/m68k/include/asm/commproc.h | 24 +----------------------- + 3 files changed, 5 insertions(+), 40 deletions(-) +Merging metag/for-next (f93125ae17d1 metag: cachepart: Fix failure check) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (132d5dfc0469 microblaze: whitespace fix) +$ git merge microblaze/next +Removing arch/microblaze/kernel/prom_parse.c +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/delay.h | 4 +-- + arch/microblaze/include/asm/kgdb.h | 3 +++ + arch/microblaze/include/asm/linkage.h | 16 +----------- + arch/microblaze/include/asm/pgalloc.h | 14 +++++------ + arch/microblaze/include/asm/syscall.h | 2 +- + arch/microblaze/include/asm/uaccess.h | 6 ++--- + arch/microblaze/include/asm/unistd.h | 2 +- + arch/microblaze/include/uapi/asm/unistd.h | 1 + + arch/microblaze/kernel/Makefile | 2 +- + arch/microblaze/kernel/cpu/cache.c | 6 ++--- + arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | 2 +- + arch/microblaze/kernel/cpu/cpuinfo-static.c | 2 +- + arch/microblaze/kernel/cpu/cpuinfo.c | 7 ++++++ + arch/microblaze/kernel/intc.c | 8 +++--- + arch/microblaze/kernel/kgdb.c | 10 +++++--- + arch/microblaze/kernel/prom_parse.c | 35 --------------------------- + arch/microblaze/kernel/ptrace.c | 4 +-- + arch/microblaze/kernel/reset.c | 1 - + arch/microblaze/kernel/signal.c | 4 +-- + arch/microblaze/kernel/syscall_table.S | 1 + + arch/microblaze/kernel/unwind.c | 2 +- + 21 files changed, 48 insertions(+), 84 deletions(-) + delete mode 100644 arch/microblaze/kernel/prom_parse.c +Merging mips/mips-for-linux-next (5500c246d920 Merge branch '3.19-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/Kconfig | 23 +++++++++----------- + arch/mips/configs/malta_defconfig | 16 ++++---------- + arch/mips/fw/arc/misc.c | 26 +++++++++++++--------- + arch/mips/include/asm/checksum.h | 40 ++++++++++++---------------------- + arch/mips/include/asm/fpu.h | 43 ++++++++++++++++++++++--------------- + arch/mips/include/asm/mips-cm.h | 4 ++-- + arch/mips/include/asm/sgialib.h | 8 +++++-- + arch/mips/include/uapi/asm/unistd.h | 15 +++++++------ + arch/mips/jz4740/irq.c | 3 +++ + arch/mips/kernel/elf.c | 8 +++---- + arch/mips/kernel/scall32-o32.S | 2 ++ + arch/mips/kernel/scall64-64.S | 1 + + arch/mips/kernel/scall64-n32.S | 1 + + arch/mips/kernel/scall64-o32.S | 2 ++ + arch/mips/kernel/smp-cmp.c | 4 ++-- + arch/mips/kernel/smp-mt.c | 3 ++- + arch/mips/sgi-ip27/ip27-reset.c | 7 +++--- + arch/mips/sgi-ip32/ip32-reset.c | 7 +++--- + 18 files changed, 112 insertions(+), 101 deletions(-) +Merging nios2/nios2-next (1b0f44923e18 nios2: Use preempt_schedule_irq) +$ git merge nios2/nios2-next +Already up-to-date. +Merging openrisc/for-upstream (548dafe880ad openrisc: Use get_signal() signal_setup_done()) +$ git merge openrisc/for-upstream +Already up-to-date. +Merging parisc/for-next (6c700d71f7fa [PARISC] hpux: Remove obsolete regs parameter from do_execve() in hpux_execve()) +$ git merge parisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (b2776bf7149b Linux 3.18) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (d557b09800da powerpc/mm/thp: Use tlbiel if possible) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (9a4fc4eaf111 powerpc/kvm: Create proper names for the kvm_host_state PMU fields) +$ git merge powerpc-mpe/next +Auto-merging drivers/misc/cxl/file.c +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/asm-offsets.c | 15 +++++++++++++-- + arch/powerpc/kvm/book3s_hv_interrupts.S | 26 +++++++++++++------------- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 28 ++++++++++++++-------------- + arch/powerpc/lib/Makefile | 3 +-- + arch/powerpc/platforms/44x/Kconfig | 1 - + arch/powerpc/platforms/pseries/Kconfig | 20 ++++++++++---------- + arch/powerpc/sysdev/ppc4xx_hsta_msi.c | 2 +- + arch/powerpc/xmon/xmon.c | 14 ++------------ + drivers/misc/cxl/cxl.h | 7 +++++++ + drivers/misc/cxl/fault.c | 6 ++++++ + drivers/misc/cxl/file.c | 4 +++- + drivers/misc/cxl/native.c | 1 + + drivers/misc/cxl/pci.c | 2 +- + 13 files changed, 72 insertions(+), 57 deletions(-) +Merging fsl/next (76f3e2929bb6 powerpc/config: Enable memory driver) +$ 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 (725908110a1f s390: add SMT support) +$ git merge s390/features +Auto-merging arch/s390/mm/pgtable.c +Auto-merging arch/s390/include/asm/sigp.h +Merge made by the 'recursive' strategy. + Documentation/s390/Debugging390.txt | 493 +++++++++++++++++------------------- + arch/s390/Kconfig | 35 ++- + arch/s390/Makefile | 2 + + arch/s390/boot/compressed/misc.c | 3 +- + arch/s390/crypto/aes_s390.c | 4 +- + arch/s390/include/asm/cpu_mf.h | 14 + + arch/s390/include/asm/elf.h | 8 +- + arch/s390/include/asm/pgtable.h | 4 + + arch/s390/include/asm/reset.h | 3 +- + arch/s390/include/asm/sclp.h | 7 +- + arch/s390/include/asm/sigp.h | 1 + + arch/s390/include/asm/smp.h | 4 + + arch/s390/include/asm/sysinfo.h | 20 +- + arch/s390/include/asm/topology.h | 4 + + arch/s390/kernel/base.S | 3 +- + arch/s390/kernel/cache.c | 388 +++++++--------------------- + arch/s390/kernel/dis.c | 9 +- + arch/s390/kernel/entry.h | 4 +- + arch/s390/kernel/ftrace.c | 95 +++---- + arch/s390/kernel/head.S | 4 +- + arch/s390/kernel/ipl.c | 11 +- + arch/s390/kernel/machine_kexec.c | 19 +- + arch/s390/kernel/process.c | 10 - + arch/s390/kernel/sclp.S | 3 +- + arch/s390/kernel/setup.c | 3 + + arch/s390/kernel/smp.c | 261 +++++++++++++++---- + arch/s390/kernel/sysinfo.c | 8 + + arch/s390/kernel/topology.c | 63 +++-- + arch/s390/kernel/vtime.c | 58 ++++- + arch/s390/mm/fault.c | 2 +- + arch/s390/mm/init.c | 9 +- + arch/s390/mm/mmap.c | 142 ++++++++++- + arch/s390/mm/pgtable.c | 6 +- + arch/s390/pci/pci_mmio.c | 4 +- + drivers/s390/char/hmcdrv_mod.c | 1 - + drivers/s390/char/sclp_early.c | 49 +++- + drivers/s390/cio/cio.c | 2 +- + drivers/s390/cio/idset.c | 20 -- + drivers/s390/cio/idset.h | 2 - + 39 files changed, 1006 insertions(+), 772 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 (b9f705758a4f tile: enable sparse checks for get/put_user) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/include/asm/uaccess.h | 37 ++++++++++++++++++---------------- + arch/tile/include/uapi/asm/byteorder.h | 4 +--- + 2 files changed, 21 insertions(+), 20 deletions(-) +Merging uml/next (989e59fa41c5 um: Include generic barrier.h) +$ git merge uml/next +Resolved 'arch/um/include/asm/Kbuild' using previous resolution. +Removing arch/x86/um/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ppc/shared/sysdep/skas_ptrace.h +Removing arch/um/sys-ia64/sysdep/skas_ptrace.h +Auto-merging arch/um/os-Linux/skas/process.c +Auto-merging arch/um/kernel/um_arch.c +Auto-merging arch/um/kernel/trap.c +Auto-merging arch/um/kernel/ptrace.c +Removing arch/um/include/shared/skas_ptrace.h +Removing arch/um/include/shared/skas/proc_mm.h +Auto-merging arch/um/include/shared/os.h +Auto-merging arch/um/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/um/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 108037a4487b] Merge remote-tracking branch 'uml/next' +$ git diff -M --stat --summary HEAD^.. + arch/um/include/shared/os.h | 2 - + arch/um/include/shared/skas/proc_mm.h | 44 ------ + arch/um/include/shared/skas/skas.h | 3 - + arch/um/include/shared/skas_ptrace.h | 14 -- + arch/um/kernel/ptrace.c | 32 ---- + arch/um/kernel/reboot.c | 35 ++--- + arch/um/kernel/skas/mmu.c | 68 +++------ + arch/um/kernel/skas/process.c | 27 ---- + arch/um/kernel/trap.c | 2 +- + arch/um/kernel/um_arch.c | 10 -- + arch/um/os-Linux/process.c | 16 -- + arch/um/os-Linux/skas/mem.c | 100 ++---------- + arch/um/os-Linux/skas/process.c | 200 ++++++------------------ + arch/um/os-Linux/start_up.c | 154 ------------------- + arch/um/sys-ia64/sysdep/skas_ptrace.h | 22 --- + arch/um/sys-ppc/shared/sysdep/skas_ptrace.h | 22 --- + arch/x86/um/ldt.c | 227 ++++++---------------------- + arch/x86/um/shared/sysdep/faultinfo_32.h | 3 - + arch/x86/um/shared/sysdep/faultinfo_64.h | 3 - + arch/x86/um/shared/sysdep/skas_ptrace.h | 22 --- + 20 files changed, 148 insertions(+), 858 deletions(-) + delete mode 100644 arch/um/include/shared/skas/proc_mm.h + delete mode 100644 arch/um/include/shared/skas_ptrace.h + delete mode 100644 arch/um/sys-ia64/sysdep/skas_ptrace.h + delete mode 100644 arch/um/sys-ppc/shared/sysdep/skas_ptrace.h + delete mode 100644 arch/x86/um/shared/sysdep/skas_ptrace.h +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (1f2fdbd0078c xtensa: disable link optimization) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (1edb647bb954 Btrfs: remove non-sense btrfs_error_discard_extent() function) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (388cfdc9bc19 libceph: require cephx message signature by default) +$ git merge ceph/master +Resolved 'fs/ceph/snap.c' using previous resolution. +Resolved 'fs/ceph/super.c' using previous resolution. +Resolved 'fs/ceph/super.h' using previous resolution. +Resolved 'net/ceph/auth_x.c' using previous resolution. +Auto-merging net/ceph/auth_x.c +CONFLICT (content): Merge conflict in net/ceph/auth_x.c +Auto-merging fs/ceph/super.h +CONFLICT (content): Merge conflict in fs/ceph/super.h +Auto-merging fs/ceph/super.c +CONFLICT (content): Merge conflict in fs/ceph/super.c +Auto-merging fs/ceph/snap.c +CONFLICT (content): Merge conflict in fs/ceph/snap.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f85f497a7bab] Merge remote-tracking branch 'ceph/master' +$ git diff -M --stat --summary HEAD^.. +Merging cifs/for-next (cac8894b8ed7 cifs: use memzero_explicit to clear stack buffer) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/smbencrypt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging configfs/linux-next (b930c26416c4 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs) +$ git merge configfs/linux-next +Already up-to-date. +Merging ecryptfs/next (e7a823be2adc Merge tag 'linux-kselftest-3.19-rc-5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) +$ git merge ecryptfs/next +Already up-to-date. +Merging ext3/for_next (c38fda3fe816 jbd: drop jbd_ENOSYS debug) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext3/super.c | 2 ++ + fs/isofs/util.c | 18 ++++-------------- + fs/udf/Kconfig | 10 ++++++---- + fs/udf/inode.c | 28 +++++++++++++++++----------- + fs/udf/super.c | 1 + + include/linux/jbd.h | 9 --------- + include/linux/jbd2.h | 9 --------- + 7 files changed, 30 insertions(+), 47 deletions(-) +Merging ext4/dev (4033d19d28ab ext4: add optimization for the lazytime mount option) +$ git merge ext4/dev +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/ext4/inode.c | 71 ++++++++++++++++++++++++-- + fs/ext4/super.c | 10 ++++ + fs/fs-writeback.c | 62 +++++++++++++++++++---- + fs/gfs2/file.c | 4 +- + fs/inode.c | 106 +++++++++++++++++++++++++++++++++------ + fs/jfs/file.c | 2 +- + fs/libfs.c | 2 +- + fs/proc_namespace.c | 1 + + fs/sync.c | 8 +++ + include/linux/backing-dev.h | 1 + + include/linux/fs.h | 10 ++++ + include/trace/events/ext4.h | 30 +++++++++++ + include/trace/events/writeback.h | 60 +++++++++++++++++++++- + include/uapi/linux/fs.h | 4 +- + mm/backing-dev.c | 10 +++- + 15 files changed, 343 insertions(+), 38 deletions(-) +Merging f2fs/dev (3857cef8022d f2fs: update memory footprint information) +$ git merge f2fs/dev +Auto-merging include/uapi/linux/fs.h +Merge made by the 'recursive' strategy. + fs/f2fs/Kconfig | 10 +++ + fs/f2fs/Makefile | 1 + + fs/f2fs/acl.c | 4 +- + fs/f2fs/checkpoint.c | 47 +++++++------ + fs/f2fs/data.c | 127 +++++++++++++++++++---------------- + fs/f2fs/debug.c | 53 ++++++++++----- + fs/f2fs/dir.c | 3 +- + fs/f2fs/f2fs.h | 54 ++++++++++----- + fs/f2fs/file.c | 123 +++++++++++++++++++++++++++++++--- + fs/f2fs/gc.c | 20 +----- + fs/f2fs/gc.h | 7 +- + fs/f2fs/inline.c | 7 +- + fs/f2fs/inode.c | 37 +++++------ + fs/f2fs/node.c | 114 ++++++++++++++----------------- + fs/f2fs/node.h | 45 +++++++++---- + fs/f2fs/recovery.c | 3 +- + fs/f2fs/segment.c | 144 +++++++++++++++++++++------------------ + fs/f2fs/super.c | 13 ++-- + fs/f2fs/trace.c | 159 ++++++++++++++++++++++++++++++++++++++++++++ + fs/f2fs/trace.h | 46 +++++++++++++ + fs/xfs/xfs_fs.h | 8 +-- + include/linux/f2fs_fs.h | 2 + + include/trace/events/f2fs.h | 134 +++++++++++++++++-------------------- + include/uapi/linux/fs.h | 8 +++ + 24 files changed, 771 insertions(+), 398 deletions(-) + create mode 100644 fs/f2fs/trace.c + create mode 100644 fs/f2fs/trace.h +Merging fscache/fscache (1a8ed18fb7db cachefiles: remove two unused pagevecs.) +$ git merge fscache/fscache +Resolved 'fs/fscache/object.c' using previous resolution. +Auto-merging fs/fscache/object.c +CONFLICT (content): Merge conflict in fs/fscache/object.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7a723854a8cf] Merge remote-tracking branch 'fscache/fscache' +$ git diff -M --stat --summary HEAD^.. +Merging fuse/for-next (9759bd518994 fuse: add memory barrier to INIT) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/master (3566c9647678 GFS2: fix sprintf format specifier) +$ git merge gfs2/master +Merge made by the 'recursive' strategy. + fs/gfs2/glock.c | 13 +++---------- + fs/gfs2/recovery.c | 2 +- + fs/gfs2/sys.c | 2 +- + 3 files changed, 5 insertions(+), 12 deletions(-) +Merging jfs/jfs-next (e1f1fe798d2f jfs: get rid of homegrown endianness helpers) +$ git merge jfs/jfs-next +Removing fs/jfs/endian24.h +Merge made by the 'recursive' strategy. + fs/jfs/endian24.h | 49 ------------------------------------------------ + fs/jfs/jfs_dtree.c | 4 ++-- + fs/jfs/jfs_types.h | 55 ++++++++++++++++++++++++++++++++---------------------- + fs/jfs/jfs_xtree.h | 25 +++++++++---------------- + 4 files changed, 44 insertions(+), 89 deletions(-) + delete mode 100644 fs/jfs/endian24.h +Merging logfs/master (339466142b3f Fix the call to BUG() caused by no free segment found) +$ git merge logfs/master +Auto-merging fs/logfs/super.c +Merge made by the 'recursive' strategy. + fs/logfs/dev_mtd.c | 2 +- + fs/logfs/super.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (ec6f34e5b552 Linux 3.19-rc5) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (0ec016e3e02f nfsd4: tweak rd_dircount accounting) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/nfsd/nfs4state.c | 8 ++++---- + fs/nfsd/nfs4xdr.c | 7 ++++--- + fs/nfsd/state.h | 2 +- + 3 files changed, 9 insertions(+), 8 deletions(-) +Merging omfs/for-next (976d167615b6 Linux 3.1-rc9) +$ git merge omfs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (4330397e4e8a ovl: discard independent cursor in readdir()) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/readdir.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.txt | 28 ++ + fs/overlayfs/copy_up.c | 5 +- + fs/overlayfs/dir.c | 28 +- + fs/overlayfs/inode.c | 12 +- + fs/overlayfs/overlayfs.h | 18 +- + fs/overlayfs/readdir.c | 181 +++++----- + fs/overlayfs/super.c | 564 +++++++++++++++++++++----------- + 7 files changed, 517 insertions(+), 319 deletions(-) +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (f15844e0777f 9P: fix return value in v9fs_fid_xattr_set) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (f38aed975c0c UBI: Fix invalid vfree()) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (ad7df6e858ef Merge branch 'xfs-sb-logging-rework' into for-next) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/xfs.txt | 17 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 14 +- + fs/xfs/libxfs/xfs_bmap.h | 33 ++++ + fs/xfs/libxfs/xfs_format.h | 24 +-- + fs/xfs/{ => libxfs}/xfs_fs.h | 0 + fs/xfs/libxfs/xfs_sb.c | 333 ++++++++++++++++---------------------- + fs/xfs/libxfs/xfs_sb.h | 11 +- + fs/xfs/libxfs/xfs_shared.h | 33 ++-- + fs/xfs/libxfs/xfs_trans_resv.c | 14 -- + fs/xfs/libxfs/xfs_trans_resv.h | 1 - + fs/xfs/{ => libxfs}/xfs_types.h | 0 + fs/xfs/xfs_bmap_util.h | 37 +---- + fs/xfs/xfs_buf_item.c | 2 +- + fs/xfs/xfs_dquot.h | 2 +- + fs/xfs/xfs_fsops.c | 33 +--- + fs/xfs/xfs_inode.c | 134 ++++++++++++++- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_iomap.c | 2 +- + fs/xfs/xfs_iomap.h | 2 +- + fs/xfs/xfs_iops.c | 21 ++- + fs/xfs/xfs_log.c | 28 +++- + fs/xfs/xfs_mount.c | 107 +++--------- + fs/xfs/xfs_mount.h | 5 +- + fs/xfs/xfs_qm.c | 43 +---- + fs/xfs/xfs_qm.h | 1 - + fs/xfs/xfs_qm_syscalls.c | 14 +- + fs/xfs/xfs_super.c | 15 +- + fs/xfs/xfs_sysctl.c | 18 --- + 29 files changed, 433 insertions(+), 515 deletions(-) + rename fs/xfs/{ => libxfs}/xfs_fs.h (100%) + rename fs/xfs/{ => libxfs}/xfs_types.h (100%) +Merging file-locks/linux-next (3d8e560de4a0 locks: consolidate NULL i_flctx checks in locks_remove_file) +$ git merge file-locks/linux-next +Auto-merging include/linux/fs.h +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/inode.c +Merge made by the 'recursive' strategy. + fs/ceph/locks.c | 64 +++--- + fs/ceph/mds_client.c | 4 - + fs/cifs/file.c | 34 +-- + fs/inode.c | 3 +- + fs/lockd/svcsubs.c | 26 ++- + fs/locks.c | 567 +++++++++++++++++++++++++++------------------------ + fs/nfs/delegation.c | 23 ++- + fs/nfs/nfs4state.c | 70 ++++--- + fs/nfs/pagelist.c | 6 +- + fs/nfs/write.c | 41 +++- + fs/nfsd/nfs4state.c | 21 +- + fs/read_write.c | 2 +- + include/linux/fs.h | 33 ++- + 13 files changed, 499 insertions(+), 395 deletions(-) +Merging vfs/for-next (88174fd2c8fb kill d_validate()) +$ git merge vfs/for-next +Merge made by the 'recursive' strategy. + fs/dcache.c | 31 -------------- + fs/ncpfs/dir.c | 98 +++++++++++++++++++++++--------------------- + fs/ncpfs/ncp_fs_i.h | 1 + + fs/ncpfs/ncplib_kernel.h | 30 -------------- + include/linux/dcache.h | 3 -- + security/selinux/selinuxfs.c | 52 ++--------------------- + 6 files changed, 55 insertions(+), 160 deletions(-) +Merging pci/next (75f30c3d9949 Merge branches 'pci/host-keystone', 'pci/host-layerscape', 'pci/host-rcar' and 'pci/host-tegra' into next) +$ git merge pci/next +Auto-merging drivers/pci/pci.c +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 3 ++ + arch/arm/include/asm/mach/pci.h | 6 ---- + arch/arm/include/asm/pci.h | 7 ----- + arch/arm/kernel/bios32.c | 3 -- + arch/arm/mach-cns3xxx/pcie.c | 40 ++++++++++++--------------- + arch/arm64/kernel/pci.c | 22 --------------- + drivers/pci/host/pci-keystone.c | 2 +- + drivers/pci/host/pci-layerscape.c | 1 - + drivers/pci/host/pci-mvebu.c | 15 ++-------- + drivers/pci/host/pci-tegra.c | 13 --------- + drivers/pci/host/pcie-designware.c | 3 -- + drivers/pci/host/pcie-rcar.c | 7 ++--- + drivers/pci/hotplug/cpci_hotplug_core.c | 3 +- + drivers/pci/pci.c | 49 +++++++++++++++++++++++++++++++++ + 14 files changed, 75 insertions(+), 99 deletions(-) +Merging hid/for-next (88cbbe74e88b Merge branch 'for-3.20/wacom' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/usbhid/hid-quirks.c +Auto-merging drivers/hid/hid-logitech-hidpp.c +Auto-merging drivers/hid/hid-input.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging drivers/hid/hid-core.c +Auto-merging drivers/hid/Kconfig +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 12 ++- + drivers/hid/Makefile | 1 + + drivers/hid/hid-betopff.c | 160 +++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-core.c | 31 ++++++-- + drivers/hid/hid-ids.h | 9 +++ + drivers/hid/hid-input.c | 26 ++++++- + drivers/hid/hid-lenovo.c | 79 ++++++++++++++++++- + drivers/hid/hid-logitech-hidpp.c | 81 +++++++++++++------- + drivers/hid/hid-microsoft.c | 2 + + drivers/hid/hid-rmi.c | 118 ++++++++++++++++++++++++----- + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hid/wacom_sys.c | 6 +- + drivers/hid/wacom_wac.c | 73 +++++++++--------- + drivers/hid/wacom_wac.h | 10 +++ + include/linux/hid.h | 4 +- + 15 files changed, 512 insertions(+), 101 deletions(-) + create mode 100644 drivers/hid/hid-betopff.c +Merging i2c/i2c/for-next (789d10deed25 Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/i2c/i2c-rk3x.txt | 14 ++ + .../devicetree/bindings/i2c/trivial-devices.txt | 6 +- + drivers/i2c/busses/i2c-cadence.c | 189 +++++++++++++-------- + drivers/i2c/busses/i2c-imx.c | 10 +- + drivers/i2c/busses/i2c-pmcmsp.c | 7 - + drivers/i2c/busses/i2c-rk3x.c | 99 ++++++++--- + drivers/i2c/i2c-core.c | 138 ++------------- + include/linux/i2c.h | 4 - + 8 files changed, 230 insertions(+), 237 deletions(-) +Merging jdelvare-hwmon/master (ae530d4403e9 hwmon: (i5500_temp) Convert to use ATTRIBUTE_GROUPS macro) +$ git merge jdelvare-hwmon/master +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'recursive' strategy. + drivers/hwmon/Kconfig | 10 +++ + drivers/hwmon/Makefile | 1 + + drivers/hwmon/i5500_temp.c | 149 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 160 insertions(+) + create mode 100644 drivers/hwmon/i5500_temp.c +Merging hwmon-staging/hwmon-next (9dc9845ac3f8 hwmon: (ina2xx) Add ina231 compatible string) +$ git merge hwmon-staging/hwmon-next +Auto-merging drivers/hwmon/Kconfig +Merge made by the 'recursive' strategy. + Documentation/hwmon/ina2xx | 23 +++- + drivers/hwmon/Kconfig | 4 +- + drivers/hwmon/ina2xx.c | 334 +++++++++++++++++++++++++++++++++++++++------ + drivers/hwmon/nct7802.c | 2 +- + 4 files changed, 315 insertions(+), 48 deletions(-) +Merging v4l-dvb/master (2ea3258b238c Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kbuild/for-next (5ea04a1a0860 Merge branch 'kbuild/kbuild' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig +Auto-merging drivers/hwmon/Kconfig +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/makefiles.txt | 20 ++--- + Documentation/lto-build | 173 ++++++++++++++++++++++++++++++++++++ + Kbuild | 61 +++++-------- + Makefile | 23 ++++- + arch/mips/pmcs-msp71xx/Kconfig | 6 +- + arch/parisc/Makefile | 2 +- + arch/powerpc/Makefile | 6 +- + arch/x86/Kconfig | 2 +- + arch/x86/Makefile.um | 2 +- + drivers/connector/Kconfig | 2 +- + drivers/hwmon/Kconfig | 2 +- + drivers/hwmon/pmbus/Kconfig | 2 +- + drivers/i2c/Kconfig | 4 +- + drivers/iio/Kconfig | 4 +- + drivers/isdn/hardware/mISDN/Kconfig | 2 +- + drivers/md/Kconfig | 4 +- + drivers/md/persistent-data/Kconfig | 2 +- + drivers/net/ethernet/ti/Kconfig | 4 +- + drivers/net/usb/Kconfig | 12 +-- + drivers/net/wireless/rt2x00/Kconfig | 6 +- + drivers/pci/pcie/aer/Kconfig | 2 +- + drivers/rtc/Kconfig | 8 +- + drivers/spi/Kconfig | 6 +- + drivers/staging/board/Kconfig | 2 +- + drivers/staging/emxx_udc/Kconfig | 2 +- + drivers/staging/iio/Kconfig | 4 +- + drivers/tty/serial/Kconfig | 2 +- + drivers/usb/gadget/Kconfig | 34 +++---- + drivers/usb/gadget/legacy/Kconfig | 2 +- + drivers/usb/gadget/udc/Kconfig | 4 +- + drivers/usb/phy/Kconfig | 2 +- + init/Kconfig | 81 ++++++++++++++++- + kernel/gcov/Kconfig | 2 +- + kernel/gcov/Makefile | 36 ++------ + lib/Kconfig | 30 +++---- + lib/Kconfig.debug | 2 +- + mm/Kconfig | 22 ++--- + net/Kconfig | 14 +-- + net/sched/Kconfig | 2 +- + net/switchdev/Kconfig | 2 +- + scripts/Kbuild.include | 7 +- + scripts/Makefile.clean | 3 - + scripts/Makefile.lto | 84 +++++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/kconfig/merge_config.sh | 5 ++ + scripts/link-vmlinux.sh | 2 +- + scripts/package/builddeb | 17 +++- + security/integrity/Kconfig | 4 +- + security/integrity/evm/Kconfig | 2 +- + 49 files changed, 521 insertions(+), 208 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (95edca5c523c localmodconfig: Add config depends by default settings) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (8ce20e750623 Merge branch 'for-3.19-fixes' into for-next) +$ git merge libata/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 75 ++++++++++-------- + drivers/ata/Kconfig | 3 +- + drivers/ata/ahci.c | 1 - + drivers/ata/ahci_xgene.c | 185 ++++++++++++++++++++++++++++++++++++++++++- + drivers/ata/libahci.c | 2 +- + drivers/ata/libata-core.c | 58 +++++++------- + drivers/ata/libata-eh.c | 2 +- + drivers/ata/libata-scsi.c | 14 ++-- + drivers/ata/libata.h | 1 - + drivers/ata/sata_dwc_460ex.c | 142 ++++++++++++++++----------------- + include/linux/ata.h | 2 +- + include/linux/libata.h | 1 + + 12 files changed, 332 insertions(+), 154 deletions(-) +Merging pm/linux-next (794c3a0a9380 Merge branches 'acpi-pm', 'acpi-processor' and 'acpi-video') +$ git merge pm/linux-next +Already up-to-date. +Merging idle/next (f7c0e22f2d14 Merge branch 'turbostat' into release) +$ git merge idle/next +Resolved 'arch/x86/include/uapi/asm/msr-index.h' using previous resolution. +Auto-merging drivers/cpufreq/Makefile +Auto-merging arch/x86/include/uapi/asm/msr-index.h +CONFLICT (content): Merge conflict in arch/x86/include/uapi/asm/msr-index.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2e8b2a904f83] Merge remote-tracking branch 'idle/next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/include/uapi/asm/msr-index.h | 5 + + drivers/cpufreq/Kconfig.x86 | 10 ++ + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/sfi-cpufreq.c | 136 ++++++++++++++++++++++++++ + drivers/sfi/sfi_core.c | 4 +- + tools/power/x86/turbostat/turbostat.c | 179 +++++++++++++++++++++++++++++++--- + 6 files changed, 321 insertions(+), 14 deletions(-) + create mode 100644 drivers/cpufreq/sfi-cpufreq.c +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging cpupowerutils/master (f16603386b38 cpupower tools: add install target to the debug tools' makefiles) +$ git merge cpupowerutils/master +Already up-to-date. +Merging thermal/next (f67744c4d91e Merge branch 'thermal-soc' of .git into next) +$ git merge thermal/next +Auto-merging drivers/acpi/video.c +Merge made by the 'recursive' strategy. + drivers/acpi/video.c | 79 ++++--- + drivers/thermal/Kconfig | 26 +-- + drivers/thermal/int340x_thermal/Kconfig | 41 ++++ + drivers/thermal/int340x_thermal/Makefile | 2 + + drivers/thermal/int340x_thermal/int3402_thermal.c | 208 +++-------------- + drivers/thermal/int340x_thermal/int3403_thermal.c | 208 +---------------- + drivers/thermal/int340x_thermal/int3406_thermal.c | 229 ++++++++++++++++++ + .../thermal/int340x_thermal/int340x_thermal_zone.c | 255 +++++++++++++++++++++ + .../thermal/int340x_thermal/int340x_thermal_zone.h | 65 ++++++ + .../int340x_thermal/processor_thermal_device.c | 90 ++++++++ + drivers/video/backlight/backlight.c | 40 ++-- + include/acpi/video.h | 20 ++ + include/linux/backlight.h | 3 +- + 13 files changed, 822 insertions(+), 444 deletions(-) + create mode 100644 drivers/thermal/int340x_thermal/Kconfig + create mode 100644 drivers/thermal/int340x_thermal/int3406_thermal.c + create mode 100644 drivers/thermal/int340x_thermal/int340x_thermal_zone.c + create mode 100644 drivers/thermal/int340x_thermal/int340x_thermal_zone.h +Merging thermal-soc/next (1813d8087469 thermal: rcar: Spelling/grammar: s/drier use .../driver uses ...s/) +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. +Merging ieee1394/for-next (d737d7da8e7e firewire: sbp2: replace card lock by target lock) +$ 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 (d8a69543bc46 Merge branch 'topic/slave_caps_device_control_fix_rebased' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + Documentation/dmaengine/provider.txt | 97 +++++++++------- + drivers/crypto/ux500/cryp/cryp_core.c | 4 +- + drivers/crypto/ux500/hash/hash_core.c | 2 +- + drivers/dma/amba-pl08x.c | 156 +++++++++++++++----------- + drivers/dma/at_hdmac.c | 130 ++++++++++++++-------- + drivers/dma/at_hdmac_regs.h | 3 +- + drivers/dma/at_xdmac.c | 128 +++++++++++---------- + drivers/dma/bcm2835-dma.c | 46 ++------ + drivers/dma/coh901318.c | 137 ++++++++++------------- + drivers/dma/cppi41.c | 30 +---- + drivers/dma/dma-jz4740.c | 20 +--- + drivers/dma/dmaengine.c | 51 +++++---- + drivers/dma/dw/core.c | 98 +++++++++------- + drivers/dma/dw/regs.h | 2 +- + drivers/dma/edma.c | 70 ++++-------- + drivers/dma/ep93xx_dma.c | 43 ++----- + drivers/dma/fsl-edma.c | 123 ++++++++++---------- + drivers/dma/fsldma.c | 97 +++++++--------- + drivers/dma/fsldma.h | 4 + + drivers/dma/imx-dma.c | 108 +++++++++--------- + drivers/dma/imx-sdma.c | 150 ++++++++++--------------- + drivers/dma/intel_mid_dma.c | 25 +---- + drivers/dma/ioat/dma_v3.c | 11 ++ + drivers/dma/ipu/ipu_idmac.c | 96 ++++++++-------- + drivers/dma/k3dma.c | 203 ++++++++++++++++++---------------- + drivers/dma/mmp_pdma.c | 109 +++++++++--------- + drivers/dma/mmp_tdma.c | 85 +++++++------- + drivers/dma/moxart-dma.c | 25 +---- + drivers/dma/mpc512x_dma.c | 111 +++++++++---------- + drivers/dma/mv_xor.c | 9 -- + drivers/dma/mxs-dma.c | 65 +++++------ + drivers/dma/nbpfaxi.c | 112 +++++++++---------- + drivers/dma/omap-dma.c | 69 ++++-------- + drivers/dma/pch_dma.c | 8 +- + drivers/dma/pl330.c | 134 +++++++++------------- + drivers/dma/qcom_bam_dma.c | 85 +++++++------- + drivers/dma/s3c24xx-dma.c | 75 ++++++------- + drivers/dma/sa11x0-dma.c | 158 +++++++++++++------------- + drivers/dma/sh/rcar-hpbdma.c | 6 + + drivers/dma/sh/shdma-base.c | 72 ++++++------ + drivers/dma/sirf-dma.c | 59 +++------- + drivers/dma/ste_dma40.c | 63 +++++------ + drivers/dma/sun6i-dma.c | 160 +++++++++++++++------------ + drivers/dma/tegra20-apb-dma.c | 42 ++++--- + drivers/dma/timb_dma.c | 8 +- + drivers/dma/txx9dmac.c | 9 +- + drivers/dma/xilinx/xilinx_vdma.c | 29 +---- + drivers/rapidio/devices/tsi721_dma.c | 8 +- + include/linux/dmaengine.h | 121 +++++++++++--------- + sound/soc/soc-generic-dmaengine-pcm.c | 2 +- + 50 files changed, 1632 insertions(+), 1826 deletions(-) +Merging net-next/master (88340160f3ad ip_tunnel: Create percpu gro_cell) +$ git merge net-next/master +Auto-merging net/wireless/reg.c +Auto-merging net/sched/Kconfig +Auto-merging net/netlink/genetlink.c +Auto-merging net/netlink/af_netlink.h +Auto-merging net/netlink/af_netlink.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/ipv4/ip_sockglue.c +Removing net/ieee802154/reassembly.h +Removing net/ieee802154/raw.c +Removing net/ieee802154/dgram.c +Removing net/ieee802154/af_ieee802154.c +Removing net/ieee802154/af802154.h +Removing net/ieee802154/6lowpan_rtnl.c +Auto-merging net/ieee802154/6lowpan/reassembly.c +Auto-merging net/core/dev.c +Auto-merging include/net/genetlink.h +Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/ethernet/ti/cpsw.c +Auto-merging drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +Auto-merging drivers/net/ethernet/renesas/sh_eth.c +Auto-merging drivers/net/ethernet/emulex/benet/be_main.c +Auto-merging drivers/clk/rockchip/clk-rk3288.c +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/rk3288-evb.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/DocBook/80211.tmpl | 1 - + .../devicetree/bindings/net/amd-xgbe-phy.txt | 21 + + .../devicetree/bindings/net/davicom-dm9000.txt | 4 + + Documentation/devicetree/bindings/net/fsl-fec.txt | 2 + + .../bindings/net/hisilicon-hip04-net.txt | 88 + + .../devicetree/bindings/net/rockchip-dwmac.txt | 67 + + .../devicetree/bindings/net/sti-dwmac.txt | 14 +- + .../devicetree/bindings/phy/phy-miphy365x.txt | 15 +- + .../devicetree/bindings/phy/phy-stih407-usb.txt | 10 +- + Documentation/kernel-parameters.txt | 12 + + Documentation/networking/filter.txt | 4 +- + Documentation/networking/nf_conntrack-sysctl.txt | 3 +- + .../networking/timestamping/txtimestamp.c | 10 +- + Documentation/rfkill.txt | 3 + + MAINTAINERS | 10 +- + arch/arm/boot/dts/rk3288-evb-rk808.dts | 23 + + arch/arm/boot/dts/rk3288-evb.dtsi | 17 + + arch/arm/boot/dts/rk3288.dtsi | 54 + + arch/arm/boot/dts/stih407-family.dtsi | 9 + + arch/arm/boot/dts/stih410.dtsi | 70 + + arch/arm/boot/dts/stih415.dtsi | 12 +- + arch/arm/boot/dts/stih416.dtsi | 22 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-sa1100/assabet.c | 2 +- + arch/arm/mach-sa1100/collie.c | 2 +- + arch/arm/mach-sa1100/h3100.c | 2 +- + arch/arm/mach-sa1100/h3600.c | 2 +- + arch/microblaze/kernel/timer.c | 1 + + drivers/acpi/event.c | 7 +- + drivers/atm/eni.c | 33 +- + drivers/atm/fore200e.c | 22 +- + drivers/atm/he.c | 125 +- + drivers/atm/he.h | 4 +- + drivers/atm/horizon.c | 24 - + drivers/atm/idt77252.c | 107 +- + drivers/atm/iphase.c | 54 +- + drivers/atm/lanai.c | 23 +- + drivers/atm/nicstar.c | 60 +- + drivers/atm/solos-pci.c | 26 +- + drivers/atm/zatm.c | 17 +- + drivers/bluetooth/bfusb.c | 2 + + drivers/bluetooth/btmrvl_drv.h | 5 +- + drivers/bluetooth/btmrvl_main.c | 32 +- + drivers/bluetooth/btmrvl_sdio.c | 6 +- + drivers/bluetooth/btusb.c | 43 +- + drivers/clk/rockchip/clk-rk3288.c | 14 +- + drivers/clocksource/arm_arch_timer.c | 1 + + drivers/infiniband/hw/cxgb4/cm.c | 118 +- + drivers/infiniband/hw/cxgb4/cq.c | 60 +- + drivers/infiniband/hw/cxgb4/device.c | 12 +- + drivers/infiniband/hw/cxgb4/ev.c | 12 +- + drivers/infiniband/hw/cxgb4/mem.c | 22 +- + drivers/infiniband/hw/cxgb4/qp.c | 62 +- + drivers/infiniband/hw/cxgb4/t4.h | 126 +- + drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 812 +++--- + drivers/infiniband/hw/mlx5/mem.c | 2 +- + drivers/infiniband/hw/nes/nes_nic.c | 13 +- + drivers/isdn/hardware/mISDN/mISDNipac.c | 12 +- + drivers/isdn/hardware/mISDN/w6692.c | 6 +- + drivers/isdn/hisax/hfc4s8s_l1.c | 21 - + drivers/isdn/sc/init.c | 15 +- + drivers/net/bonding/bond_options.c | 5 +- + drivers/net/ethernet/3com/typhoon.c | 4 +- + drivers/net/ethernet/alteon/acenic.c | 8 +- + drivers/net/ethernet/amd/Kconfig | 2 +- + drivers/net/ethernet/amd/amd8111e.c | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 32 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 66 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 67 +- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 203 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 29 +- + drivers/net/ethernet/amd/xgbe/xgbe-ptp.c | 12 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 31 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 94 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 109 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 3 + + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 4 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 9 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 4 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 14 +- + drivers/net/ethernet/broadcom/bnx2.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 8 +- + drivers/net/ethernet/broadcom/tg3.c | 29 +- + drivers/net/ethernet/brocade/bna/bnad.c | 4 +- + drivers/net/ethernet/cadence/macb.c | 70 +- + drivers/net/ethernet/cadence/macb.h | 631 +++-- + drivers/net/ethernet/chelsio/cxgb/sge.c | 4 +- + drivers/net/ethernet/chelsio/cxgb3/mc5.c | 16 - + drivers/net/ethernet/chelsio/cxgb3/sge.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/Makefile | 2 +- + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 314 +++ + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h | 41 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 19 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 543 ++++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h | 12 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 970 ++----- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 - + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 13 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 223 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 1115 ++++---- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 19 + + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 367 ++- + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 2892 +++++++++++++------- + drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 118 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 81 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 44 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 57 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_defs.h | 4 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 43 +- + drivers/net/ethernet/cisco/enic/enic.h | 16 +- + drivers/net/ethernet/cisco/enic/enic_dev.c | 56 - + drivers/net/ethernet/cisco/enic/enic_dev.h | 5 - + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 19 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 173 +- + drivers/net/ethernet/cisco/enic/vnic_stats.h | 5 + + drivers/net/ethernet/cisco/enic/vnic_wq.c | 3 + + drivers/net/ethernet/cisco/enic/vnic_wq.h | 1 + + drivers/net/ethernet/davicom/dm9000.c | 40 + + drivers/net/ethernet/emulex/benet/be.h | 4 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 - + drivers/net/ethernet/emulex/benet/be_hw.h | 5 + + drivers/net/ethernet/emulex/benet/be_main.c | 250 +- + drivers/net/ethernet/freescale/Kconfig | 3 +- + drivers/net/ethernet/freescale/fec.h | 3 + + drivers/net/ethernet/freescale/fec_main.c | 104 +- + drivers/net/ethernet/freescale/fec_ptp.c | 16 +- + drivers/net/ethernet/freescale/gianfar.c | 15 +- + drivers/net/ethernet/freescale/gianfar.h | 2 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 96 +- + drivers/net/ethernet/hisilicon/Kconfig | 9 + + drivers/net/ethernet/hisilicon/Makefile | 1 + + drivers/net/ethernet/hisilicon/hip04_eth.c | 969 +++++++ + drivers/net/ethernet/hisilicon/hip04_mdio.c | 186 ++ + drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 5 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 2 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 11 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 5 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e.h | 5 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 152 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 130 + + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 1 - + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 43 +- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 2 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 135 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 5 + + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 44 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 7 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 10 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 2 +- + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 108 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 4 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 8 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 99 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 6 +- + drivers/net/ethernet/intel/igb/igb.h | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 4 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 11 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 5 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 13 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 4 +- + drivers/net/ethernet/jme.c | 4 +- + drivers/net/ethernet/marvell/sky2.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/en_clock.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 6 +- + drivers/net/ethernet/micrel/ksz884x.c | 4 +- + drivers/net/ethernet/natsemi/ns83820.c | 4 +- + drivers/net/ethernet/neterion/s2io.c | 4 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 4 +- + drivers/net/ethernet/nvidia/forcedeth.c | 4 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 25 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 6 +- + drivers/net/ethernet/realtek/8139cp.c | 4 +- + drivers/net/ethernet/realtek/r8169.c | 16 +- + drivers/net/ethernet/renesas/sh_eth.c | 14 +- + drivers/net/ethernet/renesas/sh_eth.h | 30 +- + drivers/net/ethernet/rocker/rocker.c | 38 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 12 +- + drivers/net/ethernet/smsc/Kconfig | 10 +- + drivers/net/ethernet/smsc/smc91x.h | 21 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 459 ++++ + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 13 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.h | 1 + + drivers/net/ethernet/sun/niu.c | 3 +- + drivers/net/ethernet/sun/sunvnet.c | 7 +- + drivers/net/ethernet/tehuti/tehuti.c | 4 +- + drivers/net/ethernet/ti/cpsw.c | 76 +- + drivers/net/ethernet/ti/cpts.c | 5 +- + drivers/net/ethernet/ti/cpts.h | 1 + + drivers/net/ethernet/via/via-rhine.c | 6 +- + drivers/net/ethernet/via/via-velocity.c | 4 +- + drivers/net/fddi/skfp/smt.c | 12 - + drivers/net/ieee802154/at86rf230.c | 82 +- + drivers/net/ieee802154/cc2520.c | 27 +- + drivers/net/ieee802154/mrf24j40.c | 6 +- + drivers/net/irda/ali-ircc.c | 11 +- + drivers/net/irda/ali-ircc.h | 5 +- + drivers/net/irda/au1k_ir.c | 3 - + drivers/net/irda/irda-usb.c | 10 +- + drivers/net/irda/irda-usb.h | 5 +- + drivers/net/irda/kingsun-sir.c | 3 - + drivers/net/irda/ks959-sir.c | 3 - + drivers/net/irda/mcs7780.c | 2 - + drivers/net/irda/mcs7780.h | 1 - + drivers/net/irda/nsc-ircc.c | 7 +- + drivers/net/irda/nsc-ircc.h | 5 +- + drivers/net/irda/sa1100_ir.c | 2 +- + drivers/net/irda/stir4200.c | 16 +- + drivers/net/irda/via-ircc.h | 4 - + drivers/net/irda/vlsi_ir.c | 46 +- + drivers/net/irda/vlsi_ir.h | 2 +- + drivers/net/macvtap.c | 6 +- + drivers/net/phy/Kconfig | 2 +- + drivers/net/phy/amd-xgbe-phy.c | 981 ++++--- + drivers/net/team/team.c | 7 - + drivers/net/tun.c | 15 +- + drivers/net/usb/r8152.c | 132 +- + drivers/net/virtio_net.c | 2 + + drivers/net/vmxnet3/vmxnet3_defs.h | 1 + + drivers/net/vmxnet3/vmxnet3_drv.c | 54 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 29 +- + drivers/net/vmxnet3/vmxnet3_int.h | 6 +- + drivers/net/vxlan.c | 395 ++- + drivers/net/wireless/ath/ath10k/mac.c | 3 +- + drivers/net/wireless/ath/ath10k/wmi.c | 8 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 16 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 14 +- + drivers/net/wireless/ath/ath6kl/main.c | 1 - + drivers/net/wireless/ath/ath9k/debug.c | 71 + + drivers/net/wireless/ath/ath9k/hw.c | 3 + + drivers/net/wireless/ath/ath9k/link.c | 16 +- + drivers/net/wireless/ath/ath9k/xmit.c | 8 +- + drivers/net/wireless/ath/carl9170/cmd.c | 12 +- + drivers/net/wireless/ath/carl9170/main.c | 6 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 18 +- + drivers/net/wireless/ath/wil6210/wmi.c | 1 - + drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 11 +- + drivers/net/wireless/cw1200/main.c | 1 - + drivers/net/wireless/cw1200/sta.c | 4 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 13 +- + drivers/net/wireless/libertas/cfg.c | 12 +- + drivers/net/wireless/mac80211_hwsim.c | 33 +- + drivers/net/wireless/mwifiex/cfg80211.c | 17 +- + drivers/net/wireless/mwifiex/uap_event.c | 1 - + drivers/net/wireless/mwl8k.c | 12 +- + drivers/net/wireless/p54/eeprom.c | 6 +- + drivers/net/wireless/p54/main.c | 10 +- + drivers/net/wireless/p54/txrx.c | 12 +- + drivers/net/wireless/rndis_wlan.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 4 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 12 +- + drivers/net/wireless/rtlwifi/base.c | 156 +- + drivers/net/wireless/rtlwifi/base.h | 4 +- + drivers/net/wireless/rtlwifi/core.c | 24 +- + drivers/net/wireless/rtlwifi/core.h | 1 + + drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 162 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 1 + + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 165 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 5 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 30 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 13 +- + drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 28 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 20 +- + drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 17 - + drivers/net/wireless/rtlwifi/rtl8192de/fw.h | 1 - + drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 30 +- + drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 27 +- + drivers/net/wireless/rtlwifi/rtl8192ee/trx.c | 196 +- + drivers/net/wireless/rtlwifi/rtl8192ee/trx.h | 9 +- + drivers/net/wireless/rtlwifi/rtl8192se/def.h | 8 +- + drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 30 +- + drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 23 +- + drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 162 +- + drivers/net/wireless/rtlwifi/rtl8723be/phy.c | 25 - + drivers/net/wireless/rtlwifi/rtl8723be/phy.h | 2 - + drivers/net/wireless/rtlwifi/rtl8723be/trx.c | 162 +- + drivers/net/wireless/rtlwifi/rtl8821ae/def.h | 54 - + drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.h | 4 +- + drivers/net/wireless/rtlwifi/rtl8821ae/sw.c | 74 +- + drivers/net/wireless/rtlwifi/rtl8821ae/trx.c | 232 +- + drivers/net/wireless/rtlwifi/wifi.h | 96 +- + drivers/net/wireless/ti/wl1251/main.c | 5 +- + drivers/net/wireless/ti/wlcore/main.c | 22 +- + drivers/net/xen-netfront.c | 196 +- + drivers/phy/phy-miphy365x.c | 29 +- + drivers/phy/phy-stih407-usb.c | 25 +- + drivers/s390/net/claw.c | 6 +- + drivers/s390/net/ctcm_fsms.c | 18 +- + drivers/s390/net/ctcm_main.c | 4 +- + drivers/s390/net/ctcm_main.h | 2 +- + drivers/s390/net/ctcm_sysfs.c | 4 +- + drivers/s390/net/lcs.c | 6 +- + drivers/s390/net/netiucv.c | 15 +- + drivers/s390/net/qeth_core.h | 1 - + drivers/s390/net/qeth_core_sys.c | 45 +- + drivers/s390/net/qeth_l2_main.c | 6 +- + drivers/s390/net/qeth_l3_main.c | 15 +- + drivers/s390/net/qeth_l3_sys.c | 45 +- + drivers/scsi/csiostor/csio_hw.c | 796 +++--- + drivers/scsi/csiostor/csio_hw.h | 13 +- + drivers/scsi/csiostor/csio_hw_chip.h | 65 +- + drivers/scsi/csiostor/csio_hw_t4.c | 144 +- + drivers/scsi/csiostor/csio_hw_t5.c | 150 +- + drivers/scsi/csiostor/csio_isr.c | 2 +- + drivers/scsi/csiostor/csio_lnode.c | 2 +- + drivers/scsi/csiostor/csio_mb.c | 53 +- + drivers/scsi/csiostor/csio_scsi.c | 4 +- + drivers/scsi/csiostor/csio_wr.c | 154 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 41 +- + drivers/scsi/pmcraid.c | 8 +- + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 10 +- + drivers/staging/wlan-ng/cfg80211.c | 4 +- + drivers/target/target_core_user.c | 4 +- + drivers/thermal/thermal_core.c | 6 +- + drivers/vhost/net.c | 2 +- + fs/dlm/netlink.c | 7 +- + include/clocksource/arm_arch_timer.h | 2 +- + include/dt-bindings/clock/rk3288-cru.h | 3 + + include/linux/clocksource.h | 102 - + include/linux/etherdevice.h | 4 + + include/linux/fec.h | 1 + + include/linux/if_bridge.h | 18 - + include/linux/if_vlan.h | 16 +- + include/linux/list_nulls.h | 6 +- + include/linux/mlx4/device.h | 2 +- + include/linux/netdevice.h | 15 +- + include/linux/phy.h | 9 + + .../linux/platform_data/irda-sa11x0.h | 0 + include/linux/rhashtable.h | 271 +- + include/linux/spinlock.h | 8 + + include/linux/spinlock_api_smp.h | 2 + + include/linux/spinlock_api_up.h | 1 + + include/linux/timecounter.h | 139 + + include/linux/types.h | 3 + + include/linux/udp.h | 16 +- + include/net/bluetooth/bluetooth.h | 2 +- + include/net/bluetooth/hci.h | 83 +- + include/net/bluetooth/hci_core.h | 41 +- + include/net/bluetooth/l2cap.h | 1 + + include/net/bluetooth/rfcomm.h | 2 - + include/net/cfg80211.h | 253 +- + include/net/cfg802154.h | 10 +- + include/net/genetlink.h | 4 +- + include/net/geneve.h | 5 +- + include/net/gro_cells.h | 29 +- + include/net/ieee802154_netdev.h | 4 +- + include/net/inet_connection_sock.h | 3 +- + include/net/inet_sock.h | 29 +- + include/net/ip.h | 7 +- + include/net/ip6_fib.h | 10 +- + include/net/ip_fib.h | 50 +- + include/net/ip_tunnels.h | 5 +- + include/net/mac80211.h | 55 +- + include/net/mac802154.h | 5 +- + include/net/netfilter/nf_conntrack.h | 2 - + include/net/netlink.h | 10 +- + include/net/nl802154.h | 45 +- + include/net/pkt_sched.h | 12 + + include/net/regulatory.h | 19 + + include/net/route.h | 2 + + include/net/switchdev.h | 42 + + include/net/tc_act/tc_bpf.h | 25 + + include/net/tcp.h | 22 +- + include/net/vxlan.h | 96 +- + include/trace/events/net.h | 8 +- + include/uapi/linux/if_bridge.h | 2 + + include/uapi/linux/if_link.h | 3 + + include/uapi/linux/in.h | 1 + + include/uapi/linux/ipv6.h | 6 +- + include/uapi/linux/l2tp.h | 1 + + include/uapi/linux/libc-compat.h | 6 + + include/uapi/linux/nl80211.h | 176 +- + include/uapi/linux/openvswitch.h | 11 + + include/uapi/linux/rtnetlink.h | 3 + + include/uapi/linux/tc_act/Kbuild | 1 + + include/uapi/linux/tc_act/tc_bpf.h | 31 + + include/xen/page.h | 5 + + kernel/locking/spinlock.c | 8 + + kernel/taskstats.c | 13 +- + kernel/time/Makefile | 2 +- + kernel/time/clocksource.c | 76 - + kernel/time/timecounter.c | 112 + + lib/rhashtable.c | 750 +++-- + net/8021q/vlan_core.c | 2 +- + net/batman-adv/Kconfig | 1 + + net/batman-adv/bat_iv_ogm.c | 15 +- + net/batman-adv/bitarray.c | 1 - + net/batman-adv/bitarray.h | 3 +- + net/batman-adv/bridge_loop_avoidance.c | 17 +- + net/batman-adv/debugfs.c | 2 +- + net/batman-adv/distributed-arp-table.c | 1 + + net/batman-adv/distributed-arp-table.h | 4 +- + net/batman-adv/fragmentation.c | 1 - + net/batman-adv/fragmentation.h | 3 +- + net/batman-adv/gateway_client.c | 1 + + net/batman-adv/main.c | 10 +- + net/batman-adv/main.h | 15 +- + net/batman-adv/multicast.h | 3 - + net/batman-adv/network-coding.c | 3 +- + net/batman-adv/originator.c | 1 - + net/batman-adv/originator.h | 1 - + net/batman-adv/packet.h | 5 +- + net/batman-adv/routing.c | 3 +- + net/batman-adv/soft-interface.c | 1 - + net/batman-adv/sysfs.c | 1 - + net/batman-adv/translation-table.c | 8 +- + net/batman-adv/types.h | 4 +- + net/bluetooth/6lowpan.c | 66 +- + net/bluetooth/Kconfig | 27 + + net/bluetooth/Makefile | 4 +- + net/bluetooth/af_bluetooth.c | 6 + + net/bluetooth/cmtp/capi.c | 6 - + net/bluetooth/hci_conn.c | 21 +- + net/bluetooth/hci_core.c | 1768 +----------- + net/bluetooth/hci_debugfs.c | 979 +++++++ + net/bluetooth/hci_debugfs.h | 26 + + net/bluetooth/hci_event.c | 113 +- + net/bluetooth/hci_request.c | 556 ++++ + net/bluetooth/hci_request.h | 54 + + net/bluetooth/hci_sock.c | 107 +- + net/bluetooth/l2cap_core.c | 55 +- + net/bluetooth/l2cap_sock.c | 2 + + net/bluetooth/mgmt.c | 340 ++- + net/bluetooth/rfcomm/core.c | 4 +- + net/bluetooth/rfcomm/sock.c | 2 + + net/bluetooth/sco.c | 2 + + net/bluetooth/selftest.c | 244 ++ + net/bluetooth/selftest.h | 45 + + net/bluetooth/smp.c | 466 +++- + net/bluetooth/smp.h | 13 + + net/bridge/br.c | 52 +- + net/bridge/br_fdb.c | 48 +- + net/bridge/br_if.c | 1 + + net/bridge/br_mdb.c | 5 +- + net/bridge/br_netfilter.c | 12 +- + net/bridge/br_netlink.c | 259 +- + net/bridge/br_private.h | 8 +- + net/bridge/br_vlan.c | 4 +- + net/bridge/netfilter/ebt_vlan.c | 4 +- + net/bridge/netfilter/ebtables.c | 2 +- + net/can/gw.c | 3 +- + net/core/dev.c | 23 +- + net/core/ethtool.c | 45 +- + net/core/fib_rules.c | 3 +- + net/core/neighbour.c | 12 +- + net/core/netpoll.c | 2 +- + net/core/rtnetlink.c | 74 +- + net/core/skbuff.c | 15 +- + net/decnet/dn_dev.c | 3 +- + net/decnet/dn_fib.c | 3 +- + net/decnet/dn_route.c | 3 +- + net/decnet/dn_table.c | 7 +- + net/ethernet/eth.c | 92 + + net/ieee802154/6lowpan/6lowpan_i.h | 72 + + net/ieee802154/6lowpan/Kconfig | 5 + + net/ieee802154/6lowpan/Makefile | 3 + + net/ieee802154/6lowpan/core.c | 304 ++ + net/ieee802154/{ => 6lowpan}/reassembly.c | 2 +- + net/ieee802154/6lowpan/rx.c | 171 ++ + net/ieee802154/6lowpan/tx.c | 271 ++ + net/ieee802154/6lowpan_rtnl.c | 729 ----- + net/ieee802154/Kconfig | 18 +- + net/ieee802154/Makefile | 8 +- + net/ieee802154/af802154.h | 33 - + net/ieee802154/af_ieee802154.c | 369 --- + net/ieee802154/dgram.c | 549 ---- + net/ieee802154/netlink.c | 12 +- + net/ieee802154/nl-mac.c | 7 +- + net/ieee802154/nl-phy.c | 3 +- + net/ieee802154/nl802154.c | 52 +- + net/ieee802154/raw.c | 270 -- + net/ieee802154/rdev-ops.h | 7 + + net/ieee802154/reassembly.h | 41 - + net/ieee802154/socket.c | 1125 ++++++++ + net/ieee802154/sysfs.c | 2 +- + net/ipv4/devinet.c | 8 +- + net/ipv4/fib_frontend.c | 29 +- + net/ipv4/fib_rules.c | 22 +- + net/ipv4/fib_semantics.c | 17 +- + net/ipv4/fib_trie.c | 1916 ++++++------- + net/ipv4/fou.c | 14 +- + net/ipv4/geneve.c | 202 +- + net/ipv4/inet_diag.c | 9 +- + net/ipv4/ip_gre.c | 1 + + net/ipv4/ip_sockglue.c | 108 +- + net/ipv4/ipmr.c | 3 +- + net/ipv4/route.c | 49 +- + net/ipv4/tcp_cong.c | 121 +- + net/ipv4/tcp_input.c | 38 +- + net/ipv4/tcp_ipv4.c | 2 + + net/ipv4/tcp_metrics.c | 3 +- + net/ipv4/tcp_minisocks.c | 30 +- + net/ipv4/tcp_output.c | 21 + + net/ipv4/udp.c | 4 +- + net/ipv4/udp_offload.c | 7 +- + net/ipv4/udp_tunnel.c | 2 +- + net/ipv6/addrconf.c | 32 +- + net/ipv6/addrlabel.c | 5 +- + net/ipv6/icmp.c | 2 +- + net/ipv6/ip6_fib.c | 69 +- + net/ipv6/ip6mr.c | 3 +- + net/ipv6/route.c | 75 +- + net/ipv6/tcp_ipv6.c | 2 + + net/ipv6/udp.c | 2 +- + net/l2tp/l2tp_netlink.c | 107 +- + net/mac80211/cfg.c | 7 +- + net/mac80211/chan.c | 37 +- + net/mac80211/debugfs.c | 2 - + net/mac80211/driver-ops.h | 30 +- + net/mac80211/ethtool.c | 26 +- + net/mac80211/ibss.c | 11 +- + net/mac80211/ieee80211_i.h | 8 +- + net/mac80211/iface.c | 2 +- + net/mac80211/key.c | 9 +- + net/mac80211/main.c | 4 - + net/mac80211/mesh_plink.c | 7 + + net/mac80211/mlme.c | 81 +- + net/mac80211/offchannel.c | 4 +- + net/mac80211/pm.c | 2 +- + net/mac80211/rc80211_minstrel.c | 6 +- + net/mac80211/rc80211_minstrel.h | 15 +- + net/mac80211/rx.c | 20 +- + net/mac80211/scan.c | 8 +- + net/mac80211/spectmgmt.c | 4 - + net/mac80211/sta_info.c | 175 +- + net/mac80211/sta_info.h | 12 + + net/mac80211/status.c | 26 +- + net/mac80211/tdls.c | 32 +- + net/mac80211/trace.h | 33 +- + net/mac80211/tx.c | 5 +- + net/mac80211/util.c | 29 +- + net/mac80211/vht.c | 73 +- + net/mac802154/cfg.c | 26 +- + net/mac802154/driver-ops.h | 5 +- + net/mac802154/iface.c | 100 +- + net/mac802154/mac_cmd.c | 6 +- + net/netfilter/ipvs/ip_vs_ctl.c | 9 +- + net/netfilter/nf_conntrack_core.c | 17 +- + net/netfilter/nf_conntrack_netlink.c | 89 +- + net/netfilter/nf_conntrack_seqadj.c | 6 +- + net/netfilter/nf_log.c | 3 +- + net/netfilter/nf_tables_api.c | 18 +- + net/netfilter/nfnetlink.c | 15 +- + net/netfilter/nfnetlink_cthelper.c | 4 +- + net/netfilter/nft_hash.c | 92 +- + net/netfilter/xt_osf.c | 169 +- + net/netlabel/netlabel_cipso_v4.c | 3 +- + net/netlabel/netlabel_mgmt.c | 6 +- + net/netlabel/netlabel_unlabeled.c | 3 +- + net/netlink/af_netlink.c | 98 +- + net/netlink/af_netlink.h | 2 +- + net/netlink/diag.c | 15 +- + net/netlink/genetlink.c | 6 +- + net/nfc/netlink.c | 12 +- + net/openvswitch/actions.c | 4 +- + net/openvswitch/datapath.c | 11 +- + net/openvswitch/flow.c | 6 +- + net/openvswitch/flow.h | 14 +- + net/openvswitch/flow_netlink.c | 286 +- + net/openvswitch/vport-geneve.c | 30 +- + net/openvswitch/vport-gre.c | 14 +- + net/openvswitch/vport-vxlan.c | 103 +- + net/openvswitch/vport-vxlan.h | 11 + + net/openvswitch/vport.c | 12 +- + net/openvswitch/vport.h | 18 + + net/packet/af_packet.c | 14 +- + net/packet/diag.c | 3 +- + net/phonet/pn_netlink.c | 16 +- + net/sched/Kconfig | 12 + + net/sched/Makefile | 1 + + net/sched/act_bpf.c | 205 ++ + net/sched/act_csum.c | 2 +- + net/sched/cls_bpf.c | 18 +- + net/sched/cls_flow.c | 8 +- + net/sched/em_ipset.c | 2 +- + net/sched/em_meta.c | 4 +- + net/sched/sch_api.c | 2 +- + net/sched/sch_dsmark.c | 6 +- + net/sched/sch_teql.c | 11 +- + net/socket.c | 18 +- + net/switchdev/switchdev.c | 65 + + net/tipc/Kconfig | 12 - + net/tipc/addr.c | 45 +- + net/tipc/addr.h | 45 +- + net/tipc/bcast.c | 367 ++- + net/tipc/bcast.h | 113 +- + net/tipc/bearer.c | 141 +- + net/tipc/bearer.h | 46 +- + net/tipc/config.c | 90 +- + net/tipc/config.h | 6 +- + net/tipc/core.c | 144 +- + net/tipc/core.h | 170 +- + net/tipc/discover.c | 84 +- + net/tipc/discover.h | 8 +- + net/tipc/link.c | 324 ++- + net/tipc/link.h | 36 +- + net/tipc/msg.c | 71 +- + net/tipc/msg.h | 60 +- + net/tipc/name_distr.c | 115 +- + net/tipc/name_distr.h | 16 +- + net/tipc/name_table.c | 180 +- + net/tipc/name_table.h | 33 +- + net/tipc/net.c | 54 +- + net/tipc/net.h | 4 +- + net/tipc/netlink.c | 17 +- + net/tipc/netlink.h | 3 + + net/tipc/node.c | 159 +- + net/tipc/node.h | 35 +- + net/tipc/server.c | 6 +- + net/tipc/server.h | 17 +- + net/tipc/socket.c | 664 ++--- + net/tipc/socket.h | 19 +- + net/tipc/subscr.c | 131 +- + net/tipc/subscr.h | 14 +- + net/unix/diag.c | 3 +- + net/wireless/core.c | 40 +- + net/wireless/core.h | 11 +- + net/wireless/nl80211.c | 652 +++-- + net/wireless/nl80211.h | 16 +- + net/wireless/reg.c | 160 +- + net/wireless/reg.h | 1 + + net/wireless/scan.c | 13 +- + net/wireless/trace.h | 31 +- + net/wireless/util.c | 4 +- + net/wireless/wext-compat.c | 10 +- + net/xfrm/xfrm_algo.c | 5 - + net/xfrm/xfrm_user.c | 27 +- + sound/pci/hda/hda_priv.h | 2 +- + virt/kvm/arm/arch_timer.c | 3 +- + 646 files changed, 25485 insertions(+), 16634 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hip04-net.txt + create mode 100644 Documentation/devicetree/bindings/net/rockchip-dwmac.txt + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/t4_values.h + create mode 100644 drivers/net/ethernet/hisilicon/hip04_eth.c + create mode 100644 drivers/net/ethernet/hisilicon/hip04_mdio.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c + rename arch/arm/include/asm/mach/irda.h => include/linux/platform_data/irda-sa11x0.h (100%) + create mode 100644 include/linux/timecounter.h + create mode 100644 include/net/tc_act/tc_bpf.h + create mode 100644 include/uapi/linux/tc_act/tc_bpf.h + create mode 100644 kernel/time/timecounter.c + create mode 100644 net/bluetooth/hci_debugfs.c + create mode 100644 net/bluetooth/hci_debugfs.h + create mode 100644 net/bluetooth/hci_request.c + create mode 100644 net/bluetooth/hci_request.h + create mode 100644 net/bluetooth/selftest.c + create mode 100644 net/bluetooth/selftest.h + create mode 100644 net/ieee802154/6lowpan/6lowpan_i.h + create mode 100644 net/ieee802154/6lowpan/Kconfig + create mode 100644 net/ieee802154/6lowpan/Makefile + create mode 100644 net/ieee802154/6lowpan/core.c + rename net/ieee802154/{ => 6lowpan}/reassembly.c (99%) + create mode 100644 net/ieee802154/6lowpan/rx.c + create mode 100644 net/ieee802154/6lowpan/tx.c + delete mode 100644 net/ieee802154/6lowpan_rtnl.c + delete mode 100644 net/ieee802154/af802154.h + delete mode 100644 net/ieee802154/af_ieee802154.c + delete mode 100644 net/ieee802154/dgram.c + delete mode 100644 net/ieee802154/raw.c + delete mode 100644 net/ieee802154/reassembly.h + create mode 100644 net/ieee802154/socket.c + create mode 100644 net/openvswitch/vport-vxlan.h + create mode 100644 net/sched/act_bpf.c +$ git reset --hard HEAD^ +HEAD is now at a750abeb00ce Merge remote-tracking branch 'slave-dma/next' +Merging next-20150116 version of net-next +$ git merge -m next-20150116/net-next 0799c2d6f42db2b275b6479035f5b7a30ef4ee39 +Auto-merging net/netlink/af_netlink.h +Auto-merging net/netlink/af_netlink.c +Auto-merging net/ipv4/ip_sockglue.c +Auto-merging net/core/dev.c +Auto-merging drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c +Auto-merging drivers/net/ethernet/renesas/sh_eth.c +Auto-merging drivers/net/ethernet/emulex/benet/be_main.c +Auto-merging drivers/clk/rockchip/clk-rk3288.c +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/rk3288-evb.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/davicom-dm9000.txt | 4 + + Documentation/devicetree/bindings/net/fsl-fec.txt | 2 + + .../bindings/net/hisilicon-hip04-net.txt | 88 + + .../devicetree/bindings/net/rockchip-dwmac.txt | 67 + + .../devicetree/bindings/net/sti-dwmac.txt | 14 +- + .../devicetree/bindings/phy/phy-miphy365x.txt | 15 +- + .../devicetree/bindings/phy/phy-stih407-usb.txt | 10 +- + Documentation/networking/filter.txt | 4 +- + Documentation/networking/nf_conntrack-sysctl.txt | 3 +- + .../networking/timestamping/txtimestamp.c | 10 +- + MAINTAINERS | 10 +- + arch/arm/boot/dts/rk3288-evb-rk808.dts | 23 + + arch/arm/boot/dts/rk3288-evb.dtsi | 17 + + arch/arm/boot/dts/rk3288.dtsi | 54 + + arch/arm/boot/dts/stih407-family.dtsi | 9 + + arch/arm/boot/dts/stih410.dtsi | 70 + + arch/arm/boot/dts/stih415.dtsi | 12 +- + arch/arm/boot/dts/stih416.dtsi | 22 +- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/mach-sa1100/assabet.c | 2 +- + arch/arm/mach-sa1100/collie.c | 2 +- + arch/arm/mach-sa1100/h3100.c | 2 +- + arch/arm/mach-sa1100/h3600.c | 2 +- + arch/microblaze/kernel/timer.c | 1 + + drivers/atm/horizon.c | 24 - + drivers/atm/lanai.c | 9 - + drivers/bluetooth/bfusb.c | 2 + + drivers/bluetooth/btusb.c | 34 +- + drivers/clk/rockchip/clk-rk3288.c | 14 +- + drivers/clocksource/arm_arch_timer.c | 1 + + drivers/infiniband/hw/cxgb4/cm.c | 98 +- + drivers/infiniband/hw/cxgb4/mem.c | 4 +- + drivers/infiniband/hw/cxgb4/t4.h | 26 +- + drivers/infiniband/hw/mlx5/mem.c | 2 +- + drivers/infiniband/hw/nes/nes_nic.c | 13 +- + drivers/isdn/hardware/mISDN/mISDNipac.c | 12 +- + drivers/isdn/hardware/mISDN/w6692.c | 6 +- + drivers/isdn/hisax/hfc4s8s_l1.c | 21 - + drivers/net/bonding/bond_options.c | 5 +- + drivers/net/ethernet/3com/typhoon.c | 4 +- + drivers/net/ethernet/alteon/acenic.c | 8 +- + drivers/net/ethernet/amd/amd8111e.c | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 8 +- + drivers/net/ethernet/amd/xgbe/xgbe-ptp.c | 8 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 94 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 109 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 3 + + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 4 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 9 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 4 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 14 +- + drivers/net/ethernet/broadcom/bnx2.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 8 +- + drivers/net/ethernet/broadcom/tg3.c | 29 +- + drivers/net/ethernet/brocade/bna/bnad.c | 4 +- + drivers/net/ethernet/cadence/macb.c | 55 +- + drivers/net/ethernet/cadence/macb.h | 525 +++- + drivers/net/ethernet/chelsio/cxgb/sge.c | 4 +- + drivers/net/ethernet/chelsio/cxgb3/mc5.c | 16 - + drivers/net/ethernet/chelsio/cxgb3/sge.c | 6 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 16 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 524 ++++ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.h | 12 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 742 ++--- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 13 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 223 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 1115 ++++---- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 19 + + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 367 ++- + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 2892 +++++++++++++------- + drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 118 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 81 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 44 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 57 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_defs.h | 4 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 43 +- + drivers/net/ethernet/cisco/enic/enic.h | 16 +- + drivers/net/ethernet/cisco/enic/enic_dev.c | 56 - + drivers/net/ethernet/cisco/enic/enic_dev.h | 5 - + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 19 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 173 +- + drivers/net/ethernet/cisco/enic/vnic_stats.h | 5 + + drivers/net/ethernet/cisco/enic/vnic_wq.c | 3 + + drivers/net/ethernet/cisco/enic/vnic_wq.h | 1 + + drivers/net/ethernet/davicom/dm9000.c | 40 + + drivers/net/ethernet/emulex/benet/be.h | 4 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 2 - + drivers/net/ethernet/emulex/benet/be_hw.h | 5 + + drivers/net/ethernet/emulex/benet/be_main.c | 250 +- + drivers/net/ethernet/freescale/Kconfig | 3 +- + drivers/net/ethernet/freescale/fec.h | 3 + + drivers/net/ethernet/freescale/fec_main.c | 104 +- + drivers/net/ethernet/freescale/fec_ptp.c | 16 +- + drivers/net/ethernet/freescale/gianfar.c | 15 +- + drivers/net/ethernet/freescale/gianfar.h | 2 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 96 +- + drivers/net/ethernet/hisilicon/Kconfig | 9 + + drivers/net/ethernet/hisilicon/Makefile | 1 + + drivers/net/ethernet/hisilicon/hip04_eth.c | 969 +++++++ + drivers/net/ethernet/hisilicon/hip04_mdio.c | 186 ++ + drivers/net/ethernet/ibm/ehea/ehea_main.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 5 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 2 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 11 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 5 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 125 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 43 +- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 2 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 15 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 5 + + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 9 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 11 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 4 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 7 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 97 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 6 +- + drivers/net/ethernet/intel/igb/igb.h | 2 +- + drivers/net/ethernet/intel/igb/igb_main.c | 4 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 11 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 5 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 13 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 4 +- + drivers/net/ethernet/jme.c | 4 +- + drivers/net/ethernet/marvell/sky2.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/en_clock.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 6 +- + drivers/net/ethernet/micrel/ksz884x.c | 4 +- + drivers/net/ethernet/natsemi/ns83820.c | 4 +- + drivers/net/ethernet/neterion/s2io.c | 4 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 4 +- + drivers/net/ethernet/nvidia/forcedeth.c | 4 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 25 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 6 +- + drivers/net/ethernet/realtek/8139cp.c | 4 +- + drivers/net/ethernet/realtek/r8169.c | 16 +- + drivers/net/ethernet/renesas/sh_eth.c | 14 +- + drivers/net/ethernet/renesas/sh_eth.h | 30 +- + drivers/net/ethernet/rocker/rocker.c | 4 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 12 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 459 ++++ + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 13 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 1 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.h | 1 + + drivers/net/ethernet/sun/sunvnet.c | 7 +- + drivers/net/ethernet/tehuti/tehuti.c | 4 +- + drivers/net/ethernet/ti/cpts.c | 5 +- + drivers/net/ethernet/ti/cpts.h | 1 + + drivers/net/ethernet/via/via-rhine.c | 6 +- + drivers/net/ethernet/via/via-velocity.c | 4 +- + drivers/net/fddi/skfp/smt.c | 12 - + drivers/net/ieee802154/at86rf230.c | 82 +- + drivers/net/ieee802154/cc2520.c | 27 +- + drivers/net/ieee802154/mrf24j40.c | 6 +- + drivers/net/irda/ali-ircc.c | 11 +- + drivers/net/irda/ali-ircc.h | 5 +- + drivers/net/irda/au1k_ir.c | 3 - + drivers/net/irda/irda-usb.c | 10 +- + drivers/net/irda/irda-usb.h | 5 +- + drivers/net/irda/kingsun-sir.c | 3 - + drivers/net/irda/ks959-sir.c | 3 - + drivers/net/irda/mcs7780.c | 2 - + drivers/net/irda/mcs7780.h | 1 - + drivers/net/irda/nsc-ircc.c | 7 +- + drivers/net/irda/nsc-ircc.h | 5 +- + drivers/net/irda/sa1100_ir.c | 2 +- + drivers/net/irda/stir4200.c | 16 +- + drivers/net/irda/via-ircc.h | 4 - + drivers/net/irda/vlsi_ir.c | 46 +- + drivers/net/irda/vlsi_ir.h | 2 +- + drivers/net/macvtap.c | 6 +- + drivers/net/team/team.c | 7 - + drivers/net/tun.c | 15 +- + drivers/net/usb/r8152.c | 132 +- + drivers/net/virtio_net.c | 2 + + drivers/net/vmxnet3/vmxnet3_defs.h | 1 + + drivers/net/vmxnet3/vmxnet3_drv.c | 54 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 27 +- + drivers/net/vmxnet3/vmxnet3_int.h | 6 +- + drivers/net/vxlan.c | 392 ++- + drivers/net/wireless/ath/ath9k/debug.c | 71 + + drivers/net/wireless/ath/ath9k/hw.c | 3 + + drivers/net/wireless/ath/ath9k/xmit.c | 2 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 4 +- + drivers/net/wireless/rtlwifi/base.c | 156 +- + drivers/net/wireless/rtlwifi/base.h | 4 +- + drivers/net/wireless/rtlwifi/core.c | 24 +- + drivers/net/wireless/rtlwifi/core.h | 1 + + drivers/net/wireless/rtlwifi/rtl8188ee/trx.c | 162 +- + drivers/net/wireless/rtlwifi/rtl8192c/fw_common.h | 1 + + drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 165 +- + drivers/net/wireless/rtlwifi/rtl8192ce/phy.c | 5 +- + drivers/net/wireless/rtlwifi/rtl8192ce/sw.c | 30 +- + drivers/net/wireless/rtlwifi/rtl8192ce/trx.c | 13 +- + drivers/net/wireless/rtlwifi/rtl8192cu/mac.c | 4 +- + drivers/net/wireless/rtlwifi/rtl8192cu/sw.c | 28 +- + drivers/net/wireless/rtlwifi/rtl8192cu/trx.c | 20 +- + drivers/net/wireless/rtlwifi/rtl8192de/fw.c | 17 - + drivers/net/wireless/rtlwifi/rtl8192de/fw.h | 1 - + drivers/net/wireless/rtlwifi/rtl8192de/sw.c | 30 +- + drivers/net/wireless/rtlwifi/rtl8192de/trx.c | 27 +- + drivers/net/wireless/rtlwifi/rtl8192ee/trx.c | 196 +- + drivers/net/wireless/rtlwifi/rtl8192ee/trx.h | 9 +- + drivers/net/wireless/rtlwifi/rtl8192se/def.h | 8 +- + drivers/net/wireless/rtlwifi/rtl8192se/sw.c | 30 +- + drivers/net/wireless/rtlwifi/rtl8192se/trx.c | 23 +- + drivers/net/wireless/rtlwifi/rtl8723ae/trx.c | 162 +- + drivers/net/wireless/rtlwifi/rtl8723be/phy.c | 25 - + drivers/net/wireless/rtlwifi/rtl8723be/phy.h | 2 - + drivers/net/wireless/rtlwifi/rtl8723be/trx.c | 162 +- + drivers/net/wireless/rtlwifi/rtl8821ae/def.h | 54 - + drivers/net/wireless/rtlwifi/rtl8821ae/pwrseq.h | 4 +- + drivers/net/wireless/rtlwifi/rtl8821ae/sw.c | 74 +- + drivers/net/wireless/rtlwifi/rtl8821ae/trx.c | 232 +- + drivers/net/wireless/rtlwifi/wifi.h | 96 +- + drivers/net/xen-netfront.c | 196 +- + drivers/phy/phy-miphy365x.c | 29 +- + drivers/phy/phy-stih407-usb.c | 25 +- + drivers/s390/net/qeth_l3_main.c | 8 +- + drivers/scsi/csiostor/csio_hw.c | 796 +++--- + drivers/scsi/csiostor/csio_hw.h | 13 +- + drivers/scsi/csiostor/csio_hw_chip.h | 65 +- + drivers/scsi/csiostor/csio_hw_t4.c | 144 +- + drivers/scsi/csiostor/csio_hw_t5.c | 150 +- + drivers/scsi/csiostor/csio_isr.c | 2 +- + drivers/scsi/csiostor/csio_lnode.c | 2 +- + drivers/scsi/csiostor/csio_mb.c | 53 +- + drivers/scsi/csiostor/csio_scsi.c | 4 +- + drivers/scsi/csiostor/csio_wr.c | 154 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 18 +- + drivers/vhost/net.c | 2 +- + include/clocksource/arm_arch_timer.h | 2 +- + include/dt-bindings/clock/rk3288-cru.h | 3 + + include/linux/clocksource.h | 102 - + include/linux/etherdevice.h | 4 + + include/linux/fec.h | 1 + + include/linux/if_vlan.h | 16 +- + include/linux/list_nulls.h | 6 +- + include/linux/mlx4/device.h | 2 +- + include/linux/netdevice.h | 15 +- + include/linux/phy.h | 9 + + .../linux/platform_data/irda-sa11x0.h | 0 + include/linux/rhashtable.h | 271 +- + include/linux/spinlock.h | 8 + + include/linux/spinlock_api_smp.h | 2 + + include/linux/spinlock_api_up.h | 1 + + include/linux/timecounter.h | 139 + + include/linux/types.h | 3 + + include/linux/udp.h | 16 +- + include/net/bluetooth/hci.h | 53 + + include/net/bluetooth/hci_core.h | 35 +- + include/net/bluetooth/l2cap.h | 1 + + include/net/bluetooth/rfcomm.h | 2 - + include/net/cfg802154.h | 10 +- + include/net/geneve.h | 5 +- + include/net/ieee802154_netdev.h | 4 +- + include/net/inet_connection_sock.h | 3 +- + include/net/inet_sock.h | 29 +- + include/net/ip.h | 7 +- + include/net/ip6_fib.h | 10 +- + include/net/ip_fib.h | 50 +- + include/net/ip_tunnels.h | 5 +- + include/net/mac802154.h | 5 +- + include/net/netfilter/nf_conntrack.h | 2 - + include/net/netlink.h | 4 +- + include/net/nl802154.h | 45 +- + include/net/pkt_sched.h | 12 + + include/net/tcp.h | 22 +- + include/net/vxlan.h | 96 +- + include/trace/events/net.h | 8 +- + include/uapi/linux/if_bridge.h | 2 + + include/uapi/linux/if_link.h | 3 + + include/uapi/linux/in.h | 1 + + include/uapi/linux/ipv6.h | 6 +- + include/uapi/linux/l2tp.h | 1 + + include/uapi/linux/libc-compat.h | 6 + + include/uapi/linux/openvswitch.h | 11 + + include/uapi/linux/rtnetlink.h | 3 + + include/xen/page.h | 5 + + kernel/locking/spinlock.c | 8 + + kernel/time/Makefile | 2 +- + kernel/time/clocksource.c | 76 - + kernel/time/timecounter.c | 112 + + lib/rhashtable.c | 750 +++-- + net/8021q/vlan_core.c | 2 +- + net/batman-adv/Kconfig | 1 + + net/batman-adv/bat_iv_ogm.c | 15 +- + net/batman-adv/bitarray.c | 1 - + net/batman-adv/bitarray.h | 3 +- + net/batman-adv/bridge_loop_avoidance.c | 17 +- + net/batman-adv/debugfs.c | 2 +- + net/batman-adv/distributed-arp-table.c | 1 + + net/batman-adv/distributed-arp-table.h | 4 +- + net/batman-adv/fragmentation.c | 1 - + net/batman-adv/fragmentation.h | 3 +- + net/batman-adv/gateway_client.c | 1 + + net/batman-adv/main.c | 10 +- + net/batman-adv/main.h | 15 +- + net/batman-adv/multicast.h | 3 - + net/batman-adv/network-coding.c | 3 +- + net/batman-adv/originator.c | 1 - + net/batman-adv/originator.h | 1 - + net/batman-adv/packet.h | 5 +- + net/batman-adv/routing.c | 3 +- + net/batman-adv/soft-interface.c | 1 - + net/batman-adv/sysfs.c | 1 - + net/batman-adv/translation-table.c | 8 +- + net/batman-adv/types.h | 4 +- + net/bluetooth/Kconfig | 27 + + net/bluetooth/Makefile | 4 +- + net/bluetooth/af_bluetooth.c | 6 + + net/bluetooth/hci_conn.c | 4 + + net/bluetooth/hci_core.c | 1640 +---------- + net/bluetooth/hci_debugfs.c | 1076 ++++++++ + net/bluetooth/hci_debugfs.h | 26 + + net/bluetooth/hci_event.c | 71 +- + net/bluetooth/hci_request.c | 555 ++++ + net/bluetooth/hci_request.h | 54 + + net/bluetooth/mgmt.c | 265 +- + net/bluetooth/rfcomm/core.c | 4 +- + net/bluetooth/selftest.c | 244 ++ + net/bluetooth/selftest.h | 45 + + net/bluetooth/smp.c | 335 ++- + net/bluetooth/smp.h | 13 + + net/bridge/br_fdb.c | 7 +- + net/bridge/br_if.c | 1 + + net/bridge/br_netfilter.c | 12 +- + net/bridge/br_netlink.c | 251 +- + net/bridge/br_private.h | 4 +- + net/bridge/br_vlan.c | 4 +- + net/bridge/netfilter/ebt_vlan.c | 4 +- + net/bridge/netfilter/ebtables.c | 2 +- + net/core/dev.c | 23 +- + net/core/ethtool.c | 45 +- + net/core/netpoll.c | 2 +- + net/core/rtnetlink.c | 20 +- + net/core/skbuff.c | 15 +- + net/decnet/dn_fib.c | 3 +- + net/decnet/dn_table.c | 4 +- + net/ethernet/eth.c | 92 + + net/ieee802154/nl-mac.c | 4 +- + net/ieee802154/nl802154.c | 46 +- + net/ieee802154/rdev-ops.h | 7 + + net/ieee802154/sysfs.c | 2 +- + net/ipv4/fib_frontend.c | 29 +- + net/ipv4/fib_rules.c | 22 +- + net/ipv4/fib_semantics.c | 14 +- + net/ipv4/fib_trie.c | 1916 ++++++------- + net/ipv4/fou.c | 14 +- + net/ipv4/geneve.c | 202 +- + net/ipv4/ip_gre.c | 1 + + net/ipv4/ip_sockglue.c | 108 +- + net/ipv4/tcp_cong.c | 121 +- + net/ipv4/tcp_input.c | 38 +- + net/ipv4/tcp_ipv4.c | 2 + + net/ipv4/tcp_minisocks.c | 30 +- + net/ipv4/tcp_output.c | 21 + + net/ipv4/udp.c | 4 +- + net/ipv4/udp_offload.c | 7 +- + net/ipv4/udp_tunnel.c | 2 +- + net/ipv6/icmp.c | 2 +- + net/ipv6/ip6_fib.c | 68 +- + net/ipv6/route.c | 72 +- + net/ipv6/tcp_ipv6.c | 2 + + net/ipv6/udp.c | 2 +- + net/l2tp/l2tp_netlink.c | 101 +- + net/mac802154/cfg.c | 21 + + net/mac802154/driver-ops.h | 5 +- + net/mac802154/iface.c | 100 +- + net/mac802154/mac_cmd.c | 6 +- + net/netfilter/nf_conntrack_core.c | 17 +- + net/netfilter/nf_conntrack_netlink.c | 89 +- + net/netfilter/nf_conntrack_seqadj.c | 6 +- + net/netfilter/nf_log.c | 3 +- + net/netfilter/nfnetlink.c | 15 +- + net/netfilter/nfnetlink_cthelper.c | 4 +- + net/netfilter/nft_hash.c | 92 +- + net/netfilter/xt_osf.c | 169 +- + net/netlink/af_netlink.c | 95 +- + net/netlink/af_netlink.h | 2 +- + net/netlink/diag.c | 12 +- + net/openvswitch/actions.c | 4 +- + net/openvswitch/datapath.c | 2 +- + net/openvswitch/flow.c | 6 +- + net/openvswitch/flow.h | 14 +- + net/openvswitch/flow_netlink.c | 286 +- + net/openvswitch/vport-geneve.c | 30 +- + net/openvswitch/vport-gre.c | 14 +- + net/openvswitch/vport-vxlan.c | 103 +- + net/openvswitch/vport-vxlan.h | 11 + + net/openvswitch/vport.c | 12 +- + net/openvswitch/vport.h | 18 + + net/packet/af_packet.c | 14 +- + net/sched/act_csum.c | 2 +- + net/sched/cls_flow.c | 8 +- + net/sched/em_ipset.c | 2 +- + net/sched/em_meta.c | 4 +- + net/sched/sch_api.c | 2 +- + net/sched/sch_dsmark.c | 6 +- + net/sched/sch_teql.c | 11 +- + net/socket.c | 12 +- + net/tipc/Kconfig | 12 - + net/tipc/addr.c | 45 +- + net/tipc/addr.h | 45 +- + net/tipc/bcast.c | 367 ++- + net/tipc/bcast.h | 113 +- + net/tipc/bearer.c | 141 +- + net/tipc/bearer.h | 46 +- + net/tipc/config.c | 90 +- + net/tipc/config.h | 6 +- + net/tipc/core.c | 144 +- + net/tipc/core.h | 170 +- + net/tipc/discover.c | 84 +- + net/tipc/discover.h | 8 +- + net/tipc/link.c | 324 ++- + net/tipc/link.h | 36 +- + net/tipc/msg.c | 71 +- + net/tipc/msg.h | 60 +- + net/tipc/name_distr.c | 115 +- + net/tipc/name_distr.h | 16 +- + net/tipc/name_table.c | 180 +- + net/tipc/name_table.h | 33 +- + net/tipc/net.c | 54 +- + net/tipc/net.h | 4 +- + net/tipc/netlink.c | 17 +- + net/tipc/netlink.h | 3 + + net/tipc/node.c | 159 +- + net/tipc/node.h | 35 +- + net/tipc/server.c | 6 +- + net/tipc/server.h | 17 +- + net/tipc/socket.c | 656 ++--- + net/tipc/socket.h | 19 +- + net/tipc/subscr.c | 131 +- + net/tipc/subscr.h | 14 +- + net/wireless/util.c | 4 +- + net/xfrm/xfrm_algo.c | 5 - + sound/pci/hda/hda_priv.h | 2 +- + virt/kvm/arm/arch_timer.c | 3 +- + 451 files changed, 18083 insertions(+), 11533 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/hisilicon-hip04-net.txt + create mode 100644 Documentation/devicetree/bindings/net/rockchip-dwmac.txt + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/t4_values.h + create mode 100644 drivers/net/ethernet/hisilicon/hip04_eth.c + create mode 100644 drivers/net/ethernet/hisilicon/hip04_mdio.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c + rename arch/arm/include/asm/mach/irda.h => include/linux/platform_data/irda-sa11x0.h (100%) + create mode 100644 include/linux/timecounter.h + create mode 100644 kernel/time/timecounter.c + create mode 100644 net/bluetooth/hci_debugfs.c + create mode 100644 net/bluetooth/hci_debugfs.h + create mode 100644 net/bluetooth/hci_request.c + create mode 100644 net/bluetooth/hci_request.h + create mode 100644 net/bluetooth/selftest.c + create mode 100644 net/bluetooth/selftest.h + create mode 100644 net/openvswitch/vport-vxlan.h +Merging ipsec-next/master (78890ed75494 csiostor:fix sparse warnings) +$ git merge ipsec-next/master +Already up-to-date. +Merging wireless-drivers-next/master (d0c102f70aec b43legacy: Remove unused b43legacy_radio_set_tx_iq()) +$ git merge wireless-drivers-next/master +Resolved 'drivers/net/wireless/iwlwifi/mvm/scan.c' using previous resolution. +Auto-merging drivers/net/wireless/iwlwifi/mvm/utils.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/tx.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/scan.c +CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/mvm/scan.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-fw-file.h +Auto-merging drivers/net/wireless/iwlwifi/iwl-8000.c +Auto-merging drivers/net/wireless/iwlwifi/iwl-7000.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c6db9e0ff2cc] Merge remote-tracking branch 'wireless-drivers-next/master' +$ git diff -M --stat --summary HEAD^.. + .../bindings/net/wireless/qcom,ath10k.txt | 30 + + drivers/bcma/driver_chipcommon.c | 10 +- + drivers/net/wireless/adm8211.c | 1 + + drivers/net/wireless/ath/ath10k/Makefile | 2 + + drivers/net/wireless/ath/ath10k/ce.c | 2 + + drivers/net/wireless/ath/ath10k/core.c | 250 ++- + drivers/net/wireless/ath/ath10k/core.h | 21 +- + drivers/net/wireless/ath/ath10k/debug.c | 88 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 5 - + drivers/net/wireless/ath/ath10k/hw.h | 30 + + drivers/net/wireless/ath/ath10k/mac.c | 192 +- + drivers/net/wireless/ath/ath10k/pci.c | 31 + + drivers/net/wireless/ath/ath10k/pci.h | 5 + + drivers/net/wireless/ath/ath10k/spectral.c | 1 + + drivers/net/wireless/ath/ath10k/testmode.c | 5 +- + drivers/net/wireless/ath/ath10k/thermal.c | 243 +++ + drivers/net/wireless/ath/ath10k/thermal.h | 58 + + drivers/net/wireless/ath/ath10k/wmi-ops.h | 860 ++++++++ + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 2222 ++++++++++++++++++++ + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 1380 ++++++++++++ + drivers/net/wireless/ath/ath10k/wmi.c | 1737 ++++++++++----- + drivers/net/wireless/ath/ath10k/wmi.h | 302 ++- + drivers/net/wireless/ath/ath5k/ahb.c | 1 - + drivers/net/wireless/ath/ath9k/ahb.c | 4 + + drivers/net/wireless/ath/ath9k/ani.c | 3 +- + drivers/net/wireless/ath/ath9k/ar5008_phy.c | 80 + + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 15 +- + drivers/net/wireless/ath/ath9k/ar9003_hw.c | 61 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 47 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.h | 19 +- + drivers/net/wireless/ath/ath9k/ar956x_initvals.h | 1046 +++++++++ + drivers/net/wireless/ath/ath9k/debug.c | 134 +- + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 14 + + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 15 + + drivers/net/wireless/ath/ath9k/eeprom_def.c | 14 + + drivers/net/wireless/ath/ath9k/hw.c | 44 +- + drivers/net/wireless/ath/ath9k/hw.h | 3 + + drivers/net/wireless/ath/ath9k/mac.c | 3 +- + drivers/net/wireless/ath/ath9k/pci.c | 85 + + drivers/net/wireless/ath/ath9k/recv.c | 3 +- + drivers/net/wireless/ath/ath9k/reg.h | 4 + + drivers/net/wireless/ath/ath9k/xmit.c | 68 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 12 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 164 +- + drivers/net/wireless/ath/wil6210/ethtool.c | 46 +- + drivers/net/wireless/ath/wil6210/interrupt.c | 109 +- + drivers/net/wireless/ath/wil6210/main.c | 194 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 65 +- + drivers/net/wireless/ath/wil6210/rx_reorder.c | 275 ++- + drivers/net/wireless/ath/wil6210/txrx.c | 70 +- + drivers/net/wireless/ath/wil6210/txrx.h | 158 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 161 +- + drivers/net/wireless/ath/wil6210/wmi.c | 221 +- + drivers/net/wireless/ath/wil6210/wmi.h | 12 +- + drivers/net/wireless/b43legacy/radio.c | 19 - + drivers/net/wireless/b43legacy/radio.h | 1 - + drivers/net/wireless/brcm80211/brcmfmac/bcmsdh.c | 20 +- + drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 176 +- + drivers/net/wireless/brcm80211/brcmfmac/cfg80211.h | 5 + + drivers/net/wireless/brcm80211/brcmfmac/chip.c | 15 +- + drivers/net/wireless/brcm80211/brcmfmac/common.c | 3 + + drivers/net/wireless/brcm80211/brcmfmac/common.h | 20 + + drivers/net/wireless/brcm80211/brcmfmac/core.c | 3 +- + drivers/net/wireless/brcm80211/brcmfmac/core.h | 4 +- + drivers/net/wireless/brcm80211/brcmfmac/flowring.c | 6 +- + drivers/net/wireless/brcm80211/brcmfmac/fwil.h | 4 + + .../net/wireless/brcm80211/brcmfmac/fwil_types.h | 14 + + drivers/net/wireless/brcm80211/brcmfmac/msgbuf.c | 24 +- + drivers/net/wireless/brcm80211/brcmfmac/pcie.c | 10 +- + drivers/net/wireless/brcm80211/brcmfmac/sdio.c | 7 +- + .../net/wireless/brcm80211/include/brcm_hw_ids.h | 12 +- + drivers/net/wireless/cw1200/main.c | 5 +- + drivers/net/wireless/cw1200/pm.c | 5 +- + drivers/net/wireless/cw1200/queue.c | 4 +- + drivers/net/wireless/iwlegacy/3945-mac.c | 4 +- + drivers/net/wireless/iwlegacy/4965-mac.c | 9 +- + drivers/net/wireless/iwlwifi/dvm/main.c | 24 +- + drivers/net/wireless/iwlwifi/dvm/tt.c | 13 +- + drivers/net/wireless/iwlwifi/iwl-7000.c | 23 +- + drivers/net/wireless/iwlwifi/iwl-8000.c | 17 +- + drivers/net/wireless/iwlwifi/iwl-config.h | 10 +- + drivers/net/wireless/iwlwifi/iwl-csr.h | 1 + + drivers/net/wireless/iwlwifi/iwl-drv.c | 81 +- + drivers/net/wireless/iwlwifi/iwl-drv.h | 1 - + drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 22 +- + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 1 + + drivers/net/wireless/iwlwifi/iwl-fw.h | 4 + + drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 + + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 6 + + drivers/net/wireless/iwlwifi/iwl-prph.h | 5 + + drivers/net/wireless/iwlwifi/iwl-trans.h | 21 + + drivers/net/wireless/iwlwifi/mvm/coex.c | 4 +- + drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 4 +- + drivers/net/wireless/iwlwifi/mvm/constants.h | 28 + + drivers/net/wireless/iwlwifi/mvm/d3.c | 51 +- + drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/debugfs.c | 56 +- + drivers/net/wireless/iwlwifi/mvm/fw.c | 31 +- + drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 102 +- + drivers/net/wireless/iwlwifi/mvm/mvm.h | 34 + + drivers/net/wireless/iwlwifi/mvm/ops.c | 41 +- + drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/rs.c | 169 +- + drivers/net/wireless/iwlwifi/mvm/rs.h | 39 - + drivers/net/wireless/iwlwifi/mvm/scan.c | 22 +- + drivers/net/wireless/iwlwifi/mvm/sta.c | 16 +- + drivers/net/wireless/iwlwifi/mvm/tt.c | 7 +- + drivers/net/wireless/iwlwifi/mvm/tx.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/utils.c | 4 +- + drivers/net/wireless/iwlwifi/pcie/internal.h | 8 + + drivers/net/wireless/iwlwifi/pcie/trans.c | 64 +- + drivers/net/wireless/iwlwifi/pcie/tx.c | 34 +- + drivers/net/wireless/mwifiex/11n.h | 14 +- + drivers/net/wireless/mwifiex/11n_aggr.c | 15 +- + drivers/net/wireless/mwifiex/11n_rxreorder.c | 6 +- + drivers/net/wireless/mwifiex/Makefile | 2 + + drivers/net/wireless/mwifiex/cfg80211.c | 99 +- + drivers/net/wireless/mwifiex/cfp.c | 18 + + drivers/net/wireless/mwifiex/cmdevt.c | 6 - + drivers/net/wireless/mwifiex/debugfs.c | 281 +-- + drivers/net/wireless/mwifiex/decl.h | 34 +- + drivers/net/wireless/mwifiex/ethtool.c | 16 +- + drivers/net/wireless/mwifiex/fw.h | 3 + + drivers/net/wireless/mwifiex/init.c | 23 + + drivers/net/wireless/mwifiex/ioctl.h | 11 +- + drivers/net/wireless/mwifiex/main.c | 133 +- + drivers/net/wireless/mwifiex/main.h | 24 +- + drivers/net/wireless/mwifiex/pcie.c | 5 +- + drivers/net/wireless/mwifiex/sdio.c | 104 +- + drivers/net/wireless/mwifiex/sdio.h | 26 + + drivers/net/wireless/mwifiex/sta_cmd.c | 7 +- + drivers/net/wireless/mwifiex/sta_cmdresp.c | 2 + + drivers/net/wireless/mwifiex/sta_event.c | 7 + + drivers/net/wireless/mwifiex/sta_ioctl.c | 6 +- + drivers/net/wireless/mwifiex/sta_rx.c | 9 + + drivers/net/wireless/mwifiex/sta_tx.c | 19 +- + drivers/net/wireless/mwifiex/tdls.c | 35 +- + drivers/net/wireless/mwifiex/uap_event.c | 2 + + drivers/net/wireless/mwifiex/uap_txrx.c | 28 +- + drivers/net/wireless/mwifiex/usb.c | 11 +- + drivers/net/wireless/mwifiex/usb.h | 7 - + drivers/net/wireless/mwifiex/util.c | 220 ++ + drivers/net/wireless/mwifiex/util.h | 20 + + drivers/net/wireless/orinoco/Kconfig | 3 +- + drivers/net/wireless/orinoco/orinoco_usb.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00config.c | 4 +- + drivers/net/wireless/rt2x00/rt2x00dev.c | 18 +- + drivers/net/wireless/rt2x00/rt2x00firmware.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00mac.c | 2 +- + drivers/net/wireless/rt2x00/rt2x00queue.c | 18 +- + drivers/net/wireless/rt2x00/rt2x00usb.c | 8 +- + drivers/net/wireless/rtlwifi/core.c | 37 + + drivers/net/wireless/rtlwifi/core.h | 41 + + drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | 36 +- + drivers/net/wireless/rtlwifi/rtl8188ee/dm.h | 41 - + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.c | 45 +- + drivers/net/wireless/rtlwifi/rtl8192c/dm_common.h | 38 - + drivers/net/wireless/rtlwifi/rtl8192ce/dm.c | 1 + + drivers/net/wireless/rtlwifi/rtl8192ce/dm.h | 13 - + drivers/net/wireless/rtlwifi/rtl8192de/dm.c | 33 +- + drivers/net/wireless/rtlwifi/rtl8192de/dm.h | 38 - + drivers/net/wireless/rtlwifi/rtl8192ee/dm.c | 55 +- + drivers/net/wireless/rtlwifi/rtl8192ee/dm.h | 16 - + drivers/net/wireless/rtlwifi/rtl8192se/dm.c | 7 +- + drivers/net/wireless/rtlwifi/rtl8192se/dm.h | 28 - + drivers/net/wireless/rtlwifi/rtl8723ae/dm.c | 42 +- + drivers/net/wireless/rtlwifi/rtl8723ae/dm.h | 38 - + drivers/net/wireless/rtlwifi/rtl8723be/dm.c | 55 +- + drivers/net/wireless/rtlwifi/rtl8723be/dm.h | 33 - + drivers/net/wireless/rtlwifi/rtl8723be/sw.c | 10 +- + drivers/net/wireless/rtlwifi/rtl8821ae/dm.c | 58 +- + drivers/net/wireless/rtlwifi/rtl8821ae/dm.h | 41 - + drivers/net/wireless/rtlwifi/wifi.h | 2 - + drivers/net/wireless/ti/wl12xx/main.c | 4 + + drivers/net/wireless/ti/wl18xx/acx.c | 88 + + drivers/net/wireless/ti/wl18xx/acx.h | 46 +- + drivers/net/wireless/ti/wl18xx/cmd.c | 93 +- + drivers/net/wireless/ti/wl18xx/cmd.h | 27 + + drivers/net/wireless/ti/wl18xx/conf.h | 23 +- + drivers/net/wireless/ti/wl18xx/debugfs.c | 43 + + drivers/net/wireless/ti/wl18xx/event.c | 21 + + drivers/net/wireless/ti/wl18xx/event.h | 14 +- + drivers/net/wireless/ti/wl18xx/main.c | 37 +- + drivers/net/wireless/ti/wl18xx/wl18xx.h | 4 +- + drivers/net/wireless/ti/wlcore/cmd.c | 20 +- + drivers/net/wireless/ti/wlcore/cmd.h | 8 + + drivers/net/wireless/ti/wlcore/conf.h | 7 +- + drivers/net/wireless/ti/wlcore/debugfs.c | 9 +- + drivers/net/wireless/ti/wlcore/event.c | 11 +- + drivers/net/wireless/ti/wlcore/hw_ops.h | 48 +- + drivers/net/wireless/ti/wlcore/init.c | 8 +- + drivers/net/wireless/ti/wlcore/main.c | 381 +++- + drivers/net/wireless/ti/wlcore/ps.c | 8 +- + drivers/net/wireless/ti/wlcore/vendor_cmd.c | 2 +- + drivers/net/wireless/ti/wlcore/wlcore.h | 12 +- + drivers/net/wireless/ti/wlcore/wlcore_i.h | 7 + + include/linux/mmc/sdio_ids.h | 6 +- + 198 files changed, 12251 insertions(+), 2584 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/wireless/qcom,ath10k.txt + create mode 100644 drivers/net/wireless/ath/ath10k/thermal.c + create mode 100644 drivers/net/wireless/ath/ath10k/thermal.h + create mode 100644 drivers/net/wireless/ath/ath10k/wmi-ops.h + create mode 100644 drivers/net/wireless/ath/ath10k/wmi-tlv.c + create mode 100644 drivers/net/wireless/ath/ath10k/wmi-tlv.h + create mode 100644 drivers/net/wireless/ath/ath9k/ar956x_initvals.h + create mode 100644 drivers/net/wireless/brcm80211/brcmfmac/common.h +Merging bluetooth/master (88340160f3ad ip_tunnel: Create percpu gro_cell) +$ git merge bluetooth/master +Recorded preimage for 'drivers/net/wireless/ath/wil6210/cfg80211.c' +Auto-merging net/wireless/reg.c +Auto-merging net/sched/Kconfig +Auto-merging net/netlink/genetlink.c +Auto-merging net/netlink/af_netlink.c +Auto-merging net/mac80211/mlme.c +Removing net/ieee802154/reassembly.h +Removing net/ieee802154/raw.c +Removing net/ieee802154/dgram.c +Removing net/ieee802154/af_ieee802154.c +Removing net/ieee802154/af802154.h +Removing net/ieee802154/6lowpan_rtnl.c +Auto-merging net/ieee802154/6lowpan/reassembly.c +Auto-merging include/net/genetlink.h +Auto-merging drivers/net/wireless/ti/wlcore/main.c +Auto-merging drivers/net/wireless/mwifiex/uap_event.c +Auto-merging drivers/net/wireless/mwifiex/cfg80211.c +Auto-merging drivers/net/wireless/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/cw1200/main.c +Auto-merging drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c +Auto-merging drivers/net/wireless/ath/wil6210/wmi.c +Auto-merging drivers/net/wireless/ath/wil6210/cfg80211.c +CONFLICT (content): Merge conflict in drivers/net/wireless/ath/wil6210/cfg80211.c +Auto-merging drivers/net/wireless/ath/ath9k/xmit.c +Auto-merging drivers/net/wireless/ath/ath10k/wmi.c +Auto-merging drivers/net/wireless/ath/ath10k/mac.c +Auto-merging drivers/net/ethernet/ti/cpsw.c +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/net/wireless/ath/wil6210/cfg80211.c'. +[master e02253bbe1e3] Merge remote-tracking branch 'bluetooth/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/80211.tmpl | 1 - + .../devicetree/bindings/net/amd-xgbe-phy.txt | 21 + + Documentation/kernel-parameters.txt | 12 + + Documentation/rfkill.txt | 3 + + drivers/acpi/event.c | 7 +- + drivers/atm/eni.c | 33 +- + drivers/atm/fore200e.c | 22 +- + drivers/atm/he.c | 125 +-- + drivers/atm/he.h | 4 +- + drivers/atm/idt77252.c | 107 +- + drivers/atm/iphase.c | 54 +- + drivers/atm/lanai.c | 14 +- + drivers/atm/nicstar.c | 60 +- + drivers/atm/solos-pci.c | 26 +- + drivers/atm/zatm.c | 17 +- + drivers/bluetooth/btmrvl_drv.h | 5 +- + drivers/bluetooth/btmrvl_main.c | 32 +- + drivers/bluetooth/btmrvl_sdio.c | 6 +- + drivers/bluetooth/btusb.c | 15 +- + drivers/infiniband/hw/cxgb4/cm.c | 30 +- + drivers/infiniband/hw/cxgb4/cq.c | 60 +- + drivers/infiniband/hw/cxgb4/device.c | 12 +- + drivers/infiniband/hw/cxgb4/ev.c | 12 +- + drivers/infiniband/hw/cxgb4/mem.c | 18 +- + drivers/infiniband/hw/cxgb4/qp.c | 62 +- + drivers/infiniband/hw/cxgb4/t4.h | 100 +- + drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 812 +++++++------- + drivers/isdn/sc/init.c | 15 +- + drivers/net/ethernet/amd/Kconfig | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-desc.c | 32 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 66 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 59 +- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 203 +++- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 29 +- + drivers/net/ethernet/amd/xgbe/xgbe-ptp.c | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 29 +- + drivers/net/ethernet/cadence/macb.c | 25 +- + drivers/net/ethernet/cadence/macb.h | 734 +++++-------- + drivers/net/ethernet/chelsio/cxgb4/Makefile | 2 +- + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 314 ++++++ + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h | 41 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 19 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 228 ++-- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 3 - + drivers/net/ethernet/intel/i40e/i40e.h | 5 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 152 ++- + drivers/net/ethernet/intel/i40e/i40e_common.c | 5 + + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 1 - + drivers/net/ethernet/intel/i40e/i40e_main.c | 120 ++- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 44 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 3 + + drivers/net/ethernet/intel/i40e/i40e_type.h | 1 + + drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 2 +- + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 108 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 1 + + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- + drivers/net/ethernet/rocker/rocker.c | 34 +- + drivers/net/ethernet/smsc/Kconfig | 10 +- + drivers/net/ethernet/smsc/smc91x.h | 21 + + drivers/net/ethernet/sun/niu.c | 3 +- + drivers/net/ethernet/ti/cpsw.c | 76 +- + drivers/net/phy/Kconfig | 2 +- + drivers/net/phy/amd-xgbe-phy.c | 981 +++++++++++------ + drivers/net/vmxnet3/vmxnet3_ethtool.c | 2 +- + drivers/net/vmxnet3/vmxnet3_int.h | 4 +- + drivers/net/vxlan.c | 3 +- + drivers/net/wireless/ath/ath10k/mac.c | 3 +- + drivers/net/wireless/ath/ath10k/wmi.c | 8 +- + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 16 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 14 +- + drivers/net/wireless/ath/ath6kl/main.c | 1 - + drivers/net/wireless/ath/ath9k/link.c | 16 +- + drivers/net/wireless/ath/ath9k/xmit.c | 6 +- + drivers/net/wireless/ath/carl9170/cmd.c | 12 +- + drivers/net/wireless/ath/carl9170/main.c | 6 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 18 +- + drivers/net/wireless/ath/wil6210/wmi.c | 1 - + drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 11 +- + drivers/net/wireless/cw1200/main.c | 1 - + drivers/net/wireless/cw1200/sta.c | 4 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 13 +- + drivers/net/wireless/libertas/cfg.c | 12 +- + drivers/net/wireless/mac80211_hwsim.c | 33 +- + drivers/net/wireless/mwifiex/cfg80211.c | 17 +- + drivers/net/wireless/mwifiex/uap_event.c | 1 - + drivers/net/wireless/mwl8k.c | 12 +- + drivers/net/wireless/p54/eeprom.c | 6 +- + drivers/net/wireless/p54/main.c | 10 +- + drivers/net/wireless/p54/txrx.c | 12 +- + drivers/net/wireless/rndis_wlan.c | 4 +- + drivers/net/wireless/rt2x00/rt2800lib.c | 12 +- + drivers/net/wireless/ti/wl1251/main.c | 5 +- + drivers/net/wireless/ti/wlcore/main.c | 22 +- + drivers/s390/net/claw.c | 6 +- + drivers/s390/net/ctcm_fsms.c | 18 +- + drivers/s390/net/ctcm_main.c | 4 +- + drivers/s390/net/ctcm_main.h | 2 +- + drivers/s390/net/ctcm_sysfs.c | 4 +- + drivers/s390/net/lcs.c | 6 +- + drivers/s390/net/netiucv.c | 15 +- + drivers/s390/net/qeth_core.h | 1 - + drivers/s390/net/qeth_core_sys.c | 45 +- + drivers/s390/net/qeth_l2_main.c | 6 +- + drivers/s390/net/qeth_l3_main.c | 7 +- + drivers/s390/net/qeth_l3_sys.c | 45 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 23 +- + drivers/scsi/pmcraid.c | 8 +- + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 10 +- + drivers/staging/wlan-ng/cfg80211.c | 4 +- + drivers/target/target_core_user.c | 4 +- + drivers/thermal/thermal_core.c | 6 +- + fs/dlm/netlink.c | 7 +- + include/linux/if_bridge.h | 18 - + include/linux/rhashtable.h | 2 +- + include/net/bluetooth/bluetooth.h | 2 +- + include/net/bluetooth/hci.h | 30 +- + include/net/bluetooth/hci_core.h | 6 +- + include/net/cfg80211.h | 253 +++-- + include/net/genetlink.h | 4 +- + include/net/gro_cells.h | 29 +- + include/net/mac80211.h | 55 +- + include/net/netlink.h | 6 +- + include/net/regulatory.h | 19 + + include/net/route.h | 2 + + include/net/switchdev.h | 42 + + include/net/tc_act/tc_bpf.h | 25 + + include/uapi/linux/nl80211.h | 176 ++- + include/uapi/linux/tc_act/Kbuild | 1 + + include/uapi/linux/tc_act/tc_bpf.h | 31 + + kernel/taskstats.c | 13 +- + lib/rhashtable.c | 12 +- + net/bluetooth/6lowpan.c | 66 +- + net/bluetooth/cmtp/capi.c | 6 - + net/bluetooth/hci_conn.c | 17 +- + net/bluetooth/hci_core.c | 128 ++- + net/bluetooth/hci_debugfs.c | 143 +-- + net/bluetooth/hci_event.c | 42 + + net/bluetooth/hci_request.c | 3 +- + net/bluetooth/hci_sock.c | 107 +- + net/bluetooth/l2cap_core.c | 55 +- + net/bluetooth/l2cap_sock.c | 2 + + net/bluetooth/mgmt.c | 79 +- + net/bluetooth/rfcomm/sock.c | 2 + + net/bluetooth/sco.c | 2 + + net/bluetooth/selftest.c | 2 +- + net/bluetooth/smp.c | 133 ++- + net/bridge/br.c | 52 +- + net/bridge/br_fdb.c | 41 +- + net/bridge/br_mdb.c | 5 +- + net/bridge/br_netlink.c | 8 +- + net/bridge/br_private.h | 4 + + net/can/gw.c | 3 +- + net/core/fib_rules.c | 3 +- + net/core/neighbour.c | 12 +- + net/core/rtnetlink.c | 54 +- + net/decnet/dn_dev.c | 3 +- + net/decnet/dn_route.c | 3 +- + net/decnet/dn_table.c | 3 +- + net/ieee802154/6lowpan/6lowpan_i.h | 72 ++ + net/ieee802154/6lowpan/Kconfig | 5 + + net/ieee802154/6lowpan/Makefile | 3 + + net/ieee802154/6lowpan/core.c | 304 ++++++ + net/ieee802154/{ => 6lowpan}/reassembly.c | 2 +- + net/ieee802154/6lowpan/rx.c | 171 +++ + net/ieee802154/6lowpan/tx.c | 271 +++++ + net/ieee802154/6lowpan_rtnl.c | 729 ------------- + net/ieee802154/Kconfig | 18 +- + net/ieee802154/Makefile | 8 +- + net/ieee802154/af802154.h | 33 - + net/ieee802154/af_ieee802154.c | 369 ------- + net/ieee802154/dgram.c | 549 ---------- + net/ieee802154/netlink.c | 12 +- + net/ieee802154/nl-mac.c | 3 +- + net/ieee802154/nl-phy.c | 3 +- + net/ieee802154/nl802154.c | 6 +- + net/ieee802154/raw.c | 270 ----- + net/ieee802154/reassembly.h | 41 - + net/ieee802154/socket.c | 1125 ++++++++++++++++++++ + net/ipv4/devinet.c | 8 +- + net/ipv4/fib_semantics.c | 3 +- + net/ipv4/inet_diag.c | 9 +- + net/ipv4/ipmr.c | 3 +- + net/ipv4/route.c | 49 +- + net/ipv4/tcp_metrics.c | 3 +- + net/ipv6/addrconf.c | 32 +- + net/ipv6/addrlabel.c | 5 +- + net/ipv6/ip6_fib.c | 1 - + net/ipv6/ip6mr.c | 3 +- + net/ipv6/route.c | 3 +- + net/l2tp/l2tp_netlink.c | 10 +- + net/mac80211/cfg.c | 7 +- + net/mac80211/chan.c | 37 +- + net/mac80211/debugfs.c | 2 - + net/mac80211/driver-ops.h | 30 +- + net/mac80211/ethtool.c | 26 +- + net/mac80211/ibss.c | 11 +- + net/mac80211/ieee80211_i.h | 8 +- + net/mac80211/iface.c | 2 +- + net/mac80211/key.c | 9 +- + net/mac80211/main.c | 4 - + net/mac80211/mesh_plink.c | 7 + + net/mac80211/mlme.c | 81 +- + net/mac80211/offchannel.c | 4 +- + net/mac80211/pm.c | 2 +- + net/mac80211/rc80211_minstrel.c | 6 +- + net/mac80211/rc80211_minstrel.h | 15 +- + net/mac80211/rx.c | 20 +- + net/mac80211/scan.c | 8 +- + net/mac80211/spectmgmt.c | 4 - + net/mac80211/sta_info.c | 175 ++- + net/mac80211/sta_info.h | 12 + + net/mac80211/status.c | 26 +- + net/mac80211/tdls.c | 32 +- + net/mac80211/trace.h | 33 +- + net/mac80211/tx.c | 5 +- + net/mac80211/util.c | 29 +- + net/mac80211/vht.c | 73 +- + net/mac802154/cfg.c | 5 +- + net/netfilter/ipvs/ip_vs_ctl.c | 9 +- + net/netfilter/nf_tables_api.c | 18 +- + net/netlabel/netlabel_cipso_v4.c | 3 +- + net/netlabel/netlabel_mgmt.c | 6 +- + net/netlabel/netlabel_unlabeled.c | 3 +- + net/netlink/af_netlink.c | 11 +- + net/netlink/diag.c | 3 +- + net/netlink/genetlink.c | 6 +- + net/nfc/netlink.c | 12 +- + net/openvswitch/datapath.c | 9 +- + net/packet/diag.c | 3 +- + net/phonet/pn_netlink.c | 16 +- + net/sched/Kconfig | 12 + + net/sched/Makefile | 1 + + net/sched/act_bpf.c | 205 ++++ + net/sched/cls_bpf.c | 18 +- + net/socket.c | 10 +- + net/switchdev/switchdev.c | 65 ++ + net/tipc/socket.c | 30 +- + net/unix/diag.c | 3 +- + net/wireless/core.c | 40 +- + net/wireless/core.h | 11 +- + net/wireless/nl80211.c | 652 ++++++++---- + net/wireless/nl80211.h | 16 +- + net/wireless/reg.c | 160 ++- + net/wireless/reg.h | 1 + + net/wireless/scan.c | 13 +- + net/wireless/trace.h | 31 +- + net/wireless/wext-compat.c | 10 +- + net/xfrm/xfrm_user.c | 27 +- + 251 files changed, 7882 insertions(+), 5581 deletions(-) + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c + create mode 100644 drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h + create mode 100644 include/net/tc_act/tc_bpf.h + create mode 100644 include/uapi/linux/tc_act/tc_bpf.h + create mode 100644 net/ieee802154/6lowpan/6lowpan_i.h + create mode 100644 net/ieee802154/6lowpan/Kconfig + create mode 100644 net/ieee802154/6lowpan/Makefile + create mode 100644 net/ieee802154/6lowpan/core.c + rename net/ieee802154/{ => 6lowpan}/reassembly.c (99%) + create mode 100644 net/ieee802154/6lowpan/rx.c + create mode 100644 net/ieee802154/6lowpan/tx.c + delete mode 100644 net/ieee802154/6lowpan_rtnl.c + delete mode 100644 net/ieee802154/af802154.h + delete mode 100644 net/ieee802154/af_ieee802154.c + delete mode 100644 net/ieee802154/dgram.c + delete mode 100644 net/ieee802154/raw.c + delete mode 100644 net/ieee802154/reassembly.h + create mode 100644 net/ieee802154/socket.c + create mode 100644 net/sched/act_bpf.c +$ git reset --hard HEAD^ +HEAD is now at c6db9e0ff2cc Merge remote-tracking branch 'wireless-drivers-next/master' +Merging next-20150116 version of bluetooth +$ git merge -m next-20150116/bluetooth 2b8df323953bfbeb8289c56f43b7fcfa4c70e90a +Removing net/ieee802154/reassembly.h +Removing net/ieee802154/raw.c +Removing net/ieee802154/dgram.c +Removing net/ieee802154/af_ieee802154.c +Removing net/ieee802154/af802154.h +Removing net/ieee802154/6lowpan_rtnl.c +Auto-merging net/ieee802154/6lowpan/reassembly.c +Merge made by the 'recursive' strategy. + drivers/bluetooth/btmrvl_drv.h | 5 +- + drivers/bluetooth/btmrvl_main.c | 32 +- + drivers/bluetooth/btmrvl_sdio.c | 6 +- + drivers/bluetooth/btusb.c | 15 +- + include/net/bluetooth/bluetooth.h | 2 +- + include/net/bluetooth/hci.h | 30 +- + include/net/bluetooth/hci_core.h | 5 +- + net/bluetooth/6lowpan.c | 66 +- + net/bluetooth/cmtp/capi.c | 6 - + net/bluetooth/hci_conn.c | 2 +- + net/bluetooth/hci_core.c | 128 ++-- + net/bluetooth/hci_debugfs.c | 143 +--- + net/bluetooth/hci_event.c | 42 ++ + net/bluetooth/hci_request.c | 3 +- + net/bluetooth/hci_sock.c | 107 ++- + net/bluetooth/l2cap_core.c | 55 +- + net/bluetooth/l2cap_sock.c | 2 + + net/bluetooth/mgmt.c | 79 +- + net/bluetooth/rfcomm/sock.c | 2 + + net/bluetooth/sco.c | 2 + + net/bluetooth/selftest.c | 2 +- + net/bluetooth/smp.c | 133 +++- + net/ieee802154/6lowpan/6lowpan_i.h | 72 ++ + net/ieee802154/6lowpan/Kconfig | 5 + + net/ieee802154/6lowpan/Makefile | 3 + + net/ieee802154/6lowpan/core.c | 304 ++++++++ + net/ieee802154/{ => 6lowpan}/reassembly.c | 2 +- + net/ieee802154/6lowpan/rx.c | 171 +++++ + net/ieee802154/6lowpan/tx.c | 271 +++++++ + net/ieee802154/6lowpan_rtnl.c | 729 ------------------- + net/ieee802154/Kconfig | 18 +- + net/ieee802154/Makefile | 8 +- + net/ieee802154/af802154.h | 33 - + net/ieee802154/af_ieee802154.c | 369 ---------- + net/ieee802154/dgram.c | 549 -------------- + net/ieee802154/raw.c | 270 ------- + net/ieee802154/reassembly.h | 41 -- + net/ieee802154/socket.c | 1125 +++++++++++++++++++++++++++++ + net/mac802154/cfg.c | 5 +- + 39 files changed, 2461 insertions(+), 2381 deletions(-) + create mode 100644 net/ieee802154/6lowpan/6lowpan_i.h + create mode 100644 net/ieee802154/6lowpan/Kconfig + create mode 100644 net/ieee802154/6lowpan/Makefile + create mode 100644 net/ieee802154/6lowpan/core.c + rename net/ieee802154/{ => 6lowpan}/reassembly.c (99%) + create mode 100644 net/ieee802154/6lowpan/rx.c + create mode 100644 net/ieee802154/6lowpan/tx.c + delete mode 100644 net/ieee802154/6lowpan_rtnl.c + delete mode 100644 net/ieee802154/af802154.h + delete mode 100644 net/ieee802154/af_ieee802154.c + delete mode 100644 net/ieee802154/dgram.c + delete mode 100644 net/ieee802154/raw.c + delete mode 100644 net/ieee802154/reassembly.h + create mode 100644 net/ieee802154/socket.c +Merging infiniband/for-next (a7cfef21e3d0 Merge branches 'core', 'cxgb4', 'ipoib', 'iser', 'mlx4', 'ocrdma', 'odp' and 'srp' into for-next) +$ git merge infiniband/for-next +Already up-to-date. +Merging mtd/master (97bf6af1f928 Linux 3.19-rc1) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (69a559e75512 nandsim: remove unused STATE_DATAOUT_STATUS_M and OPT_SMARTMEDIA) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/fsl-quadspi.txt | 2 +- + .../devicetree/bindings/mtd/gpmi-nand.txt | 2 +- + .../devicetree/bindings/mtd/mtd-physmap.txt | 5 + + drivers/mtd/bcm47xxpart.c | 43 ++++++- + drivers/mtd/chips/map_ram.c | 1 + + drivers/mtd/chips/map_rom.c | 13 +- + drivers/mtd/devices/st_spi_fsm.c | 137 ++++++++++++++++++--- + drivers/mtd/maps/physmap_of.c | 10 ++ + drivers/mtd/mtdblock.c | 10 -- + drivers/mtd/mtdcore.c | 20 +++ + drivers/mtd/nand/ams-delta.c | 6 +- + drivers/mtd/nand/denali.c | 2 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 9 -- + drivers/mtd/nand/nand_base.c | 12 +- + drivers/mtd/nand/nandsim.c | 6 - + drivers/mtd/nftlmount.c | 18 +-- + drivers/mtd/spi-nor/fsl-quadspi.c | 18 +++ + drivers/mtd/spi-nor/spi-nor.c | 62 ++++++++-- + fs/jffs2/compr_rubin.c | 5 - + include/linux/mtd/mtd.h | 1 + + include/linux/mtd/spi-nor.h | 7 ++ + 21 files changed, 309 insertions(+), 80 deletions(-) +Merging crypto/master (b2c3f7cdad76 crypto: qat - don't need qat_auth_state struct) +$ git merge crypto/master +Auto-merging drivers/crypto/ux500/cryp/cryp_core.c +Merge made by the 'recursive' strategy. + arch/mips/cavium-octeon/Makefile | 1 + + arch/mips/cavium-octeon/crypto/Makefile | 7 + + arch/mips/cavium-octeon/crypto/octeon-crypto.c | 66 +++ + arch/mips/cavium-octeon/crypto/octeon-crypto.h | 75 +++ + arch/mips/cavium-octeon/crypto/octeon-md5.c | 216 +++++++ + arch/mips/cavium-octeon/executive/octeon-model.c | 6 + + arch/mips/include/asm/octeon/octeon-feature.h | 17 +- + arch/mips/include/asm/octeon/octeon.h | 5 - + arch/sparc/crypto/aes_glue.c | 2 +- + arch/sparc/crypto/camellia_glue.c | 2 +- + arch/sparc/crypto/des_glue.c | 1 + + arch/sparc/crypto/md5_glue.c | 2 +- + arch/x86/crypto/aesni-intel_asm.S | 343 +++++------ + arch/x86/crypto/aesni-intel_glue.c | 34 +- + arch/x86/crypto/des3_ede_glue.c | 2 - + crypto/Kconfig | 18 + + crypto/Makefile | 1 + + crypto/ablkcipher.c | 8 +- + crypto/aead.c | 3 +- + crypto/af_alg.c | 11 +- + crypto/ahash.c | 1 + + crypto/algapi.c | 1 + + crypto/algif_rng.c | 192 ++++++ + crypto/algif_skcipher.c | 8 + + crypto/drbg.c | 34 +- + crypto/tcrypt.c | 10 +- + crypto/testmgr.c | 50 +- + drivers/char/hw_random/core.c | 215 ++++--- + drivers/crypto/amcc/crypto4xx_sa.c | 23 - + drivers/crypto/atmel-sha.c | 50 +- + drivers/crypto/bfin_crc.c | 2 +- + drivers/crypto/omap-des.c | 4 +- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 6 +- + drivers/crypto/qat/qat_common/adf_aer.c | 24 +- + drivers/crypto/qat/qat_common/adf_cfg.c | 2 + + drivers/crypto/qat/qat_common/adf_common_drv.h | 2 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 7 +- + drivers/crypto/qat/qat_common/adf_init.c | 98 +++- + .../crypto/qat/qat_common/adf_transport_internal.h | 1 - + drivers/crypto/qat/qat_common/icp_qat_hw.h | 2 +- + drivers/crypto/qat/qat_common/qat_algs.c | 642 +++++++++++++++------ + drivers/crypto/qat/qat_common/qat_crypto.h | 16 +- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 19 + + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 42 +- + drivers/crypto/ux500/cryp/cryp_core.c | 8 +- + include/crypto/if_alg.h | 1 + + include/linux/crypto.h | 3 + + include/linux/hw_random.h | 4 + + lib/string.c | 5 + + 49 files changed, 1671 insertions(+), 621 deletions(-) + create mode 100644 arch/mips/cavium-octeon/crypto/Makefile + create mode 100644 arch/mips/cavium-octeon/crypto/octeon-crypto.c + create mode 100644 arch/mips/cavium-octeon/crypto/octeon-crypto.h + create mode 100644 arch/mips/cavium-octeon/crypto/octeon-md5.c + create mode 100644 crypto/algif_rng.c +Merging drm/drm-next (426959c94553 drm: fix mismerge in drm_crtc.c) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/i915/intel_runtime_pm.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1c2f70b77b8c] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/drm.tmpl | 109 +++- + drivers/gpu/drm/armada/armada_crtc.c | 5 - + drivers/gpu/drm/bochs/bochs_kms.c | 5 - + drivers/gpu/drm/drm_atomic.c | 730 ++++++++++++++++++++- + drivers/gpu/drm/drm_atomic_helper.c | 106 ++- + drivers/gpu/drm/drm_cache.c | 13 +- + drivers/gpu/drm/drm_crtc.c | 470 +++++++++----- + drivers/gpu/drm/drm_crtc_helper.c | 2 + + drivers/gpu/drm/drm_crtc_internal.h | 6 + + drivers/gpu/drm/drm_drv.c | 4 + + drivers/gpu/drm/drm_info.c | 24 - + drivers/gpu/drm/drm_internal.h | 1 - + drivers/gpu/drm/drm_ioctl.c | 13 + + drivers/gpu/drm/drm_irq.c | 11 +- + drivers/gpu/drm/drm_modes.c | 82 ++- + drivers/gpu/drm/drm_plane_helper.c | 18 +- + drivers/gpu/drm/drm_probe_helper.c | 43 +- + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 131 +++- + drivers/gpu/drm/i915/i915_debugfs.c | 232 +++++-- + drivers/gpu/drm/i915/i915_dma.c | 12 +- + drivers/gpu/drm/i915/i915_drv.c | 9 +- + drivers/gpu/drm/i915/i915_drv.h | 255 +++++++- + drivers/gpu/drm/i915/i915_gem.c | 535 +++++++-------- + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 137 ++++ + drivers/gpu/drm/i915/i915_gem_context.c | 43 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 117 +++- + drivers/gpu/drm/i915/i915_gem_gtt.c | 170 +++-- + drivers/gpu/drm/i915/i915_gem_gtt.h | 35 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 91 +-- + drivers/gpu/drm/i915/i915_irq.c | 30 +- + drivers/gpu/drm/i915/i915_params.c | 9 +- + drivers/gpu/drm/i915/i915_reg.h | 378 ++++++----- + drivers/gpu/drm/i915/i915_suspend.c | 2 +- + drivers/gpu/drm/i915/i915_trace.h | 69 +- + drivers/gpu/drm/i915/intel_bios.c | 65 ++ + drivers/gpu/drm/i915/intel_bios.h | 36 +- + drivers/gpu/drm/i915/intel_ddi.c | 25 +- + drivers/gpu/drm/i915/intel_display.c | 895 ++++++++++++-------------- + drivers/gpu/drm/i915/intel_dp.c | 21 +- + drivers/gpu/drm/i915/intel_drv.h | 36 +- + drivers/gpu/drm/i915/intel_dsi.c | 483 ++++++++------ + drivers/gpu/drm/i915/intel_dsi.h | 26 + + drivers/gpu/drm/i915/intel_dsi_cmd.c | 141 ++-- + drivers/gpu/drm/i915/intel_dsi_cmd.h | 46 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 58 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 12 +- + drivers/gpu/drm/i915/intel_fbc.c | 701 ++++++++++++++++++++ + drivers/gpu/drm/i915/intel_lrc.c | 178 ++--- + drivers/gpu/drm/i915/intel_lrc.h | 2 +- + drivers/gpu/drm/i915/intel_overlay.c | 44 +- + drivers/gpu/drm/i915/intel_pm.c | 817 +---------------------- + drivers/gpu/drm/i915/intel_psr.c | 246 +++++-- + drivers/gpu/drm/i915/intel_renderstate_gen6.c | 25 + + drivers/gpu/drm/i915/intel_renderstate_gen7.c | 25 + + drivers/gpu/drm/i915/intel_renderstate_gen8.c | 25 + + drivers/gpu/drm/i915/intel_renderstate_gen9.c | 25 + + drivers/gpu/drm/i915/intel_ringbuffer.c | 226 ++++--- + drivers/gpu/drm/i915/intel_ringbuffer.h | 23 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 2 +- + drivers/gpu/drm/i915/intel_sprite.c | 183 +----- + drivers/gpu/drm/i915/intel_uncore.c | 15 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 5 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 5 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 1 + + drivers/gpu/drm/msm/msm_atomic.c | 20 + + drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_drv.h | 2 + + drivers/gpu/drm/sti/sti_drm_crtc.c | 6 - + drivers/gpu/drm/tegra/dc.c | 5 - + include/drm/drmP.h | 8 +- + include/drm/drm_atomic.h | 13 +- + include/drm/drm_atomic_helper.h | 4 + + include/drm/drm_crtc.h | 74 ++- + include/drm/drm_crtc_helper.h | 32 +- + include/drm/drm_modes.h | 9 +- + include/uapi/drm/drm.h | 8 + + include/uapi/drm/drm_mode.h | 38 +- + 80 files changed, 5362 insertions(+), 3154 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_gem_batch_pool.c + create mode 100644 drivers/gpu/drm/i915/intel_fbc.c +Merging drm-panel/drm/panel/for-next (2d0853a33fda drm/panel: sharp: lq101r1sx01: Remove unneeded include) +$ git merge drm-panel/drm/panel/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../bindings/panel/giantplus,gpg482739qs5.txt | 7 +++++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/gpu/drm/drm_mipi_dsi.c | 6 ++-- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 33 ++++++++++++++-------- + drivers/gpu/drm/panel/panel-simple.c | 26 +++++++++++++++++ + 5 files changed, 59 insertions(+), 14 deletions(-) + create mode 100644 Documentation/devicetree/bindings/panel/giantplus,gpg482739qs5.txt +Merging drm-intel/for-linux-next (6f34cc393f64 i915: reuse %ph to dump small buffers) +$ git merge drm-intel/for-linux-next +Removing sound/pci/hda/hda_i915.h +Removing include/drm/i915_powerwell.h +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging Documentation/DocBook/drm.tmpl +Merge made by the 'recursive' strategy. + Documentation/DocBook/drm.tmpl | 16 ++ + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 3 + + drivers/gpu/drm/i915/i915_dma.c | 9 + + drivers/gpu/drm/i915/i915_drv.c | 9 +- + drivers/gpu/drm/i915/i915_drv.h | 23 +- + drivers/gpu/drm/i915/i915_gem.c | 65 +++-- + drivers/gpu/drm/i915/i915_gem_context.c | 71 +++++ + drivers/gpu/drm/i915/i915_gem_evict.c | 11 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 + + drivers/gpu/drm/i915/i915_irq.c | 54 ++-- + drivers/gpu/drm/i915/i915_reg.h | 4 + + drivers/gpu/drm/i915/intel_atomic_plane.c | 152 +++++++++++ + drivers/gpu/drm/i915/intel_audio.c | 110 ++++++++ + drivers/gpu/drm/i915/intel_bios.c | 20 -- + drivers/gpu/drm/i915/intel_bios.h | 11 - + drivers/gpu/drm/i915/intel_display.c | 425 +++++++++++++++-------------- + drivers/gpu/drm/i915/intel_dp.c | 4 +- + drivers/gpu/drm/i915/intel_drv.h | 52 +++- + drivers/gpu/drm/i915/intel_lrc.c | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 9 +- + drivers/gpu/drm/i915/intel_psr.c | 42 ++- + drivers/gpu/drm/i915/intel_ringbuffer.c | 18 ++ + drivers/gpu/drm/i915/intel_runtime_pm.c | 56 ---- + drivers/gpu/drm/i915/intel_sdvo.c | 3 + + drivers/gpu/drm/i915/intel_sprite.c | 203 ++++++-------- + include/drm/i915_component.h | 38 +++ + include/drm/i915_powerwell.h | 37 --- + include/uapi/drm/i915_drm.h | 21 ++ + sound/pci/hda/hda_i915.c | 154 +++++++---- + sound/pci/hda/hda_i915.h | 37 --- + sound/pci/hda/hda_intel.c | 60 ++-- + sound/pci/hda/hda_intel.h | 71 +++++ + 33 files changed, 1110 insertions(+), 683 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_atomic_plane.c + create mode 100644 include/drm/i915_component.h + delete mode 100644 include/drm/i915_powerwell.h + delete mode 100644 sound/pci/hda/hda_i915.h + create mode 100644 sound/pci/hda/hda_intel.h +Merging drm-tegra/drm/tegra/for-next (7e0180e3570c drm/tegra: gem: Check before freeing CMA memory) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/core-stuff (2535ef6ae303 next: drm/atomic: Use copy_from_user to copy 64 bit data from user space) +$ git merge drm-misc/topic/core-stuff +Merge made by the 'recursive' strategy. + drivers/gpu/drm/ast/ast_fb.c | 21 +++++--- + drivers/gpu/drm/bochs/bochs_fbdev.c | 14 +++++- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 12 ++--- + drivers/gpu/drm/drm_atomic.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/drm_fops.c | 89 ++++++++++++++++----------------- + drivers/gpu/drm/exynos/Kconfig | 1 - + drivers/gpu/drm/gma500/framebuffer.c | 22 ++++++-- + drivers/gpu/drm/mgag200/mgag200_fb.c | 12 ++++- + drivers/gpu/drm/msm/msm_fbdev.c | 10 +++- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 21 +++++--- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 10 +++- + drivers/gpu/drm/qxl/qxl_fb.c | 22 +++++--- + drivers/gpu/drm/radeon/radeon_fb.c | 21 +++++--- + drivers/gpu/drm/rockchip/Kconfig | 1 - + drivers/gpu/drm/udl/udl_fb.c | 22 +++++--- + include/drm/drm_fb_helper.h | 2 +- + 17 files changed, 185 insertions(+), 101 deletions(-) +Merging sound/for-next (53c098bfc5b6 ALSA: add Studio Evolution SE6X support) +$ git merge sound/for-next +Auto-merging sound/usb/line6/variax.h +Auto-merging sound/usb/line6/variax.c +Auto-merging sound/usb/line6/toneport.h +Auto-merging sound/usb/line6/toneport.c +Auto-merging sound/usb/line6/podhd.h +Auto-merging sound/usb/line6/podhd.c +Auto-merging sound/usb/line6/pod.h +Auto-merging sound/usb/line6/pod.c +Auto-merging sound/usb/line6/playback.c +Auto-merging sound/usb/line6/pcm.h +Auto-merging sound/usb/line6/pcm.c +Auto-merging sound/usb/line6/midi.c +Auto-merging sound/usb/line6/driver.h +Auto-merging sound/usb/line6/driver.c +Auto-merging sound/usb/line6/capture.c +Removing sound/isa/gus/gus_instr.c +Removing drivers/staging/line6/usbdefs.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/pcm512x.txt | 3 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/line6/usbdefs.h | 116 ---- + include/sound/ad1816a.h | 5 +- + include/sound/compress_driver.h | 1 + + include/sound/emu10k1.h | 14 +- + include/sound/es1688.h | 3 +- + include/sound/gus.h | 4 +- + include/sound/pcm.h | 11 +- + include/sound/pcm_params.h | 96 +-- + include/sound/sb.h | 6 +- + include/sound/soc-dapm.h | 1 - + include/sound/wss.h | 6 +- + include/uapi/sound/asound.h | 1 + + sound/aoa/soundbus/i2sbus/core.c | 19 +- + sound/arm/aaci.c | 4 +- + sound/atmel/ac97c.c | 51 +- + sound/core/oss/pcm_oss.c | 6 +- + sound/core/pcm_lib.c | 15 +- + sound/core/pcm_native.c | 10 +- + sound/core/seq/oss/seq_oss_midi.c | 6 +- + sound/core/seq/seq_midi.c | 3 +- + sound/drivers/ml403-ac97cr.c | 12 +- + sound/isa/ad1816a/ad1816a.c | 5 +- + sound/isa/ad1816a/ad1816a_lib.c | 9 +- + sound/isa/ad1848/ad1848.c | 7 +- + sound/isa/als100.c | 2 +- + sound/isa/azt2320.c | 4 +- + sound/isa/cmi8328.c | 4 +- + sound/isa/cs423x/cs4231.c | 9 +- + sound/isa/cs423x/cs4236.c | 13 +- + sound/isa/cs423x/cs4236_lib.c | 9 +- + sound/isa/es1688/es1688.c | 7 +- + sound/isa/es1688/es1688_lib.c | 6 +- + sound/isa/es18xx.c | 10 +- + sound/isa/galaxy/galaxy.c | 4 +- + sound/isa/gus/gus_instr.c | 172 ----- + sound/isa/gus/gus_pcm.c | 6 +- + sound/isa/gus/gus_uart.c | 6 +- + sound/isa/gus/gusclassic.c | 4 +- + sound/isa/gus/gusextreme.c | 4 +- + sound/isa/gus/gusmax.c | 8 +- + sound/isa/gus/interwave.c | 14 +- + sound/isa/msnd/msnd.c | 6 +- + sound/isa/msnd/msnd.h | 2 +- + sound/isa/msnd/msnd_pinnacle.c | 5 +- + sound/isa/opl3sa2.c | 4 +- + sound/isa/opti9xx/miro.c | 12 +- + sound/isa/opti9xx/opti92x-ad1848.c | 13 +- + sound/isa/sb/emu8000.c | 33 +- + sound/isa/sb/emu8000_synth.c | 3 +- + sound/isa/sb/jazz16.c | 2 +- + sound/isa/sb/sb16.c | 2 +- + sound/isa/sb/sb16_main.c | 8 +- + sound/isa/sb/sb8.c | 4 +- + sound/isa/sb/sb8_main.c | 6 +- + sound/isa/sb/sb8_midi.c | 6 +- + sound/isa/sc6000.c | 2 +- + sound/isa/sscape.c | 5 +- + sound/isa/wavefront/wavefront.c | 4 +- + sound/isa/wss/wss_lib.c | 8 +- + sound/oss/msnd_pinnacle.c | 4 +- + sound/oss/pss.c | 2 +- + sound/oss/swarm_cs4297a.c | 2 +- + sound/oss/trix.c | 2 +- + sound/parisc/harmony.c | 4 +- + sound/pci/Kconfig | 9 + + sound/pci/ad1889.c | 15 +- + sound/pci/ali5451/ali5451.c | 15 - + sound/pci/als300.c | 15 - + sound/pci/als4000.c | 15 - + sound/pci/asihpi/asihpi.c | 9 +- + sound/pci/asihpi/hpi6000.c | 7 +- + sound/pci/asihpi/hpioctl.c | 8 +- + sound/pci/atiixp.c | 18 +- + sound/pci/atiixp_modem.c | 18 +- + sound/pci/aw2/aw2-alsa.c | 4 +- + sound/pci/azt3328.c | 15 - + sound/pci/bt87x.c | 3 +- + sound/pci/ca0106/ca0106_main.c | 16 - + sound/pci/cmipci.c | 15 - + sound/pci/cs4281.c | 39 +- + sound/pci/cs46xx/cs46xx.c | 10 +- + sound/pci/cs46xx/cs46xx.h | 10 +- + sound/pci/cs46xx/cs46xx_lib.c | 59 +- + sound/pci/cs5530.c | 2 +- + sound/pci/cs5535audio/cs5535audio_pm.c | 18 - + sound/pci/ctxfi/cthw20k1.c | 14 +- + sound/pci/ctxfi/cthw20k2.c | 17 +- + sound/pci/echoaudio/echoaudio.c | 11 +- + sound/pci/emu10k1/emu10k1.c | 27 +- + sound/pci/emu10k1/emu10k1x.c | 19 +- + sound/pci/emu10k1/emufx.c | 7 +- + sound/pci/emu10k1/emupcm.c | 33 +- + sound/pci/emu10k1/p16v.c | 14 +- + sound/pci/ens1370.c | 52 +- + sound/pci/es1938.c | 12 - + sound/pci/es1968.c | 16 - + sound/pci/fm801.c | 66 +- + sound/pci/hda/Kconfig | 1 + + sound/pci/hda/hda_auto_parser.c | 18 +- + sound/pci/hda/hda_controller.c | 2 +- + sound/pci/hda/hda_intel.c | 16 +- + sound/pci/hda/patch_analog.c | 33 - + sound/pci/hda/patch_realtek.c | 81 +++ + sound/pci/ice1712/ice1712.c | 42 +- + sound/pci/ice1712/ice1724.c | 16 - + sound/pci/ice1712/wm8766.c | 16 - + sound/pci/ice1712/wm8766.h | 2 - + sound/pci/ice1712/wm8776.c | 15 - + sound/pci/ice1712/wm8776.h | 3 - + sound/pci/intel8x0.c | 15 - + sound/pci/intel8x0m.c | 12 - + sound/pci/lola/lola.c | 6 +- + sound/pci/maestro3.c | 15 - + sound/pci/mixart/mixart.c | 7 +- + sound/pci/nm256/nm256.c | 20 +- + sound/pci/oxygen/Makefile | 2 + + sound/pci/oxygen/oxygen.h | 2 +- + sound/pci/oxygen/oxygen_lib.c | 44 +- + sound/pci/oxygen/oxygen_mixer.c | 36 ++ + sound/pci/oxygen/oxygen_pcm.c | 53 +- + sound/pci/oxygen/se6x.c | 160 +++++ + sound/pci/riptide/riptide.c | 23 +- + sound/pci/rme32.c | 2 +- + sound/pci/rme96.c | 19 +- + sound/pci/rme9652/hdsp.c | 4 +- + sound/pci/rme9652/hdspm.c | 4 +- + sound/pci/rme9652/rme9652.c | 3 +- + sound/pci/sis7019.c | 18 +- + sound/pci/sonicvibes.c | 7 +- + sound/pci/trident/trident.c | 6 +- + sound/pci/trident/trident.h | 6 +- + sound/pci/trident/trident_main.c | 36 +- + sound/pci/via82xx.c | 14 - + sound/pci/via82xx_modem.c | 15 - + sound/pci/vx222/vx222.c | 17 +- + sound/pci/ymfpci/ymfpci.c | 8 +- + sound/pci/ymfpci/ymfpci.h | 8 +- + sound/pci/ymfpci/ymfpci_main.c | 53 +- + sound/ppc/pmac.c | 15 +- + sound/ppc/snd_ps3.c | 4 +- + sound/soc/codecs/pcm512x-i2c.c | 4 + + sound/soc/codecs/pcm512x-spi.c | 4 + + sound/soc/codecs/rt5670.c | 38 ++ + sound/soc/codecs/rt5677.c | 195 +++++- + sound/soc/codecs/wm8750.c | 2 +- + sound/soc/dwc/designware_i2s.c | 86 ++- + sound/soc/intel/Kconfig | 4 +- + sound/soc/intel/bytcr_dpcm_rt5640.c | 1 - + sound/soc/intel/cht_bsw_rt5672.c | 1 - + sound/soc/intel/sst-firmware.c | 1 + + sound/soc/intel/sst/sst_acpi.c | 5 +- + sound/soc/omap/omap-hdmi-audio.c | 1 - + sound/soc/pxa/spitz.c | 1 - + sound/soc/rockchip/rockchip_i2s.c | 4 + + sound/soc/samsung/arndale_rt5631.c | 1 - + sound/soc/soc-core.c | 3 - + sound/soc/soc-dapm.c | 105 +--- + sound/soc/soc-pcm.c | 33 +- + sound/synth/emux/emux.c | 6 +- + sound/usb/Kconfig | 2 + + sound/usb/Makefile | 1 + + {drivers/staging => sound/usb}/line6/Kconfig | 0 + {drivers/staging => sound/usb}/line6/Makefile | 0 + {drivers/staging => sound/usb}/line6/audio.c | 0 + {drivers/staging => sound/usb}/line6/audio.h | 0 + {drivers/staging => sound/usb}/line6/capture.c | 9 +- + {drivers/staging => sound/usb}/line6/capture.h | 0 + {drivers/staging => sound/usb}/line6/driver.c | 698 ++++++++++----------- + {drivers/staging => sound/usb}/line6/driver.h | 57 +- + {drivers/staging => sound/usb}/line6/midi.c | 4 +- + {drivers/staging => sound/usb}/line6/midi.h | 0 + {drivers/staging => sound/usb}/line6/midibuf.c | 0 + {drivers/staging => sound/usb}/line6/midibuf.h | 0 + {drivers/staging => sound/usb}/line6/pcm.c | 55 +- + {drivers/staging => sound/usb}/line6/pcm.h | 18 +- + {drivers/staging => sound/usb}/line6/playback.c | 11 +- + {drivers/staging => sound/usb}/line6/playback.h | 0 + {drivers/staging => sound/usb}/line6/pod.c | 83 ++- + {drivers/staging => sound/usb}/line6/pod.h | 12 +- + {drivers/staging => sound/usb}/line6/podhd.c | 48 +- + {drivers/staging => sound/usb}/line6/podhd.h | 3 +- + {drivers/staging => sound/usb}/line6/revision.h | 0 + {drivers/staging => sound/usb}/line6/toneport.c | 113 ++-- + {drivers/staging => sound/usb}/line6/toneport.h | 3 +- + sound/usb/line6/usbdefs.h | 27 + + {drivers/staging => sound/usb}/line6/variax.c | 36 +- + {drivers/staging => sound/usb}/line6/variax.h | 4 +- + sound/usb/quirks-table.h | 22 + + 191 files changed, 1650 insertions(+), 2376 deletions(-) + delete mode 100644 drivers/staging/line6/usbdefs.h + delete mode 100644 sound/isa/gus/gus_instr.c + create mode 100644 sound/pci/oxygen/se6x.c + rename {drivers/staging => sound/usb}/line6/Kconfig (100%) + rename {drivers/staging => sound/usb}/line6/Makefile (100%) + rename {drivers/staging => sound/usb}/line6/audio.c (100%) + rename {drivers/staging => sound/usb}/line6/audio.h (100%) + rename {drivers/staging => sound/usb}/line6/capture.c (98%) + rename {drivers/staging => sound/usb}/line6/capture.h (100%) + rename {drivers/staging => sound/usb}/line6/driver.c (60%) + rename {drivers/staging => sound/usb}/line6/driver.h (86%) + rename {drivers/staging => sound/usb}/line6/midi.c (98%) + rename {drivers/staging => sound/usb}/line6/midi.h (100%) + rename {drivers/staging => sound/usb}/line6/midibuf.c (100%) + rename {drivers/staging => sound/usb}/line6/midibuf.h (100%) + rename {drivers/staging => sound/usb}/line6/pcm.c (91%) + rename {drivers/staging => sound/usb}/line6/pcm.h (97%) + rename {drivers/staging => sound/usb}/line6/playback.c (98%) + rename {drivers/staging => sound/usb}/line6/playback.h (100%) + rename {drivers/staging => sound/usb}/line6/pod.c (95%) + rename {drivers/staging => sound/usb}/line6/pod.h (80%) + rename {drivers/staging => sound/usb}/line6/podhd.c (92%) + rename {drivers/staging => sound/usb}/line6/podhd.h (83%) + rename {drivers/staging => sound/usb}/line6/revision.h (100%) + rename {drivers/staging => sound/usb}/line6/toneport.c (91%) + rename {drivers/staging => sound/usb}/line6/toneport.h (88%) + create mode 100644 sound/usb/line6/usbdefs.h + rename {drivers/staging => sound/usb}/line6/variax.c (91%) + rename {drivers/staging => sound/usb}/line6/variax.h (87%) +Merging sound-asoc/for-next (f3ec1b8506f9 Merge remote-tracking branches 'asoc/topic/wm8804', 'asoc/topic/wm8960', 'asoc/topic/wm8988' and 'asoc/topic/xtfpga' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/soc-generic-dmaengine-pcm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/cdns,xtfpga-i2s.txt | 18 + + .../devicetree/bindings/sound/designware-i2s.txt | 31 + + .../bindings/sound/nvidia,tegra-audio-rt5677.txt | 67 ++ + .../devicetree/bindings/sound/samsung-i2s.txt | 22 + + .../devicetree/bindings/sound/simple-card.txt | 5 + + MAINTAINERS | 1 + + include/dt-bindings/sound/samsung-i2s.h | 8 + + include/sound/rcar_snd.h | 1 + + include/sound/rt5677.h | 3 + + include/sound/simple_card.h | 1 + + include/sound/soc-dapm.h | 1 - + include/sound/soc.h | 3 + + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/adi/axi-i2s.c | 2 + + sound/soc/atmel/Kconfig | 2 +- + sound/soc/atmel/sam9g20_wm8731.c | 31 +- + sound/soc/au1x/db1200.c | 19 +- + sound/soc/au1x/dbdma2.c | 6 - + sound/soc/au1x/dma.c | 6 - + sound/soc/codecs/88pm860x-codec.c | 4 +- + sound/soc/codecs/ad193x.c | 4 +- + sound/soc/codecs/ak4671.c | 2 +- + sound/soc/codecs/alc5623.c | 8 +- + sound/soc/codecs/alc5632.c | 12 +- + sound/soc/codecs/arizona.c | 18 +- + sound/soc/codecs/bt-sco.c | 2 +- + sound/soc/codecs/cs35l32.c | 4 +- + sound/soc/codecs/cs42l52.c | 4 +- + sound/soc/codecs/cs42l56.c | 4 +- + sound/soc/codecs/cs42l73.c | 4 +- + sound/soc/codecs/da732x.c | 4 +- + sound/soc/codecs/mc13783.c | 10 +- + sound/soc/codecs/pcm3008.c | 4 +- + sound/soc/codecs/pcm512x.c | 2 +- + sound/soc/codecs/rt286.c | 21 +- + sound/soc/codecs/rt5631.c | 28 +- + sound/soc/codecs/rt5640.c | 11 +- + sound/soc/codecs/rt5645.c | 16 +- + sound/soc/codecs/rt5651.c | 18 +- + sound/soc/codecs/rt5670.c | 99 ++- + sound/soc/codecs/rt5670.h | 80 ++- + sound/soc/codecs/rt5677.c | 65 +- + sound/soc/codecs/sgtl5000.c | 14 +- + sound/soc/codecs/sn95031.c | 33 +- + sound/soc/codecs/tlv320aic31xx.c | 9 +- + sound/soc/codecs/tlv320aic3x.c | 2 +- + sound/soc/codecs/tlv320dac33.c | 9 +- + sound/soc/codecs/ts3a227e.c | 6 + + sound/soc/codecs/twl4030.c | 55 +- + sound/soc/codecs/twl6040.c | 4 +- + sound/soc/codecs/wm2000.c | 2 +- + sound/soc/codecs/wm5100.c | 5 +- + sound/soc/codecs/wm5102.c | 8 +- + sound/soc/codecs/wm5110.c | 2 +- + sound/soc/codecs/wm8350.c | 2 +- + sound/soc/codecs/wm8400.c | 9 +- + sound/soc/codecs/wm8731.c | 3 +- + sound/soc/codecs/wm8770.c | 8 +- + sound/soc/codecs/wm8804.c | 4 +- + sound/soc/codecs/wm8900.c | 2 +- + sound/soc/codecs/wm8903.c | 2 +- + sound/soc/codecs/wm8904.c | 27 +- + sound/soc/codecs/wm8955.c | 2 +- + sound/soc/codecs/wm8958-dsp2.c | 2 +- + sound/soc/codecs/wm8960.c | 53 +- + sound/soc/codecs/wm8961.c | 4 +- + sound/soc/codecs/wm8962.c | 6 +- + sound/soc/codecs/wm8988.c | 6 +- + sound/soc/codecs/wm8990.c | 9 +- + sound/soc/codecs/wm8991.c | 9 +- + sound/soc/codecs/wm8993.c | 2 +- + sound/soc/codecs/wm8994.c | 23 +- + sound/soc/codecs/wm8995.c | 20 +- + sound/soc/codecs/wm8996.c | 8 +- + sound/soc/codecs/wm8997.c | 2 +- + sound/soc/codecs/wm9081.c | 2 +- + sound/soc/codecs/wm9090.c | 2 +- + sound/soc/codecs/wm9713.c | 2 +- + sound/soc/codecs/wm_adsp.c | 6 +- + sound/soc/codecs/wm_hubs.c | 10 +- + sound/soc/davinci/davinci-mcasp.c | 30 + + sound/soc/dwc/Kconfig | 1 + + sound/soc/dwc/designware_i2s.c | 283 +++++++-- + sound/soc/fsl/eukrea-tlv320.c | 23 +- + sound/soc/fsl/fsl_asrc.c | 5 +- + sound/soc/fsl/fsl_asrc.h | 3 - + sound/soc/fsl/fsl_esai.c | 2 +- + sound/soc/fsl/fsl_esai.h | 2 +- + sound/soc/fsl/fsl_sai.c | 2 +- + sound/soc/fsl/fsl_spdif.c | 17 +- + sound/soc/fsl/fsl_ssi.c | 10 +- + sound/soc/fsl/fsl_utils.c | 27 - + sound/soc/fsl/fsl_utils.h | 3 - + sound/soc/fsl/imx-mc13783.c | 5 +- + sound/soc/fsl/imx-spdif.c | 1 + + sound/soc/fsl/imx-ssi.c | 5 +- + sound/soc/fsl/imx-wm8962.c | 1 + + sound/soc/fsl/mx27vis-aic32x4.c | 12 +- + sound/soc/fsl/wm1133-ev1.c | 16 +- + sound/soc/generic/simple-card.c | 41 +- + sound/soc/intel/broadwell.c | 10 - + sound/soc/intel/byt-rt5640.c | 12 +- + sound/soc/intel/cht_bsw_rt5672.c | 14 + + sound/soc/intel/sst-baytrail-pcm.c | 6 - + sound/soc/intel/sst-dsp.c | 3 +- + sound/soc/intel/sst-firmware.c | 13 +- + sound/soc/intel/sst-haswell-dsp.c | 17 +- + sound/soc/intel/sst-haswell-ipc.c | 33 + + sound/soc/intel/sst-haswell-pcm.c | 105 ++-- + sound/soc/intel/sst-mfld-platform-pcm.c | 7 - + sound/soc/intel/sst/sst_loader.c | 3 +- + sound/soc/mxs/mxs-saif.c | 10 +- + sound/soc/mxs/mxs-saif.h | 1 - + sound/soc/mxs/mxs-sgtl5000.c | 27 +- + sound/soc/nuc900/nuc900-pcm.c | 6 - + sound/soc/omap/ams-delta.c | 18 +- + sound/soc/omap/omap-mcbsp.c | 2 +- + sound/soc/omap/omap-twl4030.c | 20 +- + sound/soc/pxa/corgi.c | 16 +- + sound/soc/pxa/e740_wm9705.c | 20 +- + sound/soc/pxa/e750_wm9705.c | 20 +- + sound/soc/pxa/hx4700.c | 8 +- + sound/soc/pxa/magician.c | 21 +- + sound/soc/pxa/mioa701_wm9713.c | 2 +- + sound/soc/pxa/palm27x.c | 15 +- + sound/soc/pxa/raumfeld.c | 35 +- + sound/soc/pxa/spitz.c | 22 +- + sound/soc/pxa/ttc-dkb.c | 4 - + sound/soc/pxa/zylonite.c | 12 +- + sound/soc/samsung/goni_wm8994.c | 23 +- + sound/soc/samsung/h1940_uda1380.c | 15 +- + sound/soc/samsung/i2s.c | 362 ++++++----- + sound/soc/samsung/jive_wm8750.c | 34 +- + sound/soc/samsung/neo1973_wm8753.c | 25 +- + sound/soc/samsung/odroidx2_max98090.c | 6 +- + sound/soc/samsung/rx1950_uda1380.c | 15 +- + sound/soc/samsung/s3c24xx_simtec.c | 20 +- + sound/soc/samsung/s3c24xx_uda134x.c | 12 +- + sound/soc/samsung/smartq_wm8987.c | 16 +- + sound/soc/samsung/smdk_wm8580.c | 26 +- + sound/soc/samsung/smdk_wm8580pcm.c | 19 +- + sound/soc/samsung/smdk_wm8994pcm.c | 16 +- + sound/soc/sh/dma-sh7760.c | 6 - + sound/soc/sh/fsi.c | 15 +- + sound/soc/sh/migor.c | 12 +- + sound/soc/sh/rcar/adg.c | 14 +- + sound/soc/sh/rcar/core.c | 97 ++- + sound/soc/sh/rcar/dvc.c | 48 +- + sound/soc/sh/rcar/gen.c | 15 + + sound/soc/sh/rcar/rsnd.h | 76 +-- + sound/soc/sh/rcar/src.c | 269 +++++--- + sound/soc/sh/rcar/ssi.c | 100 ++- + sound/soc/sh/siu_pcm.c | 1 - + sound/soc/soc-compress.c | 9 +- + sound/soc/soc-core.c | 146 +++-- + sound/soc/soc-dapm.c | 6 +- + sound/soc/soc-generic-dmaengine-pcm.c | 15 +- + sound/soc/tegra/Kconfig | 10 + + sound/soc/tegra/Makefile | 2 + + sound/soc/tegra/tegra_rt5677.c | 347 +++++++++++ + sound/soc/txx9/txx9aclc.c | 6 - + sound/soc/ux500/mop500_ab8500.c | 16 +- + sound/soc/xtensa/Kconfig | 7 + + sound/soc/xtensa/Makefile | 3 + + sound/soc/xtensa/xtfpga-i2s.c | 675 +++++++++++++++++++++ + 166 files changed, 2937 insertions(+), 1545 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/cdns,xtfpga-i2s.txt + create mode 100644 Documentation/devicetree/bindings/sound/designware-i2s.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra-audio-rt5677.txt + create mode 100644 include/dt-bindings/sound/samsung-i2s.h + create mode 100644 sound/soc/tegra/tegra_rt5677.c + create mode 100644 sound/soc/xtensa/Kconfig + create mode 100644 sound/soc/xtensa/Makefile + create mode 100644 sound/soc/xtensa/xtfpga-i2s.c +Merging modules/modules-next (97bf6af1f928 Linux 3.19-rc1) +$ git merge modules/modules-next +Already up-to-date. +Merging virtio/virtio-next (97bf6af1f928 Linux 3.19-rc1) +$ git merge virtio/virtio-next +Already up-to-date. +Merging input/next (7b2171d7c43e Input: cyapa - add acpi device id support) +$ git merge input/next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-driver-input-axp-pek | 11 + + .../devicetree/bindings/input/e3x0-button.txt | 25 + + .../devicetree/bindings/input/regulator-haptic.txt | 21 + + .../devicetree/bindings/input/sun4i-lradc-keys.txt | 62 + + .../bindings/input/touchscreen/sun4i.txt | 2 + + .../bindings/input/tps65218-pwrbutton.txt | 17 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 15 + + drivers/input/evdev.c | 55 +- + drivers/input/input.c | 38 +- + drivers/input/keyboard/Kconfig | 10 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/atakbd.c | 2 +- + drivers/input/keyboard/imx_keypad.c | 3 +- + drivers/input/keyboard/sun4i-lradc-keys.c | 286 ++ + drivers/input/misc/Kconfig | 43 + + drivers/input/misc/Makefile | 4 + + drivers/input/misc/axp20x-pek.c | 290 ++ + drivers/input/misc/e3x0-button.c | 157 ++ + drivers/input/misc/regulator-haptic.c | 266 ++ + drivers/input/misc/tps65218-pwrbutton.c | 126 + + drivers/input/mouse/Kconfig | 11 + + drivers/input/mouse/Makefile | 3 +- + drivers/input/mouse/alps.c | 40 +- + drivers/input/mouse/cyapa.c | 1722 +++++++----- + drivers/input/mouse/cyapa.h | 301 +++ + drivers/input/mouse/cyapa_gen3.c | 1247 +++++++++ + drivers/input/mouse/cyapa_gen5.c | 2774 ++++++++++++++++++++ + drivers/input/mouse/focaltech.c | 408 ++- + drivers/input/mouse/focaltech.h | 2 + + drivers/input/mouse/psmouse-base.c | 32 +- + drivers/input/mouse/psmouse.h | 1 + + drivers/input/mouse/synaptics.c | 435 +-- + drivers/input/mouse/synaptics.h | 18 +- + drivers/input/touchscreen/elants_i2c.c | 2 - + drivers/input/touchscreen/sun4i-ts.c | 54 +- + include/linux/platform_data/regulator-haptic.h | 29 + + 37 files changed, 7364 insertions(+), 1150 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-input-axp-pek + create mode 100644 Documentation/devicetree/bindings/input/e3x0-button.txt + create mode 100644 Documentation/devicetree/bindings/input/regulator-haptic.txt + create mode 100644 Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt + create mode 100644 Documentation/devicetree/bindings/input/tps65218-pwrbutton.txt + create mode 100644 drivers/input/keyboard/sun4i-lradc-keys.c + create mode 100644 drivers/input/misc/axp20x-pek.c + create mode 100644 drivers/input/misc/e3x0-button.c + create mode 100644 drivers/input/misc/regulator-haptic.c + create mode 100644 drivers/input/misc/tps65218-pwrbutton.c + create mode 100644 drivers/input/mouse/cyapa.h + create mode 100644 drivers/input/mouse/cyapa_gen3.c + create mode 100644 drivers/input/mouse/cyapa_gen5.c + create mode 100644 include/linux/platform_data/regulator-haptic.h +Merging input-mt/for-next (5e01dc7b26d9 Linux 3.12) +$ git merge input-mt/for-next +Already up-to-date. +Merging block/for-next (d7b582d95118 Merge branch 'for-3.20/drivers' into for-next) +$ git merge block/for-next +Auto-merging include/linux/blk-mq.h +Auto-merging block/blk-mq.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/xip.txt | 15 +- + arch/powerpc/sysdev/axonram.c | 19 +- + block/blk-mq-tag.c | 43 ++-- + block/blk-mq.c | 1 + + drivers/block/brd.c | 123 +++++------ + drivers/block/loop.c | 416 +++++++++++++++++++------------------- + drivers/block/loop.h | 18 +- + drivers/block/null_blk.c | 2 +- + drivers/s390/block/dcssblk.c | 21 +- + fs/block_dev.c | 40 ++++ + fs/ext2/xip.c | 31 ++- + include/linux/blk-mq.h | 1 + + include/linux/blkdev.h | 6 +- + 13 files changed, 379 insertions(+), 357 deletions(-) +Merging device-mapper/for-next (6a55c9861326 block: keep established cmd_flags when cloning into a blk-mq request) +$ git merge device-mapper/for-next +Auto-merging include/linux/blkdev.h +Auto-merging block/blk-mq.c +Auto-merging block/blk-core.c +Merge made by the 'recursive' strategy. + block/blk-core.c | 11 +- + block/blk-mq.c | 1 + + drivers/md/dm-mpath.c | 62 ++++++-- + drivers/md/dm-table.c | 59 +++++-- + drivers/md/dm-target.c | 15 +- + drivers/md/dm.c | 346 +++++++++++++++++++++++++++++------------- + drivers/md/dm.h | 11 +- + include/linux/blkdev.h | 1 + + include/linux/device-mapper.h | 10 +- + include/uapi/linux/dm-ioctl.h | 4 +- + 10 files changed, 371 insertions(+), 149 deletions(-) +Merging embedded/master (4744b43431e8 embedded: fix vc_translate operator precedence) +$ git merge embedded/master +Already up-to-date. +Merging firmware/master (6e03a201bbe8 firmware: speed up request_firmware(), v3) +$ git merge firmware/master +Already up-to-date. +Merging pcmcia/master (80af9e6d7ae6 pcmcia at91_cf: fix raw gpio number usage) +$ git merge pcmcia/master +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 (09062c888b89 mmc: dw_mmc: Power on vqmmc in MMC_POWER_ON, not MMC_POWER_UP) +$ git merge mmc-uh/next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mmc.txt | 48 ++- + arch/arm/mach-omap2/board-omap3pandora.c | 14 +- + drivers/mmc/card/mmc_test.c | 18 +- + drivers/mmc/core/bus.c | 4 + + drivers/mmc/core/core.c | 143 ++++--- + drivers/mmc/core/core.h | 7 + + drivers/mmc/core/host.c | 61 ++- + drivers/mmc/core/mmc.c | 93 ++--- + drivers/mmc/core/mmc_ops.c | 30 ++ + drivers/mmc/core/sd.c | 27 +- + drivers/mmc/core/sdio.c | 14 +- + drivers/mmc/core/sdio_bus.c | 11 + + drivers/mmc/core/slot-gpio.c | 182 ++------- + drivers/mmc/core/slot-gpio.h | 13 + + drivers/mmc/host/dw_mmc-exynos.c | 111 +----- + drivers/mmc/host/dw_mmc-exynos.h | 56 +++ + drivers/mmc/host/dw_mmc.c | 124 +++--- + drivers/mmc/host/dw_mmc.h | 9 +- + drivers/mmc/host/mmci.c | 2 +- + drivers/mmc/host/moxart-mmc.c | 4 +- + drivers/mmc/host/mvsdio.c | 10 - + drivers/mmc/host/mxs-mmc.c | 3 +- + drivers/mmc/host/omap_hsmmc.c | 150 ++------ + drivers/mmc/host/rtsx_pci_sdmmc.c | 522 ++++++++++++++------------ + drivers/mmc/host/sdhci-acpi.c | 13 +- + drivers/mmc/host/sdhci-bcm-kona.c | 4 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 17 +- + drivers/mmc/host/sdhci-of-esdhc.c | 20 +- + drivers/mmc/host/sdhci-pci.c | 7 +- + drivers/mmc/host/sdhci-pxav3.c | 11 +- + drivers/mmc/host/sdhci-s3c.c | 4 +- + drivers/mmc/host/sdhci-sirf.c | 74 +++- + drivers/mmc/host/sdhci-st.c | 4 +- + drivers/mmc/host/sdhci.c | 109 +++++- + drivers/mmc/host/sh_mobile_sdhi.c | 117 +++--- + drivers/mmc/host/sunxi-mmc.c | 29 +- + drivers/mmc/host/tmio_mmc.c | 15 +- + drivers/mmc/host/tmio_mmc.h | 43 ++- + drivers/mmc/host/tmio_mmc_dma.c | 38 +- + drivers/mmc/host/tmio_mmc_pio.c | 61 +-- + drivers/mmc/host/toshsd.c | 17 +- + include/linux/mfd/tmio.h | 28 +- + include/linux/mmc/core.h | 1 - + include/linux/mmc/dw_mmc.h | 6 + + include/linux/mmc/host.h | 2 - + include/linux/mmc/mmc.h | 5 - + include/linux/mmc/sdhci.h | 6 + + include/linux/mmc/sh_mobile_sdhi.h | 15 - + include/linux/mmc/slot-gpio.h | 5 +- + include/linux/platform_data/mmc-omap.h | 4 - + 50 files changed, 1195 insertions(+), 1116 deletions(-) + create mode 100644 drivers/mmc/core/slot-gpio.h + create mode 100644 drivers/mmc/host/dw_mmc-exynos.h +Merging kgdb/kgdb-next (c7d9ebf81c45 kdb: Fix off by one error in kdb_cpu()) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/debug_core.c | 2 +- + kernel/debug/kdb/kdb_main.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging uclinux/for-next (6dbe51c251a3 Linux 3.9-rc1) +$ git merge uclinux/for-next +Already up-to-date. +Merging md/for-next (f851b60db0fd md: Check MD_RECOVERY_RUNNING as well as ->sync_thread.) +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-mfd-next (a3b63979f8a3 mfd: rtsx: Add func to split u32 into register) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (3d6969a641d0 MAINTAINERS: Remove my name from Backlight subsystem) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (b3040ccbad76 power: max17042: Constify struct regmap_config) +$ git merge battery/master +Auto-merging drivers/power/reset/ltc2952-poweroff.c +Auto-merging drivers/power/gpio-charger.c +Merge made by the 'recursive' strategy. + .../bindings/power/reset/ltc2952-poweroff.txt | 13 +- + drivers/power/Kconfig | 8 + + drivers/power/Makefile | 1 + + drivers/power/bq24190_charger.c | 2 +- + drivers/power/collie_battery.c | 24 +- + drivers/power/gpio-charger.c | 4 +- + drivers/power/max17042_battery.c | 2 +- + drivers/power/reset/arm-versatile-reboot.c | 32 ++- + drivers/power/reset/ltc2952-poweroff.c | 290 +++++++++------------ + drivers/power/rt5033_battery.c | 177 +++++++++++++ + 10 files changed, 368 insertions(+), 185 deletions(-) + create mode 100644 drivers/power/rt5033_battery.c +Merging fbdev/for-next (718b90ac4c21 video: xilinxfb: Simplify error path) +$ git merge fbdev/for-next +Already up-to-date. +Merging viafb/viafb-next (838ac785d521 viafb: avoid refresh and mode lookup in set_par) +$ git merge viafb/viafb-next +Already up-to-date. +Merging omap_dss2/for-next (7efc436cd45c Merge branches '3.20/fbdev' and '3.20/omapdss' into for-next) +$ git merge omap_dss2/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/video/ti,opa362.txt | 38 +++ + drivers/video/console/Kconfig | 16 +- + drivers/video/console/dummycon.c | 5 +- + drivers/video/fbdev/Kconfig | 1 - + drivers/video/fbdev/aty/atyfb_base.c | 9 +- + drivers/video/fbdev/core/fbmon.c | 103 ++++---- + drivers/video/fbdev/core/modedb.c | 111 ++++++++ + drivers/video/fbdev/geode/gx1fb_core.c | 6 +- + drivers/video/fbdev/geode/gxfb_core.c | 6 +- + drivers/video/fbdev/geode/lxfb_core.c | 6 +- + drivers/video/fbdev/ocfb.c | 2 +- + drivers/video/fbdev/omap2/displays-new/Kconfig | 6 + + drivers/video/fbdev/omap2/displays-new/Makefile | 1 + + .../fbdev/omap2/displays-new/connector-analog-tv.c | 2 +- + .../fbdev/omap2/displays-new/encoder-opa362.c | 285 +++++++++++++++++++++ + drivers/video/fbdev/savage/savagefb.h | 12 +- + drivers/video/fbdev/ssd1307fb.c | 19 +- + drivers/video/fbdev/vt8500lcdfb.c | 4 +- + drivers/video/vgastate.c | 82 +++--- + include/linux/fb.h | 12 +- + 20 files changed, 583 insertions(+), 143 deletions(-) + create mode 100644 Documentation/devicetree/bindings/video/ti,opa362.txt + create mode 100644 drivers/video/fbdev/omap2/displays-new/encoder-opa362.c +Merging regulator/for-next (4311c370311a Merge remote-tracking branches 'regulator/topic/pfuze100', 'regulator/topic/rk808', 'regulator/topic/rt5033' and 'regulator/topic/tps65023' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/max77686.txt | 14 + + .../devicetree/bindings/regulator/isl9305.txt | 4 +- + .../bindings/regulator/mt6397-regulator.txt | 217 ++++++++++++++ + .../devicetree/bindings/regulator/pfuze100.txt | 94 +++++- + drivers/regulator/Kconfig | 9 + + drivers/regulator/Makefile | 1 + + drivers/regulator/axp20x-regulator.c | 93 +++--- + drivers/regulator/core.c | 32 +- + drivers/regulator/da9211-regulator.c | 4 +- + drivers/regulator/fan53555.c | 4 +- + drivers/regulator/internal.h | 2 + + drivers/regulator/isl9305.c | 6 +- + drivers/regulator/max14577.c | 62 +--- + drivers/regulator/max77686.c | 70 ++++- + drivers/regulator/max8649.c | 4 +- + drivers/regulator/mt6397-regulator.c | 332 +++++++++++++++++++++ + drivers/regulator/of_regulator.c | 11 + + drivers/regulator/pfuze100-regulator.c | 134 ++++++++- + drivers/regulator/rk808-regulator.c | 6 +- + drivers/regulator/rt5033-regulator.c | 8 +- + drivers/regulator/s2mps11.c | 42 ++- + drivers/regulator/tps65023-regulator.c | 6 +- + include/linux/mfd/samsung/s2mps13.h | 2 + + include/linux/regulator/da9211.h | 1 + + include/linux/regulator/driver.h | 13 + + include/linux/regulator/mt6397-regulator.h | 49 +++ + include/linux/regulator/pfuze100.h | 14 + + 27 files changed, 1085 insertions(+), 149 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/mt6397-regulator.txt + create mode 100644 drivers/regulator/mt6397-regulator.c + create mode 100644 include/linux/regulator/mt6397-regulator.h +Merging security/next (bb31f607a090 Merge tag 'keys-next-fixes-20150114' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next) +$ git merge security/next +Merge made by the 'recursive' strategy. + lib/mpi/mpi-cmp.c | 10 ++++------ + lib/mpi/mpi-internal.h | 2 +- + 2 files changed, 5 insertions(+), 7 deletions(-) +Merging integrity/next (63a0eb7891bd ima: Fix build failure on powerpc when TCG_IBMVTPM dependencies are not met) +$ git merge integrity/next +Already up-to-date. +Merging selinux/next (0307dadc924d selinux: add security in-core xattr support for pstore and debugfs) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/avc.c | 5 ----- + security/selinux/hooks.c | 29 ++++++++--------------------- + 2 files changed, 8 insertions(+), 26 deletions(-) +Merging lblnet/next (d8ec26d7f828 Linux 3.13) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (e0c3e00f4045 watchdog: drop owner assignment from platform_drivers) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + drivers/watchdog/cadence_wdt.c | 1 - + drivers/watchdog/imx2_wdt.c | 40 +++++++++++++++++++++++++++++++--------- + drivers/watchdog/meson_wdt.c | 1 - + 3 files changed, 31 insertions(+), 11 deletions(-) +Merging iommu/next (2c0ee8b85aae iommu/rockchip: Drop owner assignment from platform_drivers) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (1860e379875d Linux 3.15) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (5e9f36c59a48 drivers/vfio: allow type-1 IOMMU instantiation on top of an ARM SMMU) +$ 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 (174236285cf8 Merge branch 'doc/sp-update' into docs-next) +$ git merge jc_docs/docs-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/00-INDEX | 28 +-- + Documentation/Changes | 6 +- + Documentation/SubmittingPatches | 438 ++++++++++++++++----------------- + Documentation/arm/00-INDEX | 12 +- + Documentation/cgroups/00-INDEX | 2 + + Documentation/dmaengine/00-INDEX | 8 + + Documentation/driver-model/bus.txt | 2 +- + Documentation/filesystems/seq_file.txt | 12 +- + Documentation/locking/00-INDEX | 16 ++ + Documentation/networking/00-INDEX | 8 +- + MAINTAINERS | 1 + + 11 files changed, 277 insertions(+), 256 deletions(-) + create mode 100644 Documentation/dmaengine/00-INDEX + create mode 100644 Documentation/locking/00-INDEX +Merging trivial/for-next (231821d4c3fa dynamic_debug: fix comment) +$ git merge trivial/for-next +Auto-merging lib/dynamic_debug.c +Auto-merging arch/x86/mm/init.c +Merge made by the 'recursive' strategy. + Documentation/usb/usbmon.txt | 2 +- + arch/x86/mm/init.c | 2 +- + lib/dynamic_debug.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) +Merging audit/next (0f7e94ee40d0 Merge branch 'next' into upstream for v3.19) +$ git merge audit/next +Already up-to-date. +Merging fsnotify/for-next (1ca39ab9d21a inotify: automatically restart syscalls) +$ git merge fsnotify/for-next +Already up-to-date. +Merging devicetree/devicetree/next (c46ca3c8310b of: Delete unnecessary check before calling "of_node_put()") +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (e94fbe607f8c dt-bindings: use isil prefix for Intersil in vendor-prefixes.txt) +$ git merge dt-rh/for-next +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm-boards | 2 +- + Documentation/devicetree/bindings/arm/fw-cfg.txt | 72 ++++++++++++++++++++++ + .../bindings/fpga/altera-socfpga-fpga-mgr.txt | 17 +++++ + Documentation/devicetree/bindings/graph.txt | 2 +- + .../devicetree/bindings/pinctrl/ste,nomadik.txt | 35 ++++++----- + .../devicetree/bindings/vendor-prefixes.txt | 10 ++- + MAINTAINERS | 8 +-- + arch/arm/boot/dts/tegra20-seaboard.dts | 2 +- + drivers/of/Kconfig | 1 - + drivers/of/of_reserved_mem.c | 2 + + drivers/of/platform.c | 2 +- + drivers/of/unittest.c | 70 ++++----------------- + include/dt-bindings/interrupt-controller/arm-gic.h | 4 +- + 13 files changed, 139 insertions(+), 88 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/fw-cfg.txt + create mode 100644 Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt +Merging mailbox/mailbox-for-next (9f3e3cacb2ff dt: mailbox: add generic bindings) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (2cdb41c84a4e Merge remote-tracking branches 'spi/topic/sirf' and 'spi/topic/st-ssc' into spi-next) +$ git merge spi/for-next +Auto-merging sound/soc/rockchip/rockchip_i2s.c +Auto-merging drivers/spi/Kconfig +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/sh-msiof.txt | 16 + + Documentation/devicetree/bindings/spi/spi-sirf.txt | 41 + + .../devicetree/bindings/spi/spi-st-ssc.txt | 40 + + arch/x86/pci/intel_mid_pci.c | 1 - + drivers/spi/Kconfig | 22 +- + drivers/spi/Makefile | 2 + + drivers/spi/spi-au1550.c | 4 - + drivers/spi/spi-bcm2835.c | 4 - + drivers/spi/spi-bcm63xx.c | 4 - + drivers/spi/spi-bitbang.c | 4 - + drivers/spi/spi-butterfly.c | 4 - + drivers/spi/spi-coldfire-qspi.c | 5 - + drivers/spi/spi-davinci.c | 4 - + drivers/spi/spi-dln2.c | 881 +++++++++++++++++++++ + drivers/spi/spi-dw-mid.c | 3 - + drivers/spi/spi-dw-pci.c | 38 +- + drivers/spi/spi-dw.c | 15 +- + drivers/spi/spi-falcon.c | 12 - + drivers/spi/spi-fsl-cpm.c | 9 + + drivers/spi/spi-fsl-lib.c | 16 +- + drivers/spi/spi-fsl-lib.h | 4 +- + drivers/spi/spi-gpio.c | 8 +- + drivers/spi/spi-img-spfi.c | 49 +- + drivers/spi/spi-imx.c | 13 +- + drivers/spi/spi-lm70llp.c | 4 - + drivers/spi/spi-meson-spifc.c | 2 +- + drivers/spi/spi-omap-100k.c | 5 - + drivers/spi/spi-omap-uwire.c | 4 - + drivers/spi/spi-omap2-mcspi.c | 5 - + drivers/spi/spi-orion.c | 88 +- + drivers/spi/spi-pxa2xx-dma.c | 17 +- + drivers/spi/spi-pxa2xx-pxadma.c | 33 +- + drivers/spi/spi-pxa2xx.c | 206 ++--- + drivers/spi/spi-pxa2xx.h | 34 +- + drivers/spi/spi-qup.c | 11 +- + drivers/spi/spi-rspi.c | 5 - + drivers/spi/spi-s3c64xx.c | 4 - + drivers/spi/spi-sc18is602.c | 4 - + drivers/spi/spi-sh-hspi.c | 5 - + drivers/spi/spi-sh-msiof.c | 51 +- + drivers/spi/spi-sh.c | 5 - + drivers/spi/spi-sirf.c | 1 - + drivers/spi/spi-st-ssc4.c | 504 ++++++++++++ + drivers/spi/spi-topcliff-pch.c | 4 - + drivers/spi/spi.c | 118 ++- + drivers/spi/spidev.c | 4 - + include/linux/pxa2xx_ssp.h | 1 + + include/linux/spi/at86rf230.h | 4 - + include/linux/spi/l4f00242t03.h | 4 - + include/linux/spi/lms283gf05.h | 4 - + include/linux/spi/mxs-spi.h | 4 - + include/linux/spi/pxa2xx_spi.h | 4 - + include/linux/spi/rspi.h | 5 - + include/linux/spi/sh_hspi.h | 4 - + include/linux/spi/sh_msiof.h | 2 + + include/linux/spi/spi.h | 6 +- + include/linux/spi/tle62x0.h | 4 - + include/linux/spi/tsc2005.h | 5 - + sound/soc/rockchip/rockchip_i2s.c | 1 + + 59 files changed, 1913 insertions(+), 448 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi-sirf.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-st-ssc.txt + create mode 100644 drivers/spi/spi-dln2.c + create mode 100644 drivers/spi/spi-st-ssc4.c +Merging tip/auto-latest (4692b98fe5dc Merge branch 'x86/ras') +$ git merge tip/auto-latest +Auto-merging kernel/locking/osq_lock.c +Auto-merging arch/x86/include/uapi/asm/msr-index.h +Merge made by the 'recursive' strategy. + Documentation/locking/lockdep-design.txt | 2 +- + arch/x86/boot/ctype.h | 5 +- + arch/x86/boot/early_serial_console.c | 6 +- + arch/x86/include/asm/cpufeature.h | 2 + + arch/x86/include/asm/debugreg.h | 5 ++ + arch/x86/include/asm/fpu-internal.h | 10 ++- + arch/x86/include/asm/hw_breakpoint.h | 1 + + arch/x86/include/asm/irq_remapping.h | 4 - + arch/x86/include/uapi/asm/msr-index.h | 4 + + arch/x86/kernel/apb_timer.c | 8 -- + arch/x86/kernel/apic/apic.c | 108 +++++++++++++------------- + arch/x86/kernel/cpu/amd.c | 19 +++++ + arch/x86/kernel/cpu/common.c | 13 ++-- + arch/x86/kernel/cpu/intel.c | 6 +- + arch/x86/kernel/cpu/mcheck/mce.c | 25 +++--- + arch/x86/kernel/entry_64.S | 3 +- + arch/x86/kernel/hw_breakpoint.c | 45 ++++------- + arch/x86/pci/mmconfig-shared.c | 28 +++++++ + drivers/acpi/apei/apei-base.c | 32 ++++++-- + drivers/clocksource/bcm_kona_timer.c | 9 +-- + drivers/clocksource/exynos_mct.c | 4 +- + drivers/clocksource/sh_tmu.c | 2 +- + drivers/iommu/amd_iommu.c | 1 - + drivers/iommu/amd_iommu_init.c | 10 +-- + drivers/iommu/amd_iommu_proto.h | 1 - + drivers/iommu/intel_irq_remapping.c | 96 ++++++++++++----------- + drivers/iommu/irq_remapping.c | 74 ++++++------------ + drivers/iommu/irq_remapping.h | 5 -- + drivers/irqchip/irq-atmel-aic-common.c | 4 +- + drivers/irqchip/irq-gic-v3-its.c | 2 +- + drivers/irqchip/irq-hip04.c | 2 +- + drivers/irqchip/irq-mtk-sysirq.c | 4 +- + drivers/irqchip/irq-omap-intc.c | 26 +++++-- + include/linux/ftrace_event.h | 2 +- + include/linux/osq_lock.h | 12 ++- + include/linux/perf_event.h | 28 +++++-- + include/trace/ftrace.h | 7 +- + kernel/Kconfig.locks | 4 + + kernel/events/core.c | 23 ++++-- + kernel/locking/Makefile | 3 +- + kernel/locking/mcs_spinlock.h | 16 ---- + kernel/locking/mutex.c | 58 +++++++------- + kernel/locking/{mcs_spinlock.c => osq_lock.c} | 9 +-- + kernel/sched/core.c | 37 +++++---- + kernel/sched/debug.c | 1 + + kernel/sched/fair.c | 7 +- + kernel/sched/rt.c | 9 ++- + kernel/sched/sched.h | 22 +++++- + kernel/softirq.c | 6 +- + kernel/trace/trace_event_perf.c | 4 +- + kernel/trace/trace_kprobe.c | 4 +- + kernel/trace/trace_syscalls.c | 4 +- + kernel/trace/trace_uprobe.c | 2 +- + tools/perf/Documentation/perf-record.txt | 7 +- + tools/perf/tests/parse-events.c | 58 ++++++++++++++ + tools/perf/util/parse-events.c | 21 ++--- + tools/perf/util/parse-events.h | 2 +- + tools/perf/util/parse-events.l | 1 + + tools/perf/util/parse-events.y | 26 ++++++- + 59 files changed, 561 insertions(+), 378 deletions(-) + rename kernel/locking/{mcs_spinlock.c => osq_lock.c} (98%) +Merging clockevents/clockevents/next (81428bbe1d8a clocksource: marco: Rename marco to atlas7) +$ git merge clockevents/clockevents/next +Auto-merging drivers/clocksource/timer-atlas7.c +Auto-merging drivers/clocksource/Makefile +Merge made by the 'recursive' strategy. + drivers/clocksource/Makefile | 2 +- + drivers/clocksource/{timer-marco.c => timer-atlas7.c} | 15 +++++++-------- + 2 files changed, 8 insertions(+), 9 deletions(-) + rename drivers/clocksource/{timer-marco.c => timer-atlas7.c} (95%) +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 (a4972b1b9a04 edac: i5100_edac: Remove unused i5100_recmema_dm_buf_id) +$ git merge edac-amd/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/edac/Kconfig | 7 + + drivers/edac/Makefile | 1 + + drivers/edac/i5100_edac.c | 5 - + drivers/edac/mce_amd_inj.c | 2 +- + drivers/edac/mpc85xx_edac.c | 2 +- + drivers/edac/mpc85xx_edac.h | 2 +- + drivers/edac/synopsys_edac.c | 535 +++++++++++++++++++++++++++++++++++++++++++ + 8 files changed, 547 insertions(+), 8 deletions(-) + create mode 100644 drivers/edac/synopsys_edac.c +Merging irqchip/irqchip/for-next (91d117921216 irqchip: atmel-aic-common: Prevent clobbering of priority when changing IRQ type) +$ git merge irqchip/irqchip/for-next +Already up-to-date. +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (d716ff71dd12 tracing: Remove taking of trace_types_lock in pipe files) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace.c +Merge made by the 'recursive' strategy. + kernel/trace/trace.c | 126 ++++++++++++++++++--------------------------------- + kernel/trace/trace.h | 1 + + 2 files changed, 44 insertions(+), 83 deletions(-) +Merging rcu/rcu/next (0cf8c85d7791 rcu_tree: Avoid touching rnp->completed when a new GP is started) +$ git merge rcu/rcu/next +Auto-merging mm/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging kernel/softirq.c +Auto-merging init/Kconfig +Auto-merging include/linux/compiler.h +Auto-merging drivers/md/Kconfig +Auto-merging arch/x86/Kconfig +Merge made by the 'recursive' strategy. + Documentation/RCU/stallwarn.txt | 16 +- + Documentation/RCU/trace.txt | 32 +- + Documentation/memory-barriers.txt | 46 ++- + arch/arm/kvm/Kconfig | 1 + + arch/arm64/kvm/Kconfig | 1 + + arch/mips/kvm/Kconfig | 1 + + arch/powerpc/kvm/Kconfig | 1 + + arch/s390/kvm/Kconfig | 1 + + arch/tile/kvm/Kconfig | 1 + + arch/x86/Kconfig | 1 + + arch/x86/kvm/Kconfig | 1 + + drivers/clk/Kconfig | 1 + + drivers/cpufreq/Kconfig | 1 + + drivers/devfreq/Kconfig | 1 + + drivers/md/Kconfig | 1 + + drivers/net/Kconfig | 1 + + fs/btrfs/Kconfig | 1 + + fs/notify/Kconfig | 1 + + fs/quota/Kconfig | 1 + + include/linux/compiler.h | 2 +- + include/linux/rculist.h | 16 +- + include/linux/rcupdate.h | 22 +- + include/linux/rcutiny.h | 45 ++- + include/linux/rcutree.h | 11 +- + include/linux/srcu.h | 14 +- + init/Kconfig | 18 +- + kernel/cpu.c | 56 ++-- + kernel/notifier.c | 3 + + kernel/power/Kconfig | 1 + + kernel/rcu/Makefile | 3 +- + kernel/rcu/rcu.h | 6 + + kernel/rcu/rcutorture.c | 66 ++-- + kernel/rcu/srcu.c | 19 +- + kernel/rcu/tiny.c | 113 +------ + kernel/rcu/tiny_plugin.h | 9 +- + kernel/rcu/tree.c | 359 +++++++++++++++------ + kernel/rcu/tree.h | 62 +--- + kernel/rcu/tree_plugin.h | 271 +++++----------- + kernel/rcu/tree_trace.c | 8 +- + kernel/rcu/update.c | 15 +- + kernel/softirq.c | 3 +- + lib/Kconfig.debug | 3 +- + mm/Kconfig | 1 + + security/tomoyo/Kconfig | 1 + + tools/testing/selftests/rcutorture/bin/cpus2use.sh | 2 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 18 ++ + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 9 +- + .../selftests/rcutorture/bin/parse-build.sh | 20 +- + .../selftests/rcutorture/bin/parse-console.sh | 2 +- + 49 files changed, 674 insertions(+), 614 deletions(-) +Merging uprobes/for-next (0326f5a94dde uprobes/core: Handle breakpoint and singlestep exceptions) +$ git merge uprobes/for-next +Already up-to-date. +Merging kvm/linux-next (bab5bb398273 kvm: x86: Remove kvm_make_request from lapic.c) +$ git merge kvm/linux-next +Auto-merging arch/x86/include/uapi/asm/msr-index.h +Merge made by the 'recursive' strategy. + arch/x86/include/asm/kvm_host.h | 1 + + arch/x86/include/uapi/asm/msr-index.h | 3 + + arch/x86/include/uapi/asm/vmx.h | 5 + + arch/x86/kvm/emulate.c | 138 ++++++++++++-------- + arch/x86/kvm/lapic.c | 73 +++++++++-- + arch/x86/kvm/lapic.h | 3 + + arch/x86/kvm/mmu.c | 92 ++++++-------- + arch/x86/kvm/mmu.h | 5 +- + arch/x86/kvm/svm.c | 4 +- + arch/x86/kvm/trace.h | 20 +++ + arch/x86/kvm/vmx.c | 230 +++++++++++++++++++++++++++++++--- + arch/x86/kvm/x86.c | 15 +++ + arch/x86/kvm/x86.h | 3 + + virt/kvm/kvm_main.c | 1 + + 14 files changed, 457 insertions(+), 136 deletions(-) +Merging kvm-arm/next (bab5bb398273 kvm: x86: Remove kvm_make_request from lapic.c) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (2c4aa55a6af0 Merge tag 'signed-kvm-ppc-next' of git://github.com/agraf/linux-2.6 into HEAD) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging oprofile/for-next (6ce4eac1f600 Linux 3.13-rc1) +$ git merge oprofile/for-next +Already up-to-date. +Merging fw-nohz/nohz/next (74876a98a87a printk: Wake up klogd using irq_work) +$ git merge fw-nohz/nohz/next +Already up-to-date. +Merging xen-tip/linux-next (2e917175e1ef xen: Speed up set_phys_to_machine() by using read-only mappings) +$ 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 +Merge made by the 'recursive' strategy. + include/linux/percpu-refcount.h | 34 +++++++++++++++++++++++++++++++--- + 1 file changed, 31 insertions(+), 3 deletions(-) +Merging workqueues/for-next (b5b3ab523e31 Merge branch 'for-3.19-fixes' into for-next) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + include/linux/workqueue.h | 8 ++------ + kernel/workqueue.c | 25 ++++++++----------------- + 2 files changed, 10 insertions(+), 23 deletions(-) +Merging drivers-x86/for-next (200db647112d platform/x86/acerhdf: Still depends on THERMAL) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (5502486a2077 platform/chrome: chromeos_laptop - Add a limit for deferred retries) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging sysctl/master (4e474a00d7ff sysctl: protect poll() in entries that may go away) +$ git merge sysctl/master +Already up-to-date. +Merging regmap/for-next (270ded427d7b Merge remote-tracking branch 'regmap/topic/core' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging hsi/for-next (67e9a2ce6e07 hsi: nokia-modem: fix uninitialized device pointer) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/nokia-modem.c | 1 + + 1 file changed, 1 insertion(+) +Merging leds/for-next (452bc149947b leds: leds-mc13783: Use of_get_child_by_name() instead of refcount hack) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/leds/common.txt | 16 ++++++++++++++++ + drivers/leds/led-class.c | 5 ++--- + drivers/leds/leds-mc13783.c | 4 +--- + drivers/leds/leds.h | 3 ++- + 4 files changed, 21 insertions(+), 7 deletions(-) +Merging ipmi/for-next (1421c935df15 ipmi: Fix compile warning with tv_usec) +$ git merge ipmi/for-next +Already up-to-date. +Merging driver-core/driver-core-next (ec6f34e5b552 Linux 3.19-rc5) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (61b6b7fbda1b Merge 3.19-rc5 into tty-next) +$ git merge tty/tty-next +Auto-merging drivers/tty/serial/Kconfig +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/digicolor-usart.txt | 27 + + .../devicetree/bindings/serial/sirf-uart.txt | 4 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/tty/amiserial.c | 2 +- + drivers/tty/rocket.c | 4 +- + drivers/tty/serial/8250/8250_core.c | 35 +- + drivers/tty/serial/8250/8250_dma.c | 2 +- + drivers/tty/serial/8250/8250_dw.c | 11 + + drivers/tty/serial/8250/8250_early.c | 7 +- + drivers/tty/serial/8250/8250_omap.c | 81 ++- + drivers/tty/serial/8250/Kconfig | 19 + + drivers/tty/serial/Kconfig | 15 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/altera_jtaguart.c | 1 + + drivers/tty/serial/altera_uart.c | 1 + + drivers/tty/serial/atmel_serial.c | 153 ++++-- + drivers/tty/serial/digicolor-usart.c | 563 ++++++++++++++++++++ + drivers/tty/serial/imx.c | 164 ++++-- + drivers/tty/serial/mcf.c | 7 +- + drivers/tty/serial/mxs-auart.c | 44 +- + drivers/tty/serial/omap-serial.c | 8 +- + drivers/tty/serial/samsung.c | 582 ++++++++++++++++++++- + drivers/tty/serial/samsung.h | 42 ++ + drivers/tty/serial/sirfsoc_uart.c | 40 +- + drivers/tty/serial/sirfsoc_uart.h | 4 +- + drivers/tty/tty_mutex.c | 6 +- + drivers/tty/vt/vt.c | 14 +- + include/linux/serial_8250.h | 1 + + include/linux/serial_core.h | 1 + + include/linux/serial_s3c.h | 28 + + include/uapi/linux/serial_core.h | 6 +- + include/uapi/linux/serial_reg.h | 3 +- + 32 files changed, 1676 insertions(+), 201 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/digicolor-usart.txt + create mode 100644 drivers/tty/serial/digicolor-usart.c +Merging usb/usb-next (1d97869198a3 usb: host: drop owner assignment from platform_drivers) +$ git merge usb/usb-next +Auto-merging drivers/usb/host/xhci.c +Auto-merging Documentation/usb/usbmon.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/usb/usb-ehci.txt | 1 + + Documentation/usb/usbmon.txt | 2 +- + arch/mips/cavium-octeon/octeon-platform.c | 148 +++++++++------------ + drivers/usb/core/buffer.c | 26 ++-- + drivers/usb/core/usb.c | 1 + + drivers/usb/gadget/udc/bdc/bdc_core.c | 1 - + drivers/usb/host/ehci-fsl.c | 1 - + drivers/usb/host/ehci-grlib.c | 1 - + drivers/usb/host/ehci-hcd.c | 6 +- + drivers/usb/host/ehci-platform.c | 7 +- + drivers/usb/host/ehci-pmcmsp.c | 1 - + drivers/usb/host/ehci-ppc-of.c | 1 - + drivers/usb/host/ehci-sead3.c | 1 - + drivers/usb/host/ehci-sh.c | 1 - + drivers/usb/host/ehci-tilegx.c | 1 - + drivers/usb/host/ehci-xilinx-of.c | 1 - + drivers/usb/host/ehci.h | 2 +- + drivers/usb/host/isp1760-hcd.c | 4 +- + drivers/usb/host/max3421-hcd.c | 3 +- + drivers/usb/host/ohci-da8xx.c | 1 - + drivers/usb/host/ohci-jz4740.c | 1 - + drivers/usb/host/ohci-platform.c | 1 + + drivers/usb/host/ohci-ppc-of.c | 1 - + drivers/usb/host/ohci-sm501.c | 1 - + drivers/usb/host/ohci-tilegx.c | 1 - + drivers/usb/host/ohci-tmio.c | 1 - + drivers/usb/host/oxu210hp-hcd.c | 4 +- + drivers/usb/host/r8a66597-hcd.c | 10 +- + drivers/usb/host/sl811-hcd.c | 4 +- + drivers/usb/host/uhci-grlib.c | 1 - + drivers/usb/host/uhci-platform.c | 1 - + drivers/usb/host/xhci-dbg.c | 2 +- + drivers/usb/host/xhci-mem.c | 31 ++--- + drivers/usb/host/xhci-ring.c | 12 +- + drivers/usb/host/xhci.c | 68 +++++----- + drivers/usb/host/xhci.h | 10 +- + drivers/usb/image/microtek.c | 4 +- + drivers/usb/misc/uss720.c | 12 +- + include/linux/usb/ehci_pdriver.h | 3 + + include/linux/usb/hcd.h | 1 + + 40 files changed, 165 insertions(+), 214 deletions(-) +Merging usb-gadget/next (fe198e34a44c usb: musb: debugfs: improve copy_from_user() argument) +$ git merge usb-gadget/next +Resolved 'drivers/usb/dwc2/gadget.c' using previous resolution. +Resolved 'drivers/usb/gadget/udc/bdc/bdc_ep.c' using previous resolution. +Auto-merging drivers/usb/musb/musb_debugfs.c +Auto-merging drivers/usb/gadget/udc/bdc/bdc_ep.c +CONFLICT (content): Merge conflict in drivers/usb/gadget/udc/bdc/bdc_ep.c +Auto-merging drivers/usb/gadget/udc/atmel_usba_udc.c +Auto-merging drivers/usb/gadget/function/f_uac1.c +Auto-merging drivers/usb/gadget/function/f_hid.c +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging drivers/usb/dwc3/gadget.c +Auto-merging drivers/usb/dwc3/dwc3-pci.c +Auto-merging drivers/usb/dwc2/gadget.c +CONFLICT (content): Merge conflict in drivers/usb/dwc2/gadget.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4481be79a7dc] Merge remote-tracking branch 'usb-gadget/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-usb-gadget-uvc | 265 +++ + .../devicetree/bindings/usb/atmel-usb.txt | 5 +- + Documentation/devicetree/bindings/usb/dwc2.txt | 4 + + .../devicetree/bindings/usb/usb-nop-xceiv.txt | 10 +- + Documentation/usb/gadget-testing.txt | 728 ++++++ + Documentation/usb/gadget_serial.txt | 8 +- + drivers/usb/dwc2/core.c | 2 +- + drivers/usb/dwc2/core.h | 48 +- + drivers/usb/dwc2/gadget.c | 846 ++++--- + drivers/usb/dwc2/hw.h | 1 + + drivers/usb/dwc2/platform.c | 36 +- + drivers/usb/dwc3/core.h | 3 - + drivers/usb/dwc3/dwc3-pci.c | 178 +- + drivers/usb/dwc3/gadget.c | 5 +- + drivers/usb/gadget/Kconfig | 11 + + drivers/usb/gadget/function/Makefile | 2 +- + drivers/usb/gadget/function/f_fs.c | 84 +- + drivers/usb/gadget/function/f_hid.c | 2 +- + drivers/usb/gadget/function/f_uac1.c | 16 +- + drivers/usb/gadget/function/f_uvc.c | 136 +- + drivers/usb/gadget/function/u_fs.h | 24 + + drivers/usb/gadget/function/u_uac1.c | 3 +- + drivers/usb/gadget/function/u_uac1.h | 1 - + drivers/usb/gadget/function/u_uvc.h | 52 +- + drivers/usb/gadget/function/uvc_configfs.c | 2439 ++++++++++++++++++++ + drivers/usb/gadget/function/uvc_configfs.h | 22 + + drivers/usb/gadget/udc/atmel_usba_udc.c | 146 +- + drivers/usb/gadget/udc/atmel_usba_udc.h | 9 + + drivers/usb/gadget/udc/bdc/bdc_ep.c | 10 +- + drivers/usb/gadget/udc/fsl_qe_udc.c | 2 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 2 +- + drivers/usb/gadget/udc/mv_udc_core.c | 3 - + drivers/usb/gadget/udc/net2280.c | 527 +---- + drivers/usb/gadget/udc/net2280.h | 23 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 2 - + drivers/usb/gadget/udc/pxa27x_udc.c | 2 - + drivers/usb/gadget/udc/s3c2410_udc.c | 20 - + drivers/usb/musb/musb_debugfs.c | 2 +- + drivers/usb/phy/phy-fsl-usb.c | 35 - + drivers/usb/phy/phy-generic.c | 146 +- + drivers/usb/phy/phy-generic.h | 10 +- + drivers/usb/phy/phy-mxs-usb.c | 15 +- + drivers/usb/renesas_usbhs/common.c | 25 +- + drivers/usb/renesas_usbhs/common.h | 3 + + include/linux/usb/phy.h | 4 +- + include/linux/usb/usb_phy_generic.h | 2 + + .../usb/ffs-aio-example/multibuff/host_app/test.c | 14 +- + .../ffs-aio-example/simple/device_app/aio_simple.c | 2 + + tools/usb/ffs-aio-example/simple/host_app/test.c | 17 +- + 49 files changed, 4827 insertions(+), 1125 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-uvc + create mode 100644 Documentation/usb/gadget-testing.txt + create mode 100644 drivers/usb/gadget/function/uvc_configfs.c + create mode 100644 drivers/usb/gadget/function/uvc_configfs.h +Merging usb-serial/usb-next (b7392d2247cf Linux 3.19-rc2) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging staging/staging-next (ef4c65351a3d staging: rtl8723au: hal: Removed spaces before semicolon) +$ git merge staging/staging-next +Auto-merging drivers/staging/vt6655/rxtx.c +Auto-merging drivers/staging/vt6655/device_main.c +Auto-merging drivers/staging/vt6655/channel.c +Auto-merging drivers/staging/vt6655/baseband.c +Removing drivers/staging/unisys/visorchipset/testing.h +Removing drivers/staging/unisys/channels/chanstub.h +Removing drivers/staging/unisys/channels/chanstub.c +Removing drivers/staging/unisys/channels/channel.c +Removing drivers/staging/unisys/channels/Makefile +Removing drivers/staging/unisys/channels/Kconfig +Merge made by the 'recursive' strategy. + drivers/staging/comedi/drivers/8255_pci.c | 65 +- + .../comedi/drivers/addi-data/hwdrv_apci1500.c | 1505 +++++--------------- + drivers/staging/comedi/drivers/addi_apci_1500.c | 32 +- + drivers/staging/comedi/drivers/adl_pci6208.c | 3 +- + drivers/staging/comedi/drivers/adl_pci7x3x.c | 62 +- + drivers/staging/comedi/drivers/adl_pci8164.c | 2 +- + drivers/staging/comedi/drivers/adv_pci1723.c | 2 +- + drivers/staging/comedi/drivers/adv_pci1724.c | 2 +- + drivers/staging/comedi/drivers/aio_iiro_16.c | 219 ++- + drivers/staging/comedi/drivers/c6xdigio.c | 2 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 10 +- + drivers/staging/comedi/drivers/comedi_bond.c | 1 + + drivers/staging/comedi/drivers/comedi_parport.c | 2 +- + drivers/staging/comedi/drivers/dac02.c | 2 +- + drivers/staging/comedi/drivers/das08.c | 17 +- + drivers/staging/comedi/drivers/das08_isa.c | 18 +- + drivers/staging/comedi/drivers/das08_pci.c | 2 +- + drivers/staging/comedi/drivers/das16.c | 33 +- + drivers/staging/comedi/drivers/das6402.c | 4 +- + drivers/staging/comedi/drivers/dmm32at.c | 4 +- + drivers/staging/comedi/drivers/dt282x.c | 22 +- + drivers/staging/comedi/drivers/dyna_pci10xx.c | 35 +- + drivers/staging/comedi/drivers/ii_pci20kc.c | 2 +- + drivers/staging/comedi/drivers/ke_counter.c | 2 +- + drivers/staging/comedi/drivers/me_daq.c | 3 +- + drivers/staging/comedi/drivers/mf6x4.c | 2 +- + drivers/staging/comedi/drivers/ni_6527.c | 3 +- + drivers/staging/comedi/drivers/ni_65xx.c | 30 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 3 +- + drivers/staging/comedi/drivers/ni_labpc.c | 5 +- + drivers/staging/comedi/drivers/ni_labpc_pci.c | 2 +- + drivers/staging/comedi/drivers/ni_tio.c | 43 +- + drivers/staging/comedi/drivers/ni_tiocmd.c | 43 +- + drivers/staging/comedi/drivers/pcl711.c | 6 +- + drivers/staging/comedi/drivers/pcl724.c | 12 +- + drivers/staging/comedi/drivers/pcl726.c | 7 +- + drivers/staging/comedi/drivers/pcl730.c | 19 +- + drivers/staging/comedi/drivers/pcmad.c | 3 +- + drivers/staging/comedi/drivers/pcmda12.c | 2 +- + drivers/staging/comedi/drivers/pcmmio.c | 2 +- + drivers/staging/comedi/drivers/pcmuio.c | 3 +- + drivers/staging/comedi/drivers/rtd520.c | 6 +- + drivers/staging/comedi/drivers/rti800.c | 3 +- + drivers/staging/comedi/drivers/rti802.c | 2 +- + drivers/staging/comedi/drivers/s626.c | 2 +- + drivers/staging/comedi/drivers/usbdux.c | 3 +- + drivers/staging/comedi/drivers/usbduxfast.c | 2 +- + drivers/staging/comedi/drivers/usbduxsigma.c | 2 +- + drivers/staging/comedi/drivers/vmk80xx.c | 31 +- + drivers/staging/panel/panel.c | 102 +- + drivers/staging/rtl8712/rtl871x_sta_mgt.c | 3 +- + drivers/staging/rtl8723au/hal/odm_HWConfig.c | 8 +- + drivers/staging/unisys/Kconfig | 1 - + drivers/staging/unisys/Makefile | 1 - + drivers/staging/unisys/channels/Kconfig | 10 - + drivers/staging/unisys/channels/Makefile | 11 - + drivers/staging/unisys/channels/channel.c | 219 --- + drivers/staging/unisys/channels/chanstub.c | 75 - + drivers/staging/unisys/channels/chanstub.h | 23 - + .../staging/unisys/common-spar/include/version.h | 1 - + drivers/staging/unisys/uislib/Kconfig | 2 +- + drivers/staging/unisys/uislib/uislib.c | 755 +++++----- + drivers/staging/unisys/uislib/uisqueue.c | 215 ++- + drivers/staging/unisys/uislib/uisthread.c | 1 - + drivers/staging/unisys/uislib/uisutils.c | 99 +- + drivers/staging/unisys/virthba/Kconfig | 2 +- + drivers/staging/unisys/virthba/virthba.c | 2 +- + drivers/staging/unisys/virtpci/virtpci.c | 45 +- + drivers/staging/unisys/visorchannel/visorchannel.h | 69 +- + .../unisys/visorchannel/visorchannel_funcs.c | 107 +- + drivers/staging/unisys/visorchipset/file.c | 122 +- + drivers/staging/unisys/visorchipset/file.h | 3 +- + drivers/staging/unisys/visorchipset/globals.h | 2 - + drivers/staging/unisys/visorchipset/testing.h | 43 - + drivers/staging/unisys/visorchipset/visorchipset.h | 55 - + .../unisys/visorchipset/visorchipset_main.c | 3 +- + .../unisys/visorchipset/visorchipset_umode.h | 2 - + drivers/staging/unisys/visorutil/charqueue.c | 2 +- + drivers/staging/vt6655/baseband.c | 3 +- + drivers/staging/vt6655/card.c | 5 + + drivers/staging/vt6655/channel.c | 6 + + drivers/staging/vt6655/device_main.c | 8 +- + drivers/staging/vt6655/mac.c | 23 +- + drivers/staging/vt6655/power.c | 26 +- + drivers/staging/vt6655/rxtx.c | 2 +- + drivers/staging/vt6655/upc.h | 8 +- + drivers/staging/vt6656/card.c | 2 +- + drivers/staging/vt6656/device.h | 6 +- + drivers/staging/vt6656/dpc.h | 2 +- + drivers/staging/vt6656/main_usb.c | 3 +- + drivers/staging/vt6656/rxtx.c | 13 +- + 91 files changed, 1692 insertions(+), 2685 deletions(-) + delete mode 100644 drivers/staging/unisys/channels/Kconfig + delete mode 100644 drivers/staging/unisys/channels/Makefile + delete mode 100644 drivers/staging/unisys/channels/channel.c + delete mode 100644 drivers/staging/unisys/channels/chanstub.c + delete mode 100644 drivers/staging/unisys/channels/chanstub.h + delete mode 100644 drivers/staging/unisys/visorchipset/testing.h +Merging char-misc/char-misc-next (3542f6b1836d Merge 3.19-rc5 into char-misc-next) +$ git merge char-misc/char-misc-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/powerpc/fsl/lbc.txt | 18 +- + Documentation/stable_kernel_rules.txt | 44 +- + MAINTAINERS | 1 + + arch/powerpc/include/asm/fsl_lbc.h | 3 + + drivers/char/Kconfig | 9 + + drivers/char/mem.c | 22 +- + drivers/coresight/coresight-etb10.c | 12 +- + drivers/coresight/coresight-etm3x.c | 16 +- + drivers/coresight/coresight-funnel.c | 12 +- + drivers/coresight/coresight-tmc.c | 12 +- + drivers/coresight/coresight-tpiu.c | 12 +- + drivers/coresight/of_coresight.c | 6 +- + drivers/hv/channel_mgmt.c | 4 +- + drivers/hv/connection.c | 6 +- + drivers/misc/ad525x_dpot-spi.c | 4 + + drivers/misc/ad525x_dpot.c | 7 +- + drivers/misc/genwqe/card_base.h | 1 - + drivers/misc/genwqe/card_sysfs.c | 1 - + drivers/misc/ioc4.c | 31 +- + drivers/misc/mei/bus.c | 30 +- + drivers/misc/mei/client.c | 4 +- + drivers/misc/mei/mei_dev.h | 6 +- + drivers/misc/ti-st/st_core.c | 24 +- + drivers/misc/ti-st/st_kim.c | 119 ++++- + drivers/misc/ti-st/st_ll.c | 17 +- + drivers/pcmcia/Kconfig | 12 +- + drivers/pcmcia/Makefile | 1 + + drivers/pcmcia/cistpl.c | 31 +- + drivers/pcmcia/cs_internal.h | 6 +- + drivers/pcmcia/ds.c | 3 + + drivers/pcmcia/rsrc_mgr.c | 5 +- + drivers/pcmcia/rsrc_pci.c | 173 +++++++ + drivers/uio/Kconfig | 20 + + drivers/uio/Makefile | 1 + + drivers/uio/uio_fsl_elbc_gpcm.c | 499 +++++++++++++++++++++ + drivers/uio/uio_pci_generic.c | 3 +- + drivers/vme/vme.c | 2 +- + include/linux/coresight.h | 19 +- + include/linux/mei_cl_bus.h | 4 +- + include/linux/ti_wilink_st.h | 1 + + tools/hv/Makefile | 4 +- + tools/hv/hv_kvp_daemon.c | 12 +- + 42 files changed, 1024 insertions(+), 193 deletions(-) + create mode 100644 drivers/pcmcia/rsrc_pci.c + create mode 100644 drivers/uio/uio_fsl_elbc_gpcm.c +Merging cgroup/for-next (f3ba53802eff cgroup: add dummy css_put() for !CONFIG_CGROUPS) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + include/linux/cgroup.h | 4 ++++ + include/linux/cgroup_subsys.h | 8 ++++---- + 2 files changed, 8 insertions(+), 4 deletions(-) +Merging scsi/for-next (cbd5bdf0a2fd Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/ata/libata-eh.c +Merge made by the 'recursive' strategy. + drivers/ata/libata-eh.c | 17 +- + drivers/misc/enclosure.c | 108 +++++- + drivers/scsi/3w-9xxx.c | 3 +- + drivers/scsi/Kconfig | 4 +- + drivers/scsi/Makefile | 6 +- + drivers/scsi/ch.c | 6 +- + drivers/scsi/constants.c | 275 ++-------------- + drivers/scsi/esp_scsi.c | 2 - + drivers/scsi/lpfc/lpfc_els.c | 9 + + drivers/scsi/megaraid/megaraid_sas.h | 66 +++- + drivers/scsi/megaraid/megaraid_sas_base.c | 188 +++++++---- + drivers/scsi/megaraid/megaraid_sas_fp.c | 17 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 109 ++++--- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 9 +- + drivers/scsi/mpt2sas/mpi/mpi2.h | 7 +- + drivers/scsi/mpt2sas/mpi/mpi2_cnfg.h | 51 ++- + drivers/scsi/mpt2sas/mpi/mpi2_ioc.h | 4 +- + drivers/scsi/mpt2sas/mpi/mpi2_tool.h | 6 +- + drivers/scsi/mpt2sas/mpt2sas_base.c | 52 ++- + drivers/scsi/mpt2sas/mpt2sas_base.h | 16 +- + drivers/scsi/mpt2sas/mpt2sas_config.c | 39 ++- + drivers/scsi/mpt2sas/mpt2sas_ctl.c | 3 +- + drivers/scsi/mpt2sas/mpt2sas_ctl.h | 3 +- + drivers/scsi/mpt2sas/mpt2sas_debug.h | 3 +- + drivers/scsi/mpt2sas/mpt2sas_scsih.c | 47 ++- + drivers/scsi/mpt2sas/mpt2sas_transport.c | 3 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 53 ++- + drivers/scsi/mpt3sas/mpt3sas_base.h | 12 +- + drivers/scsi/mpt3sas/mpt3sas_config.c | 39 ++- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 3 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 3 +- + drivers/scsi/mpt3sas/mpt3sas_debug.h | 3 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 42 ++- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 3 +- + drivers/scsi/mpt3sas/mpt3sas_trigger_diag.c | 3 +- + drivers/scsi/mpt3sas/mpt3sas_trigger_diag.h | 3 +- + drivers/scsi/scsi.c | 11 +- + drivers/scsi/scsi_debug.c | 128 +++++++- + drivers/scsi/scsi_error.c | 50 ++- + drivers/scsi/scsi_logging.c | 489 ++++++++++++++++++++++++++++ + drivers/scsi/scsi_scan.c | 54 +-- + drivers/scsi/sd.c | 7 +- + drivers/scsi/ses.c | 148 +++++++-- + drivers/scsi/sr_ioctl.c | 13 +- + drivers/scsi/storvsc_drv.c | 190 ++++------- + drivers/scsi/ufs/ufshcd.c | 6 +- + drivers/xen/xen-scsiback.c | 1 + + include/linux/enclosure.h | 13 +- + include/scsi/scsi.h | 3 + + include/scsi/scsi_dbg.h | 74 ++++- + include/scsi/scsi_device.h | 21 +- + 51 files changed, 1693 insertions(+), 732 deletions(-) + create mode 100644 drivers/scsi/scsi_logging.c +Merging target-updates/for-next (97bf6af1f928 Linux 3.19-rc1) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (b28a960c42fc Linux 3.14-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging writeback/writeback-for-next (f9b0e058cbd0 writeback: Fix data corruption on NFS) +$ git merge writeback/writeback-for-next +Already up-to-date. +Merging hwspinlock/linux-next (8b37fcfc9b34 hwspinlock: add MAINTAINERS entries) +$ git merge hwspinlock/linux-next +Already up-to-date. +Merging pinctrl/for-next (bcb9c0ee5465 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 + + .../bindings/pinctrl/samsung-pinctrl.txt | 11 + + .../bindings/pinctrl/xlnx,zynq-pinctrl.txt | 104 ++ + drivers/pinctrl/Kconfig | 10 +- + drivers/pinctrl/Makefile | 3 +- + drivers/pinctrl/core.c | 5 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 105 +- + drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 6 +- + drivers/pinctrl/mvebu/pinctrl-dove.c | 4 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 +- + drivers/pinctrl/pinconf-generic.c | 206 ++-- + drivers/pinctrl/pinconf.c | 4 +- + drivers/pinctrl/pinconf.h | 22 +- + drivers/pinctrl/pinctrl-bcm281xx.c | 4 +- + drivers/pinctrl/pinctrl-rockchip.c | 47 +- + drivers/pinctrl/pinctrl-tz1090-pdc.c | 2 +- + drivers/pinctrl/pinctrl-tz1090.c | 2 +- + drivers/pinctrl/pinctrl-xway.c | 2 - + drivers/pinctrl/pinctrl-zynq.c | 1176 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 125 +-- + drivers/pinctrl/samsung/pinctrl-exynos.c | 19 + + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 13 + + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 21 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 2 +- + drivers/pinctrl/sirf/pinctrl-sirf.c | 51 +- + drivers/pinctrl/sirf/pinctrl-sirf.h | 1 - + drivers/pinctrl/sunxi/Kconfig | 4 + + drivers/pinctrl/sunxi/Makefile | 1 + + drivers/pinctrl/sunxi/pinctrl-sun6i-a31.c | 5 + + drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c | 815 ++++++++++++++ + include/linux/pinctrl/consumer.h | 6 +- + include/linux/pinctrl/pinconf-generic.h | 29 + + include/linux/pinctrl/pinctrl.h | 12 + + 33 files changed, 2514 insertions(+), 306 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/xlnx,zynq-pinctrl.txt + create mode 100644 drivers/pinctrl/pinctrl-zynq.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c +Merging vhost/linux-next (ecc043c31dbd virtio_pci: add module param to force legacy mode) +$ git merge vhost/linux-next +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/block/virtio_blk.c +Removing arch/mn10300/unit-asb2305/pci-iomap.c +Merge made by the 'recursive' strategy. + arch/mn10300/unit-asb2305/pci-iomap.c | 35 -- + arch/s390/include/asm/pci_io.h | 1 + + arch/s390/pci/pci.c | 34 +- + drivers/block/virtio_blk.c | 12 +- + drivers/char/hw_random/virtio-rng.c | 1 - + drivers/char/virtio_console.c | 6 + + drivers/net/virtio_net.c | 6 + + drivers/scsi/virtio_scsi.c | 6 + + drivers/virtio/Kconfig | 24 +- + drivers/virtio/Makefile | 3 +- + drivers/virtio/virtio_balloon.c | 9 +- + drivers/virtio/virtio_pci_common.c | 98 ++++- + drivers/virtio/virtio_pci_common.h | 43 ++- + drivers/virtio/virtio_pci_legacy.c | 76 +--- + drivers/virtio/virtio_pci_modern.c | 706 ++++++++++++++++++++++++++++++++++ + drivers/virtio/virtio_ring.c | 3 +- + include/asm-generic/pci_iomap.h | 10 + + include/uapi/linux/virtio_balloon.h | 3 +- + include/uapi/linux/virtio_pci.h | 94 ++++- + lib/pci_iomap.c | 35 +- + net/9p/trans_virtio.c | 6 + + 21 files changed, 1071 insertions(+), 140 deletions(-) + delete mode 100644 arch/mn10300/unit-asb2305/pci-iomap.c + create mode 100644 drivers/virtio/virtio_pci_modern.c +Merging remoteproc/for-next (9a3c4145af32 Linux 3.16-rc6) +$ git merge remoteproc/for-next +Already up-to-date. +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 (00380f987010 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging drivers/gpio/gpio-grgpio.c +Auto-merging drivers/gpio/gpio-dln2.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-max732x.txt | 59 +++++ + drivers/gpio/Kconfig | 19 +- + drivers/gpio/gpio-amd8111.c | 5 + + drivers/gpio/gpio-crystalcove.c | 2 +- + drivers/gpio/gpio-dln2.c | 1 + + drivers/gpio/gpio-dwapb.c | 53 +--- + drivers/gpio/gpio-grgpio.c | 2 +- + drivers/gpio/gpio-max732x.c | 174 +++++++++---- + drivers/gpio/gpio-moxart.c | 101 +++----- + drivers/gpio/gpio-mvebu.c | 100 +++++--- + drivers/gpio/gpio-rcar.c | 75 ++---- + drivers/gpio/gpio-sch.c | 6 + + drivers/gpio/gpio-sx150x.c | 231 +++++++++-------- + drivers/gpio/gpio-tc3589x.c | 15 +- + drivers/gpio/gpio-tz1090.c | 2 +- + drivers/gpio/gpio-vf610.c | 1 - + drivers/gpio/gpio-vx855.c | 44 +--- + drivers/gpio/gpio-xilinx.c | 284 ++++++++++++--------- + drivers/gpio/gpiolib-of.c | 27 +- + drivers/gpio/gpiolib-sysfs.c | 92 ++++--- + drivers/gpio/gpiolib.c | 60 ++--- + drivers/gpio/gpiolib.h | 1 + + include/linux/gpio/consumer.h | 17 +- + include/linux/mfd/tc3589x.h | 12 - + include/linux/of_gpio.h | 1 + + 25 files changed, 765 insertions(+), 619 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-max732x.txt +Merging dma-mapping/dma-mapping-next (dda02fd6278d mm, cma: make parameters order consistent in func declaration and definition) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (39e046f2c1dd pwm: atmel-hlcdc: add at91sam9x5 and sama5d3 errata handling) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (101e31050bf1 dma-buf/fence: Fix one more kerneldoc warning) +$ git merge dma-buf/for-next +Merge made by the 'recursive' strategy. +Merging userns/for-next (db86da7cb76f userns: Unbreak the unprivileged remount tests) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (17150fef4ab1 ktest: Add back "tail -1" to kernelrelease make) +$ git merge ktest/for-next +Already up-to-date. +Merging signal/for-next (20b4fb485227 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge signal/for-next +Already up-to-date. +Merging clk/clk-next (d6643da05e39 clk: Skip fetching index for single parent clocks) +$ git merge clk/clk-next +Auto-merging drivers/clk/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/ti,cdce706.txt | 42 ++ + MAINTAINERS | 5 + + arch/powerpc/kernel/time.c | 5 + + arch/powerpc/platforms/512x/clock-commonclk.c | 11 +- + drivers/clk/Kconfig | 8 + + drivers/clk/Makefile | 2 + + drivers/clk/clk-asm9260.c | 359 +++++++++++ + drivers/clk/clk-cdce706.c | 700 +++++++++++++++++++++ + drivers/clk/clk-divider.c | 16 + + drivers/clk/clk-gate.c | 18 +- + drivers/clk/clk-mux.c | 16 + + drivers/clk/clk-ppc-corenet.c | 43 +- + drivers/clk/clk.c | 2 +- + drivers/clk/samsung/clk-exynos-audss.c | 32 +- + include/dt-bindings/clock/alphascale,asm9260.h | 97 +++ + include/linux/clk-provider.h | 4 + + 16 files changed, 1305 insertions(+), 55 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/ti,cdce706.txt + create mode 100644 drivers/clk/clk-asm9260.c + create mode 100644 drivers/clk/clk-cdce706.c + create mode 100644 include/dt-bindings/clock/alphascale,asm9260.h +Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) +$ git merge random/dev +Already up-to-date. +Merging lzo-update/lzo-update (42b775abafaf lib/lzo: huge LZO decompression speedup on ARM by using unaligned access) +$ git merge lzo-update/lzo-update +Auto-merging lib/lzo/lzo1x_decompress_safe.c +Merge made by the 'recursive' strategy. + lib/lzo/lzo1x_decompress_safe.c | 4 ++++ + lib/lzo/lzodefs.h | 6 ++++++ + 2 files changed, 10 insertions(+) +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 documentation/for-next (0415447aa3b4 Documentation: fix broken v4l-utils URL) +$ git merge documentation/for-next +Already up-to-date. +Merging kselftest/next (97bf6af1f928 Linux 3.19-rc1) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (45446a99cef6 staging: media: lirc: Replace timeval with ktime_t in lirc_parallel.c) +$ git merge y2038/y2038 +Resolved 'drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c' using previous resolution. +Resolved 'drivers/staging/ft1000/ft1000-usb/ft1000_debug.c' using previous resolution. +Resolved 'drivers/staging/media/lirc/lirc_sasem.c' using previous resolution. +Auto-merging kernel/cpuset.c +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +CONFLICT (content): Merge conflict in drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/media/lirc/lirc_parallel.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_hw.c +Auto-merging drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-usb/ft1000_debug.c +Auto-merging drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +CONFLICT (content): Merge conflict in drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 97aaada665e7] Merge remote-tracking branch 'y2038/y2038' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c | 6 +-- + drivers/staging/ft1000/ft1000-usb/ft1000_debug.c | 6 +-- + drivers/staging/ft1000/ft1000-usb/ft1000_hw.c | 6 +-- + 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 ++++++++---------------- + kernel/cpuset.c | 12 ++++-- + 10 files changed, 69 insertions(+), 87 deletions(-) +Merging luto-misc/next (d4812e169de4 x86, mce: Get rid of TIF_MCE_NOTIFY and associated mce tricks) +$ git merge luto-misc/next +Recorded preimage for 'arch/x86/kernel/cpu/mcheck/mce.c' +Auto-merging arch/x86/kernel/entry_64.S +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/mcheck/mce.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kernel/cpu/mcheck/mce.c'. +[master c6d4ca14d182] Merge remote-tracking branch 'luto-misc/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/x86/entry_64.txt | 18 ++++-- + Documentation/x86/x86_64/kernel-stacks | 8 ++- + arch/x86/include/asm/mce.h | 1 - + arch/x86/include/asm/thread_info.h | 15 ++++- + arch/x86/include/asm/traps.h | 6 ++ + arch/x86/kernel/cpu/mcheck/mce.c | 114 +++++++++------------------------ + arch/x86/kernel/cpu/mcheck/p5.c | 6 ++ + arch/x86/kernel/cpu/mcheck/winchip.c | 5 ++ + arch/x86/kernel/entry_64.S | 86 +++++++++++++------------ + arch/x86/kernel/irq_32.c | 13 +--- + arch/x86/kernel/signal.c | 6 -- + arch/x86/kernel/traps.c | 108 ++++++++++++++++++++++++------- + 12 files changed, 208 insertions(+), 178 deletions(-) +Merging access_once/linux-next (1d513bde0145 kernel: Fix sparse warning for ACCESS_ONCE) +$ git merge access_once/linux-next +Auto-merging include/linux/compiler.h +Auto-merging arch/x86/xen/p2m.c +Merge made by the 'recursive' strategy. + arch/powerpc/kvm/book3s_hv_rm_xics.c | 8 ++++---- + arch/powerpc/kvm/book3s_xics.c | 16 ++++++++-------- + arch/powerpc/mm/hugetlbpage.c | 4 ++-- + arch/sh/mm/gup.c | 2 +- + arch/x86/include/asm/spinlock.h | 4 ++-- + arch/x86/xen/p2m.c | 2 +- + include/linux/compiler.h | 21 ++++++++++++++++----- + mm/gup.c | 2 +- + 8 files changed, 35 insertions(+), 24 deletions(-) +Merging livepatching/for-next (99590ba565a2 livepatch: fix deferred module patching order) +$ git merge livepatching/for-next +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-kernel-livepatch | 44 ++ + Documentation/oops-tracing.txt | 2 + + Documentation/sysctl/kernel.txt | 1 + + MAINTAINERS | 15 + + arch/x86/Kconfig | 3 + + arch/x86/include/asm/livepatch.h | 46 ++ + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/livepatch.c | 90 +++ + include/linux/kernel.h | 1 + + include/linux/livepatch.h | 133 ++++ + kernel/Makefile | 1 + + kernel/livepatch/Kconfig | 18 + + kernel/livepatch/Makefile | 3 + + kernel/livepatch/core.c | 937 +++++++++++++++++++++++ + kernel/panic.c | 2 + + samples/Kconfig | 7 + + samples/Makefile | 2 +- + samples/livepatch/Makefile | 1 + + samples/livepatch/livepatch-sample.c | 91 +++ + 19 files changed, 1397 insertions(+), 1 deletion(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-livepatch + create mode 100644 arch/x86/include/asm/livepatch.h + create mode 100644 arch/x86/kernel/livepatch.c + create mode 100644 include/linux/livepatch.h + create mode 100644 kernel/livepatch/Kconfig + create mode 100644 kernel/livepatch/Makefile + create mode 100644 kernel/livepatch/core.c + create mode 100644 samples/livepatch/Makefile + create mode 100644 samples/livepatch/livepatch-sample.c +Merging akpm-current/current (16cfffc93532 ipc,sem: use current->state helpers) +$ git merge --no-ff akpm-current/current +Auto-merging mm/gup.c +Removing mm/fremap.c +Auto-merging mm/Kconfig +Auto-merging lib/string.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging init/Kconfig +Auto-merging include/linux/types.h +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_qm.c +Auto-merging fs/nfs/write.c +Auto-merging fs/inode.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/dcache.c +Auto-merging fs/cifs/file.c +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/input/input.c +Auto-merging drivers/clk/clk.c +Removing arch/x86/tools/calc_run_size.pl +Auto-merging arch/x86/kernel/signal.c +Auto-merging arch/x86/include/asm/thread_info.h +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/microblaze/kernel/signal.c +Auto-merging arch/arm64/kernel/signal32.c +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +Merge made by the 'recursive' strategy. + Documentation/cachetlb.txt | 8 +- + Documentation/cgroups/unified-hierarchy.txt | 80 ++ + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + + .../devicetree/bindings/rtc/isil,isl12057.txt | 78 ++ + .../devicetree/bindings/rtc/nxp,rtc-2123.txt | 16 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/filesystems/fiemap.txt | 3 +- + Documentation/filesystems/ocfs2.txt | 4 + + Documentation/filesystems/proc.txt | 4 + + Documentation/filesystems/vfat.txt | 10 + + Documentation/leds/leds-class.txt | 3 - + Documentation/printk-formats.txt | 6 + + Documentation/sysctl/vm.txt | 12 +- + Documentation/vm/cleancache.txt | 2 +- + Documentation/vm/pagemap.txt | 8 + + Documentation/vm/remap_file_pages.txt | 7 +- + arch/alpha/include/asm/pgtable.h | 7 - + arch/alpha/include/asm/thread_info.h | 5 - + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/alpha/kernel/signal.c | 2 +- + arch/arc/include/asm/pgtable.h | 13 +- + arch/arc/include/asm/thread_info.h | 4 - + arch/arc/kernel/signal.c | 2 +- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 1 + + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 1 + + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 1 + + arch/arm/include/asm/pgtable-2level.h | 1 - + arch/arm/include/asm/pgtable-3level.h | 2 +- + arch/arm/include/asm/pgtable-nommu.h | 2 - + arch/arm/include/asm/pgtable.h | 20 +- + arch/arm/include/asm/thread_info.h | 4 - + arch/arm/kernel/signal.c | 4 +- + arch/arm/mm/hugetlbpage.c | 6 - + arch/arm/mm/proc-macros.S | 2 +- + arch/arm64/include/asm/pgtable.h | 24 +- + arch/arm64/include/asm/thread_info.h | 4 - + arch/arm64/kernel/signal.c | 2 +- + arch/arm64/kernel/signal32.c | 4 +- + arch/arm64/mm/hugetlbpage.c | 6 - + arch/avr32/include/asm/pgtable.h | 25 - + arch/avr32/include/asm/thread_info.h | 4 - + arch/avr32/kernel/asm-offsets.c | 1 - + arch/avr32/kernel/signal.c | 2 +- + arch/blackfin/include/asm/pgtable.h | 5 - + arch/blackfin/include/asm/thread_info.h | 4 - + arch/blackfin/kernel/signal.c | 2 +- + arch/c6x/include/asm/pgtable.h | 5 - + arch/c6x/include/asm/thread_info.h | 4 - + arch/c6x/kernel/signal.c | 2 +- + arch/cris/arch-v10/kernel/signal.c | 2 +- + arch/cris/arch-v32/kernel/signal.c | 2 +- + arch/cris/include/arch-v10/arch/mmu.h | 3 - + arch/cris/include/arch-v32/arch/mmu.h | 3 - + arch/cris/include/asm/pgtable.h | 4 - + arch/cris/include/asm/thread_info.h | 4 - + arch/frv/include/asm/pgtable.h | 27 +- + arch/frv/include/asm/string.h | 1 - + arch/frv/include/asm/thread_info.h | 4 - + arch/frv/kernel/asm-offsets.c | 1 - + arch/frv/kernel/signal.c | 2 +- + arch/frv/mm/extable.c | 23 - + arch/hexagon/include/asm/pgtable.h | 60 +- + arch/hexagon/include/asm/thread_info.h | 4 - + arch/hexagon/kernel/signal.c | 2 +- + arch/ia64/include/asm/pgtable.h | 25 +- + arch/ia64/include/asm/thread_info.h | 4 - + arch/ia64/kernel/signal.c | 2 +- + arch/ia64/mm/hugetlbpage.c | 6 - + arch/m32r/include/asm/pgtable-2level.h | 4 - + arch/m32r/include/asm/pgtable.h | 11 - + arch/m32r/include/asm/thread_info.h | 5 - + arch/m32r/kernel/signal.c | 2 +- + arch/m68k/include/asm/mcf_pgtable.h | 23 +- + arch/m68k/include/asm/motorola_pgtable.h | 15 - + arch/m68k/include/asm/pgtable_no.h | 2 - + arch/m68k/include/asm/sun3_pgtable.h | 15 - + arch/m68k/include/asm/thread_info.h | 4 - + arch/m68k/kernel/signal.c | 4 +- + arch/metag/include/asm/pgtable.h | 6 - + arch/metag/include/asm/thread_info.h | 6 +- + arch/metag/kernel/signal.c | 2 +- + arch/metag/mm/hugetlbpage.c | 6 - + arch/microblaze/include/asm/pgtable.h | 11 - + arch/microblaze/include/asm/thread_info.h | 4 - + arch/microblaze/kernel/signal.c | 2 +- + arch/mips/include/asm/pgtable-32.h | 36 - + arch/mips/include/asm/pgtable-64.h | 9 - + arch/mips/include/asm/pgtable-bits.h | 9 - + arch/mips/include/asm/pgtable.h | 2 - + arch/mips/include/asm/thread_info.h | 4 - + arch/mips/include/uapi/asm/mman.h | 1 + + arch/mips/kernel/asm-offsets.c | 1 - + arch/mips/kernel/signal.c | 2 +- + arch/mips/kernel/signal32.c | 2 +- + arch/mips/mm/hugetlbpage.c | 18 - + arch/mn10300/include/asm/pgtable.h | 17 +- + arch/mn10300/include/asm/thread_info.h | 4 - + arch/mn10300/kernel/asm-offsets.c | 1 - + arch/mn10300/kernel/signal.c | 2 +- + arch/nios2/include/asm/pgtable-bits.h | 1 - + arch/nios2/include/asm/pgtable.h | 10 +- + arch/openrisc/include/asm/pgtable.h | 8 - + arch/openrisc/include/asm/thread_info.h | 4 - + arch/openrisc/kernel/head.S | 5 - + arch/openrisc/kernel/signal.c | 2 +- + arch/parisc/include/asm/pgtable.h | 10 - + arch/parisc/include/asm/thread_info.h | 4 - + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/parisc/kernel/signal.c | 2 +- + arch/powerpc/include/asm/pgtable-ppc32.h | 9 +- + arch/powerpc/include/asm/pgtable-ppc64.h | 7 +- + arch/powerpc/include/asm/pgtable.h | 55 +- + arch/powerpc/include/asm/pte-40x.h | 1 - + arch/powerpc/include/asm/pte-44x.h | 5 - + arch/powerpc/include/asm/pte-8xx.h | 1 - + arch/powerpc/include/asm/pte-book3e.h | 1 - + arch/powerpc/include/asm/pte-common.h | 5 - + arch/powerpc/include/asm/pte-fsl-booke.h | 3 - + arch/powerpc/include/asm/pte-hash32.h | 1 - + arch/powerpc/include/asm/pte-hash64.h | 7 - + arch/powerpc/include/asm/thread_info.h | 4 - + arch/powerpc/kernel/machine_kexec_64.c | 2 - + arch/powerpc/kernel/signal_32.c | 4 +- + arch/powerpc/kernel/signal_64.c | 2 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 +- + arch/powerpc/mm/copro_fault.c | 8 +- + arch/powerpc/mm/fault.c | 25 +- + arch/powerpc/mm/hugetlbpage.c | 8 + + arch/powerpc/mm/pgtable.c | 11 +- + arch/powerpc/mm/pgtable_64.c | 5 +- + arch/s390/include/asm/pgtable.h | 29 +- + arch/s390/include/asm/string.h | 1 - + arch/s390/include/asm/thread_info.h | 4 - + arch/s390/kernel/compat_signal.c | 2 +- + arch/s390/kernel/signal.c | 2 +- + arch/s390/mm/hugetlbpage.c | 20 - + arch/score/include/asm/pgtable-bits.h | 1 - + arch/score/include/asm/pgtable.h | 18 +- + arch/score/include/asm/thread_info.h | 4 - + arch/score/kernel/asm-offsets.c | 1 - + arch/score/kernel/signal.c | 2 +- + arch/sh/Kconfig | 2 +- + arch/sh/include/asm/pgtable_32.h | 30 +- + arch/sh/include/asm/pgtable_64.h | 9 +- + arch/sh/include/asm/thread_info.h | 4 - + arch/sh/kernel/asm-offsets.c | 1 - + arch/sh/kernel/signal_32.c | 4 +- + arch/sh/kernel/signal_64.c | 4 +- + arch/sh/mm/hugetlbpage.c | 12 - + arch/sparc/include/asm/pgtable_32.h | 24 - + arch/sparc/include/asm/pgtable_64.h | 49 +- + arch/sparc/include/asm/pgtsrmmu.h | 14 +- + arch/sparc/include/asm/thread_info_32.h | 6 - + arch/sparc/include/asm/thread_info_64.h | 12 +- + arch/sparc/kernel/signal32.c | 4 +- + arch/sparc/kernel/signal_32.c | 2 +- + arch/sparc/kernel/signal_64.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 - + arch/sparc/mm/hugetlbpage.c | 12 - + arch/tile/include/asm/pgtable.h | 11 - + arch/tile/include/asm/thread_info.h | 4 - + arch/tile/kernel/signal.c | 2 +- + arch/tile/mm/homecache.c | 4 - + arch/tile/mm/hugetlbpage.c | 28 - + arch/um/include/asm/pgtable-2level.h | 9 - + arch/um/include/asm/pgtable-3level.h | 20 - + arch/um/include/asm/pgtable.h | 9 - + arch/um/include/asm/thread_info.h | 4 - + arch/unicore32/include/asm/pgtable-hwdef.h | 1 - + arch/unicore32/include/asm/pgtable.h | 14 - + arch/unicore32/include/asm/thread_info.h | 4 - + arch/unicore32/kernel/signal.c | 2 +- + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/ia32/ia32_signal.c | 2 +- + arch/x86/include/asm/pgtable-2level.h | 38 +- + arch/x86/include/asm/pgtable-3level.h | 12 - + arch/x86/include/asm/pgtable.h | 71 +- + arch/x86/include/asm/pgtable_64.h | 11 +- + arch/x86/include/asm/pgtable_types.h | 44 +- + arch/x86/include/asm/thread_info.h | 4 - + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/signal.c | 2 +- + arch/x86/mm/gup.c | 6 +- + arch/x86/mm/hugetlbpage.c | 20 +- + arch/x86/mm/pgtable.c | 13 +- + arch/x86/tools/calc_run_size.pl | 39 - + arch/x86/tools/calc_run_size.sh | 42 + + arch/x86/um/signal.c | 2 +- + arch/xtensa/include/asm/pgtable.h | 10 - + arch/xtensa/include/asm/thread_info.h | 5 - + arch/xtensa/include/uapi/asm/mman.h | 1 + + arch/xtensa/kernel/signal.c | 2 +- + block/genhd.c | 2 +- + drivers/block/zram/zram_drv.c | 22 +- + drivers/clk/clk.c | 12 +- + drivers/gpu/drm/drm_vma_manager.c | 3 +- + drivers/input/Kconfig | 9 + + drivers/input/Makefile | 3 + + drivers/input/input.c | 9 + + drivers/input/leds.c | 272 +++++ + drivers/leds/Kconfig | 3 - + drivers/rtc/Kconfig | 11 + + drivers/rtc/Makefile | 1 + + drivers/rtc/class.c | 24 + + drivers/rtc/interface.c | 13 +- + drivers/rtc/rtc-ab-b5ze-s3.c | 1035 ++++++++++++++++++++ + drivers/rtc/rtc-at91sam9.c | 2 +- + drivers/rtc/rtc-imxdi.c | 50 +- + drivers/rtc/rtc-isl12057.c | 348 ++++++- + drivers/rtc/rtc-pcf2123.c | 10 + + drivers/rtc/rtc-rk808.c | 10 +- + drivers/staging/android/lowmemorykiller.c | 7 +- + .../lustre/include/linux/lustre_patchless_compat.h | 1 - + drivers/tty/Kconfig | 4 + + drivers/tty/sysrq.c | 23 +- + drivers/tty/vt/keyboard.c | 110 ++- + fs/9p/vfs_file.c | 2 - + fs/affs/amigaffs.c | 6 +- + fs/affs/dir.c | 8 +- + fs/affs/file.c | 49 +- + fs/affs/inode.c | 5 +- + fs/affs/namei.c | 18 +- + fs/affs/super.c | 1 + + fs/befs/linuxvfs.c | 6 +- + fs/btrfs/extent_io.c | 2 +- + fs/btrfs/file.c | 1 - + fs/buffer.c | 4 +- + fs/ceph/addr.c | 1 - + fs/cifs/file.c | 1 - + fs/coda/dir.c | 138 ++- + fs/dcache.c | 14 +- + fs/drop_caches.c | 14 - + fs/eventfd.c | 11 +- + fs/ext4/file.c | 1 - + fs/ext4/fsync.c | 5 +- + fs/f2fs/file.c | 1 - + fs/fat/cache.c | 79 +- + fs/fat/dir.c | 2 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 61 ++ + fs/fat/inode.c | 77 +- + fs/fuse/file.c | 1 - + fs/gfs2/file.c | 1 - + fs/gfs2/quota.c | 6 +- + fs/hugetlbfs/inode.c | 2 +- + fs/inode.c | 8 +- + fs/internal.h | 7 +- + fs/ioctl.c | 5 + + fs/jffs2/scan.c | 5 + + fs/kernfs/dir.c | 24 +- + fs/kernfs/file.c | 4 - + fs/mpage.c | 23 +- + fs/namespace.c | 6 +- + fs/nfs/file.c | 1 - + fs/nfs/write.c | 5 - + fs/nilfs2/file.c | 1 - + fs/notify/fanotify/fanotify.c | 2 +- + fs/notify/fanotify/fanotify_user.c | 35 +- + fs/ocfs2/acl.c | 14 +- + fs/ocfs2/alloc.c | 18 +- + fs/ocfs2/aops.c | 258 ++++- + fs/ocfs2/cluster/tcp_internal.h | 12 +- + fs/ocfs2/dlm/dlmast.c | 6 +- + fs/ocfs2/dlm/dlmdebug.c | 4 +- + fs/ocfs2/dlm/dlmdomain.c | 14 - + fs/ocfs2/dlm/dlmdomain.h | 1 - + fs/ocfs2/dlm/dlmmaster.c | 10 - + fs/ocfs2/dlm/dlmrecovery.c | 7 + + fs/ocfs2/dlm/dlmthread.c | 10 + + fs/ocfs2/file.c | 110 +-- + fs/ocfs2/file.h | 9 + + fs/ocfs2/inode.h | 2 + + fs/ocfs2/journal.c | 115 ++- + fs/ocfs2/journal.h | 5 + + fs/ocfs2/mmap.c | 1 - + fs/ocfs2/namei.c | 348 +++++++ + fs/ocfs2/namei.h | 5 + + fs/ocfs2/ocfs2.h | 17 + + fs/ocfs2/ocfs2_fs.h | 5 +- + fs/ocfs2/ocfs2_trace.h | 3 + + fs/ocfs2/quota_local.c | 6 - + fs/ocfs2/super.c | 19 + + fs/ocfs2/xattr.c | 10 - + fs/proc/array.c | 34 +- + fs/proc/generic.c | 2 +- + fs/proc/inode.c | 2 +- + fs/proc/page.c | 16 +- + fs/proc/task_mmu.c | 45 +- + fs/proc/vmcore.c | 8 +- + fs/reiserfs/inode.c | 2 +- + fs/select.c | 2 +- + fs/super.c | 47 +- + fs/sysfs/file.c | 2 +- + fs/ubifs/file.c | 1 - + fs/ufs/super.c | 4 +- + fs/xfs/xfs_buf.c | 7 +- + fs/xfs/xfs_file.c | 1 - + fs/xfs/xfs_qm.c | 7 +- + fs/xfs/xfs_super.c | 7 +- + include/asm-generic/pgtable.h | 168 +--- + include/linux/bitmap.h | 52 +- + include/linux/compaction.h | 87 +- + include/linux/cpumask.h | 22 +- + include/linux/crc64_ecma.h | 56 ++ + include/linux/cryptohash.h | 2 + + include/linux/fs.h | 12 +- + include/linux/huge_mm.h | 16 + + include/linux/hugetlb.h | 10 +- + include/linux/init_task.h | 3 + + include/linux/input.h | 28 + + include/linux/kernfs.h | 7 +- + include/linux/kexec.h | 24 +- + include/linux/list_lru.h | 70 +- + include/linux/memcontrol.h | 92 +- + include/linux/migrate.h | 4 - + include/linux/mm.h | 85 +- + include/linux/mm_types.h | 25 +- + include/linux/mmzone.h | 15 +- + include/linux/nodemask.h | 26 +- + include/linux/oom.h | 23 +- + include/linux/page-flags.h | 2 - + include/linux/printk.h | 6 +- + include/linux/rbtree.h | 2 +- + include/linux/rmap.h | 11 +- + include/linux/rtc.h | 4 + + include/linux/sched.h | 2 + + include/linux/shrinker.h | 6 +- + include/linux/slab.h | 7 +- + include/linux/string.h | 7 +- + include/linux/string_helpers.h | 4 +- + include/linux/swap.h | 15 - + include/linux/swapops.h | 8 +- + include/linux/types.h | 5 +- + include/linux/vm_event_item.h | 1 + + include/linux/zpool.h | 5 +- + include/linux/zsmalloc.h | 2 +- + include/trace/events/compaction.h | 207 +++- + include/uapi/asm-generic/mman-common.h | 1 + + include/uapi/linux/kernel-page-flags.h | 1 + + include/uapi/linux/kexec.h | 6 - + include/uapi/linux/mempolicy.h | 2 +- + init/Kconfig | 16 - + init/main.c | 5 - + ipc/sem.c | 2 +- + kernel/cgroup.c | 2 +- + kernel/compat.c | 5 +- + kernel/exit.c | 3 +- + kernel/fork.c | 11 +- + kernel/futex.c | 2 +- + kernel/kexec.c | 23 +- + kernel/power/process.c | 75 +- + kernel/printk/printk.c | 12 +- + kernel/ptrace.c | 1 - + kernel/signal.c | 6 +- + kernel/sysctl.c | 3 - + kernel/time/alarmtimer.c | 2 +- + kernel/time/hrtimer.c | 2 +- + kernel/time/posix-cpu-timers.c | 3 +- + lib/Kconfig | 7 + + lib/Kconfig.debug | 3 + + lib/Makefile | 5 +- + lib/bitmap.c | 138 ++- + lib/crc64_ecma.c | 341 +++++++ + lib/dynamic_queue_limits.c | 4 +- + lib/gen_crc32table.c | 6 +- + lib/genalloc.c | 3 +- + lib/halfmd4.c | 2 +- + lib/hexdump.c | 105 +- + lib/idr.c | 1 - + lib/interval_tree.c | 4 +- + lib/kobject_uevent.c | 1 - + lib/lcm.c | 2 +- + lib/list_sort.c | 7 +- + lib/llist.c | 1 - + lib/md5.c | 2 +- + lib/nlattr.c | 1 - + lib/percpu_ida.c | 3 - + lib/plist.c | 1 - + lib/radix-tree.c | 2 +- + lib/show_mem.c | 1 - + lib/sort.c | 6 +- + lib/stmp_device.c | 3 +- + lib/string.c | 20 +- + lib/string_helpers.c | 26 +- + lib/strncpy_from_user.c | 3 +- + lib/test-hexdump.c | 180 ++++ + lib/vsprintf.c | 32 +- + mm/Kconfig | 10 + + mm/Makefile | 2 +- + mm/cleancache.c | 2 +- + mm/cma.c | 2 +- + mm/compaction.c | 156 ++- + mm/debug.c | 4 +- + mm/filemap.c | 16 +- + mm/fremap.c | 283 ------ + mm/gup.c | 37 +- + mm/huge_memory.c | 92 +- + mm/hugetlb.c | 206 ++-- + mm/hugetlb_cgroup.c | 10 +- + mm/internal.h | 22 + + mm/interval_tree.c | 34 +- + mm/ksm.c | 2 +- + mm/list_lru.c | 412 +++++++- + mm/madvise.c | 163 ++- + mm/memcontrol.c | 938 ++++++++++-------- + mm/memory-failure.c | 11 +- + mm/memory.c | 296 ++---- + mm/memory_hotplug.c | 11 +- + mm/mempolicy.c | 2 +- + mm/migrate.c | 45 +- + mm/mincore.c | 9 +- + mm/mmap.c | 97 +- + mm/mmzone.c | 4 +- + mm/mprotect.c | 50 +- + mm/mremap.c | 2 - + mm/msync.c | 5 +- + mm/nommu.c | 8 - + mm/oom_kill.c | 169 +++- + mm/page-writeback.c | 36 +- + mm/page_alloc.c | 426 ++++---- + mm/page_counter.c | 6 - + mm/page_isolation.c | 7 +- + mm/pgtable-generic.c | 2 - + mm/rmap.c | 283 +----- + mm/shmem.c | 3 +- + mm/slab.h | 4 +- + mm/slab_common.c | 174 ++-- + mm/slub.c | 35 +- + mm/swap.c | 4 +- + mm/truncate.c | 31 - + mm/util.c | 68 ++ + mm/vmscan.c | 235 +++-- + mm/vmstat.c | 125 +-- + mm/workingset.c | 6 +- + mm/zbud.c | 3 +- + mm/zpool.c | 6 +- + mm/zsmalloc.c | 239 ++++- + mm/zswap.c | 5 +- + net/ipv4/tcp_memcontrol.c | 10 +- + scripts/checkpatch.pl | 75 +- + tools/vm/page-types.c | 1 + + 441 files changed, 8000 insertions(+), 4680 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/isil,isl12057.txt + create mode 100644 Documentation/devicetree/bindings/rtc/nxp,rtc-2123.txt + delete mode 100644 arch/x86/tools/calc_run_size.pl + create mode 100644 arch/x86/tools/calc_run_size.sh + create mode 100644 drivers/input/leds.c + create mode 100644 drivers/rtc/rtc-ab-b5ze-s3.c + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 lib/crc64_ecma.c + create mode 100644 lib/test-hexdump.c + delete mode 100644 mm/fremap.c +$ git am -3 ../patches/0001-mm-drop-vm_ops-remap_pages-and-generic_file_remap_pa.patch +Applying: mm: drop vm_ops->remap_pages and generic_file_remap_pages() stub fix +$ 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: drivers/gpio/gpio-zevio.c: fix build +Applying: rtc: isl12022: deprecate use of isl in compatible string for isil +Applying: rtc: isl12057: deprecate use of isl in compatible string for isil +Applying: staging: iio: isl29028: deprecate use of isl in compatible string for isil +Applying: arm: dts: zynq: update isl9305 compatible string to use isil vendor prefix +Applying: MAINTAINERS: add git url entry for UIO +Applying: mm: fix XIP fault vs truncate race +Applying: mm-fix-xip-fault-vs-truncate-race-fix +Applying: mm-fix-xip-fault-vs-truncate-race-fix-fix +Applying: mm: allow page fault handlers to perform the COW +Applying: mm-allow-page-fault-handlers-to-perform-the-cow-fix +Applying: mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix-3 +Applying: mm-allow-page-fault-handlers-to-perform-the-cow-fix-fix +Applying: vfs,ext2: introduce IS_DAX(inode) +Applying: dax,ext2: replace XIP read and write with DAX I/O +Applying: dax,ext2: replace ext2_clear_xip_target with dax_clear_blocks +Applying: dax,ext2: replace the XIP page fault handler with the DAX page fault handler +Using index info to reconstruct a base tree... +M mm/filemap_xip.c +Falling back to patching base and 3-way merge... +Auto-merging mm/filemap_xip.c +CONFLICT (content): Merge conflict in mm/filemap_xip.c +Failed to merge in the changes. +Patch failed at 0018 dax,ext2: replace the XIP page fault handler with the DAX page fault handler +The copy of the patch that failed is found in: + /home/sfr/kernels/next/rebase-tmp/.git/rebase-apply/patch + +When you have resolved this problem, run "git rebase --continue". +If you prefer to skip this patch, run "git rebase --skip" instead. +To check out the original branch and stop rebasing, run "git rebase --abort". + +$ git rebase --continue +Applying: daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix +Applying: daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix-2 +Applying: daxext2-replace-the-xip-page-fault-handler-with-the-dax-page-fault-handler-fix-3 +Applying: dax,ext2: replace xip_truncate_page with dax_truncate_page +Applying: dax: replace XIP documentation with DAX documentation +Applying: vfs: remove get_xip_mem +Applying: ext2: remove ext2_xip_verify_sb() +Applying: ext2: remove ext2_use_xip +Applying: ext2: remove xip.c and xip.h +Applying: vfs,ext2: remove CONFIG_EXT2_FS_XIP and rename CONFIG_FS_XIP to CONFIG_FS_DAX +Applying: ext2: remove ext2_aops_xip +Applying: ext2: get rid of most mentions of XIP in ext2 +Applying: dax: add dax_zero_page_range +Applying: dax-add-dax_zero_page_range-fix +Applying: ext4: add DAX functionality +Applying: ext4-add-dax-functionality-fix +Applying: brd: rename XIP to DAX +Applying: drivers/w1/w1_int.c: call put_device if device_register fails +Applying: mm: add strictlimit knob +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 1d380df042b0...27c52752f63c akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (27c52752f63c mm: add strictlimit knob) +$ git merge --no-ff akpm/master +Removing mm/filemap_xip.c +Removing fs/ext2/xip.h +Removing fs/ext2/xip.c +Removing Documentation/filesystems/xip.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/filesystems/00-INDEX | 5 +- + Documentation/filesystems/Locking | 3 - + Documentation/filesystems/dax.txt | 91 +++++ + Documentation/filesystems/ext2.txt | 5 +- + Documentation/filesystems/ext4.txt | 4 + + Documentation/filesystems/vfs.txt | 7 - + Documentation/filesystems/xip.txt | 71 ---- + MAINTAINERS | 7 + + arch/arm/boot/dts/zynq-parallella.dts | 2 +- + drivers/block/Kconfig | 13 +- + drivers/block/brd.c | 14 +- + drivers/gpio/gpio-zevio.c | 4 + + drivers/rtc/rtc-isl12022.c | 3 +- + drivers/rtc/rtc-isl12057.c | 3 +- + drivers/staging/iio/light/isl29028.c | 4 +- + drivers/w1/w1_int.c | 3 +- + fs/Kconfig | 21 +- + fs/Makefile | 1 + + fs/dax.c | 534 ++++++++++++++++++++++++++++++ + fs/exofs/inode.c | 1 - + fs/ext2/Kconfig | 11 - + fs/ext2/Makefile | 1 - + fs/ext2/ext2.h | 10 +- + fs/ext2/file.c | 44 ++- + fs/ext2/inode.c | 38 ++- + fs/ext2/namei.c | 13 +- + fs/ext2/super.c | 53 ++- + fs/ext2/xip.c | 86 ----- + fs/ext2/xip.h | 26 -- + fs/ext4/ext4.h | 6 + + fs/ext4/file.c | 49 ++- + fs/ext4/indirect.c | 18 +- + fs/ext4/inode.c | 89 +++-- + fs/ext4/namei.c | 10 +- + fs/ext4/super.c | 39 ++- + fs/open.c | 5 +- + include/linux/fs.h | 34 +- + include/linux/mm.h | 1 + + include/linux/rmap.h | 2 +- + mm/Makefile | 1 - + mm/backing-dev.c | 35 ++ + mm/fadvise.c | 6 +- + mm/filemap.c | 25 +- + mm/filemap_xip.c | 477 -------------------------- + mm/madvise.c | 2 +- + mm/memory.c | 42 ++- + scripts/diffconfig | 1 - + 48 files changed, 1071 insertions(+), 857 deletions(-) + create mode 100644 Documentation/filesystems/dax.txt + delete mode 100644 Documentation/filesystems/xip.txt + create mode 100644 fs/dax.c + delete mode 100644 fs/ext2/xip.c + delete mode 100644 fs/ext2/xip.h + delete mode 100644 mm/filemap_xip.c +$ git am -3 ../patches/0001-mm-account-pmd-page-tables-to-the-process-fix.patch +Applying: mm: account pmd page tables to the process fix |