diff options
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 2969 |
1 files changed, 2969 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..01dbf8bd6f13 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,2969 @@ +$ date -R +Wed, 19 Jul 2017 09:32:55 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at cb8c65ccff7f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc +Merging origin/master (74cbd96bc2e0 Merge tag 'md/4.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md) +$ git merge origin/master +Updating cb8c65ccff7f..74cbd96bc2e0 +Fast-forward + MAINTAINERS | 8 ++ + drivers/infiniband/core/addr.c | 46 +++++++++--- + drivers/infiniband/core/cma.c | 32 +------- + drivers/infiniband/core/roce_gid_mgmt.c | 11 ++- + drivers/infiniband/core/uverbs_cmd.c | 23 +----- + drivers/infiniband/core/verbs.c | 51 +++++++++---- + drivers/infiniband/hw/hfi1/chip.c | 7 +- + drivers/infiniband/hw/hfi1/qp.c | 7 +- + drivers/infiniband/hw/hfi1/qp.h | 3 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 86 +++++++++++++--------- + drivers/infiniband/hw/hns/hns_roce_main.c | 3 - + drivers/infiniband/hw/mlx4/cq.c | 6 +- + drivers/infiniband/hw/mlx4/main.c | 2 +- + drivers/infiniband/hw/mlx4/mcg.c | 2 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 - + drivers/infiniband/hw/mlx4/qp.c | 40 +++++----- + drivers/infiniband/hw/mlx4/srq.c | 8 +- + drivers/infiniband/hw/mlx5/mr.c | 36 +++++---- + drivers/infiniband/hw/nes/nes_hw.c | 4 +- + drivers/infiniband/hw/qib/qib_qp.c | 15 ++-- + drivers/infiniband/hw/qib/qib_verbs.h | 4 +- + drivers/infiniband/sw/rdmavt/qp.c | 48 ++++-------- + drivers/infiniband/sw/rxe/rxe_net.c | 3 + + drivers/infiniband/sw/rxe/rxe_verbs.c | 2 + + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 20 +++-- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 31 +++++++- + drivers/infiniband/ulp/iser/iscsi_iser.c | 11 +++ + drivers/infiniband/ulp/iser/iser_verbs.c | 10 ++- + drivers/md/bitmap.c | 3 +- + drivers/md/md.h | 4 +- + drivers/md/raid5-ppl.c | 2 +- + drivers/md/raid5.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/alloc.c | 29 ++++---- + drivers/net/ethernet/mellanox/mlx4/cq.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/icm.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/icm.h | 3 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 4 +- + drivers/net/ethernet/mellanox/mlx4/mr.c | 17 ++--- + drivers/net/ethernet/mellanox/mlx4/qp.c | 20 ++--- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/srq.c | 4 +- + fs/nfsd/nfs4callback.c | 6 +- + include/linux/mlx4/device.h | 10 +-- + include/rdma/ib_verbs.h | 18 ++++- + include/rdma/rdma_vt.h | 5 +- + 48 files changed, 376 insertions(+), 299 deletions(-) +Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig entry) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/fixes (ad8181060788 kconfig: fix sparse warnings in nconfig) +$ git merge kbuild-current/fixes +Already up-to-date. +Merging arc-current/for-curr (37f1db0e85ff ARC: [plat-axs10x]: prepare dts files for enabling PAE40 on axs103) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/boot/dts/axc001.dtsi | 20 +++++++++----------- + arch/arc/boot/dts/axc003.dtsi | 21 ++++++++++----------- + arch/arc/boot/dts/axc003_idu.dtsi | 21 ++++++++++----------- + arch/arc/boot/dts/axs10x_mb.dtsi | 2 +- + arch/arc/configs/nps_defconfig | 1 - + arch/arc/configs/tb10x_defconfig | 1 - + arch/arc/mm/cache.c | 3 +++ + 7 files changed, 33 insertions(+), 36 deletions(-) +Merging arm-current/fixes (9e25ebfe56ec ARM: 8685/1: ensure memblock-limit is pmd-aligned) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (204a2be30a7a m68k: Remove ptrace_signal_deliver) +$ 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 (a70b487b07cf powerpc/powernv: Fix boot on Power8 bare metal due to opal_configure_cores()) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/platforms/powernv/opal.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sparc/master (fc290a114fc6 sparc64: Prevent perf from running during super critical sections) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/mmu_context_64.h | 14 +++++++++----- + arch/sparc/kernel/tsb.S | 12 ++++++++++++ + arch/sparc/power/hibernate.c | 3 +-- + 3 files changed, 22 insertions(+), 7 deletions(-) +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 (073dd5ad34b1 netfilter: fix netfilter_net_init() return) +$ git merge net/master +Auto-merging drivers/net/ethernet/mellanox/mlx4/alloc.c +Removing Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/brcm,amac.txt | 1 + + .../devicetree/bindings/net/brcm,bgmac-nsp.txt | 24 -- + drivers/atm/zatm.c | 2 +- + drivers/isdn/divert/isdn_divert.c | 25 +- + drivers/isdn/hardware/avm/c4.c | 2 +- + drivers/isdn/hardware/eicon/divasmain.c | 2 +- + drivers/isdn/hardware/mISDN/avmfritz.c | 2 +- + drivers/isdn/hardware/mISDN/hfcmulti.c | 2 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 2 +- + drivers/isdn/hardware/mISDN/netjet.c | 2 +- + drivers/isdn/hardware/mISDN/w6692.c | 2 +- + drivers/isdn/hisax/config.c | 2 +- + drivers/isdn/hisax/hfc4s8s_l1.c | 2 +- + drivers/isdn/hisax/hisax_fcpcipnp.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 22 +- + drivers/net/ethernet/broadcom/bgmac-platform.c | 21 +- + drivers/net/ethernet/broadcom/bgmac.c | 70 +++-- + drivers/net/ethernet/broadcom/bgmac.h | 1 + + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 7 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 299 +++++++++++---------- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 2 + + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 2 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ptp.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 2 + + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 3 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 58 +++- + drivers/net/ethernet/mellanox/mlx4/alloc.c | 8 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 10 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 14 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 +- + drivers/net/ethernet/sun/niu.c | 4 +- + drivers/net/phy/mdio-mux.c | 4 +- + drivers/net/ppp/ppp_generic.c | 30 ++- + drivers/net/usb/cdc_ncm.c | 28 ++ + drivers/net/usb/huawei_cdc_ncm.c | 6 + + drivers/net/usb/smsc95xx.c | 1 + + drivers/net/vmxnet3/vmxnet3_int.h | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 +- + include/linux/bpf-cgroup.h | 2 +- + include/linux/jhash.h | 29 +- + include/linux/netfilter.h | 9 - + include/linux/usb/cdc_ncm.h | 1 + + include/net/netlink.h | 4 +- + include/net/sctp/sctp.h | 4 + + net/bridge/br_device.c | 3 +- + net/bridge/br_input.c | 3 +- + net/core/fib_rules.c | 3 +- + net/core/filter.c | 2 +- + net/core/netpoll.c | 2 +- + net/dccp/input.c | 2 +- + net/ipv4/ip_output.c | 8 +- + net/ipv4/netfilter/nf_tables_arp.c | 3 +- + net/ipv4/syncookies.c | 1 + + net/ipv4/tcp_bbr.c | 49 +++- + net/ipv4/udp.c | 13 +- + net/ipv6/syncookies.c | 1 + + net/netfilter/core.c | 147 +--------- + net/netfilter/nf_conntrack_expect.c | 2 +- + net/netfilter/nf_nat_core.c | 17 +- + net/netfilter/nfnetlink.c | 6 +- + net/openvswitch/conntrack.c | 51 ++-- + net/packet/af_packet.c | 6 +- + net/sched/act_api.c | 4 +- + net/sctp/sm_make_chunk.c | 4 +- + 65 files changed, 533 insertions(+), 518 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt +Merging ipsec/master (e6194923237f esp: Fix memleaks on error paths.) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/ipv4/esp4.c | 13 ++++++++----- + net/ipv6/esp6.c | 9 +++++---- + 2 files changed, 13 insertions(+), 9 deletions(-) +Merging netfilter/master (36ac344e16e0 netfilter: expect: fix crash when putting uninited expectation) +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (3c5ab3f395d6 ipvs: SNAT packet replies only for NATed connections) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (35abcd4f9f30 brcmfmac: fix uninitialized warning in brcmf_usb_probe_phase2()) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (d7f13f745036 cfg80211: Validate frequencies nested in NL80211_ATTR_SCAN_FREQUENCIES) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (610e1ae9b533 ALSA: fm801: Initialize chip after IRQ handler is registered) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/fm801.c | 4 +-- + sound/pci/hda/patch_hdmi.c | 27 ++++++++++++++++++ + sound/pci/hda/patch_realtek.c | 66 +++++++++++++++++++++++++++++++++++++++---- + 3 files changed, 89 insertions(+), 8 deletions(-) +Merging pci-current/for-linus (34d5ac2af644 PCI: rockchip: Check for pci_scan_root_bus_bridge() failure correctly) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (5771a8c08880 Linux v4.13-rc1) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (c6325179238f tty: Fix TIOCGPTPEER ioctl definition) +$ git merge tty.current/tty-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/fsl-imx-uart.txt | 2 - + arch/alpha/include/uapi/asm/ioctls.h | 2 +- + arch/mips/include/uapi/asm/ioctls.h | 2 +- + arch/parisc/include/uapi/asm/ioctls.h | 2 +- + arch/powerpc/include/uapi/asm/ioctls.h | 2 +- + arch/sh/include/uapi/asm/ioctls.h | 2 +- + arch/sparc/include/uapi/asm/ioctls.h | 2 +- + arch/xtensa/include/uapi/asm/ioctls.h | 2 +- + drivers/tty/pty.c | 85 +++++++++++----------- + drivers/tty/serial/fsl_lpuart.c | 24 +++--- + drivers/tty/serial/imx.c | 27 +++---- + drivers/tty/serial/sh-sci.c | 12 ++- + drivers/tty/serial/st-asc.c | 1 + + include/uapi/asm-generic/ioctls.h | 2 +- + 14 files changed, 83 insertions(+), 84 deletions(-) +Merging usb.current/usb-linus (446230f52a5b usb: storage: return on error to avoid a null pointer dereference) +$ git merge usb.current/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/class/cdc-acm.c | 3 +++ + drivers/usb/storage/isd200.c | 5 ++++- + drivers/usb/typec/ucsi/ucsi.h | 1 + + 3 files changed, 8 insertions(+), 1 deletion(-) +Merging usb-gadget-fixes/fixes (5771a8c08880 Linux v4.13-rc1) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (9585e340db9f USB: serial: cp210x: add support for Qivicon USB ZigBee dongle) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/cp210x.c | 1 + + 1 file changed, 1 insertion(+) +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 (9605bc46433d phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (5a1d4c5dd4eb staging: rtl8188eu: add TL-WN722N v2 support) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/comedi/drivers/ni_mio_common.c | 3 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 19 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 2 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 + + drivers/staging/sm750fb/ddk750_chip.c | 2 +- + drivers/staging/sm750fb/sm750.c | 24 + + drivers/staging/speakup/main.c | 2 + + drivers/staging/speakup/spk_priv.h | 2 + + drivers/staging/speakup/spk_ttyio.c | 22 +- + drivers/staging/vboxvideo/Kconfig | 12 + + drivers/staging/vboxvideo/Makefile | 7 + + drivers/staging/vboxvideo/TODO | 9 + + drivers/staging/vboxvideo/hgsmi_base.c | 246 ++++++ + drivers/staging/vboxvideo/hgsmi_ch_setup.h | 66 ++ + drivers/staging/vboxvideo/hgsmi_channels.h | 53 ++ + drivers/staging/vboxvideo/hgsmi_defs.h | 92 +++ + drivers/staging/vboxvideo/modesetting.c | 142 ++++ + drivers/staging/vboxvideo/vbox_drv.c | 286 +++++++ + drivers/staging/vboxvideo/vbox_drv.h | 296 +++++++ + drivers/staging/vboxvideo/vbox_err.h | 50 ++ + drivers/staging/vboxvideo/vbox_fb.c | 412 ++++++++++ + drivers/staging/vboxvideo/vbox_hgsmi.c | 115 +++ + drivers/staging/vboxvideo/vbox_irq.c | 197 +++++ + drivers/staging/vboxvideo/vbox_main.c | 534 +++++++++++++ + drivers/staging/vboxvideo/vbox_mode.c | 877 +++++++++++++++++++++ + drivers/staging/vboxvideo/vbox_prime.c | 74 ++ + drivers/staging/vboxvideo/vbox_ttm.c | 472 +++++++++++ + drivers/staging/vboxvideo/vboxvideo.h | 491 ++++++++++++ + drivers/staging/vboxvideo/vboxvideo_guest.h | 95 +++ + drivers/staging/vboxvideo/vboxvideo_vbe.h | 84 ++ + drivers/staging/vboxvideo/vbva_base.c | 233 ++++++ + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 10 +- + 34 files changed, 4912 insertions(+), 21 deletions(-) + create mode 100644 drivers/staging/vboxvideo/Kconfig + create mode 100644 drivers/staging/vboxvideo/Makefile + create mode 100644 drivers/staging/vboxvideo/TODO + create mode 100644 drivers/staging/vboxvideo/hgsmi_base.c + create mode 100644 drivers/staging/vboxvideo/hgsmi_ch_setup.h + create mode 100644 drivers/staging/vboxvideo/hgsmi_channels.h + create mode 100644 drivers/staging/vboxvideo/hgsmi_defs.h + create mode 100644 drivers/staging/vboxvideo/modesetting.c + create mode 100644 drivers/staging/vboxvideo/vbox_drv.c + create mode 100644 drivers/staging/vboxvideo/vbox_drv.h + create mode 100644 drivers/staging/vboxvideo/vbox_err.h + create mode 100644 drivers/staging/vboxvideo/vbox_fb.c + create mode 100644 drivers/staging/vboxvideo/vbox_hgsmi.c + create mode 100644 drivers/staging/vboxvideo/vbox_irq.c + create mode 100644 drivers/staging/vboxvideo/vbox_main.c + create mode 100644 drivers/staging/vboxvideo/vbox_mode.c + create mode 100644 drivers/staging/vboxvideo/vbox_prime.c + create mode 100644 drivers/staging/vboxvideo/vbox_ttm.c + create mode 100644 drivers/staging/vboxvideo/vboxvideo.h + create mode 100644 drivers/staging/vboxvideo/vboxvideo_guest.h + create mode 100644 drivers/staging/vboxvideo/vboxvideo_vbe.h + create mode 100644 drivers/staging/vboxvideo/vbva_base.c +Merging char-misc.current/char-misc-linus (c89876dda018 w1: omap-hdq: fix error return code in omap_hdq_probe()) +$ git merge char-misc.current/char-misc-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/nvmem/rockchip-efuse.txt | 2 +- + MAINTAINERS | 9 +++++++++ + drivers/android/binder.c | 17 ++++++++--------- + drivers/fsi/fsi-core.c | 7 +++---- + drivers/hv/channel.c | 2 ++ + drivers/mux/Kconfig | 19 +++++-------------- + drivers/mux/mux-core.c | 2 +- + drivers/nvmem/rockchip-efuse.c | 2 +- + drivers/spmi/spmi-pmic-arb.c | 17 +++++++---------- + drivers/spmi/spmi.c | 12 ++++++++++++ + drivers/thunderbolt/switch.c | 3 ++- + drivers/w1/masters/omap_hdq.c | 3 ++- + drivers/w1/w1.c | 4 ++-- + 13 files changed, 55 insertions(+), 44 deletions(-) +Merging input-current/for-linus (dda5202b001c Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (41cdf7a45389 crypto: authencesn - Fix digest_null crash) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/crypto/inside-secure-safexcel.txt | 2 -- + crypto/authencesn.c | 5 +++++ + drivers/crypto/Kconfig | 2 +- + drivers/crypto/bcm/spu2.c | 1 + + drivers/crypto/cavium/nitrox/nitrox_main.c | 3 ++- + drivers/crypto/inside-secure/safexcel.c | 5 +---- + 6 files changed, 10 insertions(+), 8 deletions(-) +Merging ide/master (acfead32f3f9 ide: don't call memcpy with the same source and destination) +$ git merge ide/master +Already up-to-date. +Merging vfio-fixes/for-linus (39da7c509acf Linux 4.11-rc6) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (5771a8c08880 Linux v4.13-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +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 (d4ed3b9015b5 mtd: nand: make nand_ooblayout_lp_hamming_ops static) +$ 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 (9e69672e90cc dt-bindings: mfd: Update STM32 timers clock names) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging v4l-dvb-fixes/fixes (745f79ac9373 media: cec-notifier: small improvements) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + Documentation/media/kapi/dtv-core.rst | 443 +- + Documentation/media/typical_media_device.svg | 3054 +-------- + Documentation/media/uapi/dvb/dvbstb.svg | 668 +- + Documentation/media/uapi/v4l/bayer.svg | 1013 +-- + Documentation/media/uapi/v4l/constraints.svg | 356 +- + Documentation/media/uapi/v4l/crop.svg | 253 +- + Documentation/media/uapi/v4l/fieldseq_bt.svg | 170 +- + Documentation/media/uapi/v4l/fieldseq_tb.svg | 175 +- + Documentation/media/uapi/v4l/nv12mt.svg | 764 +-- + Documentation/media/uapi/v4l/nv12mt_example.svg | 2474 +++---- + Documentation/media/uapi/v4l/selection.svg | 6957 ++++---------------- + .../uapi/v4l/subdev-image-processing-crop.svg | 10 +- + .../uapi/v4l/subdev-image-processing-full.svg | 10 +- + ...ubdev-image-processing-scaling-multi-source.svg | 10 +- + Documentation/media/uapi/v4l/vbi_525.svg | 614 +- + Documentation/media/uapi/v4l/vbi_625.svg | 388 +- + Documentation/media/uapi/v4l/vbi_hsync.svg | 238 +- + Documentation/media/uapi/v4l/vidioc-g-fmt.rst | 6 + + Documentation/media/v4l-drivers/imx.rst | 7 +- + Documentation/media/v4l-drivers/index.rst | 1 + + drivers/media/cec/cec-adap.c | 2 +- + drivers/media/cec/cec-notifier.c | 6 + + drivers/media/dvb-core/dvb_ca_en50221.c | 143 +- + drivers/media/dvb-core/dvb_ca_en50221.h | 7 + + drivers/media/dvb-frontends/cxd2841er.c | 5 +- + drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 15 +- + drivers/media/dvb-frontends/lnbh25.c | 6 +- + drivers/media/dvb-frontends/stv0367.c | 210 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 1 - + drivers/media/i2c/tvp5150.c | 25 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 102 +- + drivers/media/pci/ngene/ngene-core.c | 32 +- + drivers/media/pci/ngene/ngene-i2c.c | 6 +- + drivers/media/pci/ngene/ngene.h | 6 +- + drivers/media/pci/tw5864/tw5864-video.c | 1 + + drivers/media/platform/coda/coda-bit.c | 8 +- + drivers/media/platform/coda/coda-common.c | 4 +- + drivers/media/platform/coda/coda.h | 2 +- + drivers/media/platform/davinci/vpif_capture.c | 2 - + drivers/media/platform/davinci/vpif_display.c | 2 - + drivers/media/platform/omap/omap_vout_vrfb.c | 133 +- + drivers/media/platform/omap/omap_voutdef.h | 6 +- + drivers/media/platform/qcom/venus/core.c | 2 +- + drivers/media/platform/sti/bdisp/bdisp-debug.c | 14 +- + drivers/media/platform/vimc/vimc-capture.c | 15 +- + drivers/media/platform/vimc/vimc-debayer.c | 15 +- + drivers/media/platform/vimc/vimc-scaler.c | 15 +- + drivers/media/platform/vimc/vimc-sensor.c | 15 +- + drivers/media/radio/radio-wl1273.c | 15 +- + drivers/media/rc/ir-lirc-codec.c | 2 +- + drivers/media/tuners/fc0011.c | 1 + + drivers/media/tuners/mxl5005s.c | 2 - + drivers/media/usb/au0828/au0828-input.c | 2 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 10 +- + drivers/media/usb/dvb-usb/dib0700_core.c | 38 +- + drivers/media/usb/em28xx/em28xx-cards.c | 18 + + drivers/media/usb/em28xx/em28xx-dvb.c | 1 + + drivers/media/usb/em28xx/em28xx-i2c.c | 2 - + drivers/media/usb/em28xx/em28xx-input.c | 2 +- + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/pulse8-cec/pulse8-cec.c | 2 +- + drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 18 +- + drivers/media/usb/stkwebcam/stk-sensor.c | 32 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 70 +- + drivers/media/usb/stkwebcam/stk-webcam.h | 6 - + drivers/media/v4l2-core/tuner-core.c | 2 - + drivers/staging/media/atomisp/i2c/gc0310.h | 2 +- + drivers/staging/media/atomisp/i2c/gc2235.h | 2 +- + drivers/staging/media/atomisp/i2c/ov2680.h | 3 +- + drivers/staging/media/atomisp/i2c/ov2722.h | 2 +- + drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 2 +- + .../staging/media/atomisp/pci/atomisp2/Makefile | 10 +- + drivers/staging/media/cxd2099/cxd2099.c | 165 +- + drivers/staging/media/cxd2099/cxd2099.h | 6 +- + include/media/cec-notifier.h | 15 + + 75 files changed, 5102 insertions(+), 13740 deletions(-) +Merging reset-fixes/reset/fixes (4497a224f759 reset: hi6220: Set module license so that it can be loaded) +$ git merge reset-fixes/reset/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (611cdf3695a3 drm/i915: Disable EXEC_OBJECT_ASYNC when doing relocations) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging drm-misc-fixes/for-linux-next-fixes (ef434a0c2ce7 Merge branch 'drm-misc-next-fixes' into drm-misc-fixes) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/dma-buf/dma-fence.c | 17 ++++------- + drivers/dma-buf/sync_debug.c | 2 +- + drivers/dma-buf/sync_file.c | 8 ++++- + drivers/gpu/drm/vc4/vc4_crtc.c | 66 +++++++++++++++++++++++++++--------------- + include/linux/dma-fence.h | 2 ++ + 5 files changed, 59 insertions(+), 36 deletions(-) +Merging kbuild/for-next (6a007e0e602b kbuild: modpost: Warn about references from rodata to __init text) +$ git merge kbuild/for-next +Merge made by the 'recursive' strategy. + scripts/mod/modpost.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +$ git am -3 ../patches/0001-Revert-kbuild-modpost-Warn-about-references-from-rod.patch +Applying: Revert "kbuild: modpost: Warn about references from rodata to __init text" +$ git reset HEAD^ +Unstaged changes after reset: +M scripts/mod/modpost.c +$ git add -A . +$ git commit -v -a --amend +[master e76b860917d8] Merge remote-tracking branch 'kbuild/for-next' + Date: Wed Jul 19 09:48:41 2017 +1000 +Merging uuid/for-next (b86a496a4206 ACPI: hns_dsaf_acpi_dsm_guid can be static) +$ git merge uuid/for-next +Already up-to-date. +Merging dma-mapping/for-next (1655cf8829d8 ARM: dma-mapping: Remove traces of NOMMU code) +$ git merge dma-mapping/for-next +Already up-to-date. +Merging asm-generic/master (a351e9b9fc24 Linux 4.11) +$ git merge asm-generic/master +Already up-to-date. +Merging arc/for-next (6f8119230ed0 ARC: set boot print log level to PR_INFO) +$ git merge arc/for-next +Auto-merging arch/arc/mm/cache.c +Auto-merging arch/arc/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/arc/include/asm/irqflags-arcv2.h | 3 --- + arch/arc/include/asm/irqflags-compact.h | 2 -- + arch/arc/include/asm/spinlock.h | 12 ++++++++++++ + arch/arc/kernel/entry-compact.S | 22 +++++++++++----------- + arch/arc/kernel/process.c | 29 +++++++++++++++++++++++++++-- + arch/arc/kernel/setup.c | 6 +++--- + arch/arc/kernel/traps.c | 2 +- + arch/arc/mm/cache.c | 2 +- + arch/arc/mm/fault.c | 2 +- + arch/arc/mm/tlb.c | 2 +- + arch/arc/mm/tlbex.S | 9 +++++++++ + arch/arc/plat-eznps/Kconfig | 15 +++++++++++++-- + arch/arc/plat-eznps/include/plat/ctop.h | 1 + + arch/arc/plat-eznps/mtm.c | 11 +++++++++-- + 14 files changed, 89 insertions(+), 29 deletions(-) +Merging arm/for-next (fc256ee00f0c Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm-perf/for-next/perf (5771a8c08880 Linux v4.13-rc1) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (ebc5ff9e87f6 Merge branch 'next/dt64' into for-next) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 251 +++++++++++++++++++++++++++++++++ + 1 file changed, 251 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (8ba75fbb148a Merge branch 'v4.13/arm+sps' into next) +$ git merge actions/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (f99503e956ae Merge branch 'v4.13/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging aspeed/for-next (4944e5dbb215 Merge branches 'dt-for-v4.12' and 'defconfig-for-v4.12' into for-next) +$ git merge aspeed/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (cd9e550740ae Merge branch 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 102 ++++++ + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 537 ++++++++++++++++++++++++++++ + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 23 +- + arch/arm/boot/dts/sama5d2.dtsi | 50 ++- + drivers/soc/atmel/soc.c | 8 + + drivers/soc/atmel/soc.h | 4 + + 7 files changed, 708 insertions(+), 17 deletions(-) + create mode 100644 arch/arm/boot/dts/at91-sama5d27_som1.dtsi + create mode 100644 arch/arm/boot/dts/at91-sama5d27_som1_ek.dts +Merging bcm2835/for-next (652fb0c6435c 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 (078690243113 Merge branch 'zte/dt64' into for-next) +$ git merge imx-mxs/for-next +Removing arch/arm/boot/dts/imx6ul-isiot-common.dtsi +Auto-merging arch/arm/boot/dts/imx6ul-geam.dts +Removing arch/arm/boot/dts/imx6ul-geam-kit.dts +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/Makefile | 2 +- + arch/arm/boot/dts/imx6dl-gw52xx.dts | 58 +++++++ + arch/arm/boot/dts/imx6dl-gw53xx.dts | 58 +++++++ + arch/arm/boot/dts/imx6dl-gw54xx.dts | 58 +++++++ + arch/arm/boot/dts/imx6q-b850v3.dts | 2 +- + arch/arm/boot/dts/imx6q-gw52xx.dts | 58 +++++++ + arch/arm/boot/dts/imx6q-gw53xx.dts | 58 +++++++ + arch/arm/boot/dts/imx6q-gw54xx.dts | 58 +++++++ + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 54 ++++++ + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 54 ++++++ + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 1 - + arch/arm/boot/dts/imx6qdl.dtsi | 1 + + arch/arm/boot/dts/imx6sl.dtsi | 1 + + arch/arm/boot/dts/imx6sx.dtsi | 1 + + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 39 ++--- + arch/arm/boot/dts/imx6ul-geam-kit.dts | 101 ------------ + .../boot/dts/{imx6ul-geam.dtsi => imx6ul-geam.dts} | 74 +++++++++ + arch/arm/boot/dts/imx6ul-isiot-common.dtsi | 141 ---------------- + arch/arm/boot/dts/imx6ul-isiot-emmc.dts | 1 - + arch/arm/boot/dts/imx6ul-isiot-nand.dts | 1 - + arch/arm/boot/dts/imx6ul-isiot.dtsi | 183 +++++++++++++++++++++ + arch/arm/boot/dts/imx6ul.dtsi | 1 + + arch/arm/boot/dts/imx7d-sdb.dts | 21 +-- + arch/arm/boot/dts/imx7s.dtsi | 1 + + arch/arm/boot/dts/zx296702-ad1.dts | 2 - + arch/arm/configs/imx_v6_v7_defconfig | 4 +- + arch/arm64/boot/dts/zte/zx296718.dtsi | 2 - + 27 files changed, 749 insertions(+), 286 deletions(-) + delete mode 100644 arch/arm/boot/dts/imx6ul-geam-kit.dts + rename arch/arm/boot/dts/{imx6ul-geam.dtsi => imx6ul-geam.dts} (87%) + delete mode 100644 arch/arm/boot/dts/imx6ul-isiot-common.dtsi +Merging keystone/next (b45371147f9d Merge branch 'for_4.13/keystone_dts' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (7a974784ec46 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-388-gp.dts | 4 +- + arch/arm/mach-mvebu/platsmp.c | 2 +- + .../boot/dts/marvell/armada-3720-espressobin.dts | 5 ++ + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 11 ++- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 94 +++++++++++++++++++++- + .../boot/dts/marvell/armada-cp110-master.dtsi | 25 ++++-- + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 25 ++++-- + arch/arm64/configs/defconfig | 1 + + 8 files changed, 145 insertions(+), 22 deletions(-) +Merging omap/for-next (05f2a5417cf1 Merge branch 'omap-for-v4.13/mmc-regulator' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 2 +- + arch/arm/boot/dts/dm8168-evm.dts | 34 ++++++++++++++++- + arch/arm/boot/dts/dm816x.dtsi | 2 +- + arch/arm/boot/dts/dra7-evm.dts | 10 ++++- + arch/arm/boot/dts/dra7.dtsi | 5 +++ + arch/arm/boot/dts/dra71-evm.dts | 18 ++++++++- + arch/arm/boot/dts/dra72-evm-common.dtsi | 2 - + arch/arm/boot/dts/dra72-evm-revc.dts | 18 +++++++++ + arch/arm/boot/dts/dra72-evm.dts | 18 +++++++++ + arch/arm/mach-omap2/pdata-quirks.c | 31 +++++++++++++++ + arch/arm/mach-omap2/pm34xx.c | 1 - + arch/arm/mach-omap2/prm3xxx.c | 7 +--- + arch/arm/mach-omap2/prm44xx.c | 55 +++++++++++++++++++++++++++ + include/linux/platform_data/hsmmc-omap.h | 3 ++ + 14 files changed, 191 insertions(+), 15 deletions(-) +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 (dfeac250c429 reset: zx2967: constify zx2967_reset_ops.) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + drivers/reset/reset-zx2967.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging qcom/for-next (6a3282b03fe6 Merge tag 'qcom-defconfig-for-4.13-2' into all-for-4.13-revised) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. +Merging realtek/for-next (007e6304223c Merge branch 'v4.13/dt64' into next) +$ git merge realtek/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging renesas/next (c2432fc935fd Merge branch 'fixes-for-v4.13' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging rockchip/for-next (8f2f97b7a071 Merge branch 'v4.14-armsoc/dts32' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/rk3036-kylin.dts | 2 - + arch/arm/boot/dts/rk3036.dtsi | 3 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 2 - + arch/arm/boot/dts/rk3066a-mk808.dts | 2 - + arch/arm/boot/dts/rk3066a-rayeager.dts | 3 - + arch/arm/boot/dts/rk3188-px3-evb.dts | 2 - + arch/arm/boot/dts/rk3188-radxarock.dts | 1 - + arch/arm/boot/dts/rk3229-evb.dts | 129 ++++++++++++++++++++- + arch/arm/boot/dts/rk3229.dtsi | 89 ++++++++++++++ + arch/arm/boot/dts/rk322x.dtsi | 113 +++++++++++++++++- + arch/arm/boot/dts/rk3288-evb.dtsi | 49 +++++++- + arch/arm/boot/dts/rk3288-fennec.dts | 6 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 1 - + arch/arm/boot/dts/rk3288-firefly-reload.dts | 2 - + arch/arm/boot/dts/rk3288-firefly.dtsi | 3 - + arch/arm/boot/dts/rk3288-miqi.dts | 2 - + arch/arm/boot/dts/rk3288-phycore-rdk.dts | 1 - + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 1 - + arch/arm/boot/dts/rk3288-popmetal.dts | 2 - + arch/arm/boot/dts/rk3288-r89.dts | 1 - + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 1 - + arch/arm/boot/dts/rk3288-rock2-square.dts | 2 - + arch/arm/boot/dts/rk3288-tinker.dts | 6 +- + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 1 - + arch/arm/boot/dts/rk3288-veyron.dtsi | 2 - + arch/arm/boot/dts/rv1108.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 24 ++++ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 76 ++++++++++++ + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 1 - + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 2 - + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 2 - + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 - + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 44 +++++++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 114 ++++++++++++------ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 19 ++- + drivers/soc/rockchip/grf.c | 14 +++ + 38 files changed, 643 insertions(+), 90 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3229.dtsi +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 (c599c49b6352 Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos3250-artik5-eval.dts | 1 - + arch/arm/boot/dts/exynos3250-artik5.dtsi | 1 - + arch/arm/boot/dts/exynos3250-monk.dts | 1 - + arch/arm/boot/dts/exynos3250-rinato.dts | 22 ------ + arch/arm/boot/dts/exynos4.dtsi | 3 + + arch/arm/boot/dts/exynos4210-trats.dts | 21 ------ + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 1 - + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 1 - + arch/arm/boot/dts/exynos4412-origen.dts | 1 - + arch/arm/boot/dts/exynos4412-trats2.dts | 22 ------ + arch/arm/boot/dts/exynos5250-arndale.dts | 2 - + arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 - + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 3 - + arch/arm/boot/dts/exynos5250-spring.dts | 2 - + arch/arm/boot/dts/exynos5260-xyref5260.dts | 2 - + arch/arm/boot/dts/exynos5410-smdk5410.dts | 2 - + arch/arm/boot/dts/exynos5420-peach-pit.dts | 3 - + arch/arm/boot/dts/exynos5800-peach-pi.dts | 3 - + arch/arm/configs/exynos_defconfig | 79 ++++++++++++++++++++-- + arch/arm/configs/ezx_defconfig | 1 - + arch/arm/configs/ixp4xx_defconfig | 4 -- + arch/arm/configs/multi_v7_defconfig | 7 -- + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/configs/vexpress_defconfig | 1 - + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 19 +----- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 4 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 - + 27 files changed, 80 insertions(+), 131 deletions(-) +Merging sunxi/sunxi/for-next (d6aa74d396fe Merge branch 'sunxi/dt64-for-4.14' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/sun6i-a31.dtsi | 6 +- + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 4 + + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 6 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 9 ++ + arch/arm64/boot/dts/allwinner/axp803.dtsi | 150 +++++++++++++++++++++ + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 11 ++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 9 ++ + 7 files changed, 189 insertions(+), 6 deletions(-) + create mode 100644 arch/arm64/boot/dts/allwinner/axp803.dtsi +Merging tegra/for-next (07bb9460b188 Merge branch for-4.13/arm64/dt into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (425e1ed73e65 arm64: fix endianness annotation for 'struct jit_ctx' and friends) +$ git merge arm64/for-next/core +Already up-to-date. +Merging clk/clk-next (1f5e4c15d3bb Merge branch 'clk-fixes' into clk-next) +$ git merge clk/clk-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/idt,versaclock5.txt | 30 +- + .../devicetree/bindings/clock/snps,pll-clock.txt | 28 ++ + MAINTAINERS | 6 + + drivers/clk/Kconfig | 6 +- + drivers/clk/axs10x/Makefile | 1 + + drivers/clk/axs10x/pll_clock.c | 346 +++++++++++++++++++++ + drivers/clk/clk-gemini.c | 14 + + drivers/clk/clk-moxart.c | 4 +- + drivers/clk/clk-versaclock5.c | 172 +++++++++- + drivers/clk/mediatek/clk-cpumux.c | 4 - + drivers/clk/mmp/clk.c | 2 +- + drivers/clk/qcom/clk-smd-rpm.c | 2 - + drivers/clk/x86/clk-pmc-atom.c | 7 + + 13 files changed, 590 insertions(+), 32 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/snps,pll-clock.txt + create mode 100644 drivers/clk/axs10x/pll_clock.c +Merging c6x/for-linux-next (91ebcd1b97ae MAINTAINERS: update email address for C6x maintainer) +$ git merge c6x/for-linux-next +Already up-to-date. +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 (204a2be30a7a m68k: Remove ptrace_signal_deliver) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (87b2c3fc6317 h8300: Add missing closing parenthesis in flat_get_addr_from_rp()) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (14ef905bb2ee microblaze: Fix MSR flags when returning from exception) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (d40e0d4fb561 locking/qspinlock: Include linux/prefetch.h) +$ git merge mips/mips-for-linux-next +Already up-to-date. +Merging nios2/for-next (e118c3fec9c0 nios2: remove custom early console implementation) +$ git merge nios2/for-next +Already up-to-date. +Merging openrisc/for-next (9d15eb228b10 openrisc: defconfig: Cleanup from old Kconfig options) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. +Merging parisc-hd/for-next (6f7da290413b Linux 4.12) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (1e0fc9d1eb2b powerpc/Kconfig: Enable STRICT_KERNEL_RWX for some configs) +$ git merge powerpc/next +Already up-to-date. +Merging fsl/next (61baf1555512 powerpc/64e: Don't place the stack beyond TASK_SIZE) +$ 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 (1bc5fede0e45 s390: add support for IBM z14 machines) +$ git merge s390/features +Auto-merging arch/s390/kernel/setup.c +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 18 ++++ + arch/s390/Makefile | 6 +- + arch/s390/include/asm/elf.h | 2 +- + arch/s390/include/asm/ipl.h | 2 +- + arch/s390/include/asm/lowcore.h | 48 ++++----- + arch/s390/include/asm/mmu_context.h | 6 +- + arch/s390/include/asm/page-states.h | 1 + + arch/s390/include/asm/page.h | 13 ++- + arch/s390/include/asm/pgalloc.h | 18 ++-- + arch/s390/include/asm/pgtable.h | 195 +++++++++++++++++++++-------------- + arch/s390/include/asm/qdio.h | 2 +- + arch/s390/include/asm/setup.h | 11 +- + arch/s390/include/asm/timex.h | 38 ++++++- + arch/s390/include/asm/tlb.h | 6 +- + arch/s390/include/asm/tlbflush.h | 7 +- + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kernel/debug.c | 9 +- + arch/s390/kernel/dumpstack.c | 2 +- + arch/s390/kernel/early.c | 15 ++- + arch/s390/kernel/head.S | 3 +- + arch/s390/kernel/head64.S | 4 +- + arch/s390/kernel/irq.c | 3 +- + arch/s390/kernel/perf_cpum_sf.c | 2 +- + arch/s390/kernel/relocate_kernel.S | 5 +- + arch/s390/kernel/setup.c | 13 ++- + arch/s390/kernel/suspend.c | 24 ++++- + arch/s390/kernel/time.c | 65 ++++++++---- + arch/s390/kernel/vdso.c | 2 + + arch/s390/kernel/vdso32/vdso32.lds.S | 4 +- + arch/s390/kernel/vdso64/vdso64.lds.S | 4 +- + arch/s390/kvm/diag.c | 8 +- + arch/s390/kvm/gaccess.c | 35 +++---- + arch/s390/kvm/priv.c | 8 +- + arch/s390/kvm/vsie.c | 2 +- + arch/s390/lib/delay.c | 2 +- + arch/s390/mm/fault.c | 10 +- + arch/s390/mm/gmap.c | 124 +++++++++++----------- + arch/s390/mm/init.c | 7 +- + arch/s390/mm/page-states.c | 192 +++++++++++++++++++++++++++++++--- + arch/s390/mm/pageattr.c | 5 +- + arch/s390/mm/pgalloc.c | 12 ++- + arch/s390/mm/pgtable.c | 160 +++++++++++++++++++++------- + arch/s390/mm/vmem.c | 47 +++------ + arch/s390/tools/gen_facilities.c | 3 + + drivers/s390/char/sclp_cmd.c | 1 + + drivers/s390/char/sclp_early.c | 6 +- + drivers/s390/cio/chp.c | 1 + + 47 files changed, 783 insertions(+), 369 deletions(-) +Merging sparc-next/master (cb8c65ccff7f Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ 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 +Merge made by the 'recursive' strategy. + arch/sh/include/asm/futex.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory) +$ git merge tile/master +Already up-to-date. +Merging uml/linux-next (61e8d462457f um: Correctly check for PTRACE_GETRESET/SETREGSET) +$ 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 ae2124b0e36b] 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 (bdf3b55fde37 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 (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (8e1bf248091d Merge branch 'for-next-next-v4.14-20170718' into for-next-20170718) +$ git merge btrfs-kdave/for-next +Merge made by the 'recursive' strategy. + fs/btrfs/async-thread.c | 6 +- + fs/btrfs/async-thread.h | 6 +- + fs/btrfs/backref.c | 1074 ++++++++++++++------------------ + fs/btrfs/backref.h | 16 +- + fs/btrfs/btrfs_inode.h | 13 +- + fs/btrfs/check-integrity.c | 6 +- + fs/btrfs/compression.c | 35 +- + fs/btrfs/compression.h | 2 + + fs/btrfs/ctree.c | 14 +- + fs/btrfs/ctree.h | 132 ++-- + fs/btrfs/dev-replace.c | 74 ++- + fs/btrfs/disk-io.c | 219 +++---- + fs/btrfs/disk-io.h | 10 +- + fs/btrfs/extent-tree.c | 49 +- + fs/btrfs/extent_io.c | 70 +-- + fs/btrfs/extent_io.h | 19 +- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/inode.c | 61 +- + fs/btrfs/ioctl.c | 70 +-- + fs/btrfs/print-tree.c | 10 +- + fs/btrfs/print-tree.h | 4 +- + fs/btrfs/props.c | 10 +- + fs/btrfs/qgroup.c | 4 +- + fs/btrfs/root-tree.c | 2 +- + fs/btrfs/scrub.c | 3 +- + fs/btrfs/struct-funcs.c | 9 +- + fs/btrfs/super.c | 25 +- + fs/btrfs/tests/btrfs-tests.c | 1 - + fs/btrfs/tests/free-space-tree-tests.c | 2 +- + fs/btrfs/volumes.c | 226 ++++--- + fs/btrfs/volumes.h | 4 + + include/trace/events/btrfs.h | 313 ++++++---- + 32 files changed, 1224 insertions(+), 1267 deletions(-) +Merging ceph/master (7c40b22f6f84 libceph: potential NULL dereference in ceph_msg_data_create()) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/dir.c | 5 +++++ + include/linux/ceph/ceph_features.h | 8 ++++---- + net/ceph/messenger.c | 6 ++++-- + net/ceph/osd_client.c | 5 ++++- + net/ceph/osdmap.c | 31 ++++++++++++++++--------------- + 5 files changed, 33 insertions(+), 22 deletions(-) +Merging cifs/for-next (235b84fc862a Merge branch 'i2c/for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge cifs/for-next +Already up-to-date. +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 (84969465ddc4 hfsplus: Don't clear SGID when inheriting ACLs) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ext2/acl.c | 43 +++++++++++++++++++++++++++++-------------- + fs/hfsplus/posix_acl.c | 30 ++++++++++++++++++------------ + fs/isofs/inode.c | 8 ++++++-- + fs/reiserfs/xattr_acl.c | 17 +++++++++++------ + 4 files changed, 64 insertions(+), 34 deletions(-) +Merging ext4/dev (ff95015648df ext4: fix spelling mistake: "prellocated" -> "preallocated") +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (4db08d016cce f2fs: avoid cpu lockup) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/acl.c | 2 +- + fs/f2fs/checkpoint.c | 10 ++++++++++ + fs/f2fs/file.c | 5 +---- + fs/f2fs/sysfs.c | 1 + + 4 files changed, 13 insertions(+), 5 deletions(-) +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 (68227c03cba8 fuse: initialize the flock flag in fuse_file on allocation) +$ git merge fuse/for-next +Merge made by the 'recursive' strategy. + fs/fuse/file.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging jfs/jfs-next (f070e5ac9bc7 jfs: preserve i_mode if __jfs_set_acl() fails) +$ git merge jfs/jfs-next +Auto-merging fs/jfs/super.c +Merge made by the 'recursive' strategy. + fs/jfs/acl.c | 24 ++++++++++++++++-------- + fs/jfs/resize.c | 4 ++-- + fs/jfs/super.c | 4 ++-- + 3 files changed, 20 insertions(+), 12 deletions(-) +Merging nfs/linux-next (6f7da290413b Linux 4.12) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (b20dae70bfa5 svcrdma: fix an incorrect check on -E2BIG and -EINVAL) +$ git merge nfsd/nfsd-next +Already up-to-date. +Merging orangefs/for-next (2f713b5c7d2a orangefs: count directory pieces correctly) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (3329e0599fd2 ovl: verify origin of merge dir lower) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + Documentation/filesystems/overlayfs.txt | 16 ++++++++++++++++ + fs/overlayfs/dir.c | 22 ++++++++++++++++++---- + fs/overlayfs/namei.c | 10 ++++++++++ + fs/overlayfs/overlayfs.h | 3 ++- + fs/overlayfs/super.c | 5 +---- + 5 files changed, 47 insertions(+), 9 deletions(-) +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 (a6664433d383 ubifs: Set double hash cookie also for RENAME_EXCHANGE) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (cd87d8679201 xfs: don't crash on unexpected holes in dir/attr btrees) +$ git merge xfs/for-next +Already up-to-date. +Merging file-locks/linux-next (9d5b86ac13c5 fs/locks: Remove fl_nspid and use fs-specific l_pid for remote locks) +$ git merge file-locks/linux-next +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 2 +- + fs/9p/vfs_file.c | 2 +- + fs/ceph/locks.c | 2 +- + fs/cifs/cifssmb.c | 2 +- + fs/dlm/plock.c | 2 +- + fs/fuse/file.c | 6 +- + fs/locks.c | 108 ++++++++++++++---------- + include/linux/fs.h | 1 - + 8 files changed, 71 insertions(+), 54 deletions(-) +Merging vfs/for-next (66bf97967726 annotate RWF_... flags) +$ git merge vfs/for-next +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/fs.h +Auto-merging fs/read_write.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/compat.h | 5 +++-- + fs/nfsd/vfs.c | 2 +- + fs/read_write.c | 50 +++++++++++++++++++++--------------------- + include/linux/compat.h | 18 ++++++++++++--- + include/linux/fs.h | 12 +++++----- + include/linux/syscalls.h | 13 ++++++----- + include/uapi/linux/aio_abi.h | 21 +++++++++--------- + include/uapi/linux/fs.h | 28 ++++++++++++++++------- + 8 files changed, 89 insertions(+), 60 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 (f4e981cba2de printk: add __printf attributes to internal functions) +$ git merge printk/for-next +Already up-to-date. +Merging pci/next (af3c8d98508d Merge tag 'drm-for-v4.13' of git://people.freedesktop.org/~airlied/linux) +$ git merge pci/next +Already up-to-date. +Merging pstore/for-next/pstore (0752e4028c00 powerpc/nvram: use memdup_user) +$ git merge pstore/for-next/pstore +Already up-to-date. +Merging hid/for-next (4cf56a89c696 HID: multitouch: do not blindly set EV_KEY or EV_ABS bits) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/hid-multitouch.c | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) +Merging i2c/i2c/for-next (4ca6df134847 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ 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 (8efa050f19fe firmware: dmi_scan: Check DMI structure length) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (e7adb541f7c5 hwmon: (jc42) Add support for GT30TS00, GT34TS02, and CAT34TS04) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + drivers/hwmon/adc128d818.c | 2 +- + drivers/hwmon/adt7475.c | 16 ++++++++-------- + drivers/hwmon/hwmon.c | 2 +- + drivers/hwmon/jc42.c | 15 +++++++++++++++ + drivers/hwmon/nct7802.c | 10 +++++----- + 5 files changed, 30 insertions(+), 15 deletions(-) +Merging jc_docs/docs-next (e604f1cb8536 docs: disable KASLR when debugging kernel) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/arm/firmware.txt | 2 +- + Documentation/dev-tools/gdb-kernel-debugging.rst | 6 ++- + Documentation/dev-tools/kgdb.rst | 11 +++- + Documentation/doc-guide/sphinx.rst | 69 +++++++++++++++++++++++- + Documentation/process/changes.rst | 16 ++---- + Documentation/sphinx-static/theme_overrides.css | 17 ++++++ + 6 files changed, 103 insertions(+), 18 deletions(-) +Merging v4l-dvb/master (0e6fd95802e2 media: pulse8-cec/rainshadow-cec: make adapter name unique) +$ git merge v4l-dvb/master +Auto-merging include/media/cec-notifier.h +Auto-merging drivers/media/usb/pulse8-cec/pulse8-cec.c +Auto-merging drivers/media/i2c/ov6650.c +Auto-merging drivers/media/cec/cec-adap.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/media/cec-drivers/index.rst | 32 + + Documentation/media/cec-drivers/pulse8-cec.rst | 11 + + Documentation/media/index.rst | 1 + + Documentation/media/kapi/cec-core.rst | 40 ++ + .../media/uapi/cec/cec-ioc-adap-g-caps.rst | 7 + + .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 4 +- + Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 20 + + Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 19 +- + MAINTAINERS | 1 + + drivers/media/Kconfig | 3 + + drivers/media/cec/Makefile | 4 + + drivers/media/cec/cec-adap.c | 223 ++++-- + drivers/media/cec/cec-api.c | 73 +- + drivers/media/cec/cec-core.c | 7 +- + drivers/media/cec/cec-pin.c | 794 +++++++++++++++++++++ + drivers/media/i2c/Kconfig | 11 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/{soc_camera => }/ov6650.c | 77 +- + drivers/media/i2c/soc_camera/Kconfig | 6 - + drivers/media/i2c/soc_camera/Makefile | 1 - + drivers/media/usb/pulse8-cec/pulse8-cec.c | 2 +- + drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 2 +- + include/media/cec-notifier.h | 12 + + include/media/cec-pin.h | 183 +++++ + include/media/cec.h | 69 +- + include/uapi/linux/cec.h | 8 +- + 26 files changed, 1435 insertions(+), 176 deletions(-) + create mode 100644 Documentation/media/cec-drivers/index.rst + create mode 100644 Documentation/media/cec-drivers/pulse8-cec.rst + create mode 100644 drivers/media/cec/cec-pin.c + rename drivers/media/i2c/{soc_camera => }/ov6650.c (92%) + create mode 100644 include/media/cec-pin.h +Merging v4l-dvb-next/master (474dfccf3685 media: svg: avoid too long lines) +$ git merge v4l-dvb-next/master +Already up-to-date. +Merging fbdev/fbdev-for-next (4c99ceda0d06 fbdev: make get_fb_unmapped_area depends of !MMU) +$ git merge fbdev/fbdev-for-next +Already up-to-date. +Merging pm/linux-next (7d71a49525ed Merge branches 'acpi-video' and 'acpi-x86' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. + arch/x86/kernel/acpi/boot.c | 9 ++++++--- + drivers/acpi/video_detect.c | 14 ++++++++++++++ + drivers/base/power/opp/of.c | 8 ++++++-- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/intel_pstate.c | 21 +++++++++++++++++++-- + drivers/cpufreq/speedstep-ich.c | 2 +- + include/linux/acpi.h | 4 ++-- + 7 files changed, 49 insertions(+), 10 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 (5d72ed35678a Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next) +$ git merge thermal/next +Already up-to-date. +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 (e94d6f64e7ba dlm: print log message when cluster name is not set) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/debug_fs.c | 25 ++++++++++++------------- + fs/dlm/lock.c | 8 +++----- + fs/dlm/lockspace.c | 7 ++++++- + fs/dlm/member.c | 15 ++++++--------- + fs/dlm/user.c | 2 ++ + 5 files changed, 29 insertions(+), 28 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 (8c5e9fb8ac8f Merge branch 'net-attribute_group-const') +$ git merge net-next/master +Auto-merging net/sctp/sm_make_chunk.c +Auto-merging net/ipv4/ip_output.c +Auto-merging net/core/skbuff.c +Removing net/core/flow.c +Auto-merging net/core/filter.c +Auto-merging net/core/dev.c +Removing include/net/flowcache.h +Auto-merging drivers/net/usb/cdc_ncm.c +Auto-merging drivers/atm/zatm.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/renesas,ravb.txt | 29 +- + .../devicetree/bindings/net/xilinx_axienet.txt | 55 ++ + Documentation/networking/ip-sysctl.txt | 6 +- + drivers/atm/ambassador.c | 2 +- + drivers/atm/eni.c | 2 +- + drivers/atm/firestream.c | 2 +- + drivers/atm/fore200e.c | 2 +- + drivers/atm/he.c | 2 +- + drivers/atm/horizon.c | 2 +- + drivers/atm/idt77252.c | 2 +- + drivers/atm/iphase.c | 2 +- + drivers/atm/lanai.c | 2 +- + drivers/atm/nicstar.c | 2 +- + drivers/atm/solos-pci.c | 2 +- + drivers/atm/zatm.c | 2 +- + drivers/net/arcnet/arcdevice.h | 2 +- + drivers/net/arcnet/com20020-pci.c | 2 +- + drivers/net/bonding/bond_sysfs.c | 2 +- + drivers/net/can/at91_can.c | 2 +- + drivers/net/can/janz-ican3.c | 2 +- + drivers/net/dsa/mv88e6xxx/chip.c | 287 +++++--- + drivers/net/dsa/mv88e6xxx/chip.h | 152 +---- + drivers/net/dsa/mv88e6xxx/global2.c | 102 ++- + drivers/net/dsa/mv88e6xxx/global2.h | 41 +- + drivers/net/dsa/mv88e6xxx/phy.c | 97 ++- + drivers/net/dsa/mv88e6xxx/phy.h | 22 + + drivers/net/dsa/mv88e6xxx/port.c | 17 + + drivers/net/dsa/mv88e6xxx/port.h | 6 +- + drivers/net/dummy.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 1 + + drivers/net/ethernet/cadence/macb_main.c | 2 +- + drivers/net/ethernet/cadence/macb_pci.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 8 +- + drivers/net/ethernet/ec_bhf.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 63 +- + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 6 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 65 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 68 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 2 + + .../mellanox/mlxsw/spectrum_acl_flex_keys.h | 3 + + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 3 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 44 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 746 ++++++++++++++------- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 25 +- + drivers/net/ethernet/neterion/s2io.c | 45 -- + drivers/net/ethernet/sun/ldmvsw.c | 2 +- + drivers/net/ethernet/sun/sunvnet.c | 2 +- + drivers/net/ethernet/sun/sunvnet_common.c | 90 ++- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 1 + + drivers/net/ethernet/xilinx/xilinx_axienet.h | 4 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 48 +- + drivers/net/ieee802154/ca8210.c | 1 + + drivers/net/ipvlan/ipvlan_main.c | 2 +- + drivers/net/ipvlan/ipvtap.c | 2 +- + drivers/net/macvlan.c | 2 +- + drivers/net/macvtap.c | 2 +- + drivers/net/phy/mdio_bus.c | 6 +- + drivers/net/tap.c | 7 +- + drivers/net/tun.c | 7 +- + drivers/net/usb/cdc_ncm.c | 2 +- + drivers/net/virtio_net.c | 6 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 2 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + include/linux/bpf.h | 20 + + include/linux/bpf_types.h | 3 + + include/linux/filter.h | 14 + + include/linux/netdev_features.h | 4 +- + include/linux/netdevice.h | 12 +- + include/linux/sctp.h | 49 +- + include/linux/skbuff.h | 37 +- + include/linux/virtio_net.h | 5 - + include/net/af_unix.h | 1 - + include/net/flow.h | 34 - + include/net/flowcache.h | 25 - + include/net/inetpeer.h | 11 +- + include/net/ip6_route.h | 2 +- + include/net/netns/xfrm.h | 11 - + include/net/sctp/structs.h | 6 +- + include/net/xfrm.h | 9 +- + include/trace/events/xdp.h | 31 +- + include/uapi/linux/bpf.h | 10 +- + kernel/bpf/Makefile | 3 + + kernel/bpf/devmap.c | 431 ++++++++++++ + kernel/bpf/verifier.c | 12 + + net/core/Makefile | 1 - + net/core/dev.c | 244 +++---- + net/core/ethtool.c | 7 - + net/core/filter.c | 178 ++++- + net/core/flow.c | 516 -------------- + net/core/skbuff.c | 34 +- + net/ipv4/af_inet.c | 12 +- + net/ipv4/gre_offload.c | 14 +- + net/ipv4/inetpeer.c | 428 +++--------- + net/ipv4/ip_output.c | 76 --- + net/ipv4/ip_vti.c | 31 - + net/ipv4/udp_offload.c | 64 +- + net/ipv4/xfrm4_policy.c | 11 +- + net/ipv6/ip6_output.c | 76 --- + net/ipv6/ip6_vti.c | 31 - + net/ipv6/udp_offload.c | 100 +-- + net/ipv6/xfrm6_policy.c | 11 +- + net/key/af_key.c | 6 - + net/openvswitch/datapath.c | 14 - + net/openvswitch/flow.c | 6 +- + net/rds/connection.c | 16 +- + net/rds/rds.h | 2 +- + net/rds/tcp.c | 2 +- + net/rds/tcp_connect.c | 4 +- + net/rds/tcp_send.c | 2 +- + net/rds/threads.c | 2 +- + net/sched/act_csum.c | 6 - + net/sctp/auth.c | 13 +- + net/sctp/endpointola.c | 8 +- + net/sctp/ipv6.c | 2 +- + net/sctp/protocol.c | 2 +- + net/sctp/sm_make_chunk.c | 32 +- + net/sctp/sm_statefuns.c | 11 +- + net/unix/af_unix.c | 24 +- + net/xfrm/xfrm_device.c | 4 +- + net/xfrm/xfrm_policy.c | 417 +++++------- + net/xfrm/xfrm_state.c | 5 +- + net/xfrm/xfrm_user.c | 3 - + samples/bpf/Makefile | 8 + + samples/bpf/xdp_redirect_kern.c | 81 +++ + samples/bpf/xdp_redirect_map_kern.c | 83 +++ + samples/bpf/xdp_redirect_map_user.c | 137 ++++ + samples/bpf/xdp_redirect_user.c | 134 ++++ + security/selinux/include/xfrm.h | 4 +- + tools/hv/bondvf.sh | 27 +- + tools/testing/selftests/bpf/bpf_helpers.h | 2 + + tools/testing/selftests/bpf/test_maps.c | 15 + + 135 files changed, 3151 insertions(+), 2622 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/xilinx_axienet.txt + delete mode 100644 include/net/flowcache.h + create mode 100644 kernel/bpf/devmap.c + delete mode 100644 net/core/flow.c + create mode 100644 samples/bpf/xdp_redirect_kern.c + create mode 100644 samples/bpf/xdp_redirect_map_kern.c + create mode 100644 samples/bpf/xdp_redirect_map_user.c + create mode 100644 samples/bpf/xdp_redirect_user.c +Merging ipsec-next/master (8bafd73093f2 xfrm: add UDP encapsulation port in migrate message) +$ git merge ipsec-next/master +Already up-to-date. +Merging netfilter-next/master (04ba724b659c netfilter: nfnetlink: extended ACK reporting) +$ 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 (fb90e8dedb46 ipvs: change comparison on sync_refresh_period) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (17d9aa66b08d Merge tag 'iwlwifi-next-for-kalle-2017-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next) +$ git merge wireless-drivers-next/master +Already up-to-date. +Merging bluetooth/master (fc37ce85ac0b Bluetooth: hci_ll: Use new hci_uart_unregister_device() function) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/bluetooth/btqca.c | 2 +- + drivers/bluetooth/btusb.c | 9 ++++++++- + drivers/bluetooth/hci_bcm.c | 30 ++++++++++++++++-------------- + drivers/bluetooth/hci_ll.c | 8 +------- + drivers/bluetooth/hci_nokia.c | 10 +--------- + drivers/bluetooth/hci_serdev.c | 13 +++++++++++++ + drivers/bluetooth/hci_uart.h | 1 + + 7 files changed, 41 insertions(+), 32 deletions(-) +Merging mac80211-next/master (3dc02251f43f Merge branch 'skb-accessor-cleanups') +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (760765903025 Merge tag 'v4.13-rc1' into k.o/for-4.14) +$ git merge rdma/for-next +Auto-merging include/rdma/rdma_vt.h +Auto-merging include/rdma/ib_verbs.h +Auto-merging drivers/infiniband/sw/rdmavt/qp.c +Auto-merging drivers/infiniband/hw/qib/qib_verbs.h +Auto-merging drivers/infiniband/hw/hfi1/qp.c +Auto-merging drivers/infiniband/hw/hfi1/chip.c +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/hfi1/Makefile | 2 +- + drivers/infiniband/hw/hfi1/affinity.c | 18 +- + drivers/infiniband/hw/hfi1/affinity.h | 14 +- + drivers/infiniband/hw/hfi1/chip.c | 303 +++++++++++----------- + drivers/infiniband/hw/hfi1/chip.h | 4 +- + drivers/infiniband/hw/hfi1/common.h | 1 + + drivers/infiniband/hw/hfi1/driver.c | 169 +++++++++---- + drivers/infiniband/hw/hfi1/eprom.c | 11 +- + drivers/infiniband/hw/hfi1/exp_rcv.c | 114 +++++++++ + drivers/infiniband/hw/hfi1/exp_rcv.h | 187 ++++++++++++++ + drivers/infiniband/hw/hfi1/file_ops.c | 43 ++-- + drivers/infiniband/hw/hfi1/hfi.h | 103 ++++---- + drivers/infiniband/hw/hfi1/init.c | 62 ++++- + drivers/infiniband/hw/hfi1/mad.c | 323 ++++++++++++++---------- + drivers/infiniband/hw/hfi1/mad.h | 2 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 14 +- + drivers/infiniband/hw/hfi1/mmu_rb.h | 5 +- + drivers/infiniband/hw/hfi1/pcie.c | 80 ++---- + drivers/infiniband/hw/hfi1/platform.c | 30 +-- + drivers/infiniband/hw/hfi1/qp.c | 6 - + drivers/infiniband/hw/hfi1/rc.c | 42 ++- + drivers/infiniband/hw/hfi1/ruc.c | 91 ++++--- + drivers/infiniband/hw/hfi1/sdma.c | 6 +- + drivers/infiniband/hw/hfi1/trace.c | 58 ++++- + drivers/infiniband/hw/hfi1/trace_ibhdrs.h | 322 +++++++++++++++-------- + drivers/infiniband/hw/hfi1/trace_misc.h | 20 ++ + drivers/infiniband/hw/hfi1/trace_rx.h | 90 ++++--- + drivers/infiniband/hw/hfi1/uc.c | 18 +- + drivers/infiniband/hw/hfi1/ud.c | 64 ++--- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 121 --------- + drivers/infiniband/hw/hfi1/user_exp_rcv.h | 23 +- + drivers/infiniband/hw/hfi1/user_sdma.c | 207 +++++++-------- + drivers/infiniband/hw/hfi1/verbs.c | 106 ++++---- + drivers/infiniband/hw/hfi1/verbs.h | 10 +- + drivers/infiniband/hw/hfi1/vnic_main.c | 11 +- + drivers/infiniband/hw/qib/qib.h | 8 +- + drivers/infiniband/hw/qib/qib_iba6120.c | 6 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 7 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 48 ++-- + drivers/infiniband/hw/qib/qib_mad.c | 13 +- + drivers/infiniband/hw/qib/qib_pcie.c | 149 +++++------ + drivers/infiniband/hw/qib/qib_ruc.c | 22 +- + drivers/infiniband/hw/qib/qib_ud.c | 43 +--- + drivers/infiniband/hw/qib/qib_verbs.h | 4 +- + drivers/infiniband/sw/rdmavt/mr.c | 51 +++- + drivers/infiniband/sw/rdmavt/qp.c | 60 ++--- + drivers/infiniband/sw/rdmavt/trace_mr.h | 62 +++++ + drivers/infiniband/sw/rdmavt/trace_tx.h | 11 +- + drivers/infiniband/sw/rdmavt/vt.c | 9 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 27 +- + include/rdma/ib_hdrs.h | 84 ++++++ + include/rdma/ib_verbs.h | 5 +- + include/rdma/rdma_vt.h | 4 +- + include/rdma/rdmavt_qp.h | 2 +- + 54 files changed, 1938 insertions(+), 1357 deletions(-) + create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.c + create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.h +Merging gfs2/for-next (283c9a97be1d gfs2: Lock holder cleanup (fixup)) +$ git merge gfs2/for-next +Merge made by the 'recursive' strategy. + fs/gfs2/file.c | 3 +-- + fs/gfs2/meta_io.c | 3 ++- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging mtd/master (7d84120b5ba6 Documentation: ABI: mtd: describe "offset" more precisely) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (7d84120b5ba6 Documentation: ABI: mtd: describe "offset" more precisely) +$ git merge l2-mtd/master +Already up-to-date. +Merging nand/nand/next (81667e9c8ad8 mtd: nand: mtk: release lock on error path) +$ git merge nand/nand/next +Already up-to-date. +Merging spi-nor/spi-nor/next (f384b352cbf0 mtd: spi-nor: parse Serial Flash Discoverable Parameters (SFDP) tables) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/spi-nor.c | 775 +++++++++++++++++++++++++++++++++++++++++- + include/linux/mtd/spi-nor.h | 6 + + 2 files changed, 768 insertions(+), 13 deletions(-) +Merging crypto/master (10a515ddb5f1 hwrng: remember rng chosen by user) +$ git merge crypto/master +Removing drivers/crypto/ccp/ccp-platform.c +Removing drivers/crypto/ccp/ccp-pci.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/atmel-crypto.txt | 13 + + MAINTAINERS | 6 + + drivers/char/hw_random/core.c | 42 +- + drivers/crypto/Kconfig | 28 +- + drivers/crypto/Makefile | 1 + + drivers/crypto/atmel-ecc.c | 781 +++++++++++++++++++++ + drivers/crypto/atmel-ecc.h | 128 ++++ + drivers/crypto/bcm/cipher.c | 5 + + drivers/crypto/caam/caamalg.c | 66 +- + drivers/crypto/caam/caamalg_desc.c | 5 +- + drivers/crypto/caam/caamalg_qi.c | 55 +- + drivers/crypto/caam/caamrng.c | 6 +- + drivers/crypto/caam/ctrl.c | 1 - + drivers/crypto/caam/error.c | 40 ++ + drivers/crypto/caam/error.h | 4 + + drivers/crypto/caam/intern.h | 3 - + drivers/crypto/caam/qi.c | 14 +- + drivers/crypto/caam/qi.h | 3 + + drivers/crypto/caam/sg_sw_sec4.h | 15 - + drivers/crypto/ccp/Kconfig | 21 +- + drivers/crypto/ccp/Makefile | 6 +- + drivers/crypto/ccp/ccp-debugfs.c | 15 +- + drivers/crypto/ccp/ccp-dev-v3.c | 17 +- + drivers/crypto/ccp/ccp-dev-v5.c | 12 +- + drivers/crypto/ccp/ccp-dev.c | 125 ++-- + drivers/crypto/ccp/ccp-dev.h | 25 +- + drivers/crypto/ccp/ccp-ops.c | 4 +- + drivers/crypto/ccp/ccp-pci.c | 356 ---------- + drivers/crypto/ccp/ccp-platform.c | 293 -------- + drivers/crypto/ccp/sp-dev.c | 277 ++++++++ + drivers/crypto/ccp/sp-dev.h | 132 ++++ + drivers/crypto/ccp/sp-pci.c | 276 ++++++++ + drivers/crypto/ccp/sp-platform.c | 256 +++++++ + drivers/crypto/geode-aes.c | 17 +- + drivers/crypto/mediatek/mtk-platform.c | 2 +- + drivers/crypto/mxc-scc.c | 4 +- + drivers/crypto/mxs-dcp.c | 8 +- + drivers/crypto/omap-aes.c | 1 + + drivers/crypto/omap-des.c | 3 +- + drivers/crypto/qat/qat_common/adf_aer.c | 2 +- + drivers/crypto/sahara.c | 2 +- + drivers/crypto/sunxi-ss/Makefile | 1 + + drivers/crypto/sunxi-ss/sun4i-ss-core.c | 30 + + drivers/crypto/sunxi-ss/sun4i-ss-prng.c | 56 ++ + drivers/crypto/sunxi-ss/sun4i-ss.h | 11 + + drivers/crypto/virtio/virtio_crypto_algs.c | 109 ++- + drivers/crypto/virtio/virtio_crypto_common.h | 22 +- + drivers/crypto/virtio/virtio_crypto_core.c | 37 +- + include/crypto/kpp.h | 10 + + include/linux/ccp.h | 8 +- + 50 files changed, 2419 insertions(+), 935 deletions(-) + create mode 100644 drivers/crypto/atmel-ecc.c + create mode 100644 drivers/crypto/atmel-ecc.h + delete mode 100644 drivers/crypto/ccp/ccp-pci.c + delete mode 100644 drivers/crypto/ccp/ccp-platform.c + create mode 100644 drivers/crypto/ccp/sp-dev.c + create mode 100644 drivers/crypto/ccp/sp-dev.h + create mode 100644 drivers/crypto/ccp/sp-pci.c + create mode 100644 drivers/crypto/ccp/sp-platform.c + create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss-prng.c +Merging drm/drm-next (6419ec78c672 Merge branch 'drm-next-4.13' 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 (eafbc2070124 Merge tag 'gvt-fixes-2017-07-11' of https://github.com/01org/gvt-linux into drm-intel-next-fixes) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (43240bbd871e gpu: host1x: At first try a non-blocking allocation for the gather copy) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/for-linux-next (b1332aaabbda drm: stm: remove "default y" in Kconfig) +$ git merge drm-misc/for-linux-next +Recorded preimage for 'drivers/gpu/drm/i915/i915_reg.h' +Resolved 'drivers/gpu/drm/vc4/vc4_crtc.c' using previous resolution. +Auto-merging include/linux/dma-fence.h +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_crtc.c +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/mediatek/mtk_hdmi.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_drv.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_crtc.c +Auto-merging drivers/gpu/drm/i915/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/drm_vblank.c +Auto-merging drivers/gpu/drm/drm_ioctl.c +Auto-merging drivers/gpu/drm/drm_internal.h +Auto-merging drivers/gpu/drm/drm_framebuffer.c +Auto-merging drivers/gpu/drm/bridge/panel.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/dma-buf/sync_debug.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/i915_reg.h'. +[master a4dfdc5def5a] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/dw_mipi_dsi.txt | 32 + + .../devicetree/bindings/display/repaper.txt | 52 + + .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 7 +- + .../devicetree/bindings/display/st,stm32-ltdc.txt | 105 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/gpu/drm-internals.rst | 2 + + Documentation/gpu/drm-kms.rst | 59 +- + Documentation/gpu/drm-uapi.rst | 2 + + MAINTAINERS | 6 + + drivers/dma-buf/sw_sync.c | 107 +- + drivers/dma-buf/sync_debug.c | 19 +- + drivers/dma-buf/sync_debug.h | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 1 - + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 41 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 10 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 2 - + drivers/gpu/drm/arm/malidp_crtc.c | 10 +- + drivers/gpu/drm/arm/malidp_drv.c | 2 +- + drivers/gpu/drm/armada/armada_crtc.c | 6 +- + drivers/gpu/drm/armada/armada_overlay.c | 2 +- + drivers/gpu/drm/ast/ast_drv.c | 5 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 18 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 17 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 16 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 29 + + drivers/gpu/drm/bochs/bochs_drv.c | 5 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 6 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 6 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 9 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 9 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 6 +- + drivers/gpu/drm/bridge/panel.c | 5 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 6 +- + drivers/gpu/drm/bridge/sii902x.c | 8 +- + drivers/gpu/drm/bridge/synopsys/Kconfig | 6 + + drivers/gpu/drm/bridge/synopsys/Makefile | 2 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 9 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 981 ++++++++++++++++++ + drivers/gpu/drm/bridge/tc358767.c | 6 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 6 +- + drivers/gpu/drm/cirrus/cirrus_drv.c | 5 +- + drivers/gpu/drm/drm_atomic.c | 121 ++- + drivers/gpu/drm/drm_atomic_helper.c | 257 ++++- + drivers/gpu/drm/drm_color_mgmt.c | 3 + + drivers/gpu/drm/drm_debugfs_crc.c | 59 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 89 +- + drivers/gpu/drm/drm_drv.c | 16 + + drivers/gpu/drm/drm_edid.c | 440 +++++++- + drivers/gpu/drm/drm_fb_cma_helper.c | 4 +- + drivers/gpu/drm/drm_fb_helper.c | 532 ++++++---- + drivers/gpu/drm/drm_file.c | 7 +- + drivers/gpu/drm/drm_framebuffer.c | 2 +- + drivers/gpu/drm/drm_gem.c | 10 +- + drivers/gpu/drm/drm_internal.h | 14 +- + drivers/gpu/drm/drm_ioctl.c | 13 +- + drivers/gpu/drm/drm_modes.c | 87 ++ + drivers/gpu/drm/drm_pci.c | 40 +- + drivers/gpu/drm/drm_probe_helper.c | 4 + + drivers/gpu/drm/drm_property.c | 23 + + drivers/gpu/drm/drm_simple_kms_helper.c | 20 +- + drivers/gpu/drm/drm_vblank.c | 187 ++-- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 5 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 4 - + drivers/gpu/drm/gma500/psb_drv.c | 5 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 10 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 3 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 10 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 1 - + drivers/gpu/drm/i2c/tda998x_drv.c | 2 +- + drivers/gpu/drm/i810/i810_drv.c | 5 +- + drivers/gpu/drm/i915/i915_drv.c | 7 +- + drivers/gpu/drm/i915/i915_drv.h | 2 - + drivers/gpu/drm/i915/i915_irq.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 2 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 47 +- + drivers/gpu/drm/i915/intel_fbdev.c | 16 +- + drivers/gpu/drm/i915/intel_hdmi.c | 7 +- + drivers/gpu/drm/i915/intel_sdvo.c | 3 +- + drivers/gpu/drm/imx/imx-drm-core.c | 8 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 5 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 10 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 7 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 2 +- + drivers/gpu/drm/meson/meson_crtc.c | 10 +- + drivers/gpu/drm/mga/mga_drv.c | 5 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 6 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 10 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 10 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 2 - + drivers/gpu/drm/nouveau/nouveau_drm.c | 12 +- + drivers/gpu/drm/nouveau/nv50_display.c | 5 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 10 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 3 +- + drivers/gpu/drm/pl111/pl111_drv.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 33 +- + drivers/gpu/drm/qxl/qxl_drv.c | 7 +- + drivers/gpu/drm/qxl/qxl_drv.h | 1 + + drivers/gpu/drm/qxl/qxl_ioctl.c | 17 +- + drivers/gpu/drm/qxl/qxl_object.c | 4 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 2 +- + drivers/gpu/drm/r128/r128_drv.c | 5 +- + drivers/gpu/drm/radeon/radeon_audio.c | 2 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 7 - + drivers/gpu/drm/radeon/radeon_drv.c | 6 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 - + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 10 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 110 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 - + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 17 +- + drivers/gpu/drm/savage/savage_drv.c | 5 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +- + drivers/gpu/drm/sis/sis_drv.c | 5 +- + drivers/gpu/drm/sti/sti_crtc.c | 10 +- + drivers/gpu/drm/sti/sti_drv.c | 1 - + drivers/gpu/drm/sti/sti_dvo.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 2 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 5 +- + drivers/gpu/drm/stm/Kconfig | 10 +- + drivers/gpu/drm/stm/Makefile | 2 + + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 352 +++++++ + drivers/gpu/drm/stm/ltdc.c | 230 +--- + drivers/gpu/drm/stm/ltdc.h | 3 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 10 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 2 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 5 +- + drivers/gpu/drm/tegra/dc.c | 10 +- + drivers/gpu/drm/tegra/drm.c | 5 +- + drivers/gpu/drm/tegra/hdmi.c | 2 +- + drivers/gpu/drm/tegra/sor.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 16 +- + drivers/gpu/drm/tinydrm/Kconfig | 12 + + drivers/gpu/drm/tinydrm/Makefile | 1 + + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 74 +- + drivers/gpu/drm/tinydrm/repaper.c | 1095 ++++++++++++++++++++ + drivers/gpu/drm/udl/udl_dmabuf.c | 2 +- + drivers/gpu/drm/udl/udl_drv.c | 6 - + drivers/gpu/drm/udl/udl_main.c | 2 - + drivers/gpu/drm/vc4/vc4_crtc.c | 46 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 13 +- + drivers/gpu/drm/vc4/vc4_drv.h | 1 - + drivers/gpu/drm/vc4/vc4_dsi.c | 20 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- + drivers/gpu/drm/vc4/vc4_kms.c | 76 +- + drivers/gpu/drm/vc4/vc4_plane.c | 17 + + drivers/gpu/drm/vgem/vgem_drv.c | 82 +- + drivers/gpu/drm/vgem/vgem_drv.h | 4 + + drivers/gpu/drm/via/via_drv.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 10 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 - + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 31 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 23 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 37 +- + drivers/gpu/drm/zte/zx_drm_drv.c | 4 +- + drivers/gpu/drm/zte/zx_hdmi.c | 2 +- + drivers/gpu/drm/zte/zx_vou.c | 10 +- + include/drm/bridge/dw_mipi_dsi.h | 39 + + include/drm/drmP.h | 37 +- + include/drm/drm_atomic.h | 122 ++- + include/drm/drm_atomic_helper.h | 11 + + include/drm/drm_connector.h | 32 + + include/drm/drm_crtc.h | 3 + + include/drm/drm_dp_mst_helper.h | 10 + + include/drm/drm_drv.h | 20 +- + include/drm/drm_edid.h | 11 +- + include/drm/drm_fb_cma_helper.h | 4 +- + include/drm/drm_fb_helper.h | 19 +- + include/drm/drm_gem.h | 15 - + include/drm/drm_modes.h | 11 + + include/drm/drm_modeset_helper_vtables.h | 109 +- + include/drm/drm_pci.h | 11 +- + include/drm/drm_property.h | 2 + + include/drm/drm_vblank.h | 3 +- + include/drm/tinydrm/tinydrm-helpers.h | 1 + + include/linux/dma-fence.h | 15 +- + include/uapi/drm/qxl_drm.h | 6 +- + 190 files changed, 5308 insertions(+), 1529 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/dw_mipi_dsi.txt + create mode 100644 Documentation/devicetree/bindings/display/repaper.txt + create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c + create mode 100644 drivers/gpu/drm/stm/dw_mipi_dsi-stm.c + create mode 100644 drivers/gpu/drm/tinydrm/repaper.c + create mode 100644 include/drm/bridge/dw_mipi_dsi.h +$ git am -3 ../patches/0001-drm-vblank-fix-for-switch-compat_drm_wait_vblank-to-.patch +Applying: drm/vblank: fix for "switch compat_drm_wait_vblank() to drm_ioctl_kernel()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/drm_ioc32.c +$ git add -A . +$ git commit -v -a --amend +[master fd125793e38c] Merge remote-tracking branch 'drm-misc/for-linux-next' + Date: Wed Jul 19 11:29:12 2017 +1000 +$ git am -3 ../patches/0001-drm-fixes-for-staging-due-to-API-changes-in-the-drm-.patch +Applying: drm: fixes for staging due to API changes in the drm core +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/staging/vboxvideo/vbox_drv.c +$ git add -A . +$ git commit -v -a --amend +[master fbf762afcb51] Merge remote-tracking branch 'drm-misc/for-linux-next' + Date: Wed Jul 19 11:29:12 2017 +1000 +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 (4a630fadbb29 drm/msm: Fix potential buffer overflow issue) +$ git merge drm-msm/msm-next +Already up-to-date. +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 (e40eda3dda1e drm/arm: mali-dp: Use CMA helper for plane buffer address calculation) +$ git merge mali-dp/for-upstream/mali-dp +Already up-to-date. +Merging sunxi-drm/sunxi-drm/for-next (110d33dd428e drm/sun4i: Add compatible for the A10s pipeline) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up-to-date. +Merging imx-drm/imx-drm/next (790cb4c7c954 drm/imx: lock scanout transfers for consecutive bursts) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/ipuv3-plane.c | 53 +++++++++++++++++++++++++++++++-------- + 1 file changed, 42 insertions(+), 11 deletions(-) +Merging etnaviv/etnaviv/next (8cc47b3ea082 drm/etnaviv: populate GEM objects on cpu_prep) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 25 +++++++++++++------------ + 1 file changed, 13 insertions(+), 12 deletions(-) +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (65745e84ee10 Merge remote-tracking branch 'regmap/topic/namespace' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + include/linux/regmap.h | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) +Merging sound/for-next (6c5a266029cc ALSA: hda: constify pci_device_id.) +$ git merge sound/for-next +Merge made by the 'recursive' strategy. + sound/hda/hdac_i915.c | 2 +- + sound/isa/ad1848/ad1848.c | 18 ++++++++------ + sound/isa/als100.c | 13 ++++++----- + sound/isa/cs423x/cs4231.c | 18 ++++++++------ + sound/isa/cs423x/cs4236.c | 20 +++++++++------- + sound/isa/opti9xx/miro.c | 7 +++--- + sound/isa/opti9xx/opti92x-ad1848.c | 14 ++++++----- + sound/pci/mixart/mixart.c | 10 ++++---- + sound/pci/mixart/mixart.h | 4 ---- + sound/pci/pcxhr/pcxhr.c | 19 ++++++++------- + sound/pci/pcxhr/pcxhr.h | 3 +-- + sound/pci/rme9652/hdspm.c | 48 ++++++++++++++++++++++---------------- + 12 files changed, 97 insertions(+), 79 deletions(-) +Merging sound-asoc/for-next (aacda1cc220d Merge remote-tracking branches 'asoc/topic/wm8804' and 'asoc/topic/zte' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/rt274.txt | 33 + + Documentation/devicetree/bindings/sound/rt5663.txt | 5 + + .../devicetree/bindings/sound/tlv320aic32x4.txt | 13 +- + include/sound/rt5663.h | 20 + + include/sound/soc.h | 6 - + include/sound/tlv320aic32x4.h | 23 + + sound/soc/au1x/psc-ac97.c | 2 +- + sound/soc/au1x/psc-i2s.c | 2 +- + sound/soc/codecs/Kconfig | 7 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/adau1977.c | 6 +- + sound/soc/codecs/cs35l33.c | 12 +- + sound/soc/codecs/cs35l34.c | 3 +- + sound/soc/codecs/cs42l42.c | 11 +- + sound/soc/codecs/cs53l30.c | 15 +- + sound/soc/codecs/hdac_hdmi.c | 2 +- + sound/soc/codecs/hdmi-codec.c | 33 +- + sound/soc/codecs/inno_rk3036.c | 2 +- + sound/soc/codecs/max9867.c | 2 +- + sound/soc/codecs/max98926.c | 2 +- + sound/soc/codecs/msm8916-wcd-analog.c | 2 +- + sound/soc/codecs/msm8916-wcd-digital.c | 2 +- + sound/soc/codecs/rt274.c | 1228 ++++++++++++++++++++ + sound/soc/codecs/rt274.h | 217 ++++ + sound/soc/codecs/rt5514-spi.c | 139 +-- + sound/soc/codecs/rt5514-spi.h | 7 +- + sound/soc/codecs/rt5514.c | 51 +- + sound/soc/codecs/rt5616.c | 2 +- + sound/soc/codecs/rt5663.c | 237 +++- + sound/soc/codecs/rt5663.h | 2 + + sound/soc/codecs/rt5665.c | 9 +- + sound/soc/codecs/sta32x.c | 3 +- + sound/soc/codecs/tas5720.c | 2 +- + sound/soc/codecs/tlv320aic32x4-i2c.c | 2 + + sound/soc/codecs/tlv320aic32x4-spi.c | 2 + + sound/soc/codecs/tlv320aic32x4.c | 206 ++++ + sound/soc/codecs/tlv320aic32x4.h | 3 + + sound/soc/codecs/twl6040.c | 4 +- + sound/soc/codecs/wm8804.c | 3 +- + sound/soc/dwc/dwc-i2s.c | 2 +- + sound/soc/fsl/fsl_asrc.c | 2 +- + sound/soc/fsl/fsl_esai.c | 2 +- + sound/soc/fsl/fsl_spdif.c | 2 +- + sound/soc/fsl/imx-ssi.c | 4 + + sound/soc/hisilicon/hi6210-i2s.c | 2 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 6 +- + sound/soc/intel/skylake/skl-messages.c | 10 +- + sound/soc/intel/skylake/skl-pcm.c | 8 +- + sound/soc/kirkwood/kirkwood-i2s.c | 6 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 2 +- + sound/soc/pxa/Kconfig | 1 + + sound/soc/pxa/mmp-sspa.c | 2 +- + sound/soc/samsung/i2s.c | 20 +- + sound/soc/samsung/s3c-i2s-v2.c | 2 +- + sound/soc/sh/fsi.c | 2 +- + sound/soc/sh/rcar/ctu.c | 5 +- + sound/soc/sh/rcar/dvc.c | 5 +- + sound/soc/sh/rcar/mix.c | 5 +- + sound/soc/sh/rcar/src.c | 6 +- + sound/soc/sh/rcar/ssi.c | 6 +- + sound/soc/sh/rcar/ssiu.c | 2 +- + sound/soc/soc-core.c | 25 - + sound/soc/soc-pcm.c | 36 +- + sound/soc/spear/spdif_in.c | 6 +- + sound/soc/sunxi/sun4i-codec.c | 5 +- + sound/soc/sunxi/sun8i-codec.c | 2 +- + sound/soc/tegra/tegra30_i2s.c | 2 +- + sound/soc/ux500/mop500.c | 4 + + sound/soc/zte/zx-i2s.c | 2 +- + sound/soc/zte/zx-spdif.c | 2 +- + sound/soc/zte/zx-tdm.c | 2 +- + 71 files changed, 2191 insertions(+), 319 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/rt274.txt + create mode 100644 include/sound/rt5663.h + create mode 100644 sound/soc/codecs/rt274.c + create mode 100644 sound/soc/codecs/rt274.h +Merging modules/modules-next (5771a8c08880 Linux v4.13-rc1) +$ git merge modules/modules-next +Already up-to-date. +Merging input/next (4323418d62fe Input: sur40 - skip all blobs that are not touches) +$ git merge input/next +Auto-merging drivers/input/mouse/elantech.c +Merge made by the 'recursive' strategy. + drivers/input/input.c | 6 ++-- + drivers/input/keyboard/gpio_keys.c | 2 +- + drivers/input/misc/ims-pcu.c | 4 +-- + drivers/input/misc/yealink.c | 2 +- + drivers/input/mouse/elantech.c | 2 +- + drivers/input/mouse/psmouse-base.c | 2 +- + drivers/input/rmi4/rmi_f01.c | 2 +- + drivers/input/rmi4/rmi_f34.c | 2 +- + drivers/input/serio/serio.c | 4 +-- + drivers/input/tablet/aiptek.c | 2 +- + drivers/input/touchscreen/ads7846.c | 4 +-- + drivers/input/touchscreen/elants_i2c.c | 2 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 2 +- + drivers/input/touchscreen/sur40.c | 46 +++++++++++++++++++----------- + 14 files changed, 48 insertions(+), 34 deletions(-) +Merging block/for-next (3b06b1a7448e Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge block/for-next +Already up-to-date. +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 (4d49f1b4a1fc dm raid: stop using BUG() in __rdev_sectors()) +$ 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 (f6aa1ee22b18 Merge branch 'fixes' into next) +$ git merge mmc/next +Auto-merging include/linux/platform_data/hsmmc-omap.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/renesas,mmcif.txt | 3 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 1 + + arch/arm/mach-omap2/hsmmc.c | 239 +----------------- + arch/arm/mach-omap2/hsmmc.h | 9 - + drivers/mmc/core/block.c | 2 - + drivers/mmc/core/mmc_ops.c | 2 +- + drivers/mmc/host/Kconfig | 21 +- + drivers/mmc/host/Makefile | 8 +- + drivers/mmc/host/android-goldfish.c | 8 +- + drivers/mmc/host/atmel-mci.c | 6 +- + drivers/mmc/host/mtk-sd.c | 1 + + drivers/mmc/host/mxcmmc.c | 9 +- + drivers/mmc/host/omap_hsmmc.c | 19 +- + drivers/mmc/host/renesas_sdhi.h | 2 + + drivers/mmc/host/renesas_sdhi_core.c | 24 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 271 +++++++++++++++++++++ + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 8 +- + drivers/mmc/host/rtsx_usb_sdmmc.c | 2 +- + drivers/mmc/host/sdhci-of-at91.c | 177 +++++++++----- + drivers/mmc/host/sdhci-st.c | 26 +- + drivers/mmc/host/sdhci-xenon.c | 2 - + drivers/mmc/host/sunxi-mmc.c | 8 +- + drivers/mmc/host/tmio_mmc.h | 9 +- + drivers/mmc/host/tmio_mmc_core.c | 32 ++- + include/linux/mfd/tmio.h | 2 + + include/linux/platform_data/hsmmc-omap.h | 10 - + 26 files changed, 514 insertions(+), 387 deletions(-) + create mode 100644 drivers/mmc/host/renesas_sdhi_internal_dmac.c +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 (90e5fed8cd2b md/raid1: fix writebehind bio clone) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + drivers/md/md.h | 54 ---------------------------------- + drivers/md/raid1-10.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++ + drivers/md/raid1.c | 61 ++++++++++---------------------------- + drivers/md/raid10.c | 19 ++++-------- + 4 files changed, 103 insertions(+), 112 deletions(-) + create mode 100644 drivers/md/raid1-10.c +Merging mfd/for-mfd-next (48a14b9f0cc6 mfd: max8998: Fix potential NULL pointer dereference) +$ git merge mfd/for-mfd-next +Auto-merging drivers/mfd/twl4030-irq.c +Auto-merging drivers/mfd/rtsx_pcr.c +Merge made by the 'recursive' strategy. + drivers/mfd/da9052-core.c | 2 ++ + drivers/mfd/max8925-i2c.c | 2 +- + drivers/mfd/max8998.c | 6 ++---- + drivers/mfd/rtsx_pcr.c | 4 ++-- + drivers/mfd/twl-core.c | 4 ++-- + drivers/mfd/twl4030-irq.c | 2 +- + 6 files changed, 10 insertions(+), 10 deletions(-) +Merging backlight/for-backlight-next (8c03a937ca99 backlight: pwm_bl: Make of_device_ids const) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/lm3630a_bl.c | 5 +++-- + drivers/video/backlight/pwm_bl.c | 2 +- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging battery/for-next (5771a8c08880 Linux v4.13-rc1) +$ 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 (048e9b36c5c4 Merge remote-tracking branches 'regulator/topic/cpcap' and 'regulator/topic/qcom' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/axp20x-regulator.c | 6 ++++++ + drivers/regulator/cpcap-regulator.c | 21 ++++++++++++++++++--- + drivers/regulator/qcom_rpm-regulator.c | 5 +++++ + drivers/regulator/qcom_smd-regulator.c | 5 +++++ + 4 files changed, 34 insertions(+), 3 deletions(-) +Merging security/next (3cf299314532 LSM: Remove security_task_create() hook.) +$ git merge security/next +Auto-merging kernel/fork.c +Auto-merging include/linux/lsm_hooks.h +Merge made by the 'recursive' strategy. + include/linux/lsm_hooks.h | 7 ------- + include/linux/security.h | 6 ------ + kernel/fork.c | 4 ---- + security/security.c | 5 ----- + 4 files changed, 22 deletions(-) +Merging integrity/next (fc26bd50539b IMA: update IMA policy documentation to include pcr= option) +$ 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 (12f6dc2696a5 selinux: Assign proper class to PF_UNIX/SOCK_RAW sockets) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'recursive' strategy. + security/selinux/hooks.c | 1 + + 1 file changed, 1 insertion(+) +Merging tpmdd/next (e7d872bf1bc5 Documentation: tpm: add powered-while-suspended binding documentation) +$ git merge tpmdd/next +Auto-merging drivers/char/tpm/tpm_crb.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/security/tpm/tpm-i2c.txt | 6 ++++++ + drivers/char/tpm/tpm_crb.c | 2 +- + 2 files changed, 7 insertions(+), 1 deletion(-) +Merging watchdog/master (c013b65ad8a1 watchdog: introduce watchdog_worker_should_ping helper) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (6a7086431fa1 Merge branches 'iommu/fixes', 'arm/rockchip', 'arm/renesas', 'arm/smmu', 'arm/core', 'x86/vt-d', 'x86/amd', 's390' and 'core' into next) +$ git merge iommu/next +Already up-to-date. +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (7f56c30bd0a2 vfio: Remove unnecessary uses of vfio_container.group_lock) +$ 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 (15318a9f8015 audit: Reduce overhead using a coarse clock) +$ git merge audit/next +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.c +Merge made by the 'recursive' strategy. + kernel/audit.c | 2 +- + kernel/auditsc.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging devicetree/for-next (0d638a07d3a1 of: Convert to using %pOF instead of full_name) +$ git merge devicetree/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/silabs,si5351.txt | 6 +- + .../devicetree/bindings/clock/ti,sci-clk.txt | 7 +-- + .../devicetree/bindings/input/ti,drv260x.txt | 2 +- + .../devicetree/bindings/nvmem/mtk-efuse.txt | 5 +- + .../devicetree/bindings/trivial-devices.txt | 10 ++++ + drivers/of/address.c | 21 ++++--- + drivers/of/base.c | 22 +++---- + drivers/of/device.c | 2 +- + drivers/of/dynamic.c | 33 ++++++----- + drivers/of/irq.c | 10 ++-- + drivers/of/of_mdio.c | 4 +- + drivers/of/of_pci.c | 29 +++++----- + drivers/of/overlay.c | 21 ++++--- + drivers/of/platform.c | 32 +++++------ + drivers/of/property.c | 19 +++--- + drivers/of/unittest.c | 67 +++++++++++++--------- + 16 files changed, 156 insertions(+), 134 deletions(-) +Merging mailbox/mailbox-for-next (25bfee16d5a3 mailbox: Introduce Qualcomm APCS IPC driver) +$ git merge mailbox/mailbox-for-next +Already up-to-date. +Merging spi/for-next (a03460063360 Merge remote-tracking branch 'spi/topic/sh-msiof' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/fsl-imx-cspi.txt | 1 + + Documentation/devicetree/bindings/spi/sh-msiof.txt | 1 + + drivers/spi/spi-ath79.c | 13 +++-- + drivers/spi/spi-bcm63xx-hsspi.c | 6 +-- + drivers/spi/spi-imx.c | 47 ++++++++++++++--- + drivers/spi/spi-loopback-test.c | 28 +++++++--- + drivers/spi/spi-pxa2xx.c | 59 ++++++++-------------- + drivers/spi/spi-sh-msiof.c | 32 ++++++++---- + 8 files changed, 116 insertions(+), 71 deletions(-) +Merging tip/auto-latest (55b6cc21521f Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Auto-merging include/linux/syscalls.h +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 13 + + Documentation/x86/amd-memory-encryption.txt | 68 +++ + MAINTAINERS | 6 +- + arch/arm/include/asm/thread_info.h | 15 +- + arch/arm/include/asm/uaccess.h | 2 + + arch/arm/kernel/entry-common.S | 9 +- + arch/arm/kernel/signal.c | 5 + + arch/arm64/include/asm/thread_info.h | 4 +- + arch/arm64/include/asm/uaccess.h | 3 + + arch/arm64/kernel/signal.c | 5 + + arch/ia64/include/asm/acpi.h | 2 - + arch/ia64/kernel/efi.c | 4 +- + arch/x86/Kconfig | 29 ++ + arch/x86/Kconfig.debug | 2 - + arch/x86/Makefile | 15 +- + arch/x86/boot/compressed/kaslr.c | 63 +-- + arch/x86/boot/compressed/pagetable.c | 7 + + arch/x86/entry/Makefile | 1 - + arch/x86/entry/calling.h | 5 + + arch/x86/entry/common.c | 3 + + arch/x86/entry/entry_64.S | 170 +++++-- + arch/x86/events/intel/core.c | 158 ++++++ + arch/x86/events/intel/cstate.c | 26 +- + arch/x86/events/intel/ds.c | 8 + + arch/x86/events/perf_event.h | 2 + + arch/x86/include/asm/acpi.h | 2 - + arch/x86/include/asm/cmdline.h | 2 + + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/disabled-features.h | 4 +- + arch/x86/include/asm/dma-mapping.h | 5 +- + arch/x86/include/asm/dmi.h | 8 +- + arch/x86/include/asm/e820/api.h | 2 + + arch/x86/include/asm/fixmap.h | 20 + + arch/x86/include/asm/init.h | 1 + + arch/x86/include/asm/io.h | 8 + + arch/x86/include/asm/kexec.h | 8 + + arch/x86/include/asm/kvm_host.h | 2 +- + arch/x86/include/asm/mem_encrypt.h | 80 +++ + arch/x86/include/asm/mmu.h | 25 +- + arch/x86/include/asm/mmu_context.h | 14 +- + arch/x86/include/asm/msr-index.h | 2 + + arch/x86/include/asm/orc_types.h | 107 ++++ + arch/x86/include/asm/page_types.h | 3 +- + arch/x86/include/asm/pgtable.h | 28 +- + arch/x86/include/asm/pgtable_types.h | 57 ++- + arch/x86/include/asm/processor-flags.h | 5 +- + arch/x86/include/asm/processor.h | 11 +- + arch/x86/include/asm/realmode.h | 12 + + arch/x86/include/asm/set_memory.h | 3 + + arch/x86/include/asm/thread_info.h | 5 +- + arch/x86/include/asm/tlbflush.h | 73 ++- + arch/x86/include/asm/uaccess.h | 7 +- + arch/x86/include/asm/unwind_hints.h | 103 ++++ + arch/x86/include/asm/vga.h | 14 +- + arch/x86/kernel/acpi/boot.c | 6 +- + arch/x86/kernel/cpu/amd.c | 30 +- + arch/x86/kernel/cpu/bugs.c | 8 + + arch/x86/kernel/cpu/common.c | 40 ++ + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/dumpstack.c | 12 +- + arch/x86/kernel/dumpstack_32.c | 4 +- + arch/x86/kernel/dumpstack_64.c | 4 +- + arch/x86/kernel/e820.c | 26 +- + arch/x86/kernel/espfix_64.c | 2 +- + arch/x86/kernel/head64.c | 93 +++- + arch/x86/kernel/head_64.S | 40 +- + arch/x86/kernel/kdebugfs.c | 34 +- + arch/x86/kernel/ksysfs.c | 28 +- + arch/x86/kernel/machine_kexec_64.c | 22 +- + arch/x86/kernel/mpparse.c | 108 +++-- + arch/x86/kernel/pci-dma.c | 11 +- + arch/x86/kernel/pci-nommu.c | 2 +- + arch/x86/kernel/pci-swiotlb.c | 15 +- + arch/x86/kernel/process.c | 17 +- + arch/x86/kernel/process_64.c | 3 + + arch/x86/kernel/setup.c | 9 + + arch/x86/kvm/mmu.c | 11 +- + arch/x86/kvm/mmu.h | 2 +- + arch/x86/kvm/svm.c | 35 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/kvm/x86.c | 3 +- + arch/x86/lib/cmdline.c | 105 ++++ + arch/x86/mm/Makefile | 2 + + arch/x86/mm/ident_map.c | 12 +- + arch/x86/mm/init.c | 1 - + arch/x86/mm/ioremap.c | 287 ++++++++++- + arch/x86/mm/kasan_init_64.c | 6 +- + arch/x86/mm/mem_encrypt.c | 593 +++++++++++++++++++++++ + arch/x86/mm/mem_encrypt_boot.S | 149 ++++++ + arch/x86/mm/numa_emulation.c | 55 ++- + arch/x86/mm/pageattr.c | 67 +++ + arch/x86/mm/pat.c | 9 +- + arch/x86/mm/tlb.c | 281 +++++++---- + arch/x86/pci/common.c | 4 +- + arch/x86/platform/efi/efi.c | 6 +- + arch/x86/platform/efi/efi_64.c | 15 +- + arch/x86/platform/uv/tlb_uv.c | 6 +- + arch/x86/realmode/init.c | 12 + + arch/x86/realmode/rm/trampoline_64.S | 24 + + arch/x86/xen/enlighten_pv.c | 7 + + arch/x86/xen/mmu_pv.c | 5 +- + drivers/acpi/processor_idle.c | 2 - + drivers/clocksource/timer-of.c | 12 +- + drivers/firmware/dmi-sysfs.c | 5 +- + drivers/firmware/efi/efi.c | 33 ++ + drivers/firmware/pcdp.c | 4 +- + drivers/gpu/drm/drm_gem.c | 2 + + drivers/gpu/drm/drm_vm.c | 4 + + drivers/gpu/drm/ttm/ttm_bo_vm.c | 7 +- + drivers/gpu/drm/udl/udl_fb.c | 4 + + drivers/idle/intel_idle.c | 9 +- + drivers/iommu/amd_iommu.c | 30 +- + drivers/iommu/amd_iommu_init.c | 34 +- + drivers/iommu/amd_iommu_proto.h | 10 + + drivers/iommu/amd_iommu_types.h | 2 +- + drivers/irqchip/irq-mips-gic.c | 2 - + drivers/sfi/sfi_core.c | 22 +- + drivers/video/fbdev/core/fbmem.c | 12 + + include/asm-generic/early_ioremap.h | 2 + + include/asm-generic/pgtable.h | 12 + + include/linux/compiler-gcc.h | 2 + + include/linux/compiler.h | 4 + + include/linux/dma-mapping.h | 13 + + include/linux/efi.h | 9 +- + include/linux/io.h | 2 + + include/linux/kexec.h | 8 + + include/linux/mem_encrypt.h | 48 ++ + include/linux/swiotlb.h | 1 + + include/linux/syscalls.h | 16 + + init/main.c | 10 + + kernel/events/core.c | 21 - + kernel/irq/chip.c | 10 - + kernel/irq/internals.h | 10 + + kernel/irq/pm.c | 2 + + kernel/kexec_core.c | 12 +- + kernel/locking/rtmutex.c | 1 - + kernel/memremap.c | 20 +- + kernel/sched/cputime.c | 6 +- + kernel/sched/deadline.c | 14 +- + lib/swiotlb.c | 57 ++- + mm/early_ioremap.c | 28 +- + tools/objtool/Build | 3 + + tools/objtool/Documentation/stack-validation.txt | 56 +-- + tools/objtool/Makefile | 3 + + tools/objtool/builtin-check.c | 2 +- + tools/objtool/builtin-orc.c | 70 +++ + tools/objtool/builtin.h | 1 + + tools/objtool/check.c | 249 +++++++++- + tools/objtool/check.h | 19 +- + tools/objtool/elf.c | 212 +++++++- + tools/objtool/elf.h | 15 +- + tools/objtool/objtool.c | 3 +- + tools/objtool/orc.h | 30 ++ + tools/objtool/orc_dump.c | 212 ++++++++ + tools/objtool/orc_gen.c | 214 ++++++++ + tools/objtool/orc_types.h | 107 ++++ + tools/perf/ui/browser.c | 2 +- + tools/perf/util/evsel.c | 8 +- + tools/perf/util/machine.c | 2 +- + 159 files changed, 4530 insertions(+), 631 deletions(-) + create mode 100644 Documentation/x86/amd-memory-encryption.txt + create mode 100644 arch/x86/include/asm/mem_encrypt.h + create mode 100644 arch/x86/include/asm/orc_types.h + create mode 100644 arch/x86/include/asm/unwind_hints.h + create mode 100644 arch/x86/mm/mem_encrypt.c + create mode 100644 arch/x86/mm/mem_encrypt_boot.S + create mode 100644 include/linux/mem_encrypt.h + create mode 100644 tools/objtool/builtin-orc.c + create mode 100644 tools/objtool/orc.h + create mode 100644 tools/objtool/orc_dump.c + create mode 100644 tools/objtool/orc_gen.c + create mode 100644 tools/objtool/orc_types.h +Merging clockevents/clockevents/next (2287d8664fe7 timers: Make the cpu base lock raw) +$ git merge clockevents/clockevents/next +Already up-to-date. +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 (c54182ec0e15 EDAC: Get rid of mci->mod_ver) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/altera_edac.c | 2 -- + drivers/edac/amd64_edac.c | 1 - + drivers/edac/amd76x_edac.c | 2 -- + drivers/edac/cpc925_edac.c | 1 - + drivers/edac/e752x_edac.c | 2 -- + drivers/edac/e7xxx_edac.c | 2 -- + drivers/edac/edac_mc_sysfs.c | 6 +++--- + drivers/edac/ghes_edac.c | 3 --- + drivers/edac/highbank_mc_edac.c | 1 - + drivers/edac/i3000_edac.c | 3 --- + drivers/edac/i3200_edac.c | 3 --- + drivers/edac/i5000_edac.c | 1 - + drivers/edac/i5100_edac.c | 1 - + drivers/edac/i5400_edac.c | 1 - + drivers/edac/i7300_edac.c | 1 - + drivers/edac/i7core_edac.c | 5 ++--- + drivers/edac/i82443bxgx_edac.c | 3 --- + drivers/edac/i82860_edac.c | 2 -- + drivers/edac/i82875p_edac.c | 2 -- + drivers/edac/i82975x_edac.c | 2 -- + drivers/edac/ie31200_edac.c | 2 -- + drivers/edac/mce_amd.c | 6 +----- + drivers/edac/mv64x60_edac.c | 1 - + drivers/edac/ppc4xx_edac.c | 1 - + drivers/edac/r82600_edac.c | 2 -- + drivers/edac/sb_edac.c | 1 - + drivers/edac/skx_edac.c | 3 --- + drivers/edac/synopsys_edac.c | 1 - + drivers/edac/thunderx_edac.c | 1 - + drivers/edac/x38_edac.c | 3 --- + drivers/edac/xgene_edac.c | 1 - + include/linux/edac.h | 1 - + 32 files changed, 6 insertions(+), 61 deletions(-) +Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge irqchip/irqchip/for-next +Already up-to-date. +Merging ftrace/for-next (2e028c4fe129 ftrace: Fix uninitialized variable in match_records()) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (ff6af1b92751 sys_membarrier: Add expedited option) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot +Removing kernel/rcu/tiny_plugin.h +Auto-merging kernel/cpu.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/RCU/checklist.txt | 121 +++++++---- + Documentation/RCU/rcu.txt | 9 +- + Documentation/RCU/rcu_dereference.txt | 61 ++---- + Documentation/RCU/rcubarrier.txt | 5 + + Documentation/RCU/torture.txt | 20 +- + Documentation/RCU/whatisRCU.txt | 5 +- + Documentation/admin-guide/kernel-parameters.txt | 7 +- + Documentation/core-api/kernel-api.rst | 49 +++++ + Documentation/memory-barriers.txt | 41 ++-- + arch/blackfin/kernel/module.c | 39 ++-- + include/linux/init_task.h | 8 +- + include/linux/rcupdate.h | 15 +- + include/linux/rcutiny.h | 8 +- + include/linux/sched.h | 8 +- + include/linux/srcutiny.h | 13 ++ + include/linux/srcutree.h | 3 +- + include/linux/swait.h | 55 +++++ + include/trace/events/rcu.h | 7 +- + include/uapi/linux/membarrier.h | 11 + + kernel/cpu.c | 1 + + kernel/exit.c | 7 +- + kernel/membarrier.c | 7 +- + kernel/rcu/Kconfig | 3 +- + kernel/rcu/rcu.h | 128 ++--------- + kernel/rcu/rcu_segcblist.c | 108 +++------- + kernel/rcu/rcu_segcblist.h | 28 +-- + kernel/rcu/rcuperf.c | 17 +- + kernel/rcu/rcutorture.c | 70 +----- + kernel/rcu/srcutiny.c | 8 + + kernel/rcu/srcutree.c | 50 ++++- + kernel/rcu/tiny.c | 2 - + kernel/rcu/tiny_plugin.h | 47 ---- + kernel/rcu/tree.c | 236 ++++++++------------ + kernel/rcu/tree.h | 15 +- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 238 ++++++++++++--------- + kernel/rcu/update.c | 18 +- + kernel/sched/core.c | 10 +- + kernel/torture.c | 2 +- + .../selftests/rcutorture/bin/config_override.sh | 61 ++++++ + .../testing/selftests/rcutorture/bin/functions.sh | 27 ++- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 11 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 58 ++--- + tools/testing/selftests/rcutorture/bin/kvm.sh | 34 ++- + .../selftests/rcutorture/configs/rcu/BUSTED.boot | 2 +- + .../selftests/rcutorture/configs/rcu/SRCU-C.boot | 1 - + .../selftests/rcutorture/configs/rcu/SRCU-u | 3 +- + .../selftests/rcutorture/configs/rcu/TREE01.boot | 2 +- + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 2 +- + 49 files changed, 867 insertions(+), 816 deletions(-) + delete mode 100644 kernel/rcu/tiny_plugin.h + create mode 100755 tools/testing/selftests/rcutorture/bin/config_override.sh + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot +Merging kvm/linux-next (d3457c877b14 kvm: x86: hyperv: make VP_INDEX managed by userspace) +$ git merge kvm/linux-next +Already up-to-date. +Merging kvm-arm/next (d38338e396ee arm64: Remove a redundancy in sysreg.h) +$ 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 (8b24e69fc47e KVM: PPC: Book3S HV: Close race with testing for signals on guest entry) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (d52cd2076eb2 KVM: s390: Inject machine check into the nested guest) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (764ffce17fd5 xen/balloon: don't online new memory initially) +$ git merge xen-tip/linux-next +Merge made by the 'recursive' strategy. + arch/x86/xen/smp_pv.c | 3 +- + arch/x86/xen/time.c | 1 - + drivers/xen/Kconfig | 12 + + drivers/xen/Makefile | 1 + + drivers/xen/balloon.c | 3 + + drivers/xen/grant-table.c | 9 +- + drivers/xen/pvcalls-back.c | 1236 ++++++++++++++++++++++++++++++++++++ + drivers/xen/xen-balloon.c | 22 +- + include/xen/balloon.h | 8 + + include/xen/interface/io/pvcalls.h | 121 ++++ + include/xen/interface/io/ring.h | 2 + + 11 files changed, 1405 insertions(+), 13 deletions(-) + create mode 100644 drivers/xen/pvcalls-back.c + create mode 100644 include/xen/interface/io/pvcalls.h +Merging percpu/for-next (9c01516278ef percpu: update the header comment and pcpu_build_alloc_info comments) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + mm/percpu-internal.h | 1 + + mm/percpu-stats.c | 11 +++++----- + mm/percpu.c | 60 +++++++++++++++++++++++++++++----------------------- + 3 files changed, 40 insertions(+), 32 deletions(-) +Merging workqueues/for-next (0e0cafcda839 workqueue: doc change for ST behavior on NUMA systems) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + Documentation/core-api/workqueue.rst | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) +Merging drivers-x86/for-next (5771a8c08880 Linux v4.13-rc1) +$ git merge drivers-x86/for-next +Already up-to-date. +Merging chrome-platform/for-next (3c778a7fcfaa platform/chrome : Add myself as Maintainer) +$ git merge chrome-platform/for-next +Already up-to-date. +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 (c68729119f4d leds: tlc591xx: add missing of_node_put) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + drivers/leds/leds-tlc591xx.c | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) +Merging ipmi/for-next (4495ec6d770e ipmi:ssif: Add missing unlock in error branch) +$ git merge ipmi/for-next +Already up-to-date. +Merging driver-core/driver-core-next (d8bcf4db9244 arch_topology: Get rid of cap_parsing_done) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + drivers/base/arch_topology.c | 78 +++++++++++++++++++++---------------------- + include/linux/arch_topology.h | 4 ++- + include/linux/debugfs.h | 16 +++++++++ + 3 files changed, 58 insertions(+), 40 deletions(-) +Merging usb/usb-next (5771a8c08880 Linux v4.13-rc1) +$ git merge usb/usb-next +Already up-to-date. +Merging usb-gadget/next (5771a8c08880 Linux v4.13-rc1) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (5771a8c08880 Linux v4.13-rc1) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (b74c43156c0c usb: chipidea: msm: ci_hdrc_msm_probe() missing of_node_get()) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_msm.c | 2 +- + drivers/usb/chipidea/udc.c | 5 +---- + 2 files changed, 2 insertions(+), 5 deletions(-) +Merging phy-next/next (af850e14a7ae phy: bcm-ns-usb3: add MDIO driver using proper bus layer) +$ git merge phy-next/next +Already up-to-date. +Merging tty/tty-next (5771a8c08880 Linux v4.13-rc1) +$ git merge tty/tty-next +Already up-to-date. +Merging char-misc/char-misc-next (34d1dc17ce97 fpga manager: Add Altera CvP driver) +$ git merge char-misc/char-misc-next +Auto-merging include/linux/fs.h +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-altera-cvp | 8 + + Documentation/admin-guide/devices.txt | 5 + + .../bindings/fpga/altera-passive-serial.txt | 29 + + .../bindings/fpga/xilinx-pr-decoupler.txt | 36 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/arm/boot/dts/imx6q-evi.dts | 16 + + arch/x86/Kbuild | 2 +- + arch/x86/include/asm/mshyperv.h | 9 +- + arch/x86/kernel/cpu/mshyperv.c | 12 +- + block/genhd.c | 18 +- + drivers/android/Makefile | 2 +- + drivers/android/binder.c | 3455 +++++++++++++------- + drivers/android/binder_alloc.c | 802 +++++ + drivers/android/binder_alloc.h | 163 + + drivers/android/binder_trace.h | 41 +- + drivers/auxdisplay/panel.c | 6 +- + drivers/char/mwave/smapi.c | 48 +- + drivers/char/ppdev.c | 3 - + drivers/fpga/Kconfig | 20 +- + drivers/fpga/Makefile | 2 + + drivers/fpga/altera-cvp.c | 500 +++ + drivers/fpga/altera-ps-spi.c | 308 ++ + drivers/hv/ring_buffer.c | 169 +- + drivers/misc/aspeed-lpc-snoop.c | 34 +- + drivers/misc/mei/hw-me.c | 45 +- + drivers/misc/mei/hw-me.h | 39 +- + drivers/misc/mei/pci-me.c | 109 +- + fs/char_dev.c | 58 +- + fs/proc/devices.c | 8 +- + include/linux/bitrev.h | 19 + + include/linux/fpga/fpga-mgr.h | 4 + + include/linux/fs.h | 10 +- + include/linux/hyperv.h | 65 - + 33 files changed, 4493 insertions(+), 1553 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-altera-cvp + create mode 100644 Documentation/devicetree/bindings/fpga/altera-passive-serial.txt + create mode 100644 Documentation/devicetree/bindings/fpga/xilinx-pr-decoupler.txt + create mode 100644 drivers/android/binder_alloc.c + create mode 100644 drivers/android/binder_alloc.h + create mode 100644 drivers/fpga/altera-cvp.c + create mode 100644 drivers/fpga/altera-ps-spi.c +Merging extcon/extcon-next (5c27036d2b05 extcon: Convert to using %pOF instead of full_name) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + .../bindings/extcon/extcon-usbc-cros-ec.txt | 24 ++ + drivers/extcon/Kconfig | 7 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-intel-int3496.c | 2 +- + drivers/extcon/extcon-usbc-cros-ec.c | 415 +++++++++++++++++++++ + drivers/extcon/extcon.c | 4 +- + include/linux/mfd/cros_ec_commands.h | 75 ++++ + 7 files changed, 525 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-usbc-cros-ec.txt + create mode 100644 drivers/extcon/extcon-usbc-cros-ec.c +Merging staging/staging-next (d56c160cb625 staging: lustre: fix spelling mistake, "grranted" -> "granted") +$ git merge staging/staging-next +Recorded preimage for 'drivers/staging/Kconfig' +Recorded preimage for 'drivers/staging/Makefile' +Removing drivers/staging/ccree/ssi_fips_local.h +Removing drivers/staging/ccree/ssi_fips_local.c +Removing drivers/staging/ccree/ssi_fips_ll.c +Removing drivers/staging/ccree/ssi_fips_ext.c +Removing drivers/staging/ccree/ssi_fips_data.h +Auto-merging drivers/staging/Makefile +CONFLICT (content): Merge conflict in drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/staging/Kconfig'. +Recorded resolution for 'drivers/staging/Makefile'. +[master 360b2975f5d3] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + drivers/staging/Kconfig | 2 + + drivers/staging/Makefile | 1 + + drivers/staging/android/ion/ion.h | 12 +- + drivers/staging/android/ion/ion_cma_heap.c | 5 +- + drivers/staging/android/ion/ion_system_heap.c | 2 - + drivers/staging/ccree/Kconfig | 9 - + drivers/staging/ccree/Makefile | 2 +- + drivers/staging/ccree/cc_hw_queue_defs.h | 3 +- + drivers/staging/ccree/ssi_aead.c | 193 +-- + drivers/staging/ccree/ssi_aead.h | 12 +- + drivers/staging/ccree/ssi_buffer_mgr.c | 433 ++--- + drivers/staging/ccree/ssi_cipher.c | 125 +- + drivers/staging/ccree/ssi_driver.c | 57 +- + drivers/staging/ccree/ssi_driver.h | 1 - + drivers/staging/ccree/ssi_fips.c | 119 +- + drivers/staging/ccree/ssi_fips.h | 58 +- + drivers/staging/ccree/ssi_fips_data.h | 306 ---- + drivers/staging/ccree/ssi_fips_ext.c | 92 -- + drivers/staging/ccree/ssi_fips_ll.c | 1649 -------------------- + drivers/staging/ccree/ssi_fips_local.c | 357 ----- + drivers/staging/ccree/ssi_fips_local.h | 67 - + drivers/staging/ccree/ssi_hash.c | 150 +- + drivers/staging/ccree/ssi_ivgen.c | 5 +- + drivers/staging/ccree/ssi_request_mgr.c | 48 +- + drivers/staging/ccree/ssi_sram_mgr.c | 6 +- + drivers/staging/ccree/ssi_sysfs.c | 80 +- + drivers/staging/comedi/comedi_buf.c | 2 +- + drivers/staging/fbtft/fb_st7789v.c | 2 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c | 2 - + drivers/staging/greybus/arche-platform.c | 11 +- + drivers/staging/greybus/tools/loopback_test.c | 13 +- + drivers/staging/ks7010/ks_wlan_net.c | 2 +- + .../staging/lustre/include/linux/lnet/lib-lnet.h | 3 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 46 +- + drivers/staging/lustre/include/linux/lnet/lnetst.h | 129 +- + .../staging/lustre/include/linux/lnet/socklnd.h | 3 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 11 - + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 20 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 5 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 3 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 9 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 5 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 2 +- + .../Documentation/devicetree/pi433-overlay.dts | 53 + + .../pi433/Documentation/devicetree/pi433.txt | 62 + + drivers/staging/pi433/Documentation/pi433.txt | 274 ++++ + drivers/staging/pi433/Kconfig | 16 + + drivers/staging/pi433/Makefile | 3 + + drivers/staging/pi433/TODO | 5 + + drivers/staging/pi433/pi433_if.c | 1314 ++++++++++++++++ + drivers/staging/pi433/pi433_if.h | 152 ++ + drivers/staging/pi433/rf69.c | 982 ++++++++++++ + drivers/staging/pi433/rf69.h | 82 + + drivers/staging/pi433/rf69_enum.h | 201 +++ + drivers/staging/pi433/rf69_registers.h | 489 ++++++ + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 78 +- + drivers/staging/rtl8192u/r8192U_core.c | 23 +- + drivers/staging/rtl8192u/r8192U_hw.h | 11 +- + drivers/staging/rtl8712/mlme_linux.c | 4 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 2 +- + drivers/staging/rtl8712/rtl8712_efuse.c | 2 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 8 +- + drivers/staging/rtl8723bs/core/rtw_btcoex.c | 2 +- + drivers/staging/typec/tcpm.c | 3 +- + drivers/staging/unisys/include/channel.h | 291 ++-- + drivers/staging/unisys/include/iochannel.h | 505 +++--- + drivers/staging/unisys/include/visorbus.h | 2 +- + drivers/staging/unisys/visorbus/controlvmchannel.h | 689 ++++---- + drivers/staging/unisys/visorbus/vbuschannel.h | 91 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 102 +- + drivers/staging/unisys/visorbus/visorchannel.c | 28 +- + drivers/staging/unisys/visorbus/visorchipset.c | 18 +- + drivers/staging/unisys/visorbus/vmcallinterface.h | 56 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 358 +++-- + .../staging/unisys/visorinput/ultrainputreport.h | 65 +- + drivers/staging/unisys/visorinput/visorinput.c | 20 +- + drivers/staging/unisys/visornic/visornic_main.c | 98 +- + drivers/staging/vt6656/device.h | 2 +- + drivers/staging/vt6656/firmware.c | 2 +- + drivers/staging/vt6656/key.h | 2 +- + drivers/staging/vt6656/main_usb.c | 5 +- + drivers/staging/vt6656/power.c | 6 +- + drivers/staging/vt6656/rf.c | 6 +- + drivers/staging/vt6656/usbpipe.c | 4 +- + drivers/staging/wilc1000/host_interface.c | 4 +- + drivers/staging/wilc1000/linux_wlan.c | 3 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 65 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 4 +- + 88 files changed, 5899 insertions(+), 4355 deletions(-) + delete mode 100644 drivers/staging/ccree/ssi_fips_data.h + delete mode 100644 drivers/staging/ccree/ssi_fips_ext.c + delete mode 100644 drivers/staging/ccree/ssi_fips_ll.c + delete mode 100644 drivers/staging/ccree/ssi_fips_local.c + delete mode 100644 drivers/staging/ccree/ssi_fips_local.h + create mode 100644 drivers/staging/pi433/Documentation/devicetree/pi433-overlay.dts + create mode 100644 drivers/staging/pi433/Documentation/devicetree/pi433.txt + create mode 100644 drivers/staging/pi433/Documentation/pi433.txt + create mode 100644 drivers/staging/pi433/Kconfig + create mode 100644 drivers/staging/pi433/Makefile + create mode 100644 drivers/staging/pi433/TODO + create mode 100644 drivers/staging/pi433/pi433_if.c + create mode 100644 drivers/staging/pi433/pi433_if.h + create mode 100644 drivers/staging/pi433/rf69.c + create mode 100644 drivers/staging/pi433/rf69.h + create mode 100644 drivers/staging/pi433/rf69_enum.h + create mode 100644 drivers/staging/pi433/rf69_registers.h +Merging mux/for-next (a351e9b9fc24 Linux 4.11) +$ git merge mux/for-next +Already up-to-date. +Merging slave-dma/next (5771a8c08880 Linux v4.13-rc1) +$ git merge slave-dma/next +Already up-to-date. +Merging cgroup/for-next (8b4950c0eab6 Merge branch 'for-4.13-fixes' into for-next) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + Documentation/cgroup-v2.txt | 3 - + include/linux/cgroup-defs.h | 13 ++-- + include/linux/cgroup.h | 2 +- + kernel/cgroup/cgroup-internal.h | 3 + + kernel/cgroup/cgroup.c | 130 ++++++++++++++++++++-------------------- + 5 files changed, 77 insertions(+), 74 deletions(-) +Merging scsi/for-next (14074aba4bcd scsi: sg: fix static checker warning in sg_is_valid_dxfer) +$ git merge scsi/for-next +Merge made by the 'recursive' strategy. + drivers/scsi/hpsa.c | 2 +- + drivers/scsi/sg.c | 7 +++++-- + drivers/scsi/smartpqi/smartpqi.h | 2 +- + 3 files changed, 7 insertions(+), 4 deletions(-) +Merging scsi-mkp/for-next (6f37e2102778 scsi: libfc: pass an error pointer to fc_disc_error()) +$ git merge scsi-mkp/for-next +Already up-to-date. +Merging target-updates/for-next (138d351eefb7 iscsi-target: Add login_keys_workaround attribute for non RFC initiators) +$ git merge target-updates/for-next +Already up-to-date. +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 (6410866c9255 Merge branch 'for-4.14' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/ata/sata_rcar.txt | 14 +++++++++++--- + drivers/ata/Kconfig | 4 ++-- + drivers/ata/libata-core.c | 6 +++--- + drivers/ata/libata-eh.c | 3 +-- + drivers/ata/sata_rcar.c | 8 ++++++++ + drivers/ata/sata_svw.c | 2 +- + include/linux/libata.h | 2 +- + 7 files changed, 27 insertions(+), 12 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 (e41b1355508d virtio_balloon: disable VIOMMU support) +$ git merge vhost/linux-next +Already up-to-date. +Merging rpmsg/for-next (9ef2b6cc595a 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 (8d2c6297aec9 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Resolved 'drivers/gpio/gpio-mvebu.c' using previous resolution. +Auto-merging drivers/gpio/gpio-mvebu.c +CONFLICT (content): Merge conflict in drivers/gpio/gpio-mvebu.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4d146ef9493d] Merge remote-tracking branch 'gpio/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging pinctrl/for-next (ece5946c2eed Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Merge made by the 'recursive' strategy. +Merging pinctrl-samsung/for-next (4460dc21cbaf pinctrl: samsung: Use define from dt-bindings for pin mux function) +$ git merge pinctrl-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 14 ++++++----- + drivers/pinctrl/samsung/pinctrl-exynos.h | 1 - + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 37 +++++++++++++++------------- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 40 ++++++++++++++----------------- + drivers/pinctrl/samsung/pinctrl-samsung.c | 10 +++++++- + drivers/pinctrl/samsung/pinctrl-samsung.h | 9 +++---- + include/dt-bindings/pinctrl/samsung.h | 3 ++- + 7 files changed, 63 insertions(+), 51 deletions(-) +Merging pwm/for-next (5ec8c48a6235 Merge branch 'for-4.13/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 33bd6146a69b] 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 (2fd1d2c4ceb2 proc: Fix proc_sys_prune_dcache to hold a sb reference) +$ 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 (4c1d69950da4 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Auto-merging fs/aio.c +Merge made by the 'recursive' strategy. + fs/aio.c | 19 ++++++++++++------- + 1 file changed, 12 insertions(+), 7 deletions(-) +Merging kselftest/next (5771a8c08880 Linux v4.13-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 (a627ed2ecdea coresight: etm4x: Adds trace return stack option programming for ETMv4.) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etb10.c | 46 ++++++++++++++++-------- + drivers/hwtracing/coresight/coresight-etm-perf.c | 4 ++- + drivers/hwtracing/coresight/coresight-etm.h | 1 + + drivers/hwtracing/coresight/coresight-etm3x.c | 20 +++++++++-- + drivers/hwtracing/coresight/coresight-etm4x.c | 4 +++ + drivers/hwtracing/coresight/coresight-priv.h | 2 ++ + drivers/hwtracing/coresight/coresight-tmc-etf.c | 34 ++++++++++++++++-- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 12 +++++++ + drivers/hwtracing/coresight/coresight.c | 8 +++++ + include/linux/coresight-pmu.h | 1 + + tools/include/linux/coresight-pmu.h | 1 + + 11 files changed, 112 insertions(+), 21 deletions(-) +Merging rtc/rtc-next (5771a8c08880 Linux v4.13-rc1) +$ 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 (23b9babb50ff MAINTAINERS: list drivers/acpi/nfit/ files for libnvdimm sub-system) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/acpi/nfit/core.c | 10 +++++++++- + drivers/dax/device.c | 9 +++++++-- + drivers/nvdimm/core.c | 7 ++++--- + 4 files changed, 21 insertions(+), 7 deletions(-) +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 (cb00e6b58abb Merge branch 'for-next/gcc-plugin/randstruct' into for-next/kspp) +$ git merge kspp/for-next/kspp +Resolved 'include/linux/fs.h' using previous resolution. +Resolved 'include/linux/ipc.h' using previous resolution. +Resolved 'include/linux/sem.h' using previous resolution. +Auto-merging security/keys/internal.h +Auto-merging kernel/futex.c +Auto-merging include/net/sock.h +Auto-merging include/net/net_namespace.h +Auto-merging include/net/neighbour.h +Auto-merging include/net/af_unix.h +Auto-merging include/linux/tty.h +Auto-merging include/linux/sysctl.h +Auto-merging include/linux/sem.h +CONFLICT (content): Merge conflict in include/linux/sem.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/module.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/kobject.h +Auto-merging include/linux/ipc.h +CONFLICT (content): Merge conflict in include/linux/ipc.h +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/linux/dcache.h +Auto-merging include/linux/cred.h +Auto-merging include/linux/compiler.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging fs/proc/internal.h +Auto-merging fs/namei.c +Auto-merging fs/mount.h +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/x86/include/asm/paravirt_types.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2941271a927b] Merge remote-tracking branch 'kspp/for-next/kspp' +$ git diff -M --stat --summary HEAD^.. + arch/arm/include/asm/cacheflush.h | 2 +- + arch/x86/include/asm/paravirt_types.h | 16 ++++++++-------- + arch/x86/include/asm/processor.h | 2 +- + fs/mount.h | 4 ++-- + fs/namei.c | 2 +- + fs/proc/internal.h | 6 +++--- + include/linux/binfmts.h | 4 ++-- + include/linux/cdev.h | 2 +- + include/linux/compiler-gcc.h | 13 ++++++++++++- + include/linux/compiler.h | 5 +++++ + include/linux/cred.h | 4 ++-- + include/linux/dcache.h | 2 +- + include/linux/fs.h | 17 +++++++++-------- + include/linux/fs_struct.h | 2 +- + include/linux/ipc.h | 2 +- + include/linux/ipc_namespace.h | 2 +- + include/linux/key-type.h | 4 ++-- + include/linux/kmod.h | 2 +- + include/linux/kobject.h | 2 +- + include/linux/lsm_hooks.h | 4 ++-- + include/linux/mm_types.h | 4 ++-- + include/linux/module.h | 4 ++-- + include/linux/mount.h | 2 +- + include/linux/msg.h | 2 +- + include/linux/path.h | 2 +- + include/linux/pid_namespace.h | 2 +- + include/linux/proc_ns.h | 2 +- + include/linux/sched.h | 16 +++++++++++++++- + include/linux/sched/signal.h | 2 +- + include/linux/sem.h | 2 +- + include/linux/shm.h | 2 +- + include/linux/sysctl.h | 2 +- + include/linux/tty.h | 2 +- + include/linux/tty_driver.h | 4 ++-- + include/linux/user_namespace.h | 2 +- + include/linux/utsname.h | 2 +- + include/net/af_unix.h | 2 +- + include/net/neighbour.h | 2 +- + include/net/net_namespace.h | 2 +- + include/net/sock.h | 2 +- + kernel/futex.c | 4 ++-- + security/keys/internal.h | 2 +- + 42 files changed, 97 insertions(+), 66 deletions(-) +Merging akpm-current/current (7f004d4884d4 kernel-reboot-add-devm_register_reboot_notifier-fix) +$ git merge --no-ff akpm-current/current +Auto-merging block/genhd.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/page.h | 2 + + arch/x86/kernel/machine_kexec_64.c | 1 + + block/genhd.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 66 +++++-- + fs/ocfs2/dlm/dlmrecovery.c | 40 ++--- + 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/reboot.h | 4 + + include/uapi/linux/sysctl.h | 4 + + kernel/reboot.c | 27 +++ + mm/memory_hotplug.c | 4 + + mm/page_alloc.c | 19 +- + mm/page_owner.c | 4 +- + mm/slub.c | 4 +- + mm/vmscan.c | 17 +- + 22 files changed, 339 insertions(+), 307 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: 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 + + a4e08d11a2dc...09656dc1c78e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (09656dc1c78e 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 ++++++ + lib/crc-ccitt.c | 58 +++++++++++++++++++++++++++++++++++++++++++++- + 3 files changed, 77 insertions(+), 14 deletions(-) |