diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 2461 |
1 files changed, 2461 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..bf5d9c9e2b9a --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2461 @@ +$ date -R +Thu, 21 Sep 2017 09:26:29 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 12fcf66e74b1 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md +Merging origin/master (c52f56a69d10 Merge tag 'trace-v4.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace) +$ git merge origin/master +Updating 12fcf66e74b1..c52f56a69d10 +Fast-forward + arch/x86/kvm/emulate.c | 8 +++-- + arch/x86/kvm/vmx.c | 39 +++++++++++++----------- + drivers/scsi/arm/acornscsi.c | 6 ++-- + drivers/scsi/scsi_transport_fc.c | 2 +- + drivers/scsi/sd.c | 2 -- + drivers/scsi/sg.c | 64 ++++++++++++++++++++++------------------ + fs/fcntl.c | 2 +- + kernel/trace/trace.c | 19 ++++++++++-- + kernel/trace/trace.h | 2 ++ + kernel/trace/trace_mmiotrace.c | 1 + + virt/kvm/eventfd.c | 2 -- + 11 files changed, 87 insertions(+), 60 deletions(-) +Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/fixes (25b080bd53f2 kbuild: rpm-pkg: fix version number handling) +$ git merge kbuild-current/fixes +Removing scripts/mkversion +Merge made by the 'recursive' strategy. + scripts/mkversion | 6 ------ + scripts/package/Makefile | 5 ----- + scripts/package/builddeb | 22 +--------------------- + scripts/package/mkspec | 14 ++++---------- + 4 files changed, 5 insertions(+), 42 deletions(-) + delete mode 100644 scripts/mkversion +Merging arc-current/for-curr (307b30e26861 ARC: [plat-eznps] Update platform maintainer as Noam left) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + arch/arc/boot/dts/axs10x_mb.dtsi | 9 ++++++++- + arch/arc/boot/dts/hsdk.dts | 23 ++++++++++++++++++++--- + arch/arc/configs/axs101_defconfig | 2 +- + arch/arc/configs/axs103_defconfig | 2 +- + arch/arc/configs/axs103_smp_defconfig | 2 +- + arch/arc/configs/haps_hs_smp_defconfig | 2 +- + arch/arc/configs/hsdk_defconfig | 3 ++- + arch/arc/configs/vdk_hs38_defconfig | 2 +- + arch/arc/configs/vdk_hs38_smp_defconfig | 2 +- + arch/arc/plat-axs10x/axs10x.c | 7 +++++++ + 11 files changed, 45 insertions(+), 12 deletions(-) +Merging arm-current/fixes (746a272e4414 ARM: 8692/1: mm: abort uaccess retries upon fatal signal) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (558d5ad276c9 m68k/mac: Avoid soft-lockup warning after mach_power_off) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (8afafa6fba78 powerpc/kprobes: Update optprobes to use emulate_update_regs()) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/configs/g5_defconfig | 5 +++-- + arch/powerpc/configs/gamecube_defconfig | 5 +++-- + arch/powerpc/configs/pasemi_defconfig | 3 ++- + arch/powerpc/configs/pmac32_defconfig | 7 ++++--- + arch/powerpc/configs/ppc64_defconfig | 7 ++++--- + arch/powerpc/configs/ppc64e_defconfig | 7 ++++--- + arch/powerpc/configs/ppc6xx_defconfig | 7 ++++--- + arch/powerpc/configs/wii_defconfig | 5 +++-- + arch/powerpc/kernel/optprobes.c | 4 +++- + arch/powerpc/kernel/ptrace.c | 2 +- + arch/powerpc/kernel/traps.c | 12 ++++++++++-- + arch/powerpc/lib/sstep.c | 23 ++++++++++++----------- + arch/powerpc/perf/core-book3s.c | 5 +++++ + arch/powerpc/platforms/powernv/idle.c | 8 +++++++- + 14 files changed, 65 insertions(+), 35 deletions(-) +Merging sparc/master (6470812e2226 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge sparc/master +Already up-to-date. +Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) +$ git merge fscrypt-current/for-stable +Already up-to-date. +Merging net/master (6cc40834b480 Merge branch 'hns3-tm-fixes') +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/ip-sysctl.txt | 18 +- + Documentation/networking/switchdev.txt | 68 ++++---- + MAINTAINERS | 2 - + drivers/isdn/i4l/isdn_ppp.c | 37 +++-- + drivers/net/ethernet/broadcom/bcmsysport.c | 52 +++--- + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 4 + + drivers/net/ethernet/freescale/fec.h | 4 +- + drivers/net/ethernet/freescale/fec_main.c | 8 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.c | 43 +---- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 15 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 12 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 183 ++++++++++++--------- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 3 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 41 +++-- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 4 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c | 23 ++- + drivers/net/ethernet/ibm/emac/mal.c | 3 +- + drivers/net/ethernet/realtek/8139too.c | 5 +- + drivers/net/phy/Kconfig | 18 +- + drivers/net/phy/xilinx_gmii2rgmii.c | 2 +- + include/linux/trace_events.h | 1 + + include/net/tcp.h | 1 - + kernel/bpf/devmap.c | 6 +- + kernel/bpf/syscall.c | 6 +- + kernel/bpf/verifier.c | 7 +- + kernel/events/core.c | 3 +- + lib/rhashtable.c | 9 +- + net/compat.c | 7 + + net/core/dev.c | 1 + + net/core/filter.c | 24 ++- + net/ipv4/tcp_output.c | 43 +---- + net/ipv6/addrconf.c | 32 +++- + net/ipv6/ip6_gre.c | 21 +-- + net/ipv6/ip6_tunnel.c | 3 + + net/ipv6/udp.c | 1 + + net/netfilter/ipset/ip_set_hash_gen.h | 14 +- + net/netfilter/nf_nat_core.c | 12 +- + net/packet/af_packet.c | 16 +- + net/sched/cls_matchall.c | 1 + + net/wireless/nl80211.c | 6 + + 40 files changed, 436 insertions(+), 323 deletions(-) +Merging ipsec/master (23e9fcfef1f3 vti: fix NULL dereference in xfrm_input()) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_device.c | 1 + + net/xfrm/xfrm_input.c | 6 ++++-- + net/xfrm/xfrm_user.c | 1 + + 3 files changed, 6 insertions(+), 2 deletions(-) +Merging netfilter/master (7f4f7dd4417d netfilter: ipset: ipset list may return wrong member count for set with timeout) +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (a715b3a0efe7 qtnfmac: cancel scans on wireless interface changes) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 37 ++++++------- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 5 ++ + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 62 ++++++++++++++++++++-- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 7 +-- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 +-- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 10 ++-- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 9 ++-- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.h | 3 ++ + drivers/net/wireless/quantenna/qtnfmac/event.c | 2 - + .../net/wireless/quantenna/qtnfmac/pearl/pcie.c | 9 +++- + .../quantenna/qtnfmac/pearl/pcie_bus_priv.h | 2 + + 16 files changed, 123 insertions(+), 41 deletions(-) +Merging mac80211/master (265698d7e613 nl80211: fix null-ptr dereference on invalid mesh configuration) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (0dcd020b7abb ALSA: usb-audio: Add sample rate quirk for Plantronics C310/C520-M) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + include/sound/hda_verbs.h | 1 + + sound/core/compress_offload.c | 3 +-- + sound/pci/asihpi/hpioctl.c | 12 ++++++++---- + sound/pci/hda/patch_hdmi.c | 21 +++++++++++++++++++++ + sound/usb/quirks.c | 2 ++ + 5 files changed, 33 insertions(+), 6 deletions(-) +Merging pci-current/for-linus (749aaf3372b8 PCI: endpoint: Use correct "end of test" interrupt) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. + arch/mips/ath79/pci.c | 12 ++++++------ + arch/mips/pci/fixup-capcella.c | 4 ++-- + arch/mips/pci/fixup-cobalt.c | 8 ++++---- + arch/mips/pci/fixup-emma2rh.c | 4 ++-- + arch/mips/pci/fixup-fuloong2e.c | 2 +- + arch/mips/pci/fixup-ip32.c | 4 ++-- + arch/mips/pci/fixup-jmr3927.c | 2 +- + arch/mips/pci/fixup-lantiq.c | 2 +- + arch/mips/pci/fixup-lemote2f.c | 4 ++-- + arch/mips/pci/fixup-loongson3.c | 2 +- + arch/mips/pci/fixup-malta.c | 4 ++-- + arch/mips/pci/fixup-mpc30x.c | 6 +++--- + arch/mips/pci/fixup-pmcmsp.c | 8 ++++---- + arch/mips/pci/fixup-rbtx4927.c | 2 +- + arch/mips/pci/fixup-rbtx4938.c | 2 +- + arch/mips/pci/fixup-sni.c | 12 ++++++------ + arch/mips/pci/fixup-tb0219.c | 2 +- + arch/mips/pci/fixup-tb0226.c | 2 +- + arch/mips/pci/fixup-tb0287.c | 2 +- + arch/mips/pci/pci-alchemy.c | 2 +- + arch/mips/pci/pci-bcm47xx.c | 2 +- + arch/mips/pci/pci-lasat.c | 2 +- + arch/mips/pci/pci-mt7620.c | 2 +- + arch/mips/pci/pci-octeon.c | 5 ++--- + arch/mips/pci/pci-rt2880.c | 2 +- + arch/mips/pci/pci-rt3883.c | 2 +- + arch/mips/pci/pci-tx4938.c | 2 +- + arch/mips/pci/pci-tx4939.c | 4 ++-- + arch/mips/pci/pci-xlp.c | 2 +- + arch/mips/pci/pci-xlr.c | 2 +- + arch/mips/pci/pcie-octeon.c | 3 +-- + arch/mips/txx9/generic/pci.c | 8 ++++++-- + drivers/pci/endpoint/functions/pci-epf-test.c | 13 ++++++------- + 33 files changed, 68 insertions(+), 67 deletions(-) +Merging driver-core.current/driver-core-linus (850fdec8d2fd driver core: remove DRIVER_ATTR) +$ git merge driver-core.current/driver-core-linus +Merge made by the 'recursive' strategy. + Documentation/driver-model/driver.txt | 7 ++--- + Documentation/filesystems/sysfs.txt | 3 ++- + drivers/base/arch_topology.c | 12 ++++----- + drivers/base/platform.c | 3 ++- + drivers/fpga/altera-cvp.c | 6 ++--- + include/linux/device.h | 2 -- + lib/kobject_uevent.c | 49 +++++++++++++++++++++++++++++------ + 7 files changed, 58 insertions(+), 24 deletions(-) +Merging tty.current/tty-linus (c91261437985 serial: sccnxp: Fix error handling in sccnxp_probe()) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + .../bindings/serial/renesas,sci-serial.txt | 2 ++ + drivers/tty/mxser.c | 16 ++++++--- + drivers/tty/serial/bcm63xx_uart.c | 5 +++ + drivers/tty/serial/fsl_lpuart.c | 40 +++++++++------------- + drivers/tty/serial/sccnxp.c | 13 +++++-- + 5 files changed, 46 insertions(+), 30 deletions(-) +Merging usb.current/usb-linus (bd7a3fe770eb USB: fix out-of-bounds in usb_set_configuration) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/core/config.c | 16 ++++++++++++---- + drivers/usb/core/hub.c | 2 +- + drivers/usb/host/pci-quirks.c | 10 +++++----- + drivers/usb/host/xhci-hub.c | 14 ++++++++++---- + drivers/usb/host/xhci-pci.c | 12 ------------ + drivers/usb/host/xhci-plat.c | 16 ++++++++++------ + drivers/usb/host/xhci.c | 3 ++- + drivers/usb/host/xhci.h | 10 ++++++---- + drivers/uwb/hwa-rc.c | 2 ++ + drivers/uwb/uwbd.c | 12 ++++++++---- + include/uapi/linux/usb/ch9.h | 1 + + 11 files changed, 57 insertions(+), 41 deletions(-) +Merging usb-gadget-fixes/fixes (7661ca09b2ff usb: gadget: dummy: fix nonsensical comparisons) +$ git merge usb-gadget-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/usb/dwc3/ep0.c | 7 +++++++ + drivers/usb/gadget/function/f_printer.c | 7 ++++++- + drivers/usb/gadget/udc/Kconfig | 1 + + drivers/usb/gadget/udc/core.c | 3 +-- + drivers/usb/gadget/udc/dummy_hcd.c | 9 ++++----- + 5 files changed, 19 insertions(+), 8 deletions(-) +Merging usb-serial-fixes/usb-linus (c496ad835c31 USB: serial: cp210x: add support for ELV TFD500) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/cp210x.c | 13 +++++++------ + drivers/usb/serial/ftdi_sio.c | 2 ++ + drivers/usb/serial/ftdi_sio_ids.h | 7 +++++++ + drivers/usb/serial/option.c | 2 ++ + 4 files changed, 18 insertions(+), 6 deletions(-) +Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging phy/fixes (5771a8c08880 Linux v4.13-rc1) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (974d4d03fc02 staging: vchiq_2835_arm: Fix NULL ptr dereference in free_pagelist) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/mt29f_spinand/mt29f_spinand.c | 8 ++++++-- + drivers/staging/pi433/rf69.c | 9 +++------ + .../staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c | 4 ++-- + .../staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c | 13 +++++++------ + drivers/staging/speakup/main.c | 15 ++++++++++++--- + drivers/staging/unisys/visorbus/visorchipset.c | 4 ++-- + .../vc04_services/interface/vchiq_arm/vchiq_2835_arm.c | 6 ++++-- + 7 files changed, 36 insertions(+), 23 deletions(-) +Merging char-misc.current/char-misc-linus (aad8d097c922 nvmem: add missing of_node_put() in of_nvmem_cell_get()) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/android/binder.c | 8 ++++---- + drivers/auxdisplay/charlcd.c | 11 +++++++++-- + drivers/auxdisplay/panel.c | 11 +++++++++-- + drivers/nvmem/core.c | 3 ++- + 4 files changed, 24 insertions(+), 9 deletions(-) +Merging input-current/for-linus (bbc8608755da Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (e117765a117d crypto: af_alg - update correct dst SGL entry) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + arch/x86/crypto/blowfish-x86_64-asm_64.S | 48 +++++++++-------- + arch/x86/crypto/camellia-x86_64-asm_64.S | 26 ++++----- + arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 47 ++++++++++------ + arch/x86/crypto/cast6-avx-x86_64-asm_64.S | 50 +++++++++++------ + arch/x86/crypto/des3_ede-asm_64.S | 15 +++--- + arch/x86/crypto/sha1_avx2_x86_64_asm.S | 4 +- + arch/x86/crypto/sha1_ssse3_asm.S | 11 ++-- + arch/x86/crypto/sha256-avx-asm.S | 15 +++--- + arch/x86/crypto/sha256-avx2-asm.S | 22 +++----- + arch/x86/crypto/sha256-ssse3-asm.S | 15 +++--- + arch/x86/crypto/sha512-avx2-asm.S | 75 +++++++++++++------------- + arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 12 ++--- + crypto/af_alg.c | 4 +- + crypto/drbg.c | 8 +-- + drivers/crypto/caam/Kconfig | 5 +- + drivers/crypto/caam/ctrl.c | 19 +++---- + drivers/crypto/caam/regs.h | 59 ++++++++++---------- + drivers/crypto/inside-secure/safexcel_cipher.c | 2 +- + drivers/crypto/inside-secure/safexcel_hash.c | 2 +- + drivers/crypto/talitos.c | 9 ++-- + 20 files changed, 236 insertions(+), 212 deletions(-) +Merging ide/master (b671e1703394 PNP: ide: constify pnp_device_id) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/ide-pnp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging vfio-fixes/for-linus (796b755066dd vfio/pci: Fix handling of RC integrated endpoint PCIe capability size) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (0ec1d92b5462 selftests: futex: Makefile: fix for lops in targets to run silently) +$ git merge kselftest-fixes/fixes +Merge made by the 'recursive' strategy. + Makefile | 13 ++- + tools/testing/selftests/Makefile | 18 ++-- + tools/testing/selftests/bpf/bpf_util.h | 17 +-- + tools/testing/selftests/breakpoints/Makefile | 8 +- + .../ftrace/test.d/kprobe/multiple_kprobes.tc | 2 + + tools/testing/selftests/futex/Makefile | 9 +- + tools/testing/selftests/intel_pstate/Makefile | 2 + + tools/testing/selftests/intel_pstate/run.sh | 11 +- + tools/testing/selftests/lib.mk | 48 +++++++-- + tools/testing/selftests/mqueue/Makefile | 4 +- + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 6 +- + tools/testing/selftests/net/msg_zerocopy.c | 2 +- + tools/testing/selftests/net/netdevice.sh | 2 +- + tools/testing/selftests/net/reuseaddr_conflict.c | 114 +++++++++++++++++++++ + tools/testing/selftests/sigaltstack/sas.c | 4 + + tools/testing/selftests/sync/Makefile | 24 ++++- + tools/testing/selftests/watchdog/Makefile | 7 +- + 18 files changed, 234 insertions(+), 58 deletions(-) + create mode 100644 tools/testing/selftests/net/reuseaddr_conflict.c +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 nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) +$ git merge nand-fixes/nand/fixes +Already up-to-date. +Merging spi-nor-fixes/spi-nor/fixes (5771a8c08880 Linux v4.13-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (0f0fc5c09005 Revert "mfd: da9061: Fix to remove BBAT_CONT register from chip model") +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging v4l-dvb-fixes/fixes (1efdf1776e22 media: leds: as3645a: add V4L2_FLASH_LED_CLASS dependency) +$ git merge v4l-dvb-fixes/fixes +Already up-to-date. +Merging reset-fixes/reset/fixes (13541226dc05 ARC: reset: remove the misleading v1 suffix all over) +$ git merge reset-fixes/reset/fixes +Removing include/dt-bindings/reset/snps,hsdk-v1-reset.h +Auto-merging drivers/reset/reset-hsdk.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/reset/snps,hsdk-reset.txt | 28 ++++++++++++++ + MAINTAINERS | 6 +-- + drivers/reset/Kconfig | 7 ++-- + drivers/reset/Makefile | 2 +- + drivers/reset/{reset-hsdk-v1.c => reset-hsdk.c} | 44 +++++++++++----------- + include/dt-bindings/reset/snps,hsdk-reset.h | 17 +++++++++ + include/dt-bindings/reset/snps,hsdk-v1-reset.h | 17 --------- + 7 files changed, 75 insertions(+), 46 deletions(-) + create mode 100644 Documentation/devicetree/bindings/reset/snps,hsdk-reset.txt + rename drivers/reset/{reset-hsdk-v1.c => reset-hsdk.c} (72%) + create mode 100644 include/dt-bindings/reset/snps,hsdk-reset.h + delete mode 100644 include/dt-bindings/reset/snps,hsdk-v1-reset.h +Merging drm-intel-fixes/for-linux-next-fixes (99df13b6ea81 drm/i915: Remove unused 'in_vbl' from i915_get_crtc_scanoutpos()) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 2 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 1 - + drivers/gpu/drm/i915/gvt/cfg_space.c | 113 ++++++-------- + drivers/gpu/drm/i915/i915_irq.c | 3 - + drivers/gpu/drm/i915/intel_display.c | 2 +- + drivers/gpu/drm/i915/intel_dsi.c | 11 -- + drivers/gpu/drm/i915/intel_panel.c | 4 + + include/uapi/linux/kfd_ioctl.h | 172 ++++++++++----------- + 8 files changed, 140 insertions(+), 168 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (b0e07da3f5c8 qxl: fix primary surface handling) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/qxl/qxl_display.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/qxl/qxl_display.c | 34 +++++++++++++++++++--------------- + 1 file changed, 19 insertions(+), 15 deletions(-) +Merging kbuild/for-next (25b080bd53f2 kbuild: rpm-pkg: fix version number handling) +$ git merge kbuild/for-next +Already up-to-date. +Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) +$ git merge uuid/for-next +Already up-to-date. +Merging dma-mapping/for-next (6d57339890c9 dma-coherent: fix rmem_dma_device_init regression) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + drivers/base/dma-coherent.c | 19 +++++++++---------- + 1 file changed, 9 insertions(+), 10 deletions(-) +Merging asm-generic/master (a351e9b9fc24 Linux 4.11) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (cc4a41fe5541 Linux 4.13-rc7) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (67715a8964fc Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. +Merging arm-perf/for-next/perf (e884f80cf2a7 arm64: perf: add support for Cortex-A35) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (ed3b42e5f399 ARM: SoC: Document merges) +$ git merge arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/bcm/brcm,brcmstb.txt | 6 +- + .../bindings/memory-controllers/brcm,dpfe-cpu.txt | 27 + + .../devicetree/bindings/mips/brcm/soc.txt | 153 ++++ + MAINTAINERS | 8 + + arch/arm/arm-soc-for-next-contents.txt | 28 + + arch/arm/boot/dts/owl-s500-guitar-bb-rev-b.dts | 7 + + arch/arm/boot/dts/owl-s500.dtsi | 3 + + arch/arm64/boot/dts/actions/s900-bubblegum-96.dts | 7 + + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 10 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 19 +- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 12 +- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 9 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 13 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 10 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 39 +- + .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 7 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 13 +- + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 10 +- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 10 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 39 +- + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 7 +- + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 1 - + drivers/memory/Makefile | 1 + + drivers/memory/brcmstb_dpfe.c | 701 ++++++++++++++++++ + drivers/soc/bcm/Kconfig | 2 + + drivers/soc/bcm/brcmstb/Kconfig | 9 + + drivers/soc/bcm/brcmstb/Makefile | 1 + + drivers/soc/bcm/brcmstb/pm/Makefile | 3 + + drivers/soc/bcm/brcmstb/pm/aon_defs.h | 113 +++ + drivers/soc/bcm/brcmstb/pm/pm-arm.c | 822 +++++++++++++++++++++ + drivers/soc/bcm/brcmstb/pm/pm-mips.c | 461 ++++++++++++ + drivers/soc/bcm/brcmstb/pm/pm.h | 89 +++ + drivers/soc/bcm/brcmstb/pm/s2-arm.S | 76 ++ + drivers/soc/bcm/brcmstb/pm/s2-mips.S | 200 +++++ + drivers/soc/bcm/brcmstb/pm/s3-mips.S | 146 ++++ + 35 files changed, 3012 insertions(+), 50 deletions(-) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 drivers/memory/brcmstb_dpfe.c + create mode 100644 drivers/soc/bcm/brcmstb/Kconfig + create mode 100644 drivers/soc/bcm/brcmstb/pm/Makefile + create mode 100644 drivers/soc/bcm/brcmstb/pm/aon_defs.h + create mode 100644 drivers/soc/bcm/brcmstb/pm/pm-arm.c + create mode 100644 drivers/soc/bcm/brcmstb/pm/pm-mips.c + create mode 100644 drivers/soc/bcm/brcmstb/pm/pm.h + create mode 100644 drivers/soc/bcm/brcmstb/pm/s2-arm.S + create mode 100644 drivers/soc/bcm/brcmstb/pm/s2-mips.S + create mode 100644 drivers/soc/bcm/brcmstb/pm/s3-mips.S +Merging actions/for-next (2a6a17c006da Merge branch 'v4.15/dt' into next) +$ git merge actions/for-next +Removing arch/arm/mach-actions/headsmp.S +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/actions.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/owl-s500-cubieboard6.dts | 44 +++++++++++++++++++ + arch/arm/mach-actions/Makefile | 4 +- + arch/arm/mach-actions/headsmp.S | 52 ----------------------- + arch/arm/mach-actions/platsmp.c | 2 +- + 6 files changed, 48 insertions(+), 56 deletions(-) + create mode 100644 arch/arm/boot/dts/owl-s500-cubieboard6.dts + delete mode 100644 arch/arm/mach-actions/headsmp.S +Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values) +$ git merge alpine/alpine/for-next +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (293cd5ae9884 Merge branch 'v4.14/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (0eead81e7847 Merge branches 'dt-for-v4.14' and 'defconfig-for-v4.14' into for-next) +$ git merge aspeed/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (819b0a26fdd8 Merge tag 'at91-fixes' into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 19 +++++++++++-------- + arch/arm/mach-at91/pm.c | 4 ++-- + 2 files changed, 13 insertions(+), 10 deletions(-) +Merging bcm2835/for-next (e83e7335d059 Merge branch anholt/bcm2835-defconfig-next into for-next) +$ git merge bcm2835/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (d65a19177f18 Merge branch 'imx/dt64' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/misc/ge-achc.txt | 26 + + .../devicetree/bindings/mtd/jedec,spi-nor.txt | 2 + + .../devicetree/bindings/spi/spi-fsl-dspi.txt | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/imx53-ppd.dts | 1042 ++++++++++++++++++++ + arch/arm/boot/dts/imx7d-pico.dts | 39 + + arch/arm/mach-mxs/pm.c | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 33 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 13 + + 9 files changed, 1158 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/misc/ge-achc.txt + create mode 100644 arch/arm/boot/dts/imx53-ppd.dts +Merging keystone/next (f922ce7bbcf5 Merge branch 'for_4.14/keystone_dts' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (80690b5be637 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/mvebu-uart.txt | 2 +- + MAINTAINERS | 6 +++ + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 11 +++++ + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 3 +- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 2 + + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 2 + + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 2 + + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 15 +++++- + .../boot/dts/marvell/armada-cp110-master.dtsi | 55 +++++++++++++++++++--- + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 55 +++++++++++++++++++--- + arch/arm64/configs/defconfig | 2 + + 11 files changed, 136 insertions(+), 19 deletions(-) +Merging omap/for-next (fa2cc631e60b Merge branch 'omap-for-v4.15/soc' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/omap/ctrl.txt | 2 + + Documentation/devicetree/bindings/hsi/omap-ssi.txt | 13 ++- + .../bindings/memory-controllers/ti/emif.txt | 6 +- + .../devicetree/bindings/power/ti-smartreflex.txt | 47 ++++++++ + arch/arm/boot/dts/am33xx.dtsi | 12 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 6 +- + arch/arm/boot/dts/dra7.dtsi | 8 ++ + arch/arm/boot/dts/dra7xx-clocks.dtsi | 2 + + arch/arm/boot/dts/omap3-n900.dts | 11 -- + arch/arm/boot/dts/omap3.dtsi | 1 + + arch/arm/boot/dts/omap4.dtsi | 121 +++++++++++++++++++-- + arch/arm/boot/dts/omap5.dtsi | 1 + + arch/arm/mach-omap2/hdq1w.c | 22 ---- + arch/arm/mach-omap2/hsmmc.c | 4 +- + arch/arm/mach-omap2/omap_hwmod.c | 49 +++++++-- + arch/arm/mach-omap2/omap_hwmod.h | 21 +--- + .../omap_hwmod_33xx_43xx_interconnect_data.c | 30 ----- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 6 +- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 1 + + 19 files changed, 248 insertions(+), 115 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/ti-smartreflex.txt +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging reset/reset/next (fe6e31a04ae1 reset: socfpga: build the reset-socfpga for Stratix10 SOC) +$ git merge reset/reset/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/reset/snps,axs10x-reset.txt | 33 +++++++++ + MAINTAINERS | 6 ++ + drivers/reset/Kconfig | 8 ++- + drivers/reset/Makefile | 1 + + drivers/reset/reset-axs10x.c | 83 ++++++++++++++++++++++ + drivers/reset/reset-uniphier.c | 4 ++ + 6 files changed, 134 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt + create mode 100644 drivers/reset/reset-axs10x.c +Merging qcom/for-next (b212aba8f7bf Merge tag 'qcom-drivers-for-4.14' into final-for-sure-4.14) +$ git merge qcom/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging realtek/for-next (74e912bc01df Merge branch 'v4.15/dt64' into next) +$ git merge realtek/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/realtek/rtd1295.dtsi | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) +Merging renesas/next (edf018e8ea1c Merge branches 'arm64-defconfig-for-v4.15', 'arm64-dt-for-v4.15', 'defconfig-for-v4.15', 'drivers-for-v4.15', 'dt-bindings-for-v4.15', 'dt-for-v4.15' and 'soc-for-v4.15' into next) +$ git merge renesas/next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/shmobile.txt | 4 + + .../bindings/display/bridge/renesas,dw-hdmi.txt | 2 +- + .../devicetree/bindings/power/renesas,apmu.txt | 1 + + .../bindings/power/renesas,rcar-sysc.txt | 1 + + .../devicetree/bindings/reset/renesas,rst.txt | 1 + + MAINTAINERS | 2 + + arch/arm/Kconfig.debug | 10 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/r7s72100-gr-peach.dts | 22 +- + arch/arm/boot/dts/r8a7743-iwg20d-q7.dts | 97 +++ + arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 17 + + arch/arm/boot/dts/r8a7743.dtsi | 189 ++++++ + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 65 ++ + arch/arm/boot/dts/r8a7745-iwg22m.dtsi | 68 ++ + arch/arm/boot/dts/r8a7745.dtsi | 269 ++++++++ + arch/arm/boot/dts/r8a7790-lager.dts | 7 +- + arch/arm/boot/dts/r8a7790.dtsi | 748 +++++++------------- + arch/arm/boot/dts/r8a7791-koelsch.dts | 4 +- + arch/arm/boot/dts/r8a7791-porter.dts | 4 +- + arch/arm/boot/dts/r8a7791.dtsi | 754 +++++++-------------- + arch/arm/boot/dts/r8a7792-blanche.dts | 3 +- + arch/arm/boot/dts/r8a7792-wheat.dts | 3 +- + arch/arm/boot/dts/r8a7792.dtsi | 378 +++-------- + arch/arm/boot/dts/r8a7793-gose.dts | 4 +- + arch/arm/boot/dts/r8a7793.dtsi | 626 ++++++----------- + arch/arm/boot/dts/r8a7794-alt.dts | 7 +- + arch/arm/boot/dts/r8a7794-silk.dts | 3 +- + arch/arm/boot/dts/r8a7794.dtsi | 696 ++++++------------- + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/include/uapi/asm/ptrace.h | 1 + + arch/arm/mach-shmobile/Makefile | 1 + + arch/arm/mach-shmobile/common.h | 2 + + arch/arm/mach-shmobile/headsmp-apmu.S | 37 + + arch/arm/mach-shmobile/platsmp-apmu.c | 2 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 20 +- + arch/arm64/Kconfig.platforms | 6 + + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 10 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 366 ++++++++++ + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 11 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 174 ++++- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 4 + + arch/arm64/configs/defconfig | 2 + + drivers/soc/renesas/Kconfig | 8 +- + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a77970-sysc.c | 39 ++ + drivers/soc/renesas/rcar-rst.c | 1 + + drivers/soc/renesas/rcar-sysc.c | 3 + + drivers/soc/renesas/rcar-sysc.h | 1 + + drivers/soc/renesas/renesas-soc.c | 8 + + include/dt-bindings/power/r8a77970-sysc.h | 32 + + 52 files changed, 2422 insertions(+), 2300 deletions(-) + create mode 100644 arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts + create mode 100644 arch/arm/boot/dts/r8a7745-iwg22m.dtsi + create mode 100644 arch/arm/mach-shmobile/headsmp-apmu.S + create mode 100644 arch/arm64/boot/dts/renesas/r8a77970.dtsi + create mode 100644 drivers/soc/renesas/r8a77970-sysc.c + create mode 100644 include/dt-bindings/power/r8a77970-sysc.h +Merging rockchip/for-next (8b6f2c854c24 Merge branch 'v4.14-clk/fixes' into for-next) +$ git merge rockchip/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/rockchip.txt | 4 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 3 +- + arch/arm/boot/dts/rk3288-vyasa.dts | 336 +++++++++++++++++++++ + arch/arm/boot/dts/rk3288.dtsi | 52 ++++ + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 72 ++++- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 72 +---- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 21 ++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 3 +- + drivers/clk/rockchip/clk-rk3128.c | 12 +- + 10 files changed, 498 insertions(+), 78 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3288-vyasa.dts +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (1cb686c08d12 ARM: dts: exynos: Add status property to Exynos 542x Mixer nodes) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos3250-rinato.dts | 22 -- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 - + arch/arm/boot/dts/exynos4412-odroidx.dts | 2 - + arch/arm/boot/dts/exynos5250-arndale.dts | 22 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 18 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 18 +- + arch/arm/boot/dts/exynos5250-spring.dts | 18 +- + arch/arm/boot/dts/exynos5250.dtsi | 18 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 4 + + arch/arm/boot/dts/exynos5420-cpus.dtsi | 8 + + arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 + + arch/arm/boot/dts/exynos5420-smdk5420.dts | 9 +- + arch/arm/boot/dts/exynos5420.dtsi | 5 +- + arch/arm/boot/dts/exynos5422-cpus.dtsi | 8 + + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 277 +++++++++++++++++++-- + 15 files changed, 328 insertions(+), 107 deletions(-) +Merging sunxi/sunxi/for-next (eebe1700cebf Merge branches 'sunxi/clk-for-4.15', 'sunxi/dt-for-4.15' and 'sunxi/dt64-for-4.15' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/sun4i-a10.dtsi | 662 +++---------------- + arch/arm/boot/dts/sun6i-a31.dtsi | 58 +- + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 8 + + .../boot/dts/sun7i-a20-olinuxino-micro-emmc.dts | 70 ++ + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 19 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 721 +++------------------ + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 199 ++++++ + arch/arm/boot/dts/sun8i-a83t.dtsi | 35 +- + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 20 - + arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 42 ++ + arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts | 6 + + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 31 + + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 9 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 41 ++ + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 193 ++++++ + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 20 +- + 20 files changed, 879 insertions(+), 1261 deletions(-) + create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts + create mode 100644 arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts +Merging tegra/for-next (b4aed883ebbe Merge branch for-4.14/arm/defconfig into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (d1be5c99a034 arm64: cleanup {COMPAT_,}SET_PERSONALITY() macro) +$ git merge arm64/for-next/core +Already up-to-date. +Merging clk/clk-next (2bd6bf03f4c1 Linux 4.14-rc1) +$ git merge clk/clk-next +Already up-to-date. +Merging clk-samsung/for-next (599cebea93e6 clk: samsung: exynos542x: Enable clock rate propagation up to the EPLL) +$ git merge clk-samsung/for-next +Already up-to-date. +Merging c6x/for-linux-next (62016565bb04 c6x: remove unused KTHREAD_SIZE definition) +$ git merge c6x/for-linux-next +Merge made by the 'recursive' strategy. + arch/c6x/kernel/asm-offsets.c | 1 - + 1 file changed, 1 deletion(-) +Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE)) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (558d5ad276c9 m68k/mac: Avoid soft-lockup warning after mach_power_off) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (6a3f01a0f87b m68k: allow ColdFire m5441x parts to run with MMU enabled) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.cpu | 2 +- + arch/m68k/coldfire/m54xx.c | 4 ---- + arch/m68k/include/asm/mcfmmu.h | 1 + + arch/m68k/include/asm/mmu_context.h | 1 - + arch/m68k/kernel/setup_mm.c | 2 ++ + arch/m68k/mm/mcfmmu.c | 4 ++-- + 6 files changed, 6 insertions(+), 8 deletions(-) +Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (9de59ab25ca4 microblaze: Add missing kvm_para.h to Kbuild) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/uapi/asm/Kbuild | 1 + + 1 file changed, 1 insertion(+) +Merging mips/mips-for-linux-next (0e25207cab0f Merge branch '4.14-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Merge made by the 'recursive' strategy. + arch/mips/kernel/perf_event_mipsxx.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging nios2/for-next (65d1e3ddeae1 nios2: time: Read timer in get_cycles only if initialized) +$ git merge nios2/for-next +Already up-to-date. +Merging openrisc/for-next (56ce2f25ab0d openrisc: add forward declaration for struct vm_area_struct) +$ git merge openrisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (b28210912d38 parisc: Add CPU topology support) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 16 ++++ + arch/parisc/include/asm/pdc.h | 1 + + arch/parisc/include/asm/topology.h | 36 +++++++++ + arch/parisc/kernel/Makefile | 4 +- + arch/parisc/kernel/firmware.c | 20 +++++ + arch/parisc/kernel/pdt.c | 9 +++ + arch/parisc/kernel/processor.c | 13 ++++ + arch/parisc/kernel/setup.c | 6 +- + arch/parisc/kernel/topology.c | 151 +++++++++++++++++++++++++++++++------ + arch/parisc/kernel/traps.c | 10 ++- + arch/parisc/kernel/unwind.c | 12 +++ + lib/Kconfig.debug | 3 +- + 12 files changed, 251 insertions(+), 30 deletions(-) + create mode 100644 arch/parisc/include/asm/topology.h +Merging powerpc/next (265601f034df powerpc/xive: Fix section __init warning) +$ git merge powerpc/next +Already up-to-date. +Merging fsl/next (a4e89ffb5923 powerpc/e6500: Update machine check for L1D cache err) +$ 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 (9ea4aa40495d s390/zcrypt: Explicitly check input data length.) +$ git merge s390/features +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 2 +- + arch/s390/boot/compressed/Makefile | 2 +- + arch/s390/include/asm/processor.h | 6 +- + arch/s390/include/asm/runtime_instr.h | 86 +++++----- + arch/s390/include/asm/string.h | 2 +- + arch/s390/kernel/Makefile | 2 + + arch/s390/kernel/guarded_storage.c | 7 +- + arch/s390/kernel/perf_cpum_sf.c | 9 +- + arch/s390/kernel/process.c | 17 +- + arch/s390/kernel/ptrace.c | 142 +++++++++++++++-- + arch/s390/kernel/runtime_instr.c | 42 ++--- + arch/s390/kvm/kvm-s390.c | 2 +- + drivers/s390/block/dasd.c | 12 +- + drivers/s390/char/tape_class.c | 3 +- + drivers/s390/char/vmlogrdr.c | 3 +- + drivers/s390/char/vmur.c | 3 +- + drivers/s390/cio/cmf.c | 278 ++++++++++++--------------------- + drivers/s390/crypto/zcrypt_msgtype50.c | 6 +- + include/uapi/linux/elf.h | 1 + + samples/kprobes/kprobe_example.c | 8 + + 20 files changed, 344 insertions(+), 289 deletions(-) +Merging sparc-next/master (d719518d9ce9 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next) +$ git merge sparc-next/master +Already up-to-date. +Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses) +$ git merge sh/for-next +Auto-merging arch/sh/include/asm/futex.h +Merge made by the 'recursive' strategy. + arch/sh/include/asm/futex.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging tile/master (637f23abca87 tile: array underflow in setup_maxnodemem()) +$ git merge tile/master +Auto-merging arch/tile/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/tile/configs/tilegx_defconfig | 1 - + arch/tile/configs/tilepro_defconfig | 2 -- + arch/tile/kernel/setup.c | 2 +- + 3 files changed, 1 insertion(+), 4 deletions(-) +Merging uml/linux-next (6d20e6b235aa um: return negative in tuntap_open_tramp()) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface) +$ git merge unicore32/unicore32 +Resolved 'arch/unicore32/include/asm/Kbuild' using previous resolution. +Auto-merging arch/unicore32/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/unicore32/include/asm/Kbuild +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d6f8a1a9dfd9] Merge remote-tracking branch 'unicore32/unicore32' +$ git diff -M --stat --summary HEAD^.. + arch/unicore32/Kconfig | 14 + + arch/unicore32/include/asm/Kbuild | 1 - + arch/unicore32/include/asm/signal.h | 21 + + arch/unicore32/include/asm/syscalls.h | 25 + + arch/unicore32/include/uapi/asm/sigcontext.h | 14 + + arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++ + arch/unicore32/include/uapi/asm/stat.h | 19 + + arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++ + arch/unicore32/include/uapi/asm/unistd.h | 8 + + arch/unicore32/kernel/entry.S | 17 + + arch/unicore32/kernel/signal.c | 41 ++ + 11 files changed, 1000 insertions(+), 1 deletion(-) + create mode 100644 arch/unicore32/include/asm/signal.h + create mode 100644 arch/unicore32/include/asm/syscalls.h + create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h + create mode 100644 arch/unicore32/include/uapi/asm/stat.h + create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h +Merging xtensa/xtensa-for-next (271335b9726e Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (c250b7dd8e73 fscrypt: make ->dummy_context() return bool) +$ git merge fscrypt/master +Already up-to-date. +Merging befs/for-next (5771a8c08880 Linux v4.13-rc1) +$ git merge befs/for-next +Already up-to-date. +Merging btrfs/next (5226fcac7841 squashfs: Add zstd support) +$ git merge btrfs/next +Auto-merging crypto/testmgr.h +Auto-merging crypto/Kconfig +Merge made by the 'recursive' strategy. + crypto/Kconfig | 9 ++ + crypto/Makefile | 1 + + crypto/testmgr.c | 10 +++ + crypto/testmgr.h | 71 +++++++++++++++ + crypto/zstd.c | 265 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 356 insertions(+) + create mode 100644 crypto/zstd.c +Merging btrfs-kdave/for-next (677410d3c8eb Merge branch 'for-next-next-v4.14-20170914' into for-next-20170914) +$ git merge btrfs-kdave/for-next +Resolved 'fs/btrfs/root-tree.c' using previous resolution. +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/send.c +Auto-merging fs/btrfs/root-tree.c +CONFLICT (content): Merge conflict in fs/btrfs/root-tree.c +Auto-merging fs/btrfs/raid56.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4bbb8e66cb89] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/async-thread.c | 2 +- + fs/btrfs/ctree.c | 15 ++++-------- + fs/btrfs/ctree.h | 5 +--- + fs/btrfs/disk-io.c | 16 +++++++++---- + fs/btrfs/extent-tree.c | 22 ++++------------- + fs/btrfs/extent_io.c | 21 ++++------------- + fs/btrfs/extent_io.h | 1 - + fs/btrfs/inode.c | 25 +++++++++++++++++--- + fs/btrfs/ioctl.c | 43 +++++++++++++--------------------- + fs/btrfs/qgroup.c | 4 ---- + fs/btrfs/raid56.c | 8 ++++++- + fs/btrfs/relocation.c | 2 +- + fs/btrfs/root-tree.c | 4 ---- + fs/btrfs/send.c | 35 ++++++++++++--------------- + fs/btrfs/super.c | 6 ++--- + fs/btrfs/tests/free-space-tree-tests.c | 3 ++- + fs/btrfs/transaction.c | 2 ++ + fs/btrfs/tree-log.c | 32 ++++++++++++------------- + fs/btrfs/volumes.c | 29 ++++++++++------------- + include/trace/events/btrfs.h | 7 ++++++ + 20 files changed, 131 insertions(+), 151 deletions(-) +Merging ceph/master (717e6f2893eb ceph: avoid panic in create_session_open_msg() if utsname() returns NULL) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/mds_client.c | 7 ++++--- + fs/ceph/mds_client.h | 3 +++ + net/ceph/osdmap.c | 35 +++++++++++++++++++++++++---------- + 3 files changed, 32 insertions(+), 13 deletions(-) +Merging cifs/for-next (f5c4ba816315 cifs: release auth_key.response for reconnect.) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 9 +++++++-- + fs/cifs/cifsfs.c | 4 +++- + fs/cifs/connect.c | 8 ++++++++ + fs/cifs/file.c | 12 ++++++++---- + fs/cifs/smb2pdu.c | 9 ++++++--- + 5 files changed, 32 insertions(+), 10 deletions(-) +Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero()) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 15 --------------- + fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ecryptfs/miscdev.c | 2 +- + 5 files changed, 11 insertions(+), 19 deletions(-) +Merging ext3/for_next (0ab0b271bf75 isofs: fix build regression) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/isofs/inode.c | 2 ++ + fs/quota/dquot.c | 2 ++ + 2 files changed, 4 insertions(+) +Merging ext4/dev (b5f515735bea ext4: avoid Y2038 overflow in recently_deleted()) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (e6c6de18f010 f2fs: hurry up to issue discard after io interruption) +$ git merge f2fs/dev +Already up-to-date. +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (5b97eeacbd80 fuse: getattr cleanup) +$ git merge fuse/for-next +Already up-to-date. +Merging jfs/jfs-next (f070e5ac9bc7 jfs: preserve i_mode if __jfs_set_acl() fails) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (7d34cd12061d MAINTAINERS: associate linux/fs.h with VFS instead of file locking) +$ git merge nfsd/nfsd-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging orangefs/for-next (0b08273c8ab7 orangefs: Adjust three checks for null pointers) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (939ae4efd51c ovl: fix false positive ESTALE on lookup) +$ git merge overlayfs/overlayfs-next +Already up-to-date. +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (89b68cd92663 UBI: Fix two typos in comments) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (6c370590cfe0 xfs: use kmem_free to free return value of kmem_zalloc) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/locks-next (3b9f8ed25dbe Merge branch 'for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata) +$ git merge file-locks/locks-next +Already up-to-date. +Merging vfs/for-next (f8340cc34799 mips: switch to {get,put}_compat_sigset()) +$ git merge vfs/for-next +Auto-merging virt/kvm/kvm_main.c +Auto-merging kernel/signal.c +Auto-merging kernel/compat.c +Auto-merging include/linux/compat.h +Auto-merging fs/signalfd.c +Auto-merging fs/select.c +Auto-merging fs/eventpoll.c +Auto-merging fs/aio.c +Auto-merging arch/sparc/kernel/signal32.c +Auto-merging arch/s390/kernel/compat_signal.c +Auto-merging arch/powerpc/kernel/signal_32.c +Auto-merging arch/parisc/kernel/signal32.c +Merge made by the 'recursive' strategy. + arch/mips/include/asm/compat-signal.h | 37 ++--------------- + arch/parisc/kernel/signal.c | 9 ++-- + arch/parisc/kernel/signal32.c | 13 ------ + arch/parisc/kernel/signal32.h | 2 - + arch/powerpc/kernel/signal_32.c | 31 +------------- + arch/s390/kernel/compat_signal.c | 33 ++++----------- + arch/sparc/kernel/signal32.c | 9 +--- + arch/sparc/kernel/sys_sparc32.c | 8 ++-- + fs/aio.c | 55 +++++++++++++------------ + fs/eventpoll.c | 4 +- + fs/select.c | 68 ++++++++++++------------------- + fs/signalfd.c | 4 +- + include/linux/compat.h | 10 ++--- + kernel/compat.c | 61 ++++++++++++++------------- + kernel/signal.c | 77 +++++++++++------------------------ + virt/kvm/kvm_main.c | 7 +--- + 16 files changed, 137 insertions(+), 291 deletions(-) +Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) +$ git merge vfs-jk/vfs +Already up-to-date. +Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up-to-date. +Merging printk/for-next (077a1cc06f72 printk: Clean up do_syslog() error handling) +$ git merge printk/for-next +Already up-to-date. +Merging pci/next (2bd6bf03f4c1 Linux 4.14-rc1) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (c71b02e4d207 Revert "pstore: Honor dmesg_restrict sysctl on dmesg dumps") +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (abbc4db7a3a0 Merge branch 'for-4.14/upstream' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (aeb068c57214 i2c: i2c-stm32f7: add driver) +$ git merge i2c/i2c/for-next +Already up-to-date. +Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging dmi/master (18f317345038 firmware: dmi: Optimize dmi_matches) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 19 +++++++++++-------- + 1 file changed, 11 insertions(+), 8 deletions(-) +Merging hwmon-staging/hwmon-next (0fc85a358283 hwmon: (sht15) remove redundant check on status and send of status value) +$ git merge hwmon-staging/hwmon-next +Removing include/linux/platform_data/sht15.h +Merge made by the 'recursive' strategy. + Documentation/hwmon/sht15 | 3 +- + arch/arm/mach-pxa/stargate2.c | 17 ++-- + drivers/hwmon/k10temp.c | 108 ++++++++++++++++++---- + drivers/hwmon/sht15.c | 175 +++++++++++------------------------- + drivers/hwmon/stts751.c | 18 ++-- + include/linux/platform_data/sht15.h | 38 -------- + 6 files changed, 165 insertions(+), 194 deletions(-) + delete mode 100644 include/linux/platform_data/sht15.h +Merging jc_docs/docs-next (6fad4e69e835 kokr/memory-barriers.txt: Apply atomic_t.txt change) +$ git merge jc_docs/docs-next +Already up-to-date. +Merging v4l-dvb/master (1efdf1776e22 media: leds: as3645a: add V4L2_FLASH_LED_CLASS dependency) +$ git merge v4l-dvb/master +Already up-to-date. +Merging v4l-dvb-next/master (1efdf1776e22 media: leds: as3645a: add V4L2_FLASH_LED_CLASS dependency) +$ git merge v4l-dvb-next/master +Already up-to-date. +Merging fbdev/fbdev-for-next (23e9f4ef99dd video/console: Update BIOS dates list for GPD win console rotation DMI quirk) +$ git merge fbdev/fbdev-for-next +Already up-to-date. +Merging pm/linux-next (b2f8e7b8d694 Merge branch 'acpi-properties' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/device.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 12 ++++++++++++ + drivers/acpi/acpi_watchdog.c | 2 +- + drivers/acpi/property.c | 24 +++++++++++++++++++----- + drivers/base/power/qos.c | 10 +++++----- + include/acpi/acpi_bus.h | 18 ++++-------------- + include/linux/device.h | 2 +- + 6 files changed, 42 insertions(+), 26 deletions(-) +Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc()) +$ git merge idle/next +Merge made by the 'recursive' strategy. +Merging thermal/next (02bc1bd0498c Merge branch 'imx-nvmem' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/imx-thermal.txt | 7 ++ + arch/arm/boot/dts/imx6sx.dtsi | 13 ++- + arch/arm/boot/dts/imx6ul.dtsi | 19 ++++ + drivers/thermal/imx_thermal.c | 104 +++++++++++++++------ + 4 files changed, 112 insertions(+), 31 deletions(-) +Merging thermal-soc/next (aa647852c32a Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one) +$ git merge ieee1394/for-next +Auto-merging drivers/firewire/net.c +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging dlm/next (1ce8ed7eff15 DLM: fix NULL pointer dereference in send_to_sock()) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/ast.c | 2 + + fs/dlm/lock.c | 42 ++++++----- + fs/dlm/lowcomms.c | 218 ++++++++++++++++++++++++++++++++++-------------------- + fs/dlm/rcom.c | 6 ++ + fs/dlm/recover.c | 4 + + fs/dlm/recoverd.c | 11 ++- + 6 files changed, 181 insertions(+), 102 deletions(-) +Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging net-next/master (34929cb4d691 cxgb4: add new T5 pci device id's) +$ git merge net-next/master +Resolved 'lib/kobject_uevent.c' using previous resolution. +Auto-merging net/ipv6/ip6_tunnel.c +Auto-merging net/ipv6/ip6_gre.c +Auto-merging lib/kobject_uevent.c +CONFLICT (content): Merge conflict in lib/kobject_uevent.c +Auto-merging include/net/tcp.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 785067195ef9db6c540f2b67c41cab02c3373a1a] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/renesas,ravb.txt | 4 +- + arch/blackfin/mach-bf518/boards/ezbrd.c | 47 -- + arch/blackfin/mach-bf518/boards/tcm-bf518.c | 1 - + drivers/net/dsa/b53/b53_common.c | 151 +++++- + drivers/net/dsa/b53/b53_priv.h | 145 ++---- + drivers/net/dsa/b53/b53_regs.h | 48 ++ + drivers/net/dsa/bcm_sf2.c | 161 +------ + drivers/net/dsa/bcm_sf2.h | 2 - + drivers/net/dsa/bcm_sf2_cfp.c | 6 +- + drivers/net/dsa/bcm_sf2_regs.h | 11 - + drivers/net/dsa/lan9303-core.c | 40 ++ + drivers/net/dummy.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 5 + + drivers/net/ethernet/freescale/ucc_geth.c | 5 +- + drivers/net/ethernet/korina.c | 230 ++++----- + drivers/net/ethernet/marvell/mvpp2.c | 1 - + drivers/net/ethernet/mellanox/mlxsw/Makefile | 2 +- + .../mellanox/mlxsw/core_acl_flex_actions.c | 75 ++- + .../mellanox/mlxsw/core_acl_flex_actions.h | 5 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 363 ++++++++++++++- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 38 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 1 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 96 +--- + .../mellanox/mlxsw/spectrum_acl_flex_actions.c | 129 +++++ + .../mellanox/mlxsw/spectrum_acl_flex_actions.h | 44 ++ + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 5 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 1 + + drivers/net/ethernet/mellanox/mlxsw/trap.h | 4 + + drivers/net/ethernet/nvidia/forcedeth.c | 70 +-- + drivers/net/hamradio/baycom_epp.c | 50 +- + drivers/net/macvlan.c | 13 +- + drivers/net/phy/realtek.c | 54 ++- + drivers/net/team/team_mode_loadbalance.c | 8 +- + drivers/net/virtio_net. | 0 + drivers/net/virtio_net.c | 84 +++- + drivers/s390/net/qeth_core.h | 22 +- + drivers/s390/net/qeth_core_main.c | 23 +- + drivers/s390/net/qeth_core_mpc.c | 4 +- + drivers/s390/net/qeth_core_mpc.h | 72 +++ + drivers/s390/net/qeth_l2.h | 6 + + drivers/s390/net/qeth_l2_main.c | 517 ++++++++++++++++++++- + drivers/s390/net/qeth_l2_sys.c | 202 +++++++- + drivers/s390/net/qeth_l3_main.c | 31 +- + drivers/s390/net/qeth_l3_sys.c | 45 +- + include/linux/skbuff.h | 16 +- + include/net/addrconf.h | 4 +- + include/net/dsa.h | 1 - + include/net/ip_tunnels.h | 3 +- + include/net/netns/ipv6.h | 5 + + include/net/sch_generic.h | 1 - + include/net/tcp.h | 6 - + kernel/bpf/lpm_trie.c | 80 +++- + lib/kobject_uevent.c | 94 ++-- + lib/test_rhashtable.c | 293 +++++++++++- + net/dsa/Makefile | 2 +- + net/dsa/dsa.c | 28 -- + net/dsa/dsa2.c | 18 +- + net/dsa/dsa_priv.h | 7 +- + net/dsa/legacy.c | 10 +- + net/dsa/master.c | 120 +++++ + net/dsa/slave.c | 82 +--- + net/ipv4/inet_connection_sock.c | 36 +- + net/ipv4/ip_gre.c | 22 +- + net/ipv4/ip_tunnel.c | 12 +- + net/ipv4/ip_vti.c | 7 +- + net/ipv4/ipip.c | 7 +- + net/ipv4/tcp_input.c | 33 +- + net/ipv4/tcp_metrics.c | 14 +- + net/ipv4/udp.c | 3 +- + net/ipv6/addrlabel.c | 81 ++-- + net/ipv6/exthdrs_core.c | 2 +- + net/ipv6/ip6_gre.c | 8 +- + net/ipv6/ip6_tunnel.c | 20 +- + net/ipv6/ip6_vti.c | 23 +- + net/ipv6/sit.c | 9 +- + net/sched/sch_api.c | 3 +- + net/sched/sch_generic.c | 10 +- + net/sched/sch_htb.c | 5 + + net/sched/sch_netem.c | 7 +- + net/vmw_vsock/vmci_transport.c | 1 - + tools/testing/selftests/bpf/test_lpm_map.c | 201 +++++++- + tools/testing/selftests/net/rtnetlink.sh | 57 +++ + 83 files changed, 2986 insertions(+), 1170 deletions(-) + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_actions.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_acl_flex_actions.h + create mode 100644 drivers/net/virtio_net. + create mode 100644 net/dsa/master.c +Merging ipsec-next/master (8598112d04af xfrm: Fix return value check of copy_sec_ctx.) +$ git merge ipsec-next/master +Already up-to-date. +Merging netfilter-next/master (80cee03bf1d6 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge netfilter-next/master +Already up-to-date. +Merging nfc-next/master (bd751808f9ff NFC: trf7970a: Correct register settings for 27MHz clock) +$ git merge nfc-next/master +Already up-to-date. +Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.) +$ git merge ipvs-next/master +Auto-merging net/netfilter/ipvs/ip_vs_proto_tcp.c +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging wireless-drivers-next/master (e9a3846afaa4 mwifiex: use get_random_mask_addr() helper) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/broadcom/b43/phy_g.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/radio.c | 2 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 47 ++- + drivers/net/wireless/marvell/mwifiex/main.h | 1 - + drivers/net/wireless/marvell/mwifiex/scan.c | 5 +- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 6 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 13 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 6 +- + drivers/net/wireless/rsi/rsi_91x_core.c | 33 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 73 ++-- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 446 ++++++++++++++++----- + drivers/net/wireless/rsi/rsi_91x_main.c | 9 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 46 ++- + drivers/net/wireless/rsi/rsi_91x_ps.c | 15 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 4 +- + drivers/net/wireless/rsi/rsi_common.h | 4 +- + drivers/net/wireless/rsi/rsi_hal.h | 3 +- + drivers/net/wireless/rsi/rsi_main.h | 10 +- + drivers/net/wireless/rsi/rsi_mgmt.h | 21 +- + drivers/net/wireless/rsi/rsi_ps.h | 7 +- + 20 files changed, 534 insertions(+), 219 deletions(-) +Merging bluetooth/master (493668b457c3 ieee802154: fix gcc-4.9 warnings) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/bluetooth.txt | 5 +++ + .../devicetree/bindings/soc/qcom/qcom,wcnss.txt | 8 ++++ + drivers/bluetooth/btqcomsmd.c | 45 ++++++++++++++++++++++ + drivers/net/ieee802154/ca8210.c | 2 +- + 4 files changed, 59 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/net/bluetooth.txt +Merging mac80211-next/master (ed554136b0a8 nl80211: add an option to allow MFP without requiring it) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/80211/cfg80211.rst | 3 - + drivers/net/wireless/mac80211_hwsim.c | 192 ++++++++++++++-------------- + include/net/cfg80211.h | 19 +-- + include/net/mac80211.h | 8 +- + include/uapi/linux/nl80211.h | 50 +++++++- + net/mac80211/agg-rx.c | 4 +- + net/mac80211/ht.c | 12 +- + net/mac80211/iface.c | 4 +- + net/mac80211/mesh.c | 3 +- + net/mac80211/mesh_hwmp.c | 8 +- + net/mac80211/mesh_plink.c | 3 +- + net/mac80211/mlme.c | 19 +-- + net/mac80211/scan.c | 37 ++++-- + net/mac80211/util.c | 25 ++-- + net/wireless/nl80211.c | 154 +++++++++++++--------- + net/wireless/util.c | 169 +++++++----------------- + 16 files changed, 355 insertions(+), 355 deletions(-) +Merging rdma/for-next (c50c98d38291 Merge branch 'k.o/net-next-base' into k.o/for-next-merged-2) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/hw/qedr/qedr_roce_cm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/infiniband/hw/qedr/Makefile | 2 +- + drivers/infiniband/hw/qedr/main.c | 105 ++- + drivers/infiniband/hw/qedr/qedr.h | 31 +- + drivers/infiniband/hw/qedr/qedr_hsi_rdma.h | 6 +- + drivers/infiniband/hw/qedr/qedr_iw_cm.c | 746 +++++++++++++++++++++ + drivers/infiniband/hw/qedr/qedr_iw_cm.h | 49 ++ + .../hw/qedr/{qedr_cm.c => qedr_roce_cm.c} | 2 +- + .../hw/qedr/{qedr_cm.h => qedr_roce_cm.h} | 0 + drivers/infiniband/hw/qedr/verbs.c | 352 +++++++--- + drivers/infiniband/hw/qedr/verbs.h | 2 + + 11 files changed, 1205 insertions(+), 91 deletions(-) + create mode 100644 drivers/infiniband/hw/qedr/qedr_iw_cm.c + create mode 100644 drivers/infiniband/hw/qedr/qedr_iw_cm.h + rename drivers/infiniband/hw/qedr/{qedr_cm.c => qedr_roce_cm.c} (99%) + rename drivers/infiniband/hw/qedr/{qedr_cm.h => qedr_roce_cm.h} (100%) +Merging gfs2/for-next (fdc47b4f0c23 gfs2: Fix debugfs glocks dump) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/glock.c | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) +Merging mtd/master (73600b619bf8 mtd: nand: remove unused blockmask variable) +$ git merge mtd/master +Merge made by the 'recursive' strategy. + drivers/mtd/nand/lpc32xx_mlc.c | 3 ++- + drivers/mtd/nand/nand_base.c | 3 +-- + drivers/mtd/spi-nor/spi-nor.c | 45 +++++++++++++++++++++++++++++++++++++++--- + 3 files changed, 45 insertions(+), 6 deletions(-) +Merging l2-mtd/master (d1f936d73683 Merge tag 'nand/for-4.14' of git://git.infradead.org/l2-mtd into mtd/next) +$ git merge l2-mtd/master +Already up-to-date. +Merging nand/nand/next (2d2a2b8c080a mtd: nand: complain loudly when chip->bits_per_cell is not correctly initialized) +$ git merge nand/nand/next +Already up-to-date. +Merging spi-nor/spi-nor/next (90074de6630f mtd: spi-nor: fix DMA unsafe buffer issue in spi_nor_read_sfdp()) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. +Merging crypto/master (2d45a7e89833 crypto: af_alg - get_page upon reassignment to TX SGL) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (47e0cd6b1dbb Merge branch 'drm-next-4.14' of git://people.freedesktop.org/~agd5f/linux into drm-next) +$ git merge drm/drm-next +Already up-to-date. +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (4babc5e27cfd drm/i915: remove redundant variable hw_check) +$ git merge drm-intel/for-linux-next +Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_gem_execbuffer.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/i915_gem_gtt.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_lrc.c' using previous resolution. +Resolved 'drivers/media/v4l2-core/videobuf2-dma-contig.c' using previous resolution. +Auto-merging drivers/media/v4l2-core/videobuf2-dma-contig.c +CONFLICT (content): Merge conflict in drivers/media/v4l2-core/videobuf2-dma-contig.c +Auto-merging drivers/gpu/drm/i915/selftests/i915_random.c +Auto-merging drivers/gpu/drm/i915/intel_sdvo.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_fbc.c +Auto-merging drivers/gpu/drm/i915/intel_dsi.c +Auto-merging drivers/gpu/drm/i915/intel_dp.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/i915_trace.h +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c +Auto-merging drivers/gpu/drm/i915/gvt/cfg_space.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d2044ac2b665] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/Makefile | 5 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 26 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 30 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 37 +- + drivers/gpu/drm/i915/gvt/execlist.c | 127 +++- + drivers/gpu/drm/i915/gvt/gtt.c | 5 +- + drivers/gpu/drm/i915/gvt/gvt.c | 2 +- + drivers/gpu/drm/i915/gvt/gvt.h | 14 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 44 +- + drivers/gpu/drm/i915/gvt/mmio.c | 47 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 114 +++- + drivers/gpu/drm/i915/gvt/scheduler.h | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 94 ++- + drivers/gpu/drm/i915/i915_drv.c | 7 +- + drivers/gpu/drm/i915/i915_drv.h | 163 +++-- + drivers/gpu/drm/i915/i915_gem.c | 122 ++-- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 29 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 51 ++ + drivers/gpu/drm/i915/i915_gem_gtt.c | 450 +++++++++--- + drivers/gpu/drm/i915/i915_gem_gtt.h | 46 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 83 +-- + drivers/gpu/drm/i915/i915_guc_submission.c | 329 ++++----- + drivers/gpu/drm/i915/i915_irq.c | 751 ++++++++------------- + drivers/gpu/drm/i915/i915_oa_cflgt2.c | 109 +++ + drivers/gpu/drm/i915/i915_oa_cflgt2.h | 34 + + drivers/gpu/drm/i915/i915_params.c | 164 ++--- + drivers/gpu/drm/i915/i915_pci.c | 262 +++++-- + drivers/gpu/drm/i915/i915_perf.c | 8 +- + drivers/gpu/drm/i915/i915_reg.h | 43 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 27 +- + drivers/gpu/drm/i915/i915_trace.h | 2 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 49 +- + drivers/gpu/drm/i915/intel_audio.c | 5 - + drivers/gpu/drm/i915/intel_bios.c | 200 +++--- + drivers/gpu/drm/i915/intel_cdclk.c | 278 ++++---- + drivers/gpu/drm/i915/intel_crt.c | 22 +- + drivers/gpu/drm/i915/intel_ddi.c | 321 +++++---- + drivers/gpu/drm/i915/intel_device_info.c | 2 - + drivers/gpu/drm/i915/intel_display.c | 189 ++++-- + drivers/gpu/drm/i915/intel_dp.c | 215 +++--- + drivers/gpu/drm/i915/intel_dp_mst.c | 16 +- + drivers/gpu/drm/i915/intel_drv.h | 113 ++-- + drivers/gpu/drm/i915/intel_dsi.c | 24 +- + drivers/gpu/drm/i915/intel_dvo.c | 12 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 243 ++++++- + drivers/gpu/drm/i915/intel_fbc.c | 17 + + drivers/gpu/drm/i915/intel_fbdev.c | 3 + + drivers/gpu/drm/i915/intel_guc_fwif.h | 10 +- + drivers/gpu/drm/i915/intel_hdmi.c | 157 +++-- + drivers/gpu/drm/i915/intel_lrc.c | 374 +++++----- + drivers/gpu/drm/i915/intel_lrc.h | 36 +- + drivers/gpu/drm/i915/intel_lvds.c | 24 +- + drivers/gpu/drm/i915/intel_modes.c | 17 + + drivers/gpu/drm/i915/intel_pipe_crc.c | 65 +- + drivers/gpu/drm/i915/intel_pm.c | 479 ++++++++----- + drivers/gpu/drm/i915/intel_psr.c | 314 +++++---- + drivers/gpu/drm/i915/intel_ringbuffer.c | 159 +---- + drivers/gpu/drm/i915/intel_ringbuffer.h | 26 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 85 ++- + drivers/gpu/drm/i915/intel_sdvo.c | 40 +- + drivers/gpu/drm/i915/intel_sprite.c | 27 +- + drivers/gpu/drm/i915/intel_tv.c | 16 +- + drivers/gpu/drm/i915/intel_uc.h | 20 - + drivers/gpu/drm/i915/intel_uncore.c | 221 +++--- + drivers/gpu/drm/i915/intel_uncore.h | 10 + + drivers/gpu/drm/i915/intel_vbt_defs.h | 331 +++++---- + drivers/gpu/drm/i915/selftests/i915_gem_timeline.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_random.c | 5 - + drivers/gpu/drm/i915/selftests/i915_random.h | 5 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 5 + + drivers/media/v4l2-core/videobuf2-dma-contig.c | 4 +- + drivers/rapidio/devices/rio_mport_cdev.c | 4 +- + include/drm/i915_pciids.h | 152 +++-- + include/linux/scatterlist.h | 17 +- + include/uapi/drm/i915_drm.h | 17 +- + lib/scatterlist.c | 95 ++- + tools/testing/scatterlist/Makefile | 30 + + tools/testing/scatterlist/linux/mm.h | 125 ++++ + tools/testing/scatterlist/main.c | 79 +++ + 80 files changed, 4759 insertions(+), 3128 deletions(-) + create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt2.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt2.h + create mode 100644 tools/testing/scatterlist/Makefile + create mode 100644 tools/testing/scatterlist/linux/mm.h + create mode 100644 tools/testing/scatterlist/main.c +Merging drm-tegra/drm/tegra/for-next (65d5d30ccebd drm/tegra: trace: Fix path to include) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/trace.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging drm-misc/for-linux-next (f44d85389e17 drm: rename u32 in __u32 in uapi) +$ git merge drm-misc/for-linux-next +Already up-to-date. +Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (642e5ef8c6c4 drm/msm: fix _NO_IMPLICIT fencing case) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/Makefile | 4 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 10 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 10 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 222 +++++++++++++++++++--- + drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 103 ++++++++++- + drivers/gpu/drm/msm/adreno/a5xx_power.c | 6 +- + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 294 ++++++++++++++++++++++++++++++ + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 183 ++++++++++--------- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 43 ++--- + drivers/gpu/drm/msm/msm_drv.c | 67 ++++++- + drivers/gpu/drm/msm/msm_drv.h | 22 ++- + drivers/gpu/drm/msm/msm_fence.c | 2 +- + drivers/gpu/drm/msm/msm_fence.h | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 11 -- + drivers/gpu/drm/msm/msm_gem.h | 5 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 49 +++-- + drivers/gpu/drm/msm/msm_gpu.c | 182 +++++++++++++----- + drivers/gpu/drm/msm/msm_gpu.h | 54 ++++-- + drivers/gpu/drm/msm/msm_ringbuffer.c | 29 ++- + drivers/gpu/drm/msm/msm_ringbuffer.h | 32 +++- + drivers/gpu/drm/msm/msm_submitqueue.c | 160 ++++++++++++++++ + include/uapi/drm/msm_drm.h | 24 +++ + 22 files changed, 1242 insertions(+), 272 deletions(-) + create mode 100644 drivers/gpu/drm/msm/adreno/a5xx_preempt.c + create mode 100644 drivers/gpu/drm/msm/msm_submitqueue.c +Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (e46477b8f23c drm: mali-dp: Restore commit_tail behaviour to the runtime_pm friendly version.) +$ git merge mali-dp/for-upstream/mali-dp +Auto-merging drivers/gpu/drm/arm/malidp_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/malidp_crtc.c | 4 ++++ + drivers/gpu/drm/arm/malidp_drv.c | 11 +++-------- + 2 files changed, 7 insertions(+), 8 deletions(-) +Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (9303519985ed drm/imx: parallel-display: use correct connector enum) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- + drivers/gpu/drm/imx/parallel-display.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging etnaviv/etnaviv/next (65375b873cb5 drm/etnaviv: switch GEM allocations to __GFP_RETRY_MAYFAIL) +$ git merge etnaviv/etnaviv/next +Already up-to-date. +Merging kconfig/for-next (6f7da290413b Linux 4.12) +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (1874021ec3a8 Merge remote-tracking branches 'regmap/topic/const' and 'regmap/topic/namespace' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-spi.c | 2 +- + drivers/base/regmap/regmap-spmi.c | 4 ++-- + include/linux/regmap.h | 17 +++++++++-------- + 3 files changed, 12 insertions(+), 11 deletions(-) +Merging sound/for-next (729fbfc92a45 ALSA: line6: add support for POD HD DESKTOP) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/core/hrtimer.c | 2 +- + sound/core/hwdep.c | 2 ++ + sound/pci/oxygen/xonar_dg.h | 2 +- + sound/pci/oxygen/xonar_dg_mixer.c | 2 +- + sound/usb/line6/podhd.c | 16 +++++++++++++++- + 5 files changed, 20 insertions(+), 4 deletions(-) +Merging sound-asoc/for-next (779db2820564 Merge remote-tracking branches 'asoc/topic/ts3a277e', 'asoc/topic/wm97xx' and 'asoc/topic/zte' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/rt5514.txt | 13 +- + Documentation/devicetree/bindings/sound/rt5663.txt | 16 + + .../devicetree/bindings/sound/tfa9879.txt | 23 + + .../devicetree/bindings/sound/wlf,arizona.txt | 49 ++ + MAINTAINERS | 1 + + drivers/input/touchscreen/Kconfig | 2 +- + drivers/input/touchscreen/wm97xx-core.c | 252 ++++++---- + drivers/mfd/Kconfig | 14 + + drivers/mfd/Makefile | 1 + + drivers/mfd/wm97xx-core.c | 366 ++++++++++++++ + include/linux/mfd/wm97xx.h | 25 + + include/sound/ac97/codec.h | 118 +++++ + include/sound/ac97/compat.h | 20 + + include/sound/ac97/controller.h | 85 ++++ + include/sound/ac97/regs.h | 262 ++++++++++ + include/sound/ac97_codec.h | 239 +-------- + include/sound/pxa2xx-lib.h | 15 +- + include/sound/rt5663.h | 3 + + include/sound/soc.h | 2 + + sound/Kconfig | 2 + + sound/Makefile | 1 + + sound/ac97/Kconfig | 19 + + sound/ac97/Makefile | 8 + + sound/ac97/ac97_core.h | 16 + + sound/ac97/bus.c | 539 +++++++++++++++++++++ + sound/ac97/codec.c | 15 + + sound/ac97/snd_ac97_compat.c | 108 +++++ + sound/arm/pxa2xx-ac97-lib.c | 37 +- + sound/arm/pxa2xx-ac97.c | 35 +- + sound/soc/codecs/Kconfig | 9 +- + sound/soc/codecs/adau17x1.c | 24 +- + sound/soc/codecs/adau17x1.h | 2 + + sound/soc/codecs/arizona.c | 141 +++++- + sound/soc/codecs/arizona.h | 5 +- + sound/soc/codecs/cs43130.c | 16 +- + sound/soc/codecs/cs47l24.c | 11 +- + sound/soc/codecs/hdmi-codec.c | 5 +- + sound/soc/codecs/max98090.c | 2 +- + sound/soc/codecs/rl6231.c | 5 +- + sound/soc/codecs/rt5514-spi.c | 17 +- + sound/soc/codecs/rt5514-spi.h | 3 + + sound/soc/codecs/rt5514.c | 63 --- + sound/soc/codecs/rt5514.h | 3 - + sound/soc/codecs/rt5645.c | 8 +- + sound/soc/codecs/rt5663.c | 218 ++++++++- + sound/soc/codecs/tas571x.c | 3 +- + sound/soc/codecs/tfa9879.c | 6 + + sound/soc/codecs/ts3a227e.c | 10 + + sound/soc/codecs/wm5102.c | 11 +- + sound/soc/codecs/wm5110.c | 11 +- + sound/soc/codecs/wm8997.c | 12 +- + sound/soc/codecs/wm8998.c | 11 +- + sound/soc/codecs/wm9705.c | 66 ++- + sound/soc/codecs/wm9712.c | 45 +- + sound/soc/codecs/wm9713.c | 39 +- + sound/soc/davinci/davinci-mcasp.c | 9 +- + sound/soc/fsl/fsl-asoc-card.c | 10 +- + sound/soc/fsl/fsl_spdif.c | 4 +- + sound/soc/fsl/fsl_ssi.c | 46 +- + sound/soc/intel/atom/sst-mfld-platform-compress.c | 2 +- + sound/soc/intel/atom/sst-mfld-platform.h | 2 +- + sound/soc/intel/atom/sst/sst_acpi.c | 9 +- + sound/soc/intel/atom/sst/sst_loader.c | 1 - + sound/soc/intel/atom/sst/sst_stream.c | 1 - + sound/soc/intel/boards/bytcr_rt5640.c | 8 +- + sound/soc/intel/boards/bytcr_rt5651.c | 20 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 185 ++++++- + sound/soc/intel/boards/cht_bsw_rt5645.c | 14 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 27 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 9 + + sound/soc/pxa/pxa2xx-ac97.c | 32 +- + sound/soc/qcom/lpass-platform.c | 2 - + sound/soc/rockchip/rk3399_gru_sound.c | 149 +++++- + sound/soc/rockchip/rockchip_i2s.c | 1 - + sound/soc/samsung/i2s.c | 9 +- + sound/soc/samsung/i2s.h | 3 + + sound/soc/samsung/tm2_wm5110.c | 7 +- + sound/soc/sh/rcar/adg.c | 4 +- + sound/soc/soc-dapm.c | 14 +- + sound/soc/soc-pcm.c | 9 +- + sound/soc/soc-topology.c | 5 +- + sound/soc/zte/zx-spdif.c | 4 +- + 82 files changed, 2961 insertions(+), 657 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/tfa9879.txt + create mode 100644 Documentation/devicetree/bindings/sound/wlf,arizona.txt + create mode 100644 drivers/mfd/wm97xx-core.c + create mode 100644 include/linux/mfd/wm97xx.h + create mode 100644 include/sound/ac97/codec.h + create mode 100644 include/sound/ac97/compat.h + create mode 100644 include/sound/ac97/controller.h + create mode 100644 include/sound/ac97/regs.h + create mode 100644 sound/ac97/Kconfig + create mode 100644 sound/ac97/Makefile + create mode 100644 sound/ac97/ac97_core.h + create mode 100644 sound/ac97/bus.c + create mode 100644 sound/ac97/codec.c + create mode 100644 sound/ac97/snd_ac97_compat.c +Merging modules/modules-next (0bf8bf50eddc module: Remove const attribute from alias for MODULE_DEVICE_TABLE) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (697c5d8a3676 Input: i8042 - add Gigabyte P57 to the keyboard reset table) +$ git merge input/next +Already up-to-date. +Merging block/for-next (50305e13dc24 Merge branch 'for-4.14/block-postmerge' into for-next) +$ git merge block/for-next +Resolved 'mm/page_io.c' using previous resolution. +Auto-merging mm/page_io.c +CONFLICT (content): Merge conflict in mm/page_io.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a91f0151e1de] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) +$ git merge lightnvm/for-next +Already up-to-date. +Merging device-mapper/for-next (c3ca015fab6d dax: remove the pmem_dax_ops->flush abstraction) +$ git merge device-mapper/for-next +Already up-to-date. +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/next (d32df218819d Merge branch 'fixes' into next) +$ git merge mmc/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_io.c +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (184a09eb9a2f md/raid5: preserve STRIPE_ON_UNPLUG_LIST in break_stripe_batch_list) +$ git merge md/for-next +Already up-to-date. +Merging mfd/for-mfd-next (b01e9348e106 mfd: intel_soc_pmic: Differentiate between Bay and Cherry Trail CRC variants) +$ git merge mfd/for-mfd-next +Already up-to-date. +Merging backlight/for-backlight-next (2606706e4d7b backlight: gpio_backlight: Delete pdata inversion) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/for-next (5d01fd38a3b0 power: supply: bq27xxx: enable writing capacity values for bq27421) +$ git merge battery/for-next +Already up-to-date. +Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (2bd6bf03f4c1 Linux 4.14-rc1) +$ git merge regulator/for-next +Already up-to-date. +Merging security/next (10e3781dda77 Revert "ima: use fs method to read integrity data") +$ git merge security/next +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Auto-merging security/commoncap.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/include/domain.h +Auto-merging security/apparmor/domain.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/audit.h +Auto-merging Documentation/sysctl/kernel.txt +Auto-merging Documentation/networking/filter.txt +Auto-merging Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/ima_policy | 3 +- + Documentation/admin-guide/kernel-parameters.txt | 8 +- + .../devicetree/bindings/security/tpm/tpm-i2c.txt | 6 + + Documentation/networking/filter.txt | 2 +- + Documentation/sysctl/kernel.txt | 1 + + Documentation/userspace-api/seccomp_filter.rst | 52 +- + drivers/char/tpm/tpm-interface.c | 10 +- + drivers/char/tpm/tpm.h | 9 +- + drivers/char/tpm/tpm2-cmd.c | 2 +- + drivers/char/tpm/tpm_crb.c | 2 +- + drivers/char/tpm/tpm_ibmvtpm.c | 98 +-- + drivers/char/tpm/tpm_infineon.c | 6 +- + drivers/char/tpm/tpm_tis_core.c | 8 +- + fs/efivarfs/file.c | 11 +- + fs/libfs.c | 32 + + include/linux/audit.h | 6 +- + include/linux/fs.h | 2 + + include/linux/seccomp.h | 3 +- + include/uapi/linux/seccomp.h | 23 +- + kernel/seccomp.c | 321 +++++++++- + security/apparmor/.gitignore | 1 + + security/apparmor/Makefile | 43 +- + security/apparmor/apparmorfs.c | 37 +- + security/apparmor/domain.c | 4 +- + security/apparmor/file.c | 30 + + security/apparmor/include/apparmor.h | 2 + + security/apparmor/include/audit.h | 39 +- + security/apparmor/include/domain.h | 5 + + security/apparmor/include/ipc.h | 6 + + security/apparmor/include/label.h | 1 + + security/apparmor/include/mount.h | 54 ++ + security/apparmor/include/net.h | 114 ++++ + security/apparmor/include/perms.h | 5 +- + security/apparmor/include/policy.h | 13 + + security/apparmor/include/sig_names.h | 98 +++ + security/apparmor/ipc.c | 99 +++ + security/apparmor/label.c | 36 +- + security/apparmor/lib.c | 5 +- + security/apparmor/lsm.c | 472 ++++++++++++++ + security/apparmor/mount.c | 696 +++++++++++++++++++++ + security/apparmor/net.c | 184 ++++++ + security/apparmor/policy.c | 166 ++--- + security/apparmor/policy_ns.c | 2 + + security/apparmor/policy_unpack.c | 105 +++- + security/commoncap.c | 6 +- + security/integrity/ima/ima.h | 1 + + security/integrity/ima/ima_api.c | 67 +- + security/integrity/ima/ima_crypto.c | 10 + + security/integrity/ima/ima_fs.c | 4 +- + security/integrity/ima/ima_main.c | 19 +- + security/integrity/ima/ima_policy.c | 41 +- + tools/testing/selftests/seccomp/Makefile | 18 +- + .../testing/selftests/seccomp/seccomp_benchmark.c | 99 +++ + tools/testing/selftests/seccomp/seccomp_bpf.c | 610 +++++++++++++++--- + 54 files changed, 3339 insertions(+), 358 deletions(-) + create mode 100644 security/apparmor/include/mount.h + create mode 100644 security/apparmor/include/net.h + create mode 100644 security/apparmor/include/sig_names.h + create mode 100644 security/apparmor/mount.c + create mode 100644 security/apparmor/net.c + create mode 100644 tools/testing/selftests/seccomp/seccomp_benchmark.c +Merging integrity/next (ed301d2614d2 ima: define "fs_unsafe" builtin policy) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (8ab2a6905b28 KEYS: Add documentation for asymmetric keyring restrictions) +$ git merge keys/keys-next +Merge made by the 'recursive' strategy. +Merging selinux/next (7c620ece125c selinux: Use kmem_cache for hashtab_node) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/ss/hashtab.c | 17 +++++++++++++++-- + security/selinux/ss/hashtab.h | 4 ++++ + security/selinux/ss/services.c | 4 ++++ + 3 files changed, 23 insertions(+), 2 deletions(-) +Merging tpmdd/next (6227756a7b0a tpm/tpm_crb: Use start method value from ACPI table directly) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-sysfs.c | 87 +++++++++++++++++++++++------------------ + drivers/char/tpm/tpm.h | 13 ------ + drivers/char/tpm/tpm_crb.c | 59 ++++++++++++++-------------- + drivers/char/tpm/tpm_tis.c | 2 +- + drivers/char/tpm/tpm_tis_core.c | 6 +-- + drivers/char/tpm/tpm_tis_core.h | 4 +- + drivers/char/tpm/tpm_tis_spi.c | 25 ++++++------ + 7 files changed, 94 insertions(+), 102 deletions(-) +Merging watchdog/master (4cb30b044a8f watchdog: mei_wdt: constify mei_cl_device_id) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (6942e78ae429 Merge branches 'arm/omap', 'arm/exynos' and 'iommu/fixes' into next) +$ git merge iommu/next +Merge made by the 'recursive' strategy. + drivers/iommu/Kconfig | 5 +- + drivers/iommu/dmar.c | 2 +- + drivers/iommu/exynos-iommu.c | 23 ++- + drivers/iommu/omap-iommu.c | 375 ++++++++++++++++++++++++++++++++----------- + drivers/iommu/omap-iommu.h | 30 ++-- + 5 files changed, 316 insertions(+), 119 deletions(-) +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (417fb50d5516 vfio: platform: constify amba_id) +$ git merge vfio/next +Already up-to-date. +Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver()) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (462d9d959613 audit: use audit_set_enabled() in audit_enable()) +$ git merge audit/next +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.h +Auto-merging include/linux/audit.h +Merge made by the 'recursive' strategy. + include/linux/audit.h | 8 ++++---- + kernel/audit.c | 41 +++++++++++++++++++++++++++++++++-------- + kernel/audit.h | 3 ++- + kernel/auditsc.c | 8 +++++++- + 4 files changed, 46 insertions(+), 14 deletions(-) +Merging devicetree/for-next (35f3c9845485 scripts/dtc: dtx_diff - 2nd update of include dts paths to match build) +$ git merge devicetree/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 2 +- + include/linux/of_platform.h | 7 +++++++ + scripts/dtc/dtx_diff | 22 +++++++++------------- + 3 files changed, 17 insertions(+), 14 deletions(-) +Merging mailbox/mailbox-for-next (1da92afbbfcd mailbox: bcm-flexrm-mailbox: Use txdone_ack instead of txdone_poll) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (442f4e787ddd Merge remote-tracking branches 'spi/topic/davinci', 'spi/topic/imx', 'spi/topic/rspi', 'spi/topic/slave' and 'spi/topic/spreadtrum' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-davinci.txt | 10 + + Documentation/devicetree/bindings/spi/spi-rspi.txt | 5 +- + .../devicetree/bindings/spi/spi-sprd-adi.txt | 58 +++ + drivers/spi/Kconfig | 10 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-armada-3700.c | 142 +++---- + drivers/spi/spi-imx.c | 227 +++++++++-- + drivers/spi/spi-sprd-adi.c | 419 +++++++++++++++++++++ + drivers/spi/spi-stm32.c | 4 +- + include/uapi/linux/spi/spidev.h | 1 + + 10 files changed, 743 insertions(+), 134 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi-sprd-adi.txt + create mode 100644 drivers/spi/spi-sprd-adi.c +Merging tip/auto-latest (dc1fb16d0a77 Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Merge made by the 'recursive' strategy. + arch/arm/include/asm/thread_info.h | 15 +++--- + arch/arm/include/asm/uaccess.h | 2 - + arch/arm/kernel/entry-common.S | 20 +++++--- + arch/arm/kernel/signal.c | 10 ++-- + arch/arm64/kernel/signal.c | 6 +-- + arch/x86/include/asm/mmu_context.h | 32 +++++++++++-- + arch/x86/kernel/cpu/bugs.c | 8 ---- + arch/x86/kernel/cpu/common.c | 8 ++++ + arch/x86/kernel/smpboot.c | 13 ++--- + arch/x86/mm/tlb.c | 11 ++--- + include/linux/syscalls.h | 12 +++-- + mm/gup.c | 97 +++++++++++++++++++++++--------------- + 12 files changed, 142 insertions(+), 92 deletions(-) +Merging clockevents/clockevents/next (acdbb48efecb MAINTAINERS: Fix path and add bindings to timers) +$ git merge clockevents/clockevents/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (398443471f16 EDAC, mce_amd: Get rid of local var in amd_filter_mce()) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge irqchip/irqchip/for-next +Already up-to-date. +Merging ftrace/for-next (170b3b1050e2 tracing: Apply trace_clock changes to instance max buffer) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (cb7f8519a489 timers: Adjust timeout at CPU-offline migration) +$ git merge rcu/rcu/next +Auto-merging arch/x86/mm/tlb.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../Design/Memory-Ordering/Tree-RCU-Diagram.html | 9 + + .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 707 +++ + .../TreeRCU-callback-invocation.svg | 486 ++ + .../Memory-Ordering/TreeRCU-callback-registry.svg | 655 +++ + .../RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg | 700 +++ + .../Design/Memory-Ordering/TreeRCU-gp-cleanup.svg | 1126 +++++ + .../RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg | 1309 +++++ + .../Design/Memory-Ordering/TreeRCU-gp-init-1.svg | 656 +++ + .../Design/Memory-Ordering/TreeRCU-gp-init-2.svg | 656 +++ + .../Design/Memory-Ordering/TreeRCU-gp-init-3.svg | 632 +++ + .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 5135 ++++++++++++++++++++ + .../RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg | 775 +++ + .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 1095 +++++ + .../RCU/Design/Memory-Ordering/rcu_node-lock.svg | 229 + + Documentation/RCU/stallwarn.txt | 200 +- + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/core-api/kernel-api.rst | 14 - + Documentation/memory-barriers.txt | 191 +- + arch/x86/mm/tlb.c | 5 + + include/linux/irq_work.h | 3 - + include/linux/rculist.h | 2 +- + include/linux/rcupdate.h | 22 +- + include/linux/sched.h | 3 +- + include/linux/sched/mm.h | 4 + + include/linux/srcu.h | 1 + + kernel/irq_work.c | 9 +- + kernel/rcu/rcu.h | 21 +- + kernel/rcu/rcutorture.c | 26 +- + kernel/rcu/srcutree.c | 2 +- + kernel/rcu/sync.c | 9 +- + kernel/rcu/tree.c | 158 +- + kernel/rcu/tree.h | 5 + + kernel/rcu/tree_plugin.h | 9 +- + kernel/rcu/update.c | 35 +- + kernel/sched/core.c | 14 +- + kernel/sched/membarrier.c | 2 +- + kernel/time/timer.c | 7 +- + .../selftests/rcutorture/bin/config_override.sh | 2 +- + .../selftests/rcutorture/bin/configcheck.sh | 2 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 4 +- + .../selftests/rcutorture/bin/parse-build.sh | 2 +- + .../selftests/rcutorture/bin/parse-torture.sh | 2 +- + 45 files changed, 14644 insertions(+), 289 deletions(-) + create mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Diagram.html + create mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-callback-invocation.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-callback-registry.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-cleanup.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-1.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-2.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-3.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-qs.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/rcu_node-lock.svg +Merging kvm/linux-next (4f350c6dbcb9 kvm: nVMX: Handle deferred early VMLAUNCH/VMRESUME failure properly) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (9b87e7a8bfb5 KVM: arm/arm64: Support uaccess of GICC_APRn) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) +$ git merge kvm-mips/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (67f8a8c1151c KVM: PPC: Book3S HV: Fix bug causing host SLB to be restored incorrectly) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (c95c895303ed KVM: s390: vsie: cleanup mcck reinjection) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (0555ac4333d7 xen, arm64: drop dummy lookup_address()) +$ git merge xen-tip/linux-next +Auto-merging arch/x86/xen/mmu_pv.c +Merge made by the 'recursive' strategy. + arch/x86/xen/mmu_pv.c | 2 +- + drivers/xen/xenbus/xenbus_client.c | 130 +++++++++++++++++++------------------ + include/xen/arm/page.h | 10 --- + 3 files changed, 68 insertions(+), 74 deletions(-) +Merging percpu/for-next (5e81ee3e6a79 percpu: update header to contain bitmap allocator explanation.) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (ebb2c2437d80 Merge tag 'mmc-v4.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc) +$ git merge workqueues/for-next +Already up-to-date. +Merging drivers-x86/for-next (2bd6bf03f4c1 Linux 4.14-rc1) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (859eb05676f6 platform/chrome: Use proper protocol transfer function) +$ git merge chrome-platform/for-next +Auto-merging drivers/platform/chrome/chromeos_laptop.c +Merge made by the 'recursive' strategy. + drivers/platform/chrome/chromeos_laptop.c | 22 +++---- + drivers/platform/chrome/cros_ec_debugfs.c | 18 +++++ + drivers/platform/chrome/cros_ec_debugfs.h | 2 + + drivers/platform/chrome/cros_ec_dev.c | 49 ++++++++------ + drivers/platform/chrome/cros_ec_proto.c | 8 ++- + drivers/platform/chrome/cros_ec_sysfs.c | 105 ++++++++++++++++++++++++------ + include/linux/mfd/cros_ec.h | 1 + + 7 files changed, 149 insertions(+), 56 deletions(-) +Merging hsi/for-next (67ddd75771b6 HSI: core: Use kcalloc() in two functions) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (f292bbfaa69d leds: Replace flags bit shift with BIT() macros) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/leds-pca955x.c | 9 +- + drivers/leds/trigger/Kconfig | 9 ++ + drivers/leds/trigger/Makefile | 1 + + drivers/leds/trigger/ledtrig-activity.c | 273 ++++++++++++++++++++++++++++++++ + include/linux/leds.h | 18 +-- + 5 files changed, 298 insertions(+), 12 deletions(-) + create mode 100644 drivers/leds/trigger/ledtrig-activity.c +Merging ipmi/for-next (80a469559980 ipmi: Remove the device id from ipmi_register_smi()) +$ git merge ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +Merge made by the 'recursive' strategy. + Documentation/IPMI.txt | 4 +- + drivers/char/ipmi/Kconfig | 27 +- + drivers/char/ipmi/ipmi_msghandler.c | 697 +++++++++++++++++++++++++++--------- + drivers/char/ipmi/ipmi_powernv.c | 4 +- + drivers/char/ipmi/ipmi_poweroff.c | 2 +- + drivers/char/ipmi/ipmi_si_intf.c | 44 ++- + drivers/char/ipmi/ipmi_ssif.c | 18 - + drivers/char/ipmi/ipmi_watchdog.c | 11 +- + include/linux/ipmi.h | 6 +- + include/linux/ipmi_smi.h | 25 +- + 10 files changed, 603 insertions(+), 235 deletions(-) +Merging driver-core/driver-core-next (fb7ff3f8721b cpuinfo: implement sysfs nodes for arm64) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 52 ++++++++++++ + arch/Kconfig | 3 + + arch/arm64/Kconfig | 1 + + arch/arm64/kernel/cpuinfo.c | 55 ++++++++++++ + arch/x86/Kconfig | 1 + + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/cpuinfo.c | 99 ++++++++++++++++++++++ + drivers/base/Makefile | 1 + + drivers/base/cpuinfo.c | 48 +++++++++++ + include/linux/cpuhotplug.h | 1 + + include/linux/cpuinfo.h | 43 ++++++++++ + 11 files changed, 306 insertions(+) + create mode 100644 arch/x86/kernel/cpuinfo.c + create mode 100644 drivers/base/cpuinfo.c + create mode 100644 include/linux/cpuinfo.h +Merging usb/usb-next (38502ef49f96 usb: storage: make const arrays static, reduces object code size) +$ git merge usb/usb-next +Auto-merging include/linux/usb/tcpm.h +Auto-merging include/linux/usb/pd.h +Auto-merging drivers/usb/typec/tcpm.c +Auto-merging drivers/usb/typec/fusb302/fusb302.c +Removing drivers/staging/typec/fusb302/TODO +Merge made by the 'recursive' strategy. + drivers/staging/typec/Kconfig | 10 ---- + drivers/staging/typec/Makefile | 2 - + drivers/staging/typec/TODO | 10 ---- + drivers/staging/typec/fusb302/TODO | 10 ---- + drivers/staging/typec/tcpci.c | 4 +- + drivers/usb/storage/option_ms.c | 4 +- + drivers/usb/typec/Kconfig | 14 ++++++ + drivers/usb/typec/Makefile | 2 + + drivers/{staging => usb}/typec/fusb302/Kconfig | 0 + drivers/{staging => usb}/typec/fusb302/Makefile | 0 + drivers/{staging => usb}/typec/fusb302/fusb302.c | 4 +- + .../{staging => usb}/typec/fusb302/fusb302_reg.h | 0 + drivers/{staging => usb}/typec/tcpm.c | 48 +++--------------- + {drivers/staging/typec => include/linux/usb}/pd.h | 5 ++ + .../staging/typec => include/linux/usb}/pd_bdo.h | 0 + .../staging/typec => include/linux/usb}/pd_vdo.h | 0 + .../staging/typec => include/linux/usb}/tcpm.h | 57 +++++++++++++++++++--- + 17 files changed, 83 insertions(+), 87 deletions(-) + delete mode 100644 drivers/staging/typec/fusb302/TODO + rename drivers/{staging => usb}/typec/fusb302/Kconfig (100%) + rename drivers/{staging => usb}/typec/fusb302/Makefile (100%) + rename drivers/{staging => usb}/typec/fusb302/fusb302.c (99%) + rename drivers/{staging => usb}/typec/fusb302/fusb302_reg.h (100%) + rename drivers/{staging => usb}/typec/tcpm.c (99%) + rename {drivers/staging/typec => include/linux/usb}/pd.h (98%) + rename {drivers/staging/typec => include/linux/usb}/pd_bdo.h (100%) + rename {drivers/staging/typec => include/linux/usb}/pd_vdo.h (100%) + rename {drivers/staging/typec => include/linux/usb}/tcpm.h (68%) +Merging usb-gadget/next (0852659ef071 usb: gadget: f_ncm/u_ether: Move 'SKB reserve' quirk setup to u_ether) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (2bd6bf03f4c1 Linux 4.14-rc1) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (dfebb5f43a78 usb: chipidea: Add support for Tegra20/30/114/124) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up-to-date. +Merging phy-next/next (d9c51f4c53ae phy: brcm-sata: fix a timeout test in init) +$ git merge phy-next/next +Already up-to-date. +Merging tty/tty-next (be7da1a2b714 serial: imx: default to half duplex rs485) +$ git merge tty/tty-next +Auto-merging drivers/tty/serial/fsl_lpuart.c +Merge made by the 'recursive' strategy. + drivers/tty/serial/atmel_serial.c | 25 +------------------------ + drivers/tty/serial/bfin_sport_uart.c | 2 +- + drivers/tty/serial/fsl_lpuart.c | 27 +++++++++++++++++++-------- + drivers/tty/serial/imx.c | 3 +-- + drivers/tty/serial/meson_uart.c | 18 ++++++++++++++++-- + drivers/tty/serial/omap-serial.c | 13 +------------ + drivers/tty/serial/serial_core.c | 36 ++++++++++++++++++++++++++++++++++++ + drivers/tty/synclink.c | 3 +-- + drivers/tty/tty_port.c | 4 ++-- + drivers/tty/vt/vt.c | 29 ++++++++++++++--------------- + include/linux/serial_core.h | 5 +++++ + 11 files changed, 97 insertions(+), 68 deletions(-) +Merging char-misc/char-misc-next (e701c67c30e6 nvmem: remove unneeded IS_ENABLED(CONFIG_NVMEM) conditional) +$ git merge char-misc/char-misc-next +Auto-merging drivers/nvmem/core.c +Merge made by the 'recursive' strategy. + drivers/nvmem/core.c | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) +Merging extcon/extcon-next (f12c89504cb8 extcon: make extcon_info static const, fixes warning) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging staging/staging-next (c3eec59659cf staging: lustre: ptlrpc: kfree used instead of kvfree) +$ git merge staging/staging-next +Auto-merging drivers/staging/speakup/main.c +Auto-merging drivers/staging/pi433/rf69.c +Merge made by the 'recursive' strategy. + drivers/staging/android/ion/ion.h | 2 +- + drivers/staging/ccree/ssi_aead.c | 21 +- + drivers/staging/ccree/ssi_buffer_mgr.c | 18 +- + drivers/staging/ccree/ssi_cipher.c | 7 +- + drivers/staging/ccree/ssi_cipher.h | 10 +- + drivers/staging/ccree/ssi_driver.c | 196 ++++++++---------- + drivers/staging/ccree/ssi_driver.h | 15 +- + drivers/staging/ccree/ssi_hash.c | 3 +- + drivers/staging/ccree/ssi_pm.c | 3 +- + drivers/staging/ccree/ssi_request_mgr.c | 23 ++- + drivers/staging/ccree/ssi_sysfs.c | 2 +- + drivers/staging/dgnc/dgnc_driver.h | 16 -- + drivers/staging/dgnc/dgnc_neo.c | 11 +- + drivers/staging/fbtft/fb_ra8875.c | 10 +- + drivers/staging/irda/drivers/ali-ircc.c | 3 +- + drivers/staging/irda/drivers/irda-usb.c | 4 +- + drivers/staging/irda/drivers/mcs7780.c | 9 +- + drivers/staging/irda/include/net/irda/qos.h | 20 +- + drivers/staging/irda/net/discovery.c | 4 +- + drivers/staging/irda/net/irqueue.c | 3 +- + drivers/staging/lustre/lnet/lnet/router.c | 9 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 2 +- + drivers/staging/pi433/pi433_if.c | 13 +- + drivers/staging/pi433/rf69.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 28 +-- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 22 +- + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 64 +++--- + drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 4 +- + drivers/staging/rtl8188eu/include/odm.h | 2 +- + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 112 +++++----- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 27 ++- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 1 - + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 15 +- + drivers/staging/rtl8712/hal_init.c | 4 +- + drivers/staging/rtl8712/os_intfs.c | 4 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 4 +- + drivers/staging/rtl8712/rtl8712_event.h | 1 - + drivers/staging/rtl8712/rtl8712_recv.c | 4 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 3 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 4 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 4 +- + drivers/staging/rtl8712/usb_intf.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 84 ++++---- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 36 ++-- + drivers/staging/rtl8723bs/core/rtw_recv.c | 14 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2 +- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 10 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 4 +- + .../rtl8723bs/include/osdep_service_linux.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 16 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 34 +-- + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 30 +-- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 227 +++++++++------------ + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 17 +- + drivers/staging/rtlwifi/core.c | 43 +--- + drivers/staging/rtlwifi/core.h | 4 - + drivers/staging/rtlwifi/efuse.c | 5 +- + drivers/staging/rtlwifi/rc.c | 4 +- + drivers/staging/rts5208/sd.c | 6 - + drivers/staging/sm750fb/sm750_cursor.c | 4 - + drivers/staging/speakup/buffers.c | 4 +- + drivers/staging/speakup/main.c | 4 +- + drivers/staging/speakup/speakup_acntsa.c | 2 +- + drivers/staging/speakup/spk_ttyio.c | 4 +- + .../vc04_services/bcm2835-camera/mmal-vchiq.h | 2 +- + drivers/staging/wlan-ng/prism2mgmt.c | 78 ++++--- + drivers/staging/wlan-ng/prism2sta.c | 2 +- + drivers/staging/xgifb/XGI_main_26.c | 4 +- + drivers/staging/xgifb/vb_setmode.c | 5 +- + 79 files changed, 610 insertions(+), 789 deletions(-) +Merging mux/for-next (aae4e7a8bc44 Linux 4.13-rc4) +$ git merge mux/for-next +Already up-to-date. +Merging slave-dma/next (4fccd758036d Merge branch 'topic/xilinx' into next) +$ git merge slave-dma/next +Merge made by the 'recursive' strategy. + drivers/dma/dma-axi-dmac.c | 75 ++++++++++++++++++++++++++++++----------- + drivers/dma/xilinx/xilinx_dma.c | 14 ++++++++ + include/linux/dma/xilinx_dma.h | 14 -------- + 3 files changed, 69 insertions(+), 34 deletions(-) +Merging cgroup/for-next (9c3bace4684b Merge branch 'for-4.13-fixes' into for-next) +$ git merge cgroup/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (3e0097499839 scsi: sg: fixup infoleak when using SG_GET_REQUEST_TABLE) +$ git merge scsi/for-next +Already up-to-date. +Merging scsi-mkp/for-next (3882a734c19b Fix up MAINTAINERS file sorting) +$ git merge scsi-mkp/for-next +Already up-to-date. +Merging target-updates/for-next (04229774f692 tcmu: Oops in unmap_thread_fn()) +$ git merge target-updates/for-next +Merge made by the 'recursive' strategy. + drivers/target/target_core_user.c | 136 ++++++++++++++++++++++++++++++++------ + 1 file changed, 114 insertions(+), 22 deletions(-) +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging target-bva/for-next (2ea659a9ef48 Linux 4.12-rc1) +$ git merge target-bva/for-next +Already up-to-date. +Merging libata/for-next (9826313227fe Merge branch 'for-4.15' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/ata_piix.c | 1 + + drivers/ata/libata-core.c | 21 +++++++++++---------- + drivers/ata/libata-eh.c | 10 +++++----- + drivers/ata/libata-scsi.c | 19 ++++++++++--------- + drivers/ata/pata_artop.c | 2 +- + include/linux/libata.h | 1 + + 6 files changed, 29 insertions(+), 25 deletions(-) +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Already up-to-date. +Merging vhost/linux-next (ac7380709f65 vhost: fix end of range for access_ok) +$ git merge vhost/linux-next +Auto-merging drivers/vhost/vhost.c +Merge made by the 'recursive' strategy. + drivers/vhost/vhost.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging rpmsg/for-next (7148e5c13dd7 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging gpio/for-next (64bbd57d4d2f Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Merge made by the 'recursive' strategy. + Documentation/gpio/consumer.txt | 22 +++++++++++++++++++--- + drivers/gpio/Kconfig | 3 ++- + drivers/gpio/gpio-dwapb.c | 23 ++++++++++++++++++++++- + drivers/gpio/gpio-xgene-sb.c | 13 ++----------- + drivers/gpio/gpiolib-acpi.c | 2 +- + 5 files changed, 46 insertions(+), 17 deletions(-) +Merging pinctrl/for-next (12b136dec281 pinctrl: uniphier: make arrays static, reduces object code size) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) +Merging pinctrl-samsung/for-next (2bd6bf03f4c1 Linux 4.14-rc1) +$ git merge pinctrl-samsung/for-next +Already up-to-date. +Merging pwm/for-next (7755daf5e7e8 Merge branch 'for-4.14/drivers' into for-next) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e61bd2b6f117] Merge remote-tracking branch 'dma-buf/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 11 +++++++++++ + 1 file changed, 11 insertions(+) +Merging userns/for-next (076a9bcacfc7 signal/mips: Remove FPE_FIXME usage from mips) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout) +$ git merge ktest/for-next +Already up-to-date. +Merging random/dev (72e5c740f633 random: reorder READ_ONCE() in get_random_uXX) +$ git merge random/dev +Already up-to-date. +Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (2bd6bf03f4c1 Linux 4.14-rc1) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (69973b830859 Linux 4.9) +$ git merge y2038/y2038 +Already up-to-date. +Merging luto-misc/next (2dcd0af568b0 Linux 4.6) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (26d8d1e9bb48 Merge branch 'for-4.12/upstream-fixes' into for-next) +$ git merge livepatching/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging coresight/next (096d08d830e9 coresight: Extend the PIDR mask to cover relevant bits in PIDR2) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../coresight/coresight-dynamic-replicator.c | 4 ++-- + drivers/hwtracing/coresight/coresight-etb10.c | 4 ++-- + drivers/hwtracing/coresight/coresight-etm3x.c | 24 +++++++++++----------- + drivers/hwtracing/coresight/coresight-funnel.c | 4 ++-- + drivers/hwtracing/coresight/coresight-stm.c | 8 ++++---- + drivers/hwtracing/coresight/coresight-tmc.c | 4 ++-- + drivers/hwtracing/coresight/coresight-tpiu.c | 4 ++-- + 7 files changed, 26 insertions(+), 26 deletions(-) +Merging rtc/rtc-next (46c1e79fee41 Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ 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 (04c3c982fcc0 libnvdimm, btt: fix format string warnings) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) +$ git merge idr/idr-4.11 +Already up-to-date. +Merging kspp/for-next/kspp (cb624a11ecd5 Merge branch 'for-next/secureexec' into for-next/kspp) +$ git merge kspp/for-next/kspp +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging akpm-current/current (a443333ea9bb kernel-reboot-add-devm_register_reboot_notifier-fix) +$ git merge --no-ff akpm-current/current +Auto-merging fs/ocfs2/super.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/page.h | 2 + + arch/powerpc/sysdev/fsl_rio.c | 17 +- + arch/powerpc/sysdev/fsl_rmu.c | 8 + + arch/sh/include/cpu-sh2a/cpu/sh7264.h | 4 +- + arch/sh/include/cpu-sh2a/cpu/sh7269.h | 4 +- + arch/sh/include/cpu-sh4/cpu/sh7722.h | 2 +- + arch/sh/include/cpu-sh4/cpu/sh7757.h | 8 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + block/genhd.c | 2 +- + drivers/rapidio/devices/tsi721.c | 7 + + drivers/rapidio/rio-access.c | 40 +--- + fs/dcache.c | 3 +- + fs/ocfs2/dlm/dlmmaster.c | 66 +++++-- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/filecheck.c | 357 +++++++++++++--------------------- + fs/ocfs2/filecheck.h | 29 ++- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/ocfs2/super.c | 35 +++- + fs/seq_file.c | 10 - + include/linux/crash_core.h | 2 + + include/linux/mmu_notifier.h | 5 + + include/linux/pageblock-flags.h | 11 ++ + include/linux/reboot.h | 4 + + include/uapi/linux/sysctl.h | 4 + + kernel/reboot.c | 27 +++ + mm/compaction.c | 59 ++++-- + mm/ksm.c | 5 +- + mm/madvise.c | 12 +- + mm/memcontrol.c | 20 +- + mm/memory_hotplug.c | 4 + + mm/oom_kill.c | 16 ++ + mm/page_alloc.c | 9 +- + mm/page_owner.c | 4 +- + mm/vmscan.c | 17 +- + mm/z3fold.c | 4 +- + scripts/parse-maintainers.pl | 52 ++++- + 38 files changed, 513 insertions(+), 356 deletions(-) +$ 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: iopoll: avoid -Wint-in-bool-context warning +Applying: sparc64: NG4 memset 32 bits overflow +Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + b81fd5eb7261...d377ef5d8407 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (d377ef5d8407 lib/crc-ccitt: add CCITT-FALSE CRC16 variant) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/sparc/lib/NG4memset.S | 26 ++++++++++----------- + include/linux/crc-ccitt.h | 7 ++++++ + include/linux/iopoll.h | 24 ++++++++++++------- + include/linux/regmap.h | 12 ++++++---- + lib/crc-ccitt.c | 58 +++++++++++++++++++++++++++++++++++++++++++++- + 5 files changed, 99 insertions(+), 28 deletions(-) |