diff options
Diffstat (limited to 'Next/merge.log')
-rw-r--r-- | Next/merge.log | 3525 |
1 files changed, 3525 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..0708ed7a130c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3525 @@ +$ date -R +Fri, 20 Nov 2015 09:09:25 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 34258a32d9a9 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux +Merging origin/master (b4ba1f0f6533 Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux) +$ git merge origin/master +Updating 34258a32d9a9..b4ba1f0f6533 +Fast-forward + MAINTAINERS | 1 - + arch/arm64/crypto/aes-ce-cipher.c | 2 +- + arch/arm64/include/asm/barrier.h | 16 ++++--- + arch/arm64/include/asm/compat.h | 3 +- + arch/arm64/include/asm/dma-mapping.h | 13 ++--- + arch/arm64/include/asm/mmu_context.h | 2 +- + arch/arm64/include/asm/pgtable.h | 1 + + arch/arm64/kernel/cpuinfo.c | 5 ++ + arch/arm64/kernel/efi.c | 14 ++---- + arch/arm64/kernel/suspend.c | 10 ++++ + arch/arm64/mm/dma-mapping.c | 35 +++++++------- + arch/arm64/mm/mmu.c | 14 +++--- + drivers/hid/wacom_wac.c | 5 +- + drivers/mmc/card/block.c | 11 ++--- + drivers/mmc/core/mmc.c | 93 ++++++++++++++++++++++++++---------- + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/mtk-sd.c | 2 +- + drivers/mmc/host/pxamci.c | 2 +- + kernel/livepatch/core.c | 6 +++ + 19 files changed, 145 insertions(+), 91 deletions(-) +Merging fixes/master (25cb62b76430 Linux 4.3-rc5) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (049e6dde7e57 Linux 4.3-rc4) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (28fa99b7645a ARM: wire up mlock2 syscall) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/include/uapi/asm/unistd.h | 1 + + arch/arm/kernel/calls.S | 1 + + 2 files changed, 2 insertions(+) +Merging m68k-current/for-linus (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) +$ git merge mips-fixes/mips-fixes +Already up-to-date. +Merging powerpc-fixes/fixes (1451ad03fac3 powerpc: Wire up sys_mlock2()) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/systbl.h | 1 + + arch/powerpc/include/asm/unistd.h | 2 +- + arch/powerpc/include/uapi/asm/unistd.h | 1 + + 3 files changed, 3 insertions(+), 1 deletion(-) +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (2c302e7e4105 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge sparc/master +Already up-to-date. +Merging net/master (1b8e6a01e19f tcp: md5: fix lockdep annotation) +$ git merge net/master +Merge made by the 'recursive' strategy. + arch/arm64/net/bpf_jit_comp.c | 27 ++++++++++++------------- + drivers/net/ethernet/atheros/alx/main.c | 2 ++ + drivers/net/ethernet/atheros/alx/reg.h | 1 + + drivers/net/ethernet/cadence/macb.c | 4 ++++ + drivers/net/ethernet/cadence/macb.h | 5 +++++ + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 4 +++- + drivers/net/ethernet/renesas/ravb_main.c | 6 ++++-- + drivers/net/usb/qmi_wwan.c | 1 + + drivers/net/wan/hdlc_fr.c | 10 ++++----- + include/linux/dns_resolver.h | 2 +- + net/dns_resolver/dns_query.c | 2 +- + net/ipv4/tcp_ipv4.c | 3 ++- + net/ipv4/udp.c | 1 - + net/ipv6/ip6_tunnel.c | 2 +- + 14 files changed, 43 insertions(+), 27 deletions(-) +Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops) +$ git merge ipsec/master +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/ipv6/xfrm6_policy.c +Auto-merging net/ipv4/xfrm4_policy.c +Merge made by the 'recursive' strategy. + net/ipv4/xfrm4_policy.c | 46 +++++++++++++++++++++++++++++++++--------- + net/ipv6/xfrm6_policy.c | 53 +++++++++++++++++++++++++++++++++++-------------- + net/xfrm/xfrm_policy.c | 38 ----------------------------------- + 3 files changed, 75 insertions(+), 62 deletions(-) +Merging ipvs/master (086f332167d6 netfilter: nf_tables: add clone interface to expression operations) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (eeec5d0ef7ee rtlwifi: rtl8821ae: Fix lockups on boot) +$ git merge wireless-drivers/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/net/wireless/ath/ath10k/core.c | 49 +++++++++++- + drivers/net/wireless/ath/ath10k/core.h | 1 + + drivers/net/wireless/ath/ath10k/hw.h | 17 ++++- + drivers/net/wireless/ath/ath10k/mac.c | 2 +- + drivers/net/wireless/ath/ath10k/pci.c | 53 ++++++++++--- + drivers/net/wireless/iwlwifi/iwl-7000.c | 2 +- + drivers/net/wireless/iwlwifi/iwl-8000.c | 2 +- + drivers/net/wireless/iwlwifi/mvm/d3.c | 8 +- + drivers/net/wireless/iwlwifi/mvm/mac80211.c | 11 ++- + drivers/net/wireless/iwlwifi/mvm/sta.c | 88 ++++++++++++---------- + drivers/net/wireless/iwlwifi/mvm/sta.h | 4 +- + drivers/net/wireless/iwlwifi/pcie/drv.c | 19 ++++- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 2 +- + 15 files changed, 189 insertions(+), 73 deletions(-) +Merging mac80211/master (c2e703a55245 mac80211: mesh: fix call_rcu() usage) +$ git merge mac80211/master +Merge made by the 'recursive' strategy. + net/mac80211/main.c | 3 +-- + net/mac80211/mesh_pathtbl.c | 8 ++++---- + 2 files changed, 5 insertions(+), 6 deletions(-) +Merging sound-current/for-linus (ff9d8859e2d4 ALSA: hda - apply SKL display power request/release patch to BXT) +$ git merge sound-current/for-linus +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'recursive' strategy. + sound/firewire/dice/dice.c | 4 ++++ + sound/pci/hda/hda_intel.c | 7 +++++++ + sound/pci/hda/patch_hdmi.c | 3 ++- + sound/pci/hda/patch_realtek.c | 1 + + sound/usb/midi.c | 46 +++++++++++++++++++++++++++++++++++++++++++ + sound/usb/quirks-table.h | 11 +++++++++++ + sound/usb/quirks.c | 1 + + sound/usb/usbaudio.h | 1 + + 8 files changed, 73 insertions(+), 1 deletion(-) +Merging pci-current/for-linus (8005c49d9aea Linux 4.4-rc1) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (8005c49d9aea Linux 4.4-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (8005c49d9aea Linux 4.4-rc1) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (dad67d5f3d0e xhci: Fix a race in usb2 LPM resume, blocking U3 for usb2 devices) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/imx27.dtsi | 16 +++- + drivers/usb/chipidea/ci_hdrc_imx.c | 142 ++++++++++++++++++++++++++----- + drivers/usb/chipidea/debug.c | 2 + + drivers/usb/chipidea/udc.c | 17 ++++ + drivers/usb/chipidea/usbmisc_imx.c | 10 ++- + drivers/usb/dwc2/hcd.c | 9 +- + drivers/usb/dwc2/platform.c | 3 +- + drivers/usb/dwc3/dwc3-pci.c | 4 + + drivers/usb/dwc3/gadget.c | 24 +++++- + drivers/usb/gadget/function/f_loopback.c | 2 +- + drivers/usb/gadget/udc/atmel_usba_udc.c | 2 +- + drivers/usb/host/xhci-hub.c | 15 ++-- + drivers/usb/host/xhci-ring.c | 32 ++----- + drivers/usb/host/xhci.c | 10 +++ + drivers/usb/musb/musb_core.c | 12 +-- + drivers/usb/musb/musb_host.c | 22 +++-- + drivers/usb/phy/phy-mxs-usb.c | 7 +- + drivers/usb/phy/phy-omap-otg.c | 2 +- + 18 files changed, 247 insertions(+), 84 deletions(-) +Merging usb-gadget-fixes/fixes (d134c48d889d usb: gadget: atmel_usba_udc: Expose correct device speed) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (59536da34513 USB: qcserial: Fix support for HP lt4112 LTE/HSPA+ Gobi 4G Modem) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 2 + + drivers/usb/serial/qcserial.c | 94 +++++++++++++++++++++++++++-------- + drivers/usb/serial/ti_usb_3410_5052.c | 2 + + drivers/usb/serial/ti_usb_3410_5052.h | 4 ++ + 4 files changed, 82 insertions(+), 20 deletions(-) +Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (b57f9f34e27b Revert "Staging: wilc1000: coreconfigurator: Drop unneeded wrapper functions") +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/adc/ad7793.c | 2 +- + drivers/iio/adc/vf610_adc.c | 22 +++++-- + drivers/iio/adc/xilinx-xadc-core.c | 1 + + drivers/iio/dac/ad5064.c | 91 ++++++++++++++++++++--------- + drivers/iio/humidity/si7020.c | 8 +-- + drivers/staging/iio/Kconfig | 3 +- + drivers/staging/iio/adc/lpc32xx_adc.c | 4 +- + drivers/staging/wilc1000/coreconfigurator.c | 48 +++++++-------- + 8 files changed, 115 insertions(+), 64 deletions(-) +Merging char-misc.current/char-misc-linus (8005c49d9aea Linux 4.4-rc1) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (0c6da0733bff Input: parkbd - clear unused function pointers) +$ git merge input-current/for-linus +Auto-merging drivers/input/joystick/walkera0701.c +Merge made by the 'recursive' strategy. + drivers/input/joystick/db9.c | 1 + + drivers/input/joystick/gamecon.c | 1 + + drivers/input/joystick/turbografx.c | 1 + + drivers/input/joystick/walkera0701.c | 1 + + drivers/input/serio/parkbd.c | 1 + + 5 files changed, 5 insertions(+) +Merging crypto-current/master (79960943fdc1 crypto: talitos - Fix timing leak in ESP ICV verification) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + drivers/crypto/nx/nx-aes-ccm.c | 2 +- + drivers/crypto/nx/nx-aes-gcm.c | 3 ++- + drivers/crypto/talitos.c | 2 +- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging ide/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (275d7d44d802 module: Fix locking in symbol_put_addr()) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (4bc94d5dc95d vfio: Fix lockdep issue) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (2ce47b44b25d selftests/seccomp: Get page size from sysconf) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + tools/testing/selftests/futex/README | 2 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 11 +++++++---- + 2 files changed, 8 insertions(+), 5 deletions(-) +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (a53f2afb7e3d drm/i915: Mark uneven memory banks on gen4 desktop as unknown swizzling) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_drv.h | 4 ++ + drivers/gpu/drm/i915/i915_gem.c | 8 +++- + drivers/gpu/drm/i915/i915_gem_fence.c | 36 ++++++++++++----- + drivers/gpu/drm/i915/i915_params.c | 5 +++ + drivers/gpu/drm/i915/intel_crt.c | 31 ++------------- + drivers/gpu/drm/i915/intel_ddi.c | 75 ++++++++++++++++++++++++++++++----- + drivers/gpu/drm/i915/intel_display.c | 37 ++++++++++++----- + drivers/gpu/drm/i915/intel_pm.c | 10 +++-- + 8 files changed, 145 insertions(+), 61 deletions(-) +Merging asm-generic/master (795291732663 asm-generic: page.h: Remove useless get_user_page and free_user_page) +$ git merge asm-generic/master +Merge made by the 'recursive' strategy. + arch/arc/include/asm/page.h | 3 - + arch/arm/include/asm/div64.h | 283 ++++++++---------------- + arch/arm/include/asm/page-nommu.h | 3 - + arch/frv/include/asm/page.h | 3 - + arch/m68k/include/asm/page_mm.h | 3 - + arch/m68k/include/asm/page_no.h | 3 - + arch/openrisc/include/asm/page.h | 3 - + drivers/clk/imx/clk-pllv1.c | 14 +- + drivers/clk/imx/clk-pllv2.c | 9 +- + drivers/clk/tegra/clk-divider.c | 4 +- + drivers/clk/ti/clkt_dpll.c | 4 +- + drivers/clk/ti/fapll.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c | 3 +- + drivers/hid/hid-sensor-hub.c | 3 +- + drivers/mtd/sm_ftl.c | 3 +- + include/asm-generic/div64.h | 178 ++++++++++++++- + include/asm-generic/page.h | 3 - + lib/div64.c | 6 +- + 19 files changed, 298 insertions(+), 236 deletions(-) +Merging arc/for-next (e81b75f7b206 ARC: remove SYNC from __switch_to()) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/configs/axs101_defconfig | 2 +- + arch/arc/configs/axs103_defconfig | 2 +- + arch/arc/configs/axs103_smp_defconfig | 2 +- + arch/arc/configs/nsim_hs_defconfig | 2 +- + arch/arc/configs/nsim_hs_smp_defconfig | 2 +- + arch/arc/configs/nsimosci_hs_defconfig | 2 +- + arch/arc/configs/nsimosci_hs_smp_defconfig | 2 +- + arch/arc/configs/vdk_hs38_defconfig | 2 +- + arch/arc/configs/vdk_hs38_smp_defconfig | 2 +- + arch/arc/include/asm/irqflags-arcv2.h | 3 +++ + arch/arc/include/asm/irqflags-compact.h | 2 ++ + arch/arc/kernel/ctx_sw.c | 2 -- + arch/arc/kernel/ctx_sw_asm.S | 3 --- + arch/arc/kernel/process.c | 9 ++++----- + arch/arc/mm/tlb.c | 4 ++-- + 15 files changed, 20 insertions(+), 21 deletions(-) +Merging arm/for-next (fa6af083e893 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/l2cc.txt | 10 ++++++---- + arch/arm/kernel/entry-v7m.S | 2 +- + arch/arm/mm/cache-l2x0.c | 20 ++++++++++++++++++++ + arch/arm/mm/proc-v7m.S | 14 +++++--------- + 4 files changed, 32 insertions(+), 14 deletions(-) +Merging arm-perf/for-next/perf (8005c49d9aea Linux 4.4-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (851df3dc1113 scpi: hide get_scpi_ops in module from built-in code) +$ git merge arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 5 +- + arch/arm/boot/dts/animeo_ip.dts | 6 +- + arch/arm/boot/dts/at91-foxg20.dts | 2 +- + arch/arm/boot/dts/at91-kizbox.dts | 13 +--- + arch/arm/boot/dts/at91-kizbox2.dts | 6 +- + arch/arm/boot/dts/at91-kizboxmini.dts | 4 +- + arch/arm/boot/dts/at91-qil_a9260.dts | 2 +- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 115 +++++++++++++++++++++++++--- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 2 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 12 +-- + arch/arm/boot/dts/at91-sama5d4ek.dts | 12 +-- + arch/arm/boot/dts/at91rm9200ek.dts | 9 --- + arch/arm/boot/dts/at91sam9261ek.dts | 19 ++--- + arch/arm/boot/dts/at91sam9263ek.dts | 13 +--- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 13 +--- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 13 +--- + arch/arm/boot/dts/at91sam9n12ek.dts | 11 +-- + arch/arm/boot/dts/at91sam9rlek.dts | 13 +--- + arch/arm/boot/dts/at91sam9x5cm.dtsi | 11 --- + arch/arm/boot/dts/sama5d35ek.dts | 2 +- + arch/arm/boot/dts/sama5d4.dtsi | 2 +- + arch/arm/boot/dts/usb_a9260_common.dtsi | 2 +- + arch/arm/boot/dts/usb_a9263.dts | 2 +- + arch/arm/configs/at91_dt_defconfig | 1 - + arch/arm/configs/sama5_defconfig | 1 - + arch/arm/mach-pxa/palm27x.c | 2 +- + arch/arm/mach-pxa/palmtc.c | 2 +- + arch/arm/mach-zx/Kconfig | 2 +- + include/linux/scpi_protocol.h | 2 +- + 29 files changed, 146 insertions(+), 153 deletions(-) +Merging at91/at91-next (f05d836b8770 Merge tag 'at91-fixes' into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging berlin/berlin/for-next (56c56eceb815 Merge branches 'berlin/dt' and 'berlin/doc' into berlin/for-next) +$ git merge berlin/berlin/for-next +Merge made by the 'recursive' strategy. + Documentation/arm/Marvell/README | 22 +++++++++------ + arch/arm/boot/dts/berlin2.dtsi | 21 ++++++++++++++ + arch/arm/boot/dts/berlin2cd.dtsi | 21 ++++++++++++++ + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 1 - + arch/arm/boot/dts/berlin2q.dtsi | 27 ++++++++++++++---- + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 45 +++++++++++++++++++++++++++++- + 7 files changed, 121 insertions(+), 17 deletions(-) +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (f843df81257a Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. + drivers/soc/ti/knav_qmss_queue.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging mvebu/for-next (5442f0eadf28 ARM: dts: Kirkwood: Fix QNAP TS219 power-off) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/kirkwood-ts219.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging omap/for-next (f2a148747f11 Merge branch 'omap-for-v4.3/fixes' into for-next) +$ git merge omap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution. +Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4105e85b0128] Merge remote-tracking branch 'omap-pending/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging qcom/qcom/for-next (deec361815db ARM: dts: msm8974: Add SCM firmware node) +$ git merge qcom/qcom/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 25 + + .../devicetree/bindings/soc/qcom/qcom,smp2p.txt | 104 ++++ + .../devicetree/bindings/soc/qcom/qcom,smsm.txt | 104 ++++ + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 16 +- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 20 +- + .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 436 ++++++++++++++ + arch/arm/boot/dts/qcom-apq8064.dtsi | 104 ++++ + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 199 +++++++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 13 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 4 + + drivers/firmware/qcom_scm-32.c | 82 +++ + drivers/firmware/qcom_scm-64.c | 25 + + drivers/firmware/qcom_scm.c | 271 ++++++++- + drivers/firmware/qcom_scm.h | 12 + + drivers/soc/qcom/Kconfig | 19 + + drivers/soc/qcom/Makefile | 3 + + drivers/soc/qcom/smem_state.c | 201 +++++++ + drivers/soc/qcom/smp2p.c | 578 +++++++++++++++++++ + drivers/soc/qcom/smsm.c | 625 +++++++++++++++++++++ + drivers/tty/serial/Kconfig | 2 +- + include/linux/qcom_scm.h | 6 + + include/linux/soc/qcom/smem_state.h | 18 + + 24 files changed, 2848 insertions(+), 31 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smsm.txt + create mode 100644 arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts + create mode 100644 drivers/soc/qcom/smem_state.c + create mode 100644 drivers/soc/qcom/smp2p.c + create mode 100644 drivers/soc/qcom/smsm.c + create mode 100644 include/linux/soc/qcom/smem_state.h +Merging renesas/next (0c9400fab882 Merge branch 'heads/dt-for-v4.5' into next) +$ git merge renesas/next +Auto-merging arch/arm64/Kconfig.platforms +Removing arch/arm/boot/dts/r8a7791-henninger.dts +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 4 + + MAINTAINERS | 10 +- + arch/arm/boot/dts/Makefile | 1 - + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 2 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7790-lager.dts | 8 +- + arch/arm/boot/dts/r8a7790.dtsi | 12 +- + arch/arm/boot/dts/r8a7791-henninger.dts | 320 --------------------- + arch/arm/boot/dts/r8a7791-koelsch.dts | 55 ++-- + arch/arm/boot/dts/r8a7791-porter.dts | 20 ++ + arch/arm/boot/dts/r8a7791.dtsi | 18 +- + arch/arm/boot/dts/r8a7793-gose.dts | 74 +++++ + arch/arm/boot/dts/r8a7793.dtsi | 294 +++++++++++++++++++ + arch/arm/boot/dts/r8a7794-alt.dts | 125 ++++++++ + arch/arm/boot/dts/r8a7794-silk.dts | 40 +++ + arch/arm/boot/dts/r8a7794.dtsi | 49 +++- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/shmobile_defconfig | 2 +- + arch/arm/mach-shmobile/Kconfig | 10 +- + arch/arm64/Kconfig.platforms | 17 ++ + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/renesas/Makefile | 4 + + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 62 ++++ + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 173 +++++++++++ + arch/arm64/configs/defconfig | 5 + + drivers/sh/pm_runtime.c | 2 +- + include/dt-bindings/clock/r8a7794-clock.h | 1 + + 28 files changed, 922 insertions(+), 393 deletions(-) + delete mode 100644 arch/arm/boot/dts/r8a7791-henninger.dts + create mode 100644 arch/arm64/boot/dts/renesas/Makefile + create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a7795.dtsi +Merging rockchip/for-next (78a6e39eae9b Merge branch 'v4.5-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 4 +++ + arch/arm/boot/dts/rk3288.dtsi | 11 +++++-- + arch/arm/boot/dts/rk3xxx.dtsi | 1 + + arch/arm/mach-rockchip/platsmp.c | 45 +++++++++++++++++++------- + arch/arm/mach-rockchip/rockchip.c | 44 +++++++++++++++---------- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 1 + + 7 files changed, 76 insertions(+), 31 deletions(-) +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (8005c49d9aea Linux 4.4-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (81b0782f32e7 Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'recursive' strategy. + .../bindings/display/exynos/exynos_hdmi.txt | 7 +- + .../bindings/pinctrl/samsung-pinctrl.txt | 1 + + arch/arm/boot/dts/exynos4.dtsi | 18 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 8 + + arch/arm/boot/dts/exynos4210.dtsi | 8 + + arch/arm/boot/dts/exynos4412-trats2.dts | 4 + + arch/arm/boot/dts/exynos4x12.dtsi | 4 + + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 6 +- + arch/arm/boot/dts/exynos5250.dtsi | 9 + + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 406 +++++++++++++++++++++ + arch/arm/boot/dts/exynos5410.dtsi | 36 ++ + arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 +- + arch/arm/boot/dts/exynos5420.dtsi | 19 + + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 5 - + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 2 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 2 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 +- + arch/arm/configs/exynos_defconfig | 14 + + arch/arm/configs/multi_v7_defconfig | 15 +- + arch/arm/mach-exynos/pmu.c | 9 +- + arch/arm/mach-exynos/regs-pmu.h | 9 - + arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c | 2 +- + arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | 2 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 282 +++++++++++++- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 7 + + drivers/clk/samsung/clk-exynos4.c | 1 + + drivers/cpufreq/s3c24xx-cpufreq.c | 2 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 103 ++++++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + include/dt-bindings/clock/exynos4.h | 1 + + 31 files changed, 953 insertions(+), 42 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos5410-pinctrl.dtsi +Merging sunxi/sunxi/for-next (7022e5f74246 Merge branch 'sunxi/dt-for-4.4' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (1d1514d79a9a Merge branch for-4.5/defconfig into for-next) +$ git merge tegra/for-next +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/Makefile +Auto-merging arch/arm64/Kconfig.platforms +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 036549cd069f] Merge remote-tracking branch 'tegra/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/nvidia,tegra210-car.txt | 56 + + arch/arm/mach-tegra/Kconfig | 50 - + arch/arm64/Kconfig.platforms | 12 - + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/nvidia/Makefile | 7 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 1130 ++++++++ + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 990 +++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 45 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts | 9 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 9 + + arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 50 + + arch/arm64/boot/dts/nvidia/tegra210-p2571.dts | 1302 +++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi | 1272 +++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 1270 +++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 805 ++++++ + arch/arm64/configs/defconfig | 8 +- + drivers/amba/Kconfig | 2 +- + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-id.h | 75 +- + drivers/clk/tegra/clk-pll.c | 768 +++++- + drivers/clk/tegra/clk-tegra-periph.c | 371 ++- + drivers/clk/tegra/clk-tegra-super-gen4.c | 142 +- + drivers/clk/tegra/clk-tegra114.c | 331 +-- + drivers/clk/tegra/clk-tegra124.c | 443 +-- + drivers/clk/tegra/clk-tegra20.c | 308 ++- + drivers/clk/tegra/clk-tegra210.c | 2847 ++++++++++++++++++++ + drivers/clk/tegra/clk-tegra30.c | 419 +-- + drivers/clk/tegra/clk.h | 99 +- + drivers/mmc/host/sdhci-tegra.c | 23 +- + drivers/soc/Kconfig | 1 + + drivers/soc/tegra/Kconfig | 87 + + include/dt-bindings/clock/tegra210-car.h | 401 +++ + 32 files changed, 12381 insertions(+), 953 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra210-car.txt + create mode 100644 arch/arm64/boot/dts/nvidia/Makefile + create mode 100644 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra132.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2571.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210.dtsi + create mode 100644 drivers/clk/tegra/clk-tegra210.c + create mode 100644 drivers/soc/tegra/Kconfig + create mode 100644 include/dt-bindings/clock/tegra210-car.h +Merging arm64/for-next/core (01b305a23494 arm64: suspend: make hw_breakpoint_restore static) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Removing arch/c6x/include/asm/clkdev.h +Auto-merging arch/c6x/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/c6x/include/asm/Kbuild | 1 + + arch/c6x/include/asm/clkdev.h | 22 ---------------------- + 2 files changed, 1 insertion(+), 22 deletions(-) + delete mode 100644 arch/c6x/include/asm/clkdev.h +Merging cris/for-next (918fc2ee791e cris: Drop reference to get_cmos_time()) +$ git merge cris/for-next +Merge made by the 'recursive' strategy. +Merging h8300/h8300-next (2a9c83986221 h8300: zImage alignment fix) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + arch/h8300/boot/compressed/vmlinux.lds | 1 + + 1 file changed, 1 insertion(+) +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted()) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (bab84fa9cc09 m68k/sun3: Use %pM format specifier to print ethernet address) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (8005c49d9aea Linux 4.4-rc1) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (f23d0e2468bc MAINTAINERS: Change Meta arch port status to Odd Fixes) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (4b58ce41dcd3 Merge branch '4.4-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/include/asm/page.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging nios2/for-next (bb3fc5ddef93 nios2: Remove unnecessary #ifdef guards) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (6a13feb9c828 Linux 4.3) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (8005c49d9aea Linux 4.4-rc1) +$ git merge powerpc/next +Already up-to-date. +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (e1f580e8ced5 powerpc/e6500: hw tablewalk: make sure we invalidate and write to the same tlb entry) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (dcd67b9abc55 s390: Delete unnecessary checks before the function call "debug_unregister") +$ git merge s390/features +Merge made by the 'recursive' strategy. + Documentation/s390/zfcpdump.txt | 22 +- + arch/s390/include/asm/elf.h | 2 - + arch/s390/include/asm/fpu/internal.h | 10 +- + arch/s390/include/asm/ipl.h | 14 +- + arch/s390/include/asm/lowcore.h | 21 -- + arch/s390/include/asm/os_info.h | 2 +- + arch/s390/include/asm/pci_dma.h | 2 + + arch/s390/include/asm/reset.h | 3 +- + arch/s390/include/asm/sclp.h | 3 +- + arch/s390/include/asm/smp.h | 2 +- + arch/s390/kernel/asm-offsets.c | 2 +- + arch/s390/kernel/crash_dump.c | 454 +++++++++++++++------------------- + arch/s390/kernel/early.c | 9 + + arch/s390/kernel/ipl.c | 17 +- + arch/s390/kernel/machine_kexec.c | 110 +++++---- + arch/s390/kernel/os_info.c | 7 +- + arch/s390/kernel/reipl.S | 94 +++---- + arch/s390/kernel/setup.c | 17 +- + arch/s390/kernel/smp.c | 143 ++++++----- + arch/s390/kvm/kvm-s390.c | 30 +-- + arch/s390/lib/spinlock.c | 28 ++- + arch/s390/mm/gup.c | 1 + + arch/s390/pci/pci.c | 3 +- + arch/s390/pci/pci_dma.c | 19 +- + drivers/s390/char/Makefile | 4 +- + drivers/s390/char/zcore.c | 461 ++++------------------------------- + drivers/s390/cio/chsc_sch.c | 3 +- + drivers/s390/cio/cio.c | 11 +- + drivers/s390/cio/qdio_debug.c | 6 +- + drivers/s390/crypto/zcrypt_api.c | 6 +- + 30 files changed, 536 insertions(+), 970 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 (09745f38a74e arch/tile: turn off timer tick for oneshot_stopped state) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/Kconfig | 1 + + arch/tile/include/asm/insn.h | 59 +++++++++++++++++++++++++++ + arch/tile/include/asm/jump_label.h | 58 +++++++++++++++++++++++++++ + arch/tile/include/asm/page.h | 10 +++++ + arch/tile/include/asm/processor.h | 2 +- + arch/tile/include/asm/thread_info.h | 8 +++- + arch/tile/kernel/Makefile | 1 + + arch/tile/kernel/ftrace.c | 13 +----- + arch/tile/kernel/intvec_32.S | 46 +++++++-------------- + arch/tile/kernel/intvec_64.S | 49 +++++++---------------- + arch/tile/kernel/jump_label.c | 64 ++++++++++++++++++++++++++++++ + arch/tile/kernel/kgdb.c | 2 +- + arch/tile/kernel/kprobes.c | 4 +- + arch/tile/kernel/process.c | 79 +++++++++++++++++++------------------ + arch/tile/kernel/time.c | 1 + + 15 files changed, 276 insertions(+), 121 deletions(-) + create mode 100644 arch/tile/include/asm/insn.h + create mode 100644 arch/tile/include/asm/jump_label.h + create mode 100644 arch/tile/kernel/jump_label.c +Merging uml/linux-next (2eb5f31bc4ea um: Switch clocksource to hrtimers) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (afaa7c542cc9 Merge tag 'xtensa-for-next-20151109' of git://github.com/jcmvbkbc/linux-xtensa) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (3a9508b0221d btrfs: fix compile when block cgroups are not enabled) +$ git merge btrfs/next +Already up-to-date. +Merging ceph/master (583d0fef756a libceph: clear msg->con in ceph_msg_release() only) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (ccf7202a3486 update signing code) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsglob.h | 8 +++- + fs/cifs/cifsproto.h | 5 ++- + fs/cifs/connect.c | 9 +++-- + fs/cifs/misc.c | 2 +- + fs/cifs/smb2misc.c | 36 ++++++++++++++--- + fs/cifs/smb2ops.c | 13 ++++-- + fs/cifs/smb2pdu.c | 10 ++--- + fs/cifs/smb2pdu.h | 8 ++-- + fs/cifs/smb2proto.h | 3 +- + fs/cifs/smb2transport.c | 102 +++++++++++++++++++++++++++++++++++++++++++++--- + 10 files changed, 161 insertions(+), 35 deletions(-) +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (d4eb6dee4712 ext4: Update EXT4_USE_FOR_EXT2 description) +$ git merge ext3/for_next +Already up-to-date. +Merging ext4/dev (be69e1c19f0e fs/ext4: remove unnecessary new_valid_dev check) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (8005c49d9aea Linux 4.4-rc1) +$ git merge f2fs/dev +Already up-to-date. +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek) +$ git merge fuse/for-next +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/cuse.c | 2 ++ + fs/fuse/file.c | 75 +++++++++++++++++++++++++++++++++++++++++------ + fs/fuse/fuse_i.h | 3 ++ + include/uapi/linux/fuse.h | 17 ++++++++++- + 4 files changed, 87 insertions(+), 10 deletions(-) +Merging gfs2/for-next (3bf1c7de6916 GFS2: Reintroduce a timeout in function gfs2_gl_hash_clear) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/xattr.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 2 +- + fs/gfs2/bmap.c | 13 ++---- + fs/gfs2/dir.c | 15 +++++-- + fs/gfs2/file.c | 29 ++++++------- + fs/gfs2/glock.c | 18 ++++---- + fs/gfs2/glock.h | 26 ++++++------ + fs/gfs2/incore.h | 20 +++++---- + fs/gfs2/inode.c | 28 ++++++------- + fs/gfs2/main.c | 16 +++---- + fs/gfs2/meta_io.c | 82 ++++++++++++++++++++++++++++++++---- + fs/gfs2/meta_io.h | 2 +- + fs/gfs2/ops_fstype.c | 3 +- + fs/gfs2/quota.c | 115 +++++++++++++++++++++++++++++++++------------------ + fs/gfs2/quota.h | 2 + + fs/gfs2/rgrp.c | 62 +++++---------------------- + fs/gfs2/rgrp.h | 4 +- + fs/gfs2/super.c | 15 +++---- + fs/gfs2/util.c | 2 +- + fs/gfs2/util.h | 2 +- + fs/gfs2/xattr.c | 10 ++--- + 20 files changed, 265 insertions(+), 201 deletions(-) +Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (8005c49d9aea Linux 4.4-rc1) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (ee8e8bf3b78e nfsd: don't hold i_mutex over userspace upcalls) +$ git merge nfsd/nfsd-next +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + fs/namei.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/nfsd/nfs3xdr.c | 2 +- + fs/nfsd/nfs4xdr.c | 8 +++--- + fs/nfsd/vfs.c | 23 +++++++--------- + include/linux/namei.h | 1 + + 5 files changed, 89 insertions(+), 19 deletions(-) +Merging orangefs/for-next (555fa0fa618b fs: out of bounds on stack in iov_iter_advance) +$ git merge orangefs/for-next +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++ + Documentation/filesystems/orangefs.txt | 137 +++ + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/orangefs/Kconfig | 6 + + fs/orangefs/Makefile | 10 + + fs/orangefs/acl.c | 175 +++ + fs/orangefs/dcache.c | 142 +++ + fs/orangefs/devpvfs2-req.c | 984 +++++++++++++++ + fs/orangefs/dir.c | 373 ++++++ + fs/orangefs/downcall.h | 133 +++ + fs/orangefs/file.c | 712 +++++++++++ + fs/orangefs/inode.c | 466 ++++++++ + fs/orangefs/namei.c | 446 +++++++ + fs/orangefs/protocol.h | 443 +++++++ + fs/orangefs/pvfs2-bufmap.c | 558 +++++++++ + fs/orangefs/pvfs2-bufmap.h | 62 + + fs/orangefs/pvfs2-cache.c | 246 ++++ + fs/orangefs/pvfs2-debug.h | 292 +++++ + fs/orangefs/pvfs2-debugfs.c | 458 +++++++ + fs/orangefs/pvfs2-debugfs.h | 3 + + fs/orangefs/pvfs2-dev-proto.h | 85 ++ + fs/orangefs/pvfs2-kernel.h | 819 +++++++++++++ + fs/orangefs/pvfs2-mod.c | 315 +++++ + fs/orangefs/pvfs2-sysfs.c | 1787 ++++++++++++++++++++++++++++ + fs/orangefs/pvfs2-sysfs.h | 2 + + fs/orangefs/pvfs2-utils.c | 1156 ++++++++++++++++++ + fs/orangefs/super.c | 541 +++++++++ + fs/orangefs/symlink.c | 31 + + fs/orangefs/upcall.h | 246 ++++ + fs/orangefs/waitqueue.c | 529 ++++++++ + fs/orangefs/xattr.c | 530 +++++++++ + 32 files changed, 11776 insertions(+) + create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs + create mode 100644 Documentation/filesystems/orangefs.txt + create mode 100644 fs/orangefs/Kconfig + create mode 100644 fs/orangefs/Makefile + create mode 100644 fs/orangefs/acl.c + create mode 100644 fs/orangefs/dcache.c + create mode 100644 fs/orangefs/devpvfs2-req.c + create mode 100644 fs/orangefs/dir.c + create mode 100644 fs/orangefs/downcall.h + create mode 100644 fs/orangefs/file.c + create mode 100644 fs/orangefs/inode.c + create mode 100644 fs/orangefs/namei.c + create mode 100644 fs/orangefs/protocol.h + create mode 100644 fs/orangefs/pvfs2-bufmap.c + create mode 100644 fs/orangefs/pvfs2-bufmap.h + create mode 100644 fs/orangefs/pvfs2-cache.c + create mode 100644 fs/orangefs/pvfs2-debug.h + create mode 100644 fs/orangefs/pvfs2-debugfs.c + create mode 100644 fs/orangefs/pvfs2-debugfs.h + create mode 100644 fs/orangefs/pvfs2-dev-proto.h + create mode 100644 fs/orangefs/pvfs2-kernel.h + create mode 100644 fs/orangefs/pvfs2-mod.c + create mode 100644 fs/orangefs/pvfs2-sysfs.c + create mode 100644 fs/orangefs/pvfs2-sysfs.h + create mode 100644 fs/orangefs/pvfs2-utils.c + create mode 100644 fs/orangefs/super.c + create mode 100644 fs/orangefs/symlink.c + create mode 100644 fs/orangefs/upcall.h + create mode 100644 fs/orangefs/waitqueue.c + create mode 100644 fs/orangefs/xattr.c +Merging overlayfs/overlayfs-next (257f87199347 ovl: move super block magic number to magic.h) +$ git merge overlayfs/overlayfs-next +Auto-merging include/uapi/linux/magic.h +Auto-merging fs/overlayfs/super.c +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 41 ++++++++++++++++++++++++++--------------- + fs/overlayfs/inode.c | 23 +++++++++++++++++++++++ + fs/overlayfs/overlayfs.h | 3 +++ + fs/overlayfs/super.c | 30 ++++++++++++++++++++++++++++-- + include/uapi/linux/magic.h | 1 + + 5 files changed, 81 insertions(+), 17 deletions(-) +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (3053600ed4f7 9p: trans_fd, bail out if recv fcall if missing) +$ git merge v9fs/for-next +Merge made by the 'recursive' strategy. + net/9p/trans_fd.c | 88 +++++++++++++++++++++++++++------------------------ + net/9p/trans_virtio.c | 2 +- + 2 files changed, 47 insertions(+), 43 deletions(-) +Merging ubifs/linux-next (8c1c5f263833 ubifs: introduce UBIFS_ATIME_SUPPORT to ubifs) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (4e14e49a91e1 Merge branch 'xfs-misc-fixes-for-4.4-3' into for-next) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (8ace5dfb983e locks: use list_first_entry_or_null()) +$ git merge file-locks/linux-next +Auto-merging fs/Kconfig +Merge made by the 'recursive' strategy. + fs/Kconfig | 10 ++++++++ + fs/locks.c | 12 ++++----- + fs/namespace.c | 10 ++++++++ + include/linux/fs.h | 74 +++++++++++++++++++++++++++++------------------------- + 4 files changed, 66 insertions(+), 40 deletions(-) +Merging vfs/for-next (1a487dec990b f2fs: xattr simplifications) +$ git merge vfs/for-next +Resolved 'fs/xfs/xfs_xattr.c' using previous resolution. +Auto-merging fs/xfs/xfs_xattr.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_xattr.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0744d876d491] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging pci/next (8005c49d9aea Linux 4.4-rc1) +$ git merge pci/next +Already up-to-date. +Merging hid/for-next (7e5c791e8238 Merge branch 'for-4.5/core' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-core.c | 16 ++++--- + drivers/hid/hid-sony.c | 101 +++++++++++++++++++++++++++++++++++------- + drivers/hid/i2c-hid/i2c-hid.c | 1 - + drivers/hid/wacom_sys.c | 3 +- + 4 files changed, 95 insertions(+), 26 deletions(-) +Merging i2c/i2c/for-next (8005c49d9aea Linux 4.4-rc1) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (69bb8a38c5a9 hwmon: (k10temp) Remove duplicate pci-id define) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. +Merging dmi/master (1dc51b828800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge dmi/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (18ed6787d9fd hwmon: (pmbus) Add client driver for LTC3815) +$ git merge hwmon-staging/hwmon-next +Removing drivers/hwmon/htu21.c +Removing Documentation/hwmon/htu21 +Merge made by the 'recursive' strategy. + Documentation/hwmon/htu21 | 46 --------- + Documentation/hwmon/ltc3815 | 61 ++++++++++++ + drivers/hwmon/Kconfig | 10 -- + drivers/hwmon/Makefile | 1 - + drivers/hwmon/htu21.c | 174 ---------------------------------- + drivers/hwmon/pmbus/Kconfig | 10 ++ + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/ltc3815.c | 215 ++++++++++++++++++++++++++++++++++++++++++ + 8 files changed, 287 insertions(+), 231 deletions(-) + delete mode 100644 Documentation/hwmon/htu21 + create mode 100644 Documentation/hwmon/ltc3815 + delete mode 100644 drivers/hwmon/htu21.c + create mode 100644 drivers/hwmon/pmbus/ltc3815.c +Merging v4l-dvb/master (ca79e72cf39c Merge branch 'patchwork' into to_next) +$ git merge v4l-dvb/master +Auto-merging include/media/i2c/tvp5150.h +Auto-merging include/media/i2c/smiapp.h +Auto-merging include/media/i2c/saa7127.h +Auto-merging include/media/i2c/saa7115.h +Auto-merging include/media/i2c/lm3646.h +Auto-merging include/media/i2c/lm3560.h +Auto-merging include/media/i2c/as3645a.h +Auto-merging include/media/i2c/adp1653.h +Auto-merging include/media/drv-intf/si476x.h +Auto-merging include/media/drv-intf/saa7146_vv.h +Auto-merging include/media/drv-intf/msp3400.h +Auto-merging include/linux/platform_data/media/si4713.h +Auto-merging include/linux/platform_data/media/s5p_hdmi.h +Auto-merging include/linux/platform_data/media/gpio-ir-recv.h +Removing include/linux/platform_data/camera-rcar.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/DocBook/device-drivers.tmpl | 84 ++------ + Documentation/DocBook/media/Makefile | 6 +- + Documentation/DocBook/media/v4l/io.xml | 10 +- + Documentation/DocBook/media/v4l/v4l2.xml | 10 + + .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 28 ++- + .../bindings/media/stih407-c8sectpfe.txt | 20 +- + Documentation/video4linux/CARDLIST.em28xx | 4 +- + Documentation/video4linux/omap4_camera.txt | 2 +- + Documentation/video4linux/si4713.txt | 2 +- + MAINTAINERS | 25 +-- + arch/arm/boot/dts/stihxxx-b2120.dtsi | 46 ++++- + arch/arm/mach-davinci/board-da850-evm.c | 4 +- + arch/arm/mach-davinci/board-dm355-evm.c | 2 +- + arch/arm/mach-davinci/board-dm365-evm.c | 4 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 4 +- + arch/arm/mach-imx/devices/devices-common.h | 4 +- + arch/arm/mach-omap1/include/mach/camera.h | 2 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 4 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/ezx.c | 2 +- + arch/arm/mach-pxa/mioa701.c | 2 +- + arch/arm/mach-pxa/palmtreo.c | 2 +- + arch/arm/mach-pxa/palmz72.c | 2 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 4 +- + arch/arm/plat-samsung/devs.c | 2 +- + arch/blackfin/mach-bf561/boards/ezkit.c | 2 +- + arch/blackfin/mach-bf609/boards/ezkit.c | 6 +- + arch/sh/boards/mach-ap325rxa/setup.c | 6 +- + arch/sh/boards/mach-ecovec24/setup.c | 10 +- + arch/sh/boards/mach-kfr2r09/setup.c | 4 +- + arch/sh/boards/mach-migor/setup.c | 6 +- + arch/sh/boards/mach-se/7724/setup.c | 6 +- + drivers/media/common/cx2341x.c | 2 +- + drivers/media/common/saa7146/saa7146_core.c | 2 +- + drivers/media/common/saa7146/saa7146_fops.c | 2 +- + drivers/media/common/saa7146/saa7146_hlp.c | 2 +- + drivers/media/common/saa7146/saa7146_i2c.c | 2 +- + drivers/media/common/saa7146/saa7146_vbi.c | 2 +- + drivers/media/common/saa7146/saa7146_video.c | 2 +- + drivers/media/common/siano/smsir.h | 2 - + drivers/media/dvb-core/demux.h | 67 ++++++- + drivers/media/dvb-core/dvb-usb-ids.h | 1 + + drivers/media/dvb-core/dvb_frontend.c | 27 ++- + drivers/media/dvb-core/dvb_frontend.h | 221 ++++++++++++++++----- + drivers/media/dvb-frontends/si2165.c | 69 ++++--- + drivers/media/dvb-frontends/stb6100.c | 76 ++----- + drivers/media/dvb-frontends/stb6100.h | 1 - + drivers/media/dvb-frontends/stb6100_cfg.h | 37 ++-- + drivers/media/dvb-frontends/stb6100_proc.h | 43 ++-- + drivers/media/dvb-frontends/tda665x.c | 183 ++++++++--------- + drivers/media/dvb-frontends/tda8261.c | 125 +++++------- + drivers/media/dvb-frontends/tda8261_cfg.h | 37 +--- + drivers/media/i2c/ad9389b.c | 2 +- + drivers/media/i2c/adp1653.c | 2 +- + drivers/media/i2c/adv7180.c | 2 +- + drivers/media/i2c/adv7183.c | 2 +- + drivers/media/i2c/adv7343.c | 2 +- + drivers/media/i2c/adv7393.c | 2 +- + drivers/media/i2c/adv7511.c | 4 +- + drivers/media/i2c/adv7604.c | 2 +- + drivers/media/i2c/adv7842.c | 2 +- + drivers/media/i2c/ak881x.c | 2 +- + drivers/media/i2c/as3645a.c | 2 +- + drivers/media/i2c/bt819.c | 2 +- + drivers/media/i2c/cx25840/cx25840-audio.c | 2 +- + drivers/media/i2c/cx25840/cx25840-core.c | 2 +- + drivers/media/i2c/cx25840/cx25840-firmware.c | 2 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 2 +- + drivers/media/i2c/cx25840/cx25840-vbi.c | 2 +- + drivers/media/i2c/ir-kbd-i2c.c | 2 +- + drivers/media/i2c/lm3560.c | 2 +- + drivers/media/i2c/lm3646.c | 2 +- + drivers/media/i2c/m52790.c | 2 +- + drivers/media/i2c/m5mols/m5mols_capture.c | 4 +- + drivers/media/i2c/m5mols/m5mols_core.c | 2 +- + drivers/media/i2c/msp3400-driver.c | 4 +- + drivers/media/i2c/msp3400-driver.h | 2 +- + drivers/media/i2c/msp3400-kthreads.c | 2 +- + drivers/media/i2c/mt9m032.c | 4 +- + drivers/media/i2c/mt9p031.c | 4 +- + drivers/media/i2c/mt9t001.c | 4 +- + drivers/media/i2c/mt9v011.c | 4 +- + drivers/media/i2c/mt9v032.c | 4 +- + drivers/media/i2c/noon010pc30.c | 2 +- + drivers/media/i2c/ov2659.c | 4 +- + drivers/media/i2c/ov7670.c | 2 +- + drivers/media/i2c/ov9650.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 + + drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +- + drivers/media/i2c/s5k4ecgx.c | 2 +- + drivers/media/i2c/s5k6aa.c | 2 +- + drivers/media/i2c/saa6588.c | 2 +- + drivers/media/i2c/saa7115.c | 2 +- + drivers/media/i2c/saa7127.c | 2 +- + drivers/media/i2c/smiapp/smiapp.h | 2 +- + drivers/media/i2c/soc_camera/mt9m001.c | 2 +- + drivers/media/i2c/soc_camera/mt9t112.c | 2 +- + drivers/media/i2c/soc_camera/mt9v022.c | 4 +- + drivers/media/i2c/soc_camera/ov772x.c | 2 +- + drivers/media/i2c/soc_camera/rj54n1cb0c.c | 2 +- + drivers/media/i2c/soc_camera/tw9910.c | 2 +- + drivers/media/i2c/sr030pc30.c | 2 +- + drivers/media/i2c/tc358743.c | 2 +- + drivers/media/i2c/ths7303.c | 2 +- + drivers/media/i2c/tvaudio.c | 2 +- + drivers/media/i2c/tvp514x.c | 2 +- + drivers/media/i2c/tvp5150.c | 2 +- + drivers/media/i2c/tvp7002.c | 2 +- + drivers/media/i2c/uda1342.c | 2 +- + drivers/media/i2c/upd64031a.c | 2 +- + drivers/media/i2c/upd64083.c | 2 +- + drivers/media/i2c/wm8775.c | 2 +- + drivers/media/pci/bt8xx/bttv-cards.c | 2 +- + drivers/media/pci/bt8xx/bttv-driver.c | 6 +- + drivers/media/pci/bt8xx/bttvp.h | 4 +- + drivers/media/pci/cobalt/cobalt-driver.c | 6 +- + drivers/media/pci/cobalt/cobalt-irq.c | 2 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 4 +- + drivers/media/pci/cx18/cx18-cards.c | 2 +- + drivers/media/pci/cx18/cx18-driver.h | 2 +- + drivers/media/pci/cx18/cx23418.h | 2 +- + drivers/media/pci/cx23885/cx23885-417.c | 2 +- + drivers/media/pci/cx23885/cx23885-cards.c | 2 +- + drivers/media/pci/cx23885/cx23885-input.c | 2 +- + drivers/media/pci/cx23885/cx23885-video.c | 2 +- + drivers/media/pci/cx23885/cx23885.h | 2 +- + drivers/media/pci/cx88/cx88-alsa.c | 2 +- + drivers/media/pci/cx88/cx88-blackbird.c | 2 +- + drivers/media/pci/cx88/cx88-video.c | 2 +- + drivers/media/pci/cx88/cx88.h | 6 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 4 +- + drivers/media/pci/ivtv/ivtv-cards.c | 12 +- + drivers/media/pci/ivtv/ivtv-driver.c | 8 +- + drivers/media/pci/ivtv/ivtv-driver.h | 4 +- + drivers/media/pci/ivtv/ivtv-fileops.c | 2 +- + drivers/media/pci/ivtv/ivtv-firmware.c | 2 +- + drivers/media/pci/ivtv/ivtv-i2c.c | 2 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 2 +- + drivers/media/pci/ivtv/ivtv-routing.c | 8 +- + drivers/media/pci/saa7134/saa7134-video.c | 2 +- + drivers/media/pci/saa7134/saa7134.h | 2 +- + drivers/media/pci/saa7146/hexium_gemini.c | 2 +- + drivers/media/pci/saa7146/hexium_orion.c | 2 +- + drivers/media/pci/saa7146/mxb.c | 4 +- + drivers/media/pci/ttpci/av7110.h | 2 +- + drivers/media/pci/ttpci/av7110_av.c | 9 +- + drivers/media/pci/ttpci/av7110_av.h | 3 +- + drivers/media/pci/ttpci/budget-av.c | 2 +- + drivers/media/pci/ttpci/budget.h | 2 +- + drivers/media/pci/zoran/zoran_card.c | 2 +- + drivers/media/platform/Kconfig | 2 +- + drivers/media/platform/coda/coda-common.c | 2 +- + drivers/media/platform/davinci/Kconfig | 6 + + drivers/media/platform/exynos4-is/common.c | 2 +- + drivers/media/platform/exynos4-is/fimc-core.h | 2 +- + drivers/media/platform/exynos4-is/fimc-isp-video.c | 2 +- + drivers/media/platform/exynos4-is/fimc-isp.h | 2 +- + drivers/media/platform/exynos4-is/fimc-lite-reg.c | 2 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 2 +- + drivers/media/platform/exynos4-is/fimc-lite.h | 2 +- + drivers/media/platform/exynos4-is/fimc-reg.c | 2 +- + drivers/media/platform/exynos4-is/media-dev.c | 2 +- + drivers/media/platform/exynos4-is/media-dev.h | 2 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 2 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 2 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +- + drivers/media/platform/omap/omap_vout_vrfb.c | 10 +- + drivers/media/platform/rcar_jpu.c | 13 +- + drivers/media/platform/s3c-camif/camif-core.h | 2 +- + drivers/media/platform/s3c-camif/camif-regs.h | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 2 +- + drivers/media/platform/s5p-tv/hdmi_drv.c | 2 +- + drivers/media/platform/s5p-tv/sii9234_drv.c | 2 +- + drivers/media/platform/sh_vou.c | 2 +- + drivers/media/platform/soc_camera/atmel-isi.c | 164 +++++++++++---- + drivers/media/platform/soc_camera/atmel-isi.h | 10 + + drivers/media/platform/soc_camera/mx2_camera.c | 4 +- + drivers/media/platform/soc_camera/mx3_camera.c | 4 +- + drivers/media/platform/soc_camera/omap1_camera.c | 4 +- + drivers/media/platform/soc_camera/pxa_camera.c | 4 +- + drivers/media/platform/soc_camera/rcar_vin.c | 77 +++---- + .../platform/soc_camera/sh_mobile_ceu_camera.c | 6 +- + drivers/media/platform/soc_camera/sh_mobile_csi2.c | 6 +- + drivers/media/platform/soc_camera/soc_camera.c | 25 +-- + .../platform/soc_camera/soc_camera_platform.c | 2 +- + drivers/media/platform/soc_camera/soc_mediabus.c | 2 +- + .../platform/sti/c8sectpfe/c8sectpfe-common.c | 16 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 2 +- + drivers/media/platform/timblogiw.c | 2 +- + drivers/media/platform/via-camera.c | 2 +- + drivers/media/platform/vivid/vivid-core.h | 1 + + drivers/media/platform/vivid/vivid-ctrls.c | 21 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 10 +- + drivers/media/platform/vivid/vivid-vid-out.c | 9 +- + drivers/media/platform/xilinx/xilinx-tpg.c | 2 + + drivers/media/platform/xilinx/xilinx-vipp.c | 4 +- + drivers/media/radio/radio-maxiradio.c | 2 +- + drivers/media/radio/radio-sf16fmr2.c | 2 +- + drivers/media/radio/radio-shark.c | 2 +- + drivers/media/radio/radio-shark2.c | 2 +- + drivers/media/radio/radio-si476x.c | 2 +- + drivers/media/radio/radio-tea5777.h | 2 +- + drivers/media/radio/radio-timb.c | 2 +- + drivers/media/radio/si4713/radio-usb-si4713.c | 2 +- + drivers/media/radio/si4713/si4713.h | 2 +- + drivers/media/radio/tea575x.c | 2 +- + drivers/media/rc/Kconfig | 3 +- + drivers/media/rc/gpio-ir-recv.c | 24 ++- + drivers/media/rc/ir-jvc-decoder.c | 3 - + drivers/media/rc/ir-mce_kbd-decoder.c | 3 - + drivers/media/rc/ir-nec-decoder.c | 3 - + drivers/media/rc/ir-rc5-decoder.c | 3 - + drivers/media/rc/ir-rc6-decoder.c | 5 - + drivers/media/rc/ir-rx51.c | 2 +- + drivers/media/rc/ir-sanyo-decoder.c | 3 - + drivers/media/rc/ir-sharp-decoder.c | 7 +- + drivers/media/rc/ir-sony-decoder.c | 4 - + drivers/media/rc/ir-xmp-decoder.c | 3 - + drivers/media/rc/nuvoton-cir.c | 156 +++++++-------- + drivers/media/rc/nuvoton-cir.h | 28 +-- + drivers/media/rc/rc-core-priv.h | 64 ------ + drivers/media/rc/rc-ir-raw.c | 31 +-- + drivers/media/rc/rc-main.c | 84 ++++++-- + drivers/media/rc/st_rc.c | 14 +- + drivers/media/rc/streamzap.c | 19 +- + drivers/media/tuners/max2165.c | 2 +- + drivers/media/tuners/mt2063.c | 1 - + drivers/media/tuners/si2157.c | 1 + + drivers/media/usb/airspy/airspy.c | 2 +- + drivers/media/usb/as102/as102_fw.c | 1 + + drivers/media/usb/cpia2/cpia2_usb.c | 3 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 10 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 15 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 8 +- + drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- + drivers/media/usb/cx231xx/cx231xx.h | 4 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c | 4 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h | 4 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 6 +- + drivers/media/usb/em28xx/em28xx-camera.c | 4 +- + drivers/media/usb/em28xx/em28xx-cards.c | 18 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 15 ++ + drivers/media/usb/em28xx/em28xx-video.c | 2 +- + drivers/media/usb/em28xx/em28xx.h | 2 +- + drivers/media/usb/go7007/go7007-usb.c | 6 +- + drivers/media/usb/go7007/go7007-v4l2.c | 2 +- + drivers/media/usb/gspca/ov534.c | 9 +- + drivers/media/usb/gspca/topro.c | 6 +- + drivers/media/usb/hackrf/hackrf.c | 13 +- + drivers/media/usb/hdpvr/hdpvr.h | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-audio.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 16 +- + drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c | 2 +- + drivers/media/usb/stk1160/stk1160-core.c | 2 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 2 +- + drivers/media/usb/tm6000/tm6000-cards.c | 2 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +- + drivers/media/usb/usbvision/usbvision-core.c | 2 +- + drivers/media/usb/usbvision/usbvision-video.c | 25 ++- + drivers/media/usb/uvc/uvc_driver.c | 3 +- + drivers/media/usb/uvc/uvc_v4l2.c | 20 ++ + drivers/media/v4l2-core/v4l2-clk.c | 9 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 6 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 77 ++++--- + drivers/media/v4l2-core/v4l2-device.c | 21 +- + drivers/media/v4l2-core/v4l2-dv-timings.c | 7 + + drivers/media/v4l2-core/v4l2-ioctl.c | 14 +- + drivers/media/v4l2-core/videobuf2-v4l2.c | 8 +- + drivers/mfd/timberdale.c | 4 +- + drivers/staging/media/davinci_vpfe/Kconfig | 2 + + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 5 +- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 2 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 7 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 2 +- + drivers/staging/media/lirc/lirc_imon.c | 2 + + drivers/staging/media/omap4iss/Kconfig | 2 +- + drivers/staging/media/omap4iss/iss.c | 4 +- + drivers/staging/media/omap4iss/iss.h | 2 +- + drivers/staging/media/omap4iss/iss_csi2.c | 6 +- + drivers/staging/media/omap4iss/iss_csiphy.h | 2 +- + drivers/staging/media/omap4iss/iss_resizer.c | 4 +- + include/linux/platform_data/camera-rcar.h | 25 --- + .../linux/platform_data/{ => media}/camera-mx2.h | 0 + .../linux/platform_data/{ => media}/camera-mx3.h | 0 + .../linux/platform_data/{ => media}/camera-pxa.h | 0 + include/linux/platform_data/{ => media}/coda.h | 0 + .../{ => linux/platform_data}/media/gpio-ir-recv.h | 1 - + include/{ => linux/platform_data}/media/ir-rx51.h | 0 + .../{ => linux/platform_data}/media/mmp-camera.h | 0 + .../{ => linux/platform_data}/media/omap1_camera.h | 0 + include/{ => linux/platform_data}/media/omap4iss.h | 0 + include/{ => linux/platform_data}/media/s5p_hdmi.h | 1 - + include/{ => linux/platform_data}/media/si4713.h | 2 +- + include/{ => linux/platform_data}/media/sii9234.h | 0 + .../platform_data}/media/soc_camera_platform.h | 0 + .../{ => linux/platform_data}/media/timb_radio.h | 0 + .../{ => linux/platform_data}/media/timb_video.h | 0 + include/media/{ => drv-intf}/cx2341x.h | 0 + include/media/{ => drv-intf}/cx25840.h | 0 + include/media/{ => drv-intf}/exynos-fimc.h | 0 + include/media/{ => drv-intf}/msp3400.h | 1 - + include/media/{ => drv-intf}/s3c_camif.h | 0 + include/media/{ => drv-intf}/saa7146.h | 0 + include/media/{ => drv-intf}/saa7146_vv.h | 2 +- + include/media/{ => drv-intf}/sh_mobile_ceu.h | 0 + include/media/{ => drv-intf}/sh_mobile_csi2.h | 0 + include/media/{ => drv-intf}/sh_vou.h | 0 + include/media/{ => drv-intf}/si476x.h | 2 +- + include/media/{ => drv-intf}/soc_mediabus.h | 0 + include/media/{ => drv-intf}/tea575x.h | 0 + include/media/{ => i2c}/ad9389b.h | 0 + include/media/{ => i2c}/adp1653.h | 2 +- + include/media/{ => i2c}/adv7183.h | 0 + include/media/{ => i2c}/adv7343.h | 0 + include/media/{ => i2c}/adv7393.h | 0 + include/media/{ => i2c}/adv7511.h | 0 + include/media/{ => i2c}/adv7604.h | 0 + include/media/{ => i2c}/adv7842.h | 0 + include/media/{ => i2c}/ak881x.h | 0 + include/media/{ => i2c}/as3645a.h | 2 +- + include/media/{ => i2c}/bt819.h | 0 + include/media/{ => i2c}/cs5345.h | 0 + include/media/{ => i2c}/cs53l32a.h | 0 + include/media/{ => i2c}/ir-kbd-i2c.h | 0 + include/media/{ => i2c}/lm3560.h | 2 +- + include/media/{ => i2c}/lm3646.h | 2 +- + include/media/{ => i2c}/m52790.h | 0 + include/media/{ => i2c}/m5mols.h | 0 + include/media/{ => i2c}/mt9m032.h | 0 + include/media/{ => i2c}/mt9p031.h | 0 + include/media/{ => i2c}/mt9t001.h | 0 + include/media/{ => i2c}/mt9t112.h | 0 + include/media/{ => i2c}/mt9v011.h | 0 + include/media/{ => i2c}/mt9v022.h | 0 + include/media/{ => i2c}/mt9v032.h | 0 + include/media/{ => i2c}/noon010pc30.h | 0 + include/media/{ => i2c}/ov2659.h | 0 + include/media/{ => i2c}/ov7670.h | 0 + include/media/{ => i2c}/ov772x.h | 0 + include/media/{ => i2c}/ov9650.h | 0 + include/media/{ => i2c}/rj54n1cb0c.h | 0 + include/media/{ => i2c}/s5c73m3.h | 0 + include/media/{ => i2c}/s5k4ecgx.h | 0 + include/media/{ => i2c}/s5k6aa.h | 0 + include/media/{ => i2c}/saa6588.h | 0 + include/media/{ => i2c}/saa7115.h | 1 - + include/media/{ => i2c}/saa7127.h | 1 - + include/media/{ => i2c}/smiapp.h | 2 +- + include/media/{ => i2c}/sr030pc30.h | 0 + include/media/{ => i2c}/tc358743.h | 0 + include/media/{ => i2c}/ths7303.h | 0 + include/media/{ => i2c}/tvaudio.h | 0 + include/media/{ => i2c}/tvp514x.h | 0 + include/media/{ => i2c}/tvp5150.h | 1 - + include/media/{ => i2c}/tvp7002.h | 0 + include/media/{ => i2c}/tw9910.h | 0 + include/media/{ => i2c}/uda1342.h | 0 + include/media/{ => i2c}/upd64031a.h | 0 + include/media/{ => i2c}/upd64083.h | 0 + include/media/{ => i2c}/wm8775.h | 0 + include/media/lirc.h | 169 +--------------- + include/media/rc-core.h | 1 + + include/media/rc-map.h | 40 ++-- + include/media/v4l2-clk.h | 5 + + include/media/v4l2-dv-timings.h | 21 ++ + include/uapi/linux/dvb/video.h | 1 - + include/uapi/linux/lirc.h | 168 ++++++++++++++++ + include/uapi/linux/usb/video.h | 1 + + include/uapi/linux/v4l2-controls.h | 6 +- + include/uapi/linux/videodev2.h | 12 +- + sound/pci/es1968.c | 2 +- + sound/pci/fm801.c | 2 +- + 382 files changed, 1861 insertions(+), 1456 deletions(-) + delete mode 100644 include/linux/platform_data/camera-rcar.h + rename include/linux/platform_data/{ => media}/camera-mx2.h (100%) + rename include/linux/platform_data/{ => media}/camera-mx3.h (100%) + rename include/linux/platform_data/{ => media}/camera-pxa.h (100%) + rename include/linux/platform_data/{ => media}/coda.h (100%) + rename include/{ => linux/platform_data}/media/gpio-ir-recv.h (99%) + rename include/{ => linux/platform_data}/media/ir-rx51.h (100%) + rename include/{ => linux/platform_data}/media/mmp-camera.h (100%) + rename include/{ => linux/platform_data}/media/omap1_camera.h (100%) + rename include/{ => linux/platform_data}/media/omap4iss.h (100%) + rename include/{ => linux/platform_data}/media/s5p_hdmi.h (99%) + rename include/{ => linux/platform_data}/media/si4713.h (96%) + rename include/{ => linux/platform_data}/media/sii9234.h (100%) + rename include/{ => linux/platform_data}/media/soc_camera_platform.h (100%) + rename include/{ => linux/platform_data}/media/timb_radio.h (100%) + rename include/{ => linux/platform_data}/media/timb_video.h (100%) + rename include/media/{ => drv-intf}/cx2341x.h (100%) + rename include/media/{ => drv-intf}/cx25840.h (100%) + rename include/media/{ => drv-intf}/exynos-fimc.h (100%) + rename include/media/{ => drv-intf}/msp3400.h (99%) + rename include/media/{ => drv-intf}/s3c_camif.h (100%) + rename include/media/{ => drv-intf}/saa7146.h (100%) + rename include/media/{ => drv-intf}/saa7146_vv.h (99%) + rename include/media/{ => drv-intf}/sh_mobile_ceu.h (100%) + rename include/media/{ => drv-intf}/sh_mobile_csi2.h (100%) + rename include/media/{ => drv-intf}/sh_vou.h (100%) + rename include/media/{ => drv-intf}/si476x.h (94%) + rename include/media/{ => drv-intf}/soc_mediabus.h (100%) + rename include/media/{ => drv-intf}/tea575x.h (100%) + rename include/media/{ => i2c}/ad9389b.h (100%) + rename include/media/{ => i2c}/adp1653.h (99%) + rename include/media/{ => i2c}/adv7183.h (100%) + rename include/media/{ => i2c}/adv7343.h (100%) + rename include/media/{ => i2c}/adv7393.h (100%) + rename include/media/{ => i2c}/adv7511.h (100%) + rename include/media/{ => i2c}/adv7604.h (100%) + rename include/media/{ => i2c}/adv7842.h (100%) + rename include/media/{ => i2c}/ak881x.h (100%) + rename include/media/{ => i2c}/as3645a.h (98%) + rename include/media/{ => i2c}/bt819.h (100%) + rename include/media/{ => i2c}/cs5345.h (100%) + rename include/media/{ => i2c}/cs53l32a.h (100%) + rename include/media/{ => i2c}/ir-kbd-i2c.h (100%) + rename include/media/{ => i2c}/lm3560.h (98%) + rename include/media/{ => i2c}/lm3646.h (98%) + rename include/media/{ => i2c}/m52790.h (100%) + rename include/media/{ => i2c}/m5mols.h (100%) + rename include/media/{ => i2c}/mt9m032.h (100%) + rename include/media/{ => i2c}/mt9p031.h (100%) + rename include/media/{ => i2c}/mt9t001.h (100%) + rename include/media/{ => i2c}/mt9t112.h (100%) + rename include/media/{ => i2c}/mt9v011.h (100%) + rename include/media/{ => i2c}/mt9v022.h (100%) + rename include/media/{ => i2c}/mt9v032.h (100%) + rename include/media/{ => i2c}/noon010pc30.h (100%) + rename include/media/{ => i2c}/ov2659.h (100%) + rename include/media/{ => i2c}/ov7670.h (100%) + rename include/media/{ => i2c}/ov772x.h (100%) + rename include/media/{ => i2c}/ov9650.h (100%) + rename include/media/{ => i2c}/rj54n1cb0c.h (100%) + rename include/media/{ => i2c}/s5c73m3.h (100%) + rename include/media/{ => i2c}/s5k4ecgx.h (100%) + rename include/media/{ => i2c}/s5k6aa.h (100%) + rename include/media/{ => i2c}/saa6588.h (100%) + rename include/media/{ => i2c}/saa7115.h (99%) + rename include/media/{ => i2c}/saa7127.h (99%) + rename include/media/{ => i2c}/smiapp.h (98%) + rename include/media/{ => i2c}/sr030pc30.h (100%) + rename include/media/{ => i2c}/tc358743.h (100%) + rename include/media/{ => i2c}/ths7303.h (100%) + rename include/media/{ => i2c}/tvaudio.h (100%) + rename include/media/{ => i2c}/tvp514x.h (100%) + rename include/media/{ => i2c}/tvp5150.h (99%) + rename include/media/{ => i2c}/tvp7002.h (100%) + rename include/media/{ => i2c}/tw9910.h (100%) + rename include/media/{ => i2c}/uda1342.h (100%) + rename include/media/{ => i2c}/upd64031a.h (100%) + rename include/media/{ => i2c}/upd64083.h (100%) + rename include/media/{ => i2c}/wm8775.h (100%) + create mode 100644 include/uapi/linux/lirc.h +Merging kbuild/for-next (674327f76bb1 Merge branch 'kbuild/kconfig' into kbuild/for-next) +$ git merge kbuild/for-next +Resolved 'scripts/Makefile.modpost' using previous resolution. +Auto-merging scripts/Makefile.modpost +CONFLICT (content): Merge conflict in scripts/Makefile.modpost +Auto-merging lib/Kconfig.debug +Auto-merging arch/x86/Kconfig +Auto-merging Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6c2105038f4a] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/lto-build | 173 +++++++++++++++++++++++++++++++++++++++++++++++ + Makefile | 19 +++++- + arch/x86/Kconfig | 2 +- + init/Kconfig | 73 ++++++++++++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.lto | 84 +++++++++++++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/link-vmlinux.sh | 2 +- + 9 files changed, 356 insertions(+), 8 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (fca9051bec79 Merge branch 'for-4.4' into for-next) +$ git merge libata/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging pm/linux-next (523790d0912e Merge branch 'acpi-pci' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 3 - + arch/x86/include/asm/msr-index.h | 3 +- + drivers/acpi/cppc_acpi.c | 2 +- + drivers/acpi/ec.c | 2 +- + drivers/acpi/sbshc.c | 48 +----- + drivers/base/power/wakeirq.c | 6 + + drivers/cpufreq/Kconfig.arm | 1 + + drivers/cpufreq/Kconfig.x86 | 1 - + drivers/cpufreq/cppc_cpufreq.c | 1 + + drivers/cpufreq/intel_pstate.c | 316 ++++++++-------------------------- + drivers/cpuidle/governors/menu.c | 6 +- + drivers/pci/probe.c | 4 +- + tools/power/x86/turbostat/turbostat.c | 8 +- + 13 files changed, 100 insertions(+), 301 deletions(-) +Merging idle/next (6a13feb9c828 Linux 4.3) +$ git merge idle/next +Already up-to-date. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (7c5b2759bf8c Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next) +$ git merge thermal/next +Already up-to-date. +Merging thermal-soc/next (f00b6e0caa71 Revert "thermal: qcom_spmi: allow compile test") +$ git merge thermal-soc/next +Merge made by the 'recursive' strategy. + .../bindings/thermal/rockchip-thermal.txt | 4 +- + drivers/thermal/Kconfig | 2 +- + drivers/thermal/of-thermal.c | 2 +- + drivers/thermal/power_allocator.c | 24 +- + drivers/thermal/rcar_thermal.c | 49 ++- + drivers/thermal/rockchip_thermal.c | 328 +++++++++++++++------ + 6 files changed, 273 insertions(+), 136 deletions(-) +Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (14d34dad30f6 Merge branch 'topic/rcar' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 13 +- + .../devicetree/bindings/dma/stm32-dma.txt | 82 ++ + Documentation/dmaengine/client.txt | 38 +- + Documentation/dmaengine/provider.txt | 20 +- + arch/arm/configs/stm32_defconfig | 2 + + drivers/dca/dca-core.c | 3 +- + drivers/dma/Kconfig | 12 + + drivers/dma/Makefile | 1 + + drivers/dma/at_hdmac.c | 20 +- + drivers/dma/at_hdmac_regs.h | 6 +- + drivers/dma/at_xdmac.c | 20 +- + drivers/dma/dma-axi-dmac.c | 8 + + drivers/dma/dmaengine.c | 6 +- + drivers/dma/edma.c | 4 +- + drivers/dma/imx-sdma.c | 2 +- + drivers/dma/ioat/dca.c | 2 +- + drivers/dma/ioat/dma.h | 34 +- + drivers/dma/ioat/registers.h | 16 +- + drivers/dma/pxa_dma.c | 1 + + drivers/dma/sh/usb-dmac.c | 11 +- + drivers/dma/stm32-dma.c | 1141 ++++++++++++++++++++ + drivers/dma/virt-dma.c | 46 +- + drivers/dma/virt-dma.h | 25 + + include/linux/dca.h | 5 +- + include/linux/dmaengine.h | 92 ++ + include/linux/of_dma.h | 2 +- + sound/core/pcm_dmaengine.c | 9 +- + 27 files changed, 1524 insertions(+), 97 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/stm32-dma.txt + create mode 100644 drivers/dma/stm32-dma.c +Merging net-next/master (85c72ba1ed0c Merge branch 'net-generic-busy-polling') +$ git merge net-next/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/hisilicon-hns-mdio.txt | 7 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 1 - + drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 113 ------------------ + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 50 +------- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 7 -- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 2 - + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 - + drivers/net/ethernet/cisco/enic/enic_main.c | 2 - + drivers/net/ethernet/emulex/benet/be_ethtool.c | 6 +- + drivers/net/ethernet/emulex/benet/be_main.c | 2 - + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 1 - + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 1 - + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 1 - + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 3 - + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 17 --- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 40 ------- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 18 +-- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 126 --------------------- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 15 ++- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 11 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 3 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 4 +- + drivers/net/ethernet/rocker/rocker.c | 2 +- + drivers/net/ethernet/sfc/efx.c | 1 - + drivers/net/ethernet/sfc/rx.c | 1 - + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 2 +- + drivers/net/virtio_net.c | 3 - + drivers/net/wireless/ath/wil6210/netdev.c | 2 +- + include/linux/hashtable.h | 4 + + include/linux/netdevice.h | 44 +++++-- + include/linux/skbuff.h | 3 - + include/net/busy_poll.h | 45 +------- + net/core/dev.c | 116 +++++++++++++++---- + net/ipv4/ipconfig.c | 73 +++++------- + net/ipv4/netfilter/arp_tables.c | 6 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 22 ++-- + 47 files changed, 223 insertions(+), 571 deletions(-) +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging ipvs-next/master (c5a37883f42b Merge branch 'akpm' (patches from Andrew)) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (8aaa878de83a Merge ath-next from ath.git) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (e9d637672587 Bluetooth: Use hex notation for mask) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/bfusb.c | 9 +- + drivers/bluetooth/bluecard_cs.c | 25 +- + drivers/bluetooth/bpa10x.c | 4 +- + drivers/bluetooth/bt3c_cs.c | 11 +- + drivers/bluetooth/btmrvl_main.c | 8 +- + drivers/bluetooth/btmrvl_sdio.c | 4 +- + drivers/bluetooth/btsdio.c | 6 +- + drivers/bluetooth/btuart_cs.c | 11 +- + drivers/bluetooth/btusb.c | 48 +-- + drivers/bluetooth/btwilink.c | 8 +- + drivers/bluetooth/dtl1_cs.c | 11 +- + drivers/bluetooth/hci_ath.c | 6 +- + drivers/bluetooth/hci_bcm.c | 2 +- + drivers/bluetooth/hci_bcsp.c | 25 +- + drivers/bluetooth/hci_h4.c | 16 +- + drivers/bluetooth/hci_h5.c | 18 +- + drivers/bluetooth/hci_intel.c | 14 +- + drivers/bluetooth/hci_ldisc.c | 5 +- + drivers/bluetooth/hci_ll.c | 4 +- + drivers/bluetooth/hci_qca.c | 4 +- + drivers/bluetooth/hci_vhci.c | 8 +- + include/net/bluetooth/bluetooth.h | 25 +- + include/net/bluetooth/hci.h | 3 +- + include/net/bluetooth/hci_core.h | 13 +- + include/net/bluetooth/hci_mon.h | 2 + + include/net/bluetooth/hci_sock.h | 1 + + net/bluetooth/af_bluetooth.c | 12 +- + net/bluetooth/cmtp/core.c | 3 +- + net/bluetooth/hci_conn.c | 103 ++---- + net/bluetooth/hci_core.c | 576 ++++++++------------------------ + net/bluetooth/hci_request.c | 676 ++++++++++++++++++++++++++++++++++++-- + net/bluetooth/hci_request.h | 25 +- + net/bluetooth/hci_sock.c | 200 +++++++++-- + net/bluetooth/l2cap_core.c | 19 +- + net/bluetooth/mgmt.c | 520 ++++++----------------------- + net/mac802154/rx.c | 3 +- + 36 files changed, 1279 insertions(+), 1149 deletions(-) +Merging mac80211-next/master (1b1050cdc5cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (db7489e07669 IB/core, cma: Make __attribute_const__ declarations sparse-friendly) +$ git merge rdma/for-next +Already up-to-date. +Merging mtd/master (1ddaa021b000 MAINTAINERS: brcmnand: Add co-maintainer for Broadcom SoCs) +$ git merge mtd/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 ++ + drivers/mtd/nand/jz4740_nand.c | 1 + + drivers/mtd/nand/nand_base.c | 2 +- + 3 files changed, 4 insertions(+), 1 deletion(-) +Merging l2-mtd/master (0501f2e5ff28 mtd: spi-nor: mx25l3205d/mx25l6405d: append SECT_4K) +$ git merge l2-mtd/master +Merge made by the 'recursive' strategy. + Documentation/DocBook/mtdnand.tmpl | 4 +- + .../devicetree/bindings/mtd/mtk-quadspi.txt | 41 ++++++ + .../devicetree/bindings/mtd/partition.txt | 2 + + Documentation/mtd/nand_ecc.txt | 58 ++++----- + drivers/mtd/Kconfig | 2 +- + drivers/mtd/afs.c | 63 +++++---- + drivers/mtd/devices/m25p80.c | 27 +--- + drivers/mtd/devices/mtd_dataflash.c | 5 +- + drivers/mtd/devices/spear_smi.c | 6 +- + drivers/mtd/devices/st_spi_fsm.c | 5 +- + drivers/mtd/maps/lantiq-flash.c | 5 +- + drivers/mtd/maps/physmap_of.c | 6 +- + drivers/mtd/mtdcore.c | 4 + + drivers/mtd/mtdpart.c | 3 +- + drivers/mtd/nand/atmel_nand.c | 7 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 31 ++--- + drivers/mtd/nand/cafe_nand.c | 34 +++-- + drivers/mtd/nand/davinci_nand.c | 10 +- + drivers/mtd/nand/fsl_elbc_nand.c | 5 +- + drivers/mtd/nand/fsl_ifc_nand.c | 5 +- + drivers/mtd/nand/fsl_upm.c | 5 +- + drivers/mtd/nand/fsmc_nand.c | 9 +- + drivers/mtd/nand/gpio.c | 8 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 5 +- + drivers/mtd/nand/hisi504_nand.c | 5 +- + drivers/mtd/nand/lpc32xx_mlc.c | 7 +- + drivers/mtd/nand/lpc32xx_slc.c | 7 +- + drivers/mtd/nand/mpc5121_nfc.c | 5 +- + drivers/mtd/nand/mxc_nand.c | 8 +- + drivers/mtd/nand/nand_base.c | 7 +- + drivers/mtd/nand/ndfc.c | 5 +- + drivers/mtd/nand/omap2.c | 6 +- + drivers/mtd/nand/orion_nand.c | 6 +- + drivers/mtd/nand/plat_nand.c | 5 +- + drivers/mtd/nand/pxa3xx_nand.c | 141 ++++++++++----------- + drivers/mtd/nand/sh_flctl.c | 6 +- + drivers/mtd/nand/socrates_nand.c | 5 +- + drivers/mtd/nand/sunxi_nand.c | 6 +- + drivers/mtd/nand/vf610_nfc.c | 14 +- + drivers/mtd/ofpart.c | 12 +- + drivers/mtd/onenand/omap2.c | 8 +- + drivers/mtd/spi-nor/fsl-quadspi.c | 14 +- + drivers/mtd/spi-nor/nxp-spifi.c | 6 +- + drivers/mtd/spi-nor/spi-nor.c | 45 +++++-- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 5 +- + include/linux/mtd/mtd.h | 11 ++ + include/linux/mtd/nand.h | 16 +++ + include/linux/mtd/partitions.h | 3 - + include/linux/mtd/spi-nor.h | 16 ++- + 49 files changed, 377 insertions(+), 342 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/mtk-quadspi.txt +Merging crypto/master (4f9ea86604e3 crypto: sun4i-ss - add missing statesize) +$ git merge crypto/master +Auto-merging drivers/crypto/qat/qat_common/adf_ctl_drv.c +Merge made by the 'recursive' strategy. + crypto/algif_aead.c | 6 +- + crypto/algif_skcipher.c | 10 +- + crypto/rsa.c | 24 -- + drivers/crypto/amcc/crypto4xx_core.c | 4 + + drivers/crypto/caam/caamhash.c | 24 ++ + drivers/crypto/hifn_795x.c | 508 +++++++++++----------------- + drivers/crypto/ixp4xx_crypto.c | 6 +- + drivers/crypto/marvell/cipher.c | 8 + + drivers/crypto/marvell/hash.c | 4 + + drivers/crypto/picoxcell_crypto.c | 48 ++- + drivers/crypto/qat/qat_common/adf_aer.c | 2 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 2 +- + drivers/crypto/qat/qat_common/qat_crypto.c | 22 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 8 +- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 9 +- + drivers/crypto/qce/ablkcipher.c | 8 + + drivers/crypto/qce/sha.c | 5 + + drivers/crypto/sahara.c | 12 + + drivers/crypto/sunxi-ss/sun4i-ss-core.c | 2 + + drivers/crypto/talitos.c | 41 ++- + lib/mpi/mpicoder.c | 21 +- + 21 files changed, 382 insertions(+), 392 deletions(-) +Merging drm/drm-next (f20780f3e8fe Merge branch 'drm-sti-next-2015-11-03' of http://git.linaro.org/people/benjamin.gaignard/kernel into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (f1811a8a6413 drm/bridge: ptn3460: Fix coccinelle warnings) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (fb1a21114fe1 Revert "drm/i915: Initialize HWS page address after GPU reset") +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_runtime_pm.c' using previous resolution. +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/gpu/drm/i915/intel_uncore.c +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_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.h +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_guc_loader.c +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_crt.c +Auto-merging drivers/gpu/drm/i915/intel_audio.c +Auto-merging drivers/gpu/drm/i915/i915_params.c +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem_fence.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_dma.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging arch/x86/kernel/early-quirks.c +Auto-merging Documentation/DocBook/gpu.tmpl +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ba12379299ba] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/gpu.tmpl | 12 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/dvo.h | 3 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 37 +- + drivers/gpu/drm/i915/i915_debugfs.c | 246 ++- + drivers/gpu/drm/i915/i915_dma.c | 26 +- + drivers/gpu/drm/i915/i915_drv.c | 170 +- + drivers/gpu/drm/i915/i915_drv.h | 175 +- + drivers/gpu/drm/i915/i915_gem.c | 73 +- + drivers/gpu/drm/i915/i915_gem_context.c | 12 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 +- + drivers/gpu/drm/i915/i915_gem_fence.c | 2 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 58 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 7 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 3 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 4 + + drivers/gpu/drm/i915/i915_gpu_error.c | 40 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 53 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 16 +- + drivers/gpu/drm/i915/i915_irq.c | 117 +- + drivers/gpu/drm/i915/i915_params.c | 10 +- + drivers/gpu/drm/i915/i915_reg.h | 2742 ++++++++++++------------- + drivers/gpu/drm/i915/i915_sysfs.c | 3 +- + drivers/gpu/drm/i915/i915_trace.h | 4 +- + drivers/gpu/drm/i915/i915_vgpu.c | 6 +- + drivers/gpu/drm/i915/i915_vgpu.h | 14 +- + drivers/gpu/drm/i915/intel_atomic.c | 3 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 2 + + drivers/gpu/drm/i915/intel_audio.c | 23 +- + drivers/gpu/drm/i915/intel_crt.c | 14 +- + drivers/gpu/drm/i915/intel_csr.c | 284 ++- + drivers/gpu/drm/i915/intel_ddi.c | 141 +- + drivers/gpu/drm/i915/intel_display.c | 849 +++++--- + drivers/gpu/drm/i915/intel_dp.c | 1087 ++++------ + drivers/gpu/drm/i915/intel_dp_link_training.c | 323 +++ + drivers/gpu/drm/i915/intel_dp_mst.c | 18 +- + drivers/gpu/drm/i915/intel_drv.h | 159 +- + drivers/gpu/drm/i915/intel_dsi.c | 45 +- + drivers/gpu/drm/i915/intel_dvo.c | 27 +- + drivers/gpu/drm/i915/intel_fbc.c | 196 +- + drivers/gpu/drm/i915/intel_fbdev.c | 40 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 127 +- + drivers/gpu/drm/i915/intel_guc.h | 8 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 72 + + drivers/gpu/drm/i915/intel_guc_loader.c | 105 +- + drivers/gpu/drm/i915/intel_hdmi.c | 76 +- + drivers/gpu/drm/i915/intel_i2c.c | 37 +- + drivers/gpu/drm/i915/intel_lrc.c | 148 +- + drivers/gpu/drm/i915/intel_lrc.h | 19 +- + drivers/gpu/drm/i915/intel_lvds.c | 11 +- + drivers/gpu/drm/i915/intel_mocs.c | 61 +- + drivers/gpu/drm/i915/intel_opregion.c | 2 +- + drivers/gpu/drm/i915/intel_overlay.c | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 637 +++--- + drivers/gpu/drm/i915/intel_psr.c | 77 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 156 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 9 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 506 ++--- + drivers/gpu/drm/i915/intel_sdvo.c | 61 +- + drivers/gpu/drm/i915/intel_sprite.c | 20 +- + drivers/gpu/drm/i915/intel_uncore.c | 261 ++- + drivers/pci/quirks.c | 4 +- + include/drm/i915_component.h | 69 +- + include/drm/i915_pciids.h | 36 + + include/uapi/drm/i915_drm.h | 11 +- + 67 files changed, 5254 insertions(+), 4312 deletions(-) + create mode 100644 drivers/gpu/drm/i915/intel_dp_link_training.c +Merging drm-tegra/drm/tegra/for-next (2bcdcbfae289 drm/tegra: dc: Request/free syncpoint at init/exit) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (58c8fb954494 drm/sysfs: Grab lock for edid/modes_show) +$ git merge drm-misc/topic/drm-misc +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_sprite.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging Documentation/DocBook/gpu.tmpl +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 544b5a97520c] Merge remote-tracking branch 'drm-misc/topic/drm-misc' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/gpu.tmpl | 48 +++--------- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 2 +- + drivers/gpu/drm/armada/armada_fb.c | 4 +- + drivers/gpu/drm/armada/armada_fb.h | 2 +- + drivers/gpu/drm/ast/ast_drv.h | 3 +- + drivers/gpu/drm/ast/ast_fb.c | 2 +- + drivers/gpu/drm/ast/ast_main.c | 4 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- + drivers/gpu/drm/bochs/bochs.h | 2 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 2 +- + drivers/gpu/drm/bochs/bochs_mm.c | 4 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 3 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_main.c | 4 +- + drivers/gpu/drm/drm_atomic.c | 9 +-- + drivers/gpu/drm/drm_atomic_helper.c | 28 +++---- + drivers/gpu/drm/drm_crtc.c | 4 +- + drivers/gpu/drm/drm_crtc_helper.c | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 4 +- + drivers/gpu/drm/drm_gem.c | 35 ++++++++- + drivers/gpu/drm/drm_modes.c | 16 ++-- + drivers/gpu/drm/drm_plane_helper.c | 4 + + drivers/gpu/drm/drm_rect.c | 7 +- + drivers/gpu/drm/drm_sysfs.c | 16 +++- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_fb.h | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 6 +- + drivers/gpu/drm/i915/intel_display.c | 2 +- + drivers/gpu/drm/i915/intel_drv.h | 2 - + drivers/gpu/drm/i915/intel_sprite.c | 8 +- + drivers/gpu/drm/imx/Kconfig | 9 --- + drivers/gpu/drm/imx/imx-drm-core.c | 12 +-- + drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 4 +- + drivers/gpu/drm/msm/msm_drv.h | 4 +- + drivers/gpu/drm/msm/msm_fb.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 1 - + drivers/gpu/drm/omapdrm/omap_drv.h | 6 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 4 +- + drivers/gpu/drm/qxl/qxl_display.c | 4 +- + drivers/gpu/drm/qxl/qxl_drv.h | 2 +- + drivers/gpu/drm/qxl/qxl_fb.c | 3 +- + drivers/gpu/drm/radeon/radeon_display.c | 4 +- + drivers/gpu/drm/radeon/radeon_fb.c | 1 - + drivers/gpu/drm/radeon/radeon_mode.h | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.h | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 2 +- + drivers/gpu/drm/tegra/Kconfig | 12 --- + drivers/gpu/drm/tegra/drm.c | 4 +- + drivers/gpu/drm/tegra/drm.h | 8 +- + drivers/gpu/drm/tegra/fb.c | 16 ++-- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- + drivers/gpu/drm/udl/udl_drv.h | 2 +- + drivers/gpu/drm/udl/udl_fb.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +- + include/drm/drm_crtc.h | 8 +- + include/drm/drm_crtc_helper.h | 2 +- + include/drm/drm_dp_helper.h | 36 +++++++++ + include/drm/drm_fb_cma_helper.h | 2 +- + include/drm/drm_gem.h | 106 +++++++++++++++++++++++---- + include/drm/drm_rect.h | 3 +- + 71 files changed, 320 insertions(+), 215 deletions(-) +Merging drm-exynos/exynos-drm/for-next (f92220e7bee8 drm/exynos: dsi: add runtime pm support) +$ git merge drm-exynos/exynos-drm/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 54 ++++++--- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 125 +++++++++---------- + drivers/gpu/drm/exynos/exynos_dp_core.c | 165 +++++++++++++++++++------- + drivers/gpu/drm/exynos/exynos_dp_core.h | 1 + + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 147 ++++++++++++----------- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 91 ++++++-------- + drivers/gpu/drm/exynos/exynos_hdmi.c | 56 ++++++--- + drivers/gpu/drm/exynos/exynos_mixer.c | 125 ++++++++++--------- + 8 files changed, 433 insertions(+), 331 deletions(-) +Merging drm-msm/msm-next (a9ee34b70e07 drm/msm: Remove local fbdev emulation Kconfig option) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging sound/for-next (3c7a09358729 ALSA: ua101: replace le16_to_cpu() with usb_endpoint_maxp()) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/usb/misc/ua101.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging sound-asoc/for-next (da1a128f2faf Merge remote-tracking branch 'asoc/topic/wm9713' into asoc-next) +$ git merge sound-asoc/for-next +Removing sound/soc/sh/rcar/rcar_snd.h +Auto-merging arch/arm/plat-samsung/devs.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak4613.txt | 10 + + .../devicetree/bindings/sound/img,i2s-in.txt | 47 + + .../devicetree/bindings/sound/img,i2s-out.txt | 51 + + .../devicetree/bindings/sound/img,parallel-out.txt | 44 + + .../devicetree/bindings/sound/img,spdif-in.txt | 41 + + .../devicetree/bindings/sound/img,spdif-out.txt | 44 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 2 + + .../bindings/sound/renesas,rsrc-card.txt | 4 +- + .../devicetree/bindings/sound/rockchip-i2s.txt | 2 + + Documentation/devicetree/bindings/sound/rt5659.txt | 75 + + Documentation/devicetree/bindings/sound/rt5677.txt | 2 +- + Documentation/sound/alsa/img,spdif-in.txt | 49 + + arch/arm/mach-s3c64xx/dev-audio.c | 41 +- + arch/arm/mach-s3c64xx/include/mach/dma.h | 52 +- + arch/arm/plat-samsung/devs.c | 17 +- + include/linux/platform_data/asoc-s3c.h | 4 + + include/sound/ac97_codec.h | 3 + + include/sound/rt5659.h | 49 + + include/sound/soc-dapm.h | 1 + + include/sound/soc-topology.h | 6 +- + include/sound/soc.h | 11 +- + include/uapi/sound/asoc.h | 2 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/codecs/Kconfig | 15 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/ak4613.c | 118 +- + sound/soc/codecs/arizona.c | 16 +- + sound/soc/codecs/cs47l24.c | 1148 ++++++ + sound/soc/codecs/cs47l24.h | 23 + + sound/soc/codecs/da7219.c | 2 +- + sound/soc/codecs/nau8825.c | 31 + + sound/soc/codecs/rl6231.c | 6 +- + sound/soc/codecs/rt286.c | 6 + + sound/soc/codecs/rt298.c | 2 - + sound/soc/codecs/rt5645.c | 254 +- + sound/soc/codecs/rt5659.c | 4223 ++++++++++++++++++++ + sound/soc/codecs/rt5659.h | 1819 +++++++++ + sound/soc/codecs/rt5670.h | 12 +- + sound/soc/codecs/rt5677.c | 108 +- + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8960.c | 2 +- + sound/soc/codecs/wm8962.c | 7 +- + sound/soc/codecs/wm8998.c | 46 +- + sound/soc/codecs/wm9713.c | 296 +- + sound/soc/davinci/davinci-mcasp.c | 4 +- + sound/soc/fsl/fsl-asoc-card.c | 5 +- + sound/soc/fsl/fsl_esai.c | 44 +- + sound/soc/fsl/fsl_sai.c | 68 +- + sound/soc/fsl/fsl_spdif.c | 16 +- + sound/soc/fsl/fsl_ssi.c | 22 +- + sound/soc/fsl/imx-wm8962.c | 10 +- + sound/soc/generic/simple-card.c | 12 +- + sound/soc/img/Kconfig | 44 + + sound/soc/img/Makefile | 5 + + sound/soc/img/img-i2s-in.c | 516 +++ + sound/soc/img/img-i2s-out.c | 565 +++ + sound/soc/img/img-parallel-out.c | 327 ++ + sound/soc/img/img-spdif-in.c | 806 ++++ + sound/soc/img/img-spdif-out.c | 441 ++ + sound/soc/intel/Kconfig | 17 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 12 +- + sound/soc/intel/atom/sst/sst_acpi.c | 67 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 7 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 7 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 7 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 368 ++ + sound/soc/intel/boards/skl_rt286.c | 55 +- + sound/soc/intel/common/Makefile | 3 +- + sound/soc/intel/common/sst-acpi.c | 41 +- + sound/soc/intel/common/sst-acpi.h | 33 + + sound/soc/intel/common/sst-dsp-priv.h | 8 +- + sound/soc/intel/common/sst-firmware.c | 4 +- + sound/soc/intel/common/sst-match-acpi.c | 43 + + sound/soc/intel/haswell/sst-haswell-dsp.c | 2 +- + sound/soc/intel/skylake/skl-messages.c | 191 +- + sound/soc/intel/skylake/skl-nhlt.c | 19 +- + sound/soc/intel/skylake/skl-pcm.c | 185 +- + sound/soc/intel/skylake/skl-sst-cldma.c | 20 + + sound/soc/intel/skylake/skl-sst-dsp.h | 3 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 2 +- + sound/soc/intel/skylake/skl-sst.c | 42 +- + sound/soc/intel/skylake/skl-topology.c | 389 +- + sound/soc/intel/skylake/skl-topology.h | 35 +- + sound/soc/intel/skylake/skl-tplg-interface.h | 90 +- + sound/soc/intel/skylake/skl.c | 134 +- + sound/soc/intel/skylake/skl.h | 4 +- + sound/soc/mediatek/mtk-afe-pcm.c | 13 +- + sound/soc/pxa/mioa701_wm9713.c | 6 +- + sound/soc/rockchip/rockchip_i2s.c | 43 +- + sound/soc/rockchip/rockchip_max98090.c | 6 + + sound/soc/rockchip/rockchip_rt5645.c | 6 + + sound/soc/rockchip/rockchip_spdif.c | 2 +- + sound/soc/samsung/ac97.c | 26 +- + sound/soc/samsung/bells.c | 40 +- + sound/soc/samsung/dma.h | 2 +- + sound/soc/samsung/dmaengine.c | 4 +- + sound/soc/samsung/i2s.c | 26 +- + sound/soc/samsung/littlemill.c | 32 +- + sound/soc/samsung/odroidx2_max98090.c | 9 +- + sound/soc/samsung/pcm.c | 20 +- + sound/soc/samsung/s3c2412-i2s.c | 12 +- + sound/soc/samsung/s3c24xx-i2s.c | 12 +- + sound/soc/samsung/snow.c | 9 +- + sound/soc/samsung/spdif.c | 10 +- + sound/soc/samsung/speyside.c | 12 +- + sound/soc/samsung/tobermory.c | 21 +- + sound/soc/sh/Kconfig | 1 - + sound/soc/sh/rcar/Makefile | 2 +- + sound/soc/sh/rcar/adg.c | 88 +- + sound/soc/sh/rcar/cmd.c | 170 + + sound/soc/sh/rcar/core.c | 478 +-- + sound/soc/sh/rcar/ctu.c | 98 +- + sound/soc/sh/rcar/dma.c | 245 +- + sound/soc/sh/rcar/dvc.c | 247 +- + sound/soc/sh/rcar/gen.c | 68 +- + sound/soc/sh/rcar/mix.c | 145 +- + sound/soc/sh/rcar/rcar_snd.h | 117 - + sound/soc/sh/rcar/rsnd.h | 281 +- + sound/soc/sh/rcar/rsrc-card.c | 6 +- + sound/soc/sh/rcar/src.c | 900 ++--- + sound/soc/sh/rcar/ssi.c | 574 ++- + sound/soc/sh/rcar/ssiu.c | 178 + + sound/soc/soc-ac97.c | 125 + + sound/soc/soc-core.c | 289 +- + sound/soc/soc-dapm.c | 14 +- + sound/soc/soc-ops.c | 6 +- + sound/soc/soc-pcm.c | 25 +- + sound/soc/soc-topology.c | 3 +- + sound/soc/sunxi/sun4i-codec.c | 27 +- + sound/soc/tegra/tegra_wm8903.c | 3 +- + 132 files changed, 14385 insertions(+), 3390 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/img,i2s-in.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,i2s-out.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,parallel-out.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,spdif-in.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,spdif-out.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt5659.txt + create mode 100644 Documentation/sound/alsa/img,spdif-in.txt + create mode 100644 include/sound/rt5659.h + create mode 100644 sound/soc/codecs/cs47l24.c + create mode 100644 sound/soc/codecs/cs47l24.h + create mode 100644 sound/soc/codecs/rt5659.c + create mode 100644 sound/soc/codecs/rt5659.h + create mode 100644 sound/soc/img/Kconfig + create mode 100644 sound/soc/img/Makefile + create mode 100644 sound/soc/img/img-i2s-in.c + create mode 100644 sound/soc/img/img-i2s-out.c + create mode 100644 sound/soc/img/img-parallel-out.c + create mode 100644 sound/soc/img/img-spdif-in.c + create mode 100644 sound/soc/img/img-spdif-out.c + create mode 100644 sound/soc/intel/boards/skl_nau88l25_ssm4567.c + create mode 100644 sound/soc/intel/common/sst-acpi.h + create mode 100644 sound/soc/intel/common/sst-match-acpi.c + create mode 100644 sound/soc/sh/rcar/cmd.c + delete mode 100644 sound/soc/sh/rcar/rcar_snd.h + create mode 100644 sound/soc/sh/rcar/ssiu.c +$ git reset --hard HEAD^ +HEAD is now at 6e254578269a Merge remote-tracking branch 'sound/for-next' +Merging next-20151118 version of sound-asoc +$ git merge -m next-20151118/sound-asoc 2ae8954a919b38560ff66a7af5d594f5336ef674 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak4613.txt | 10 + + .../devicetree/bindings/sound/img,i2s-in.txt | 47 + + .../devicetree/bindings/sound/img,i2s-out.txt | 51 + + .../devicetree/bindings/sound/img,parallel-out.txt | 44 + + .../devicetree/bindings/sound/img,spdif-in.txt | 41 + + .../devicetree/bindings/sound/img,spdif-out.txt | 44 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 2 + + .../bindings/sound/renesas,rsrc-card.txt | 4 +- + .../devicetree/bindings/sound/rockchip-i2s.txt | 2 + + Documentation/devicetree/bindings/sound/rt5677.txt | 2 +- + Documentation/sound/alsa/img,spdif-in.txt | 49 + + include/sound/soc-dapm.h | 1 + + include/uapi/sound/asoc.h | 2 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/codecs/Kconfig | 9 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ak4613.c | 118 +- + sound/soc/codecs/arizona.c | 16 +- + sound/soc/codecs/cs47l24.c | 1148 ++++++++++++++++++++ + sound/soc/codecs/cs47l24.h | 23 + + sound/soc/codecs/da7219.c | 2 +- + sound/soc/codecs/nau8825.c | 31 + + sound/soc/codecs/rl6231.c | 6 +- + sound/soc/codecs/rt286.c | 6 + + sound/soc/codecs/rt298.c | 2 - + sound/soc/codecs/rt5645.c | 254 ++++- + sound/soc/codecs/rt5670.h | 12 +- + sound/soc/codecs/rt5677.c | 108 +- + sound/soc/codecs/wm8960.c | 2 +- + sound/soc/codecs/wm8962.c | 7 +- + sound/soc/codecs/wm8998.c | 46 +- + sound/soc/codecs/wm9713.c | 296 ++--- + sound/soc/davinci/davinci-mcasp.c | 4 +- + sound/soc/fsl/fsl_esai.c | 44 +- + sound/soc/fsl/fsl_sai.c | 68 +- + sound/soc/fsl/fsl_spdif.c | 16 +- + sound/soc/fsl/fsl_ssi.c | 22 +- + sound/soc/img/Kconfig | 44 + + sound/soc/img/Makefile | 5 + + sound/soc/img/img-i2s-in.c | 516 +++++++++ + sound/soc/img/img-i2s-out.c | 565 ++++++++++ + sound/soc/img/img-parallel-out.c | 327 ++++++ + sound/soc/img/img-spdif-in.c | 806 ++++++++++++++ + sound/soc/img/img-spdif-out.c | 441 ++++++++ + sound/soc/intel/Kconfig | 1 + + sound/soc/intel/atom/sst/sst_acpi.c | 67 +- + sound/soc/intel/boards/skl_rt286.c | 5 +- + sound/soc/intel/common/Makefile | 3 +- + sound/soc/intel/common/sst-acpi.c | 41 +- + sound/soc/intel/common/sst-acpi.h | 33 + + sound/soc/intel/common/sst-dsp-priv.h | 8 +- + sound/soc/intel/common/sst-firmware.c | 4 +- + sound/soc/intel/common/sst-match-acpi.c | 43 + + sound/soc/intel/haswell/sst-haswell-dsp.c | 2 +- + sound/soc/intel/skylake/skl-messages.c | 191 ++-- + sound/soc/intel/skylake/skl-nhlt.c | 19 +- + sound/soc/intel/skylake/skl-pcm.c | 142 +-- + sound/soc/intel/skylake/skl-sst-dsp.h | 3 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 2 +- + sound/soc/intel/skylake/skl-sst.c | 12 +- + sound/soc/intel/skylake/skl-topology.c | 389 +++---- + sound/soc/intel/skylake/skl-topology.h | 35 +- + sound/soc/intel/skylake/skl-tplg-interface.h | 90 +- + sound/soc/intel/skylake/skl.c | 119 +- + sound/soc/intel/skylake/skl.h | 4 +- + sound/soc/mediatek/mtk-afe-pcm.c | 13 +- + sound/soc/rockchip/rockchip_i2s.c | 43 +- + sound/soc/rockchip/rockchip_max98090.c | 6 + + sound/soc/rockchip/rockchip_rt5645.c | 6 + + sound/soc/rockchip/rockchip_spdif.c | 2 +- + sound/soc/sh/Kconfig | 1 - + sound/soc/sh/rcar/Makefile | 2 +- + sound/soc/sh/rcar/adg.c | 23 +- + sound/soc/sh/rcar/cmd.c | 173 +++ + sound/soc/sh/rcar/core.c | 162 +-- + sound/soc/sh/rcar/ctu.c | 8 + + sound/soc/sh/rcar/dma.c | 240 ++-- + sound/soc/sh/rcar/dvc.c | 159 +-- + sound/soc/sh/rcar/gen.c | 2 +- + sound/soc/sh/rcar/mix.c | 55 +- + sound/soc/sh/rcar/rsnd.h | 90 +- + sound/soc/sh/rcar/src.c | 186 +--- + sound/soc/sh/rcar/ssi.c | 426 ++++---- + sound/soc/sh/rcar/ssiu.c | 181 +++ + sound/soc/soc-dapm.c | 7 + + sound/soc/soc-ops.c | 2 +- + sound/soc/soc-pcm.c | 3 +- + sound/soc/soc-topology.c | 1 + + sound/soc/sunxi/sun4i-codec.c | 27 +- + 90 files changed, 6678 insertions(+), 1600 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/img,i2s-in.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,i2s-out.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,parallel-out.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,spdif-in.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,spdif-out.txt + create mode 100644 Documentation/sound/alsa/img,spdif-in.txt + create mode 100644 sound/soc/codecs/cs47l24.c + create mode 100644 sound/soc/codecs/cs47l24.h + create mode 100644 sound/soc/img/Kconfig + create mode 100644 sound/soc/img/Makefile + create mode 100644 sound/soc/img/img-i2s-in.c + create mode 100644 sound/soc/img/img-i2s-out.c + create mode 100644 sound/soc/img/img-parallel-out.c + create mode 100644 sound/soc/img/img-spdif-in.c + create mode 100644 sound/soc/img/img-spdif-out.c + create mode 100644 sound/soc/intel/common/sst-acpi.h + create mode 100644 sound/soc/intel/common/sst-match-acpi.c + create mode 100644 sound/soc/sh/rcar/cmd.c + create mode 100644 sound/soc/sh/rcar/ssiu.c +Merging modules/modules-next (d1189c63ea5e scripts: [modpost] add new sections to white list) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (5e0baca8b324 Input: parkbd - drop bogus __init from parkbd_allocate_serio()) +$ git merge input/next +Already up-to-date. +Merging block/for-next (4ef4e4105a25 Merge branch 'for-4.4/io-poll' into for-next) +$ git merge block/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (949d51b23b38 dm thin metadata: speed up discard of partially mapped volumes) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + drivers/md/dm-crypt.c | 22 ++++++---- + drivers/md/dm-mpath.c | 30 +++++++------ + drivers/md/dm-thin-metadata.c | 66 +++++++++++++++++----------- + drivers/md/dm-thin.c | 1 + + drivers/md/dm.c | 7 +-- + drivers/md/persistent-data/dm-btree.c | 81 +++++++++++++++++++++++++++++++++++ + drivers/md/persistent-data/dm-btree.h | 7 +++ + 7 files changed, 163 insertions(+), 51 deletions(-) +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ 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 (ed9e237b9a40 mmc: sh_mmcif: rework dma channel handling) +$ git merge mmc-uh/next +Auto-merging lib/Kconfig.debug +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/renesas,mmcif.txt | 1 + + drivers/mmc/card/block.c | 4 +- + drivers/mmc/core/core.c | 43 ++++++----- + drivers/mmc/core/core.h | 8 +++ + drivers/mmc/core/host.c | 11 ++- + drivers/mmc/core/mmc.c | 15 +--- + drivers/mmc/core/pwrseq.h | 2 +- + drivers/mmc/core/pwrseq_emmc.c | 2 +- + drivers/mmc/core/pwrseq_simple.c | 2 +- + drivers/mmc/core/sd.c | 15 +--- + drivers/mmc/host/dw_mmc-rockchip.c | 8 --- + drivers/mmc/host/mtk-sd.c | 1 - + drivers/mmc/host/omap_hsmmc.c | 6 +- + drivers/mmc/host/sdhci-of-at91.c | 72 ++++++++++++++++++- + drivers/mmc/host/sdhci-pltfm.c | 3 +- + drivers/mmc/host/sdhci.c | 57 ++++++--------- + drivers/mmc/host/sh_mmcif.c | 84 ++++++++++------------ + include/linux/mmc/host.h | 5 +- + lib/Kconfig.debug | 3 +- + 19 files changed, 187 insertions(+), 155 deletions(-) +Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (3ac6b716f787 md-cluster: Allow spare devices to be marked as faulty) +$ git merge md/for-next +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + drivers/md/md-cluster.c | 17 ++++++++++++++--- + drivers/md/md.c | 22 +++++++++++++--------- + drivers/md/md.h | 1 + + drivers/md/raid5.c | 2 -- + 4 files changed, 28 insertions(+), 14 deletions(-) +Merging mfd/for-mfd-next (271bb1773b1e bindings: mfd: s2mps11: Add documentation for s2mps15 PMIC) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (9d6c243502b7 backlight: pm8941-wled: Add default-brightness property) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (0fe69b960ae2 power: bq27xxx_battery: Add I2C module check dependency in Kconfig) +$ git merge battery/master +Merge made by the 'recursive' strategy. + drivers/power/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging omap_dss2/for-next (08bfb453f045 radeonfb: Deinline large functions) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (82d93c09d445 Merge remote-tracking branches 'regulator/topic/optional', 'regulator/topic/tps6105x' and 'regulator/topic/tps65086' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/Kconfig | 8 ++ + drivers/regulator/Makefile | 1 + + drivers/regulator/core.c | 6 +- + drivers/regulator/devres.c | 7 +- + drivers/regulator/tps6105x-regulator.c | 95 ++----------- + drivers/regulator/tps65086-regulator.c | 250 +++++++++++++++++++++++++++++++++ + include/linux/regulator/consumer.h | 3 + + 7 files changed, 283 insertions(+), 87 deletions(-) + create mode 100644 drivers/regulator/tps65086-regulator.c +Merging security/next (e42852bf8814 security/capability.h: cap_issubset/isclear can be boolean) +$ git merge security/next +Merge made by the 'recursive' strategy. + include/linux/capability.h | 22 ++++++++-------------- + 1 file changed, 8 insertions(+), 14 deletions(-) +Merging integrity/next (72e1eed8abb1 integrity: prevent loading untrusted certificates on the IMA trusted keyring) +$ git merge integrity/next +Already up-to-date. +Merging selinux/next (92f190d2a1ec selinux: rate-limit netlink message warnings in selinux_nlmsg_perm()) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Auto-merging kernel/audit.h +Auto-merging kernel/audit.c +Auto-merging include/linux/audit.h +Auto-merging fs/gfs2/glops.c +Merge made by the 'recursive' strategy. + fs/gfs2/glops.c | 2 + + include/linux/audit.h | 8 +- + include/linux/lsm_hooks.h | 10 +- + include/linux/security.h | 13 ++- + kernel/audit.c | 2 +- + kernel/audit.h | 2 +- + kernel/auditsc.c | 6 +- + security/security.c | 12 ++- + security/selinux/hooks.c | 206 +++++++++++++++++++++++++----------- + security/selinux/include/classmap.h | 2 +- + security/selinux/include/objsec.h | 6 ++ + security/selinux/include/security.h | 3 + + security/selinux/selinuxfs.c | 80 ++++++++++++++ + security/selinux/ss/services.c | 34 ++++-- + security/smack/smack_lsm.c | 4 +- + 15 files changed, 302 insertions(+), 88 deletions(-) +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (760d280084f8 watchdog: include: add units for timeout values in kerneldoc) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (b67ad2f7c751 Merge branches 'x86/vt-d', 'arm/omap', 'arm/smmu', 's390', 'core' and 'x86/amd' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (222e684ca762 vfio/pci: make an array larger) +$ git merge vfio/next +Already up-to-date. +Merging jc_docs/docs-next (1ef0623371e0 kernel-doc: Make it compatible with Perl versions below 5.12 again) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + scripts/kernel-doc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging trivial/for-next (75021d28594d Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (4b5829e9edfa audit: Delete unnecessary checks before two function calls) +$ git merge audit/next +Resolved 'kernel/audit.c' using previous resolution. +Auto-merging kernel/audit.c +CONFLICT (content): Merge conflict in kernel/audit.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e635e4a6edee] Merge remote-tracking branch 'audit/next' +$ git diff -M --stat --summary HEAD^.. + kernel/audit.c | 17 +++++++---------- + 1 file changed, 7 insertions(+), 10 deletions(-) +Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (b1d06b60e90c of: Provide static inline function for of_translate_address if needed) +$ git merge dt-rh/for-next +Already up-to-date. +Merging mailbox/mailbox-for-next (cb1ca0b3bb66 mailbox: mailbox-test: avoid reading iomem twice) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (5fdd8d47cb46 Merge remote-tracking branches 'spi/topic/bcm63xx', 'spi/topic/s3c64xx' and 'spi/topic/sun4i' into spi-next) +$ git merge spi/for-next +Auto-merging arch/arm/plat-samsung/devs.c +Merge made by the 'recursive' strategy. + arch/arm/plat-samsung/devs.c | 19 ++++++++++--------- + drivers/spi/spi-bcm63xx.c | 11 +++++------ + drivers/spi/spi-mt65xx.c | 26 ++++++++++++++++++-------- + drivers/spi/spi-s3c64xx.c | 27 +++++++-------------------- + drivers/spi/spi-sun4i.c | 8 ++++---- + drivers/spi/spi-sun6i.c | 8 ++++---- + drivers/spi/spi.c | 1 + + include/linux/platform_data/spi-s3c64xx.h | 2 ++ + 8 files changed, 51 insertions(+), 51 deletions(-) +Merging tip/auto-latest (5a5b01e59771 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + arch/x86/include/asm/apic.h | 1 + + arch/x86/include/asm/ipi.h | 2 ++ + arch/x86/include/asm/paravirt_types.h | 2 -- + arch/x86/kernel/apic/apic_flat_64.c | 19 +++++-------------- + arch/x86/kernel/apic/apic_noop.c | 2 ++ + arch/x86/kernel/apic/apic_numachip.c | 2 ++ + arch/x86/kernel/apic/bigsmp_32.c | 10 +++------- + arch/x86/kernel/apic/ipi.c | 18 ++++++++++++++++++ + arch/x86/kernel/apic/probe_32.c | 1 + + arch/x86/kernel/apic/x2apic_cluster.c | 9 +++++++++ + arch/x86/kernel/apic/x2apic_phys.c | 9 +++++++++ + arch/x86/kernel/apic/x2apic_uv_x.c | 1 + + arch/x86/kernel/paravirt.c | 13 +------------ + arch/x86/kernel/smp.c | 4 ++-- + 14 files changed, 56 insertions(+), 37 deletions(-) +Merging clockevents/clockevents/next (2527dfeb1f64 clocksource/drivers/tango-xtal: Replace code by clocksource_mmio_init) +$ git merge clockevents/clockevents/next +Resolved 'arch/h8300/Kconfig' using previous resolution. +Resolved 'arch/h8300/include/asm/io.h' using previous resolution. +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging arch/h8300/kernel/setup.c +Auto-merging arch/h8300/include/asm/io.h +CONFLICT (content): Merge conflict in arch/h8300/include/asm/io.h +Auto-merging arch/h8300/Kconfig +CONFLICT (content): Merge conflict in arch/h8300/Kconfig +Auto-merging arch/arm/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 280b0f4ccda7] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/Kconfig | 3 + + arch/arm/mach-exynos/Kconfig | 1 + + arch/arm/mach-sti/Kconfig | 1 + + arch/arm/mach-ux500/Kconfig | 1 + + arch/h8300/Kconfig | 1 + + arch/h8300/include/asm/io.h | 39 +++--- + arch/h8300/kernel/setup.c | 8 +- + drivers/clocksource/Kconfig | 132 +++++++++++++----- + drivers/clocksource/Makefile | 2 +- + drivers/clocksource/dw_apb_timer_of.c | 16 +++ + drivers/clocksource/h8300_timer16.c | 201 ++++++++++------------------ + drivers/clocksource/h8300_timer8.c | 243 ++++++++++++---------------------- + drivers/clocksource/h8300_tpu.c | 159 ++++++++-------------- + drivers/clocksource/mtk_timer.c | 20 +-- + drivers/clocksource/rockchip_timer.c | 23 ++-- + drivers/clocksource/tango_xtal.c | 18 +-- + drivers/clocksource/tegra20_timer.c | 3 +- + drivers/clocksource/timer-sun5i.c | 16 +-- + drivers/clocksource/vt8500_timer.c | 1 - + drivers/irqchip/irq-renesas-h8300h.c | 8 +- + include/linux/sched_clock.h | 12 +- + 21 files changed, 396 insertions(+), 512 deletions(-) +Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (990995bad13c EDAC: Fix PAGES_TO_MiB macro misuse) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (8005c49d9aea Linux 4.4-rc1) +$ 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 (e428abbbf616 tracing: #ifdef out uses of max trace when CONFIG_TRACER_MAX_TRACE is not set) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (31bf937d2dcb rcu: Print symbolic name for ->gp_state) +$ git merge rcu/rcu/next +Merge made by the 'recursive' strategy. + .../RCU/Design/Requirements/2013-08-is-it-dead.png | Bin 0 -> 100825 bytes + .../Design/Requirements/GPpartitionReaders1.svg | 374 +++ + .../RCU/Design/Requirements/RCUApplicability.svg | 237 ++ + .../Design/Requirements/ReadersPartitionGP1.svg | 639 +++++ + .../RCU/Design/Requirements/Requirements.html | 2897 ++++++++++++++++++++ + .../RCU/Design/Requirements/Requirements.htmlx | 2741 ++++++++++++++++++ + Documentation/RCU/Design/htmlqqz.sh | 108 + + Documentation/circular-buffers.txt | 4 +- + include/linux/list.h | 14 +- + include/linux/list_bl.h | 2 +- + include/linux/list_nulls.h | 2 +- + include/linux/rculist.h | 69 +- + include/linux/rcupdate.h | 6 +- + include/linux/rcutiny.h | 8 + + include/linux/rcutree.h | 4 +- + include/linux/tracepoint.h | 4 +- + kernel/rcu/rcutorture.c | 24 +- + kernel/rcu/tree.c | 307 ++- + kernel/rcu/tree.h | 58 +- + kernel/rcu/tree_plugin.h | 60 +- + kernel/rcu/tree_trace.c | 39 +- + kernel/sched/core.c | 6 +- + lib/list_debug.c | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 4 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 22 +- + .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 1 - + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 4 - + 27 files changed, 7372 insertions(+), 264 deletions(-) + create mode 100644 Documentation/RCU/Design/Requirements/2013-08-is-it-dead.png + create mode 100644 Documentation/RCU/Design/Requirements/GPpartitionReaders1.svg + create mode 100644 Documentation/RCU/Design/Requirements/RCUApplicability.svg + create mode 100644 Documentation/RCU/Design/Requirements/ReadersPartitionGP1.svg + create mode 100644 Documentation/RCU/Design/Requirements/Requirements.html + create mode 100644 Documentation/RCU/Design/Requirements/Requirements.htmlx + create mode 100755 Documentation/RCU/Design/htmlqqz.sh +Merging kvm/linux-next (d792abacaf1a Merge tag 'kvm-s390-master-4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master) +$ git merge kvm/linux-next +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'recursive' strategy. + arch/mips/kvm/emulate.c | 2 +- + arch/mips/kvm/locore.S | 16 ++++++++----- + arch/mips/kvm/mips.c | 5 +++- + arch/s390/kvm/interrupt.c | 7 ++++-- + arch/s390/kvm/kvm-s390.c | 6 ++++- + arch/s390/kvm/priv.c | 2 +- + arch/s390/kvm/sigp.c | 8 ++----- + arch/x86/kvm/x86.c | 61 +++++++++++++++++++++++++---------------------- + include/linux/kvm_host.h | 11 +++++++++ + 9 files changed, 71 insertions(+), 47 deletions(-) +Merging kvm-arm/next (26caea7693cb KVM: arm/arm64: Merge vgic_set_lr() and vgic_sync_lr_elrsr()) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (a3eaa8649e4c KVM: VMX: Fix commit which broke PML) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (d7d9f3b2408e KVM: Create debugfs dir and stat files for each VM) +$ git merge kvms390/next +Recorded preimage for 'arch/s390/kvm/interrupt.c' +Recorded preimage for 'arch/s390/kvm/sigp.c' +Recorded preimage for 'include/linux/kvm_host.h' +Auto-merging include/linux/kvm_host.h +CONFLICT (content): Merge conflict in include/linux/kvm_host.h +Auto-merging arch/s390/kvm/sigp.c +CONFLICT (content): Merge conflict in arch/s390/kvm/sigp.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kvm/interrupt.c +CONFLICT (content): Merge conflict in arch/s390/kvm/interrupt.c +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/s390/include/asm/sclp.h +Auto-merging arch/s390/include/asm/elf.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/s390/kvm/interrupt.c'. +Recorded resolution for 'arch/s390/kvm/sigp.c'. +Recorded resolution for 'include/linux/kvm_host.h'. +[master 3e8cb6452d3f] Merge remote-tracking branch 'kvms390/next' +$ git diff -M --stat --summary HEAD^.. + arch/powerpc/kvm/book3s_hv.c | 10 +- + arch/s390/include/asm/elf.h | 7 ++ + arch/s390/include/asm/kvm_host.h | 49 +++++++- + arch/s390/include/asm/sclp.h | 8 +- + arch/s390/kernel/processor.c | 6 + + arch/s390/kernel/setup.c | 9 ++ + arch/s390/kvm/diag.c | 11 +- + arch/s390/kvm/gaccess.c | 38 ++++-- + arch/s390/kvm/intercept.c | 7 +- + arch/s390/kvm/interrupt.c | 133 ++++++++++++++++----- + arch/s390/kvm/kvm-s390.c | 249 ++++++++++++++++++++++++++++----------- + arch/s390/kvm/kvm-s390.h | 7 ++ + drivers/s390/char/sclp_early.c | 16 ++- + include/linux/kvm_host.h | 13 +- + virt/kvm/kvm_main.c | 218 +++++++++++++++++++++++++++++----- + 15 files changed, 612 insertions(+), 169 deletions(-) +$ git am -3 ../patches/0001-KVM-s390-update-for-kvm_lookup_vcpu-name-change.patch +Applying: KVM: s390: update for kvm_lookup_vcpu name change +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/kvm/book3s_hv.c +M arch/s390/kvm/diag.c +M virt/kvm/kvm_main.c +$ git add -A . +$ git commit -v -a --amend +[master b803f7e4bb22] Merge remote-tracking branch 'kvms390/next' + Date: Fri Nov 20 12:41:20 2015 +1100 +Merging xen-tip/linux-next (abed7d0710e8 xen: fix the check of e_pfn in xen_find_pfn_range) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + arch/ia64/include/asm/percpu.h | 2 -- + include/linux/percpu-refcount.h | 2 +- + include/linux/percpu.h | 6 ------ + 3 files changed, 1 insertion(+), 9 deletions(-) +Merging workqueues/for-next (4fcfc3013144 Merge branch 'for-4.4' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (b82983401684 asus-wmi: fix error handling in store_sys_wmi()) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging regmap/for-next (760d93aa0258 Merge remote-tracking branches 'regmap/topic/mmio' and 'regmap/topic/rbtree' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + arch/mips/boot/dts/brcm/bcm6328.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7125.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7346.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7358.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7360.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7362.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7420.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7425.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7435.dtsi | 1 - + drivers/base/regmap/regcache-rbtree.c | 9 +++++++-- + drivers/base/regmap/regmap-mmio.c | 16 ++++++++-------- + 11 files changed, 15 insertions(+), 19 deletions(-) +Merging hsi/for-next (16bd5865cdb3 hsi: controllers:remove redundant code) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (f3b7edb12431 led: flash: Remove checking for state < 1 in flash_strobe_store()) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + Documentation/leds/leds-class.txt | 13 +++ + drivers/leds/led-class-flash.c | 8 +- + drivers/leds/led-class.c | 6 +- + drivers/leds/led-core.c | 120 ++++++++++++++++++------- + drivers/leds/leds-88pm860x.c | 23 ++--- + drivers/leds/leds-aat1290.c | 50 +++-------- + drivers/leds/leds-adp5520.c | 26 ++---- + drivers/leds/leds-bd2802.c | 39 +++----- + drivers/leds/leds-blinkm.c | 87 ++++-------------- + drivers/leds/leds-da903x.c | 46 ++++------ + drivers/leds/leds-da9052.c | 39 +++----- + drivers/leds/leds-dac124s085.c | 38 +++----- + drivers/leds/leds-gpio.c | 62 +++++-------- + drivers/leds/leds-ktd2692.c | 50 +++-------- + drivers/leds/leds-lm3533.c | 30 ++----- + drivers/leds/leds-lm355x.c | 85 ++++++------------ + drivers/leds/leds-lm3642.c | 73 +++++---------- + drivers/leds/leds-lp3944.c | 32 ++----- + drivers/leds/leds-lp5521.c | 11 +-- + drivers/leds/leds-lp5523.c | 10 +-- + drivers/leds/leds-lp5562.c | 11 +-- + drivers/leds/leds-lp55xx-common.c | 12 ++- + drivers/leds/leds-lp55xx-common.h | 6 +- + drivers/leds/leds-lp8501.c | 11 +-- + drivers/leds/leds-lp8788.c | 48 +++++----- + drivers/leds/leds-lp8860.c | 27 ++---- + drivers/leds/leds-lt3593.c | 33 +++---- + drivers/leds/leds-max77693.c | 57 ++---------- + drivers/leds/leds-max8997.c | 1 - + drivers/leds/leds-mc13783.c | 35 ++------ + drivers/leds/leds-pca9532.c | 28 +++--- + drivers/leds/leds-pca955x.c | 39 ++------ + drivers/leds/leds-pca963x.c | 80 +++++------------ + drivers/leds/leds-pwm.c | 35 +++----- + drivers/leds/leds-regulator.c | 46 +++------- + drivers/leds/leds-tlc591xx.c | 31 ++----- + drivers/leds/leds-wm831x-status.c | 25 ++---- + drivers/leds/leds-wm8350.c | 64 ++++++------- + drivers/leds/leds.h | 27 +----- + drivers/leds/trigger/ledtrig-backlight.c | 8 +- + drivers/leds/trigger/ledtrig-default-on.c | 2 +- + drivers/leds/trigger/ledtrig-gpio.c | 6 +- + drivers/leds/trigger/ledtrig-heartbeat.c | 4 +- + drivers/leds/trigger/ledtrig-oneshot.c | 6 +- + drivers/leds/trigger/ledtrig-transient.c | 10 +-- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 8 +- + include/linux/leds.h | 27 ++++-- + include/linux/mfd/wm8350/pmic.h | 1 - + 48 files changed, 543 insertions(+), 993 deletions(-) +Merging ipmi/for-next (d503e2fbbfea char: ipmi: ipmi_ssif: Replace timeval with timespec64) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + Documentation/IPMI.txt | 7 +++- + drivers/char/ipmi/ipmi_si_intf.c | 82 +++++++++++++++++++++++++-------------- + drivers/char/ipmi/ipmi_watchdog.c | 8 +++- + 3 files changed, 64 insertions(+), 33 deletions(-) +Merging driver-core/driver-core-next (8005c49d9aea Linux 4.4-rc1) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (8005c49d9aea Linux 4.4-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging usb/usb-next (8005c49d9aea Linux 4.4-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (8005c49d9aea Linux 4.4-rc1) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (d0bf1ff0ae32 USB: cp210x: work around cp2108 GET_LINE_CTL bug) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/cp210x.c | 128 +++++++++++++++++++++++++++++++++++--------- + 1 file changed, 104 insertions(+), 24 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (15af5aea51de usb: chipidea: removing of_find_property) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Removing drivers/usb/chipidea/debug.h +Auto-merging drivers/usb/chipidea/debug.c +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +Merge made by the 'recursive' strategy. + Documentation/usb/chipidea.txt | 4 +-- + drivers/usb/chipidea/Kconfig | 5 ---- + drivers/usb/chipidea/Makefile | 5 +--- + drivers/usb/chipidea/ci.h | 3 ++ + drivers/usb/chipidea/ci_hdrc_imx.c | 6 ++++ + drivers/usb/chipidea/core.c | 59 ++++++++++++++------------------------ + drivers/usb/chipidea/debug.c | 1 - + drivers/usb/chipidea/debug.h | 30 ------------------- + drivers/usb/chipidea/udc.c | 28 ++++++++++++------ + 9 files changed, 54 insertions(+), 87 deletions(-) + delete mode 100644 drivers/usb/chipidea/debug.h +Merging staging/staging-next (e3f8f77c41ce staging: unisys: fix vbuschannel.h comments) +$ git merge staging/staging-next +Auto-merging drivers/staging/wilc1000/coreconfigurator.c +Removing drivers/staging/sm750fb/modedb.h +Merge made by the 'recursive' strategy. + drivers/staging/android/ion/compat_ion.c | 6 +- + drivers/staging/android/lowmemorykiller.c | 6 +- + drivers/staging/android/sync.c | 22 +- + drivers/staging/android/timed_gpio.c | 11 +- + drivers/staging/comedi/Kconfig | 12 +- + drivers/staging/comedi/drivers/Makefile | 1 + + drivers/staging/comedi/drivers/adl_pci9118.c | 3 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 109 +- + drivers/staging/comedi/drivers/adv_pci1720.c | 195 ++++ + drivers/staging/comedi/drivers/das16.c | 3 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 18 +- + drivers/staging/dgnc/dgnc_utils.c | 1 - + drivers/staging/fwserial/fwserial.c | 3 +- + drivers/staging/fwserial/fwserial.h | 10 - + drivers/staging/gdm724x/gdm_lte.c | 2 +- + drivers/staging/gdm724x/netlink_k.c | 5 - + drivers/staging/gdm724x/netlink_k.h | 1 - + drivers/staging/gdm72xx/gdm_qos.c | 52 +- + drivers/staging/gdm72xx/gdm_wimax.c | 9 +- + .../lustre/include/linux/libcfs/libcfs_hash.h | 154 ++- + .../include/linux/libcfs/libcfs_kernelcomm.h | 2 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 2 - + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 2 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 11 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 3 + + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 2 - + drivers/staging/lustre/lnet/lnet/api-ni.c | 16 +- + drivers/staging/lustre/lnet/lnet/config.c | 24 +- + drivers/staging/lustre/lnet/lnet/module.c | 2 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 4 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 4 +- + drivers/staging/lustre/lnet/selftest/console.c | 88 +- + drivers/staging/lustre/lnet/selftest/framework.c | 8 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 23 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 16 +- + drivers/staging/lustre/lustre/fid/fid_internal.h | 2 - + drivers/staging/lustre/lustre/fid/fid_request.c | 23 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 34 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 9 - + drivers/staging/lustre/lustre/fld/fld_request.c | 2 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 3 - + .../staging/lustre/lustre/include/lustre_disk.h | 1 + + drivers/staging/lustre/lustre/include/lustre_dlm.h | 2 - + drivers/staging/lustre/lustre/include/obd.h | 322 +++--- + drivers/staging/lustre/lustre/include/obd_class.h | 16 +- + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 4 +- + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 16 +- + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 47 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 2 - + drivers/staging/lustre/lustre/libcfs/debug.c | 16 +- + drivers/staging/lustre/lustre/libcfs/fail.c | 2 +- + drivers/staging/lustre/lustre/libcfs/hash.c | 380 ++++--- + .../lustre/lustre/libcfs/kernel_user_comm.c | 3 +- + drivers/staging/lustre/lustre/libcfs/libcfs_mem.c | 2 - + .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 30 +- + .../lustre/libcfs/linux/linux-crypto-adler.c | 9 +- + .../lustre/lustre/libcfs/linux/linux-debug.c | 1 - + drivers/staging/lustre/lustre/libcfs/module.c | 6 +- + drivers/staging/lustre/lustre/libcfs/tracefile.c | 27 +- + drivers/staging/lustre/lustre/libcfs/tracefile.h | 15 - + drivers/staging/lustre/lustre/libcfs/workitem.c | 10 +- + drivers/staging/lustre/lustre/llite/dir.c | 11 +- + .../staging/lustre/lustre/llite/llite_internal.h | 10 - + drivers/staging/lustre/lustre/llite/lloop.c | 2 +- + drivers/staging/lustre/lustre/llite/super25.c | 2 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 21 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 14 - + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 94 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 15 - + drivers/staging/lustre/lustre/lov/lov_obd.c | 60 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 3 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 16 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 15 - + drivers/staging/lustre/lustre/mdc/mdc_request.c | 116 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 32 +- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 3 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 2 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 6 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 21 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 10 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 10 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 6 - + drivers/staging/lustre/lustre/osc/osc_request.c | 69 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 6 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 3 - + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 1 + + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 3 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 393 ++++--- + drivers/staging/most/aim-network/networking.h | 2 - + drivers/staging/most/hdm-dim2/dim2_errors.h | 2 - + drivers/staging/most/hdm-dim2/dim2_hal.c | 133 +-- + drivers/staging/most/hdm-dim2/dim2_hal.h | 53 +- + drivers/staging/most/hdm-dim2/dim2_hdm.c | 60 +- + drivers/staging/most/hdm-dim2/dim2_reg.h | 5 +- + drivers/staging/most/hdm-dim2/dim2_sysfs.h | 3 - + drivers/staging/most/mostcore/core.c | 3 +- + drivers/staging/most/mostcore/mostcore.h | 2 - + drivers/staging/nvec/README | 2 +- + drivers/staging/nvec/nvec.c | 20 +- + drivers/staging/octeon/ethernet-defines.h | 2 +- + drivers/staging/rdma/amso1100/c2.c | 11 +- + drivers/staging/rdma/amso1100/c2.h | 80 +- + drivers/staging/rdma/amso1100/c2_mq.h | 14 +- + drivers/staging/rdma/amso1100/c2_rnic.c | 5 +- + drivers/staging/rdma/amso1100/c2_vq.h | 20 +- + drivers/staging/rdma/hfi1/chip.c | 71 +- + drivers/staging/rdma/hfi1/chip.h | 1 + + drivers/staging/rdma/hfi1/common.h | 15 +- + drivers/staging/rdma/hfi1/driver.c | 103 +- + drivers/staging/rdma/hfi1/file_ops.c | 178 ++-- + drivers/staging/rdma/hfi1/firmware.c | 2 +- + drivers/staging/rdma/hfi1/hfi.h | 26 - + drivers/staging/rdma/hfi1/init.c | 31 +- + drivers/staging/rdma/hfi1/mad.c | 4 +- + drivers/staging/rdma/hfi1/pcie.c | 32 +- + drivers/staging/rdma/hfi1/pio.c | 19 +- + drivers/staging/rdma/hfi1/qsfp.c | 5 +- + drivers/staging/rdma/hfi1/rc.c | 10 +- + drivers/staging/rdma/hfi1/sdma.c | 40 +- + drivers/staging/rdma/hfi1/uc.c | 15 +- + drivers/staging/rdma/hfi1/user_exp_rcv.h | 74 ++ + drivers/staging/rdma/hfi1/user_sdma.c | 44 +- + drivers/staging/rdma/hfi1/user_sdma.h | 10 +- + drivers/staging/rdma/hfi1/verbs.c | 41 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 54 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 100 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 7 - + drivers/staging/rtl8188eu/core/rtw_mlme.c | 22 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 84 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 14 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 11 +- + drivers/staging/rtl8188eu/hal/fw.c | 40 +- + drivers/staging/rtl8188eu/hal/hal_com.c | 14 +- + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 7 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 34 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 10 +- + drivers/staging/rtl8188eu/include/HalVerDef.h | 33 - + drivers/staging/rtl8188eu/include/osdep_service.h | 2 - + drivers/staging/rtl8188eu/include/rtw_xmit.h | 1 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 10 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 6 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 5 +- + drivers/staging/rtl8192u/r8192U_core.c | 15 - + drivers/staging/rtl8192u/r819xU_phy.c | 25 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 8 +- + drivers/staging/rtl8723au/core/rtw_efuse.c | 45 +- + drivers/staging/sm750fb/modedb.h | 233 ---- + drivers/staging/sm750fb/sm750.c | 2 - + drivers/staging/unisys/include/channel.h | 114 +- + drivers/staging/unisys/include/iochannel.h | 157 ++- + drivers/staging/unisys/include/vbushelper.h | 3 +- + drivers/staging/unisys/include/visorbus.h | 4 +- + .../unisys/visorbus/controlvmcompletionstatus.h | 24 +- + drivers/staging/unisys/visorbus/periodic_work.c | 11 +- + drivers/staging/unisys/visorbus/vbuschannel.h | 9 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 15 +- + drivers/staging/unisys/visorbus/visorchannel.c | 4 +- + drivers/staging/unisys/visorbus/vmcallinterface.h | 34 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 16 +- + drivers/staging/unisys/visorinput/visorinput.c | 4 +- + drivers/staging/vt6656/key.c | 1 - + drivers/staging/wilc1000/Makefile | 6 +- + drivers/staging/wilc1000/coreconfigurator.c | 1 - + drivers/staging/wilc1000/coreconfigurator.h | 2 +- + drivers/staging/wilc1000/host_interface.c | 1120 ++++++++++---------- + drivers/staging/wilc1000/host_interface.h | 998 +++-------------- + drivers/staging/wilc1000/linux_mon.c | 2 +- + drivers/staging/wilc1000/linux_wlan.c | 622 ++++------- + drivers/staging/wilc1000/linux_wlan_sdio.c | 4 +- + drivers/staging/wilc1000/linux_wlan_sdio.h | 2 +- + drivers/staging/wilc1000/linux_wlan_spi.c | 2 +- + drivers/staging/wilc1000/linux_wlan_spi.h | 2 +- + drivers/staging/wilc1000/wilc_sdio.c | 91 +- + drivers/staging/wilc1000/wilc_spi.c | 164 ++- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 194 ++-- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 2 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 6 +- + drivers/staging/wilc1000/wilc_wlan.c | 835 +++++---------- + drivers/staging/wilc1000/wilc_wlan.h | 324 +++--- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 2 +- + drivers/staging/wilc1000/wilc_wlan_cfg.h | 2 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 26 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 34 +- + drivers/staging/wlan-ng/p80211netdev.h | 1 - + drivers/staging/wlan-ng/prism2mgmt.h | 1 - + drivers/staging/wlan-ng/prism2mib.c | 5 +- + drivers/staging/wlan-ng/prism2sta.c | 21 - + include/uapi/rdma/hfi/hfi1_user.h | 26 +- + 193 files changed, 3850 insertions(+), 5737 deletions(-) + create mode 100644 drivers/staging/comedi/drivers/adv_pci1720.c + create mode 100644 drivers/staging/rdma/hfi1/user_exp_rcv.h + delete mode 100644 drivers/staging/sm750fb/modedb.h +Merging char-misc/char-misc-next (8005c49d9aea Linux 4.4-rc1) +$ git merge char-misc/char-misc-next +Already up-to-date. +Merging extcon/extcon-next (36a868729646 extcon: arizona: Update DT binding documentation for jack detection) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-arizona.txt | 26 ++++++++++++++++++++++ + drivers/extcon/extcon-arizona.c | 13 +++++++++++ + 2 files changed, 39 insertions(+) +Merging cgroup/for-next (6c2920926b10 cgroup: replace unified-hierarchy.txt with a proper cgroup v2 documentation) +$ git merge cgroup/for-next +Auto-merging include/uapi/linux/magic.h +Removing Documentation/cgroups/unified-hierarchy.txt +Auto-merging Documentation/cgroup-legacy/blkio-controller.txt +Merge made by the 'recursive' strategy. + Documentation/{cgroups => cgroup-legacy}/00-INDEX | 0 + .../blkio-controller.txt | 79 -- + .../{cgroups => cgroup-legacy}/cgroups.txt | 0 + .../{cgroups => cgroup-legacy}/cpuacct.txt | 0 + .../{cgroups => cgroup-legacy}/cpusets.txt | 0 + .../{cgroups => cgroup-legacy}/devices.txt | 0 + .../freezer-subsystem.txt | 0 + .../{cgroups => cgroup-legacy}/hugetlb.txt | 0 + .../{cgroups => cgroup-legacy}/memcg_test.txt | 0 + .../{cgroups => cgroup-legacy}/memory.txt | 0 + .../{cgroups => cgroup-legacy}/net_cls.txt | 0 + .../{cgroups => cgroup-legacy}/net_prio.txt | 0 + Documentation/{cgroups => cgroup-legacy}/pids.txt | 0 + Documentation/cgroup.txt | 1293 ++++++++++++++++++++ + Documentation/cgroups/unified-hierarchy.txt | 647 ---------- + include/linux/cgroup-defs.h | 5 - + include/linux/cgroup.h | 14 +- + include/uapi/linux/magic.h | 1 + + kernel/cgroup.c | 89 +- + 19 files changed, 1352 insertions(+), 776 deletions(-) + rename Documentation/{cgroups => cgroup-legacy}/00-INDEX (100%) + rename Documentation/{cgroups => cgroup-legacy}/blkio-controller.txt (81%) + rename Documentation/{cgroups => cgroup-legacy}/cgroups.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/cpuacct.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/cpusets.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/devices.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/freezer-subsystem.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/hugetlb.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/memcg_test.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/memory.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/net_cls.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/net_prio.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/pids.txt (100%) + create mode 100644 Documentation/cgroup.txt + delete mode 100644 Documentation/cgroups/unified-hierarchy.txt +Merging scsi/for-next (0a5149ba02bd mpt3sas: fix inline markers on non inline function declarations) +$ git merge scsi/for-next +Already up-to-date. +Merging target-updates/for-next (517982229f78 configfs: remove old API) +$ git merge target-updates/for-next +Already up-to-date. +Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging pinctrl/for-next (b21bcac08c20 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/Kconfig | 4 ---- + drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c | 3 +-- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 8 ++++++-- + drivers/pinctrl/pinctrl-single.c | 5 +---- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +- + 6 files changed, 10 insertions(+), 14 deletions(-) +Merging vhost/linux-next (d629f2b585cb virtio: introduce avail cache) +$ git merge vhost/linux-next +Merge made by the 'recursive' strategy. + drivers/virtio/virtio_ring.c | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) +Merging remoteproc/for-next (8de3dbd0895b remoteproc: fix !CONFIG_OF build breakage) +$ 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 (b59d5fb7e9c7 gpio-tegra: Do not create the debugfs entry by default) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + drivers/gpio/gpio-74xx-mmio.c | 7 ++- + drivers/gpio/gpio-palmas.c | 2 + + drivers/gpio/gpio-syscon.c | 6 ++- + drivers/gpio/gpio-tegra.c | 105 ++++++++++++++++++++++-------------------- + 4 files changed, 68 insertions(+), 52 deletions(-) +Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (5dcd7b42f1d0 pwm: sunxi: Fix whitespace issue) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (86ea07ca846a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (b953c0d234bc Linux 4.1) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (47c5ee34d8d9 clk: versatile: fix memory leak) +$ git merge clk/clk-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/tango4-clock.txt | 23 ++++++ + drivers/clk/Makefile | 1 + + drivers/clk/clk-tango4.c | 61 +++++++++++++++ + drivers/clk/qcom/common.c | 87 ++++++++++++++++++++++ + drivers/clk/qcom/common.h | 4 + + drivers/clk/qcom/gcc-apq8084.c | 16 ++-- + drivers/clk/qcom/gcc-ipq806x.c | 14 ++-- + drivers/clk/qcom/gcc-msm8660.c | 15 ++-- + drivers/clk/qcom/gcc-msm8960.c | 14 ++-- + drivers/clk/qcom/gcc-msm8974.c | 17 ++--- + drivers/clk/versatile/clk-sp810.c | 1 + + 11 files changed, 210 insertions(+), 43 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/tango4-clock.txt + create mode 100644 drivers/clk/clk-tango4.c +Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) +$ git merge random/dev +Already up-to-date. +Merging aio/master (6ff33f3902c3 Linux 4.3-rc1) +$ git merge aio/master +Already up-to-date. +Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +Merging kselftest/next (8005c49d9aea Linux 4.4-rc1) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (8750343a6505 coredump: Use 64bit time for unix time of coredump) +$ git merge y2038/y2038 +Auto-merging kernel/cpuset.c +Auto-merging fs/coredump.c +Auto-merging drivers/staging/media/lirc/lirc_serial.c +Auto-merging drivers/staging/media/lirc/lirc_sasem.c +Auto-merging drivers/staging/gdm72xx/gdm_sdio.c +Merge made by the 'recursive' strategy. + drivers/staging/gdm72xx/gdm_sdio.c | 13 ++++---- + drivers/staging/gdm72xx/gdm_sdio.h | 4 +-- + drivers/staging/media/lirc/lirc_parallel.c | 35 +++++++++------------ + drivers/staging/media/lirc/lirc_sasem.c | 20 ++++++------ + drivers/staging/media/lirc/lirc_serial.c | 50 ++++++++++-------------------- + fs/coredump.c | 8 +++-- + kernel/cpuset.c | 12 ++++--- + 7 files changed, 62 insertions(+), 80 deletions(-) +Merging luto-misc/next (a6c5170d1ede Merge branch 'for-4.0' of git://linux-nfs.org/~bfields/linux) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (fc7f9754db6c s390/dma: Allow per device dma ops) +$ git merge borntraeger/linux-next +Auto-merging lib/Makefile +Auto-merging include/linux/dma-mapping.h +Auto-merging arch/s390/pci/pci_dma.c +Auto-merging arch/s390/pci/pci.c +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/alpha/kernel/pci-noop.c | 46 ++--------------------- + arch/s390/Kconfig | 7 +--- + arch/s390/include/asm/device.h | 6 ++- + arch/s390/include/asm/dma-mapping.h | 6 ++- + arch/s390/pci/pci.c | 1 + + arch/s390/pci/pci_dma.c | 4 +- + include/linux/dma-mapping.h | 2 + + lib/Makefile | 1 + + lib/dma-noop.c | 75 +++++++++++++++++++++++++++++++++++++ + 9 files changed, 96 insertions(+), 52 deletions(-) + create mode 100644 lib/dma-noop.c +Merging livepatching/for-next (2184037e40ce Merge branch 'for-4.4/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (a0aede15d496 coresight: checking for NULL string in coresight_name_match()) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc/rtc-next (1e3929ef0e1c rtc: Add a driver for Micro Crystal RV8803) +$ git merge rtc/rtc-next +Already up-to-date. +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (8de5dff8bae6 libnvdimm: documentation clarifications) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging akpm-current/current (c5257ff11a2f ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Auto-merging lib/test_hexdump.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/dma-mapping.h +Removing include/asm-generic/dma-mapping-common.h +Removing include/asm-generic/dma-mapping-broken.h +Removing include/asm-generic/dma-coherent.h +Auto-merging fs/gfs2/main.c +Auto-merging fs/ecryptfs/main.c +Auto-merging drivers/staging/lustre/lustre/llite/super25.c +Auto-merging drivers/staging/lustre/include/linux/libcfs/libcfs_private.h +Auto-merging drivers/media/platform/Kconfig +Auto-merging drivers/media/pci/cx88/cx88-video.c +Auto-merging drivers/media/pci/cx88/cx88-alsa.c +Auto-merging drivers/gpu/drm/imx/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/tile/Kconfig +Auto-merging arch/s390/mm/gup.c +Auto-merging arch/s390/include/asm/dma-mapping.h +Auto-merging arch/h8300/Kconfig +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/include/asm/dma-mapping.h +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/features/vm/pmdp_splitting_flush/arch-support.txt +Removing Documentation/features/io/dma_map_attrs/arch-support.txt +Merge made by the 'recursive' strategy. + Documentation/DMA-API-HOWTO.txt | 10 - + .../features/io/dma_map_attrs/arch-support.txt | 40 - + .../vm/pmdp_splitting_flush/arch-support.txt | 40 - + Documentation/filesystems/proc.txt | 21 +- + Documentation/filesystems/vfat.txt | 10 + + Documentation/vm/transhuge.txt | 151 +- + MAINTAINERS | 13 + + arch/Kconfig | 6 +- + arch/alpha/Kconfig | 1 - + arch/alpha/include/asm/dma-mapping.h | 2 - + arch/arc/include/asm/dma-mapping.h | 187 +-- + arch/arc/mm/cache.c | 4 +- + arch/arc/mm/dma.c | 151 +- + arch/arm/Kconfig | 1 - + arch/arm/include/asm/dma-mapping.h | 7 - + arch/arm/include/asm/pgtable-3level.h | 9 - + arch/arm/lib/uaccess_with_memcpy.c | 5 +- + arch/arm/mm/dma-mapping.c | 11 +- + arch/arm/mm/flush.c | 17 +- + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/dma-mapping.h | 2 - + arch/arm64/include/asm/pgtable.h | 8 - + arch/arm64/mm/flush.c | 16 - + arch/avr32/include/asm/dma-mapping.h | 342 +---- + arch/avr32/mm/dma-coherent.c | 115 +- + arch/blackfin/include/asm/dma-mapping.h | 127 +- + arch/blackfin/kernel/dma-mapping.c | 52 +- + arch/c6x/Kconfig | 1 + + arch/c6x/include/asm/dma-mapping.h | 96 +- + arch/c6x/kernel/dma.c | 91 +- + arch/cris/arch-v32/drivers/pci/dma.c | 54 +- + arch/cris/include/asm/dma-mapping.h | 161 +-- + arch/frv/Kconfig | 1 + + arch/frv/include/asm/dma-mapping.h | 132 +- + arch/frv/mb93090-mb00/pci-dma-nommu.c | 72 +- + arch/frv/mb93090-mb00/pci-dma.c | 74 +- + arch/h8300/Kconfig | 1 - + arch/h8300/include/asm/dma-mapping.h | 2 - + arch/hexagon/Kconfig | 1 - + arch/hexagon/include/asm/dma-mapping.h | 2 - + arch/ia64/Kconfig | 1 - + arch/ia64/include/asm/dma-mapping.h | 2 - + arch/m68k/include/asm/dma-mapping.h | 112 +- + arch/m68k/kernel/dma.c | 61 +- + arch/metag/include/asm/dma-mapping.h | 179 +-- + arch/metag/kernel/dma.c | 146 +- + arch/microblaze/Kconfig | 1 - + arch/microblaze/include/asm/dma-mapping.h | 2 - + arch/mips/Kconfig | 1 - + arch/mips/include/asm/dma-mapping.h | 2 - + arch/mips/include/asm/pgtable-bits.h | 10 +- + arch/mips/include/asm/pgtable.h | 18 - + arch/mips/mm/c-r4k.c | 3 +- + arch/mips/mm/cache.c | 2 +- + arch/mips/mm/gup.c | 17 +- + arch/mips/mm/init.c | 6 +- + arch/mips/mm/pgtable-64.c | 14 - + arch/mips/mm/tlbex.c | 1 - + arch/mn10300/Kconfig | 1 + + arch/mn10300/include/asm/dma-mapping.h | 161 +-- + arch/mn10300/mm/dma-alloc.c | 67 +- + arch/nios2/include/asm/dma-mapping.h | 123 +- + arch/nios2/mm/dma-mapping.c | 147 +- + arch/openrisc/Kconfig | 3 - + arch/openrisc/include/asm/dma-mapping.h | 2 - + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/dma-mapping.h | 189 +-- + arch/parisc/kernel/drivers.c | 2 +- + arch/parisc/kernel/pci-dma.c | 92 +- + arch/powerpc/Kconfig | 1 - + arch/powerpc/include/asm/dma-mapping.h | 2 - + arch/powerpc/include/asm/pgtable-ppc64.h | 27 +- + arch/powerpc/mm/hugepage-hash64.c | 3 - + arch/powerpc/mm/hugetlbpage.c | 17 +- + arch/powerpc/mm/pgtable_64.c | 49 - + arch/powerpc/mm/subpage-prot.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 2 +- + arch/s390/include/asm/dma-mapping.h | 2 - + arch/s390/include/asm/pgtable.h | 16 +- + arch/s390/mm/gup.c | 24 +- + arch/s390/mm/pgtable.c | 21 +- + arch/sh/Kconfig | 1 - + arch/sh/include/asm/dma-mapping.h | 2 - + arch/sh/mm/cache-sh4.c | 2 +- + arch/sh/mm/cache.c | 8 +- + arch/sparc/Kconfig | 1 - + arch/sparc/include/asm/dma-mapping.h | 17 - + arch/sparc/include/asm/pgtable_64.h | 16 - + arch/sparc/mm/fault_64.c | 3 - + arch/sparc/mm/gup.c | 16 +- + arch/tile/Kconfig | 1 - + arch/tile/include/asm/dma-mapping.h | 32 +- + arch/tile/include/asm/pgtable.h | 10 - + arch/tile/kernel/pci-dma.c | 29 + + arch/unicore32/Kconfig | 1 - + arch/unicore32/include/asm/dma-mapping.h | 2 - + arch/x86/Kconfig | 1 - + arch/x86/include/asm/dma-mapping.h | 2 - + arch/x86/include/asm/pgtable.h | 9 - + arch/x86/include/asm/pgtable_types.h | 2 - + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/vm86_32.c | 6 +- + arch/x86/mm/gup.c | 17 +- + arch/x86/mm/pgtable.c | 14 - + arch/xtensa/Kconfig | 1 - + arch/xtensa/include/asm/dma-mapping.h | 4 - + arch/xtensa/mm/tlb.c | 2 +- + block/genhd.c | 2 +- + drivers/acpi/apei/erst.c | 6 +- + drivers/base/dma-mapping.c | 7 +- + drivers/block/drbd/drbd_bitmap.c | 26 +- + drivers/block/drbd/drbd_int.h | 3 - + drivers/char/mspec.c | 15 +- + drivers/gpu/drm/Kconfig | 4 +- + drivers/gpu/drm/drm_hashtab.c | 5 +- + drivers/gpu/drm/imx/Kconfig | 2 +- + drivers/gpu/drm/rcar-du/Kconfig | 2 +- + drivers/gpu/drm/shmobile/Kconfig | 2 +- + drivers/gpu/drm/sti/Kconfig | 2 +- + drivers/gpu/drm/tilcdc/Kconfig | 2 +- + drivers/iio/industrialio-core.c | 9 +- + drivers/media/pci/cx23885/cx23885-core.c | 4 +- + drivers/media/pci/cx25821/cx25821-core.c | 3 +- + drivers/media/pci/cx88/cx88-alsa.c | 4 +- + drivers/media/pci/cx88/cx88-mpeg.c | 3 +- + drivers/media/pci/cx88/cx88-video.c | 4 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +- + drivers/media/pci/saa7134/saa7134-core.c | 4 +- + drivers/media/pci/saa7164/saa7164-core.c | 4 +- + drivers/media/pci/tw68/tw68-core.c | 4 +- + drivers/media/platform/Kconfig | 1 - + drivers/net/ethernet/amd/pcnet32.c | 5 +- + drivers/net/wireless/iwlwifi/dvm/calib.c | 2 +- + drivers/parisc/ccio-dma.c | 57 +- + drivers/parisc/sba_iommu.c | 52 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 8 +- + drivers/staging/lustre/lustre/llite/super25.c | 3 +- + fs/9p/v9fs.c | 2 +- + fs/adfs/super.c | 2 +- + fs/affs/super.c | 2 +- + fs/afs/super.c | 2 +- + fs/befs/linuxvfs.c | 2 +- + fs/bfs/inode.c | 2 +- + fs/block_dev.c | 2 +- + fs/btrfs/inode.c | 3 +- + fs/ceph/super.c | 4 +- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/file.c | 8 +- + fs/coda/coda_linux.h | 3 +- + fs/coda/inode.c | 6 +- + fs/configfs/dir.c | 110 ++ + fs/dcache.c | 5 +- + fs/ecryptfs/main.c | 6 +- + fs/efs/super.c | 6 +- + fs/exofs/inode.c | 5 +- + fs/exofs/super.c | 4 +- + fs/ext2/super.c | 2 +- + fs/ext4/fsync.c | 5 +- + fs/ext4/super.c | 2 +- + fs/f2fs/super.c | 5 +- + fs/fat/cache.c | 79 +- + fs/fat/dir.c | 18 +- + fs/fat/fat.h | 6 +- + fs/fat/file.c | 61 + + fs/fat/inode.c | 77 +- + fs/file.c | 7 +- + fs/fuse/inode.c | 4 +- + fs/gfs2/main.c | 3 +- + fs/hfs/super.c | 4 +- + fs/hfsplus/super.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/super.c | 2 +- + fs/hugetlbfs/inode.c | 69 +- + fs/inode.c | 2 +- + fs/isofs/inode.c | 2 +- + fs/jffs2/build.c | 8 +- + fs/jffs2/fs.c | 5 +- + fs/jffs2/super.c | 7 +- + fs/jfs/super.c | 2 +- + fs/kernfs/dir.c | 9 +- + fs/logfs/inode.c | 3 +- + fs/minix/inode.c | 2 +- + fs/ncpfs/inode.c | 2 +- + fs/ncpfs/ioctl.c | 2 + + fs/nfs/inode.c | 2 +- + fs/nfs/objlayout/objio_osd.c | 5 +- + fs/nilfs2/super.c | 3 +- + fs/notify/inode_mark.c | 3 +- + fs/ntfs/super.c | 4 +- + fs/ocfs2/alloc.c | 105 +- + fs/ocfs2/aops.c | 1120 +++++++-------- + fs/ocfs2/aops.h | 11 +- + fs/ocfs2/dlm/dlmconvert.c | 24 +- + fs/ocfs2/dlm/dlmrecovery.c | 1 - + fs/ocfs2/dlmfs/dlmfs.c | 2 +- + fs/ocfs2/file.c | 138 +- + fs/ocfs2/inode.c | 3 + + fs/ocfs2/inode.h | 3 + + fs/ocfs2/journal.c | 8 +- + fs/ocfs2/localalloc.c | 4 +- + fs/ocfs2/mmap.c | 4 +- + fs/ocfs2/namei.c | 2 + + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/ocfs2_trace.h | 16 +- + fs/ocfs2/quota_global.c | 2 +- + fs/ocfs2/resize.c | 2 +- + fs/ocfs2/super.c | 48 +- + fs/ocfs2/super.h | 2 - + fs/openpromfs/inode.c | 2 +- + fs/proc/inode.c | 3 +- + fs/proc/page.c | 4 +- + fs/proc/task_mmu.c | 125 +- + fs/qnx4/inode.c | 2 +- + fs/qnx6/inode.c | 2 +- + fs/reiserfs/super.c | 3 +- + fs/romfs/super.c | 4 +- + fs/squashfs/super.c | 3 +- + fs/stat.c | 2 +- + fs/sysv/inode.c | 2 +- + fs/ubifs/super.c | 4 +- + fs/udf/super.c | 10 +- + fs/ufs/super.c | 2 +- + fs/xattr.c | 33 +- + fs/xfs/kmem.h | 1 + + fs/xfs/xfs_super.c | 4 +- + include/asm-generic/dma-coherent.h | 32 - + include/asm-generic/dma-mapping-broken.h | 95 -- + include/asm-generic/dma-mapping-common.h | 358 ----- + include/asm-generic/memory_model.h | 2 +- + include/asm-generic/pgtable.h | 9 - + include/asm-generic/sections.h | 65 + + include/linux/configfs.h | 10 + + include/linux/crc64_ecma.h | 56 + + include/linux/dma-attrs.h | 10 - + include/linux/dma-mapping.h | 411 +++++- + include/linux/gfp.h | 20 +- + include/linux/huge_mm.h | 61 +- + include/linux/hugetlb.h | 10 +- + include/linux/kdev_t.h | 5 - + include/linux/kernel.h | 36 +- + include/linux/kexec.h | 2 + + include/linux/memblock.h | 4 +- + include/linux/memcontrol.h | 31 +- + include/linux/mempolicy.h | 4 +- + include/linux/mm.h | 137 +- + include/linux/mm_types.h | 27 +- + include/linux/mmdebug.h | 6 + + include/linux/mmzone.h | 31 +- + include/linux/page-flags.h | 282 ++-- + include/linux/pagemap.h | 38 +- + include/linux/pfn.h | 1 + + include/linux/poison.h | 6 +- + include/linux/rmap.h | 16 +- + include/linux/shm.h | 6 +- + include/linux/shmem_fs.h | 4 + + include/linux/signal.h | 1 - + include/linux/slab.h | 50 +- + include/linux/string.h | 1 + + include/linux/swap.h | 5 +- + include/linux/thread_info.h | 5 +- + include/linux/vm_event_item.h | 4 +- + include/trace/events/huge_memory.h | 166 +++ + include/trace/events/page_isolation.h | 38 + + include/trace/events/vmscan.h | 21 +- + init/do_mounts.h | 4 +- + init/do_mounts_initrd.c | 6 +- + init/main.c | 10 +- + ipc/mqueue.c | 2 +- + ipc/msg.c | 5 +- + ipc/sem.c | 2 +- + ipc/shm.c | 2 +- + ipc/util.c | 11 +- + ipc/util.h | 2 +- + kernel/cred.c | 4 +- + kernel/delayacct.c | 2 +- + kernel/events/uprobes.c | 13 +- + kernel/fork.c | 22 +- + kernel/futex.c | 63 +- + kernel/panic.c | 5 +- + kernel/pid.c | 2 +- + kernel/printk/printk.c | 26 +- + kernel/signal.c | 2 +- + lib/Kconfig | 7 + + lib/Kconfig.debug | 8 + + lib/Makefile | 3 +- + lib/crc64_ecma.c | 341 +++++ + lib/string_helpers.c | 63 +- + lib/{test-hexdump.c => test_hexdump.c} | 120 +- + mm/debug.c | 8 +- + mm/filemap.c | 25 +- + mm/gup.c | 114 +- + mm/huge_memory.c | 1469 ++++++++++++-------- + mm/hugetlb.c | 12 +- + mm/internal.h | 74 +- + mm/kasan/kasan.c | 2 + + mm/kmemleak.c | 3 +- + mm/ksm.c | 63 +- + mm/memblock.c | 4 +- + mm/memcontrol.c | 92 +- + mm/memory-failure.c | 77 +- + mm/memory.c | 107 +- + mm/mempolicy.c | 70 +- + mm/migrate.c | 21 +- + mm/mincore.c | 2 +- + mm/mlock.c | 14 +- + mm/mmap.c | 16 +- + mm/mmzone.c | 8 +- + mm/mprotect.c | 2 +- + mm/mremap.c | 15 +- + mm/nommu.c | 2 +- + mm/oom_kill.c | 5 +- + mm/page-writeback.c | 4 +- + mm/page_alloc.c | 83 +- + mm/page_idle.c | 66 +- + mm/page_isolation.c | 18 +- + mm/pagewalk.c | 2 +- + mm/percpu.c | 18 +- + mm/pgtable-generic.c | 21 +- + mm/rmap.c | 286 ++-- + mm/shmem.c | 108 +- + mm/slab.c | 87 +- + mm/slab.h | 7 +- + mm/slab_common.c | 9 +- + mm/slob.c | 2 +- + mm/slub.c | 308 ++-- + mm/swap.c | 274 +--- + mm/swap_state.c | 4 +- + mm/swapfile.c | 16 +- + mm/userfaultfd.c | 8 +- + mm/util.c | 54 +- + mm/vmalloc.c | 25 +- + mm/vmpressure.c | 2 +- + mm/vmscan.c | 11 +- + mm/vmstat.c | 4 +- + net/ipv4/fib_trie.c | 4 +- + net/socket.c | 2 +- + net/sunrpc/rpc_pipe.c | 2 +- + scripts/checkpatch.pl | 49 +- + tools/vm/page-types.c | 1 + + 339 files changed, 6161 insertions(+), 6620 deletions(-) + delete mode 100644 Documentation/features/io/dma_map_attrs/arch-support.txt + delete mode 100644 Documentation/features/vm/pmdp_splitting_flush/arch-support.txt + delete mode 100644 include/asm-generic/dma-coherent.h + delete mode 100644 include/asm-generic/dma-mapping-broken.h + delete mode 100644 include/asm-generic/dma-mapping-common.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/trace/events/huge_memory.h + create mode 100644 include/trace/events/page_isolation.h + create mode 100644 lib/crc64_ecma.c + rename lib/{test-hexdump.c => test_hexdump.c} (57%) +$ 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: iio: core: introduce IIO configfs support +Applying: iio: core: introduce IIO software triggers +Applying: iio: core: fix ptr_ret.cocci warnings +Applying: iio: trigger: introduce IIO hrtimer based trigger +Applying: iio: Documentation: add IIO configfs documentation +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + f802b4eb8128...860443c08156 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (860443c08156 iio: Documentation: add IIO configfs documentation) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/configfs-iio | 21 ++++ + Documentation/iio/iio_configfs.txt | 93 ++++++++++++++++ + drivers/iio/Kconfig | 16 +++ + drivers/iio/Makefile | 2 + + drivers/iio/industrialio-configfs.c | 50 +++++++++ + drivers/iio/industrialio-sw-trigger.c | 181 +++++++++++++++++++++++++++++++ + drivers/iio/trigger/Kconfig | 10 ++ + drivers/iio/trigger/Makefile | 2 + + drivers/iio/trigger/iio-trig-hrtimer.c | 193 +++++++++++++++++++++++++++++++++ + include/linux/iio/sw_trigger.h | 71 ++++++++++++ + 10 files changed, 639 insertions(+) + create mode 100644 Documentation/ABI/testing/configfs-iio + create mode 100644 Documentation/iio/iio_configfs.txt + create mode 100644 drivers/iio/industrialio-configfs.c + create mode 100644 drivers/iio/industrialio-sw-trigger.c + create mode 100644 drivers/iio/trigger/iio-trig-hrtimer.c + create mode 100644 include/linux/iio/sw_trigger.h |