diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-08-28 19:22:44 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-08-28 19:22:44 +1000 |
| commit | adc4148c101c038bc105ca4539083dcd1a246596 (patch) | |
| tree | f10c290fdf4e62c1c7726cd65c58f30ffa6c45f2 /Next/merge.log | |
| parent | 5565bb23f312bbe802867522d54d4a7d3a81d4a4 (diff) | |
Add linux-next specific files for 20170828next-20170828
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'Next/merge.log')
| -rw-r--r-- | Next/merge.log | 12756 |
1 files changed, 12756 insertions, 0 deletions
diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..bfc704a5c4ba --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,12756 @@ +$ date -R +Mon, 28 Aug 2017 08:25:57 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 4898b99c261e Merge tag 'acpi-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm +Merging origin/master (0cc3b0ec23ce Clarify (and fix) MAX_LFS_FILESIZE macros) +$ git merge origin/master +Updating 4898b99c261e..0cc3b0ec23ce +Fast-forward + arch/powerpc/include/asm/mmu_context.h | 18 +++++++ + arch/powerpc/include/asm/pgtable-be-types.h | 1 + + arch/powerpc/include/asm/pgtable-types.h | 1 + + arch/powerpc/kvm/book3s_64_vio.c | 56 +++++++++++-------- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 3 ++ + arch/powerpc/kvm/book3s_xive_template.c | 68 +++++++++++++++++++++-- + arch/s390/kvm/sthyi.c | 7 ++- + arch/x86/include/asm/fpu/internal.h | 6 +-- + arch/x86/include/asm/kvm_host.h | 1 + + arch/x86/include/asm/mmu_context.h | 4 +- + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/kvm_cache_regs.h | 5 -- + arch/x86/kvm/mmu.h | 2 +- + arch/x86/kvm/svm.c | 7 --- + arch/x86/kvm/vmx.c | 25 +++------ + arch/x86/kvm/x86.c | 17 ++++-- + block/blk-mq-debugfs.c | 3 ++ + block/blk-throttle.c | 18 +++++-- + block/bsg-lib.c | 74 +++++++++++++++----------- + drivers/block/loop.c | 42 +++------------ + drivers/block/loop.h | 1 - + drivers/block/virtio_blk.c | 16 +++--- + drivers/dma/tegra210-adma.c | 4 +- + drivers/gpu/drm/drm_atomic.c | 11 ++-- + drivers/gpu/drm/drm_gem.c | 6 +-- + drivers/gpu/drm/drm_plane.c | 1 + + drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 +- + drivers/gpu/drm/i915/intel_bios.c | 15 +++--- + drivers/gpu/drm/i915/intel_dsi_dcs_backlight.c | 2 +- + drivers/gpu/drm/i915/intel_dsi_vbt.c | 2 +- + drivers/gpu/drm/i915/intel_lrc.c | 23 +++++++- + drivers/gpu/drm/i915/intel_lspcon.c | 4 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 6 +-- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 12 ++++- + drivers/gpu/drm/sun4i/sun4i_drv.c | 8 +++ + drivers/gpu/ipu-v3/Kconfig | 1 + + drivers/i2c/busses/i2c-aspeed.c | 5 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 17 ++++-- + drivers/i2c/busses/i2c-designware-slave.c | 6 ++- + drivers/i2c/busses/i2c-simtec.c | 6 +-- + drivers/i2c/i2c-core-base.c | 4 +- + drivers/infiniband/core/uverbs_cmd.c | 13 +++-- + drivers/infiniband/core/verbs.c | 7 ++- + drivers/infiniband/hw/mlx5/main.c | 6 +++ + drivers/infiniband/hw/mlx5/qp.c | 1 + + drivers/input/misc/soc_button_array.c | 2 +- + drivers/input/mouse/alps.c | 41 ++++++++++---- + drivers/input/mouse/alps.h | 8 +++ + drivers/input/mouse/elan_i2c_core.c | 1 + + drivers/input/mouse/trackpoint.c | 3 +- + drivers/input/mouse/trackpoint.h | 3 +- + drivers/mmc/core/block.c | 49 ++++++++++++++--- + drivers/mtd/nand/atmel/nand-controller.c | 13 ++++- + drivers/mtd/nand/nandsim.c | 1 + + drivers/pci/msi.c | 13 ++--- + drivers/virtio/virtio_pci_common.c | 10 ++-- + fs/cifs/dir.c | 18 ++++--- + fs/cifs/smb2pdu.c | 4 +- + fs/dax.c | 10 ++++ + fs/nfsd/nfs4xdr.c | 6 +-- + include/linux/blkdev.h | 1 - + include/linux/bsg-lib.h | 2 + + include/linux/fs.h | 4 +- + include/rdma/ib_verbs.h | 1 + + include/uapi/linux/loop.h | 3 -- + kernel/events/core.c | 39 +++++++------- + kernel/fork.c | 1 + + kernel/time/timer.c | 50 +++++++++++++---- + mm/madvise.c | 2 +- + mm/memblock.c | 2 +- + mm/page_alloc.c | 20 ++++++- + mm/shmem.c | 4 +- + net/sunrpc/svcsock.c | 22 +++++++- + sound/core/control.c | 2 +- + sound/firewire/iso-resources.c | 7 ++- + sound/firewire/motu/motu.c | 1 + + sound/pci/hda/patch_conexant.c | 1 + + sound/soc/codecs/rt5677.c | 1 + + sound/usb/quirks.c | 9 ++-- + tools/objtool/arch/x86/decode.c | 26 ++++++++- + 80 files changed, 635 insertions(+), 284 deletions(-) +Merging fixes/master (b4b8cbf679c4 Cavium CNN55XX: fix broken default Kconfig entry) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/fixes (64236e315955 kbuild: update comments of Makefile.asm-generic) +$ git merge kbuild-current/fixes +Already up-to-date. +Merging arc-current/for-curr (a8ec3ee861b6 arc: Mask individual IRQ lines during core INTC init) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (1abd35023763 ARM: align .data section) +$ git merge arm-current/fixes +Auto-merging arch/arm/kernel/entry-armv.S +Merge made by the 'recursive' strategy. + arch/arm/include/debug/omap2plus.S | 1 + + arch/arm/kernel/entry-armv.S | 2 ++ + arch/arm/kernel/head.S | 2 ++ + arch/arm/kernel/hyp-stub.S | 1 + + arch/arm/kernel/iwmmxt.S | 1 + + arch/arm/kernel/sleep.S | 1 + + arch/arm/mach-exynos/sleep.S | 1 + + arch/arm/mach-omap2/sleep34xx.S | 2 ++ + arch/arm/mach-omap2/sleep44xx.S | 1 + + arch/arm/mach-pxa/mioa701_bootresume.S | 2 ++ + arch/arm/mach-rockchip/sleep.S | 2 +- + arch/arm/mm/cache-v4wb.S | 1 + + arch/arm/mm/proc-xscale.S | 1 + + 13 files changed, 17 insertions(+), 1 deletion(-) +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 (1a92a80ad386 powerpc/mm: Ensure cpumask update is ordered) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging sparc/master (6470812e2226 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge sparc/master +Already up-to-date. +Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) +$ git merge fscrypt-current/for-stable +Already up-to-date. +Merging net/master (f63ae01d890c Merge tag 'wireless-drivers-for-davem-2017-08-25' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/broadcom/bcmsysport.c | 4 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 41 +++++++++++++++------- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 2 ++ + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 6 ++-- + drivers/net/ethernet/faraday/ftgmac100.c | 1 - + drivers/net/ethernet/freescale/fman/mac.c | 2 ++ + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 15 +++++--- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 16 ++++----- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 14 ++++---- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 22 +++++++----- + drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 2 +- + drivers/net/ethernet/realtek/r8169.c | 5 ++- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 2 ++ + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 5 ++- + drivers/net/hyperv/netvsc_drv.c | 7 +++- + drivers/net/macsec.c | 1 + + drivers/net/phy/phy_device.c | 6 ++-- + drivers/net/virtio_net.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 2 ++ + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 10 +----- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 9 +++++ + include/linux/skbuff.h | 41 +++++++++++++++++++--- + include/net/ip6_fib.h | 30 +++++++++++++++- + include/net/sch_generic.h | 7 ++++ + include/net/tcp.h | 4 +-- + include/net/udp.h | 2 +- + kernel/bpf/hashtab.c | 30 +++++++++------- + net/core/datagram.c | 2 +- + net/core/filter.c | 8 ++--- + net/core/skbuff.c | 13 ++++--- + net/dsa/tag_ksz.c | 12 ++++--- + net/dsa/tag_trailer.c | 2 +- + net/hsr/hsr_device.c | 3 +- + net/ipv4/esp4.c | 13 ++++--- + net/ipv4/esp4_offload.c | 2 +- + net/ipv4/netfilter/arp_tables.c | 10 +++--- + net/ipv4/netfilter/ip_tables.c | 9 ++--- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 4 ++- + net/ipv4/tcp.c | 2 +- + net/ipv4/tcp_cong.c | 19 +++++++--- + net/ipv4/udp.c | 4 ++- + net/ipv6/esp6.c | 9 ++--- + net/ipv6/esp6_offload.c | 2 +- + net/ipv6/ip6_fib.c | 20 ++++++++--- + net/ipv6/output_core.c | 6 ++-- + net/ipv6/route.c | 14 ++++++-- + net/ipv6/udp.c | 11 +++++- + net/netfilter/nf_nat_core.c | 2 +- + net/netfilter/nft_compat.c | 4 +-- + net/netfilter/nft_limit.c | 25 +++++++------ + net/sched/cls_api.c | 16 ++++++--- + net/sched/sch_api.c | 6 ++-- + net/sched/sch_generic.c | 2 +- + net/sctp/sctp_diag.c | 7 ++-- + net/sctp/socket.c | 3 +- + net/tipc/msg.c | 7 ++-- + net/tipc/node.c | 4 ++- + net/tipc/socket.c | 6 ++-- + net/tipc/subscr.c | 21 +++++------ + net/xfrm/xfrm_policy.c | 6 ++++ + net/xfrm/xfrm_state.c | 8 +++++ + 61 files changed, 382 insertions(+), 188 deletions(-) +Merging ipsec/master (8a4b5784fac2 net: xfrm: don't double-hold dst when sk_policy in use.) +$ git merge ipsec/master +Merge made by the 'recursive' strategy. + net/xfrm/xfrm_policy.c | 1 - + 1 file changed, 1 deletion(-) +Merging netfilter/master (c26844eda9d4 netfilter: nf_tables: Fix nft limit burst handling) +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (10a54d8196d1 iwlwifi: pcie: move rx workqueue initialization to iwl_trans_pcie_alloc()) +$ 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 (9ce76511b67b ASoC: rt5677: Reintroduce I2C device IDs) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (8e1101d25164 PCI/MSI: Don't warn when irq_create_affinity_masks() returns NULL) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (ef954844c7ac Linux 4.13-rc5) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (ef954844c7ac Linux 4.13-rc5) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (ef954844c7ac Linux 4.13-rc5) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (b7d44c36a6f6 usb: renesas_usbhs: gadget: fix unused-but-set-variable warning) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (fd1b8668af59 USB: serial: option: add D-Link DWM-222 device ID) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (cbb22ebcfb99 usb: chipidea: core: check before accessing ci_role in ci_role_show) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging phy/fixes (5771a8c08880 Linux v4.13-rc1) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (2c68888f1d76 Merge tag 'fixes-for-4.13b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/adc/ina2xx-adc.c | 2 +- + drivers/iio/adc/stm32-adc-core.c | 10 +-- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 8 +-- + drivers/iio/imu/adis16480.c | 2 +- + drivers/iio/magnetometer/st_magn_core.c | 4 +- + drivers/iio/pressure/bmp280-core.c | 27 ++++++- + drivers/iio/pressure/bmp280.h | 5 ++ + drivers/iio/trigger/stm32-timer-trigger.c | 82 ++++++++++++++++------ + drivers/staging/fsl-mc/bus/fsl-mc-allocator.c | 6 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 + + include/linux/iio/iio.h | 2 +- + include/linux/iio/trigger.h | 4 +- + 12 files changed, 107 insertions(+), 46 deletions(-) +Merging char-misc.current/char-misc-linus (b2a6d1b999a4 ANDROID: binder: fix proc->tsk check.) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + drivers/android/binder.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging input-current/for-linus (4a646580f793 Input: ALPS - fix two-finger scroll breakage in right side on ALPS touchpad) +$ git merge input-current/for-linus +Already up-to-date. +Merging crypto-current/master (445a582738de crypto: algif_skcipher - only call put_page on referenced and used pages) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + crypto/algif_skcipher.c | 9 +++++++-- + crypto/chacha20_generic.c | 9 +++++++-- + crypto/testmgr.h | 7 +++++++ + lib/mpi/mpicoder.c | 4 +++- + 4 files changed, 24 insertions(+), 5 deletions(-) +Merging ide/master (b671e1703394 PNP: ide: constify pnp_device_id) +$ git merge ide/master +Merge made by the 'recursive' strategy. + drivers/ide/ide-pnp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging vfio-fixes/for-linus (796b755066dd vfio/pci: Fix handling of RC integrated endpoint PCIe capability size) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (622b2fbe625b selftests: timers: freq-step: fix compile error) +$ 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 (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) +$ git merge nand-fixes/nand/fixes +Already up-to-date. +Merging spi-nor-fixes/spi-nor/fixes (5771a8c08880 Linux v4.13-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (0f0fc5c09005 Revert "mfd: da9061: Fix to remove BBAT_CONT register from chip model") +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging v4l-dvb-fixes/fixes (42b884edd6fa media: Revert "[media] v4l: async: make v4l2 coexist with devicetree nodes in a dt overlay") +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/rc/lirc_dev.c | 4 ++++ + drivers/media/v4l2-core/v4l2-async.c | 7 +------ + drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c | 1 + + 3 files changed, 6 insertions(+), 6 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 (e7c50e1156b6 Merge tag 'gvt-fixes-2017-08-23' of https://github.com/01org/gvt-linux into drm-intel-fixes) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging drm-misc-fixes/for-linux-next-fixes (79964dbaf662 drm/bridge/sii8620: Fix memory corruption) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/bridge/sil-sii8620.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging kbuild/for-next (64236e315955 kbuild: update comments of Makefile.asm-generic) +$ git merge kbuild/for-next +Already up-to-date. +Merging uuid/for-next (832e4c83abc5 uuid: remove uuid_be) +$ git merge uuid/for-next +Already up-to-date. +Merging dma-mapping/for-next (ee7b1f31200d of: fix DMA mask generation) +$ 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 (dd6f7edfa2c1 ARC: [plat-eznps] handle extra aux regs #2: kernel/entry exit) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 9 +++++ + arch/arc/include/asm/entry-compact.h | 24 ++++++++++++ + arch/arc/include/asm/irqflags-arcv2.h | 3 -- + arch/arc/include/asm/irqflags-compact.h | 2 - + arch/arc/include/asm/processor.h | 10 +++++ + arch/arc/include/asm/ptrace.h | 5 +++ + arch/arc/include/asm/spinlock.h | 12 ++++++ + arch/arc/include/asm/switch_to.h | 9 +++++ + arch/arc/kernel/entry-compact.S | 22 +++++------ + arch/arc/kernel/process.c | 33 +++++++++++++++- + 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 | 26 ++++++++++++- + arch/arc/plat-eznps/Makefile | 2 +- + arch/arc/plat-eznps/ctop.c | 32 ++++++++++++++++ + arch/arc/plat-eznps/entry.S | 2 +- + arch/arc/plat-eznps/include/plat/ctop.h | 2 + + arch/arc/plat-eznps/mtm.c | 50 +++++++++++++++++++++++-- + 22 files changed, 233 insertions(+), 33 deletions(-) + create mode 100644 arch/arc/plat-eznps/ctop.c +Merging arm/for-next (862f4c2c1e06 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 4 ++-- + arch/arm/include/asm/smp_scu.h | 1 + + arch/arm/include/asm/suspend.h | 2 ++ + arch/arm/kernel/entry-common.S | 44 +++++++++++++++++++++++++++++------------- + 4 files changed, 36 insertions(+), 15 deletions(-) +Merging arm-perf/for-next/perf (e884f80cf2a7 arm64: perf: add support for Cortex-A35) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/pmu.txt | 2 + + arch/arm64/kernel/perf_event.c | 208 +++++++++++--------------- + drivers/perf/arm_pmu.c | 6 + + drivers/perf/xgene_pmu.c | 74 +++------ + 4 files changed, 115 insertions(+), 175 deletions(-) +Merging arm-soc/for-next (8c1dc6aa36fd arm-soc: document merges) +$ git merge arm-soc/for-next +Removing include/dt-bindings/genpd/k2g.h +Removing drivers/reset/reset-gemini.c +Removing arch/arm64/boot/dts/broadcom/bcm283x.dtsi +Removing arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi +Removing arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi +Removing arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi +Auto-merging arch/arm/include/debug/omap2plus.S +Removing arch/arm/boot/dts/uniphier-sld3.dtsi +Removing arch/arm/boot/dts/uniphier-sld3-ref.dts +Auto-merging arch/arm/boot/dts/rk3229.dtsi +Removing arch/arm/boot/dts/imx6ul-isiot-common.dtsi +Auto-merging arch/arm/boot/dts/imx6ul-geam.dts +Auto-merging arch/arm/boot/dts/bcm2837.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.txt | 41 ++ + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 + + Documentation/devicetree/bindings/arm/bhf.txt | 6 + + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + Documentation/devicetree/bindings/arm/mediatek.txt | 4 + + .../devicetree/bindings/arm/omap/omap.txt | 9 + + Documentation/devicetree/bindings/arm/qcom.txt | 2 + + Documentation/devicetree/bindings/arm/rockchip.txt | 12 + + Documentation/devicetree/bindings/arm/shmobile.txt | 8 + + .../bindings/display/bridge/renesas,dw-hdmi.txt | 1 + + .../devicetree/bindings/display/renesas,du.txt | 51 +- + Documentation/devicetree/bindings/dma/ti-edma.txt | 95 ++- + .../devicetree/bindings/gpu/arm,mali-midgard.txt | 1 + + .../interrupt-controller/mediatek,sysirq.txt | 1 + + .../devicetree/bindings/mmc/ti-omap-hsmmc.txt | 52 +- + .../devicetree/bindings/net/can/c_can.txt | 13 +- + .../devicetree/bindings/pci/mvebu-pci.txt | 2 +- + .../devicetree/bindings/power/renesas,apmu.txt | 3 +- + .../bindings/power/renesas,rcar-sysc.txt | 1 + + .../devicetree/bindings/reset/renesas,rst.txt | 1 + + .../devicetree/bindings/reset/uniphier-reset.txt | 27 +- + .../devicetree/bindings/serial/mtk-uart.txt | 1 + + .../devicetree/bindings/soc/mediatek/scpsys.txt | 3 + + .../devicetree/bindings/soc/rockchip/grf.txt | 3 + + .../bindings/soc/rockchip/power_domain.txt | 3 + + .../devicetree/bindings/soc/ti/sci-pm-domain.txt | 5 +- + .../devicetree/bindings/sram/renesas,smp-sram.txt | 27 + + .../devicetree/bindings/sram/sunxi-sram.txt | 9 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + .../devicetree/bindings/watchdog/mtk-wdt.txt | 6 +- + MAINTAINERS | 32 +- + arch/arm/Kconfig.debug | 53 +- + arch/arm/arm-soc-for-next-contents.txt | 244 ++++++++ + arch/arm/boot/dts/Makefile | 19 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 3 - + arch/arm/boot/dts/am335x-chiliboard.dts | 3 - + arch/arm/boot/dts/am335x-evm.dts | 1 + + arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 525 +++++++++++++++++ + arch/arm/boot/dts/am437x-gp-evm.dts | 15 + + arch/arm/boot/dts/am43x-epos-evm.dts | 1 + + arch/arm/boot/dts/am571x-idk.dts | 35 +- + arch/arm/boot/dts/am572x-idk.dts | 34 +- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 36 +- + arch/arm/boot/dts/am57xx-beagle-x15-revb1.dts | 17 +- + arch/arm/boot/dts/am57xx-beagle-x15-revc.dts | 39 ++ + arch/arm/boot/dts/am57xx-beagle-x15.dts | 11 + + arch/arm/boot/dts/am57xx-idk-common.dtsi | 8 + + arch/arm/boot/dts/armada-370.dtsi | 4 +- + arch/arm/boot/dts/armada-375.dtsi | 4 +- + arch/arm/boot/dts/armada-380.dtsi | 5 +- + arch/arm/boot/dts/armada-385-db-ap.dts | 2 +- + arch/arm/boot/dts/armada-385-turris-omnia.dts | 2 +- + arch/arm/boot/dts/armada-385.dtsi | 6 +- + arch/arm/boot/dts/armada-388-clearfog.dts | 2 +- + arch/arm/boot/dts/armada-388-clearfog.dtsi | 2 +- + arch/arm/boot/dts/armada-388-db.dts | 2 +- + arch/arm/boot/dts/armada-388-gp.dts | 2 +- + arch/arm/boot/dts/armada-388-rd.dts | 2 +- + arch/arm/boot/dts/armada-38x.dtsi | 7 + + arch/arm/boot/dts/armada-390-db.dts | 2 +- + arch/arm/boot/dts/armada-395-gp.dts | 2 +- + arch/arm/boot/dts/armada-398-db.dts | 2 +- + arch/arm/boot/dts/armada-39x.dtsi | 6 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 3 +- + arch/arm/boot/dts/armada-xp-db.dts | 2 +- + arch/arm/boot/dts/armada-xp-gp.dts | 2 +- + arch/arm/boot/dts/armada-xp-mv78230.dtsi | 7 +- + arch/arm/boot/dts/armada-xp-mv78260.dtsi | 11 +- + arch/arm/boot/dts/armada-xp-mv78460.dtsi | 14 +- + arch/arm/boot/dts/aspeed-g4.dtsi | 4 +- + arch/arm/boot/dts/bcm-cygnus.dtsi | 149 ++++- + arch/arm/boot/dts/bcm-nsp.dtsi | 59 +- + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-a.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-b.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 139 +++++ + arch/arm/boot/dts/bcm2835-rpi-zero.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 6 + + arch/arm/boot/dts/bcm2836.dtsi | 1 + + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 52 +- + .../dts/broadcom => arm/boot/dts}/bcm2837.dtsi | 1 + + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 4 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 3 + + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 6 + + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 4 + + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 5 + + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 3 + + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 + + arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 2 + + arch/arm/boot/dts/bcm5301x.dtsi | 34 ++ + arch/arm/boot/dts/bcm53573.dtsi | 4 + + arch/arm/boot/dts/bcm911360_entphn.dts | 7 +- + arch/arm/boot/dts/bcm947189acdbmr.dts | 97 +++ + arch/arm/boot/dts/bcm958522er.dts | 8 + + arch/arm/boot/dts/bcm958525er.dts | 8 + + arch/arm/boot/dts/bcm958525xmc.dts | 8 + + arch/arm/boot/dts/bcm958622hr.dts | 8 + + arch/arm/boot/dts/bcm958623hr.dts | 8 + + arch/arm/boot/dts/bcm958625hr.dts | 8 + + arch/arm/boot/dts/bcm958625k.dts | 8 + + arch/arm/boot/dts/da850-lego-ev3.dts | 24 + + arch/arm/boot/dts/dove-d3plug.dts | 4 +- + arch/arm/boot/dts/dove.dtsi | 8 +- + arch/arm/boot/dts/dra7-evm-common.dtsi | 258 ++++++++ + arch/arm/boot/dts/dra7-evm.dts | 277 +-------- + arch/arm/boot/dts/dra7.dtsi | 36 +- + arch/arm/boot/dts/dra71-evm.dts | 32 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 7 +- + arch/arm/boot/dts/dra72-evm-revc.dts | 34 ++ + arch/arm/boot/dts/dra72-evm-tps65917.dtsi | 2 +- + arch/arm/boot/dts/dra72-evm.dts | 32 + + arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi | 350 +++++++++++ + arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi | 647 +++++++++++++++++++++ + arch/arm/boot/dts/dra76-evm.dts | 423 ++++++++++++++ + arch/arm/boot/dts/dra76x.dtsi | 19 + + 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/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/exynos5440.dtsi | 2 + + arch/arm/boot/dts/exynos5800-peach-pi.dts | 3 - + arch/arm/boot/dts/gemini-dlink-dir-685.dts | 246 ++++++++ + arch/arm/boot/dts/gemini-nas4220b.dts | 24 + + arch/arm/boot/dts/gemini-rut1xx.dts | 39 ++ + arch/arm/boot/dts/gemini-sq201.dts | 36 +- + arch/arm/boot/dts/gemini-wbd111.dts | 26 + + arch/arm/boot/dts/gemini-wbd222.dts | 26 + + arch/arm/boot/dts/gemini.dtsi | 173 +++++- + arch/arm/boot/dts/imx25.dtsi | 7 + + arch/arm/boot/dts/imx53-cx9020.dts | 297 ++++++++++ + arch/arm/boot/dts/imx53-pinfunc.h | 4 + + arch/arm/boot/dts/imx53.dtsi | 9 + + 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/imx6dl-riotboard.dts | 45 ++ + arch/arm/boot/dts/imx6q-apalis-eval.dts | 278 +++++++++ + arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 291 +++++++++ + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 32 +- + arch/arm/boot/dts/imx6q-b850v3.dts | 2 +- + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 42 ++ + 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-apalis.dtsi | 44 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 54 ++ + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 54 ++ + arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 19 + + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 19 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 112 +++- + 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 | 40 +- + .../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-liteboard.dts | 4 + + arch/arm/boot/dts/imx6ul.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri.dtsi | 9 + + arch/arm/boot/dts/imx7d-sdb.dts | 93 +-- + arch/arm/boot/dts/imx7s.dtsi | 32 + + arch/arm/boot/dts/keystone-k2e-evm.dts | 18 + + arch/arm/boot/dts/keystone-k2e.dtsi | 20 + + arch/arm/boot/dts/keystone-k2g-evm.dts | 71 +++ + arch/arm/boot/dts/keystone-k2g-ice.dts | 18 + + arch/arm/boot/dts/keystone-k2g.dtsi | 204 +++++++ + arch/arm/boot/dts/keystone-k2hk-evm.dts | 53 ++ + arch/arm/boot/dts/keystone-k2hk.dtsi | 139 +++++ + arch/arm/boot/dts/keystone-k2l-evm.dts | 33 ++ + arch/arm/boot/dts/keystone-k2l.dtsi | 71 +++ + arch/arm/boot/dts/kirkwood-6192.dtsi | 3 +- + arch/arm/boot/dts/kirkwood-6281.dtsi | 3 +- + arch/arm/boot/dts/kirkwood-6282.dtsi | 4 +- + arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 3 +- + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 2 +- + arch/arm/boot/dts/meson.dtsi | 30 +- + arch/arm/boot/dts/meson6.dtsi | 28 + + arch/arm/boot/dts/meson8.dtsi | 16 + + arch/arm/boot/dts/meson8b.dtsi | 33 +- + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 1 + + arch/arm/boot/dts/omap3-beagle-xm.dts | 2 +- + arch/arm/boot/dts/omap3-beagle.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3517.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3730.dts | 2 +- + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-evm-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-n900.dts | 89 ++- + arch/arm/boot/dts/omap3-overo-base.dtsi | 2 +- + arch/arm/boot/dts/omap3-tao3530.dtsi | 2 +- + arch/arm/boot/dts/omap3-zoom3.dts | 2 +- + arch/arm/boot/dts/omap3.dtsi | 4 - + arch/arm/boot/dts/omap3430-sdp.dts | 2 +- + arch/arm/boot/dts/omap4-droid4-xt894.dts | 42 +- + arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 2 +- + arch/arm/boot/dts/omap4-sdp-es23plus.dts | 2 +- + arch/arm/boot/dts/omap4-sdp.dts | 2 +- + arch/arm/boot/dts/omap4-var-om44customboard.dtsi | 2 +- + arch/arm/boot/dts/omap5-board-common.dtsi | 2 +- + arch/arm/boot/dts/omap5-cm-t54.dts | 2 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 29 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 109 +++- + arch/arm/boot/dts/qcom-msm8974.dtsi | 2 +- + arch/arm/boot/dts/r7s72100-genmai.dts | 71 ++- + arch/arm/boot/dts/r7s72100-rskrza1.dts | 61 ++ + arch/arm/boot/dts/r7s72100.dtsi | 78 +++ + arch/arm/boot/dts/r8a7743-iwg20d-q7.dts | 31 + + arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 26 + + arch/arm/boot/dts/r8a7743-sk-rzg1m.dts | 25 +- + arch/arm/boot/dts/r8a7743.dtsi | 301 +++++++++- + arch/arm/boot/dts/r8a7745-sk-rzg1e.dts | 25 +- + arch/arm/boot/dts/r8a7745.dtsi | 30 +- + arch/arm/boot/dts/r8a7790.dtsi | 30 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 10 +- + arch/arm/boot/dts/r8a7791.dtsi | 28 +- + arch/arm/boot/dts/r8a7792.dtsi | 18 + + arch/arm/boot/dts/r8a7793.dtsi | 18 + + arch/arm/boot/dts/r8a7794.dtsi | 22 +- + 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 +++- + .../boot/dts/{imx6ul-geam-kit.dts => rk3229.dtsi} | 104 ++-- + arch/arm/boot/dts/rk322x.dtsi | 199 ++++++- + arch/arm/boot/dts/rk3288-evb.dtsi | 51 +- + arch/arm/boot/dts/rk3288-fennec.dts | 8 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 3 +- + arch/arm/boot/dts/rk3288-firefly-reload.dts | 2 - + arch/arm/boot/dts/rk3288-firefly.dtsi | 5 +- + arch/arm/boot/dts/rk3288-miqi.dts | 4 +- + arch/arm/boot/dts/rk3288-phycore-rdk.dts | 1 - + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 3 +- + arch/arm/boot/dts/rk3288-popmetal.dts | 4 +- + arch/arm/boot/dts/rk3288-r89.dts | 3 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 3 +- + arch/arm/boot/dts/rk3288-rock2-square.dts | 2 - + arch/arm/boot/dts/rk3288-tinker.dts | 8 +- + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 1 - + arch/arm/boot/dts/rk3288-veyron.dtsi | 4 +- + arch/arm/boot/dts/rk3288.dtsi | 215 ++++--- + arch/arm/boot/dts/rv1108-evb.dts | 190 ++++++ + arch/arm/boot/dts/rv1108.dtsi | 369 +++++++++++- + arch/arm/boot/dts/spear1310.dtsi | 3 + + arch/arm/boot/dts/spear1340.dtsi | 1 + + arch/arm/boot/dts/ste-dbx5x0.dtsi | 15 +- + arch/arm/boot/dts/stm32429i-eval.dts | 2 +- + arch/arm/boot/dts/stm32f429-disco.dts | 2 +- + arch/arm/boot/dts/stm32f429.dtsi | 25 + + arch/arm/boot/dts/stm32f469-disco.dts | 2 +- + arch/arm/boot/dts/stm32f746.dtsi | 51 ++ + arch/arm/boot/dts/stm32f769-disco.dts | 6 + + arch/arm/boot/dts/stm32h743.dtsi | 127 +++- + arch/arm/boot/dts/stm32h743i-eval.dts | 18 + + 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 +- + .../boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts | 85 +++ + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 101 ++++ + arch/arm/boot/dts/sun8i-a83t.dtsi | 176 ++++++ + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 31 +- + arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 321 ++++++++++ + arch/arm/boot/dts/tegra114-dalmore.dts | 10 + + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 12 +- + arch/arm/boot/dts/tegra124.dtsi | 1 + + arch/arm/boot/dts/tegra20-paz00.dts | 2 + + arch/arm/boot/dts/tegra30-beaver.dts | 10 + + arch/arm/boot/dts/tps65217.dtsi | 3 + + arch/arm/boot/dts/uniphier-ld4-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-ld4.dtsi | 13 +- + arch/arm/boot/dts/uniphier-ld6b-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-ld6b.dtsi | 2 +- + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 43 +- + arch/arm/boot/dts/uniphier-pro4-ace.dts | 2 +- + arch/arm/boot/dts/uniphier-pro4-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-pro4-sanji.dts | 2 +- + arch/arm/boot/dts/uniphier-pro4.dtsi | 13 +- + arch/arm/boot/dts/uniphier-pro5.dtsi | 51 +- + arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 2 +- + arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 2 +- + arch/arm/boot/dts/uniphier-pxs2.dtsi | 13 +- + arch/arm/boot/dts/uniphier-sld3-ref.dts | 75 --- + arch/arm/boot/dts/uniphier-sld3.dtsi | 260 --------- + arch/arm/boot/dts/uniphier-sld8-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-sld8.dtsi | 13 +- + arch/arm/boot/dts/versatile-pb.dts | 2 +- + arch/arm/boot/dts/zx296702-ad1.dts | 2 - + arch/arm/boot/dts/zynq-7000.dtsi | 8 + + arch/arm/boot/dts/zynq-parallella.dts | 3 +- + arch/arm/boot/dts/zynq-zc702.dts | 20 +- + arch/arm/boot/dts/zynq-zc706.dts | 20 +- + arch/arm/boot/dts/zynq-zed.dts | 5 +- + arch/arm/boot/dts/zynq-zybo.dts | 5 +- + arch/arm/configs/aspeed_g4_defconfig | 5 +- + arch/arm/configs/aspeed_g5_defconfig | 4 +- + arch/arm/configs/bcm2835_defconfig | 7 + + arch/arm/configs/davinci_all_defconfig | 2 + + arch/arm/configs/exynos_defconfig | 79 ++- + arch/arm/configs/ezx_defconfig | 1 - + arch/arm/configs/imx_v6_v7_defconfig | 15 +- + arch/arm/configs/ixp4xx_defconfig | 4 - + arch/arm/configs/keystone_defconfig | 13 + + arch/arm/configs/multi_v7_defconfig | 15 +- + arch/arm/configs/omap2plus_defconfig | 4 + + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/configs/shmobile_defconfig | 18 +- + arch/arm/configs/sunxi_defconfig | 15 +- + arch/arm/configs/tegra_defconfig | 12 +- + arch/arm/configs/vexpress_defconfig | 1 - + arch/arm/include/debug/omap2plus.S | 108 ---- + arch/arm/kernel/cpuidle.c | 4 +- + arch/arm/kernel/devtree.c | 5 +- + arch/arm/kernel/topology.c | 3 +- + arch/arm/mach-ep93xx/clock.c | 8 + + arch/arm/mach-ep93xx/core.c | 24 + + arch/arm/mach-ep93xx/edb93xx.c | 1 + + arch/arm/mach-ep93xx/include/mach/platform.h | 1 + + arch/arm/mach-ep93xx/soc.h | 1 + + arch/arm/mach-exynos/suspend.c | 7 +- + arch/arm/mach-gemini/Kconfig | 5 + + arch/arm/mach-hisi/platsmp.c | 2 +- + arch/arm/mach-imx/gpc.c | 4 +- + arch/arm/mach-mediatek/mediatek.c | 2 + + arch/arm/mach-mediatek/platsmp.c | 1 + + arch/arm/mach-mvebu/Kconfig | 2 + + arch/arm/mach-mvebu/kirkwood.c | 3 +- + arch/arm/mach-omap2/Kconfig | 1 + + arch/arm/mach-omap2/board-generic.c | 1 + + arch/arm/mach-omap2/dma.c | 148 +---- + arch/arm/mach-omap2/id.c | 9 + + arch/arm/mach-omap2/omap-smp.c | 4 +- + arch/arm/mach-omap2/omap-wakeupgen.c | 4 +- + arch/arm/mach-omap2/omap_device.c | 10 - + arch/arm/mach-omap2/omap_hwmod.c | 4 +- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 11 +- + arch/arm/mach-omap2/pdata-quirks.c | 31 + + arch/arm/mach-omap2/powerdomains7xx_data.c | 33 +- + arch/arm/mach-omap2/prm3xxx.c | 2 +- + arch/arm/mach-omap2/prm44xx.c | 4 +- + arch/arm/mach-omap2/soc.h | 5 + + arch/arm/mach-rockchip/Kconfig | 2 + + arch/arm/mach-rockchip/platsmp.c | 6 +- + arch/arm/mach-s3c24xx/Kconfig | 2 +- + arch/arm/mach-s3c24xx/common.c | 2 +- + arch/arm/mach-s3c24xx/include/mach/regs-clock.h | 4 +- + arch/arm/mach-s3c24xx/mach-mini2440.c | 2 +- + arch/arm/mach-s3c24xx/mach-smdk2443.c | 8 - + arch/arm/mach-s3c24xx/sleep.S | 11 +- + arch/arm/mach-shmobile/Kconfig | 4 - + arch/arm/mach-shmobile/pm-rcar-gen2.c | 33 +- + arch/arm/mach-shmobile/pm-rmobile.c | 7 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 21 +- + arch/arm/mach-tegra/Kconfig | 2 + + arch/arm/mach-tegra/tegra.c | 29 +- + arch/arm/plat-samsung/include/plat/map-s3c.h | 2 +- + arch/arm64/Kconfig.platforms | 7 + + arch/arm64/boot/dts/allwinner/Makefile | 2 + + arch/arm64/boot/dts/allwinner/axp803.dtsi | 150 +++++ + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 144 ++++- + .../boot/dts/allwinner/sun50i-a64-nanopi-a64.dts | 207 +++++++ + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 199 +++++++ + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 113 ++++ + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 23 + + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 86 +++ + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 9 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 26 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 58 ++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 3 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 25 + + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 56 ++ + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 25 + + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 2 + + arch/arm64/boot/dts/apm/apm-storm.dtsi | 5 + + arch/arm64/boot/dts/arm/foundation-v8.dtsi | 2 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 14 +- + arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 2 +- + arch/arm64/boot/dts/broadcom/Makefile | 4 +- + arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi | 1 - + arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 42 +- + .../boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi | 1 - + .../boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi | 1 - + arch/arm64/boot/dts/broadcom/bcm283x.dtsi | 1 - + arch/arm64/boot/dts/broadcom/northstar2/Makefile | 6 + + .../dts/broadcom/{ => northstar2}/ns2-clock.dtsi | 0 + .../boot/dts/broadcom/{ => northstar2}/ns2-svk.dts | 0 + .../boot/dts/broadcom/{ => northstar2}/ns2-xmc.dts | 0 + .../boot/dts/broadcom/{ => northstar2}/ns2.dtsi | 0 + .../boot/dts/broadcom/stingray/bcm958742-base.dtsi | 78 +++ + .../boot/dts/broadcom/stingray/bcm958742k.dts | 4 + + .../boot/dts/broadcom/stingray/bcm958742t.dts | 4 + + .../boot/dts/broadcom/stingray/stingray-fs4.dtsi | 118 ++++ + .../boot/dts/broadcom/stingray/stingray-sata.dtsi | 278 +++++++++ + .../arm64/boot/dts/broadcom/stingray/stingray.dtsi | 136 +++++ + .../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 - + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 17 + + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 65 +++ + arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 5 - + arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 5 - + arch/arm64/boot/dts/freescale/fsl-ls2080a-simu.dts | 5 - + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 17 + + arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts | 5 - + arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 5 - + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 17 + + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 51 ++ + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 37 +- + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 130 +++++ + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 9 +- + arch/arm64/boot/dts/hisilicon/hip07-d05.dts | 4 + + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 22 + + .../boot/dts/marvell/armada-3720-espressobin.dts | 30 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 11 +- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 39 ++ + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 65 +++ + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 94 ++- + .../boot/dts/marvell/armada-cp110-master.dtsi | 58 +- + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 58 +- + arch/arm64/boot/dts/mediatek/Makefile | 2 + + arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 32 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 171 ++++++ + arch/arm64/boot/dts/mediatek/mt6797.dtsi | 12 +- + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 27 + + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 110 ++++ + arch/arm64/boot/dts/qcom/Makefile | 1 + + .../arm64/boot/dts/qcom/apq8016-sbc-pmic-pins.dtsi | 1 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 17 +- + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 24 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 198 +++++++ + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 52 ++ + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 194 ++++++ + arch/arm64/boot/dts/qcom/msm8916.dtsi | 120 +++- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 314 ++++++++++ + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 17 + + arch/arm64/boot/dts/renesas/Makefile | 1 + + arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts | 2 - + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 2 - + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 9 +- + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 16 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 2 - + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 8 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 314 +++++++++- + arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 14 +- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 31 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 414 ++++++++++++- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 46 ++ + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 155 +++++ + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 4 - + arch/arm64/boot/dts/renesas/salvator-xs.dtsi | 10 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 51 ++ + arch/arm64/boot/dts/rockchip/Makefile | 3 + + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 164 ++++++ + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 333 +++++++++++ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 398 +++++++++++++ + 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 | 3 - + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 2 - + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 140 ++++- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 16 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 44 ++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 132 +++-- + arch/arm64/boot/dts/rockchip/rk3399-op1-opp.dtsi | 33 ++ + arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 33 ++ + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 228 ++++++++ + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 547 +++++++++++++++++ + .../dts/rockchip/rk3399-sapphire-excavator.dts | 240 ++++++++ + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 644 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 284 ++++++++- + .../boot/dts/socionext/uniphier-ld11-global.dts | 6 +- + .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 6 +- + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 17 +- + .../boot/dts/socionext/uniphier-ld20-global.dts | 6 +- + .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 6 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 17 +- + .../arm64/boot/dts/socionext/uniphier-pinctrl.dtsi | 2 +- + .../boot/dts/socionext/uniphier-ref-daughter.dtsi | 2 +- + .../boot/dts/socionext/uniphier-support-card.dtsi | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp-ep108-clk.dtsi | 50 +- + arch/arm64/boot/dts/xilinx/zynqmp-ep108.dts | 18 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 277 ++++++++- + arch/arm64/boot/dts/zte/Makefile | 1 + + arch/arm64/boot/dts/zte/zx296718-evb.dts | 68 ++- + arch/arm64/boot/dts/zte/zx296718-pcbox.dts | 143 +++++ + arch/arm64/boot/dts/zte/zx296718.dtsi | 171 +++++- + arch/arm64/configs/defconfig | 32 +- + drivers/bus/Kconfig | 2 +- + drivers/bus/arm-cci.c | 12 +- + drivers/bus/imx-weim.c | 8 +- + drivers/bus/omap-ocp2scp.c | 9 +- + drivers/bus/sunxi-rsb.c | 22 +- + drivers/firmware/arm_scpi.c | 4 +- + drivers/firmware/psci.c | 4 +- + drivers/firmware/tegra/bpmp.c | 4 +- + drivers/memory/atmel-ebi.c | 17 +- + drivers/memory/jz4780-nemc.c | 12 +- + drivers/memory/mvebu-devbus.c | 12 +- + drivers/memory/omap-gpmc.c | 16 +- + drivers/reset/Kconfig | 9 +- + drivers/reset/Makefile | 2 +- + drivers/reset/core.c | 238 +++++++- + drivers/reset/reset-gemini.c | 110 ---- + drivers/reset/reset-hsdk-v1.c | 137 +++++ + drivers/reset/reset-sunxi.c | 4 +- + drivers/reset/reset-uniphier.c | 117 ++-- + drivers/reset/reset-zx2967.c | 2 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/amlogic/Kconfig | 12 + + drivers/soc/amlogic/Makefile | 1 + + drivers/soc/amlogic/meson-gx-socinfo.c | 177 ++++++ + drivers/soc/fsl/qbman/bman_ccsr.c | 10 +- + drivers/soc/fsl/qbman/bman_portal.c | 8 +- + drivers/soc/fsl/qbman/qman_ccsr.c | 12 +- + drivers/soc/fsl/qbman/qman_portal.c | 11 +- + drivers/soc/fsl/qe/gpio.c | 4 +- + drivers/soc/mediatek/mtk-pmic-wrap.c | 10 +- + drivers/soc/mediatek/mtk-scpsys.c | 247 ++++---- + drivers/soc/qcom/Kconfig | 4 + + drivers/soc/qcom/mdt_loader.c | 5 +- + drivers/soc/qcom/smsm.c | 3 +- + drivers/soc/qcom/wcnss_ctrl.c | 1 + + drivers/soc/renesas/Kconfig | 7 +- + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/r8a77995-sysc.c | 31 + + drivers/soc/renesas/rcar-rst.c | 5 +- + drivers/soc/renesas/rcar-sysc.c | 9 +- + drivers/soc/renesas/rcar-sysc.h | 1 + + drivers/soc/renesas/renesas-soc.c | 8 + + drivers/soc/rockchip/grf.c | 14 + + drivers/soc/rockchip/pm_domains.c | 32 + + drivers/soc/samsung/pm_domains.c | 10 +- + drivers/soc/sunxi/sunxi_sram.c | 57 +- + drivers/soc/tegra/Kconfig | 5 + + drivers/soc/tegra/fuse/fuse-tegra.c | 56 +- + drivers/soc/tegra/pmc.c | 4 +- + drivers/soc/versatile/soc-realview.c | 2 +- + drivers/tee/optee/core.c | 19 +- + drivers/tee/optee/optee_smc.h | 12 +- + drivers/tee/optee/rpc.c | 15 +- + drivers/tee/tee_core.c | 5 + + drivers/tee/tee_shm.c | 2 +- + include/dt-bindings/clock/rv1108-cru.h | 123 +++- + include/dt-bindings/genpd/k2g.h | 90 --- + include/dt-bindings/pinctrl/dra.h | 3 + + include/dt-bindings/power/mt7622-power.h | 22 + + include/dt-bindings/power/r8a77995-sysc.h | 23 + + include/dt-bindings/power/rk3366-power.h | 24 + + include/dt-bindings/reset/snps,hsdk-v1-reset.h | 17 + + include/linux/platform_data/hsmmc-omap.h | 3 + + include/linux/reset.h | 68 +++ + include/linux/soc/mediatek/infracfg.h | 7 + + include/linux/tee_drv.h | 1 + + include/soc/tegra/fuse.h | 2 + + include/uapi/linux/tee.h | 1 + + 583 files changed, 20977 insertions(+), 2849 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/bhf.txt + create mode 100644 Documentation/devicetree/bindings/sram/renesas,smp-sram.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts + create mode 100644 arch/arm/boot/dts/am57xx-beagle-x15-revc.dts + create mode 100644 arch/arm/boot/dts/bcm2835-rpi-zero-w.dts + rename arch/{arm64/boot/dts/broadcom => arm/boot/dts}/bcm2837.dtsi (96%) + create mode 100644 arch/arm/boot/dts/bcm947189acdbmr.dts + create mode 100644 arch/arm/boot/dts/dra7-evm-common.dtsi + create mode 100644 arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi + create mode 100644 arch/arm/boot/dts/dra74x-mmc-iodelay.dtsi + create mode 100644 arch/arm/boot/dts/dra76-evm.dts + create mode 100644 arch/arm/boot/dts/dra76x.dtsi + create mode 100644 arch/arm/boot/dts/gemini-dlink-dir-685.dts + create mode 100644 arch/arm/boot/dts/imx53-cx9020.dts + create mode 100644 arch/arm/boot/dts/imx6q-apalis-eval.dts + create mode 100644 arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts + rename arch/arm/boot/dts/{imx6ul-geam.dtsi => imx6ul-geam.dts} (87%) + delete mode 100644 arch/arm/boot/dts/imx6ul-isiot-common.dtsi + rename arch/arm/boot/dts/{imx6ul-geam-kit.dts => rk3229.dtsi} (56%) + create mode 100644 arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts + delete mode 100644 arch/arm/boot/dts/uniphier-sld3-ref.dts + delete mode 100644 arch/arm/boot/dts/uniphier-sld3.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/axp803.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-nanopi-a64.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-olinuxino.dts + delete mode 120000 arch/arm64/boot/dts/broadcom/bcm2835-rpi.dtsi + delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-smsc9514.dtsi + delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x-rpi-usb-host.dtsi + delete mode 120000 arch/arm64/boot/dts/broadcom/bcm283x.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/northstar2/Makefile + rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-clock.dtsi (100%) + rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-svk.dts (100%) + rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2-xmc.dts (100%) + rename arch/arm64/boot/dts/broadcom/{ => northstar2}/ns2.dtsi (100%) + create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-fs4.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/stingray/stingray-sata.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt2712-evb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt2712e.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt7622.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/ipq8074-hk01.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq8074.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a77995-draak.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77995.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-sapphire-excavator.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi + mode change 120000 => 100644 arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi + mode change 120000 => 100644 arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi + mode change 120000 => 100644 arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi + create mode 100644 arch/arm64/boot/dts/zte/zx296718-pcbox.dts + delete mode 100644 drivers/reset/reset-gemini.c + create mode 100644 drivers/reset/reset-hsdk-v1.c + create mode 100644 drivers/soc/amlogic/Kconfig + create mode 100644 drivers/soc/amlogic/Makefile + create mode 100644 drivers/soc/amlogic/meson-gx-socinfo.c + create mode 100644 drivers/soc/renesas/r8a77995-sysc.c + delete mode 100644 include/dt-bindings/genpd/k2g.h + create mode 100644 include/dt-bindings/power/mt7622-power.h + create mode 100644 include/dt-bindings/power/r8a77995-sysc.h + create mode 100644 include/dt-bindings/power/rk3366-power.h + create mode 100644 include/dt-bindings/reset/snps,hsdk-v1-reset.h +Merging actions/for-next (253d192bc4aa Merge branch 'v4.14/dt' into next) +$ git merge actions/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/owl-s500.dtsi | 3 +++ + 1 file changed, 3 insertions(+) +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 (b951316e2f33 Merge branch 'v4.14/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/amlogic,meson8b-clkc.txt | 9 +- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 7 ++ + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 20 +++- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 7 ++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 7 ++ + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 6 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 9 ++ + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 8 +- + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 7 ++ + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 64 +++++++++++ + .../dts/amlogic/meson-gxl-s905x-nexbox-a95x.dts | 7 ++ + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 7 ++ + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 10 ++ + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 7 ++ + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 + + drivers/clk/meson/gxbb.c | 2 + + drivers/clk/meson/gxbb.h | 125 +++------------------ + drivers/clk/meson/meson8b.c | 1 + + drivers/clk/meson/meson8b.h | 103 +---------------- + include/dt-bindings/clock/gxbb-aoclkc.h | 1 + + include/dt-bindings/clock/gxbb-clkc.h | 63 +++++++++++ + include/dt-bindings/clock/meson8b-clkc.h | 70 ++++++++++++ + .../dt-bindings/reset/amlogic,meson8b-clkc-reset.h | 27 +++++ + 23 files changed, 354 insertions(+), 217 deletions(-) + create mode 100644 include/dt-bindings/reset/amlogic,meson8b-clkc-reset.h +Merging aspeed/for-next (0eead81e7847 Merge branches 'dt-for-v4.14' and 'defconfig-for-v4.14' into for-next) +$ git merge aspeed/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (01c1fe77824e Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/boot/dts/Makefile +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 | 38 ++ + drivers/soc/atmel/soc.c | 8 + + drivers/soc/atmel/soc.h | 4 + + 7 files changed, 702 insertions(+), 11 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 (e83e7335d059 Merge branch anholt/bcm2835-defconfig-next into for-next) +$ git merge bcm2835/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (b90b6c45ff6b Merge branch 'zte/dt64' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (f922ce7bbcf5 Merge branch 'for_4.14/keystone_dts' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (2ca6aa7f6960 Merge branch 'mvebu/dt' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (a70cb93b6c2f Merge branch 'omap-for-v4.14/dt-v3' into for-next) +$ git merge omap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +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 (ac0c735ac3dd reset: uniphier: add analog amplifiers reset control) +$ git merge reset/reset/next +Already up-to-date. +Merging qcom/for-next (b212aba8f7bf Merge tag 'qcom-drivers-for-4.14' into final-for-sure-4.14) +$ git merge qcom/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging realtek/for-next (932a3d80019d Merge branch 'v4.14/dt64' into next) +$ git merge realtek/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/realtek/rtd1295.dtsi | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) +Merging renesas/next (e6bf13206283 Merge branches 'arm64-dt-for-v4.14', 'dt-bindings-for-v4.14' and 'dt-for-v4.14' into next) +$ git merge renesas/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (23b856f7af3c Merge branch 'v4.14-armsoc/dts64' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3128-cru.txt | 8 +- + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 70 ++++ + drivers/clk/clk-fractional-divider.c | 28 +- + drivers/clk/rockchip/clk-rk3128.c | 69 ++- + drivers/clk/rockchip/clk-rk3228.c | 2 +- + drivers/clk/rockchip/clk-rv1108.c | 462 +++++++++++++++++---- + drivers/clk/rockchip/clk.c | 36 ++ + include/dt-bindings/clock/rk3228-cru.h | 1 + + include/dt-bindings/clock/rv1108-cru.h | 8 +- + include/linux/clk-provider.h | 3 + + 10 files changed, 577 insertions(+), 110 deletions(-) +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (2ea659a9ef48 Linux 4.12-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (e6f2efc1a7da Merge branch 'next/soc' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (edec428a0cd6 Merge branch 'sunxi/clk-for-4.14' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/sunxi-ccu.txt | 4 + + drivers/clk/sunxi-ng/Kconfig | 5 + + drivers/clk/sunxi-ng/Makefile | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 13 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.h | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 1290 ++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun8i-r40.h | 69 ++ + drivers/clk/sunxi-ng/ccu_div.c | 22 +- + drivers/clk/sunxi-ng/ccu_div.h | 3 +- + drivers/clk/sunxi-ng/ccu_frac.c | 14 +- + drivers/clk/sunxi-ng/ccu_frac.h | 2 +- + drivers/clk/sunxi-ng/ccu_mult.c | 10 +- + drivers/clk/sunxi-ng/ccu_nkm.c | 22 +- + drivers/clk/sunxi-ng/ccu_nkm.h | 2 + + drivers/clk/sunxi-ng/ccu_nm.c | 19 +- + include/dt-bindings/clock/sun8i-r40-ccu.h | 187 +++ + include/dt-bindings/reset/sun8i-r40-ccu.h | 130 ++ + 17 files changed, 1773 insertions(+), 22 deletions(-) + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-r40.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun8i-r40.h + create mode 100644 include/dt-bindings/clock/sun8i-r40-ccu.h + create mode 100644 include/dt-bindings/reset/sun8i-r40-ccu.h +Merging tegra/for-next (b4aed883ebbe Merge branch for-4.14/arm/defconfig into for-next) +$ git merge tegra/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (d1be5c99a034 arm64: cleanup {COMPAT_,}SET_PERSONALITY() macro) +$ git merge arm64/for-next/core +Resolved 'arch/arm64/kernel/fpsimd.c' using previous resolution. +Auto-merging kernel/fork.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/kernel/head.S +Auto-merging arch/arm64/kernel/fpsimd.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/fpsimd.c +Auto-merging arch/arm64/include/asm/elf.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e77cf29cadf9] Merge remote-tracking branch 'arm64/for-next/core' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm64/cpu-feature-registers.txt | 2 + + arch/arm64/Kconfig | 13 ++ + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/asm-bug.h | 54 +++++ + arch/arm64/include/asm/assembler.h | 25 +- + arch/arm64/include/asm/bug.h | 35 +-- + arch/arm64/include/asm/cacheflush.h | 4 +- + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/efi.h | 13 +- + arch/arm64/include/asm/elf.h | 2 - + arch/arm64/include/asm/esr.h | 42 +++- + arch/arm64/include/asm/fpsimd.h | 16 +- + arch/arm64/include/asm/fpsimdmacros.h | 56 ----- + arch/arm64/include/asm/hugetlb.h | 9 +- + arch/arm64/include/asm/irq.h | 42 ---- + arch/arm64/include/asm/kvm_mmu.h | 21 +- + arch/arm64/include/asm/memory.h | 53 +++++ + arch/arm64/include/asm/mmu.h | 2 + + arch/arm64/include/asm/neon.h | 16 +- + arch/arm64/include/asm/numa.h | 3 - + arch/arm64/include/asm/page-def.h | 34 +++ + arch/arm64/include/asm/page.h | 12 +- + arch/arm64/include/asm/pgtable-prot.h | 18 +- + arch/arm64/include/asm/pgtable.h | 103 ++++----- + arch/arm64/include/asm/processor.h | 4 +- + arch/arm64/include/asm/ptrace.h | 31 ++- + arch/arm64/include/asm/signal32.h | 2 - + arch/arm64/include/asm/simd.h | 56 +++++ + arch/arm64/include/asm/smp.h | 2 +- + arch/arm64/include/asm/stacktrace.h | 61 ++++- + arch/arm64/include/asm/string.h | 4 + + arch/arm64/include/asm/sysreg.h | 1 + + arch/arm64/include/asm/thread_info.h | 13 +- + arch/arm64/include/asm/traps.h | 5 + + arch/arm64/include/asm/uaccess.h | 12 + + arch/arm64/include/uapi/asm/hwcap.h | 1 + + arch/arm64/kernel/asm-offsets.c | 1 + + arch/arm64/kernel/cpufeature.c | 13 ++ + arch/arm64/kernel/cpuinfo.c | 1 + + arch/arm64/kernel/entry-fpsimd.S | 24 -- + arch/arm64/kernel/entry.S | 283 +++++++++++++++-------- + arch/arm64/kernel/fpsimd.c | 172 ++++++++++---- + arch/arm64/kernel/head.S | 22 +- + arch/arm64/kernel/hibernate.c | 4 +- + arch/arm64/kernel/irq.c | 40 +++- + arch/arm64/kernel/machine_kexec.c | 2 +- + arch/arm64/kernel/perf_callchain.c | 1 - + arch/arm64/kernel/probes/uprobes.c | 2 +- + arch/arm64/kernel/process.c | 13 +- + arch/arm64/kernel/ptrace.c | 5 +- + arch/arm64/kernel/return_address.c | 1 - + arch/arm64/kernel/signal.c | 10 +- + arch/arm64/kernel/signal32.c | 2 +- + arch/arm64/kernel/smp.c | 14 +- + arch/arm64/kernel/stacktrace.c | 60 +---- + arch/arm64/kernel/time.c | 1 - + arch/arm64/kernel/traps.c | 79 ++++--- + arch/arm64/kernel/vdso.c | 15 ++ + arch/arm64/kernel/vmlinux.lds.S | 18 +- + arch/arm64/kvm/hyp/s2-setup.c | 2 +- + arch/arm64/lib/Makefile | 2 + + arch/arm64/lib/uaccess_flushcache.c | 47 ++++ + arch/arm64/mm/cache.S | 37 ++- + arch/arm64/mm/dma-mapping.c | 4 +- + arch/arm64/mm/fault.c | 77 +++++-- + arch/arm64/mm/flush.c | 16 ++ + arch/arm64/mm/hugetlbpage.c | 314 +++++++++++++++++++------- + drivers/acpi/arm64/iort.c | 140 +++++++----- + drivers/firmware/efi/libstub/arm64-stub.c | 6 +- + include/linux/raid/pq.h | 1 + + include/linux/thread_info.h | 4 + + kernel/fork.c | 3 +- + lib/raid6/Makefile | 4 +- + lib/raid6/algos.c | 3 + + lib/raid6/neon.uc | 33 ++- + lib/raid6/recov_neon.c | 110 +++++++++ + lib/raid6/recov_neon_inner.c | 117 ++++++++++ + 77 files changed, 1725 insertions(+), 749 deletions(-) + create mode 100644 arch/arm64/include/asm/asm-bug.h + create mode 100644 arch/arm64/include/asm/page-def.h + create mode 100644 arch/arm64/include/asm/simd.h + create mode 100644 arch/arm64/lib/uaccess_flushcache.c + create mode 100644 lib/raid6/recov_neon.c + create mode 100644 lib/raid6/recov_neon_inner.c +Merging clk/clk-next (69a6beab0852 clk: msm8996-gcc: add missing smmu clks) +$ git merge clk/clk-next +Resolved 'MAINTAINERS' using previous resolution. +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 23fe6d4fae5b] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/amlogic,gxbb-aoclkc.txt | 22 +- + .../devicetree/bindings/clock/idt,versaclock5.txt | 30 +- + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 3 +- + .../bindings/clock/renesas,rcar-usb2-clock-sel.txt | 55 ++++ + .../devicetree/bindings/clock/snps,pll-clock.txt | 28 ++ + .../devicetree/bindings/clock/uniphier-clock.txt | 5 - + MAINTAINERS | 6 + + drivers/clk/Kconfig | 6 +- + drivers/clk/axs10x/Makefile | 1 + + drivers/clk/axs10x/pll_clock.c | 346 +++++++++++++++++++++ + drivers/clk/berlin/bg2.c | 3 +- + drivers/clk/berlin/bg2q.c | 7 +- + drivers/clk/clk-asm9260.c | 4 +- + drivers/clk/clk-conf.c | 16 +- + drivers/clk/clk-moxart.c | 16 +- + drivers/clk/clk-qoriq.c | 26 +- + drivers/clk/clk-stm32f4.c | 4 +- + drivers/clk/clk-versaclock5.c | 172 +++++++++- + drivers/clk/clk-xgene.c | 15 +- + drivers/clk/clk.c | 4 +- + drivers/clk/clkdev.c | 4 +- + drivers/clk/mediatek/clk-cpumux.c | 6 +- + drivers/clk/mediatek/clk-mtk.c | 2 +- + drivers/clk/mediatek/reset.c | 2 +- + drivers/clk/meson/Kconfig | 1 + + drivers/clk/meson/Makefile | 2 +- + drivers/clk/meson/gxbb-aoclk-32k.c | 194 ++++++++++++ + drivers/clk/meson/gxbb-aoclk-regmap.c | 46 +++ + drivers/clk/meson/gxbb-aoclk.c | 65 ++-- + drivers/clk/meson/gxbb-aoclk.h | 42 +++ + drivers/clk/meson/gxbb.c | 187 ++++++++++- + drivers/clk/meson/meson8b.c | 159 +++++++++- + drivers/clk/meson/meson8b.h | 9 +- + drivers/clk/mmp/clk.c | 2 +- + drivers/clk/qcom/clk-smd-rpm.c | 2 - + drivers/clk/qcom/gcc-msm8916.c | 2 +- + drivers/clk/qcom/gcc-msm8996.c | 28 ++ + drivers/clk/renesas/Kconfig | 48 +-- + drivers/clk/renesas/Makefile | 2 + + drivers/clk/renesas/clk-div6.c | 3 + + drivers/clk/renesas/clk-mstp.c | 2 +- + drivers/clk/renesas/clk-rcar-gen2.c | 3 +- + drivers/clk/renesas/r8a7792-cpg-mssr.c | 7 + + drivers/clk/renesas/r8a7795-cpg-mssr.c | 34 +- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 35 ++- + drivers/clk/renesas/r8a77995-cpg-mssr.c | 236 ++++++++++++++ + drivers/clk/renesas/rcar-gen3-cpg.c | 69 ++-- + drivers/clk/renesas/rcar-gen3-cpg.h | 15 +- + drivers/clk/renesas/rcar-usb2-clock-sel.c | 188 +++++++++++ + drivers/clk/renesas/renesas-cpg-mssr.c | 6 + + drivers/clk/renesas/renesas-cpg-mssr.h | 1 + + drivers/clk/rockchip/clk.c | 2 +- + drivers/clk/samsung/clk-exynos-audss.c | 8 +- + drivers/clk/samsung/clk-exynos5420.c | 23 +- + drivers/clk/sunxi-ng/ccu-sun5i.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 3 +- + drivers/clk/sunxi/clk-sunxi.c | 17 +- + drivers/clk/tegra/clk-emc.c | 12 +- + drivers/clk/tegra/clk-pll.c | 159 +++------- + drivers/clk/tegra/clk-tegra-periph.c | 3 +- + drivers/clk/tegra/clk-tegra-super-gen4.c | 11 +- + drivers/clk/tegra/clk-tegra210.c | 32 +- + drivers/clk/tegra/clk.h | 6 - + drivers/clk/ti/adpll.c | 2 +- + drivers/clk/ti/apll.c | 2 +- + drivers/clk/ti/clockdomain.c | 4 +- + drivers/clk/ti/fapll.c | 4 +- + drivers/clk/uniphier/clk-uniphier-core.c | 16 +- + drivers/clk/uniphier/clk-uniphier-mio.c | 4 +- + drivers/clk/uniphier/clk-uniphier-sys.c | 42 +-- + drivers/clk/uniphier/clk-uniphier.h | 3 +- + include/dt-bindings/clock/qcom,gcc-msm8996.h | 2 + + include/dt-bindings/clock/r8a77995-cpg-mssr.h | 57 ++++ + 78 files changed, 2145 insertions(+), 456 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/renesas,rcar-usb2-clock-sel.txt + create mode 100644 Documentation/devicetree/bindings/clock/snps,pll-clock.txt + create mode 100644 drivers/clk/axs10x/pll_clock.c + create mode 100644 drivers/clk/meson/gxbb-aoclk-32k.c + create mode 100644 drivers/clk/meson/gxbb-aoclk-regmap.c + create mode 100644 drivers/clk/meson/gxbb-aoclk.h + create mode 100644 drivers/clk/renesas/r8a77995-cpg-mssr.c + create mode 100644 drivers/clk/renesas/rcar-usb2-clock-sel.c + create mode 100644 include/dt-bindings/clock/r8a77995-cpg-mssr.h +Merging clk-samsung/for-next (599cebea93e6 clk: samsung: exynos542x: Enable clock rate propagation up to the EPLL) +$ git merge clk-samsung/for-next +Already up-to-date. +Merging c6x/for-linux-next (636d42117800 c6x: Convert to using %pOF instead of full_name) +$ git merge c6x/for-linux-next +Merge made by the 'recursive' strategy. + arch/c6x/configs/dsk6455_defconfig | 2 -- + arch/c6x/configs/evmc6457_defconfig | 2 -- + arch/c6x/configs/evmc6472_defconfig | 2 -- + arch/c6x/configs/evmc6474_defconfig | 2 -- + arch/c6x/configs/evmc6678_defconfig | 2 -- + arch/c6x/platforms/megamod-pic.c | 22 +++++++++++----------- + arch/c6x/platforms/plldata.c | 4 ++-- + arch/c6x/platforms/timer64.c | 8 ++++---- + 8 files changed, 17 insertions(+), 27 deletions(-) +Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE)) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (558d5ad276c9 m68k/mac: Avoid soft-lockup warning after mach_power_off) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/configs/amiga_defconfig | 7 +++++-- + arch/m68k/configs/apollo_defconfig | 7 +++++-- + arch/m68k/configs/atari_defconfig | 8 ++++++-- + arch/m68k/configs/bvme6000_defconfig | 7 +++++-- + arch/m68k/configs/hp300_defconfig | 7 +++++-- + arch/m68k/configs/mac_defconfig | 7 +++++-- + arch/m68k/configs/multi_defconfig | 7 +++++-- + arch/m68k/configs/mvme147_defconfig | 7 +++++-- + arch/m68k/configs/mvme16x_defconfig | 7 +++++-- + arch/m68k/configs/q40_defconfig | 7 +++++-- + arch/m68k/configs/sun3_defconfig | 7 +++++-- + arch/m68k/configs/sun3x_defconfig | 7 +++++-- + arch/m68k/include/asm/asm-prototypes.h | 5 +++++ + arch/m68k/mac/misc.c | 16 ++++++++++++++-- + 14 files changed, 80 insertions(+), 26 deletions(-) + create mode 100644 arch/m68k/include/asm/asm-prototypes.h +Merging m68knommu/for-next (ac54c6a0f0ce m68knommu: remove dead code) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/clk.c | 3 +++ + arch/m68k/coldfire/m5441x.c | 37 ------------------------------------- + 2 files changed, 3 insertions(+), 37 deletions(-) +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 (47184d3d0797 Merge branches '4.13-fixes', '4.13-fp-fixes' and '4.14-features' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/kernel/r6000_fpu.S +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mips/ni.txt | 7 + + Documentation/devicetree/bindings/mips/ralink.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 19 ++ + arch/mips/Kconfig | 17 +- + arch/mips/Makefile | 4 +- + arch/mips/alchemy/devboards/db1200.c | 64 +++-- + arch/mips/alchemy/devboards/db1300.c | 31 +- + arch/mips/alchemy/devboards/db1xxx.c | 2 + + arch/mips/ath79/clock.c | 9 +- + arch/mips/boot/Makefile | 16 +- + arch/mips/boot/dts/Makefile | 1 + + arch/mips/boot/dts/ingenic/ci20.dts | 37 +++ + arch/mips/boot/dts/ni/169445.dts | 100 +++++++ + arch/mips/boot/dts/ni/Makefile | 7 + + arch/mips/boot/dts/ralink/Makefile | 2 + + arch/mips/boot/dts/ralink/mt7628a.dtsi | 126 ++++++++ + arch/mips/boot/dts/ralink/omega2p.dts | 18 ++ + arch/mips/boot/dts/ralink/vocore2.dts | 18 ++ + arch/mips/cavium-octeon/smp.c | 6 +- + arch/mips/configs/cavium_octeon_defconfig | 25 +- + arch/mips/configs/ci20_defconfig | 1 + + arch/mips/configs/generic/board-ni169445.config | 27 ++ + arch/mips/configs/gpr_defconfig | 4 - + arch/mips/configs/lemote2f_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 4 - + arch/mips/configs/nlm_xlp_defconfig | 1 - + arch/mips/configs/nlm_xlr_defconfig | 4 - + arch/mips/configs/omega2p_defconfig | 129 +++++++++ + arch/mips/configs/pistachio_defconfig | 5 +- + arch/mips/configs/vocore2_defconfig | 129 +++++++++ + arch/mips/fw/arc/init.c | 2 +- + arch/mips/generic/Kconfig | 6 + + arch/mips/generic/Platform | 4 + + arch/mips/generic/board-boston.its.S | 22 ++ + arch/mips/generic/board-ni169445.its.S | 22 ++ + arch/mips/generic/init.c | 5 + + arch/mips/generic/irq.c | 1 + + arch/mips/generic/vmlinux.its.S | 25 -- + arch/mips/include/asm/bmips.h | 4 +- + arch/mips/include/asm/cpu-type.h | 5 - + arch/mips/include/asm/cpu.h | 5 - + arch/mips/include/asm/fpu_emulator.h | 118 +++++++- + .../asm/mach-au1x00/cpu-feature-overrides.h | 26 ++ + .../asm/mach-cavium-octeon/cpu-feature-overrides.h | 6 +- + arch/mips/include/asm/mach-ip27/topology.h | 1 - + arch/mips/include/asm/mach-loongson64/loongson.h | 2 +- + arch/mips/include/asm/mach-loongson64/topology.h | 1 - + arch/mips/include/asm/module.h | 2 - + arch/mips/include/asm/netlogic/common.h | 2 +- + arch/mips/include/asm/smp-ops.h | 12 +- + arch/mips/include/asm/smp.h | 10 +- + arch/mips/kernel/Makefile | 14 +- + arch/mips/kernel/cpu-probe.c | 20 +- + arch/mips/kernel/idle.c | 1 + + arch/mips/kernel/mips-r2-to-r6-emul.c | 14 +- + arch/mips/kernel/octeon_switch.S | 11 +- + arch/mips/kernel/pm-cps.c | 2 +- + arch/mips/kernel/r2300_fpu.S | 80 +++++- + arch/mips/kernel/r2300_switch.S | 81 ------ + arch/mips/kernel/r4k_fpu.S | 196 +++++++++++++ + arch/mips/kernel/r4k_switch.S | 203 ------------- + arch/mips/kernel/r6000_fpu.S | 99 ------- + arch/mips/kernel/smp-bmips.c | 4 +- + arch/mips/kernel/smp-cmp.c | 2 +- + arch/mips/kernel/smp-cps.c | 4 +- + arch/mips/kernel/smp-mt.c | 2 +- + arch/mips/kernel/smp-up.c | 2 +- + arch/mips/kernel/smp.c | 4 +- + arch/mips/kernel/time.c | 14 - + arch/mips/kernel/traps.c | 18 +- + arch/mips/kernel/unaligned.c | 2 +- + arch/mips/lib/delay.c | 1 + + arch/mips/loongson64/loongson-3/smp.c | 2 +- + arch/mips/math-emu/Makefile | 6 +- + arch/mips/math-emu/cp1emu.c | 284 +++++++++++++++++- + arch/mips/math-emu/dp_fmax.c | 84 ++++-- + arch/mips/math-emu/dp_fmin.c | 86 ++++-- + arch/mips/math-emu/dp_maddf.c | 246 ++++++++++------ + arch/mips/math-emu/dp_rint.c | 89 ++++++ + arch/mips/math-emu/ieee754.h | 2 + + arch/mips/math-emu/ieee754int.h | 4 + + arch/mips/math-emu/ieee754sp.h | 4 + + arch/mips/math-emu/me-debugfs.c | 318 ++++++++++++++++++++- + arch/mips/math-emu/sp_fmax.c | 84 ++++-- + arch/mips/math-emu/sp_fmin.c | 86 ++++-- + arch/mips/math-emu/sp_maddf.c | 229 +++++++-------- + arch/mips/math-emu/sp_rint.c | 90 ++++++ + arch/mips/mm/cache.c | 2 +- + arch/mips/mm/dma-default.c | 46 +-- + arch/mips/mm/init.c | 1 + + arch/mips/mm/mmap.c | 1 + + arch/mips/mm/tlbex.c | 5 - + arch/mips/netlogic/common/smp.c | 2 +- + arch/mips/paravirt/paravirt-smp.c | 2 +- + arch/mips/paravirt/setup.c | 2 +- + arch/mips/pci/pci-legacy.c | 2 +- + arch/mips/pci/pci-mt7620.c | 2 +- + arch/mips/pci/pci-rt3883.c | 11 +- + arch/mips/ralink/Kconfig | 10 + + arch/mips/sgi-ip27/ip27-smp.c | 2 +- + arch/mips/sibyte/bcm1480/smp.c | 2 +- + arch/mips/sibyte/common/cfe.c | 4 +- + arch/mips/sibyte/sb1250/smp.c | 2 +- + drivers/pcmcia/db1xxx_ss.c | 33 ++- + 105 files changed, 2601 insertions(+), 1013 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mips/ni.txt + create mode 100644 arch/mips/boot/dts/ni/169445.dts + create mode 100644 arch/mips/boot/dts/ni/Makefile + create mode 100644 arch/mips/boot/dts/ralink/mt7628a.dtsi + create mode 100644 arch/mips/boot/dts/ralink/omega2p.dts + create mode 100644 arch/mips/boot/dts/ralink/vocore2.dts + create mode 100644 arch/mips/configs/generic/board-ni169445.config + create mode 100644 arch/mips/configs/omega2p_defconfig + create mode 100644 arch/mips/configs/vocore2_defconfig + create mode 100644 arch/mips/generic/board-boston.its.S + create mode 100644 arch/mips/generic/board-ni169445.its.S + delete mode 100644 arch/mips/kernel/r6000_fpu.S + create mode 100644 arch/mips/math-emu/dp_rint.c + create mode 100644 arch/mips/math-emu/sp_rint.c +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 (fd46cd55fbc5 printk-formats.txt: Add examples for %pF and %pS usage) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + Documentation/printk-formats.txt | 10 + + arch/parisc/Kconfig | 9 + + arch/parisc/Makefile | 16 +- + arch/parisc/boot/.gitignore | 2 + + arch/parisc/boot/Makefile | 26 +++ + arch/parisc/boot/compressed/.gitignore | 3 + + arch/parisc/boot/compressed/Makefile | 86 +++++++++ + arch/parisc/boot/compressed/head.S | 85 +++++++++ + arch/parisc/boot/compressed/misc.c | 301 ++++++++++++++++++++++++++++++ + arch/parisc/boot/compressed/vmlinux.lds.S | 101 ++++++++++ + arch/parisc/boot/compressed/vmlinux.scr | 10 + + arch/parisc/boot/install.sh | 65 +++++++ + arch/parisc/include/asm/mmu_context.h | 3 + + arch/parisc/include/asm/page.h | 4 + + arch/parisc/include/asm/pdc.h | 2 + + arch/parisc/include/asm/pdcpat.h | 14 ++ + arch/parisc/include/uapi/asm/mman.h | 6 +- + arch/parisc/kernel/firmware.c | 62 +++++- + arch/parisc/kernel/pci-dma.c | 3 +- + arch/parisc/kernel/pdt.c | 280 +++++++++++++++++++++++---- + arch/parisc/kernel/perf.c | 4 +- + arch/parisc/kernel/processor.c | 30 ++- + arch/parisc/kernel/real2.S | 4 + + arch/parisc/kernel/unwind.c | 4 +- + arch/parisc/lib/memcpy.c | 2 - + drivers/char/ipmi/ipmi_si_intf.c | 12 +- + drivers/input/keyboard/hilkbd.c | 10 +- + drivers/input/serio/gscps2.c | 10 +- + drivers/input/serio/hp_sdc.c | 4 +- + drivers/net/ethernet/i825xx/lasi_82596.c | 10 +- + drivers/parisc/asp.c | 4 +- + drivers/parisc/ccio-dma.c | 4 +- + drivers/parisc/ccio-rm-dma.c | 6 +- + drivers/parisc/dino.c | 4 +- + drivers/parisc/eisa.c | 4 +- + drivers/parisc/hppb.c | 6 +- + drivers/parisc/lasi.c | 4 +- + drivers/parisc/lba_pci.c | 46 ++++- + drivers/parisc/sba_iommu.c | 6 +- + drivers/parisc/superio.c | 4 +- + drivers/parisc/wax.c | 4 +- + drivers/parport/parport_gsc.c | 10 +- + drivers/scsi/lasi700.c | 6 +- + drivers/scsi/zalon.c | 8 +- + drivers/tty/serial/8250/8250_gsc.c | 8 +- + drivers/tty/serial/mux.c | 14 +- + drivers/video/console/sticore.c | 11 +- + sound/parisc/harmony.c | 10 +- + tools/arch/parisc/include/uapi/asm/mman.h | 2 - + 49 files changed, 1182 insertions(+), 157 deletions(-) + create mode 100644 arch/parisc/boot/.gitignore + create mode 100644 arch/parisc/boot/Makefile + create mode 100644 arch/parisc/boot/compressed/.gitignore + create mode 100644 arch/parisc/boot/compressed/Makefile + create mode 100644 arch/parisc/boot/compressed/head.S + create mode 100644 arch/parisc/boot/compressed/misc.c + create mode 100644 arch/parisc/boot/compressed/vmlinux.lds.S + create mode 100644 arch/parisc/boot/compressed/vmlinux.scr + create mode 100644 arch/parisc/boot/install.sh +Merging powerpc/next (d1d0d5ffb300 powerpc/64: Optimise set/clear of CTRL[RUN] (runlatch)) +$ git merge powerpc/next +Auto-merging mm/hugetlb.c +Auto-merging include/linux/cpuhotplug.h +Auto-merging arch/powerpc/platforms/8xx/pic.c +Auto-merging arch/powerpc/platforms/4xx/uic.c +Auto-merging arch/powerpc/platforms/4xx/soc.c +Auto-merging arch/powerpc/platforms/4xx/pci.c +Auto-merging arch/powerpc/platforms/4xx/msi.c +Auto-merging arch/powerpc/platforms/4xx/gpio.c +Auto-merging arch/powerpc/platforms/4xx/cpm.c +Removing arch/powerpc/mm/icswx_pid.c +Removing arch/powerpc/mm/icswx.h +Removing arch/powerpc/mm/icswx.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c +Auto-merging arch/powerpc/Kconfig +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-firmware-opal-powercap | 31 + + Documentation/ABI/testing/sysfs-firmware-opal-psr | 18 + + .../bindings/powerpc/opal/sensor-groups.txt | 27 + + arch/powerpc/Kconfig | 34 +- + arch/powerpc/Makefile | 6 +- + arch/powerpc/boot/Makefile | 4 +- + arch/powerpc/boot/dts/fsp2.dts | 33 +- + arch/powerpc/boot/ppc_asm.h | 8 + + arch/powerpc/boot/util.S | 24 +- + arch/powerpc/configs/44x/fsp2_defconfig | 2 + + arch/powerpc/configs/be.config | 1 + + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/book3s/32/pgtable.h | 4 +- + arch/powerpc/include/asm/book3s/64/hash.h | 6 +- + arch/powerpc/include/asm/book3s/64/hugetlb.h | 4 +- + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 2 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 8 +- + arch/powerpc/include/asm/book3s/64/pgalloc.h | 2 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 9 +- + arch/powerpc/include/asm/book3s/64/radix.h | 2 + + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 5 +- + arch/powerpc/include/asm/cache.h | 2 +- + arch/powerpc/include/asm/cpuidle.h | 11 + + arch/powerpc/include/asm/cputable.h | 4 +- + arch/powerpc/include/asm/fixmap.h | 10 +- + arch/powerpc/include/asm/fs_pd.h | 2 +- + arch/powerpc/include/asm/hardirq.h | 4 + + arch/powerpc/include/asm/hugetlb.h | 14 - + arch/powerpc/include/asm/imc-pmu.h | 128 ++ + arch/powerpc/include/asm/mmu_context.h | 76 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 5 +- + arch/powerpc/include/asm/nohash/pgtable.h | 1 + + arch/powerpc/include/asm/opal-api.h | 24 +- + arch/powerpc/include/asm/opal.h | 17 + + arch/powerpc/include/asm/paca.h | 7 + + arch/powerpc/include/asm/pgalloc.h | 2 + + arch/powerpc/include/asm/pgtable.h | 12 +- + arch/powerpc/include/asm/pnv-pci.h | 2 + + arch/powerpc/include/asm/ppc-opcode.h | 4 + + arch/powerpc/include/asm/ppc_asm.h | 16 +- + arch/powerpc/include/asm/pte-walk.h | 35 + + arch/powerpc/include/asm/reg.h | 86 +- + arch/powerpc/include/asm/reg_booke.h | 3 - + arch/powerpc/include/asm/string.h | 24 + + arch/powerpc/include/asm/timex.h | 6 +- + arch/powerpc/include/asm/tlb.h | 11 +- + arch/powerpc/include/asm/topology.h | 2 - + arch/powerpc/kernel/Makefile | 4 +- + arch/powerpc/kernel/asm-offsets.c | 8 + + arch/powerpc/kernel/btext.c | 2 +- + arch/powerpc/kernel/cacheinfo.c | 34 +- + arch/powerpc/kernel/cputable.c | 8 +- + arch/powerpc/kernel/eeh.c | 4 +- + arch/powerpc/kernel/entry_32.S | 22 + + arch/powerpc/kernel/entry_64.S | 7 +- + arch/powerpc/kernel/exceptions-64s.S | 37 +- + arch/powerpc/kernel/head_32.S | 6 +- + arch/powerpc/kernel/head_8xx.S | 109 +- + arch/powerpc/kernel/idle_book3s.S | 65 +- + arch/powerpc/kernel/io-workarounds.c | 9 +- + arch/powerpc/kernel/iommu.c | 4 +- + arch/powerpc/kernel/irq.c | 65 +- + arch/powerpc/kernel/isa-bridge.c | 32 +- + arch/powerpc/kernel/kgdb.c | 4 +- + arch/powerpc/kernel/l2cr_6xx.S | 4 +- + arch/powerpc/kernel/legacy_serial.c | 12 +- + arch/powerpc/kernel/mce.c | 33 + + arch/powerpc/kernel/of_platform.c | 2 +- + arch/powerpc/kernel/pci-common.c | 15 +- + arch/powerpc/kernel/pci_32.c | 4 +- + arch/powerpc/kernel/pci_64.c | 4 +- + arch/powerpc/kernel/pci_of_scan.c | 24 +- + arch/powerpc/kernel/process.c | 89 +- + arch/powerpc/kernel/setup-common.c | 9 +- + arch/powerpc/kernel/swsusp_asm64.S | 2 +- + arch/powerpc/kernel/traps.c | 198 +-- + arch/powerpc/kernel/vdso32/gettimeofday.S | 12 +- + arch/powerpc/kernel/vmlinux.lds.S | 2 +- + arch/powerpc/kernel/watchdog.c | 3 + + arch/powerpc/kvm/book3s_64_mmu_hv.c | 5 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 32 +- + arch/powerpc/kvm/book3s_64_vio_hv.c | 12 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 18 +- + arch/powerpc/kvm/e500_mmu_host.c | 3 +- + arch/powerpc/lib/copypage_power7.S | 14 +- + arch/powerpc/lib/copyuser_power7.S | 66 +- + arch/powerpc/lib/mem_64.S | 19 +- + arch/powerpc/lib/memcpy_power7.S | 66 +- + arch/powerpc/lib/sstep.c | 118 +- + arch/powerpc/lib/string_64.S | 2 +- + arch/powerpc/mm/8xx_mmu.c | 29 +- + arch/powerpc/mm/Makefile | 4 +- + arch/powerpc/mm/fault.c | 562 +++++---- + arch/powerpc/mm/hash_utils_64.c | 16 +- + arch/powerpc/mm/hugetlbpage.c | 219 +--- + arch/powerpc/mm/icswx.c | 292 ----- + arch/powerpc/mm/icswx.h | 68 - + arch/powerpc/mm/icswx_pid.c | 87 -- + arch/powerpc/mm/init_32.c | 8 +- + arch/powerpc/mm/init_64.c | 6 +- + arch/powerpc/mm/mem.c | 2 +- + arch/powerpc/mm/mmu_context.c | 99 ++ + arch/powerpc/mm/mmu_context_book3s64.c | 20 +- + arch/powerpc/mm/mmu_decl.h | 10 +- + arch/powerpc/mm/pgtable-book3s64.c | 24 +- + arch/powerpc/mm/pgtable-hash64.c | 12 +- + arch/powerpc/mm/pgtable-radix.c | 22 +- + arch/powerpc/mm/pgtable_32.c | 66 +- + arch/powerpc/mm/pgtable_64.c | 2 + + arch/powerpc/mm/slb_low.S | 23 +- + arch/powerpc/mm/tlb-radix.c | 108 +- + arch/powerpc/mm/tlb_hash64.c | 13 +- + arch/powerpc/mm/tlb_nohash_low.S | 2 +- + arch/powerpc/net/bpf_jit_comp64.c | 6 +- + arch/powerpc/perf/Makefile | 1 + + arch/powerpc/perf/callchain.c | 3 +- + arch/powerpc/perf/imc-pmu.c | 1306 ++++++++++++++++++++ + arch/powerpc/perf/isa207-common.c | 31 +- + arch/powerpc/perf/isa207-common.h | 5 +- + arch/powerpc/perf/power8-pmu.c | 33 +- + arch/powerpc/perf/power9-events-list.h | 9 +- + arch/powerpc/perf/power9-pmu.c | 23 +- + arch/powerpc/platforms/44x/Makefile | 4 +- + arch/powerpc/platforms/44x/machine_check.c | 89 ++ + arch/powerpc/platforms/4xx/Makefile | 8 + + .../{sysdev/ppc4xx_cpm.c => platforms/4xx/cpm.c} | 8 +- + .../{sysdev/ppc4xx_gpio.c => platforms/4xx/gpio.c} | 3 +- + .../ppc4xx_hsta_msi.c => platforms/4xx/hsta_msi.c} | 0 + arch/powerpc/platforms/4xx/machine_check.c | 26 + + .../{sysdev/ppc4xx_msi.c => platforms/4xx/msi.c} | 3 +- + .../{sysdev/ppc4xx_ocm.c => platforms/4xx/ocm.c} | 0 + .../{sysdev/ppc4xx_pci.c => platforms/4xx/pci.c} | 118 +- + .../{sysdev/ppc4xx_pci.h => platforms/4xx/pci.h} | 0 + .../{sysdev/ppc4xx_soc.c => platforms/4xx/soc.c} | 5 +- + arch/powerpc/{sysdev => platforms/4xx}/uic.c | 14 +- + arch/powerpc/platforms/512x/mpc512x_shared.c | 12 +- + arch/powerpc/platforms/52xx/efika.c | 8 +- + arch/powerpc/platforms/52xx/media5200.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 4 +- + arch/powerpc/platforms/52xx/mpc52xx_pci.c | 8 +- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 3 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +- + arch/powerpc/platforms/85xx/p1022_ds.c | 8 +- + arch/powerpc/platforms/85xx/xes_mpc85xx.c | 4 +- + arch/powerpc/platforms/8xx/Kconfig | 3 +- + arch/powerpc/platforms/8xx/Makefile | 2 +- + arch/powerpc/platforms/8xx/m8xx_setup.c | 2 +- + arch/powerpc/platforms/8xx/machine_check.c | 37 + + .../{sysdev/mpc8xx_pic.c => platforms/8xx/pic.c} | 2 +- + .../{sysdev/mpc8xx_pic.h => platforms/8xx/pic.h} | 0 + arch/powerpc/platforms/Kconfig.cputype | 45 +- + arch/powerpc/platforms/Makefile | 1 + + arch/powerpc/platforms/amigaone/setup.c | 6 +- + arch/powerpc/platforms/cell/axon_msi.c | 36 +- + arch/powerpc/platforms/cell/interrupt.c | 4 +- + arch/powerpc/platforms/cell/iommu.c | 24 +- + arch/powerpc/platforms/cell/ras.c | 4 +- + arch/powerpc/platforms/cell/spider-pci.c | 4 +- + arch/powerpc/platforms/cell/spider-pic.c | 4 +- + arch/powerpc/platforms/cell/spu_manage.c | 26 +- + arch/powerpc/platforms/chrp/pci.c | 18 +- + arch/powerpc/platforms/chrp/pegasos_eth.c | 2 +- + arch/powerpc/platforms/embedded6xx/linkstation.c | 6 +- + arch/powerpc/platforms/embedded6xx/mvme5100.c | 2 +- + arch/powerpc/platforms/embedded6xx/storcenter.c | 2 +- + arch/powerpc/platforms/maple/pci.c | 10 +- + arch/powerpc/platforms/pasemi/pci.c | 2 +- + arch/powerpc/platforms/powermac/feature.c | 14 +- + arch/powerpc/platforms/powermac/low_i2c.c | 50 +- + arch/powerpc/platforms/powermac/pci.c | 6 +- + arch/powerpc/platforms/powermac/pfunc_base.c | 24 +- + arch/powerpc/platforms/powermac/pfunc_core.c | 6 +- + arch/powerpc/platforms/powermac/pic.c | 8 +- + arch/powerpc/platforms/powermac/setup.c | 2 +- + arch/powerpc/platforms/powernv/Makefile | 3 +- + arch/powerpc/platforms/powernv/idle.c | 34 +- + arch/powerpc/platforms/powernv/opal-async.c | 4 +- + arch/powerpc/platforms/powernv/opal-flash.c | 2 +- + arch/powerpc/platforms/powernv/opal-imc.c | 226 ++++ + arch/powerpc/platforms/powernv/opal-powercap.c | 244 ++++ + arch/powerpc/platforms/powernv/opal-prd.c | 13 +- + arch/powerpc/platforms/powernv/opal-psr.c | 175 +++ + .../powerpc/platforms/powernv/opal-sensor-groups.c | 212 ++++ + arch/powerpc/platforms/powernv/opal-wrappers.S | 9 + + arch/powerpc/platforms/powernv/opal-xscom.c | 8 +- + arch/powerpc/platforms/powernv/opal.c | 24 + + arch/powerpc/platforms/powernv/pci-ioda.c | 18 +- + arch/powerpc/platforms/powernv/pci.c | 75 ++ + arch/powerpc/platforms/powernv/pci.h | 5 + + arch/powerpc/platforms/powernv/rng.c | 45 +- + arch/powerpc/platforms/powernv/smp.c | 11 +- + arch/powerpc/platforms/pseries/dlpar.c | 9 +- + arch/powerpc/platforms/pseries/event_sources.c | 6 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 6 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 53 +- + arch/powerpc/platforms/pseries/ibmebus.c | 5 +- + arch/powerpc/platforms/pseries/iommu.c | 58 +- + arch/powerpc/platforms/pseries/mobility.c | 2 +- + arch/powerpc/platforms/pseries/msi.c | 12 +- + arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- + arch/powerpc/platforms/pseries/pseries.h | 2 +- + arch/powerpc/platforms/pseries/pseries_energy.c | 7 +- + arch/powerpc/platforms/pseries/reconfig.c | 15 +- + arch/powerpc/platforms/pseries/vio.c | 10 +- + arch/powerpc/purgatory/trampoline.S | 2 +- + arch/powerpc/sysdev/Makefile | 12 +- + arch/powerpc/sysdev/axonram.c | 4 +- + arch/powerpc/sysdev/dcr.c | 4 +- + arch/powerpc/sysdev/fsl_85xx_cache_sram.c | 12 +- + arch/powerpc/sysdev/fsl_gtm.c | 14 +- + arch/powerpc/sysdev/fsl_msi.c | 16 +- + arch/powerpc/sysdev/fsl_pci.c | 47 +- + arch/powerpc/sysdev/fsl_rio.c | 36 +- + arch/powerpc/sysdev/fsl_rmu.c | 12 +- + arch/powerpc/sysdev/fsl_soc.c | 2 +- + arch/powerpc/sysdev/fsl_soc.h | 2 +- + arch/powerpc/sysdev/ipic.c | 1 + + arch/powerpc/sysdev/mpic.c | 4 +- + arch/powerpc/sysdev/mpic_msgr.c | 2 +- + arch/powerpc/sysdev/mpic_msi.c | 2 +- + arch/powerpc/sysdev/mpic_timer.c | 19 +- + arch/powerpc/sysdev/msi_bitmap.c | 4 +- + arch/powerpc/sysdev/mv64x60_dev.c | 20 +- + arch/powerpc/sysdev/mv64x60_pci.c | 6 +- + arch/powerpc/sysdev/of_rtc.c | 12 +- + arch/powerpc/sysdev/scom.c | 5 +- + arch/powerpc/sysdev/simple_gpio.c | 3 +- + arch/powerpc/sysdev/tsi108_pci.c | 4 +- + arch/powerpc/sysdev/xive/common.c | 14 +- + arch/powerpc/sysdev/xive/native.c | 4 +- + arch/powerpc/xmon/Makefile | 4 + + arch/powerpc/xmon/xmon.c | 26 +- + drivers/block/ps3vram.c | 10 +- + drivers/macintosh/rack-meter.c | 2 +- + drivers/macintosh/windfarm_cpufreq_clamp.c | 2 +- + drivers/macintosh/windfarm_rm31.c | 4 +- + drivers/macintosh/windfarm_smu_controls.c | 2 +- + drivers/misc/cxl/fault.c | 6 + + drivers/tty/hvc/hvc_vio.c | 12 + + include/linux/cpuhotplug.h | 3 + + include/linux/hugetlb.h | 1 + + mm/hugetlb.c | 4 +- + tools/testing/selftests/powerpc/tm/Makefile | 1 + + .../testing/selftests/powerpc/tm/tm-resched-dscr.c | 12 +- + 244 files changed, 4971 insertions(+), 2395 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-opal-powercap + create mode 100644 Documentation/ABI/testing/sysfs-firmware-opal-psr + create mode 100644 Documentation/devicetree/bindings/powerpc/opal/sensor-groups.txt + create mode 100644 arch/powerpc/configs/be.config + create mode 100644 arch/powerpc/include/asm/imc-pmu.h + create mode 100644 arch/powerpc/include/asm/pte-walk.h + delete mode 100644 arch/powerpc/mm/icswx.c + delete mode 100644 arch/powerpc/mm/icswx.h + delete mode 100644 arch/powerpc/mm/icswx_pid.c + create mode 100644 arch/powerpc/mm/mmu_context.c + create mode 100644 arch/powerpc/perf/imc-pmu.c + create mode 100644 arch/powerpc/platforms/44x/machine_check.c + create mode 100644 arch/powerpc/platforms/4xx/Makefile + rename arch/powerpc/{sysdev/ppc4xx_cpm.c => platforms/4xx/cpm.c} (97%) + rename arch/powerpc/{sysdev/ppc4xx_gpio.c => platforms/4xx/gpio.c} (98%) + rename arch/powerpc/{sysdev/ppc4xx_hsta_msi.c => platforms/4xx/hsta_msi.c} (100%) + create mode 100644 arch/powerpc/platforms/4xx/machine_check.c + rename arch/powerpc/{sysdev/ppc4xx_msi.c => platforms/4xx/msi.c} (98%) + rename arch/powerpc/{sysdev/ppc4xx_ocm.c => platforms/4xx/ocm.c} (100%) + rename arch/powerpc/{sysdev/ppc4xx_pci.c => platforms/4xx/pci.c} (95%) + rename arch/powerpc/{sysdev/ppc4xx_pci.h => platforms/4xx/pci.h} (100%) + rename arch/powerpc/{sysdev/ppc4xx_soc.c => platforms/4xx/soc.c} (97%) + rename arch/powerpc/{sysdev => platforms/4xx}/uic.c (95%) + create mode 100644 arch/powerpc/platforms/8xx/machine_check.c + rename arch/powerpc/{sysdev/mpc8xx_pic.c => platforms/8xx/pic.c} (99%) + rename arch/powerpc/{sysdev/mpc8xx_pic.h => platforms/8xx/pic.h} (100%) + create mode 100644 arch/powerpc/platforms/powernv/opal-imc.c + create mode 100644 arch/powerpc/platforms/powernv/opal-powercap.c + create mode 100644 arch/powerpc/platforms/powernv/opal-psr.c + create mode 100644 arch/powerpc/platforms/powernv/opal-sensor-groups.c +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 (76b22affdf15 s390/uaccess: avoid mvcos jump label) +$ git merge s390/features +Auto-merging arch/s390/include/uapi/asm/vmcp.h +Removing arch/s390/include/uapi/asm/swab.h +Removing arch/s390/include/asm/unaligned.h +Removing arch/s390/include/asm/types.h +Auto-merging arch/s390/include/asm/tlb.h +Removing arch/s390/include/asm/mman.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 + + arch/s390/Kconfig | 18 ++ + arch/s390/Makefile | 6 +- + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/cpcmd.h | 7 +- + arch/s390/include/asm/ebcdic.h | 4 +- + 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/mman.h | 11 -- + arch/s390/include/asm/mmu_context.h | 33 +--- + arch/s390/include/asm/nmi.h | 2 +- + arch/s390/include/asm/page-states.h | 1 + + arch/s390/include/asm/page.h | 37 ++-- + arch/s390/include/asm/pgalloc.h | 18 +- + arch/s390/include/asm/pgtable.h | 195 +++++++++++++-------- + arch/s390/include/asm/processor.h | 2 +- + arch/s390/include/asm/qdio.h | 2 +- + arch/s390/include/asm/setup.h | 17 +- + arch/s390/include/asm/spinlock.h | 14 +- + arch/s390/include/asm/timex.h | 40 ++++- + arch/s390/include/asm/tlb.h | 6 +- + arch/s390/include/asm/tlbflush.h | 7 +- + arch/s390/include/asm/topology.h | 6 - + arch/s390/include/asm/types.h | 11 -- + arch/s390/include/asm/unaligned.h | 13 -- + arch/s390/include/uapi/asm/Kbuild | 1 + + arch/s390/include/uapi/asm/swab.h | 89 ---------- + .../char => arch/s390/include/uapi/asm}/vmcp.h | 20 +-- + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kernel/cpcmd.c | 13 +- + arch/s390/kernel/debug.c | 9 +- + arch/s390/kernel/dumpstack.c | 2 +- + arch/s390/kernel/early.c | 17 +- + arch/s390/kernel/head.S | 3 +- + arch/s390/kernel/head64.S | 4 +- + arch/s390/kernel/irq.c | 3 +- + arch/s390/kernel/relocate_kernel.S | 5 +- + arch/s390/kernel/setup.c | 14 +- + arch/s390/kernel/smp.c | 1 + + arch/s390/kernel/suspend.c | 24 ++- + arch/s390/kernel/time.c | 67 ++++--- + 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/lib/spinlock.c | 93 ++++++---- + arch/s390/lib/uaccess.c | 38 ++-- + arch/s390/mm/fault.c | 10 +- + arch/s390/mm/gmap.c | 124 ++++++------- + arch/s390/mm/init.c | 60 ++++++- + arch/s390/mm/page-states.c | 192 ++++++++++++++++++-- + arch/s390/mm/pageattr.c | 5 +- + arch/s390/mm/pgalloc.c | 12 +- + arch/s390/mm/pgtable.c | 154 ++++++++++++---- + arch/s390/mm/vmem.c | 47 ++--- + arch/s390/pci/pci_clp.c | 10 +- + arch/s390/tools/gen_facilities.c | 5 +- + drivers/s390/block/dasd.c | 36 +++- + drivers/s390/block/dasd_3990_erp.c | 2 +- + drivers/s390/block/dasd_devmap.c | 2 +- + drivers/s390/block/dasd_diag.c | 2 +- + drivers/s390/block/dasd_eckd.c | 8 +- + drivers/s390/block/dasd_eckd.h | 2 +- + drivers/s390/block/dasd_erp.c | 2 +- + drivers/s390/block/dasd_int.h | 16 +- + drivers/s390/block/dasd_proc.c | 2 +- + drivers/s390/block/scm_blk.c | 13 +- + drivers/s390/char/Kconfig | 11 ++ + drivers/s390/char/raw3270.c | 2 +- + drivers/s390/char/sclp_cmd.c | 1 + + drivers/s390/char/sclp_config.c | 2 +- + drivers/s390/char/sclp_early.c | 6 +- + drivers/s390/char/sclp_ocf.c | 2 +- + drivers/s390/char/tape_core.c | 2 +- + drivers/s390/char/vmcp.c | 112 +++++++++--- + drivers/s390/cio/chp.c | 4 +- + drivers/s390/cio/device.c | 4 +- + drivers/s390/cio/vfio_ccw_cp.c | 2 +- + drivers/s390/crypto/zcrypt_card.c | 2 +- + drivers/s390/crypto/zcrypt_queue.c | 2 +- + drivers/s390/net/qeth_l3_sys.c | 8 +- + 86 files changed, 1156 insertions(+), 684 deletions(-) + delete mode 100644 arch/s390/include/asm/mman.h + delete mode 100644 arch/s390/include/asm/types.h + delete mode 100644 arch/s390/include/asm/unaligned.h + delete mode 100644 arch/s390/include/uapi/asm/swab.h + rename {drivers/s390/char => arch/s390/include/uapi/asm}/vmcp.h (56%) +Merging sparc-next/master (cc324d1a3e35 Merge branch 'sparc64-16gb-hugepages') +$ git merge sparc-next/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/sparc/configs/sparc64_defconfig | 1 + + arch/sparc/include/asm/hugetlb.h | 7 + + arch/sparc/include/asm/hypervisor.h | 18 + + arch/sparc/include/asm/page_64.h | 3 +- + arch/sparc/include/asm/pgtable_64.h | 20 +- + arch/sparc/include/asm/smp_64.h | 5 + + arch/sparc/include/asm/tsb.h | 36 ++ + arch/sparc/include/asm/vio.h | 9 + + arch/sparc/kernel/head_64.S | 18 +- + arch/sparc/kernel/hvapi.c | 2 +- + arch/sparc/kernel/hvcalls.S | 11 + + arch/sparc/kernel/ldc.c | 2 + + arch/sparc/kernel/process_64.c | 7 +- + arch/sparc/kernel/setup_64.c | 1 + + arch/sparc/kernel/smp_64.c | 80 ++- + arch/sparc/kernel/tsb.S | 2 +- + arch/sparc/kernel/vio.c | 1 + + arch/sparc/kernel/viohs.c | 12 +- + arch/sparc/kernel/vmlinux.lds.S | 5 + + arch/sparc/lib/M7copy_from_user.S | 40 ++ + arch/sparc/lib/M7copy_to_user.S | 51 ++ + arch/sparc/lib/M7memcpy.S | 923 +++++++++++++++++++++++++++ + arch/sparc/lib/M7memset.S | 352 +++++++++++ + arch/sparc/lib/M7patch.S | 51 ++ + arch/sparc/lib/Makefile | 5 + + arch/sparc/lib/Memcpy_utils.S | 345 ++++++++++ + arch/sparc/lib/NG4memcpy.S | 277 ++------ + arch/sparc/lib/U3memcpy.S | 32 +- + arch/sparc/mm/gup.c | 45 +- + arch/sparc/mm/hugetlbpage.c | 102 +-- + arch/sparc/mm/init_64.c | 54 +- + drivers/tty/Kconfig | 5 + + drivers/tty/Makefile | 1 + + drivers/tty/vcc.c | 1155 ++++++++++++++++++++++++++++++++++ + 35 files changed, 3390 insertions(+), 289 deletions(-) + create mode 100644 arch/sparc/lib/M7copy_from_user.S + create mode 100644 arch/sparc/lib/M7copy_to_user.S + create mode 100644 arch/sparc/lib/M7memcpy.S + create mode 100644 arch/sparc/lib/M7memset.S + create mode 100644 arch/sparc/lib/M7patch.S + create mode 100644 arch/sparc/lib/Memcpy_utils.S + create mode 100644 drivers/tty/vcc.c +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 (637f23abca87 tile: array underflow in setup_maxnodemem()) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/configs/tilegx_defconfig | 1 - + arch/tile/configs/tilepro_defconfig | 2 -- + arch/tile/kernel/setup.c | 2 +- + 3 files changed, 1 insertion(+), 4 deletions(-) +Merging uml/linux-next (2fb44600fe78 um: Fix check for _xstate for older hosts) +$ git merge uml/linux-next +Merge made by the 'recursive' strategy. + arch/x86/um/user-offsets.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 1c60fc30d4f1] Merge remote-tracking branch 'unicore32/unicore32' +$ git diff -M --stat --summary HEAD^.. + arch/unicore32/Kconfig | 14 + + arch/unicore32/include/asm/Kbuild | 1 - + arch/unicore32/include/asm/signal.h | 21 + + arch/unicore32/include/asm/syscalls.h | 25 + + arch/unicore32/include/uapi/asm/sigcontext.h | 14 + + arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++ + arch/unicore32/include/uapi/asm/stat.h | 19 + + arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++ + arch/unicore32/include/uapi/asm/unistd.h | 8 + + arch/unicore32/kernel/entry.S | 17 + + arch/unicore32/kernel/signal.c | 41 ++ + 11 files changed, 1000 insertions(+), 1 deletion(-) + create mode 100644 arch/unicore32/include/asm/signal.h + create mode 100644 arch/unicore32/include/asm/syscalls.h + create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h + create mode 100644 arch/unicore32/include/uapi/asm/stat.h + create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h +Merging xtensa/xtensa-for-next (271335b9726e Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (c250b7dd8e73 fscrypt: make ->dummy_context() return bool) +$ git merge fscrypt/master +Already up-to-date. +Merging befs/for-next (5771a8c08880 Linux v4.13-rc1) +$ git merge befs/for-next +Already up-to-date. +Merging btrfs/next (ff108ad6692a crypto: Add zstd support) +$ git merge btrfs/next +Auto-merging fs/btrfs/disk-io.c +Auto-merging crypto/testmgr.h +Merge made by the 'recursive' strategy. + crypto/Kconfig | 9 + + crypto/Makefile | 1 + + crypto/testmgr.c | 10 + + crypto/testmgr.h | 71 + + crypto/zstd.c | 265 ++++ + fs/btrfs/Kconfig | 2 + + fs/btrfs/Makefile | 2 +- + fs/btrfs/compression.c | 1 + + fs/btrfs/compression.h | 6 +- + fs/btrfs/ctree.h | 1 + + fs/btrfs/disk-io.c | 2 + + fs/btrfs/ioctl.c | 6 +- + fs/btrfs/props.c | 6 + + fs/btrfs/super.c | 12 +- + fs/btrfs/sysfs.c | 2 + + fs/btrfs/zstd.c | 432 ++++++ + include/linux/xxhash.h | 236 +++ + include/linux/zstd.h | 1157 +++++++++++++++ + include/uapi/linux/btrfs.h | 8 +- + lib/Kconfig | 11 + + lib/Makefile | 3 + + lib/xxhash.c | 500 +++++++ + lib/zstd/Makefile | 18 + + lib/zstd/bitstream.h | 374 +++++ + lib/zstd/compress.c | 3484 ++++++++++++++++++++++++++++++++++++++++++++ + lib/zstd/decompress.c | 2528 ++++++++++++++++++++++++++++++++ + lib/zstd/entropy_common.c | 243 +++ + lib/zstd/error_private.h | 53 + + lib/zstd/fse.h | 575 ++++++++ + lib/zstd/fse_compress.c | 795 ++++++++++ + lib/zstd/fse_decompress.c | 332 +++++ + lib/zstd/huf.h | 212 +++ + lib/zstd/huf_compress.c | 770 ++++++++++ + lib/zstd/huf_decompress.c | 960 ++++++++++++ + lib/zstd/mem.h | 151 ++ + lib/zstd/zstd_common.c | 75 + + lib/zstd/zstd_internal.h | 263 ++++ + lib/zstd/zstd_opt.h | 1014 +++++++++++++ + 38 files changed, 14578 insertions(+), 12 deletions(-) + create mode 100644 crypto/zstd.c + create mode 100644 fs/btrfs/zstd.c + create mode 100644 include/linux/xxhash.h + create mode 100644 include/linux/zstd.h + create mode 100644 lib/xxhash.c + create mode 100644 lib/zstd/Makefile + create mode 100644 lib/zstd/bitstream.h + create mode 100644 lib/zstd/compress.c + create mode 100644 lib/zstd/decompress.c + create mode 100644 lib/zstd/entropy_common.c + create mode 100644 lib/zstd/error_private.h + create mode 100644 lib/zstd/fse.h + create mode 100644 lib/zstd/fse_compress.c + create mode 100644 lib/zstd/fse_decompress.c + create mode 100644 lib/zstd/huf.h + create mode 100644 lib/zstd/huf_compress.c + create mode 100644 lib/zstd/huf_decompress.c + create mode 100644 lib/zstd/mem.h + create mode 100644 lib/zstd/zstd_common.c + create mode 100644 lib/zstd/zstd_internal.h + create mode 100644 lib/zstd/zstd_opt.h +Merging btrfs-kdave/for-next (d112b114021d Merge branch 'for-next-next-v4.14-20170822' into for-next-20170822) +$ git merge btrfs-kdave/for-next +Resolved 'fs/btrfs/compression.h' using previous resolution. +Resolved 'fs/btrfs/inode.c' using previous resolution. +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/props.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +CONFLICT (content): Merge conflict in fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/compression.h +CONFLICT (content): Merge conflict in fs/btrfs/compression.h +Auto-merging fs/btrfs/compression.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 11cc5458ce45] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/acl.c | 6 +- + fs/btrfs/async-thread.c | 6 +- + fs/btrfs/async-thread.h | 6 +- + fs/btrfs/backref.c | 1085 ++++++++++++++------------------ + fs/btrfs/backref.h | 16 +- + fs/btrfs/btrfs_inode.h | 13 +- + fs/btrfs/check-integrity.c | 8 +- + fs/btrfs/compression.c | 35 +- + fs/btrfs/compression.h | 3 +- + fs/btrfs/ctree.c | 14 +- + fs/btrfs/ctree.h | 183 +++--- + fs/btrfs/delayed-inode.c | 1 + + fs/btrfs/dev-replace.c | 74 ++- + fs/btrfs/disk-io.c | 242 +++---- + fs/btrfs/disk-io.h | 10 +- + fs/btrfs/extent-tree.c | 200 ++++-- + fs/btrfs/extent_io.c | 92 ++- + fs/btrfs/extent_io.h | 19 +- + fs/btrfs/file.c | 19 +- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/free-space-tree.c | 2 +- + fs/btrfs/free-space-tree.h | 3 +- + fs/btrfs/inode.c | 220 +++++-- + fs/btrfs/ioctl.c | 116 ++-- + fs/btrfs/print-tree.c | 40 +- + fs/btrfs/print-tree.h | 4 +- + fs/btrfs/props.c | 10 +- + fs/btrfs/qgroup.c | 7 +- + fs/btrfs/relocation.c | 32 +- + fs/btrfs/root-tree.c | 9 +- + fs/btrfs/scrub.c | 47 +- + fs/btrfs/send.c | 21 +- + fs/btrfs/struct-funcs.c | 9 +- + fs/btrfs/super.c | 41 +- + fs/btrfs/tests/btrfs-tests.c | 1 - + fs/btrfs/tests/free-space-tree-tests.c | 2 +- + fs/btrfs/tree-log.c | 9 +- + fs/btrfs/volumes.c | 296 ++++----- + fs/btrfs/volumes.h | 8 +- + include/trace/events/btrfs.h | 331 ++++++---- + 40 files changed, 1702 insertions(+), 1540 deletions(-) +Merging ceph/master (326547a91b3f ceph: fix readpage from fscache) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + fs/ceph/addr.c | 24 +++++++++++++++--------- + fs/ceph/cache.c | 12 +++--------- + 2 files changed, 18 insertions(+), 18 deletions(-) +Merging cifs/for-next (1758a3d2ba3b CIFS: remove endian related sparse warning) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsglob.h | 2 +- + fs/cifs/cifsproto.h | 3 +- + fs/cifs/cifssmb.c | 3 +- + fs/cifs/dir.c | 2 +- + fs/cifs/smb2ops.c | 204 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/cifs/smb2pdu.c | 22 ++++++ + fs/cifs/smb2pdu.h | 14 +++- + fs/cifs/smb2proto.h | 6 ++ + fs/cifs/xattr.c | 2 +- + 9 files changed, 251 insertions(+), 7 deletions(-) +Merging configfs/for-next (19e72d3abb63 configfs: Introduce config_item_get_unless_zero()) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 15 --------------- + fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ecryptfs/miscdev.c | 2 +- + 5 files changed, 11 insertions(+), 19 deletions(-) +Merging ext3/for_next (77405e51fa21 Merge quota scalability patches) +$ git merge ext3/for_next +Auto-merging include/linux/fs.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 14 +- + fs/ext4/super.c | 26 +-- + fs/isofs/inode.c | 11 +- + fs/ocfs2/quota_global.c | 36 ++-- + fs/ocfs2/quota_local.c | 17 +- + fs/quota/dquot.c | 504 +++++++++++++++++++++++---------------------- + fs/quota/quota_tree.c | 10 +- + fs/quota/quota_v1.c | 11 +- + fs/quota/quota_v2.c | 93 +++++++-- + fs/reiserfs/journal.c | 2 +- + fs/stat.c | 2 +- + fs/super.c | 2 +- + fs/udf/inode.c | 13 +- + fs/udf/namei.c | 2 +- + fs/udf/super.c | 12 +- + include/linux/fs.h | 4 + + include/linux/quota.h | 31 +-- + include/linux/quotaops.h | 5 - + include/uapi/linux/quota.h | 1 - + 19 files changed, 436 insertions(+), 360 deletions(-) +Merging ext4/dev (42d4a99b09cb ext4: fix fault handling when mounted with -o dax,ro) +$ git merge ext4/dev +Auto-merging fs/ext4/super.c +Merge made by the 'recursive' strategy. + fs/ext4/dir.c | 2 +- + fs/ext4/ext4.h | 11 ++--- + fs/ext4/file.c | 19 ++++++-- + fs/ext4/hash.c | 4 -- + fs/ext4/ialloc.c | 74 ++++++++++++++++++----------- + fs/ext4/inode.c | 8 ---- + fs/ext4/mmp.c | 2 +- + fs/ext4/super.c | 38 ++++++++++++--- + fs/ext4/xattr.c | 141 ++++++++++++++++++++++++++++++++++++------------------- + 9 files changed, 194 insertions(+), 105 deletions(-) +Merging f2fs/dev (a36c106dffb6 f2fs: use printk_ratelimited for f2fs_msg) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 1 + + fs/f2fs/acl.c | 5 +- + fs/f2fs/checkpoint.c | 2 +- + fs/f2fs/data.c | 19 ++- + fs/f2fs/f2fs.h | 184 +++++++++++++++++--- + fs/f2fs/file.c | 341 +++++++++++++++++++++++++++++++------ + fs/f2fs/gc.c | 11 +- + fs/f2fs/inline.c | 132 +++++++------- + fs/f2fs/inode.c | 128 ++++++++++++-- + fs/f2fs/namei.c | 40 +++++ + fs/f2fs/node.c | 70 +++++--- + fs/f2fs/recovery.c | 7 +- + fs/f2fs/segment.c | 21 ++- + fs/f2fs/super.c | 96 +++++++++-- + fs/f2fs/sysfs.c | 164 ++++++++++++++---- + fs/f2fs/xattr.c | 2 +- + include/linux/f2fs_fs.h | 40 ++--- + 17 files changed, 1007 insertions(+), 256 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 (9183976ef1c8 fuse: set mapping error in writepage_locked when it fails) +$ git merge fuse/for-next +Already up-to-date. +Merging jfs/jfs-next (f070e5ac9bc7 jfs: preserve i_mode if __jfs_set_acl() fails) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (7af7a5963c40 Merge branch 'bugfixes') +$ git merge nfs/linux-next +Auto-merging net/sunrpc/svcsock.c +Merge made by the 'recursive' strategy. + fs/nfs/callback_proc.c | 2 +- + fs/nfs/delegation.c | 2 +- + fs/nfs/direct.c | 4 +- + fs/nfs/inode.c | 10 +- + fs/nfs/nfs4_fs.h | 11 + + fs/nfs/nfs4proc.c | 273 ++++++++++-------- + fs/nfs/pagelist.c | 144 ++++------ + fs/nfs/pnfs.c | 41 --- + fs/nfs/pnfs.h | 2 - + fs/nfs/pnfs_nfs.c | 37 ++- + fs/nfs/read.c | 2 +- + fs/nfs/super.c | 12 +- + fs/nfs/write.c | 442 ++++++++++++++--------------- + include/linux/nfs_fs.h | 5 +- + include/linux/nfs_page.h | 6 +- + include/linux/nfs_xdr.h | 2 +- + include/linux/sunrpc/sched.h | 2 + + include/linux/sunrpc/xprt.h | 3 + + net/sunrpc/backchannel_rqst.c | 4 +- + net/sunrpc/clnt.c | 8 + + net/sunrpc/svcsock.c | 6 +- + net/sunrpc/xprt.c | 55 +++- + net/sunrpc/xprtrdma/rpc_rdma.c | 8 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 7 +- + net/sunrpc/xprtsock.c | 82 +++--- + 25 files changed, 595 insertions(+), 575 deletions(-) +Merging nfsd/nfsd-next (cafad00a8202 svcrdma: Clean up svc_rdma_build_read_chunk()) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/svcsock.c +Auto-merging fs/nfsd/nfs4xdr.c +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 2 +- + fs/nfs/callback.c | 10 +- + fs/nfsd/nfs4proc.c | 109 +++++------ + fs/nfsd/nfs4xdr.c | 326 +++++++++++-------------------- + fs/nfsd/nfssvc.c | 2 +- + fs/nfsd/xdr4.h | 49 +++++ + include/linux/sunrpc/svc.h | 6 +- + include/linux/sunrpc/svc_xprt.h | 4 +- + net/sunrpc/svc.c | 6 +- + net/sunrpc/svcsock.c | 6 +- + net/sunrpc/xprtrdma/svc_rdma_rw.c | 8 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 4 +- + 12 files changed, 235 insertions(+), 297 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 880e9e518c3b Merge remote-tracking branch 'nfs/linux-next' +Merging next-20170824 version of nfsd +$ git merge -m next-20170824/nfsd b20dae70bfa5014fdf201d0a8589271b888e4927 +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 (4edb83bb1041 ovl: constant d_ino for non-merge dirs) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + fs/overlayfs/dir.c | 11 +- + fs/overlayfs/inode.c | 3 + + fs/overlayfs/overlayfs.h | 8 +- + fs/overlayfs/readdir.c | 383 +++++++++++++++++++++++++++++++++++++++++++---- + fs/overlayfs/super.c | 1 + + fs/overlayfs/util.c | 24 ++- + 6 files changed, 383 insertions(+), 47 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 (e255b13d466b xfs: evict all inodes involved with log redo item) +$ git merge xfs/for-next +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/inode.c | 1 + + fs/internal.h | 1 - + fs/xfs/libxfs/xfs_ialloc.c | 55 ++++++++-------- + fs/xfs/xfs_buf_item.c | 60 ++++++++++++++++- + fs/xfs/xfs_buf_item.h | 3 + + fs/xfs/xfs_error.c | 3 + + fs/xfs/xfs_error.h | 4 +- + fs/xfs/xfs_inode_item.c | 47 ++++++++++++-- + fs/xfs/xfs_log.c | 26 +++++++- + fs/xfs/xfs_log_recover.c | 157 ++++++++++++++++++++++++++++----------------- + fs/xfs/xfs_trace.h | 18 ++++++ + fs/xfs/xfs_trans.h | 8 ++- + fs/xfs/xfs_trans_ail.c | 20 +++++- + fs/xfs/xfs_trans_priv.h | 31 +++++++++ + include/linux/fs.h | 1 + + 15 files changed, 334 insertions(+), 101 deletions(-) +Merging file-locks/locks-next (3953704fde7e locks: restore a warn for leaked locks on close) +$ git merge file-locks/locks-next +Auto-merging include/linux/fs.h +Auto-merging fs/fuse/file.c +Auto-merging fs/cifs/cifssmb.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 | 130 ++++++++++++++++-------- + include/linux/fs.h | 1 - + 8 files changed, 93 insertions(+), 54 deletions(-) +Merging wberr/wberr-next (6d4b51241394 ecryptfs: convert to file_write_and_wait in ->fsync) +$ git merge wberr/wberr-next +Auto-merging include/linux/fs.h +Auto-merging fs/fuse/file.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/9p/vfs_file.c +Merge made by the 'recursive' strategy. + Documentation/errseq.rst | 149 +++++++++++++++++++++++++++++ + arch/powerpc/platforms/cell/spufs/file.c | 2 +- + drivers/staging/lustre/lustre/llite/file.c | 2 +- + drivers/video/fbdev/core/fb_defio.c | 2 +- + fs/9p/vfs_file.c | 4 +- + fs/affs/file.c | 2 +- + fs/afs/write.c | 2 +- + fs/cifs/file.c | 4 +- + fs/ecryptfs/file.c | 2 +- + fs/exofs/file.c | 2 +- + fs/f2fs/file.c | 2 +- + fs/fuse/file.c | 6 +- + fs/gfs2/file.c | 6 +- + fs/hfs/inode.c | 2 +- + fs/hfsplus/inode.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/file.c | 2 +- + fs/jffs2/file.c | 2 +- + fs/jfs/file.c | 2 +- + fs/ncpfs/file.c | 2 +- + fs/ntfs/dir.c | 2 +- + fs/ntfs/file.c | 2 +- + fs/ocfs2/file.c | 2 +- + fs/reiserfs/dir.c | 2 +- + fs/reiserfs/file.c | 2 +- + fs/sync.c | 4 +- + fs/ubifs/file.c | 2 +- + include/linux/errseq.h | 14 +-- + include/linux/fs.h | 20 +++- + lib/errseq.c | 17 ++-- + mm/filemap.c | 64 ++++++------- + 31 files changed, 241 insertions(+), 89 deletions(-) + create mode 100644 Documentation/errseq.rst +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 (077a1cc06f72 printk: Clean up do_syslog() error handling) +$ git merge printk/for-next +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 69 +++++++++++++++++++++++--------------------------- + 1 file changed, 32 insertions(+), 37 deletions(-) +Merging pci/next (4da046ce92e8 Merge branch 'pci/virtualization' into next) +$ git merge pci/next +Resolved 'drivers/pci/probe.c' using previous resolution. +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/probe.c +CONFLICT (content): Merge conflict in drivers/pci/probe.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/msi.c +Auto-merging arch/sparc/kernel/pcic.c +Auto-merging arch/mips/pci/pci-legacy.c +Auto-merging arch/arm64/boot/dts/rockchip/rk3399.dtsi +Removing arch/arc/kernel/pcibios.c +Removing Documentation/devicetree/bindings/pci/mediatek,mt7623-pcie.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5d20e62c78ab] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/pci/mediatek,mt7623-pcie.txt | 130 ----- + .../devicetree/bindings/pci/mediatek-pcie.txt | 284 ++++++++++ + .../devicetree/bindings/pci/ralink,rt3883-pci.txt | 2 +- + .../devicetree/bindings/pci/rockchip-pcie.txt | 26 +- + .../devicetree/bindings/phy/rockchip-pcie-phy.txt | 7 +- + arch/alpha/kernel/pci.c | 27 +- + arch/alpha/kernel/sys_nautilus.c | 31 +- + arch/arc/kernel/Makefile | 1 - + arch/arc/kernel/pcibios.c | 22 - + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 8 +- + arch/arm64/kernel/pci.c | 17 - + arch/cris/arch-v32/drivers/pci/bios.c | 4 - + arch/ia64/pci/pci.c | 7 - + arch/m68k/coldfire/pci.c | 36 +- + arch/microblaze/include/asm/pci.h | 3 - + arch/microblaze/pci/pci-common.c | 145 ----- + arch/mips/pci/pci-legacy.c | 30 +- + arch/s390/pci/pci.c | 4 - + arch/sh/drivers/pci/fixups-cayman.c | 2 +- + arch/sh/drivers/pci/fixups-dreamcast.c | 2 +- + arch/sh/drivers/pci/fixups-r7780rp.c | 2 +- + arch/sh/drivers/pci/fixups-rts7751r2d.c | 6 +- + arch/sh/drivers/pci/fixups-sdk7780.c | 4 +- + arch/sh/drivers/pci/fixups-se7751.c | 2 +- + arch/sh/drivers/pci/fixups-sh03.c | 2 +- + arch/sh/drivers/pci/fixups-snapgear.c | 2 +- + arch/sh/drivers/pci/fixups-titan.c | 4 +- + arch/sh/drivers/pci/pci.c | 49 +- + arch/sh/drivers/pci/pcie-sh7786.c | 2 +- + arch/sparc/kernel/leon_pci.c | 30 +- + arch/sparc/kernel/pci.c | 10 - + arch/sparc/kernel/pcic.c | 6 - + arch/tile/kernel/pci.c | 39 +- + arch/tile/kernel/pci_gx.c | 35 +- + arch/unicore32/kernel/pci.c | 35 +- + drivers/misc/pci_endpoint_test.c | 132 ++++- + drivers/pci/dwc/pci-dra7xx.c | 19 +- + drivers/pci/dwc/pci-exynos.c | 4 +- + drivers/pci/dwc/pci-imx6.c | 11 +- + drivers/pci/dwc/pci-keystone-dw.c | 12 +- + drivers/pci/dwc/pci-keystone.c | 10 +- + drivers/pci/dwc/pci-keystone.h | 4 +- + drivers/pci/dwc/pci-layerscape.c | 14 +- + drivers/pci/dwc/pcie-armada8k.c | 8 +- + drivers/pci/dwc/pcie-artpec6.c | 4 +- + drivers/pci/dwc/pcie-designware-ep.c | 7 +- + drivers/pci/dwc/pcie-designware-host.c | 7 +- + drivers/pci/dwc/pcie-designware-plat.c | 4 +- + drivers/pci/dwc/pcie-designware.c | 12 +- + drivers/pci/dwc/pcie-designware.h | 3 +- + drivers/pci/dwc/pcie-hisi.c | 5 +- + drivers/pci/dwc/pcie-kirin.c | 6 +- + drivers/pci/dwc/pcie-qcom.c | 72 ++- + drivers/pci/dwc/pcie-spear13xx.c | 4 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 99 ++-- + drivers/pci/endpoint/pci-epc-core.c | 11 +- + drivers/pci/endpoint/pci-epc-mem.c | 59 +- + drivers/pci/endpoint/pci-epf-core.c | 21 +- + drivers/pci/host/Kconfig | 7 +- + drivers/pci/host/pci-aardvark.c | 5 +- + drivers/pci/host/pci-ftpci100.c | 6 +- + drivers/pci/host/pci-hyperv.c | 8 +- + drivers/pci/host/pci-mvebu.c | 11 +- + drivers/pci/host/pci-tegra.c | 9 +- + drivers/pci/host/pcie-altera-msi.c | 2 - + drivers/pci/host/pcie-altera.c | 9 +- + drivers/pci/host/pcie-iproc-msi.c | 2 - + drivers/pci/host/pcie-mediatek.c | 600 ++++++++++++++++++--- + drivers/pci/host/pcie-rcar.c | 12 +- + drivers/pci/host/pcie-rockchip.c | 164 ++++-- + drivers/pci/host/pcie-xilinx-nwl.c | 9 +- + drivers/pci/host/pcie-xilinx.c | 60 +-- + drivers/pci/host/vmd.c | 29 +- + drivers/pci/hotplug/cpcihp_zt5550.c | 2 +- + drivers/pci/hotplug/cpqphp_core.c | 2 +- + drivers/pci/hotplug/ibmphp_core.c | 2 +- + drivers/pci/hotplug/ibmphp_ebda.c | 2 +- + drivers/pci/hotplug/pciehp_hpc.c | 8 + + drivers/pci/hotplug/pnv_php.c | 4 +- + drivers/pci/hotplug/rpadlpar_core.c | 4 +- + drivers/pci/hotplug/rpadlpar_sysfs.c | 2 +- + drivers/pci/hotplug/rpaphp_core.c | 2 +- + drivers/pci/hotplug/rpaphp_pci.c | 4 +- + drivers/pci/hotplug/rpaphp_slot.c | 4 +- + drivers/pci/hotplug/shpchp_core.c | 2 +- + drivers/pci/hotplug/shpchp_hpc.c | 2 + + drivers/pci/msi.c | 27 +- + drivers/pci/pci-label.c | 4 +- + drivers/pci/pci-sysfs.c | 21 +- + drivers/pci/pci.c | 19 +- + drivers/pci/pci.h | 1 + + drivers/pci/pcie/aer/aerdrv.c | 25 +- + drivers/pci/pcie/portdrv_pci.c | 105 +--- + drivers/pci/probe.c | 52 +- + drivers/pci/quirks.c | 45 ++ + drivers/pci/setup-irq.c | 32 +- + drivers/pci/setup-res.c | 13 + + drivers/phy/rockchip/phy-rockchip-pcie.c | 131 ++++- + include/linux/pci-epc.h | 8 +- + include/linux/pci-epf.h | 11 +- + include/linux/pci.h | 62 ++- + include/linux/pcieport_if.h | 6 +- + tools/pci/pcitest.c | 1 + + 103 files changed, 2043 insertions(+), 1037 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pci/mediatek,mt7623-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/mediatek-pcie.txt + delete mode 100644 arch/arc/kernel/pcibios.c +Merging pstore/for-next/pstore (c71b02e4d207 Revert "pstore: Honor dmesg_restrict sysctl on dmesg dumps") +$ git merge pstore/for-next/pstore +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + fs/pstore/inode.c | 24 +----------------------- + include/linux/syslog.h | 9 --------- + kernel/printk/printk.c | 3 +-- + 3 files changed, 2 insertions(+), 34 deletions(-) +Merging hid/for-next (abbc4db7a3a0 Merge branch 'for-4.14/upstream' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 2 +- + drivers/hid/hid-asus.c | 218 ++++++++++++++++----- + drivers/hid/hid-core.c | 16 +- + drivers/hid/hid-ids.h | 5 +- + drivers/hid/hid-input.c | 196 ++++++++++++------ + drivers/hid/hid-logitech-hidpp.c | 2 +- + drivers/hid/hid-multitouch.c | 50 ++++- + drivers/hid/hid-ntrig.c | 2 +- + drivers/hid/hid-prodikeys.c | 2 +- + drivers/hid/hid-sensor-custom.c | 4 +- + drivers/hid/hid-sensor-hub.c | 94 --------- + drivers/hid/i2c-hid/i2c-hid.c | 3 +- + drivers/hid/uhid.c | 3 +- + drivers/hid/usbhid/hid-core.c | 3 +- + drivers/hid/usbhid/hid-quirks.c | 1 + + drivers/hid/usbhid/usbkbd.c | 2 +- + drivers/hid/usbhid/usbmouse.c | 2 +- + drivers/hid/wacom_sys.c | 63 +++--- + drivers/hid/wacom_wac.c | 8 +- + .../iio/common/hid-sensors/hid-sensor-attributes.c | 3 + + include/linux/hid.h | 18 +- + net/bluetooth/hidp/core.c | 3 +- + 22 files changed, 436 insertions(+), 264 deletions(-) +Merging i2c/i2c/for-next (264170d12d9c Merge branch 'i2c/for-4.14' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging include/linux/mfd/tps65010.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-cbus-gpio.txt | 4 +- + Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 5 +- + Documentation/devicetree/bindings/i2c/i2c-rk3x.txt | 1 + + .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 5 +- + Documentation/devicetree/bindings/mfd/retu.txt | 25 ++ + Documentation/devicetree/bindings/mfd/tps6105x.txt | 17 + + arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 4 +- + arch/arm/boot/dts/ste-hrefprev60.dtsi | 2 +- + arch/arm/mach-omap1/board-h2-mmc.c | 2 +- + arch/arm/mach-omap1/board-h2.c | 2 +- + arch/arm/mach-omap1/board-h3-mmc.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 2 +- + arch/arm/mach-omap1/board-nokia770.c | 4 +- + arch/arm/mach-omap1/board-osk.c | 2 +- + arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 2 +- + arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- + .../intel-mid/device_libs/platform_tc35876x.c | 2 +- + drivers/gpu/drm/gma500/tc35876x-dsi-lvds.c | 2 +- + drivers/i2c/busses/Kconfig | 8 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-aspeed.c | 74 ++++- + drivers/i2c/busses/i2c-bcm-iproc.c | 6 +- + drivers/i2c/busses/i2c-cadence.c | 6 +- + drivers/i2c/busses/i2c-cht-wc.c | 363 +++++++++++++++++++++ + drivers/i2c/busses/i2c-davinci.c | 8 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 6 +- + drivers/i2c/busses/i2c-designware-slave.c | 2 +- + drivers/i2c/busses/i2c-exynos5.c | 6 +- + drivers/i2c/busses/i2c-gpio.c | 4 +- + drivers/i2c/busses/i2c-hix5hd2.c | 6 +- + drivers/i2c/busses/i2c-lpc2k.c | 6 +- + drivers/i2c/busses/i2c-mt65xx.c | 65 ++-- + drivers/i2c/busses/i2c-mv64xxx.c | 5 +- + drivers/i2c/busses/i2c-pmcmsp.c | 4 +- + drivers/i2c/busses/i2c-powermac.c | 10 +- + drivers/i2c/busses/i2c-pxa.c | 6 +- + drivers/i2c/busses/i2c-rcar.c | 5 +- + drivers/i2c/busses/i2c-rk3x.c | 9 + + drivers/i2c/busses/i2c-s3c2410.c | 6 +- + drivers/i2c/busses/i2c-sh_mobile.c | 4 +- + drivers/i2c/busses/i2c-sirf.c | 6 +- + drivers/i2c/busses/i2c-st.c | 3 +- + drivers/i2c/busses/i2c-stm32f4.c | 4 +- + drivers/i2c/busses/i2c-sun6i-p2wi.c | 6 +- + drivers/i2c/busses/i2c-taos-evm.c | 2 +- + drivers/i2c/busses/i2c-tegra.c | 2 +- + drivers/i2c/busses/i2c-uniphier-f.c | 46 ++- + drivers/i2c/busses/i2c-uniphier.c | 40 ++- + drivers/i2c/busses/i2c-xiic.c | 6 +- + drivers/i2c/i2c-core-of.c | 24 +- + drivers/i2c/muxes/i2c-demux-pinctrl.c | 4 +- + drivers/input/misc/dm355evm_keys.c | 2 +- + drivers/mfd/dm355evm_msp.c | 2 +- + drivers/mfd/retu-mfd.c | 12 +- + drivers/mfd/tps6105x.c | 8 + + drivers/mfd/tps65010.c | 2 +- + drivers/rtc/rtc-dm355evm.c | 2 +- + drivers/usb/host/ohci-omap.c | 2 +- + drivers/usb/phy/phy-isp1301-omap.c | 2 +- + drivers/video/fbdev/omap/lcd_h3.c | 2 +- + include/linux/{i2c => mfd}/dm355evm_msp.h | 0 + include/linux/{i2c => mfd}/tps65010.h | 2 +- + include/linux/{i2c => platform_data}/tc35876x.h | 0 + 63 files changed, 707 insertions(+), 167 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/retu.txt + create mode 100644 Documentation/devicetree/bindings/mfd/tps6105x.txt + create mode 100644 drivers/i2c/busses/i2c-cht-wc.c + rename include/linux/{i2c => mfd}/dm355evm_msp.h (100%) + rename include/linux/{i2c => mfd}/tps65010.h (99%) + rename include/linux/{i2c => platform_data}/tc35876x.h (100%) +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 (f996c4155d0d dmi: Mark all struct dmi_system_id instances const) +$ git merge dmi/master +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/pcie/portdrv_pci.c +Auto-merging drivers/acpi/ec.c +Merge made by the 'recursive' strategy. + arch/x86/kernel/acpi/boot.c | 4 ++-- + arch/x86/kernel/apm_32.c | 2 +- + arch/x86/kernel/io_delay.c | 2 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/pci/irq.c | 2 +- + arch/x86/power/cpu.c | 2 +- + drivers/acpi/acpi_video.c | 2 +- + drivers/acpi/blacklist.c | 4 ++-- + drivers/acpi/bus.c | 4 ++-- + drivers/acpi/ec.c | 2 +- + drivers/acpi/osi.c | 2 +- + drivers/acpi/pci_slot.c | 2 +- + drivers/acpi/processor_pdc.c | 2 +- + drivers/acpi/sbs.c | 2 +- + drivers/acpi/sleep.c | 2 +- + drivers/acpi/thermal.c | 2 +- + drivers/char/sonypi.c | 2 +- + drivers/cpufreq/powernow-k7.c | 2 +- + drivers/firmware/google/gsmi.c | 2 +- + drivers/firmware/google/memconsole-x86-legacy.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gpio/base.c | 2 +- + drivers/hwmon/acpi_power_meter.c | 2 +- + drivers/hwmon/applesmc.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 4 ++-- + drivers/input/touchscreen/htcpen.c | 2 +- + drivers/leds/leds-clevo-mail.c | 2 +- + drivers/leds/leds-ss4200.c | 2 +- + drivers/mfd/kempld-core.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/via/via-rhine.c | 2 +- + drivers/pci/pcie/portdrv_pci.c | 2 +- + drivers/pci/quirks.c | 2 +- + drivers/platform/chrome/chromeos_laptop.c | 2 +- + drivers/platform/chrome/chromeos_pstore.c | 2 +- + drivers/platform/chrome/cros_ec_lpc.c | 2 +- + drivers/platform/x86/compal-laptop.c | 2 +- + drivers/platform/x86/hdaps.c | 2 +- + drivers/platform/x86/ibm_rtl.c | 2 +- + drivers/platform/x86/intel_oaktrail.c | 2 +- + drivers/platform/x86/mlx-platform.c | 2 +- + drivers/platform/x86/msi-laptop.c | 2 +- + drivers/platform/x86/samsung-laptop.c | 2 +- + drivers/platform/x86/samsung-q10.c | 2 +- + drivers/platform/x86/sony-laptop.c | 2 +- + drivers/platform/x86/toshiba-wmi.c | 2 +- + drivers/pnp/pnpbios/core.c | 2 +- + drivers/tty/serial/pch_uart.c | 2 +- + drivers/video/backlight/kb3886_bl.c | 2 +- + sound/soc/codecs/rt5645.c | 2 +- + 49 files changed, 53 insertions(+), 53 deletions(-) +Merging hwmon-staging/hwmon-next (d5553c26198f hwmon: (aspeed-pwm) add THERMAL dependency) +$ git merge hwmon-staging/hwmon-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/aspeed-pwm-tacho.txt | 9 + + Documentation/hwmon/ftsteutates | 4 + + drivers/hwmon/Kconfig | 1 + + drivers/hwmon/adc128d818.c | 2 +- + drivers/hwmon/ads1015.c | 14 +- + drivers/hwmon/adt7475.c | 16 +- + drivers/hwmon/aspeed-pwm-tacho.c | 116 ++++++++- + drivers/hwmon/ftsteutates.c | 2 + + drivers/hwmon/hwmon.c | 4 +- + drivers/hwmon/i5k_amb.c | 2 +- + drivers/hwmon/it87.c | 214 +++++++++++---- + drivers/hwmon/jc42.c | 19 ++ + drivers/hwmon/nct7802.c | 10 +- + drivers/hwmon/pmbus/pmbus_core.c | 288 +++++++++++++++++++-- + drivers/hwmon/scpi-hwmon.c | 2 +- + drivers/hwmon/stts751.c | 4 + + 16 files changed, 605 insertions(+), 102 deletions(-) +Merging jc_docs/docs-next (c1aa3871fa0f Documentation: stable-kernel-rules: fix broken git urls) +$ git merge jc_docs/docs-next +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/Makefile | 12 +- + Documentation/arm/firmware.txt | 2 +- + Documentation/conf.py | 4 +- + Documentation/dev-tools/gdb-kernel-debugging.rst | 6 +- + Documentation/dev-tools/kgdb.rst | 11 +- + Documentation/doc-guide/sphinx.rst | 109 +++- + Documentation/driver-api/basics.rst | 5 +- + Documentation/driver-api/dma-buf.rst | 3 - + Documentation/driver-api/miscellaneous.rst | 1 - + Documentation/driver-api/s390-drivers.rst | 2 +- + Documentation/driver-api/scsi.rst | 8 - + .../features/core/tracehook/arch-support.txt | 2 +- + Documentation/gpu/drm-mm.rst | 2 +- + Documentation/input/joydev/index.rst | 1 - + Documentation/kbuild/makefiles.txt | 6 +- + Documentation/locking/rt-mutex-design.txt | 432 ++++----------- + Documentation/locking/rt-mutex.txt | 58 +- + Documentation/media/uapi/cec/cec-funcs.rst | 1 - + Documentation/networking/ieee802154.txt | 16 +- + Documentation/nvmem/nvmem.txt | 2 +- + Documentation/process/changes.rst | 16 +- + Documentation/process/stable-kernel-rules.rst | 4 +- + Documentation/process/submitting-patches.rst | 2 +- + Documentation/security/keys/core.rst | 4 +- + Documentation/security/keys/request-key.rst | 2 +- + Documentation/security/keys/trusted-encrypted.rst | 2 +- + Documentation/sphinx-static/theme_overrides.css | 17 + + Documentation/sphinx/requirements.txt | 3 + + Documentation/translations/zh_CN/HOWTO | 2 - + Makefile | 2 +- + scripts/sphinx-pre-install | 609 +++++++++++++++++++++ + 31 files changed, 914 insertions(+), 432 deletions(-) + create mode 100644 Documentation/sphinx/requirements.txt + create mode 100755 scripts/sphinx-pre-install +Merging v4l-dvb/master (9a45bf28bc39 media: max2175: Propagate the real error on devm_clk_get() failure) +$ git merge v4l-dvb/master +Resolved 'arch/arm/configs/imx_v6_v7_defconfig' using previous resolution. +Auto-merging drivers/media/i2c/ov6650.c +Auto-merging arch/mips/configs/pistachio_defconfig +Auto-merging arch/arm/configs/sunxi_defconfig +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/imx_v6_v7_defconfig +Auto-merging MAINTAINERS +Removing Documentation/media/uapi/v4l/pixfmt-008.rst +Auto-merging Documentation/media/uapi/v4l/colorspaces-details.rst +Auto-merging Documentation/media/uapi/v4l/colorspaces-defs.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f5b8e88b1dac] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/leds/ams,as3645a.txt | 71 + + .../devicetree/bindings/leds/irled/gpio-ir-tx.txt | 14 + + .../devicetree/bindings/leds/irled/pwm-ir-tx.txt | 13 + + .../devicetree/bindings/media/i2c/adv748x.txt | 95 + + .../bindings/media/i2c/dongwoon,dw9714.txt | 9 + + .../devicetree/bindings/media/meson-ao-cec.txt | 28 + + .../devicetree/bindings/media/mtk-cir.txt | 8 +- + .../devicetree/bindings/media/qcom,camss.txt | 197 + + .../devicetree/bindings/media/renesas,drif.txt | 1 + + .../devicetree/bindings/media/video-interfaces.txt | 8 +- + .../devicetree/bindings/media/zx-irdec.txt | 14 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + 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 + + Documentation/media/kapi/csi2.rst | 10 + + Documentation/media/uapi/cec/cec-func-close.rst | 2 +- + Documentation/media/uapi/cec/cec-func-ioctl.rst | 2 +- + Documentation/media/uapi/cec/cec-func-open.rst | 4 +- + Documentation/media/uapi/cec/cec-func-poll.rst | 8 +- + .../media/uapi/cec/cec-ioc-adap-g-caps.rst | 9 +- + .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 6 +- + Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 22 +- + Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 80 +- + Documentation/media/uapi/dvb/dvbproperty.rst | 66 +- + Documentation/media/uapi/dvb/fe-read-status.rst | 20 +- + Documentation/media/uapi/dvb/frontend.rst | 30 +- + Documentation/media/uapi/dvb/intro.rst | 4 +- + .../v4l/{pixfmt-006.rst => colorspaces-defs.rst} | 2 +- + .../{pixfmt-007.rst => colorspaces-details.rst} | 47 + + Documentation/media/uapi/v4l/dev-meta.rst | 2 + + Documentation/media/uapi/v4l/dev-sliced-vbi.rst | 23 +- + Documentation/media/uapi/v4l/dev-subdev.rst | 8 +- + Documentation/media/uapi/v4l/extended-controls.rst | 32 +- + Documentation/media/uapi/v4l/pixfmt-008.rst | 32 - + .../v4l/{pixfmt-013.rst => pixfmt-compressed.rst} | 0 + .../uapi/v4l/{pixfmt-004.rst => pixfmt-intro.rst} | 0 + Documentation/media/uapi/v4l/pixfmt-inzi.rst | 7 +- + Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst | 30 +- + Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst | 184 +- + Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst | 50 +- + Documentation/media/uapi/v4l/pixfmt-rgb.rst | 1 + + Documentation/media/uapi/v4l/pixfmt-srggb10p.rst | 7 +- + Documentation/media/uapi/v4l/pixfmt-srggb12p.rst | 103 + + .../v4l/{pixfmt-003.rst => pixfmt-v4l2-mplane.rst} | 0 + .../uapi/v4l/{pixfmt-002.rst => pixfmt-v4l2.rst} | 0 + Documentation/media/uapi/v4l/pixfmt.rst | 15 +- + Documentation/media/uapi/v4l/subdev-formats.rst | 17 +- + Documentation/media/uapi/v4l/vidioc-dqevent.rst | 2 +- + .../media/uapi/v4l/vidioc-dv-timings-cap.rst | 2 +- + .../media/uapi/v4l/vidioc-enum-frameintervals.rst | 2 + + Documentation/media/uapi/v4l/vidioc-enumstd.rst | 9 +- + .../media/uapi/v4l/vidioc-g-dv-timings.rst | 4 +- + .../media/uapi/v4l/vidioc-g-enc-index.rst | 2 +- + .../media/uapi/v4l/vidioc-g-ext-ctrls.rst | 2 +- + .../media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst | 6 +- + Documentation/media/uapi/v4l/vidioc-g-tuner.rst | 4 +- + Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 2 +- + Documentation/media/v4l-drivers/qcom_camss.rst | 156 + + .../media/v4l-drivers/qcom_camss_graph.dot | 41 + + MAINTAINERS | 82 +- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 14 + + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/omap2plus_defconfig | 2 +- + arch/arm/configs/sunxi_defconfig | 2 +- + arch/mips/configs/pistachio_defconfig | 2 +- + drivers/hid/hid-picolcd_cir.c | 4 +- + drivers/leds/Kconfig | 8 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-aat1290.c | 4 +- + drivers/leds/leds-as3645a.c | 763 ++++ + drivers/leds/leds-max77693.c | 4 +- + drivers/media/Kconfig | 20 +- + drivers/media/cec/Makefile | 4 + + drivers/media/cec/cec-adap.c | 284 +- + drivers/media/cec/cec-api.c | 92 +- + drivers/media/cec/cec-core.c | 27 +- + drivers/media/cec/cec-pin.c | 802 ++++ + drivers/media/common/saa7146/saa7146_i2c.c | 2 +- + drivers/media/common/saa7146/saa7146_vbi.c | 2 +- + drivers/media/common/saa7146/saa7146_video.c | 2 +- + drivers/media/common/siano/smsir.c | 6 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c | 150 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 2 +- + drivers/media/dvb-core/demux.h | 2 +- + drivers/media/dvb-core/dvb-usb-ids.h | 1 + + drivers/media/dvb-core/dvb_ca_en50221.c | 945 ++-- + drivers/media/dvb-core/dvb_ca_en50221.h | 10 +- + drivers/media/dvb-core/dvb_frontend.c | 4 +- + drivers/media/dvb-frontends/Kconfig | 27 + + drivers/media/dvb-frontends/Makefile | 3 + + drivers/media/dvb-frontends/cx24123.c | 2 +- + drivers/media/dvb-frontends/cxd2841er.c | 75 +- + drivers/media/dvb-frontends/dib0090.c | 11 +- + drivers/media/dvb-frontends/dib7000p.c | 2 +- + drivers/media/dvb-frontends/dib8000.c | 20 +- + drivers/media/dvb-frontends/dib8000.h | 1 - + drivers/media/dvb-frontends/dib9000.c | 22 +- + drivers/media/dvb-frontends/dib9000.h | 7 - + drivers/media/dvb-frontends/drx39xyj/drxj.c | 35 +- + drivers/media/dvb-frontends/drxd_hard.c | 6 +- + drivers/media/dvb-frontends/isl6421.c | 76 +- + drivers/media/dvb-frontends/mb86a16.c | 25 +- + drivers/media/dvb-frontends/mn88472.c | 4 +- + drivers/media/dvb-frontends/mn88473.c | 4 +- + drivers/media/dvb-frontends/mxl5xx.c | 1873 ++++++++ + drivers/media/dvb-frontends/mxl5xx.h | 41 + + drivers/media/dvb-frontends/mxl5xx_defs.h | 731 +++ + drivers/media/dvb-frontends/mxl5xx_regs.h | 367 ++ + drivers/media/dvb-frontends/s5h1420.c | 2 +- + drivers/media/dvb-frontends/stv0367.c | 156 +- + drivers/media/dvb-frontends/stv0910.c | 1813 ++++++++ + drivers/media/dvb-frontends/stv0910.h | 32 + + drivers/media/dvb-frontends/stv0910_regs.h | 4760 ++++++++++++++++++++ + drivers/media/dvb-frontends/stv6111.c | 681 +++ + drivers/media/dvb-frontends/stv6111.h | 21 + + drivers/media/dvb-frontends/zd1301_demod.c | 2 +- + drivers/media/i2c/Kconfig | 36 + + drivers/media/i2c/Makefile | 3 + + drivers/media/i2c/ad9389b.c | 2 +- + drivers/media/i2c/adv7180.c | 2 + + drivers/media/i2c/adv748x/Makefile | 7 + + drivers/media/i2c/adv748x/adv748x-afe.c | 552 +++ + drivers/media/i2c/adv748x/adv748x-core.c | 833 ++++ + drivers/media/i2c/adv748x/adv748x-csi2.c | 326 ++ + drivers/media/i2c/adv748x/adv748x-hdmi.c | 768 ++++ + drivers/media/i2c/adv748x/adv748x.h | 425 ++ + drivers/media/i2c/adv7511.c | 5 +- + drivers/media/i2c/adv7604.c | 7 +- + drivers/media/i2c/adv7842.c | 5 +- + drivers/media/i2c/dw9714.c | 26 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 26 +- + drivers/media/i2c/ir-kbd-i2c.c | 59 +- + drivers/media/i2c/m5mols/m5mols_core.c | 2 +- + drivers/media/i2c/max2175.c | 2 +- + drivers/media/i2c/mt9m111.c | 6 +- + drivers/media/i2c/mt9t001.c | 8 +- + drivers/media/i2c/ov13858.c | 101 +- + drivers/media/i2c/ov5640.c | 3 +- + drivers/media/i2c/ov5645.c | 49 +- + drivers/media/i2c/ov5670.c | 2601 +++++++++++ + drivers/media/i2c/{soc_camera => }/ov6650.c | 77 +- + drivers/media/i2c/ov7670.c | 6 +- + drivers/media/i2c/ov9650.c | 67 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 3 +- + drivers/media/i2c/s5k5baf.c | 9 +- + drivers/media/i2c/saa7127.c | 2 +- + drivers/media/i2c/saa717x.c | 2 +- + drivers/media/i2c/smiapp/smiapp-core.c | 16 +- + drivers/media/i2c/smiapp/smiapp-quirk.c | 8 +- + drivers/media/i2c/soc_camera/Kconfig | 6 - + drivers/media/i2c/soc_camera/Makefile | 1 - + drivers/media/i2c/soc_camera/mt9t031.c | 2 +- + drivers/media/i2c/tc358743.c | 2 +- + drivers/media/i2c/ths8200.c | 2 +- + drivers/media/i2c/vs6624.c | 2 +- + drivers/media/media-device.c | 16 +- + drivers/media/media-entity.c | 2 +- + drivers/media/pci/b2c2/flexcop-pci.c | 2 +- + drivers/media/pci/bt8xx/bt878.c | 2 +- + drivers/media/pci/bt8xx/bttv-driver.c | 4 +- + drivers/media/pci/bt8xx/bttv-i2c.c | 2 +- + drivers/media/pci/bt8xx/bttv-input.c | 18 +- + drivers/media/pci/cobalt/cobalt-alsa-pcm.c | 4 +- + drivers/media/pci/cobalt/cobalt-driver.c | 2 +- + drivers/media/pci/cobalt/cobalt-i2c.c | 2 +- + drivers/media/pci/cx18/cx18-alsa-mixer.c | 2 +- + drivers/media/pci/cx18/cx18-alsa-pcm.c | 2 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/cx18/cx18-i2c.c | 8 +- + drivers/media/pci/cx18/cx18-streams.c | 4 +- + drivers/media/pci/cx23885/cx23885-417.c | 2 +- + drivers/media/pci/cx23885/cx23885-alsa.c | 2 +- + drivers/media/pci/cx23885/cx23885-cards.c | 6 + + drivers/media/pci/cx23885/cx23885-core.c | 2 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 10 +- + drivers/media/pci/cx23885/cx23885-i2c.c | 2 +- + drivers/media/pci/cx23885/cx23885-input.c | 16 +- + drivers/media/pci/cx25821/cx25821-alsa.c | 2 +- + drivers/media/pci/cx25821/cx25821-core.c | 5 +- + drivers/media/pci/cx25821/cx25821-i2c.c | 2 +- + drivers/media/pci/cx25821/cx25821.h | 2 - + drivers/media/pci/cx88/cx88-alsa.c | 2 +- + drivers/media/pci/cx88/cx88-blackbird.c | 2 +- + drivers/media/pci/cx88/cx88-input.c | 30 +- + drivers/media/pci/ddbridge/Kconfig | 21 + + drivers/media/pci/ddbridge/Makefile | 3 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 4226 +++++++++++------ + drivers/media/pci/ddbridge/ddbridge-hw.c | 376 ++ + drivers/media/pci/ddbridge/ddbridge-hw.h | 43 + + drivers/media/pci/ddbridge/ddbridge-i2c.c | 230 + + drivers/media/pci/ddbridge/ddbridge-i2c.h | 112 + + drivers/media/pci/ddbridge/ddbridge-io.h | 71 + + drivers/media/pci/ddbridge/ddbridge-main.c | 346 ++ + drivers/media/pci/ddbridge/ddbridge-maxs8.c | 444 ++ + drivers/media/pci/ddbridge/ddbridge-maxs8.h | 29 + + drivers/media/pci/ddbridge/ddbridge-regs.h | 159 +- + drivers/media/pci/ddbridge/ddbridge.h | 341 +- + drivers/media/pci/dm1105/dm1105.c | 8 +- + drivers/media/pci/dt3155/dt3155.c | 2 +- + drivers/media/pci/ivtv/ivtv-alsa-mixer.c | 2 +- + drivers/media/pci/ivtv/ivtv-alsa-pcm.c | 2 +- + drivers/media/pci/ivtv/ivtv-driver.c | 2 +- + drivers/media/pci/ivtv/ivtv-i2c.c | 18 +- + drivers/media/pci/mantis/hopper_cards.c | 2 +- + drivers/media/pci/mantis/mantis_cards.c | 2 +- + drivers/media/pci/mantis/mantis_common.h | 2 +- + drivers/media/pci/mantis/mantis_i2c.c | 2 +- + drivers/media/pci/mantis/mantis_input.c | 6 +- + drivers/media/pci/meye/meye.c | 4 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +- + drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c | 2 +- + drivers/media/pci/ngene/ngene-i2c.c | 2 +- + drivers/media/pci/pluto2/pluto2.c | 2 +- + drivers/media/pci/pt1/pt1.c | 2 +- + drivers/media/pci/pt3/pt3.c | 11 +- + drivers/media/pci/saa7134/saa7134-alsa.c | 2 +- + drivers/media/pci/saa7134/saa7134-empress.c | 2 +- + drivers/media/pci/saa7134/saa7134-i2c.c | 2 +- + drivers/media/pci/saa7134/saa7134-input.c | 81 +- + drivers/media/pci/saa7146/hexium_gemini.c | 2 +- + drivers/media/pci/saa7146/hexium_orion.c | 2 +- + drivers/media/pci/saa7146/mxb.c | 2 +- + drivers/media/pci/saa7164/saa7164-core.c | 2 +- + drivers/media/pci/saa7164/saa7164-i2c.c | 2 +- + drivers/media/pci/smipcie/smipcie-ir.c | 6 +- + drivers/media/pci/smipcie/smipcie.h | 2 +- + drivers/media/pci/solo6x10/solo6x10-g723.c | 2 +- + drivers/media/pci/solo6x10/solo6x10-gpio.c | 97 + + drivers/media/pci/solo6x10/solo6x10-tw28.c | 3 +- + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 2 +- + drivers/media/pci/solo6x10/solo6x10.h | 5 + + drivers/media/pci/sta2x11/sta2x11_vip.c | 2 +- + drivers/media/pci/ttpci/av7110.c | 2 +- + drivers/media/pci/ttpci/av7110_v4l.c | 2 +- + drivers/media/pci/ttpci/budget-av.c | 2 +- + drivers/media/pci/ttpci/budget-ci.c | 9 +- + drivers/media/pci/ttpci/budget-patch.c | 2 +- + drivers/media/pci/ttpci/budget.c | 2 +- + drivers/media/pci/tw68/tw68-video.c | 2 +- + drivers/media/pci/zoran/zoran_card.c | 2 +- + drivers/media/platform/Kconfig | 21 +- + drivers/media/platform/Makefile | 4 + + drivers/media/platform/am437x/am437x-vpfe.c | 4 +- + drivers/media/platform/atmel/atmel-isc.c | 6 +- + drivers/media/platform/blackfin/bfin_capture.c | 4 +- + drivers/media/platform/coda/coda-bit.c | 29 +- + drivers/media/platform/coda/coda-common.c | 78 +- + drivers/media/platform/coda/coda_regs.h | 1 + + drivers/media/platform/coda/imx-vdoa.c | 2 + + drivers/media/platform/davinci/vpbe.c | 2 +- + drivers/media/platform/davinci/vpbe_display.c | 4 +- + drivers/media/platform/davinci/vpbe_osd.c | 2 +- + drivers/media/platform/davinci/vpbe_venc.c | 2 +- + drivers/media/platform/davinci/vpfe_capture.c | 2 +- + drivers/media/platform/davinci/vpif_capture.c | 28 +- + drivers/media/platform/davinci/vpif_display.c | 2 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 2 +- + drivers/media/platform/exynos4-is/fimc-is-i2c.c | 2 +- + drivers/media/platform/exynos4-is/fimc-is.c | 8 +- + drivers/media/platform/exynos4-is/fimc-isp.c | 2 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 5 +- + drivers/media/platform/exynos4-is/fimc-m2m.c | 2 +- + drivers/media/platform/exynos4-is/media-dev.c | 8 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 4 +- + drivers/media/platform/fsl-viu.c | 6 +- + drivers/media/platform/m2m-deinterlace.c | 4 +- + drivers/media/platform/marvell-ccic/cafe-driver.c | 4 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 2 +- + drivers/media/platform/meson/Makefile | 1 + + drivers/media/platform/meson/ao-cec.c | 744 +++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 4 +- + drivers/media/platform/mtk-mdp/mtk_mdp_comp.c | 10 +- + drivers/media/platform/mtk-mdp/mtk_mdp_core.c | 8 +- + drivers/media/platform/mtk-mdp/mtk_mdp_m2m.c | 4 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 37 +- + drivers/media/platform/mx2_emmaprp.c | 6 +- + drivers/media/platform/omap/omap_vout_vrfb.c | 3 +- + drivers/media/platform/omap3isp/isp.c | 161 +- + drivers/media/platform/omap3isp/isp.h | 4 +- + drivers/media/platform/omap3isp/ispccdc.c | 22 +- + drivers/media/platform/omap3isp/ispccp2.c | 18 +- + drivers/media/platform/omap3isp/ispcsi2.c | 6 +- + drivers/media/platform/omap3isp/ispcsiphy.c | 91 +- + drivers/media/platform/omap3isp/ispcsiphy.h | 7 +- + drivers/media/platform/omap3isp/ispreg.h | 4 + + drivers/media/platform/omap3isp/omap3isp.h | 6 + + drivers/media/platform/pxa_camera.c | 9 +- + drivers/media/platform/qcom/camss-8x16/Makefile | 11 + + .../media/platform/qcom/camss-8x16/camss-csid.c | 1092 +++++ + .../media/platform/qcom/camss-8x16/camss-csid.h | 82 + + .../media/platform/qcom/camss-8x16/camss-csiphy.c | 890 ++++ + .../media/platform/qcom/camss-8x16/camss-csiphy.h | 77 + + .../media/platform/qcom/camss-8x16/camss-ispif.c | 1175 +++++ + .../media/platform/qcom/camss-8x16/camss-ispif.h | 85 + + drivers/media/platform/qcom/camss-8x16/camss-vfe.c | 3088 +++++++++++++ + drivers/media/platform/qcom/camss-8x16/camss-vfe.h | 123 + + .../media/platform/qcom/camss-8x16/camss-video.c | 860 ++++ + .../media/platform/qcom/camss-8x16/camss-video.h | 70 + + drivers/media/platform/qcom/camss-8x16/camss.c | 746 +++ + drivers/media/platform/qcom/camss-8x16/camss.h | 106 + + drivers/media/platform/qcom/venus/helpers.c | 51 +- + drivers/media/platform/qcom/venus/helpers.h | 1 + + drivers/media/platform/qcom/venus/vdec.c | 31 +- + drivers/media/platform/qcom/venus/venc.c | 47 +- + drivers/media/platform/rcar-vin/rcar-core.c | 4 +- + drivers/media/platform/rcar_fdp1.c | 2 +- + drivers/media/platform/rcar_jpu.c | 2 +- + drivers/media/platform/s3c-camif/camif-core.c | 1 - + drivers/media/platform/s5p-cec/s5p_cec.c | 7 +- + drivers/media/platform/s5p-g2d/g2d.c | 4 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 200 +- + drivers/media/platform/s5p-jpeg/jpeg-core.h | 8 + + drivers/media/platform/s5p-jpeg/jpeg-hw-exynos4.c | 9 +- + drivers/media/platform/s5p-jpeg/jpeg-regs.h | 2 +- + drivers/media/platform/soc_camera/soc_camera.c | 8 +- + drivers/media/platform/soc_camera/soc_mediabus.c | 3 + + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 2 +- + drivers/media/platform/sti/cec/stih-cec.c | 4 +- + drivers/media/platform/sti/delta/delta-v4l2.c | 6 +- + drivers/media/platform/stm32/stm32-cec.c | 4 +- + drivers/media/platform/stm32/stm32-dcmi.c | 495 +- + drivers/media/platform/ti-vpe/cal.c | 4 +- + drivers/media/platform/ti-vpe/vpe.c | 4 +- + drivers/media/platform/via-camera.c | 2 +- + drivers/media/platform/video-mux.c | 53 +- + drivers/media/platform/vim2m.c | 4 +- + drivers/media/platform/vimc/vimc-debayer.c | 2 +- + drivers/media/platform/vimc/vimc-scaler.c | 2 +- + drivers/media/platform/vimc/vimc-sensor.c | 2 +- + drivers/media/platform/vivid/vivid-cec.c | 66 +- + drivers/media/platform/vivid/vivid-core.c | 8 +- + drivers/media/platform/vsp1/vsp1_entity.h | 7 + + drivers/media/platform/vsp1/vsp1_pipe.c | 22 + + drivers/media/platform/vsp1/vsp1_pipe.h | 46 +- + drivers/media/platform/vsp1/vsp1_regs.h | 14 + + drivers/media/platform/vsp1/vsp1_rpf.c | 27 +- + drivers/media/platform/vsp1/vsp1_sru.c | 26 + + drivers/media/platform/vsp1/vsp1_uds.c | 57 +- + drivers/media/platform/vsp1/vsp1_video.c | 182 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 24 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 52 +- + drivers/media/radio/dsbr100.c | 2 +- + drivers/media/radio/radio-cadet.c | 2 +- + drivers/media/radio/radio-gemtek.c | 2 +- + drivers/media/radio/radio-keene.c | 2 +- + drivers/media/radio/radio-ma901.c | 2 +- + drivers/media/radio/radio-maxiradio.c | 2 +- + drivers/media/radio/radio-mr800.c | 2 +- + drivers/media/radio/radio-raremono.c | 2 +- + drivers/media/radio/radio-sf16fmr2.c | 2 +- + drivers/media/radio/radio-shark.c | 2 +- + drivers/media/radio/radio-shark2.c | 2 +- + drivers/media/radio/radio-tea5764.c | 2 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 2 +- + drivers/media/radio/si4713/radio-platform-si4713.c | 2 +- + drivers/media/radio/si4713/radio-usb-si4713.c | 4 +- + drivers/media/radio/wl128x/fmdrv_v4l2.c | 2 +- + drivers/media/rc/Kconfig | 53 +- + drivers/media/rc/Makefile | 3 + + drivers/media/rc/ati_remote.c | 7 +- + drivers/media/rc/ene_ir.c | 6 +- + drivers/media/rc/fintek-cir.c | 4 +- + drivers/media/rc/gpio-ir-recv.c | 31 +- + drivers/media/rc/gpio-ir-tx.c | 174 + + drivers/media/rc/igorplugusb.c | 11 +- + drivers/media/rc/iguanair.c | 4 +- + drivers/media/rc/img-ir/img-ir-hw.c | 6 +- + drivers/media/rc/img-ir/img-ir-hw.h | 4 +- + drivers/media/rc/img-ir/img-ir-jvc.c | 4 +- + drivers/media/rc/img-ir/img-ir-nec.c | 20 +- + drivers/media/rc/img-ir/img-ir-raw.c | 6 +- + drivers/media/rc/img-ir/img-ir-rc5.c | 4 +- + drivers/media/rc/img-ir/img-ir-rc6.c | 4 +- + drivers/media/rc/img-ir/img-ir-sanyo.c | 4 +- + drivers/media/rc/img-ir/img-ir-sharp.c | 4 +- + drivers/media/rc/img-ir/img-ir-sony.c | 27 +- + drivers/media/rc/imon.c | 55 +- + drivers/media/rc/ir-hix5hd2.c | 4 +- + drivers/media/rc/ir-jvc-decoder.c | 6 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 12 +- + drivers/media/rc/ir-nec-decoder.c | 57 +- + drivers/media/rc/ir-rc5-decoder.c | 25 +- + drivers/media/rc/ir-rc6-decoder.c | 30 +- + drivers/media/rc/ir-sanyo-decoder.c | 16 +- + drivers/media/rc/ir-sharp-decoder.c | 6 +- + drivers/media/rc/ir-sony-decoder.c | 23 +- + drivers/media/rc/ir-spi.c | 1 + + drivers/media/rc/ir-xmp-decoder.c | 4 +- + drivers/media/rc/ite-cir.c | 4 +- + drivers/media/rc/keymaps/Makefile | 3 +- + drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | 8 +- + drivers/media/rc/keymaps/rc-alink-dtu-m.c | 8 +- + drivers/media/rc/keymaps/rc-anysee.c | 8 +- + drivers/media/rc/keymaps/rc-apac-viewcomp.c | 8 +- + drivers/media/rc/keymaps/rc-asus-pc39.c | 8 +- + drivers/media/rc/keymaps/rc-asus-ps3-100.c | 8 +- + drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | 8 +- + drivers/media/rc/keymaps/rc-ati-x10.c | 8 +- + drivers/media/rc/keymaps/rc-avermedia-a16d.c | 8 +- + drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 8 +- + drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 8 +- + drivers/media/rc/keymaps/rc-avermedia-m135a.c | 8 +- + .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c | 8 +- + drivers/media/rc/keymaps/rc-avermedia-rm-ks.c | 8 +- + drivers/media/rc/keymaps/rc-avermedia.c | 8 +- + drivers/media/rc/keymaps/rc-avertv-303.c | 8 +- + drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c | 8 +- + drivers/media/rc/keymaps/rc-behold-columbus.c | 8 +- + drivers/media/rc/keymaps/rc-behold.c | 8 +- + drivers/media/rc/keymaps/rc-budget-ci-old.c | 8 +- + drivers/media/rc/keymaps/rc-cec.c | 2 +- + drivers/media/rc/keymaps/rc-cinergy-1400.c | 8 +- + drivers/media/rc/keymaps/rc-cinergy.c | 8 +- + drivers/media/rc/keymaps/rc-d680-dmb.c | 8 +- + drivers/media/rc/keymaps/rc-delock-61959.c | 8 +- + drivers/media/rc/keymaps/rc-dib0700-nec.c | 8 +- + drivers/media/rc/keymaps/rc-dib0700-rc5.c | 8 +- + drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c | 8 +- + drivers/media/rc/keymaps/rc-digittrade.c | 8 +- + drivers/media/rc/keymaps/rc-dm1105-nec.c | 8 +- + drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 8 +- + drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 8 +- + drivers/media/rc/keymaps/rc-dtt200u.c | 8 +- + drivers/media/rc/keymaps/rc-dvbsky.c | 8 +- + drivers/media/rc/keymaps/rc-dvico-mce.c | 8 +- + drivers/media/rc/keymaps/rc-dvico-portable.c | 8 +- + drivers/media/rc/keymaps/rc-em-terratec.c | 8 +- + drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 8 +- + drivers/media/rc/keymaps/rc-encore-enltv.c | 8 +- + drivers/media/rc/keymaps/rc-encore-enltv2.c | 8 +- + drivers/media/rc/keymaps/rc-evga-indtube.c | 8 +- + drivers/media/rc/keymaps/rc-eztv.c | 8 +- + drivers/media/rc/keymaps/rc-flydvb.c | 8 +- + drivers/media/rc/keymaps/rc-flyvideo.c | 8 +- + drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | 8 +- + drivers/media/rc/keymaps/rc-gadmei-rm008z.c | 8 +- + drivers/media/rc/keymaps/rc-geekbox.c | 8 +- + drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | 8 +- + drivers/media/rc/keymaps/rc-gotview7135.c | 8 +- + drivers/media/rc/keymaps/rc-hauppauge.c | 8 +- + drivers/media/rc/keymaps/rc-imon-mce.c | 8 +- + drivers/media/rc/keymaps/rc-imon-pad.c | 8 +- + drivers/media/rc/keymaps/rc-iodata-bctv7e.c | 8 +- + drivers/media/rc/keymaps/rc-it913x-v1.c | 8 +- + drivers/media/rc/keymaps/rc-it913x-v2.c | 8 +- + drivers/media/rc/keymaps/rc-kaiomy.c | 8 +- + drivers/media/rc/keymaps/rc-kworld-315u.c | 8 +- + drivers/media/rc/keymaps/rc-kworld-pc150u.c | 8 +- + .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 8 +- + drivers/media/rc/keymaps/rc-leadtek-y04g0051.c | 8 +- + drivers/media/rc/keymaps/rc-lme2510.c | 8 +- + drivers/media/rc/keymaps/rc-manli.c | 8 +- + .../media/rc/keymaps/rc-medion-x10-digitainer.c | 8 +- + drivers/media/rc/keymaps/rc-medion-x10-or2x.c | 8 +- + drivers/media/rc/keymaps/rc-medion-x10.c | 8 +- + drivers/media/rc/keymaps/rc-msi-digivox-ii.c | 8 +- + drivers/media/rc/keymaps/rc-msi-digivox-iii.c | 8 +- + drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 8 +- + drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 8 +- + drivers/media/rc/keymaps/rc-nebula.c | 8 +- + .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 8 +- + drivers/media/rc/keymaps/rc-norwood.c | 8 +- + drivers/media/rc/keymaps/rc-npgtech.c | 8 +- + drivers/media/rc/keymaps/rc-pctv-sedna.c | 8 +- + drivers/media/rc/keymaps/rc-pinnacle-color.c | 8 +- + drivers/media/rc/keymaps/rc-pinnacle-grey.c | 8 +- + drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 8 +- + drivers/media/rc/keymaps/rc-pixelview-002t.c | 8 +- + drivers/media/rc/keymaps/rc-pixelview-mk12.c | 8 +- + drivers/media/rc/keymaps/rc-pixelview-new.c | 8 +- + drivers/media/rc/keymaps/rc-pixelview.c | 8 +- + .../media/rc/keymaps/rc-powercolor-real-angel.c | 8 +- + drivers/media/rc/keymaps/rc-proteus-2309.c | 8 +- + drivers/media/rc/keymaps/rc-purpletv.c | 8 +- + drivers/media/rc/keymaps/rc-pv951.c | 8 +- + drivers/media/rc/keymaps/rc-rc6-mce.c | 8 +- + .../media/rc/keymaps/rc-real-audio-220-32-keys.c | 8 +- + drivers/media/rc/keymaps/rc-reddo.c | 8 +- + drivers/media/rc/keymaps/rc-snapstream-firefly.c | 8 +- + drivers/media/rc/keymaps/rc-streamzap.c | 8 +- + drivers/media/rc/keymaps/rc-su3000.c | 8 +- + drivers/media/rc/keymaps/rc-tbs-nec.c | 8 +- + drivers/media/rc/keymaps/rc-technisat-ts35.c | 8 +- + drivers/media/rc/keymaps/rc-technisat-usb2.c | 8 +- + .../media/rc/keymaps/rc-terratec-cinergy-c-pci.c | 8 +- + .../media/rc/keymaps/rc-terratec-cinergy-s2-hd.c | 8 +- + drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | 8 +- + drivers/media/rc/keymaps/rc-terratec-slim-2.c | 8 +- + drivers/media/rc/keymaps/rc-terratec-slim.c | 8 +- + drivers/media/rc/keymaps/rc-tevii-nec.c | 8 +- + drivers/media/rc/keymaps/rc-tivo.c | 8 +- + .../media/rc/keymaps/rc-total-media-in-hand-02.c | 8 +- + drivers/media/rc/keymaps/rc-total-media-in-hand.c | 8 +- + drivers/media/rc/keymaps/rc-trekstor.c | 8 +- + drivers/media/rc/keymaps/rc-tt-1500.c | 8 +- + drivers/media/rc/keymaps/rc-twinhan-dtv-cab-ci.c | 8 +- + drivers/media/rc/keymaps/rc-twinhan1027.c | 8 +- + drivers/media/rc/keymaps/rc-videomate-m1f.c | 8 +- + drivers/media/rc/keymaps/rc-videomate-s350.c | 8 +- + drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | 8 +- + drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | 8 +- + drivers/media/rc/keymaps/rc-winfast.c | 8 +- + drivers/media/rc/keymaps/rc-zx-irdec.c | 79 + + drivers/media/rc/mceusb.c | 40 +- + drivers/media/rc/meson-ir.c | 4 +- + drivers/media/rc/mtk-cir.c | 246 +- + drivers/media/rc/nuvoton-cir.c | 120 +- + drivers/media/rc/nuvoton-cir.h | 24 - + drivers/media/rc/pwm-ir-tx.c | 138 + + drivers/media/rc/rc-core-priv.h | 5 +- + drivers/media/rc/rc-ir-raw.c | 67 +- + drivers/media/rc/rc-loopback.c | 6 +- + drivers/media/rc/rc-main.c | 265 +- + drivers/media/rc/redrat3.c | 4 +- + drivers/media/rc/serial_ir.c | 12 +- + drivers/media/rc/sir_ir.c | 6 +- + drivers/media/rc/st_rc.c | 6 +- + drivers/media/rc/streamzap.c | 4 +- + drivers/media/rc/sunxi-cir.c | 6 +- + drivers/media/rc/ttusbir.c | 4 +- + drivers/media/rc/winbond-cir.c | 37 +- + drivers/media/rc/zx-irdec.c | 184 + + drivers/media/tuners/fc0012.c | 2 +- + drivers/media/tuners/fc0013.c | 2 +- + drivers/media/tuners/tda18271-maps.c | 4 +- + drivers/media/tuners/tuner-simple.c | 2 +- + drivers/media/usb/airspy/airspy.c | 4 +- + drivers/media/usb/as102/as102_usb_drv.c | 2 +- + drivers/media/usb/au0828/Kconfig | 1 + + drivers/media/usb/au0828/au0828-core.c | 2 + + drivers/media/usb/au0828/au0828-i2c.c | 4 +- + drivers/media/usb/au0828/au0828-input.c | 6 +- + drivers/media/usb/au0828/au0828-video.c | 2 +- + drivers/media/usb/b2c2/flexcop-usb.c | 2 +- + drivers/media/usb/cpia2/cpia2_usb.c | 2 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 4 +- + drivers/media/usb/cx231xx/cx231xx-audio.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 3 + + drivers/media/usb/cx231xx/cx231xx-dvb.c | 6 +- + drivers/media/usb/cx231xx/cx231xx-i2c.c | 10 +- + drivers/media/usb/cx231xx/cx231xx-input.c | 6 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 2 +- + drivers/media/usb/cx231xx/cx231xx.h | 4 +- + drivers/media/usb/dvb-usb-v2/af9015.c | 11 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 16 +- + drivers/media/usb/dvb-usb-v2/anysee.c | 4 +- + drivers/media/usb/dvb-usb-v2/az6007.c | 13 +- + drivers/media/usb/dvb-usb-v2/dvb_usb.h | 2 +- + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 5 +- + drivers/media/usb/dvb-usb-v2/dvbsky.c | 4 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 6 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 4 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 13 +- + drivers/media/usb/dvb-usb/cxusb.c | 30 +- + drivers/media/usb/dvb-usb/dib0700.h | 2 +- + drivers/media/usb/dvb-usb/dib0700_core.c | 28 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 152 +- + drivers/media/usb/dvb-usb/dtt200u.c | 12 +- + drivers/media/usb/dvb-usb/dvb-usb-remote.c | 2 +- + drivers/media/usb/dvb-usb/dvb-usb.h | 2 +- + drivers/media/usb/dvb-usb/dw2102.c | 74 +- + drivers/media/usb/dvb-usb/m920x.c | 4 +- + drivers/media/usb/dvb-usb/pctv452e.c | 6 +- + drivers/media/usb/dvb-usb/technisat-usb2.c | 2 +- + drivers/media/usb/dvb-usb/ttusb2.c | 4 +- + drivers/media/usb/em28xx/em28xx-audio.c | 4 +- + drivers/media/usb/em28xx/em28xx-i2c.c | 2 +- + drivers/media/usb/em28xx/em28xx-input.c | 126 +- + drivers/media/usb/go7007/go7007-v4l2.c | 4 +- + drivers/media/usb/go7007/snd-go7007.c | 2 +- + drivers/media/usb/gspca/gspca.c | 2 +- + drivers/media/usb/gspca/xirlink_cit.c | 2 +- + drivers/media/usb/hackrf/hackrf.c | 4 +- + drivers/media/usb/hdpvr/hdpvr-core.c | 2 +- + drivers/media/usb/hdpvr/hdpvr-i2c.c | 5 +- + drivers/media/usb/msi2500/msi2500.c | 4 +- + drivers/media/usb/pulse8-cec/pulse8-cec.c | 7 +- + drivers/media/usb/pvrusb2/pvrusb2-encoder.c | 6 +- + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 14 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 2 +- + drivers/media/usb/pwc/pwc-if.c | 2 +- + drivers/media/usb/rainshadow-cec/rainshadow-cec.c | 7 +- + drivers/media/usb/s2255/s2255drv.c | 4 +- + drivers/media/usb/stk1160/stk1160-core.c | 2 +- + drivers/media/usb/stk1160/stk1160-i2c.c | 2 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 4 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 6 +- + drivers/media/usb/tm6000/tm6000-alsa.c | 2 +- + drivers/media/usb/tm6000/tm6000-cards.c | 2 +- + drivers/media/usb/tm6000/tm6000-input.c | 40 +- + drivers/media/usb/tm6000/tm6000-video.c | 4 +- + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 4 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +- + drivers/media/usb/usbtv/usbtv-audio.c | 2 +- + drivers/media/usb/usbtv/usbtv-core.c | 2 +- + drivers/media/usb/usbtv/usbtv-video.c | 2 +- + drivers/media/usb/usbvision/usbvision-i2c.c | 11 +- + drivers/media/usb/usbvision/usbvision-video.c | 19 +- + drivers/media/usb/uvc/uvc_ctrl.c | 7 + + drivers/media/usb/uvc/uvc_driver.c | 28 +- + drivers/media/usb/uvc/uvc_entity.c | 2 +- + drivers/media/usb/uvc/uvc_queue.c | 9 +- + drivers/media/usb/uvc/uvcvideo.h | 4 +- + drivers/media/usb/zr364xx/zr364xx.c | 6 +- + drivers/media/v4l2-core/v4l2-clk.c | 3 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 13 +- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 139 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 139 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 12 +- + drivers/media/v4l2-core/videobuf2-core.c | 27 +- + drivers/media/v4l2-core/videobuf2-dma-contig.c | 5 +- + drivers/media/v4l2-core/videobuf2-dma-sg.c | 8 +- + drivers/media/v4l2-core/videobuf2-vmalloc.c | 8 +- + drivers/staging/fbtft/fb_st7789v.c | 2 +- + drivers/staging/greybus/light.c | 46 +- + drivers/staging/media/atomisp/i2c/ap1302.c | 7 +- + drivers/staging/media/atomisp/i2c/gc0310.c | 5 +- + drivers/staging/media/atomisp/i2c/gc2235.c | 4 +- + drivers/staging/media/atomisp/i2c/gc2235.h | 6 +- + drivers/staging/media/atomisp/i2c/imx/ad5816g.c | 11 +- + drivers/staging/media/atomisp/i2c/imx/drv201.c | 11 +- + drivers/staging/media/atomisp/i2c/imx/dw9714.c | 14 +- + drivers/staging/media/atomisp/i2c/imx/dw9718.c | 5 - + drivers/staging/media/atomisp/i2c/imx/dw9719.c | 11 - + drivers/staging/media/atomisp/i2c/imx/imx.c | 48 +- + drivers/staging/media/atomisp/i2c/imx/imx.h | 29 - + drivers/staging/media/atomisp/i2c/lm3554.c | 2 +- + drivers/staging/media/atomisp/i2c/mt9m114.c | 12 +- + drivers/staging/media/atomisp/i2c/ov2680.c | 19 +- + drivers/staging/media/atomisp/i2c/ov2722.c | 2 +- + drivers/staging/media/atomisp/i2c/ov5693/ov5693.c | 10 +- + drivers/staging/media/atomisp/i2c/ov8858.c | 2 +- + drivers/staging/media/atomisp/i2c/ov8858.h | 3 - + drivers/staging/media/atomisp/i2c/ov8858_btns.h | 3 - + .../staging/media/atomisp/include/linux/atomisp.h | 6 - + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 50 +- + .../media/atomisp/pci/atomisp2/atomisp_cmd.h | 3 - + .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 8 +- + .../media/atomisp/pci/atomisp2/atomisp_fops.c | 4 +- + .../media/atomisp/pci/atomisp2/atomisp_internal.h | 13 - + .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 3 - + .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 6 +- + .../media/atomisp/pci/atomisp2/atomisp_v4l2.c | 35 +- + .../css2400/runtime/isys/src/ibuf_ctrl_rmgr.c | 27 +- + .../atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 8 +- + .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 139 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 3 +- + drivers/staging/media/cxd2099/cxd2099.c | 21 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 2 +- + drivers/staging/media/imx/Kconfig | 3 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 57 +- + drivers/staging/media/imx/imx-media-capture.c | 4 +- + drivers/staging/media/imx/imx-media-csi.c | 37 +- + drivers/staging/media/imx/imx-media-dev.c | 4 +- + drivers/staging/media/imx/imx-media-of.c | 50 +- + drivers/staging/media/imx/imx-media-vdic.c | 37 +- + drivers/staging/media/lirc/lirc_zilog.c | 18 +- + drivers/staging/media/omap4iss/iss_video.c | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 4 +- + include/media/cec-notifier.h | 12 + + include/media/cec-pin.h | 186 + + include/media/cec.h | 81 +- + include/media/drv-intf/saa7146.h | 2 +- + include/media/i2c/ir-kbd-i2c.h | 8 +- + include/media/media-device.h | 7 - + include/media/media-entity.h | 2 +- + include/media/rc-core.h | 72 +- + include/media/rc-map.h | 216 +- + include/media/v4l2-clk.h | 4 +- + include/media/v4l2-ctrls.h | 16 +- + include/media/v4l2-flash-led-class.h | 48 +- + include/media/v4l2-fwnode.h | 25 +- + include/media/v4l2-mediabus.h | 30 + + include/media/v4l2-subdev.h | 12 +- + include/media/videobuf2-core.h | 13 + + include/uapi/linux/cec-funcs.h | 1 + + include/uapi/linux/cec.h | 8 +- + include/uapi/linux/dvb/frontend.h | 1 + + include/uapi/linux/media.h | 5 +- + include/uapi/linux/videodev2.h | 5 + + samples/v4l/v4l2-pci-skeleton.c | 2 +- + 685 files changed, 39302 insertions(+), 6092 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/ams,as3645a.txt + create mode 100644 Documentation/devicetree/bindings/leds/irled/gpio-ir-tx.txt + create mode 100644 Documentation/devicetree/bindings/leds/irled/pwm-ir-tx.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/adv748x.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt + create mode 100644 Documentation/devicetree/bindings/media/meson-ao-cec.txt + create mode 100644 Documentation/devicetree/bindings/media/qcom,camss.txt + create mode 100644 Documentation/devicetree/bindings/media/zx-irdec.txt + create mode 100644 Documentation/media/cec-drivers/index.rst + create mode 100644 Documentation/media/cec-drivers/pulse8-cec.rst + rename Documentation/media/uapi/v4l/{pixfmt-006.rst => colorspaces-defs.rst} (98%) + rename Documentation/media/uapi/v4l/{pixfmt-007.rst => colorspaces-details.rst} (92%) + delete mode 100644 Documentation/media/uapi/v4l/pixfmt-008.rst + rename Documentation/media/uapi/v4l/{pixfmt-013.rst => pixfmt-compressed.rst} (100%) + rename Documentation/media/uapi/v4l/{pixfmt-004.rst => pixfmt-intro.rst} (100%) + create mode 100644 Documentation/media/uapi/v4l/pixfmt-srggb12p.rst + rename Documentation/media/uapi/v4l/{pixfmt-003.rst => pixfmt-v4l2-mplane.rst} (100%) + rename Documentation/media/uapi/v4l/{pixfmt-002.rst => pixfmt-v4l2.rst} (100%) + create mode 100644 Documentation/media/v4l-drivers/qcom_camss.rst + create mode 100644 Documentation/media/v4l-drivers/qcom_camss_graph.dot + create mode 100644 drivers/leds/leds-as3645a.c + create mode 100644 drivers/media/cec/cec-pin.c + create mode 100644 drivers/media/dvb-frontends/mxl5xx.c + create mode 100644 drivers/media/dvb-frontends/mxl5xx.h + create mode 100644 drivers/media/dvb-frontends/mxl5xx_defs.h + create mode 100644 drivers/media/dvb-frontends/mxl5xx_regs.h + create mode 100644 drivers/media/dvb-frontends/stv0910.c + create mode 100644 drivers/media/dvb-frontends/stv0910.h + create mode 100644 drivers/media/dvb-frontends/stv0910_regs.h + create mode 100644 drivers/media/dvb-frontends/stv6111.c + create mode 100644 drivers/media/dvb-frontends/stv6111.h + create mode 100644 drivers/media/i2c/adv748x/Makefile + create mode 100644 drivers/media/i2c/adv748x/adv748x-afe.c + create mode 100644 drivers/media/i2c/adv748x/adv748x-core.c + create mode 100644 drivers/media/i2c/adv748x/adv748x-csi2.c + create mode 100644 drivers/media/i2c/adv748x/adv748x-hdmi.c + create mode 100644 drivers/media/i2c/adv748x/adv748x.h + create mode 100644 drivers/media/i2c/ov5670.c + rename drivers/media/i2c/{soc_camera => }/ov6650.c (92%) + create mode 100644 drivers/media/pci/ddbridge/ddbridge-hw.c + create mode 100644 drivers/media/pci/ddbridge/ddbridge-hw.h + create mode 100644 drivers/media/pci/ddbridge/ddbridge-i2c.c + create mode 100644 drivers/media/pci/ddbridge/ddbridge-i2c.h + create mode 100644 drivers/media/pci/ddbridge/ddbridge-io.h + create mode 100644 drivers/media/pci/ddbridge/ddbridge-main.c + create mode 100644 drivers/media/pci/ddbridge/ddbridge-maxs8.c + create mode 100644 drivers/media/pci/ddbridge/ddbridge-maxs8.h + create mode 100644 drivers/media/platform/meson/Makefile + create mode 100644 drivers/media/platform/meson/ao-cec.c + create mode 100644 drivers/media/platform/qcom/camss-8x16/Makefile + create mode 100644 drivers/media/platform/qcom/camss-8x16/camss-csid.c + create mode 100644 drivers/media/platform/qcom/camss-8x16/camss-csid.h + create mode 100644 drivers/media/platform/qcom/camss-8x16/camss-csiphy.c + create mode 100644 drivers/media/platform/qcom/camss-8x16/camss-csiphy.h + create mode 100644 drivers/media/platform/qcom/camss-8x16/camss-ispif.c + create mode 100644 drivers/media/platform/qcom/camss-8x16/camss-ispif.h + create mode 100644 drivers/media/platform/qcom/camss-8x16/camss-vfe.c + create mode 100644 drivers/media/platform/qcom/camss-8x16/camss-vfe.h + create mode 100644 drivers/media/platform/qcom/camss-8x16/camss-video.c + create mode 100644 drivers/media/platform/qcom/camss-8x16/camss-video.h + create mode 100644 drivers/media/platform/qcom/camss-8x16/camss.c + create mode 100644 drivers/media/platform/qcom/camss-8x16/camss.h + create mode 100644 drivers/media/rc/gpio-ir-tx.c + create mode 100644 drivers/media/rc/keymaps/rc-zx-irdec.c + create mode 100644 drivers/media/rc/pwm-ir-tx.c + create mode 100644 drivers/media/rc/zx-irdec.c + 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 (aa55457d26ec omapfb: constify omap_video_timings structures) +$ git merge fbdev/fbdev-for-next +Auto-merging drivers/video/fbdev/core/tileblit.c +Auto-merging drivers/video/fbdev/core/softcursor.c +Auto-merging drivers/video/fbdev/core/fbcon_ud.c +Auto-merging drivers/video/fbdev/core/fbcon_rotate.c +Auto-merging drivers/video/fbdev/core/fbcon_cw.c +Auto-merging drivers/video/fbdev/core/fbcon_ccw.c +Auto-merging drivers/video/fbdev/core/fbcon.h +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/video/fbdev/core/bitblit.c +Merge made by the 'recursive' strategy. + Documentation/fb/fbcon.txt | 7 ++ + drivers/video/console/Kconfig | 2 +- + drivers/video/console/Makefile | 8 -- + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/arkfb.c | 2 +- + drivers/video/fbdev/asiliantfb.c | 2 +- + drivers/video/fbdev/aty/aty128fb.c | 2 +- + drivers/video/fbdev/aty/atyfb_base.c | 2 +- + drivers/video/fbdev/aty/radeon_base.c | 6 +- + drivers/video/fbdev/bfin-lq035q1-fb.c | 2 +- + drivers/video/fbdev/bw2.c | 4 +- + drivers/video/fbdev/cg14.c | 4 +- + drivers/video/fbdev/cg3.c | 4 +- + drivers/video/fbdev/cg6.c | 4 +- + drivers/video/fbdev/chipsfb.c | 4 +- + drivers/video/fbdev/cobalt_lcdfb.c | 2 +- + drivers/video/fbdev/core/Makefile | 14 +++ + drivers/video/{console => fbdev/core}/bitblit.c | 8 +- + drivers/video/{console => fbdev/core}/fbcon.c | 39 +++--- + drivers/video/{console => fbdev/core}/fbcon.h | 9 +- + drivers/video/{console => fbdev/core}/fbcon_ccw.c | 8 +- + drivers/video/{console => fbdev/core}/fbcon_cw.c | 8 +- + drivers/video/fbdev/core/fbcon_dmi_quirks.c | 131 +++++++++++++++++++++ + .../video/{console => fbdev/core}/fbcon_rotate.c | 4 - + .../video/{console => fbdev/core}/fbcon_rotate.h | 0 + drivers/video/{console => fbdev/core}/fbcon_ud.c | 8 +- + drivers/video/fbdev/core/fbmem.c | 12 +- + drivers/video/fbdev/core/fbmon.c | 4 +- + drivers/video/{console => fbdev/core}/softcursor.c | 4 - + drivers/video/{console => fbdev/core}/tileblit.c | 7 +- + drivers/video/fbdev/da8xx-fb.c | 2 +- + drivers/video/fbdev/ffb.c | 4 +- + drivers/video/fbdev/geode/gxfb_core.c | 2 +- + drivers/video/fbdev/i810/i810_main.c | 4 +- + drivers/video/fbdev/imsttfb.c | 2 +- + drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- + drivers/video/fbdev/kyro/fbdev.c | 2 +- + drivers/video/fbdev/leo.c | 4 +- + drivers/video/fbdev/matrox/matroxfb_base.c | 12 +- + drivers/video/fbdev/mb862xx/mb862xxfbdrv.c | 2 +- + drivers/video/fbdev/mbx/mbxfb.c | 4 +- + drivers/video/fbdev/neofb.c | 2 +- + drivers/video/fbdev/nvidia/nvidia.c | 2 +- + drivers/video/fbdev/offb.c | 10 +- + drivers/video/fbdev/omap/lcd_mipid.c | 2 +- + .../omapfb/displays/panel-lgphilips-lb035q02.c | 2 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 2 +- + .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 2 +- + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 3 +- + drivers/video/fbdev/p9100.c | 4 +- + drivers/video/fbdev/pm2fb.c | 2 +- + drivers/video/fbdev/pm3fb.c | 2 +- + drivers/video/fbdev/pvr2fb.c | 2 +- + drivers/video/fbdev/pxa3xx-gcu.c | 4 +- + drivers/video/fbdev/riva/fbdev.c | 2 +- + drivers/video/fbdev/s3fb.c | 2 +- + drivers/video/fbdev/savage/savagefb_driver.c | 2 +- + drivers/video/fbdev/skeletonfb.c | 2 +- + drivers/video/fbdev/sm712fb.c | 17 +-- + drivers/video/fbdev/smscufx.c | 2 +- + drivers/video/fbdev/sunxvr1000.c | 10 +- + drivers/video/fbdev/sunxvr2500.c | 2 +- + drivers/video/fbdev/sunxvr500.c | 2 +- + drivers/video/fbdev/tcx.c | 4 +- + drivers/video/fbdev/tdfxfb.c | 2 +- + drivers/video/fbdev/tridentfb.c | 2 +- + drivers/video/fbdev/udlfb.c | 5 +- + drivers/video/fbdev/uvesafb.c | 2 +- + drivers/video/fbdev/vermilion/vermilion.c | 2 +- + drivers/video/fbdev/via/via-core.c | 2 +- + drivers/video/fbdev/vt8623fb.c | 4 +- + drivers/video/fbdev/xilinxfb.c | 62 +++++----- + drivers/video/of_display_timing.c | 41 +++---- + drivers/video/of_videomode.c | 2 +- + include/linux/fb.h | 10 +- + include/linux/fbcon.h | 12 ++ + 77 files changed, 356 insertions(+), 229 deletions(-) + rename drivers/video/{console => fbdev/core}/bitblit.c (98%) + rename drivers/video/{console => fbdev/core}/fbcon.c (99%) + rename drivers/video/{console => fbdev/core}/fbcon.h (97%) + rename drivers/video/{console => fbdev/core}/fbcon_ccw.c (98%) + rename drivers/video/{console => fbdev/core}/fbcon_cw.c (98%) + create mode 100644 drivers/video/fbdev/core/fbcon_dmi_quirks.c + rename drivers/video/{console => fbdev/core}/fbcon_rotate.c (95%) + rename drivers/video/{console => fbdev/core}/fbcon_rotate.h (100%) + rename drivers/video/{console => fbdev/core}/fbcon_ud.c (98%) + rename drivers/video/{console => fbdev/core}/softcursor.c (93%) + rename drivers/video/{console => fbdev/core}/tileblit.c (96%) + create mode 100644 include/linux/fbcon.h +Merging pm/linux-next (eeba01288a54 Merge branch 'acpi-properties-fix' into linux-next) +$ git merge pm/linux-next +Resolved 'drivers/acpi/sbs.c' using previous resolution. +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/cpufreq/mediatek-cpufreq.c +Removing drivers/cpufreq/dbx500-cpufreq.c +Auto-merging drivers/acpi/sleep.c +Auto-merging drivers/acpi/sbs.c +CONFLICT (content): Merge conflict in drivers/acpi/sbs.c +Auto-merging drivers/acpi/osi.c +Auto-merging drivers/acpi/ec.c +Auto-merging drivers/acpi/bus.c +Auto-merging drivers/acpi/arm64/iort.c +Auto-merging arch/x86/kernel/acpi/boot.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/clock/mt8173-cpu-dvfs.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a599bfefd986] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-power | 12 + + Documentation/admin-guide/pm/cpufreq.rst | 8 - + Documentation/admin-guide/pm/intel_pstate.rst | 61 +-- + .../devicetree/bindings/clock/mt8173-cpu-dvfs.txt | 83 --- + .../bindings/cpufreq/cpufreq-mediatek.txt | 247 +++++++++ + Documentation/power/states.txt | 4 +- + MAINTAINERS | 9 + + arch/arm/boot/dts/tango4-smp8758.dtsi | 1 - + arch/arm/mach-tegra/cpuidle-tegra114.c | 4 +- + arch/arm/mach-ux500/Kconfig | 1 + + arch/arm64/kernel/acpi.c | 4 +- + arch/ia64/kernel/acpi.c | 6 +- + arch/x86/include/asm/setup.h | 1 + + arch/x86/kernel/acpi/boot.c | 11 +- + arch/x86/kernel/early-quirks.c | 4 +- + arch/x86/kernel/quirks.c | 10 + + arch/x86/kernel/setup.c | 2 + + drivers/acpi/Makefile | 1 + + drivers/acpi/acpi_lpat.c | 6 +- + drivers/acpi/acpi_lpss.c | 3 +- + drivers/acpi/acpica/Makefile | 1 + + drivers/acpi/acpica/acapps.h | 2 + + drivers/acpi/acpica/acdispat.h | 13 + + drivers/acpi/acpica/aclocal.h | 7 +- + drivers/acpi/acpica/acobject.h | 15 +- + drivers/acpi/acpica/actables.h | 5 +- + drivers/acpi/acpica/acutils.h | 9 +- + drivers/acpi/acpica/dbdisply.c | 37 +- + drivers/acpi/acpica/dsfield.c | 2 + + drivers/acpi/acpica/dsobject.c | 398 +++----------- + drivers/acpi/acpica/dsopcode.c | 9 + + drivers/acpi/acpica/dspkginit.c | 496 +++++++++++++++++ + drivers/acpi/acpica/evgpeblk.c | 30 +- + drivers/acpi/acpica/evxfgpe.c | 8 + + drivers/acpi/acpica/excreate.c | 62 +-- + drivers/acpi/acpica/exdump.c | 34 +- + drivers/acpi/acpica/exmisc.c | 9 + + drivers/acpi/acpica/exoparg2.c | 3 + + drivers/acpi/acpica/hwregs.c | 2 +- + drivers/acpi/acpica/hwxfsleep.c | 9 +- + drivers/acpi/acpica/nsaccess.c | 28 +- + drivers/acpi/acpica/nsarguments.c | 21 +- + drivers/acpi/acpica/nsinit.c | 14 + + drivers/acpi/acpica/nsnames.c | 9 +- + drivers/acpi/acpica/nsprepkg.c | 2 + + drivers/acpi/acpica/psloop.c | 14 + + drivers/acpi/acpica/psobject.c | 26 + + drivers/acpi/acpica/rsxface.c | 7 +- + drivers/acpi/acpica/tbdata.c | 230 +++++++- + drivers/acpi/acpica/tbinstal.c | 161 +----- + drivers/acpi/acpica/tbxface.c | 39 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/uthex.c | 4 +- + drivers/acpi/acpica/utmath.c | 222 +++++++- + drivers/acpi/acpica/utmisc.c | 10 +- + drivers/acpi/acpica/utobject.c | 5 + + drivers/acpi/acpica/utprint.c | 8 +- + drivers/acpi/acpica/utresrc.c | 7 + + drivers/acpi/acpica/utstate.c | 2 +- + drivers/acpi/acpica/utstrtoul64.c | 9 +- + drivers/acpi/acpica/uttrack.c | 9 +- + drivers/acpi/apei/ghes.c | 3 +- + drivers/acpi/arm64/iort.c | 57 +- + drivers/acpi/bus.c | 3 - + drivers/acpi/device_pm.c | 175 ++++-- + drivers/acpi/dock.c | 2 +- + drivers/acpi/ec.c | 48 +- + drivers/acpi/internal.h | 6 + + drivers/acpi/osi.c | 37 +- + drivers/acpi/pci_root.c | 4 +- + drivers/acpi/pmic/intel_pmic_xpower.c | 21 +- + drivers/acpi/processor_driver.c | 2 +- + drivers/acpi/processor_idle.c | 6 +- + drivers/acpi/property.c | 237 +++++---- + drivers/acpi/resource.c | 82 ++- + drivers/acpi/sbs.c | 25 +- + drivers/acpi/scan.c | 107 +++- + drivers/acpi/sleep.c | 204 ++++++- + drivers/acpi/spcr.c | 36 +- + drivers/acpi/sysfs.c | 12 +- + drivers/acpi/tables.c | 4 +- + drivers/acpi/video_detect.c | 14 + + drivers/acpi/x86/apple.c | 141 +++++ + drivers/base/power/domain.c | 237 ++++++++- + drivers/base/power/main.c | 103 ++-- + drivers/base/power/opp/of.c | 37 +- + drivers/base/power/wakeup.c | 10 +- + drivers/base/property.c | 131 +++-- + drivers/cpufreq/Kconfig.arm | 21 +- + drivers/cpufreq/Makefile | 4 +- + drivers/cpufreq/arm_big_little.c | 10 +- + drivers/cpufreq/cppc_cpufreq.c | 1 - + drivers/cpufreq/cpufreq-dt-platdev.c | 11 +- + drivers/cpufreq/cpufreq-dt.c | 1 + + drivers/cpufreq/cpufreq-nforce2.c | 2 +- + drivers/cpufreq/cpufreq.c | 41 +- + drivers/cpufreq/cpufreq_conservative.c | 6 - + drivers/cpufreq/cpufreq_governor.c | 20 +- + drivers/cpufreq/cpufreq_governor.h | 3 +- + drivers/cpufreq/cpufreq_ondemand.c | 12 - + drivers/cpufreq/dbx500-cpufreq.c | 103 ---- + drivers/cpufreq/elanfreq.c | 4 +- + drivers/cpufreq/gx-suspmod.c | 2 +- + drivers/cpufreq/intel_pstate.c | 322 +---------- + drivers/cpufreq/longrun.c | 1 - + drivers/cpufreq/loongson2_cpufreq.c | 2 +- + .../{mt8173-cpufreq.c => mediatek-cpufreq.c} | 29 +- + drivers/cpufreq/pmac32-cpufreq.c | 7 +- + drivers/cpufreq/s5pv210-cpufreq.c | 3 + + drivers/cpufreq/sa1100-cpufreq.c | 5 +- + drivers/cpufreq/sa1110-cpufreq.c | 5 +- + drivers/cpufreq/sh-cpufreq.c | 3 +- + drivers/cpufreq/speedstep-ich.c | 2 +- + drivers/cpufreq/speedstep-smi.c | 2 +- + drivers/cpufreq/tango-cpufreq.c | 38 ++ + drivers/cpufreq/unicore2-cpufreq.c | 3 +- + drivers/cpuidle/cpuidle.c | 18 +- + drivers/cpuidle/dt_idle_states.c | 4 +- + drivers/firmware/efi/apple-properties.c | 5 +- + drivers/idle/intel_idle.c | 180 +++---- + drivers/mailbox/pcc.c | 4 +- + drivers/mfd/db8500-prcmu.c | 60 +-- + drivers/of/property.c | 66 ++- + drivers/pci/pci-acpi.c | 4 +- + drivers/pci/pci-driver.c | 4 +- + drivers/pci/pci.c | 7 + + drivers/pci/quirks.c | 5 +- + drivers/platform/x86/intel-hid.c | 17 +- + drivers/regulator/of_regulator.c | 2 +- + drivers/spi/spi.c | 32 ++ + drivers/thunderbolt/icm.c | 13 +- + drivers/thunderbolt/tb.c | 4 +- + include/acpi/acnames.h | 1 + + include/acpi/acpi.h | 4 +- + include/acpi/acpi_bus.h | 61 ++- + include/acpi/acpixf.h | 15 +- + include/acpi/acrestyp.h | 7 - + include/acpi/actbl.h | 1 + + include/acpi/actbl2.h | 30 +- + include/acpi/actypes.h | 11 +- + include/acpi/platform/acenv.h | 9 +- + include/acpi/platform/acgcc.h | 4 + + include/acpi/platform/aclinux.h | 5 + + include/linux/acpi.h | 80 +-- + include/linux/acpi_iort.h | 5 +- + include/linux/cpufreq.h | 38 +- + include/linux/cpuidle.h | 8 +- + include/linux/fwnode.h | 56 +- + include/linux/irqdomain.h | 4 +- + include/linux/of.h | 3 +- + include/linux/platform_data/x86/apple.h | 13 + + include/linux/pm.h | 4 + + include/linux/pm_domain.h | 3 + + include/linux/property.h | 67 +-- + include/linux/suspend.h | 48 +- + kernel/cpu_pm.c | 50 +- + kernel/irq/irqdomain.c | 11 +- + kernel/power/hibernate.c | 29 +- + kernel/power/main.c | 64 ++- + kernel/power/power.h | 5 +- + kernel/power/suspend.c | 184 ++++--- + kernel/power/suspend_test.c | 4 +- + kernel/sched/cpufreq_schedutil.c | 98 +++- + kernel/sched/deadline.c | 2 +- + kernel/sched/fair.c | 8 +- + kernel/sched/idle.c | 8 +- + kernel/sched/rt.c | 2 +- + kernel/sched/sched.h | 10 +- + kernel/time/timekeeping_debug.c | 5 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 105 ++-- + tools/power/acpi/tools/acpidump/apfiles.c | 2 +- + tools/power/acpi/tools/acpidump/apmain.c | 2 +- + tools/power/cpupower/utils/cpupower.c | 15 +- + tools/power/cpupower/utils/helpers/cpuid.c | 4 +- + tools/power/cpupower/utils/helpers/helpers.h | 5 +- + tools/power/cpupower/utils/helpers/misc.c | 2 +- + .../cpupower/utils/idle_monitor/hsw_ext_idle.c | 4 +- + .../cpupower/utils/idle_monitor/mperf_monitor.c | 3 +- + tools/power/cpupower/utils/idle_monitor/nhm_idle.c | 8 +- + tools/power/cpupower/utils/idle_monitor/snb_idle.c | 4 +- + tools/power/pm-graph/Makefile | 19 +- + tools/power/pm-graph/analyze_boot.py | 586 ++++++++++++++------- + tools/power/pm-graph/analyze_suspend.py | 534 +++++++++++++------ + tools/power/pm-graph/bootgraph.8 | 61 ++- + tools/power/pm-graph/sleepgraph.8 | 48 +- + 185 files changed, 4979 insertions(+), 2670 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/mt8173-cpu-dvfs.txt + create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-mediatek.txt + create mode 100644 drivers/acpi/acpica/dspkginit.c + create mode 100644 drivers/acpi/x86/apple.c + delete mode 100644 drivers/cpufreq/dbx500-cpufreq.c + rename drivers/cpufreq/{mt8173-cpufreq.c => mediatek-cpufreq.c} (95%) + create mode 100644 drivers/cpufreq/tango-cpufreq.c + create mode 100644 include/linux/platform_data/x86/apple.h +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 (1ef4bd4b47f3 Merge branch 'rockchip-rk3328' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + .../bindings/thermal/rockchip-thermal.txt | 1 + + .../bindings/thermal/uniphier-thermal.txt | 64 ++++ + drivers/thermal/Kconfig | 12 +- + drivers/thermal/Makefile | 1 + + drivers/thermal/broadcom/bcm2835_thermal.c | 2 +- + drivers/thermal/hisi_thermal.c | 2 +- + drivers/thermal/imx_thermal.c | 4 +- + drivers/thermal/int340x_thermal/acpi_thermal_rel.c | 2 +- + drivers/thermal/int340x_thermal/acpi_thermal_rel.h | 8 +- + drivers/thermal/int340x_thermal/int3400_thermal.c | 43 ++- + .../int340x_thermal/processor_thermal_device.c | 2 +- + drivers/thermal/intel_pch_thermal.c | 8 +- + drivers/thermal/qoriq_thermal.c | 2 +- + drivers/thermal/rcar_gen3_thermal.c | 2 +- + drivers/thermal/rockchip_thermal.c | 69 +++- + drivers/thermal/samsung/exynos_tmu.c | 2 +- + drivers/thermal/thermal_core.c | 31 +- + drivers/thermal/thermal_core.h | 1 + + drivers/thermal/thermal_sysfs.c | 29 ++ + drivers/thermal/uniphier_thermal.c | 384 +++++++++++++++++++++ + drivers/thermal/zx2967_thermal.c | 2 +- + include/linux/thermal.h | 1 + + 22 files changed, 633 insertions(+), 39 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/uniphier-thermal.txt + create mode 100644 drivers/thermal/uniphier_thermal.c +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 (1c2428537241 dlm: use sock_create_lite inside tcp_accept_from_sock) +$ 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 | 9 +++++++-- + fs/dlm/lowcomms.c | 2 +- + fs/dlm/member.c | 15 ++++++--------- + fs/dlm/user.c | 6 ++++++ + include/uapi/linux/dlm_netlink.h | 1 + + 7 files changed, 36 insertions(+), 30 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 (901c5d2fbfcd ARM: dts: rk3228-evb: Fix the compiling error) +$ git merge net-next/master +Recorded preimage for 'arch/arm64/boot/dts/rockchip/rk3328-evb.dts' +Resolved 'arch/arm64/boot/dts/rockchip/rk3328.dtsi' using previous resolution. +Resolved 'net/ipv6/ip6_fib.c' using previous resolution. +Removing tools/hv/bondvf.sh +Auto-merging net/xfrm/xfrm_state.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/tipc/node.c +Auto-merging net/sctp/socket.c +Auto-merging net/sched/sch_generic.c +Auto-merging net/sched/sch_api.c +Auto-merging net/sched/cls_api.c +Auto-merging net/rxrpc/protocol.h +Auto-merging net/ipv6/udp.c +Auto-merging net/ipv6/route.c +Auto-merging net/ipv6/ip6_fib.c +CONFLICT (content): Merge conflict in net/ipv6/ip6_fib.c +Auto-merging net/ipv6/esp6_offload.c +Auto-merging net/ipv6/esp6.c +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv4/tcp_cong.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/esp4_offload.c +Auto-merging net/ipv4/esp4.c +Auto-merging net/dsa/tag_trailer.c +Auto-merging net/dsa/tag_ksz.c +Auto-merging net/core/skbuff.c +Removing net/core/flow.c +Auto-merging net/core/filter.c +Auto-merging net/core/datagram.c +Auto-merging kernel/events/core.c +Auto-merging kernel/bpf/hashtab.c +Auto-merging include/uapi/linux/rxrpc.h +Auto-merging include/net/udp.h +Auto-merging include/net/tcp.h +Auto-merging include/net/sch_generic.h +Auto-merging include/net/ip6_fib.h +Removing include/net/flowcache.h +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/skbuff.h +Auto-merging drivers/s390/net/qeth_l3_sys.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/internal.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/dbg.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/dbg.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/tx.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/tof.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/stats.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/sta.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/scan.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/rx.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/rs.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/power.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/mac.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/d3.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/coex.h +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/api/cmdhdr.h +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/phy/phy_device.c +Auto-merging drivers/net/hyperv/netvsc_drv.c +Auto-merging drivers/net/ethernet/qlogic/qlge/qlge_dbg.c +Auto-merging drivers/net/ethernet/netronome/nfp/nfp_net_main.c +Auto-merging drivers/net/ethernet/netronome/nfp/nfp_net_common.c +Auto-merging drivers/net/ethernet/netronome/nfp/nfp_main.c +Auto-merging drivers/net/ethernet/marvell/skge.c +Auto-merging drivers/net/ethernet/freescale/fman/mac.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/ethernet/broadcom/bcmsysport.c +Auto-merging arch/powerpc/net/bpf_jit_comp64.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/rockchip/rk3328.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk3328.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3328-evb.dts +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/rockchip/rk3328-evb.dts +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/networking/batman-adv.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/arm64/boot/dts/rockchip/rk3328-evb.dts'. +[master f6eba78787dd] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/anarion-gmac.txt | 25 + + .../devicetree/bindings/net/broadcom-bluetooth.txt | 35 + + .../devicetree/bindings/net/marvell-pp2.txt | 29 +- + .../devicetree/bindings/net/mediatek-net.txt | 12 +- + Documentation/devicetree/bindings/net/phy.txt | 5 + + .../devicetree/bindings/net/renesas,ravb.txt | 30 +- + .../devicetree/bindings/net/rockchip-dwmac.txt | 1 + + .../devicetree/bindings/net/xilinx_axienet.txt | 55 + + Documentation/networking/00-INDEX | 2 - + Documentation/networking/batman-adv.rst | 220 + + Documentation/networking/batman-adv.txt | 215 - + Documentation/networking/filter.txt | 130 +- + Documentation/networking/hinic.txt | 125 + + Documentation/networking/index.rst | 1 + + Documentation/networking/ip-sysctl.txt | 22 +- + Documentation/networking/netvsc.txt | 75 + + Documentation/networking/strparser.txt | 209 +- + Documentation/sysctl/net.txt | 2 +- + MAINTAINERS | 23 +- + arch/alpha/include/uapi/asm/socket.h | 2 + + arch/arm/Kconfig | 2 +- + arch/arm/boot/dts/rk3228-evb.dts | 34 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/net/bpf_jit_32.c | 2448 +++++++---- + arch/arm/net/bpf_jit_32.h | 108 +- + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 17 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 39 + + arch/arm64/configs/defconfig | 1 + + arch/arm64/net/bpf_jit.h | 4 + + arch/arm64/net/bpf_jit_comp.c | 20 + + arch/frv/include/uapi/asm/socket.h | 2 + + arch/ia64/include/uapi/asm/socket.h | 2 + + arch/m32r/include/uapi/asm/socket.h | 2 + + arch/mips/include/uapi/asm/socket.h | 2 + + arch/mips/net/ebpf_jit.c | 163 +- + arch/mn10300/include/uapi/asm/socket.h | 2 + + arch/parisc/include/uapi/asm/socket.h | 2 + + arch/powerpc/net/bpf_jit.h | 1 + + arch/powerpc/net/bpf_jit_comp64.c | 20 + + arch/s390/include/uapi/asm/socket.h | 2 + + arch/s390/net/bpf_jit_comp.c | 24 + + arch/sparc/include/uapi/asm/socket.h | 2 + + arch/sparc/net/bpf_jit_comp_64.c | 34 + + arch/x86/net/bpf_jit_comp.c | 26 + + arch/xtensa/include/uapi/asm/socket.h | 2 + + drivers/atm/adummy.c | 4 +- + drivers/atm/ambassador.c | 2 +- + drivers/atm/atmtcp.c | 2 +- + drivers/atm/eni.c | 2 +- + drivers/atm/firestream.c | 2 +- + drivers/atm/fore200e.c | 2 +- + drivers/atm/he.c | 4 +- + drivers/atm/horizon.c | 2 +- + drivers/atm/idt77252.c | 4 +- + drivers/atm/iphase.c | 2 +- + drivers/atm/lanai.c | 2 +- + drivers/atm/nicstar.c | 4 +- + drivers/atm/solos-pci.c | 8 +- + drivers/atm/zatm.c | 2 +- + drivers/bcma/driver_gpio.c | 1 + + drivers/bluetooth/Kconfig | 2 + + drivers/bluetooth/ath3k.c | 3 +- + drivers/bluetooth/bluecard_cs.c | 58 +- + drivers/bluetooth/bt3c_cs.c | 8 +- + drivers/bluetooth/btbcm.c | 69 +- + drivers/bluetooth/btmrvl_sdio.c | 6 +- + drivers/bluetooth/btqca.c | 2 +- + drivers/bluetooth/btrtl.c | 2 + + drivers/bluetooth/btsdio.c | 3 +- + drivers/bluetooth/btuart_cs.c | 8 +- + drivers/bluetooth/btusb.c | 68 +- + drivers/bluetooth/btwilink.c | 8 +- + drivers/bluetooth/hci_bcm.c | 133 +- + drivers/bluetooth/hci_h4.c | 2 +- + drivers/bluetooth/hci_ldisc.c | 3 +- + drivers/bluetooth/hci_ll.c | 11 +- + drivers/bluetooth/hci_nokia.c | 10 +- + drivers/bluetooth/hci_serdev.c | 13 + + drivers/bluetooth/hci_uart.h | 1 + + drivers/hv/channel.c | 129 +- + drivers/infiniband/hw/bnxt_re/Kconfig | 1 + + drivers/isdn/capi/kcapi.c | 2 +- + drivers/isdn/hardware/eicon/divacapi.h | 16 +- + drivers/isdn/hardware/eicon/message.c | 247 +- + drivers/isdn/hardware/mISDN/hfcsusb.h | 2 +- + drivers/isdn/hisax/hfc_usb.c | 2 +- + drivers/net/appletalk/ipddp.c | 4 +- + 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/c_can/c_can_platform.c | 2 +- + drivers/net/can/janz-ican3.c | 2 +- + drivers/net/dsa/b53/b53_common.c | 83 +- + drivers/net/dsa/b53/b53_priv.h | 16 +- + drivers/net/dsa/bcm_sf2.c | 32 +- + drivers/net/dsa/dsa_loop.c | 40 +- + drivers/net/dsa/lan9303-core.c | 137 +- + drivers/net/dsa/lan9303.h | 11 + + drivers/net/dsa/lan9303_i2c.c | 2 + + drivers/net/dsa/lan9303_mdio.c | 23 + + drivers/net/dsa/microchip/ksz_common.c | 124 +- + drivers/net/dsa/mt7530.c | 43 +- + drivers/net/dsa/mv88e6xxx/chip.c | 416 +- + drivers/net/dsa/mv88e6xxx/chip.h | 146 +- + drivers/net/dsa/mv88e6xxx/global2.c | 104 +- + drivers/net/dsa/mv88e6xxx/global2.h | 41 +- + drivers/net/dsa/mv88e6xxx/phy.c | 1 - + drivers/net/dsa/mv88e6xxx/port.h | 3 - + drivers/net/dsa/qca8k.c | 110 +- + drivers/net/dsa/qca8k.h | 1 - + drivers/net/dummy.c | 2 +- + drivers/net/ethernet/3com/3c509.c | 4 +- + drivers/net/ethernet/3com/3c59x.c | 2 +- + drivers/net/ethernet/8390/ax88796.c | 2 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/adi/bfin_mac.c | 2 +- + drivers/net/ethernet/amd/a2065.c | 2 +- + drivers/net/ethernet/amd/ariadne.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 25 + + drivers/net/ethernet/amd/xgbe/xgbe-debugfs.c | 25 + + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 198 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 501 ++- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 86 +- + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 97 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 81 +- + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 4 + + drivers/net/ethernet/amd/xgbe/xgbe-phy-v1.c | 54 +- + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 352 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 92 +- + drivers/net/ethernet/apple/mace.c | 8 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 7 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 5 +- + drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 1 + + drivers/net/ethernet/arc/emac_main.c | 13 + + drivers/net/ethernet/broadcom/Kconfig | 3 + + drivers/net/ethernet/broadcom/bcmsysport.c | 78 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 21 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 14 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 4 +- + drivers/net/ethernet/broadcom/bnxt/Makefile | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 251 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 54 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 17 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.h | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 35 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 322 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 15 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 495 +++ + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h | 72 + + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 1 + + drivers/net/ethernet/broadcom/genet/bcmmii.c | 256 +- + drivers/net/ethernet/broadcom/tg3.c | 8 +- + drivers/net/ethernet/cadence/macb_main.c | 2 +- + drivers/net/ethernet/cadence/macb_pci.c | 2 +- + drivers/net/ethernet/cadence/macb_ptp.c | 2 +- + .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 62 +- + .../ethernet/cavium/liquidio/cn23xx_pf_device.h | 2 - + .../ethernet/cavium/liquidio/cn23xx_vf_device.h | 2 - + drivers/net/ethernet/cavium/liquidio/lio_core.c | 728 +++- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 352 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 956 +---- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 598 +-- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 11 +- + .../net/ethernet/cavium/liquidio/octeon_config.h | 13 +- + .../net/ethernet/cavium/liquidio/octeon_console.c | 75 +- + .../net/ethernet/cavium/liquidio/octeon_device.c | 27 +- + .../net/ethernet/cavium/liquidio/octeon_device.h | 20 +- + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 10 +- + drivers/net/ethernet/cavium/liquidio/octeon_main.h | 6 + + .../net/ethernet/cavium/liquidio/octeon_network.h | 35 + + .../net/ethernet/cavium/liquidio/request_manager.c | 11 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 1 - + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 8 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 58 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 192 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 188 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 9 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.h | 6 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 944 ++++- + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 177 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 50 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 86 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 456 ++- + drivers/net/ethernet/dec/tulip/de4x5.c | 2 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 2 - + drivers/net/ethernet/ec_bhf.c | 2 +- + drivers/net/ethernet/emulex/benet/be_roce.c | 3 - + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 19 +- + drivers/net/ethernet/freescale/fec_main.c | 13 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 4 +- + drivers/net/ethernet/freescale/fman/fman.c | 12 +- + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 118 +- + drivers/net/ethernet/freescale/fman/fman_port.c | 4 +- + drivers/net/ethernet/freescale/fman/mac.c | 50 +- + .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 2 +- + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 20 +- + drivers/net/ethernet/freescale/gianfar_ptp.c | 2 +- + drivers/net/ethernet/hisilicon/Kconfig | 27 + + drivers/net/ethernet/hisilicon/Makefile | 1 + + drivers/net/ethernet/hisilicon/hns/hnae.c | 1 + + drivers/net/ethernet/hisilicon/hns/hnae.h | 15 + + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 1 + + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 135 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 9 +- + drivers/net/ethernet/hisilicon/hns3/Makefile | 7 + + drivers/net/ethernet/hisilicon/hns3/hnae3.c | 300 ++ + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 444 ++ + .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 11 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 356 ++ + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 740 ++++ + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4265 ++++++++++++++++++++ + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 519 +++ + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 213 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h | 17 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 1015 +++++ + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 106 + + .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c | 2891 +++++++++++++ + .../net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h | 593 +++ + .../ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c | 493 +++ + drivers/net/ethernet/hp/hp100.c | 2 +- + drivers/net/ethernet/huawei/Kconfig | 19 + + drivers/net/ethernet/huawei/Makefile | 5 + + drivers/net/ethernet/huawei/hinic/Kconfig | 13 + + drivers/net/ethernet/huawei/hinic/Makefile | 6 + + drivers/net/ethernet/huawei/hinic/hinic_common.c | 80 + + drivers/net/ethernet/huawei/hinic/hinic_common.h | 38 + + drivers/net/ethernet/huawei/hinic/hinic_dev.h | 64 + + .../net/ethernet/huawei/hinic/hinic_hw_api_cmd.c | 978 +++++ + .../net/ethernet/huawei/hinic/hinic_hw_api_cmd.h | 208 + + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 946 +++++ + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h | 187 + + drivers/net/ethernet/huawei/hinic/hinic_hw_csr.h | 149 + + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c | 1048 +++++ + drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 239 ++ + drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c | 886 ++++ + drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.h | 265 ++ + drivers/net/ethernet/huawei/hinic/hinic_hw_if.c | 351 ++ + drivers/net/ethernet/huawei/hinic/hinic_hw_if.h | 272 ++ + drivers/net/ethernet/huawei/hinic/hinic_hw_io.c | 533 +++ + drivers/net/ethernet/huawei/hinic/hinic_hw_io.h | 97 + + drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 597 +++ + drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h | 153 + + drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c | 887 ++++ + drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h | 180 + + .../net/ethernet/huawei/hinic/hinic_hw_qp_ctxt.h | 214 + + drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c | 878 ++++ + drivers/net/ethernet/huawei/hinic/hinic_hw_wq.h | 117 + + drivers/net/ethernet/huawei/hinic/hinic_hw_wqe.h | 368 ++ + drivers/net/ethernet/huawei/hinic/hinic_main.c | 1111 +++++ + drivers/net/ethernet/huawei/hinic/hinic_port.c | 379 ++ + drivers/net/ethernet/huawei/hinic/hinic_port.h | 198 + + drivers/net/ethernet/huawei/hinic/hinic_rx.c | 509 +++ + drivers/net/ethernet/huawei/hinic/hinic_rx.h | 55 + + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 504 +++ + drivers/net/ethernet/huawei/hinic/hinic_tx.h | 62 + + drivers/net/ethernet/ibm/ehea/ehea_main.c | 5 +- + drivers/net/ethernet/ibm/emac/core.c | 63 +- + drivers/net/ethernet/ibm/emac/core.h | 1 - + drivers/net/ethernet/ibm/emac/debug.h | 2 +- + drivers/net/ethernet/ibm/emac/mal.c | 8 +- + drivers/net/ethernet/ibm/emac/rgmii.c | 18 +- + drivers/net/ethernet/ibm/emac/tah.c | 12 +- + drivers/net/ethernet/ibm/emac/zmii.c | 17 +- + drivers/net/ethernet/ibm/ibmveth.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 214 +- + drivers/net/ethernet/ibm/ibmvnic.h | 17 + + drivers/net/ethernet/intel/e1000e/hw.h | 4 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 2 + + drivers/net/ethernet/intel/e1000e/netdev.c | 4 + + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 14 +- + drivers/net/ethernet/intel/i40e/i40e.h | 44 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 160 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 260 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 27 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 11 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 18 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 3 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 62 +- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 2 +- + drivers/net/ethernet/intel/i40evf/i40e_osdep.h | 4 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 6 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 5 +- + drivers/net/ethernet/intel/i40evf/i40evf.h | 25 +- + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 45 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 55 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 4 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 6 + + drivers/net/ethernet/intel/igb/e1000_defines.h | 1 + + drivers/net/ethernet/intel/igb/e1000_hw.h | 18 +- + drivers/net/ethernet/intel/igb/e1000_mbx.c | 57 +- + drivers/net/ethernet/intel/igb/e1000_mbx.h | 14 +- + drivers/net/ethernet/intel/igb/igb_main.c | 23 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 4 + + drivers/net/ethernet/intel/igbvf/mbx.c | 4 + + drivers/net/ethernet/intel/igbvf/netdev.c | 47 + + drivers/net/ethernet/intel/igbvf/vf.c | 12 +- + drivers/net/ethernet/intel/igbvf/vf.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 30 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 132 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 9 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 102 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 6 +- + drivers/net/ethernet/marvell/mvneta.c | 3 - + drivers/net/ethernet/marvell/mvpp2.c | 1225 ++++-- + drivers/net/ethernet/marvell/skge.c | 2 +- + drivers/net/ethernet/mediatek/Kconfig | 6 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 183 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 80 +- + drivers/net/ethernet/mellanox/Kconfig | 5 +- + drivers/net/ethernet/mellanox/mlx4/alloc.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 20 +- + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_main.c | 9 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 17 +- + drivers/net/ethernet/mellanox/mlx4/en_resources.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 20 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/fw_qos.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/fw_qos.h | 10 +- + drivers/net/ethernet/mellanox/mlx4/icm.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/icm.h | 4 +- + drivers/net/ethernet/mellanox/mlx4/intf.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 18 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 12 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 +- + drivers/net/ethernet/mellanox/mlx4/mr.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/qp.c | 12 +- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 21 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 73 + + .../net/ethernet/mellanox/mlx5/core/diag/Makefile | 1 + + .../mellanox/mlx5/core/diag/fs_tracepoint.c | 261 ++ + .../mellanox/mlx5/core/diag/fs_tracepoint.h | 282 ++ + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 64 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 17 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 165 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 80 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 9 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 46 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 211 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 78 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 472 ++- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 25 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 13 +- + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 135 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c | 201 + + drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h | 95 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 40 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 4 + + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 15 +- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 2 +- + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 6 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 111 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 193 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 14 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 80 +- + .../mellanox/mlxsw/spectrum_acl_flex_keys.h | 3 + + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 18 + + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 433 +- + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.h | 1 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 78 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 2414 ++++++++--- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 20 + + drivers/net/ethernet/mellanox/mlxsw/switchib.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/trap.h | 25 +- + drivers/net/ethernet/moxa/moxart_ether.c | 15 +- + drivers/net/ethernet/moxa/moxart_ether.h | 8 +- + drivers/net/ethernet/neterion/s2io.c | 45 - + drivers/net/ethernet/netronome/nfp/Makefile | 1 + + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 24 + + drivers/net/ethernet/netronome/nfp/bpf/main.c | 20 +- + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 4 +- + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 24 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 68 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 22 + + drivers/net/ethernet/netronome/nfp/flower/main.c | 51 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 9 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 15 +- + drivers/net/ethernet/netronome/nfp/nfp_app.c | 20 + + drivers/net/ethernet/netronome/nfp/nfp_app.h | 10 +- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 48 +- + drivers/net/ethernet/netronome/nfp/nfp_main.h | 4 + + drivers/net/ethernet/netronome/nfp/nfp_net.h | 2 - + .../net/ethernet/netronome/nfp/nfp_net_common.c | 16 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 1 + + .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 13 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 593 ++- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 26 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 88 +- + drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c | 243 ++ + drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h | 86 + + drivers/net/ethernet/netronome/nfp/nfp_port.c | 39 +- + drivers/net/ethernet/netronome/nfp/nfp_port.h | 60 +- + .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c | 18 +- + drivers/net/ethernet/netronome/nfp/nic/main.c | 12 + + drivers/net/ethernet/nvidia/forcedeth.c | 5 +- + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 145 +- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 43 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 49 + + drivers/net/ethernet/qlogic/qed/qed_l2.c | 115 + + drivers/net/ethernet/qlogic/qed/qed_l2.h | 18 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 58 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 66 + + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 37 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 157 + + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 3 + + drivers/net/ethernet/qlogic/qed/qed_vf.c | 75 + + drivers/net/ethernet/qlogic/qed/qed_vf.h | 53 +- + drivers/net/ethernet/qlogic/qede/qede.h | 19 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 205 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 483 ++- + drivers/net/ethernet/qlogic/qede/qede_main.c | 9 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_minidump.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 8 +- + drivers/net/ethernet/qlogic/qlge/qlge_dbg.c | 47 +- + drivers/net/ethernet/renesas/ravb.h | 2 + + drivers/net/ethernet/renesas/ravb_main.c | 131 +- + drivers/net/ethernet/renesas/sh_eth.c | 2 +- + drivers/net/ethernet/rocker/rocker_main.c | 5 + + drivers/net/ethernet/rocker/rocker_ofdpa.c | 6 +- + drivers/net/ethernet/sfc/efx.h | 4 +- + drivers/net/ethernet/sfc/falcon/efx.h | 4 +- + drivers/net/ethernet/sfc/falcon/tx.c | 13 +- + drivers/net/ethernet/sfc/mcdi_port.c | 224 +- + drivers/net/ethernet/sfc/tx.c | 13 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 9 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 152 + + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 193 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 2 +- + drivers/net/ethernet/sun/ldmvsw.c | 2 +- + drivers/net/ethernet/sun/niu.c | 24 +- + 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/ti/cpsw.c | 10 +- + drivers/net/ethernet/ti/cpts.c | 2 +- + drivers/net/ethernet/ti/davinci_emac.c | 4 +- + drivers/net/ethernet/ti/davinci_mdio.c | 10 +- + drivers/net/ethernet/ti/netcp_core.c | 13 +- + drivers/net/ethernet/tile/tilegx.c | 2 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 4 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 48 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- + drivers/net/fddi/defxx.c | 2 +- + drivers/net/geneve.c | 322 +- + drivers/net/hamradio/baycom_par.c | 2 +- + drivers/net/hamradio/baycom_ser_fdx.c | 2 +- + drivers/net/hamradio/baycom_ser_hdx.c | 2 +- + drivers/net/hamradio/dmascc.c | 2 +- + drivers/net/hyperv/hyperv_net.h | 72 +- + drivers/net/hyperv/netvsc.c | 459 +-- + drivers/net/hyperv/netvsc_drv.c | 772 +++- + drivers/net/hyperv/rndis_filter.c | 151 +- + drivers/net/ieee802154/ca8210.c | 1 + + drivers/net/ieee802154/mrf24j40.c | 3 +- + drivers/net/ipvlan/ipvlan_main.c | 2 +- + drivers/net/ipvlan/ipvtap.c | 2 +- + drivers/net/irda/irda-usb.c | 2 +- + drivers/net/irda/kingsun-sir.c | 2 +- + drivers/net/irda/ks959-sir.c | 2 +- + drivers/net/irda/ksdazzle-sir.c | 2 +- + drivers/net/irda/mcs7780.c | 2 +- + drivers/net/irda/stir4200.c | 2 +- + drivers/net/macvlan.c | 5 +- + drivers/net/macvtap.c | 2 +- + drivers/net/phy/Kconfig | 72 +- + drivers/net/phy/Makefile | 7 + + drivers/net/phy/marvell.c | 320 +- + drivers/net/phy/mdio-bcm-unimac.c | 71 +- + drivers/net/phy/mdio-gpio.c | 2 +- + drivers/net/phy/mdio-i2c.c | 109 + + drivers/net/phy/mdio-i2c.h | 19 + + drivers/net/phy/mdio-mux-mmioreg.c | 18 +- + drivers/net/phy/mdio-mux.c | 16 +- + drivers/net/phy/mdio_bus.c | 6 +- + drivers/net/phy/phy-core.c | 180 + + drivers/net/phy/phy.c | 235 +- + drivers/net/phy/phy_device.c | 15 + + drivers/net/phy/phylink.c | 1462 +++++++ + drivers/net/phy/rockchip.c | 233 ++ + drivers/net/phy/sfp-bus.c | 475 +++ + drivers/net/phy/sfp.c | 915 +++++ + drivers/net/phy/sfp.h | 28 + + drivers/net/tap.c | 11 +- + drivers/net/tun.c | 253 +- + drivers/net/usb/catc.c | 2 +- + drivers/net/usb/cdc-phonet.c | 2 +- + drivers/net/usb/cdc_ncm.c | 2 +- + drivers/net/usb/ipheth.c | 2 +- + drivers/net/usb/kaweth.c | 2 +- + drivers/net/usb/r8152.c | 2 +- + drivers/net/usb/rtl8150.c | 2 +- + drivers/net/virtio_net.c | 350 +- + drivers/net/vrf.c | 139 +- + drivers/net/vxlan.c | 130 +- + drivers/net/wan/dscc4.c | 129 +- + drivers/net/wireless/ath/ath10k/ahb.c | 3 +- + drivers/net/wireless/ath/ath10k/ce.c | 299 +- + drivers/net/wireless/ath/ath10k/ce.h | 30 +- + drivers/net/wireless/ath/ath10k/core.c | 5 + + drivers/net/wireless/ath/ath10k/core.h | 2 + + drivers/net/wireless/ath/ath10k/debug.c | 2 +- + drivers/net/wireless/ath/ath10k/hw.c | 150 + + drivers/net/wireless/ath/ath10k/hw.h | 9 + + drivers/net/wireless/ath/ath10k/pci.c | 55 +- + drivers/net/wireless/ath/ath10k/pci.h | 14 +- + drivers/net/wireless/ath/ath10k/wmi.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 5 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 2 +- + drivers/net/wireless/cisco/airo.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 30 +- + 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 +- + drivers/net/wireless/intel/iwlwifi/Makefile | 2 + + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 16 - + drivers/net/wireless/intel/iwlwifi/fw/api/alive.h | 206 + + .../net/wireless/intel/iwlwifi/fw/api/binding.h | 144 + + .../intel/iwlwifi/fw/{api.h => api/cmdhdr.h} | 78 +- + .../iwlwifi/{mvm/fw-api-coex.h => fw/api/coex.h} | 11 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 664 +++ + drivers/net/wireless/intel/iwlwifi/fw/api/config.h | 192 + + .../net/wireless/intel/iwlwifi/fw/api/context.h | 94 + + .../intel/iwlwifi/{mvm/fw-api-d3.h => fw/api/d3.h} | 11 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 127 + + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 345 ++ + drivers/net/wireless/intel/iwlwifi/fw/api/filter.h | 183 + + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 152 + + .../iwlwifi/{mvm/fw-api-mac.h => fw/api/mac.h} | 33 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 386 ++ + .../net/wireless/intel/iwlwifi/fw/api/offload.h | 101 + + drivers/net/wireless/intel/iwlwifi/fw/api/paging.h | 108 + + .../net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h | 164 + + drivers/net/wireless/intel/iwlwifi/fw/api/phy.h | 258 ++ + .../iwlwifi/{mvm/fw-api-power.h => fw/api/power.h} | 13 +- + .../intel/iwlwifi/{mvm/fw-api-rs.h => fw/api/rs.h} | 13 +- + .../intel/iwlwifi/{mvm/fw-api-rx.h => fw/api/rx.h} | 31 +- + .../iwlwifi/{mvm/fw-api-scan.h => fw/api/scan.h} | 11 +- + drivers/net/wireless/intel/iwlwifi/fw/api/sf.h | 138 + + .../iwlwifi/{mvm/fw-api-sta.h => fw/api/sta.h} | 15 +- + .../iwlwifi/{mvm/fw-api-stats.h => fw/api/stats.h} | 13 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h | 208 + + .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 386 ++ + .../iwlwifi/{mvm/fw-api-tof.h => fw/api/tof.h} | 9 +- + .../intel/iwlwifi/{mvm/fw-api-tx.h => fw/api/tx.h} | 42 +- + drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 163 + + drivers/net/wireless/intel/iwlwifi/fw/common_rx.c | 88 + + .../intel/iwlwifi/{mvm/fw-dbg.c => fw/dbg.c} | 438 +- + .../intel/iwlwifi/{mvm/fw-dbg.h => fw/dbg.h} | 125 +- + drivers/net/wireless/intel/iwlwifi/fw/init.c | 75 + + drivers/net/wireless/intel/iwlwifi/fw/paging.c | 414 ++ + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 156 + + drivers/net/wireless/intel/iwlwifi/fw/smem.c | 152 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 2 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 2845 +------------ + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 484 +-- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 382 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 194 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 121 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 150 +- + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 25 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 452 +-- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 18 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 20 +- + drivers/net/wireless/intel/iwlwifi/mvm/tof.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tof.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 155 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 18 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 4 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 2 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 4 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 8 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 8 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 5 +- + drivers/net/wireless/intersil/hostap/hostap_main.c | 4 +- + drivers/net/wireless/marvell/mwifiex/11n.c | 2 + + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 6 +- + drivers/net/wireless/marvell/mwifiex/cfp.c | 4 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 15 +- + drivers/net/wireless/marvell/mwifiex/debugfs.c | 2 - + drivers/net/wireless/marvell/mwifiex/init.c | 32 +- + drivers/net/wireless/marvell/mwifiex/main.c | 133 +- + drivers/net/wireless/marvell/mwifiex/main.h | 7 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 126 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 11 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 3 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 19 +- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 5 +- + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 121 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 2 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 3 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 315 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.h | 4 + + drivers/net/wireless/quantenna/qtnfmac/commands.c | 486 ++- + drivers/net/wireless/quantenna/qtnfmac/commands.h | 5 + + drivers/net/wireless/quantenna/qtnfmac/core.c | 5 + + drivers/net/wireless/quantenna/qtnfmac/core.h | 27 +- + drivers/net/wireless/quantenna/qtnfmac/event.c | 67 +- + .../net/wireless/quantenna/qtnfmac/pearl/pcie.c | 30 +- + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 202 +- + .../net/wireless/quantenna/qtnfmac/qlink_util.c | 26 +- + .../net/wireless/quantenna/qtnfmac/qlink_util.h | 10 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 22 +- + drivers/net/wireless/realtek/rtlwifi/base.h | 2 + + .../realtek/rtlwifi/btcoexist/halbt_precomp.h | 16 - + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 17 +- + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c | 28 + + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.h | 1 + + drivers/net/wireless/realtek/rtlwifi/core.c | 2 + + drivers/net/wireless/realtek/rtlwifi/pci.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 2 + + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 5 - + .../net/wireless/realtek/rtlwifi/rtl8192cu/mac.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 12 - + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.h | 3 - + .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 9 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 5 + + .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 6 - + .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 9 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 7 + + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 365 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 17 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/table.c | 192 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/table.h | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 13 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 43 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 21 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 49 +- + drivers/net/wireless/rsi/rsi_91x_core.c | 10 +- + drivers/net/wireless/rsi/rsi_91x_debugfs.c | 3 + + drivers/net/wireless/rsi/rsi_91x_hal.c | 270 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 63 +- + drivers/net/wireless/rsi/rsi_91x_main.c | 3 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 470 ++- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 154 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 44 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 137 +- + drivers/net/wireless/rsi/rsi_91x_usb_ops.c | 6 +- + drivers/net/wireless/rsi/rsi_hal.h | 64 + + drivers/net/wireless/rsi/rsi_main.h | 52 +- + drivers/net/wireless/rsi/rsi_mgmt.h | 171 +- + drivers/net/wireless/rsi/rsi_sdio.h | 4 +- + drivers/net/wireless/rsi/rsi_usb.h | 6 +- + drivers/net/wireless/ti/wl1251/main.c | 1 + + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/net/wireless/zydas/zd1211rw/zd_rf_rf2959.c | 2 +- + drivers/of/of_mdio.c | 39 +- + drivers/ptp/ptp_dte.c | 2 +- + drivers/ptp/ptp_ixp46x.c | 2 +- + drivers/ptp/ptp_kvm.c | 2 +- + drivers/ptp/ptp_pch.c | 2 +- + drivers/s390/net/ctcm_main.c | 2 +- + drivers/s390/net/lcs.c | 28 +- + drivers/s390/net/netiucv.c | 4 +- + drivers/s390/net/qeth_core.h | 17 +- + drivers/s390/net/qeth_core_main.c | 205 +- + drivers/s390/net/qeth_core_sys.c | 2 +- + drivers/s390/net/qeth_l2_main.c | 343 +- + drivers/s390/net/qeth_l3_main.c | 67 +- + drivers/s390/net/qeth_l3_sys.c | 17 + + drivers/vhost/net.c | 1 + + drivers/virtio/virtio_ring.c | 2 +- + fs/afs/misc.c | 1 - + fs/afs/rxrpc.c | 1 - + include/linux/avf/virtchnl.h | 4 +- + include/linux/bpf.h | 87 +- + include/linux/bpf_types.h | 7 + + include/linux/bpf_verifier.h | 78 +- + include/linux/ethtool.h | 15 + + include/linux/filter.h | 17 + + include/linux/hyperv.h | 21 - + include/linux/igmp.h | 3 +- + include/linux/ipv6.h | 10 + + include/linux/mlx5/device.h | 2 +- + include/linux/mlx5/driver.h | 7 +- + include/linux/mlx5/mlx5_ifc.h | 51 +- + include/linux/net.h | 12 + + include/linux/netdev_features.h | 6 +- + include/linux/netdevice.h | 64 +- + include/linux/phy.h | 21 + + include/linux/phylink.h | 148 + + include/linux/platform_data/mdio-bcm-unimac.h | 13 + + include/linux/qed/qed_eth_if.h | 1 + + include/linux/qed/qed_if.h | 37 +- + include/linux/sched/user.h | 3 +- + include/linux/sctp.h | 171 +- + include/linux/seg6_local.h | 6 + + include/linux/sfp.h | 434 ++ + include/linux/skbuff.h | 200 +- + include/linux/socket.h | 1 + + include/linux/syscalls.h | 12 + + include/linux/tcp.h | 17 +- + include/linux/tnum.h | 81 + + include/linux/virtio_net.h | 5 - + include/net/af_unix.h | 1 - + include/net/devlink.h | 18 +- + include/net/dsa.h | 50 +- + include/net/dst.h | 3 +- + include/net/erspan.h | 61 + + include/net/fib_notifier.h | 44 + + include/net/fib_rules.h | 9 + + include/net/flow.h | 35 +- + include/net/flowcache.h | 25 - + include/net/inet6_hashtables.h | 22 +- + include/net/inet_hashtables.h | 31 +- + include/net/inetpeer.h | 11 +- + include/net/ip.h | 19 +- + include/net/ip6_fib.h | 53 + + include/net/ip6_route.h | 3 +- + include/net/ip_fib.h | 67 +- + include/net/ip_tunnels.h | 3 + + include/net/net_namespace.h | 1 + + include/net/netlink.h | 16 + + include/net/netns/ipv4.h | 1 + + include/net/netns/ipv6.h | 3 + + include/net/netns/xfrm.h | 11 - + include/net/pkt_cls.h | 145 +- + include/net/pkt_sched.h | 14 + + include/net/raw.h | 2 +- + include/net/rawv6.h | 2 +- + include/net/rtnetlink.h | 9 +- + include/net/sch_generic.h | 16 +- + include/net/sctp/command.h | 70 +- + include/net/sctp/constants.h | 89 +- + include/net/sctp/sctp.h | 20 +- + include/net/sctp/sm.h | 205 +- + include/net/sctp/structs.h | 74 +- + include/net/seg6.h | 5 + + include/net/sock.h | 7 + + include/net/strparser.h | 121 +- + include/net/switchdev.h | 87 - + include/net/tc_act/tc_gact.h | 20 +- + include/net/tcp.h | 85 +- + include/net/tso.h | 2 + + include/net/udp.h | 4 +- + include/net/udp_tunnel.h | 8 + + include/net/xfrm.h | 41 +- + include/trace/events/qdisc.h | 50 + + include/trace/events/xdp.h | 46 +- + include/uapi/asm-generic/socket.h | 2 + + include/uapi/linux/bpf.h | 78 +- + include/uapi/linux/devlink.h | 13 + + include/uapi/linux/errqueue.h | 3 + + include/uapi/linux/ethtool.h | 48 +- + include/uapi/linux/if_ether.h | 1 + + include/uapi/linux/if_tunnel.h | 1 + + include/uapi/linux/inet_diag.h | 1 + + include/uapi/linux/lwtunnel.h | 1 + + include/uapi/linux/netlink.h | 17 + + include/uapi/linux/rtnetlink.h | 23 +- + include/{ => uapi}/linux/rxrpc.h | 57 +- + include/uapi/linux/seg6_iptunnel.h | 18 +- + include/uapi/linux/seg6_local.h | 68 + + include/uapi/linux/snmp.h | 9 - + include/uapi/linux/tcp.h | 8 + + include/uapi/linux/xfrm.h | 1 + + kernel/bpf/Makefile | 8 +- + kernel/bpf/arraymap.c | 33 +- + kernel/bpf/core.c | 61 + + kernel/bpf/devmap.c | 409 ++ + kernel/bpf/hashtab.c | 36 +- + kernel/bpf/lpm_trie.c | 9 +- + kernel/bpf/sockmap.c | 800 ++++ + kernel/bpf/stackmap.c | 8 +- + kernel/bpf/syscall.c | 146 +- + kernel/bpf/tnum.c | 180 + + kernel/bpf/verifier.c | 2450 ++++++----- + kernel/events/core.c | 10 +- + kernel/trace/trace_syscalls.c | 53 +- + lib/nlattr.c | 30 + + lib/test_bpf.c | 364 ++ + net/atm/clip.c | 2 +- + net/atm/lec.c | 2 +- + net/atm/mpc.c | 2 +- + net/atm/signaling.c | 2 +- + net/batman-adv/bat_iv_ogm.c | 6 +- + net/batman-adv/bat_v_ogm.c | 16 +- + net/batman-adv/distributed-arp-table.c | 2 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/send.c | 2 +- + net/bluetooth/6lowpan.c | 9 +- + net/bluetooth/Kconfig | 12 + + net/bluetooth/selftest.c | 2 +- + net/bridge/br_fdb.c | 18 - + net/bridge/br_mdb.c | 6 +- + net/can/gw.c | 6 +- + net/core/Makefile | 4 +- + net/core/datagram.c | 55 +- + net/core/dev.c | 307 +- + net/core/devlink.c | 68 +- + net/core/dst.c | 9 +- + net/core/ethtool.c | 42 +- + net/core/fib_notifier.c | 164 + + net/core/fib_rules.c | 69 +- + net/core/filter.c | 427 +- + net/core/flow.c | 516 --- + net/core/flow_dissector.c | 59 +- + net/core/lwtunnel.c | 28 +- + net/core/neighbour.c | 10 +- + net/core/net-sysfs.c | 222 +- + net/core/net-traces.c | 1 + + net/core/net_namespace.c | 5 +- + net/core/rtnetlink.c | 249 +- + net/core/skbuff.c | 566 ++- + net/core/sock.c | 74 +- + net/dcb/dcbnl.c | 4 +- + net/dccp/ipv4.c | 4 +- + net/dccp/ipv6.c | 4 +- + net/decnet/dn_dev.c | 6 +- + net/decnet/dn_fib.c | 4 +- + net/decnet/dn_route.c | 4 +- + net/dsa/dsa.c | 42 +- + net/dsa/dsa2.c | 6 +- + net/dsa/dsa_priv.h | 44 +- + net/dsa/legacy.c | 40 +- + net/dsa/port.c | 51 +- + net/dsa/slave.c | 411 +- + net/dsa/switch.c | 21 +- + net/dsa/tag_brcm.c | 3 +- + net/dsa/tag_dsa.c | 3 +- + net/dsa/tag_edsa.c | 3 +- + net/dsa/tag_ksz.c | 3 +- + net/dsa/tag_lan9303.c | 5 +- + net/dsa/tag_mtk.c | 17 +- + net/dsa/tag_qca.c | 3 +- + net/dsa/tag_trailer.c | 3 +- + net/ipv4/af_inet.c | 22 +- + net/ipv4/devinet.c | 8 +- + net/ipv4/esp4.c | 14 +- + net/ipv4/esp4_offload.c | 5 +- + net/ipv4/fib_frontend.c | 23 +- + net/ipv4/fib_lookup.h | 1 + + net/ipv4/fib_notifier.c | 99 +- + net/ipv4/fib_rules.c | 44 +- + net/ipv4/fib_semantics.c | 49 +- + net/ipv4/fib_trie.c | 8 +- + net/ipv4/gre_offload.c | 14 +- + net/ipv4/icmp.c | 4 +- + net/ipv4/igmp.c | 6 +- + net/ipv4/inet_diag.c | 11 + + net/ipv4/inet_hashtables.c | 27 +- + net/ipv4/inetpeer.c | 428 +- + net/ipv4/ip_gre.c | 272 +- + net/ipv4/ip_options.c | 9 +- + net/ipv4/ip_output.c | 92 +- + net/ipv4/ip_sockglue.c | 19 +- + net/ipv4/ip_vti.c | 31 - + net/ipv4/ipmr.c | 8 +- + net/ipv4/proc.c | 9 - + net/ipv4/raw.c | 18 +- + net/ipv4/raw_diag.c | 4 +- + net/ipv4/route.c | 15 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/sysctl_net_ipv4.c | 3 + + net/ipv4/tcp.c | 293 +- + net/ipv4/tcp_bic.c | 14 +- + net/ipv4/tcp_cdg.c | 12 +- + net/ipv4/tcp_cong.c | 2 +- + net/ipv4/tcp_cubic.c | 13 +- + net/ipv4/tcp_fastopen.c | 6 +- + net/ipv4/tcp_highspeed.c | 11 +- + net/ipv4/tcp_htcp.c | 3 +- + net/ipv4/tcp_illinois.c | 11 +- + net/ipv4/tcp_input.c | 355 +- + net/ipv4/tcp_ipv4.c | 82 +- + net/ipv4/tcp_minisocks.c | 3 - + net/ipv4/tcp_nv.c | 13 +- + net/ipv4/tcp_output.c | 19 +- + net/ipv4/tcp_probe.c | 5 +- + net/ipv4/tcp_recovery.c | 2 +- + net/ipv4/tcp_scalable.c | 16 +- + net/ipv4/tcp_timer.c | 12 - + net/ipv4/tcp_veno.c | 11 +- + net/ipv4/tcp_westwood.c | 31 +- + net/ipv4/tcp_yeah.c | 11 +- + net/ipv4/udp.c | 81 +- + net/ipv4/udp_diag.c | 10 +- + net/ipv4/udp_offload.c | 64 +- + net/ipv4/udp_tunnel.c | 25 +- + net/ipv4/xfrm4_policy.c | 25 +- + net/ipv6/Kconfig | 16 +- + net/ipv6/Makefile | 4 +- + net/ipv6/addrconf.c | 60 +- + net/ipv6/addrlabel.c | 6 +- + net/ipv6/af_inet6.c | 5 +- + net/ipv6/esp6.c | 16 +- + net/ipv6/esp6_offload.c | 5 +- + net/ipv6/exthdrs.c | 4 +- + net/ipv6/fib6_notifier.c | 61 + + net/ipv6/fib6_rules.c | 69 +- + net/ipv6/icmp.c | 16 +- + net/ipv6/inet6_hashtables.c | 28 +- + net/ipv6/ip6_fib.c | 134 +- + net/ipv6/ip6_output.c | 77 - + net/ipv6/ip6_vti.c | 31 - + net/ipv6/ip6mr.c | 2 +- + net/ipv6/ndisc.c | 1 + + net/ipv6/raw.c | 13 +- + net/ipv6/route.c | 138 +- + net/ipv6/seg6.c | 7 +- + net/ipv6/seg6_iptunnel.c | 82 +- + net/ipv6/seg6_local.c | 932 +++++ + net/ipv6/sysctl_net_ipv6.c | 8 + + net/ipv6/tcp_ipv6.c | 20 +- + net/ipv6/udp.c | 47 +- + net/ipv6/udp_offload.c | 100 +- + net/ipv6/xfrm6_input.c | 4 +- + net/ipv6/xfrm6_policy.c | 20 +- + net/kcm/kcmproc.c | 34 +- + net/kcm/kcmsock.c | 49 +- + net/key/af_key.c | 6 - + net/mpls/af_mpls.c | 8 +- + net/netfilter/xt_TPROXY.c | 6 +- + net/netfilter/xt_recent.c | 2 +- + net/openvswitch/conntrack.c | 14 +- + net/openvswitch/datapath.c | 14 - + net/openvswitch/flow.c | 16 +- + net/openvswitch/flow.h | 2 + + net/openvswitch/flow_netlink.c | 2 +- + net/openvswitch/flow_table.c | 4 +- + net/packet/af_packet.c | 2 - + net/phonet/pn_netlink.c | 12 +- + net/qrtr/qrtr.c | 2 +- + net/rds/connection.c | 50 +- + net/rds/rds.h | 4 +- + net/rds/tcp.c | 2 +- + net/rds/tcp_connect.c | 4 +- + net/rds/tcp_send.c | 2 +- + net/rds/threads.c | 2 +- + net/rxrpc/ar-internal.h | 2 +- + include/rxrpc/packet.h => net/rxrpc/protocol.h | 45 - + net/sched/act_api.c | 80 +- + net/sched/act_csum.c | 6 - + net/sched/cls_api.c | 228 +- + net/sched/cls_basic.c | 39 +- + net/sched/cls_bpf.c | 90 +- + net/sched/cls_cgroup.c | 30 +- + net/sched/cls_flow.c | 71 +- + net/sched/cls_flower.c | 103 +- + net/sched/cls_fw.c | 60 +- + net/sched/cls_matchall.c | 65 +- + net/sched/cls_route.c | 58 +- + net/sched/cls_rsvp.h | 28 +- + net/sched/cls_tcindex.c | 44 +- + net/sched/cls_u32.c | 204 +- + net/sched/sch_api.c | 452 ++- + net/sched/sch_atm.c | 42 +- + net/sched/sch_cbq.c | 44 +- + net/sched/sch_drr.c | 33 +- + net/sched/sch_dsmark.c | 17 +- + net/sched/sch_fq_codel.c | 9 +- + net/sched/sch_generic.c | 8 +- + net/sched/sch_hfsc.c | 81 +- + net/sched/sch_htb.c | 36 +- + net/sched/sch_ingress.c | 32 +- + net/sched/sch_mq.c | 9 +- + net/sched/sch_mqprio.c | 25 +- + net/sched/sch_multiq.c | 11 +- + net/sched/sch_netem.c | 9 +- + net/sched/sch_prio.c | 11 +- + net/sched/sch_qfq.c | 33 +- + net/sched/sch_red.c | 9 +- + net/sched/sch_sfb.c | 9 +- + net/sched/sch_sfq.c | 9 +- + net/sched/sch_tbf.c | 9 +- + net/sctp/associola.c | 21 +- + net/sctp/auth.c | 13 +- + net/sctp/bind_addr.c | 20 +- + net/sctp/chunk.c | 4 +- + net/sctp/debug.c | 8 +- + net/sctp/endpointola.c | 12 +- + net/sctp/input.c | 2 +- + net/sctp/ipv6.c | 8 +- + net/sctp/objcnt.c | 2 +- + net/sctp/output.c | 60 +- + net/sctp/outqueue.c | 20 +- + net/sctp/primitive.c | 4 +- + net/sctp/probe.c | 13 +- + net/sctp/protocol.c | 8 +- + net/sctp/sm_make_chunk.c | 524 ++- + net/sctp/sm_sideeffect.c | 154 +- + net/sctp/sm_statefuns.c | 1555 +++---- + net/sctp/sm_statetable.c | 59 +- + net/sctp/socket.c | 20 +- + net/sctp/sysctl.c | 2 +- + net/sctp/transport.c | 2 +- + net/sctp/ulpevent.c | 10 +- + net/smc/Kconfig | 4 - + net/smc/af_smc.c | 64 +- + net/smc/smc_clc.c | 12 +- + net/smc/smc_core.c | 388 +- + net/smc/smc_core.h | 31 +- + net/smc/smc_ib.c | 128 +- + net/smc/smc_ib.h | 19 +- + net/smc/smc_rx.c | 3 + + net/smc/smc_tx.c | 9 +- + net/smc/smc_wr.c | 63 + + net/smc/smc_wr.h | 1 + + net/socket.c | 33 +- + net/strparser/strparser.c | 315 +- + net/switchdev/switchdev.c | 519 --- + net/tipc/bearer.c | 24 - + net/tipc/bearer.h | 1 - + net/tipc/link.c | 23 +- + net/tipc/netlink_compat.c | 2 +- + net/tipc/node.c | 14 +- + net/unix/af_unix.c | 24 +- + net/x25/af_x25.c | 2 +- + net/xfrm/xfrm_device.c | 9 +- + net/xfrm/xfrm_input.c | 2 + + net/xfrm/xfrm_output.c | 3 + + net/xfrm/xfrm_policy.c | 435 +- + net/xfrm/xfrm_state.c | 21 +- + net/xfrm/xfrm_user.c | 16 +- + samples/bpf/Makefile | 12 + + samples/bpf/bpf_load.c | 29 +- + samples/bpf/bpf_load.h | 1 + + samples/bpf/map_perf_test_kern.c | 2 + + samples/bpf/map_perf_test_user.c | 12 +- + samples/bpf/syscall_tp_kern.c | 62 + + samples/bpf/syscall_tp_user.c | 71 + + 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 + + samples/sockmap/Makefile | 78 + + samples/sockmap/sockmap_kern.c | 110 + + samples/sockmap/sockmap_user.c | 286 ++ + security/selinux/include/xfrm.h | 4 +- + tools/hv/bondvf.sh | 232 -- + tools/include/uapi/linux/bpf.h | 63 +- + tools/lib/bpf/Makefile | 4 + + tools/lib/bpf/bpf.c | 46 +- + tools/lib/bpf/bpf.h | 10 + + tools/lib/bpf/libbpf.c | 29 + + tools/lib/bpf/libbpf.h | 2 + + tools/testing/selftests/bpf/Makefile | 4 +- + tools/testing/selftests/bpf/bpf_helpers.h | 10 + + tools/testing/selftests/bpf/sockmap_parse_prog.c | 38 + + tools/testing/selftests/bpf/sockmap_verdict_prog.c | 48 + + tools/testing/selftests/bpf/test_align.c | 462 ++- + tools/testing/selftests/bpf/test_maps.c | 325 ++ + tools/testing/selftests/bpf/test_progs.c | 55 +- + tools/testing/selftests/bpf/test_verifier.c | 900 ++++- + tools/testing/selftests/bpf/test_xdp_redirect.c | 28 + + tools/testing/selftests/bpf/test_xdp_redirect.sh | 59 + + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 4 +- + tools/testing/selftests/net/msg_zerocopy.c | 697 ++++ + tools/testing/selftests/net/msg_zerocopy.sh | 112 + + tools/testing/selftests/net/rtnetlink.sh | 231 ++ + .../selftests/networking/timestamping/.gitignore | 1 + + .../selftests/networking/timestamping/Makefile | 4 +- + .../networking/timestamping/rxtimestamp.c | 389 ++ + 1094 files changed, 78089 insertions(+), 25809 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/anarion-gmac.txt + create mode 100644 Documentation/devicetree/bindings/net/broadcom-bluetooth.txt + create mode 100644 Documentation/devicetree/bindings/net/xilinx_axienet.txt + create mode 100644 Documentation/networking/batman-adv.rst + delete mode 100644 Documentation/networking/batman-adv.txt + create mode 100644 Documentation/networking/hinic.txt + create mode 100644 Documentation/networking/netvsc.txt + create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c + create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/Makefile + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hnae3.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hnae3.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/Makefile + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.c + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_enet.h + create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hns3_ethtool.c + create mode 100644 drivers/net/ethernet/huawei/Kconfig + create mode 100644 drivers/net/ethernet/huawei/Makefile + create mode 100644 drivers/net/ethernet/huawei/hinic/Kconfig + create mode 100644 drivers/net/ethernet/huawei/hinic/Makefile + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_common.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_common.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_dev.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_api_cmd.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_csr.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_if.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_if.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_io.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_io.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_qp_ctxt.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_wq.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_wqe.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_main.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_port.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_port.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_rx.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_rx.h + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_tx.c + create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_tx.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/Makefile + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/diag/fs_tracepoint.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/mpfs.h + create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c + create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-anarion.c + create mode 100644 drivers/net/phy/mdio-i2c.c + create mode 100644 drivers/net/phy/mdio-i2c.h + create mode 100644 drivers/net/phy/phylink.c + create mode 100644 drivers/net/phy/rockchip.c + create mode 100644 drivers/net/phy/sfp-bus.c + create mode 100644 drivers/net/phy/sfp.c + create mode 100644 drivers/net/phy/sfp.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/alive.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/binding.h + rename drivers/net/wireless/intel/iwlwifi/fw/{api.h => api/cmdhdr.h} (82%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-coex.h => fw/api/coex.h} (96%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/commands.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/config.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/context.h + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-d3.h => fw/api/d3.h} (98%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/datapath.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/debug.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/filter.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/mac-cfg.h + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-mac.h => fw/api/mac.h} (93%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/offload.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/paging.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/phy.h + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-power.h => fw/api/power.h} (98%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-rs.h => fw/api/rs.h} (97%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-rx.h => fw/api/rx.h} (95%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-scan.h => fw/api/scan.h} (98%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/sf.h + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-sta.h => fw/api/sta.h} (98%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-stats.h => fw/api/stats.h} (97%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/tdls.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-tof.h => fw/api/tof.h} (98%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-api-tx.h => fw/api/tx.h} (98%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/txq.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/common_rx.c + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-dbg.c => fw/dbg.c} (69%) + rename drivers/net/wireless/intel/iwlwifi/{mvm/fw-dbg.h => fw/dbg.h} (59%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/init.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/paging.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/runtime.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/smem.c + create mode 100644 include/linux/phylink.h + create mode 100644 include/linux/platform_data/mdio-bcm-unimac.h + create mode 100644 include/linux/seg6_local.h + create mode 100644 include/linux/sfp.h + create mode 100644 include/linux/tnum.h + create mode 100644 include/net/erspan.h + create mode 100644 include/net/fib_notifier.h + delete mode 100644 include/net/flowcache.h + create mode 100644 include/trace/events/qdisc.h + rename include/{ => uapi}/linux/rxrpc.h (54%) + create mode 100644 include/uapi/linux/seg6_local.h + create mode 100644 kernel/bpf/devmap.c + create mode 100644 kernel/bpf/sockmap.c + create mode 100644 kernel/bpf/tnum.c + create mode 100644 net/core/fib_notifier.c + delete mode 100644 net/core/flow.c + create mode 100644 net/ipv6/fib6_notifier.c + create mode 100644 net/ipv6/seg6_local.c + rename include/rxrpc/packet.h => net/rxrpc/protocol.h (78%) + create mode 100644 samples/bpf/syscall_tp_kern.c + create mode 100644 samples/bpf/syscall_tp_user.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 + create mode 100644 samples/sockmap/Makefile + create mode 100644 samples/sockmap/sockmap_kern.c + create mode 100644 samples/sockmap/sockmap_user.c + delete mode 100755 tools/hv/bondvf.sh + create mode 100644 tools/testing/selftests/bpf/sockmap_parse_prog.c + create mode 100644 tools/testing/selftests/bpf/sockmap_verdict_prog.c + create mode 100644 tools/testing/selftests/bpf/test_xdp_redirect.c + create mode 100755 tools/testing/selftests/bpf/test_xdp_redirect.sh + create mode 100644 tools/testing/selftests/net/msg_zerocopy.c + create mode 100755 tools/testing/selftests/net/msg_zerocopy.sh + create mode 100755 tools/testing/selftests/net/rtnetlink.sh + create mode 100644 tools/testing/selftests/networking/timestamping/rxtimestamp.c +Merging ipsec-next/master (60890e046081 gre: remove duplicated assignment of iph) +$ git merge ipsec-next/master +Already up-to-date. +Merging netfilter-next/master (c816c2558ed4 netfilter: ebtables: fix indent on if statements) +$ git merge netfilter-next/master +Auto-merging net/openvswitch/conntrack.c +Auto-merging net/netfilter/xt_TPROXY.c +Auto-merging net/ipv4/netfilter/ipt_CLUSTERIP.c +Auto-merging net/ipv4/netfilter/ip_tables.c +Auto-merging net/ipv4/netfilter/arp_tables.c +Auto-merging lib/nlattr.c +Auto-merging include/net/netlink.h +Auto-merging drivers/net/ipvlan/ipvlan_main.c +Merge made by the 'recursive' strategy. + Documentation/networking/nf_conntrack-sysctl.txt | 11 -- + drivers/net/ipvlan/ipvlan_main.c | 2 +- + include/net/netfilter/nf_conntrack.h | 3 + + include/net/netfilter/nf_conntrack_expect.h | 5 + + include/net/netfilter/nf_conntrack_l3proto.h | 45 ++--- + include/net/netfilter/nf_conntrack_l4proto.h | 36 ++-- + include/net/netfilter/nf_conntrack_timeout.h | 4 +- + include/net/netfilter/nf_tables.h | 10 +- + include/net/netfilter/nf_tables_core.h | 2 + + include/net/netlink.h | 1 + + include/uapi/linux/netfilter/nf_tables.h | 17 +- + lib/nlattr.c | 24 +++ + net/bridge/br_netfilter_hooks.c | 2 +- + net/bridge/netfilter/ebt_ip.c | 4 +- + net/bridge/netfilter/ebt_ip6.c | 2 +- + net/bridge/netfilter/ebtable_filter.c | 2 +- + net/bridge/netfilter/ebtable_nat.c | 2 +- + net/bridge/netfilter/ebtables.c | 13 +- + net/decnet/netfilter/dn_rtmsg.c | 2 +- + net/ipv4/netfilter/arp_tables.c | 2 - + net/ipv4/netfilter/ip_tables.c | 4 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- + net/ipv4/netfilter/ipt_SYNPROXY.c | 2 +- + net/ipv4/netfilter/iptable_nat.c | 2 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 40 ++--- + net/ipv4/netfilter/nf_conntrack_proto_icmp.c | 12 -- + net/ipv4/netfilter/nf_defrag_ipv4.c | 2 +- + net/ipv4/netfilter/nf_log_arp.c | 2 +- + net/ipv4/netfilter/nf_log_ipv4.c | 2 +- + net/ipv4/netfilter/nf_nat_h323.c | 57 +++--- + net/ipv4/netfilter/nft_fib_ipv4.c | 20 ++- + net/ipv6/ila/ila_xlat.c | 2 +- + net/ipv6/netfilter/ip6_tables.c | 2 +- + net/ipv6/netfilter/ip6t_SYNPROXY.c | 2 +- + net/ipv6/netfilter/ip6table_nat.c | 2 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 42 ++--- + net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | 12 -- + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 2 +- + net/ipv6/netfilter/nf_log_ipv6.c | 2 +- + net/ipv6/netfilter/nft_fib_ipv6.c | 29 +++- + net/netfilter/Kconfig | 9 + + net/netfilter/Makefile | 1 + + net/netfilter/ipvs/ip_vs_core.c | 10 +- + net/netfilter/ipvs/ip_vs_ctl.c | 3 - + net/netfilter/ipvs/ip_vs_ftp.c | 2 - + net/netfilter/ipvs/ip_vs_proto_sctp.c | 11 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 10 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 10 +- + net/netfilter/ipvs/ip_vs_xmit.c | 46 +---- + net/netfilter/nf_conntrack_broadcast.c | 2 - + net/netfilter/nf_conntrack_core.c | 44 +++-- + net/netfilter/nf_conntrack_expect.c | 66 ++++++- + net/netfilter/nf_conntrack_helper.c | 34 ++-- + net/netfilter/nf_conntrack_l3proto_generic.c | 7 - + net/netfilter/nf_conntrack_netlink.c | 106 ++++-------- + net/netfilter/nf_conntrack_pptp.c | 2 - + net/netfilter/nf_conntrack_proto.c | 90 ++++------ + net/netfilter/nf_conntrack_proto_dccp.c | 18 +- + net/netfilter/nf_conntrack_proto_generic.c | 8 - + net/netfilter/nf_conntrack_proto_gre.c | 15 +- + net/netfilter/nf_conntrack_proto_sctp.c | 19 +- + net/netfilter/nf_conntrack_proto_tcp.c | 19 +- + net/netfilter/nf_conntrack_proto_udp.c | 17 -- + net/netfilter/nf_conntrack_sip.c | 6 +- + net/netfilter/nf_conntrack_standalone.c | 97 +++++++++-- + net/netfilter/nf_internals.h | 1 - + net/netfilter/nf_queue.c | 1 + + net/netfilter/nf_tables_api.c | 128 ++++++++++---- + net/netfilter/nf_tables_core.c | 28 ++- + net/netfilter/nf_tables_trace.c | 42 +++-- + net/netfilter/nfnetlink_cttimeout.c | 22 +-- + net/netfilter/nfnetlink_log.c | 2 +- + net/netfilter/nfnetlink_queue.c | 21 ++- + net/netfilter/nft_exthdr.c | 211 +++++++++++++++++++++-- + net/netfilter/nft_fib_netdev.c | 87 ++++++++++ + net/netfilter/nft_rt.c | 66 +++++++ + net/netfilter/nft_set_rbtree.c | 49 ++++-- + net/netfilter/x_tables.c | 14 +- + net/netfilter/xt_CT.c | 2 +- + net/netfilter/xt_TCPMSS.c | 2 - + net/netfilter/xt_TPROXY.c | 4 - + net/netfilter/xt_addrtype.c | 3 - + net/netfilter/xt_connlimit.c | 26 +-- + net/netfilter/xt_hashlimit.c | 8 +- + net/netfilter/xt_osf.c | 2 - + net/openvswitch/conntrack.c | 4 +- + security/selinux/hooks.c | 2 +- + security/smack/smack_netfilter.c | 2 +- + 88 files changed, 1064 insertions(+), 744 deletions(-) + create mode 100644 net/netfilter/nft_fib_netdev.c +Merging nfc-next/master (bd751808f9ff NFC: trf7970a: Correct register settings for 27MHz clock) +$ git merge nfc-next/master +Already up-to-date. +Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.) +$ git merge ipvs-next/master +Auto-merging net/netfilter/ipvs/ip_vs_proto_tcp.c +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging wireless-drivers-next/master (5307eca13624 Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/rx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/internal.h +Merge made by the 'recursive' strategy. + drivers/bcma/Kconfig | 9 +- + drivers/net/wireless/ath/ar5523/ar5523.c | 2 +- + drivers/net/wireless/ath/ath10k/Kconfig | 7 + + drivers/net/wireless/ath/ath10k/Makefile | 3 + + drivers/net/wireless/ath/ath10k/ahb.c | 15 +- + drivers/net/wireless/ath/ath10k/core.c | 10 + + drivers/net/wireless/ath/ath10k/core.h | 5 + + drivers/net/wireless/ath/ath10k/debug.h | 2 + + drivers/net/wireless/ath/ath10k/htt_rx.c | 12 +- + drivers/net/wireless/ath/ath10k/hw.h | 5 + + drivers/net/wireless/ath/ath10k/mac.c | 5 +- + drivers/net/wireless/ath/ath10k/sdio.c | 8 +- + drivers/net/wireless/ath/ath10k/usb.c | 1106 ++++++++++++++++++++ + drivers/net/wireless/ath/ath10k/usb.h | 128 +++ + drivers/net/wireless/ath/ath10k/wmi.c | 164 ++- + drivers/net/wireless/ath/ath10k/wmi.h | 271 ++++- + drivers/net/wireless/ath/ath9k/debug.c | 2 +- + drivers/net/wireless/ath/ath9k/pci.c | 5 + + drivers/net/wireless/ath/carl9170/usb.c | 2 +- + drivers/net/wireless/ath/wcn36xx/dxe.c | 5 + + drivers/net/wireless/atmel/at76c50x-usb.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 18 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 11 +- + .../broadcom/brcm80211/include/brcm_hw_ids.h | 3 + + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 4 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 15 +- + drivers/net/wireless/intel/iwlwifi/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/a000.c | 42 + + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 8 +- + drivers/net/wireless/intel/iwlwifi/fw/api/coex.h | 62 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 17 +- + drivers/net/wireless/intel/iwlwifi/fw/api/config.h | 8 - + drivers/net/wireless/intel/iwlwifi/fw/api/led.h | 71 ++ + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 28 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 38 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 30 + + drivers/net/wireless/intel/iwlwifi/fw/file.h | 4 + + drivers/net/wireless/intel/iwlwifi/fw/notif-wait.c | 25 +- + drivers/net/wireless/intel/iwlwifi/fw/nvm.c | 162 +++ + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 2 + + drivers/net/wireless/intel/iwlwifi/fw/smem.c | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 11 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 36 +- + drivers/net/wireless/intel/iwlwifi/iwl-io.c | 14 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 116 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 308 +----- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 54 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 69 +- + drivers/net/wireless/intel/iwlwifi/mvm/led.c | 59 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 47 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 16 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 37 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 197 +--- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 142 +-- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 108 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 7 + + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 34 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 9 +- + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 24 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 15 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 22 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 55 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 17 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 2 +- + drivers/net/wireless/intersil/p54/p54usb.c | 2 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 2 +- + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 2 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 29 +- + drivers/net/wireless/marvell/mwifiex/join.c | 2 +- + drivers/net/wireless/marvell/mwifiex/main.c | 40 +- + drivers/net/wireless/marvell/mwifiex/main.h | 7 + + drivers/net/wireless/marvell/mwifiex/scan.c | 4 +- + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 34 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/dma.c | 5 + + drivers/net/wireless/mediatek/mt7601u/usb.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/bus.h | 1 - + .../net/wireless/quantenna/qtnfmac/pearl/pcie.c | 279 +++-- + .../quantenna/qtnfmac/pearl/pcie_bus_priv.h | 15 +- + .../wireless/quantenna/qtnfmac/pearl/pcie_ipc.h | 1 + + .../quantenna/qtnfmac/pearl/pcie_regs_pearl.h | 1 + + drivers/net/wireless/ralink/rt2x00/rt2500usb.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 13 +- + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 17 +- + drivers/net/wireless/ralink/rt2x00/rt73usb.c | 2 +- + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 2 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 10 +- + drivers/net/wireless/realtek/rtlwifi/rc.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 5 +- + drivers/net/wireless/rsi/Makefile | 1 + + drivers/net/wireless/rsi/rsi_91x_core.c | 70 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 136 ++- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 415 +++++++- + drivers/net/wireless/rsi/rsi_91x_main.c | 2 + + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 285 ++++- + drivers/net/wireless/rsi/rsi_91x_ps.c | 146 +++ + drivers/net/wireless/rsi/rsi_91x_sdio.c | 2 +- + drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 40 +- + drivers/net/wireless/rsi/rsi_common.h | 1 + + drivers/net/wireless/rsi/rsi_hal.h | 4 +- + drivers/net/wireless/rsi/rsi_main.h | 38 +- + drivers/net/wireless/rsi/rsi_mgmt.h | 87 +- + drivers/net/wireless/rsi/rsi_ps.h | 64 ++ + drivers/net/wireless/rsi/rsi_sdio.h | 3 +- + drivers/net/wireless/ti/wlcore/main.c | 23 + + drivers/net/wireless/ti/wlcore/sdio.c | 1 + + drivers/net/wireless/ti/wlcore/spi.c | 1 + + drivers/net/wireless/ti/wlcore/sysfs.c | 2 +- + drivers/net/wireless/ti/wlcore/wlcore.h | 3 + + drivers/net/wireless/zydas/zd1201.c | 2 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 2 +- + include/linux/mmc/sdio_ids.h | 1 + + 127 files changed, 4310 insertions(+), 1272 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath10k/usb.c + create mode 100644 drivers/net/wireless/ath/ath10k/usb.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/led.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/nvm.c + create mode 100644 drivers/net/wireless/rsi/rsi_91x_ps.c + create mode 100644 drivers/net/wireless/rsi/rsi_ps.h +Merging bluetooth/master (96a1c173ea65 ieee802154: 6lowpan: make header_ops const) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + drivers/net/ieee802154/ca8210.c | 5 +---- + net/bluetooth/hci_sysfs.c | 4 ++-- + net/ieee802154/6lowpan/core.c | 2 +- + 3 files changed, 4 insertions(+), 7 deletions(-) +Merging mac80211-next/master (3dc02251f43f Merge branch 'skb-accessor-cleanups') +$ git merge mac80211-next/master +Already up-to-date. +Merging rdma/for-next (ea61e5a1c0bd Merge branch 'k.o/for-next' into k.o/for-next-merged) +$ git merge rdma/for-next +Auto-merging include/linux/pci.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/mlx5/device.h +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/sriov.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eq.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/qp.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_tx.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/en_rx.c +Auto-merging drivers/net/ethernet/mellanox/mlx4/cmd.c +Auto-merging drivers/infiniband/hw/qedr/qedr_roce_cm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + block/Kconfig | 5 + + block/Makefile | 1 + + block/blk-mq-rdma.c | 52 + + drivers/infiniband/core/Makefile | 3 +- + drivers/infiniband/core/addr.c | 12 +- + drivers/infiniband/core/cache.c | 23 +- + drivers/infiniband/core/cm.c | 161 ++- + drivers/infiniband/core/cma.c | 35 +- + drivers/infiniband/core/core_priv.h | 27 +- + drivers/infiniband/core/device.c | 144 ++- + drivers/infiniband/core/iwcm.c | 16 +- + drivers/infiniband/core/iwpm_msg.c | 20 +- + drivers/infiniband/core/iwpm_util.c | 15 +- + drivers/infiniband/core/mad_rmpp.c | 2 +- + drivers/infiniband/core/netlink.c | 321 +++--- + drivers/infiniband/core/nldev.c | 325 ++++++ + drivers/infiniband/core/roce_gid_mgmt.c | 2 + + drivers/infiniband/core/sa_query.c | 42 +- + drivers/infiniband/core/sysfs.c | 4 +- + drivers/infiniband/core/ucm.c | 2 +- + drivers/infiniband/core/ucma.c | 10 +- + drivers/infiniband/core/user_mad.c | 2 +- + drivers/infiniband/core/uverbs_cmd.c | 233 ++--- + drivers/infiniband/core/uverbs_main.c | 13 +- + drivers/infiniband/core/uverbs_marshall.c | 48 +- + drivers/infiniband/core/verbs.c | 151 ++- + drivers/infiniband/hw/bnxt_re/Makefile | 2 +- + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 5 +- + drivers/infiniband/hw/bnxt_re/hw_counters.c | 114 +++ + drivers/infiniband/hw/bnxt_re/hw_counters.h | 62 ++ + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 105 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 3 - + drivers/infiniband/hw/bnxt_re/main.c | 168 +++- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 486 +++++++-- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 29 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 26 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.h | 10 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 10 + + drivers/infiniband/hw/bnxt_re/qplib_res.h | 2 + + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 77 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 2 + + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 4 +- + drivers/infiniband/hw/cxgb3/iwch.c | 1 - + drivers/infiniband/hw/cxgb3/iwch_provider.c | 5 +- + drivers/infiniband/hw/cxgb4/cm.c | 1 - + drivers/infiniband/hw/cxgb4/device.c | 1 - + drivers/infiniband/hw/cxgb4/provider.c | 5 +- + drivers/infiniband/hw/hfi1/Kconfig | 7 - + drivers/infiniband/hw/hfi1/Makefile | 2 +- + drivers/infiniband/hw/hfi1/affinity.c | 18 +- + drivers/infiniband/hw/hfi1/affinity.h | 14 +- + drivers/infiniband/hw/hfi1/aspm.h | 41 +- + drivers/infiniband/hw/hfi1/chip.c | 804 ++++++++------- + drivers/infiniband/hw/hfi1/chip.h | 29 +- + drivers/infiniband/hw/hfi1/common.h | 11 +- + drivers/infiniband/hw/hfi1/debugfs.c | 79 +- + drivers/infiniband/hw/hfi1/driver.c | 513 +++++++--- + drivers/infiniband/hw/hfi1/eprom.c | 11 +- + drivers/infiniband/hw/hfi1/exp_rcv.c | 114 +++ + drivers/infiniband/hw/hfi1/exp_rcv.h | 190 ++++ + drivers/infiniband/hw/hfi1/file_ops.c | 430 ++++---- + drivers/infiniband/hw/hfi1/firmware.c | 73 +- + drivers/infiniband/hw/hfi1/hfi.h | 548 +++++++--- + drivers/infiniband/hw/hfi1/init.c | 393 ++++++-- + drivers/infiniband/hw/hfi1/intr.c | 3 +- + drivers/infiniband/hw/hfi1/iowait.h | 70 +- + drivers/infiniband/hw/hfi1/mad.c | 805 ++++++++++----- + drivers/infiniband/hw/hfi1/mad.h | 5 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 14 +- + drivers/infiniband/hw/hfi1/mmu_rb.h | 5 +- + drivers/infiniband/hw/hfi1/opa_compat.h | 21 +- + drivers/infiniband/hw/hfi1/pcie.c | 384 ++++--- + drivers/infiniband/hw/hfi1/pio.c | 15 +- + drivers/infiniband/hw/hfi1/platform.c | 87 +- + drivers/infiniband/hw/hfi1/qp.c | 49 +- + drivers/infiniband/hw/hfi1/rc.c | 423 +++++--- + drivers/infiniband/hw/hfi1/ruc.c | 321 ++++-- + drivers/infiniband/hw/hfi1/sdma.c | 42 +- + drivers/infiniband/hw/hfi1/sdma.h | 3 +- + drivers/infiniband/hw/hfi1/sysfs.c | 4 +- + drivers/infiniband/hw/hfi1/trace.c | 191 +++- + drivers/infiniband/hw/hfi1/trace_ibhdrs.h | 456 ++++++--- + drivers/infiniband/hw/hfi1/trace_misc.h | 20 + + drivers/infiniband/hw/hfi1/trace_rx.h | 102 +- + drivers/infiniband/hw/hfi1/uc.c | 60 +- + drivers/infiniband/hw/hfi1/ud.c | 487 ++++++--- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 128 +-- + drivers/infiniband/hw/hfi1/user_exp_rcv.h | 26 +- + drivers/infiniband/hw/hfi1/user_sdma.c | 237 ++--- + drivers/infiniband/hw/hfi1/user_sdma.h | 6 +- + drivers/infiniband/hw/hfi1/verbs.c | 384 ++++--- + drivers/infiniband/hw/hfi1/verbs.h | 59 +- + drivers/infiniband/hw/hfi1/vnic.h | 16 +- + drivers/infiniband/hw/hfi1/vnic_main.c | 39 +- + drivers/infiniband/hw/hfi1/vnic_sdma.c | 14 +- + drivers/infiniband/hw/hns/Kconfig | 2 +- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 1 + + drivers/infiniband/hw/hns/hns_roce_eq.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 1 + + drivers/infiniband/hw/hns/hns_roce_qp.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 27 +- + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 11 + + drivers/infiniband/hw/i40iw/i40iw_main.c | 1 - + drivers/infiniband/hw/i40iw/i40iw_p.h | 14 +- + drivers/infiniband/hw/i40iw/i40iw_pble.c | 9 +- + drivers/infiniband/hw/i40iw/i40iw_puda.c | 6 +- + drivers/infiniband/hw/i40iw/i40iw_type.h | 5 + + drivers/infiniband/hw/i40iw/i40iw_utils.c | 22 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 7 +- + drivers/infiniband/hw/mlx4/alias_GUID.c | 4 +- + drivers/infiniband/hw/mlx4/cq.c | 4 +- + drivers/infiniband/hw/mlx4/mad.c | 8 +- + drivers/infiniband/hw/mlx4/main.c | 54 +- + drivers/infiniband/hw/mlx4/mcg.c | 9 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 42 +- + drivers/infiniband/hw/mlx4/qp.c | 1054 ++++++++++++++++++-- + drivers/infiniband/hw/mlx4/srq.c | 13 +- + drivers/infiniband/hw/mlx5/Makefile | 2 +- + drivers/infiniband/hw/mlx5/cmd.c | 20 + + drivers/infiniband/hw/mlx5/cmd.h | 4 + + drivers/infiniband/hw/mlx5/cong.c | 421 ++++++++ + drivers/infiniband/hw/mlx5/cq.c | 8 +- + drivers/infiniband/hw/mlx5/ib_virt.c | 9 + + drivers/infiniband/hw/mlx5/mad.c | 4 +- + drivers/infiniband/hw/mlx5/main.c | 438 +++++++- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 81 +- + drivers/infiniband/hw/mlx5/mr.c | 121 ++- + drivers/infiniband/hw/mlx5/qp.c | 162 ++- + drivers/infiniband/hw/mlx5/srq.c | 4 +- + drivers/infiniband/hw/mthca/mthca_av.c | 10 +- + drivers/infiniband/hw/mthca/mthca_cmd.c | 14 +- + drivers/infiniband/hw/mthca/mthca_dev.h | 4 +- + drivers/infiniband/hw/mthca/mthca_mad.c | 4 +- + drivers/infiniband/hw/mthca/mthca_main.c | 3 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 7 +- + drivers/infiniband/hw/nes/nes.c | 70 +- + drivers/infiniband/hw/nes/nes_verbs.c | 10 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 6 +- + drivers/infiniband/hw/qedr/Makefile | 2 +- + drivers/infiniband/hw/qedr/main.c | 112 ++- + drivers/infiniband/hw/qedr/qedr.h | 34 +- + drivers/infiniband/hw/qedr/qedr_hsi_rdma.h | 6 +- + drivers/infiniband/hw/qedr/qedr_iw_cm.c | 746 ++++++++++++++ + drivers/infiniband/hw/qedr/qedr_iw_cm.h | 49 + + .../hw/qedr/{qedr_cm.c => qedr_roce_cm.c} | 2 +- + .../hw/qedr/{qedr_cm.h => qedr_roce_cm.h} | 0 + drivers/infiniband/hw/qedr/verbs.c | 355 +++++-- + drivers/infiniband/hw/qedr/verbs.h | 2 + + drivers/infiniband/hw/qib/qib.h | 8 +- + drivers/infiniband/hw/qib/qib_driver.c | 1 - + 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_init.c | 2 +- + drivers/infiniband/hw/qib/qib_mad.c | 19 +- + drivers/infiniband/hw/qib/qib_pcie.c | 149 ++- + drivers/infiniband/hw/qib/qib_ruc.c | 26 +- + drivers/infiniband/hw/qib/qib_sysfs.c | 4 +- + drivers/infiniband/hw/qib/qib_ud.c | 43 +- + drivers/infiniband/hw/qib/qib_verbs.c | 9 + + drivers/infiniband/hw/qib/qib_verbs.h | 4 +- + drivers/infiniband/hw/usnic/usnic_fwd.c | 12 +- + drivers/infiniband/hw/usnic/usnic_fwd.h | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_main.c | 18 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 41 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 1 + + drivers/infiniband/hw/vmw_pvrdma/pvrdma.h | 2 + + drivers/infiniband/hw/vmw_pvrdma/pvrdma_dev_api.h | 37 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 44 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_misc.c | 7 + + drivers/infiniband/hw/vmw_pvrdma/pvrdma_ring.h | 17 - + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 9 + + drivers/infiniband/sw/rdmavt/ah.c | 10 - + drivers/infiniband/sw/rdmavt/cq.c | 2 +- + drivers/infiniband/sw/rdmavt/mr.c | 49 +- + drivers/infiniband/sw/rdmavt/qp.c | 86 +- + 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/sw/rxe/rxe.c | 1 - + drivers/infiniband/sw/rxe/rxe.h | 2 +- + drivers/infiniband/sw/rxe/rxe_av.c | 7 +- + drivers/infiniband/sw/rxe/rxe_hw_counters.c | 2 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 2 +- + drivers/infiniband/sw/rxe/rxe_mmap.c | 2 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 2 +- + drivers/infiniband/sw/rxe/rxe_req.c | 2 +- + drivers/infiniband/sw/rxe/rxe_task.c | 4 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 65 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 8 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 31 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 22 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 1 - + drivers/infiniband/ulp/iser/iser_verbs.c | 6 +- + drivers/infiniband/ulp/isert/ib_isert.c | 1 - + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 35 +- + drivers/infiniband/ulp/srp/ib_srp.c | 1 - + drivers/infiniband/ulp/srpt/ib_srpt.c | 5 +- + drivers/infiniband/ulp/srpt/ib_srpt.h | 4 +- + drivers/net/ethernet/mellanox/mlx4/cmd.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/cq.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 1 + + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 6 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 7 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 2 +- + drivers/net/ethernet/mellanox/mlx4/qp.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 57 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 13 + + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 32 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 123 +-- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 1 - + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 14 + + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 42 + + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 62 ++ + drivers/nvme/host/rdma.c | 34 +- + drivers/nvme/target/rdma.c | 5 - + drivers/pci/pci-driver.c | 1 + + include/linux/blk-mq-rdma.h | 10 + + include/linux/mlx4/device.h | 12 +- + include/linux/mlx5/device.h | 11 +- + include/linux/mlx5/driver.h | 30 +- + include/linux/mlx5/mlx5_ifc.h | 100 +- + include/linux/mlx5/qp.h | 3 + + include/linux/mlx5/vport.h | 3 +- + include/linux/pci.h | 1 + + include/rdma/ib_addr.h | 11 +- + include/rdma/ib_hdrs.h | 84 ++ + include/rdma/ib_marshall.h | 6 +- + include/rdma/ib_verbs.h | 102 +- + include/rdma/opa_addr.h | 42 +- + include/rdma/opa_vnic.h | 3 - + include/rdma/rdma_netlink.h | 58 +- + include/rdma/rdma_vt.h | 23 +- + include/rdma/rdmavt_qp.h | 3 +- + include/uapi/rdma/ib_user_verbs.h | 2 +- + include/uapi/rdma/mlx4-abi.h | 52 +- + include/uapi/rdma/mlx5-abi.h | 23 + + include/uapi/rdma/qedr-abi.h | 3 + + include/uapi/rdma/rdma_netlink.h | 84 +- + 250 files changed, 12211 insertions(+), 4412 deletions(-) + create mode 100644 block/blk-mq-rdma.c + create mode 100644 drivers/infiniband/core/nldev.c + create mode 100644 drivers/infiniband/hw/bnxt_re/hw_counters.c + create mode 100644 drivers/infiniband/hw/bnxt_re/hw_counters.h + create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.c + create mode 100644 drivers/infiniband/hw/hfi1/exp_rcv.h + create mode 100644 drivers/infiniband/hw/mlx5/cong.c + create mode 100644 drivers/infiniband/hw/qedr/qedr_iw_cm.c + create mode 100644 drivers/infiniband/hw/qedr/qedr_iw_cm.h + rename drivers/infiniband/hw/qedr/{qedr_cm.c => qedr_roce_cm.c} (99%) + rename drivers/infiniband/hw/qedr/{qedr_cm.h => qedr_roce_cm.h} (100%) + create mode 100644 include/linux/blk-mq-rdma.h +Merging gfs2/for-next (27c3b415f6ff GFS2: Fix up some sparse warnings) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/file.c +Auto-merging fs/gfs2/dir.c +Merge made by the 'recursive' strategy. + fs/gfs2/acl.c | 27 ++++++----- + fs/gfs2/aops.c | 14 +++++- + fs/gfs2/bmap.c | 5 +- + fs/gfs2/dir.c | 4 +- + fs/gfs2/file.c | 3 +- + fs/gfs2/glock.c | 135 +++++++++++++++++++++++++++++++++++++++++---------- + fs/gfs2/glock.h | 36 ++++++++++++++ + fs/gfs2/glops.c | 30 +----------- + fs/gfs2/incore.h | 4 +- + fs/gfs2/inode.c | 17 ++++--- + fs/gfs2/lock_dlm.c | 5 +- + fs/gfs2/log.c | 13 +++++ + fs/gfs2/lops.c | 7 ++- + fs/gfs2/meta_io.c | 9 ++-- + fs/gfs2/ops_fstype.c | 7 ++- + fs/gfs2/quota.c | 7 ++- + fs/gfs2/rgrp.c | 1 - + fs/gfs2/super.c | 71 ++++++++++++++++++++++++--- + fs/gfs2/util.h | 1 + + fs/gfs2/xattr.c | 1 + + 20 files changed, 294 insertions(+), 103 deletions(-) +Merging mtd/master (be3e83e3471c mtd: nand: atmel: Relax tADL_min constraint) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (75864b301c91 mtd: make device_type const) +$ git merge l2-mtd/master +Resolved 'include/asm-generic/vmlinux.lds.h' using previous resolution. +Auto-merging include/asm-generic/vmlinux.lds.h +CONFLICT (content): Merge conflict in include/asm-generic/vmlinux.lds.h +Auto-merging drivers/mtd/nand/nandsim.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3d366fb5f47d] Merge remote-tracking branch 'l2-mtd/master' +$ git diff -M --stat --summary HEAD^.. + drivers/mtd/devices/docg3.c | 49 ++++++++++++--------------------- + drivers/mtd/devices/docg3.h | 2 -- + drivers/mtd/devices/spear_smi.c | 2 ++ + drivers/mtd/maps/amd76xrom.c | 4 +-- + drivers/mtd/maps/ck804xrom.c | 4 +-- + drivers/mtd/maps/esb2rom.c | 4 +-- + drivers/mtd/maps/ichxrom.c | 4 +-- + drivers/mtd/maps/intel_vr_nor.c | 2 +- + drivers/mtd/maps/pci.c | 2 +- + drivers/mtd/maps/physmap_of_core.c | 8 +++--- + drivers/mtd/maps/physmap_of_gemini.c | 16 ----------- + drivers/mtd/maps/physmap_of_versatile.c | 2 +- + drivers/mtd/maps/sun_uflash.c | 4 +-- + drivers/mtd/mtdcore.c | 18 +++++++++++- + drivers/mtd/mtdswap.c | 21 +++----------- + drivers/mtd/nand/nandsim.c | 48 ++++++++------------------------ + drivers/mtd/ofpart.c | 23 ++++++++-------- + drivers/mtd/spi-nor/hisi-sfc.c | 8 +++--- + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/mtd/mtd.h | 10 +++++++ + include/linux/mtd/xip.h | 10 ++++--- + 21 files changed, 101 insertions(+), 141 deletions(-) +$ git am -3 ../patches/0001-fix-merge-of-l2-mtd-tree.patch +Applying: fix merge of l2-mtd tree +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/mtd/nand/nandsim.c +$ git add -A . +$ git commit -v -a --amend +[master c618a87ea5fb] Merge remote-tracking branch 'l2-mtd/master' + Date: Mon Aug 28 11:58:45 2017 +1000 +Merging nand/nand/next (a75d6a4cebcc Merge branch 'nand/rename-header-file' of git://git.infradead.org/l2-mtd into nand/next) +$ git merge nand/nand/next +Auto-merging include/linux/mtd/rawnand.h +Auto-merging drivers/mtd/nand/sunxi_nand.c +Auto-merging drivers/mtd/nand/nandsim.c +Auto-merging drivers/mtd/nand/nand_timings.c +Auto-merging drivers/mtd/nand/nand_base.c +Auto-merging drivers/mtd/nand/atmel/pmecc.c +Auto-merging drivers/mtd/nand/atmel/nand-controller.c +Auto-merging arch/mips/alchemy/devboards/db1300.c +Auto-merging arch/mips/alchemy/devboards/db1200.c +Auto-merging arch/arm/mach-s3c24xx/mach-osiris.c +Auto-merging arch/arm/mach-s3c24xx/mach-mini2440.c +Auto-merging arch/arm/mach-omap1/board-h3.c +Auto-merging arch/arm/mach-omap1/board-h2.c +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/qcom_nandc.txt | 65 +- + Documentation/driver-api/mtdnand.rst | 8 +- + MAINTAINERS | 2 +- + arch/arm/mach-davinci/board-da850-evm.c | 2 +- + arch/arm/mach-davinci/board-dm355-evm.c | 2 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 2 +- + arch/arm/mach-davinci/board-dm365-evm.c | 2 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 2 +- + arch/arm/mach-davinci/board-sffsdr.c | 2 +- + arch/arm/mach-dove/dove-db-setup.c | 2 +- + arch/arm/mach-ep93xx/snappercl15.c | 2 +- + arch/arm/mach-ep93xx/ts72xx.c | 2 +- + arch/arm/mach-imx/mach-qong.c | 2 +- + arch/arm/mach-ixp4xx/ixdp425-setup.c | 2 +- + arch/arm/mach-mmp/aspenite.c | 2 +- + arch/arm/mach-omap1/board-fsample.c | 2 +- + arch/arm/mach-omap1/board-h2.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 2 +- + arch/arm/mach-omap1/board-nand.c | 2 +- + arch/arm/mach-omap1/board-perseus2.c | 2 +- + arch/arm/mach-orion5x/db88f5281-setup.c | 2 +- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 +- + arch/arm/mach-orion5x/ts209-setup.c | 2 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 2 +- + arch/arm/mach-pxa/balloon3.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/eseries.c | 2 +- + arch/arm/mach-pxa/palmtx.c | 2 +- + arch/arm/mach-pxa/tosa.c | 2 +- + arch/arm/mach-s3c24xx/common-smdk.c | 2 +- + arch/arm/mach-s3c24xx/mach-anubis.c | 2 +- + arch/arm/mach-s3c24xx/mach-at2440evb.c | 2 +- + arch/arm/mach-s3c24xx/mach-bast.c | 2 +- + arch/arm/mach-s3c24xx/mach-gta02.c | 2 +- + arch/arm/mach-s3c24xx/mach-jive.c | 2 +- + arch/arm/mach-s3c24xx/mach-mini2440.c | 2 +- + arch/arm/mach-s3c24xx/mach-osiris.c | 2 +- + arch/arm/mach-s3c24xx/mach-qt2410.c | 2 +- + arch/arm/mach-s3c24xx/mach-rx3715.c | 2 +- + arch/arm/mach-s3c24xx/mach-vstms.c | 2 +- + arch/blackfin/mach-bf537/boards/dnp5370.c | 2 +- + arch/blackfin/mach-bf537/boards/stamp.c | 2 +- + arch/blackfin/mach-bf561/boards/acvilon.c | 2 +- + arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 2 +- + arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 2 +- + arch/mips/alchemy/devboards/db1200.c | 2 +- + arch/mips/alchemy/devboards/db1300.c | 2 +- + arch/mips/alchemy/devboards/db1550.c | 2 +- + arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +- + arch/mips/netlogic/xlr/platform-flash.c | 2 +- + arch/mips/pnx833x/common/platform.c | 2 +- + arch/mips/rb532/devices.c | 2 +- + arch/sh/boards/mach-migor/setup.c | 2 +- + drivers/mtd/devices/st_spi_fsm.c | 20 +- + drivers/mtd/inftlcore.c | 2 +- + drivers/mtd/nand/Kconfig | 2 +- + drivers/mtd/nand/ams-delta.c | 2 +- + drivers/mtd/nand/atmel/nand-controller.c | 15 +- + drivers/mtd/nand/atmel/pmecc.c | 2 +- + drivers/mtd/nand/au1550nd.c | 2 +- + drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h | 2 +- + drivers/mtd/nand/bf5xx_nand.c | 2 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 2 +- + drivers/mtd/nand/cafe_nand.c | 2 +- + drivers/mtd/nand/cmx270_nand.c | 2 +- + drivers/mtd/nand/cs553x_nand.c | 2 +- + drivers/mtd/nand/davinci_nand.c | 2 +- + drivers/mtd/nand/denali.h | 2 +- + drivers/mtd/nand/denali_dt.c | 4 +- + drivers/mtd/nand/diskonchip.c | 2 +- + drivers/mtd/nand/docg4.c | 2 +- + drivers/mtd/nand/fsl_elbc_nand.c | 2 +- + drivers/mtd/nand/fsl_ifc_nand.c | 2 +- + drivers/mtd/nand/fsl_upm.c | 2 +- + drivers/mtd/nand/fsmc_nand.c | 2 +- + drivers/mtd/nand/gpio.c | 2 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 2 +- + drivers/mtd/nand/hisi504_nand.c | 2 +- + drivers/mtd/nand/jz4740_nand.c | 2 +- + drivers/mtd/nand/jz4780_nand.c | 2 +- + drivers/mtd/nand/lpc32xx_mlc.c | 11 +- + drivers/mtd/nand/lpc32xx_slc.c | 11 +- + drivers/mtd/nand/mpc5121_nfc.c | 2 +- + drivers/mtd/nand/mtk_ecc.c | 4 +- + drivers/mtd/nand/mtk_nand.c | 2 +- + drivers/mtd/nand/mxc_nand.c | 9 +- + drivers/mtd/nand/nand_amd.c | 2 +- + drivers/mtd/nand/nand_base.c | 297 ++----- + drivers/mtd/nand/nand_bbt.c | 2 +- + drivers/mtd/nand/nand_bch.c | 2 +- + drivers/mtd/nand/nand_ecc.c | 2 +- + drivers/mtd/nand/nand_hynix.c | 6 +- + drivers/mtd/nand/nand_ids.c | 2 +- + drivers/mtd/nand/nand_macronix.c | 2 +- + drivers/mtd/nand/nand_micron.c | 2 +- + drivers/mtd/nand/nand_samsung.c | 2 +- + drivers/mtd/nand/nand_timings.c | 2 +- + drivers/mtd/nand/nand_toshiba.c | 2 +- + drivers/mtd/nand/nandsim.c | 2 +- + drivers/mtd/nand/ndfc.c | 2 +- + drivers/mtd/nand/nuc900_nand.c | 2 +- + drivers/mtd/nand/omap2.c | 2 +- + drivers/mtd/nand/orion_nand.c | 9 +- + drivers/mtd/nand/oxnas_nand.c | 27 +- + drivers/mtd/nand/pasemi_nand.c | 2 +- + drivers/mtd/nand/plat_nand.c | 2 +- + drivers/mtd/nand/pxa3xx_nand.c | 2 +- + drivers/mtd/nand/qcom_nandc.c | 919 +++++++++++++++++---- + drivers/mtd/nand/r852.h | 2 +- + drivers/mtd/nand/s3c2410.c | 2 +- + drivers/mtd/nand/sh_flctl.c | 8 +- + drivers/mtd/nand/sharpsl.c | 4 +- + drivers/mtd/nand/sm_common.c | 2 +- + drivers/mtd/nand/socrates_nand.c | 2 +- + drivers/mtd/nand/sunxi_nand.c | 4 +- + drivers/mtd/nand/tango_nand.c | 2 +- + drivers/mtd/nand/tmio_nand.c | 6 +- + drivers/mtd/nand/txx9ndfmc.c | 2 +- + drivers/mtd/nand/vf610_nfc.c | 11 +- + drivers/mtd/nand/xway_nand.c | 2 +- + drivers/mtd/nftlcore.c | 2 +- + drivers/mtd/nftlmount.c | 2 +- + drivers/mtd/ssfdc.c | 2 +- + drivers/mtd/tests/nandbiterrs.c | 2 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 2 +- + fs/jffs2/wbuf.c | 2 +- + include/linux/mfd/tmio.h | 1 + + include/linux/mtd/nand-gpio.h | 2 +- + include/linux/mtd/{nand.h => rawnand.h} | 28 +- + include/linux/mtd/sh_flctl.h | 2 +- + include/linux/mtd/sharpsl.h | 3 +- + include/linux/platform_data/mtd-davinci.h | 2 +- + include/linux/platform_data/mtd-nand-s3c2410.h | 2 +- + 134 files changed, 1104 insertions(+), 590 deletions(-) + rename include/linux/mtd/{nand.h => rawnand.h} (98%) +Merging spi-nor/spi-nor/next (18f7ce2f4495 mtd: spi-nor: add support for Microchip sst26vf064b QSPI memory) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/Kconfig | 16 + + drivers/mtd/spi-nor/Makefile | 3 +- + drivers/mtd/spi-nor/aspeed-smc.c | 13 +- + drivers/mtd/spi-nor/atmel-quadspi.c | 1 - + drivers/mtd/spi-nor/intel-spi-pci.c | 82 ++++ + drivers/mtd/spi-nor/mtk-quadspi.c | 1 - + drivers/mtd/spi-nor/spi-nor.c | 805 +++++++++++++++++++++++++++++++++++- + include/linux/mtd/spi-nor.h | 11 + + 8 files changed, 901 insertions(+), 31 deletions(-) + create mode 100644 drivers/mtd/spi-nor/intel-spi-pci.c +Merging crypto/master (2d45a7e89833 crypto: af_alg - get_page upon reassignment to TX SGL) +$ git merge crypto/master +Removing drivers/crypto/ccp/ccp-platform.c +Removing drivers/crypto/ccp/ccp-pci.c +Auto-merging crypto/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/artpec6-crypto.txt | 16 + + .../devicetree/bindings/crypto/atmel-crypto.txt | 13 + + .../devicetree/bindings/crypto/st,stm32-hash.txt | 30 + + Documentation/devicetree/bindings/rng/imx-rngc.txt | 21 + + MAINTAINERS | 7 + + arch/arm/crypto/Kconfig | 5 +- + arch/arm/crypto/aes-ce-glue.c | 4 +- + arch/arm/crypto/aes-cipher-core.S | 88 +- + arch/arm/crypto/aes-neonbs-glue.c | 5 +- + arch/arm/crypto/ghash-ce-core.S | 234 +- + arch/arm/crypto/ghash-ce-glue.c | 24 +- + arch/arm64/crypto/Kconfig | 22 +- + arch/arm64/crypto/aes-ce-ccm-core.S | 30 +- + arch/arm64/crypto/aes-ce-ccm-glue.c | 174 +- + arch/arm64/crypto/aes-ce-cipher.c | 55 +- + arch/arm64/crypto/aes-ce.S | 12 +- + arch/arm64/crypto/aes-cipher-core.S | 152 +- + arch/arm64/crypto/aes-ctr-fallback.h | 53 + + arch/arm64/crypto/aes-glue.c | 63 +- + arch/arm64/crypto/aes-neonbs-glue.c | 53 +- + arch/arm64/crypto/chacha20-neon-glue.c | 5 +- + arch/arm64/crypto/crc32-ce-glue.c | 11 +- + arch/arm64/crypto/crct10dif-ce-glue.c | 13 +- + arch/arm64/crypto/ghash-ce-core.S | 401 ++- + arch/arm64/crypto/ghash-ce-glue.c | 517 +++- + arch/arm64/crypto/sha1-ce-glue.c | 18 +- + arch/arm64/crypto/sha2-ce-glue.c | 30 +- + arch/arm64/crypto/sha256-glue.c | 1 + + arch/sparc/crypto/aes_glue.c | 3 +- + arch/x86/crypto/aesni-intel_glue.c | 4 +- + arch/x86/crypto/blowfish_glue.c | 3 +- + arch/x86/crypto/cast5_avx_glue.c | 3 +- + arch/x86/crypto/des3_ede_glue.c | 3 +- + crypto/Kconfig | 2 + + crypto/af_alg.c | 691 +++++ + crypto/ahash.c | 29 + + crypto/algapi.c | 25 +- + crypto/algif_aead.c | 864 ++---- + crypto/algif_skcipher.c | 834 +---- + crypto/ctr.c | 3 +- + crypto/ecdh.c | 51 +- + crypto/pcbc.c | 12 +- + crypto/rng.c | 6 +- + crypto/scompress.c | 55 +- + crypto/serpent_generic.c | 77 +- + crypto/tcrypt.c | 8 +- + drivers/char/hw_random/Kconfig | 20 +- + drivers/char/hw_random/Makefile | 1 + + drivers/char/hw_random/core.c | 42 +- + drivers/char/hw_random/imx-rngc.c | 331 ++ + drivers/crypto/Kconfig | 49 +- + drivers/crypto/Makefile | 4 +- + drivers/crypto/atmel-ecc.c | 781 +++++ + drivers/crypto/atmel-ecc.h | 128 + + drivers/crypto/atmel-sha.c | 2 +- + drivers/crypto/atmel-tdes.c | 2 +- + drivers/crypto/axis/Makefile | 1 + + drivers/crypto/axis/artpec6_crypto.c | 3192 ++++++++++++++++++++ + drivers/crypto/bcm/cipher.c | 114 +- + drivers/crypto/bcm/cipher.h | 13 +- + drivers/crypto/caam/caamalg.c | 66 +- + drivers/crypto/caam/caamalg_desc.c | 5 +- + drivers/crypto/caam/caamalg_qi.c | 55 +- + drivers/crypto/caam/caamhash.c | 7 +- + drivers/crypto/caam/caamrng.c | 6 +- + drivers/crypto/caam/ctrl.c | 127 +- + drivers/crypto/caam/ctrl.h | 2 + + drivers/crypto/caam/error.c | 40 + + drivers/crypto/caam/error.h | 4 + + drivers/crypto/caam/intern.h | 11 - + drivers/crypto/caam/jr.c | 7 +- + drivers/crypto/caam/qi.c | 30 +- + drivers/crypto/caam/qi.h | 3 + + drivers/crypto/caam/regs.h | 1 + + drivers/crypto/caam/sg_sw_qm2.h | 81 + + drivers/crypto/caam/sg_sw_sec4.h | 43 +- + drivers/crypto/cavium/cpt/cptpf_main.c | 13 +- + drivers/crypto/cavium/nitrox/nitrox_main.c | 4 +- + drivers/crypto/ccp/Kconfig | 22 +- + drivers/crypto/ccp/Makefile | 7 +- + drivers/crypto/ccp/ccp-crypto-aes-galois.c | 2 +- + drivers/crypto/ccp/ccp-crypto-aes-xts.c | 96 +- + drivers/crypto/ccp/ccp-crypto-des3.c | 2 +- + drivers/crypto/ccp/ccp-crypto-main.c | 21 +- + drivers/crypto/ccp/ccp-crypto-rsa.c | 299 ++ + drivers/crypto/ccp/ccp-crypto-sha.c | 2 +- + drivers/crypto/ccp/ccp-crypto.h | 36 +- + drivers/crypto/ccp/ccp-debugfs.c | 15 +- + drivers/crypto/ccp/ccp-dev-v3.c | 20 +- + drivers/crypto/ccp/ccp-dev-v5.c | 28 +- + drivers/crypto/ccp/ccp-dev.c | 134 +- + drivers/crypto/ccp/ccp-dev.h | 30 +- + drivers/crypto/ccp/ccp-dmaengine.c | 2 +- + drivers/crypto/ccp/ccp-ops.c | 133 +- + 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 | 133 + + drivers/crypto/ccp/sp-pci.c | 276 ++ + drivers/crypto/ccp/sp-platform.c | 256 ++ + drivers/crypto/geode-aes.c | 17 +- + drivers/crypto/img-hash.c | 2 +- + drivers/crypto/inside-secure/safexcel.c | 5 +- + drivers/crypto/mediatek/mtk-platform.c | 2 +- + drivers/crypto/mxc-scc.c | 4 +- + drivers/crypto/mxs-dcp.c | 8 +- + drivers/crypto/n2_core.c | 60 +- + drivers/crypto/omap-aes.c | 1 + + drivers/crypto/omap-des.c | 3 +- + drivers/crypto/omap-sham.c | 2 +- + drivers/crypto/qat/qat_common/adf_aer.c | 2 +- + drivers/crypto/rockchip/rk3288_crypto.c | 74 +- + drivers/crypto/rockchip/rk3288_crypto.h | 15 +- + drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 103 +- + drivers/crypto/rockchip/rk3288_crypto_ahash.c | 119 +- + drivers/crypto/sahara.c | 14 +- + drivers/crypto/stm32/Kconfig | 19 +- + drivers/crypto/stm32/Makefile | 4 +- + drivers/crypto/stm32/stm32-hash.c | 1575 ++++++++++ + drivers/crypto/stm32/stm32_crc32.c | 17 +- + 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 +- + drivers/crypto/vmx/aes_ctr.c | 3 +- + drivers/md/dm-crypt.c | 11 +- + include/crypto/algapi.h | 23 +- + include/crypto/if_alg.h | 170 ++ + include/crypto/internal/akcipher.h | 6 + + include/crypto/internal/hash.h | 2 + + include/crypto/kpp.h | 10 + + include/linux/ccp.h | 11 +- + lib/mpi/longlong.h | 24 +- + 136 files changed, 11758 insertions(+), 3169 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/artpec6-crypto.txt + create mode 100644 Documentation/devicetree/bindings/crypto/st,stm32-hash.txt + create mode 100644 Documentation/devicetree/bindings/rng/imx-rngc.txt + create mode 100644 arch/arm64/crypto/aes-ctr-fallback.h + create mode 100644 drivers/char/hw_random/imx-rngc.c + create mode 100644 drivers/crypto/atmel-ecc.c + create mode 100644 drivers/crypto/atmel-ecc.h + create mode 100644 drivers/crypto/axis/Makefile + create mode 100644 drivers/crypto/axis/artpec6_crypto.c + create mode 100644 drivers/crypto/caam/sg_sw_qm2.h + create mode 100644 drivers/crypto/ccp/ccp-crypto-rsa.c + 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/stm32/stm32-hash.c + create mode 100644 drivers/crypto/sunxi-ss/sun4i-ss-prng.c +Merging drm/drm-next (7c0059dd832c Merge branch 'linux-4.14' of git://github.com/skeggsb/linux into drm-next) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/i915/intel_display.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/imx/ipuv3-plane.c' +Removing include/linux/platform_data/omap_drm.h +Auto-merging drivers/media/platform/vsp1/vsp1_wpf.c +Auto-merging drivers/media/platform/vsp1/vsp1_video.c +Auto-merging drivers/media/platform/vsp1/vsp1_regs.h +Auto-merging drivers/media/platform/vsp1/vsp1_pipe.h +Auto-merging drivers/media/platform/vsp1/vsp1_pipe.c +Auto-merging drivers/media/platform/vsp1/vsp1_entity.h +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging drivers/gpu/drm/rockchip/rockchip_drm_drv.c +Removing drivers/gpu/drm/omapdrm/dss/dss_features.h +Removing drivers/gpu/drm/omapdrm/dss/dss_features.c +Auto-merging drivers/gpu/drm/imx/ipuv3-plane.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/imx/ipuv3-plane.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_bios.c +Auto-merging drivers/gpu/drm/i915/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c +Auto-merging drivers/gpu/drm/drm_plane.c +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/drm_atomic.c +Auto-merging arch/x86/kernel/early-quirks.c +Removing arch/arm/mach-omap2/drm.c +Auto-merging arch/arm/mach-omap2/board-generic.c +Auto-merging MAINTAINERS +Auto-merging Documentation/gpu/drm-mm.rst +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/imx/ipuv3-plane.c'. +[master 3b2511741e83] Merge remote-tracking branch 'drm/drm-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 +- + .../bindings/display/rockchip/rockchip-vop.txt | 4 + + .../bindings/display/sitronix,st7586.txt | 22 + + .../devicetree/bindings/display/st,stm32-ltdc.txt | 105 +- + .../bindings/display/sunxi/sun4i-drm.txt | 36 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/gpu/drm-internals.rst | 2 + + Documentation/gpu/drm-kms-helpers.rst | 9 + + Documentation/gpu/drm-kms.rst | 59 +- + Documentation/gpu/drm-mm.rst | 2 +- + Documentation/gpu/drm-uapi.rst | 2 + + Documentation/gpu/i915.rst | 18 +- + Documentation/gpu/todo.rst | 4 +- + MAINTAINERS | 23 +- + arch/arm/mach-omap2/Makefile | 2 +- + arch/arm/mach-omap2/board-generic.c | 1 + + arch/arm/mach-omap2/display.c | 118 +- + arch/arm/mach-omap2/display.h | 1 - + arch/arm/mach-omap2/drm.c | 53 - + arch/arm/mach-omap2/io.c | 1 - + arch/x86/kernel/early-quirks.c | 1 + + drivers/char/agp/ali-agp.c | 2 +- + drivers/char/agp/amd-k7-agp.c | 4 +- + drivers/char/agp/amd64-agp.c | 2 +- + drivers/char/agp/ati-agp.c | 2 +- + drivers/char/agp/efficeon-agp.c | 2 +- + drivers/char/agp/intel-agp.c | 2 +- + drivers/char/agp/nvidia-agp.c | 2 +- + drivers/char/agp/sis-agp.c | 2 +- + drivers/char/agp/uninorth-agp.c | 2 +- + drivers/dma-buf/dma-fence.c | 4 +- + drivers/dma-buf/reservation.c | 99 +- + drivers/dma-buf/sw_sync.c | 201 +- + drivers/dma-buf/sync_debug.c | 19 +- + drivers/dma-buf/sync_debug.h | 26 +- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 223 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 189 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 227 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 161 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 129 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 251 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 77 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 64 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 13 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 234 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 68 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 63 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 40 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sa.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 56 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 82 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 488 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.c | 85 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.h | 62 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 504 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 77 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 9 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 60 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 168 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 113 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 152 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 115 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 125 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 109 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 243 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 172 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 152 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h | 1 - + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h | 2 - + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 80 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 78 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 91 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 142 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 111 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 3 - + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 46 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 4 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 1 + + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 4 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 15 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 96 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.h | 5 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 10 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 42 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 70 +- + drivers/gpu/drm/amd/amdgpu/si.c | 28 + + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 1 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 66 +- + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 7 + + drivers/gpu/drm/amd/amdgpu/soc15d.h | 1 + + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 80 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 183 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 102 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.c | 21 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgmgr.h | 27 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 123 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 318 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_cik.c | 8 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 40 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 33 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 63 +- + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 62 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 46 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 294 +- + drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers.h | 330 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_vi.h | 140 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 32 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 25 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 71 +- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 46 +- + drivers/gpu/drm/amd/include/atomfirmware.h | 63 + + drivers/gpu/drm/amd/include/cgs_common.h | 6 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 30 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 113 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 25 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 241 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 8 + + drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 9 + + drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h | 2 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 12 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 302 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 15 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 1291 +++++ + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.h | 16 + + .../amd/powerplay/hwmgr/vega10_processpptables.c | 88 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 6 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 5 + + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 2 + + drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 6 + + drivers/gpu/drm/amd/powerplay/inc/pp_soc15.h | 2 + + drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h | 7 +- + drivers/gpu/drm/amd/powerplay/inc/smu9.h | 13 +- + drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h | 5 +- + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 3 + + drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h | 4 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 19 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 184 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h | 11 - + .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 4 +- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 34 +- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.h | 12 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 6 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 8 +- + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 11 +- + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 30 +- + drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h | 9 +- + drivers/gpu/drm/arc/arcpgu_crtc.c | 43 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 61 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 11 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 4 - + drivers/gpu/drm/arm/malidp_crtc.c | 10 +- + drivers/gpu/drm/arm/malidp_drv.c | 4 +- + drivers/gpu/drm/arm/malidp_planes.c | 3 +- + drivers/gpu/drm/armada/armada_crtc.c | 20 +- + drivers/gpu/drm/armada/armada_crtc.h | 2 - + drivers/gpu/drm/armada/armada_drv.c | 4 +- + drivers/gpu/drm/armada/armada_fbdev.c | 3 - + drivers/gpu/drm/armada/armada_overlay.c | 3 +- + drivers/gpu/drm/ast/ast_dp501.c | 25 +- + drivers/gpu/drm/ast/ast_drv.c | 6 +- + drivers/gpu/drm/ast/ast_drv.h | 4 +- + drivers/gpu/drm/ast/ast_fb.c | 23 +- + drivers/gpu/drm/ast/ast_main.c | 13 +- + drivers/gpu/drm/ast/ast_mode.c | 48 +- + drivers/gpu/drm/ast/ast_ttm.c | 19 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 17 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 32 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 16 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 45 +- + drivers/gpu/drm/bochs/bochs_drv.c | 6 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 7 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 11 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 10 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1 - + drivers/gpu/drm/bridge/dumb-vga-dac.c | 10 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 1 - + drivers/gpu/drm/bridge/nxp-ptn3460.c | 7 +- + drivers/gpu/drm/bridge/panel.c | 36 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 7 +- + drivers/gpu/drm/bridge/sii902x.c | 9 +- + drivers/gpu/drm/bridge/synopsys/Kconfig | 16 + + drivers/gpu/drm/bridge/synopsys/Makefile | 3 + + .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 327 ++ + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h | 19 + + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 3 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 107 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.h | 46 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 981 ++++ + drivers/gpu/drm/bridge/tc358767.c | 7 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 7 +- + drivers/gpu/drm/cirrus/cirrus_drv.c | 6 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 8 - + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 5 +- + drivers/gpu/drm/cirrus/cirrus_main.c | 10 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 71 +- + drivers/gpu/drm/drm_atomic.c | 219 +- + drivers/gpu/drm/drm_atomic_helper.c | 611 ++- + drivers/gpu/drm/drm_color_mgmt.c | 3 + + drivers/gpu/drm/drm_connector.c | 7 +- + drivers/gpu/drm/drm_crtc_helper.c | 3 +- + drivers/gpu/drm/drm_crtc_internal.h | 7 + + drivers/gpu/drm/drm_debugfs_crc.c | 59 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 89 +- + drivers/gpu/drm/drm_drv.c | 56 +- + drivers/gpu/drm/drm_dumb_buffers.c | 26 +- + drivers/gpu/drm/drm_edid.c | 440 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 184 +- + drivers/gpu/drm/drm_fb_helper.c | 681 ++- + drivers/gpu/drm/drm_file.c | 9 +- + drivers/gpu/drm/drm_framebuffer.c | 2 +- + drivers/gpu/drm/drm_gem.c | 47 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 39 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 283 ++ + drivers/gpu/drm/drm_internal.h | 14 +- + drivers/gpu/drm/drm_ioc32.c | 2 +- + drivers/gpu/drm/drm_ioctl.c | 17 +- + drivers/gpu/drm/drm_mipi_dsi.c | 6 +- + drivers/gpu/drm/drm_mode_config.c | 7 + + drivers/gpu/drm/drm_mode_object.c | 159 +- + drivers/gpu/drm/drm_modes.c | 91 +- + drivers/gpu/drm/drm_modeset_helper.c | 1 + + drivers/gpu/drm/drm_modeset_lock.c | 12 +- + drivers/gpu/drm/drm_of.c | 4 +- + drivers/gpu/drm/drm_pci.c | 40 +- + drivers/gpu/drm/drm_plane.c | 120 +- + drivers/gpu/drm/drm_probe_helper.c | 4 + + drivers/gpu/drm/drm_property.c | 23 + + drivers/gpu/drm/drm_scdc_helper.c | 33 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 23 +- + drivers/gpu/drm/drm_syncobj.c | 2 - + drivers/gpu/drm/drm_vblank.c | 187 +- + drivers/gpu/drm/drm_vm.c | 2 +- + drivers/gpu/drm/etnaviv/Kconfig | 2 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 45 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 8 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 27 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 26 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 30 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 5 - + drivers/gpu/drm/exynos/exynos_drm_plane.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 3 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 5 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 1 - + drivers/gpu/drm/gma500/framebuffer.c | 22 - + drivers/gpu/drm/gma500/gem.c | 30 - + drivers/gpu/drm/gma500/gma_display.c | 32 +- + drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 4 +- + drivers/gpu/drm/gma500/mdfld_intel_display.c | 4 - + drivers/gpu/drm/gma500/psb_drv.c | 7 +- + drivers/gpu/drm/gma500/psb_drv.h | 2 - + drivers/gpu/drm/gma500/psb_intel_display.c | 7 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 1 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 12 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 5 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 1 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 8 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 17 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 30 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 2 - + drivers/gpu/drm/i2c/tda998x_drv.c | 12 +- + drivers/gpu/drm/i810/i810_drv.c | 5 +- + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/Kconfig.debug | 1 + + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/gvt/aperture_gm.c | 4 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 8 +- + drivers/gpu/drm/i915/gvt/cmd_parser.h | 2 +- + drivers/gpu/drm/i915/gvt/display.c | 6 +- + drivers/gpu/drm/i915/gvt/execlist.c | 15 + + drivers/gpu/drm/i915/gvt/gtt.c | 128 +- + drivers/gpu/drm/i915/gvt/gtt.h | 26 +- + drivers/gpu/drm/i915/gvt/gvt.h | 3 + + drivers/gpu/drm/i915/gvt/handlers.c | 50 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 17 + + drivers/gpu/drm/i915/gvt/render.c | 54 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 113 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 1 + + drivers/gpu/drm/i915/gvt/vgpu.c | 7 +- + drivers/gpu/drm/i915/i915_debugfs.c | 200 +- + drivers/gpu/drm/i915/i915_drv.c | 197 +- + drivers/gpu/drm/i915/i915_drv.h | 366 +- + drivers/gpu/drm/i915/i915_gem.c | 432 +- + drivers/gpu/drm/i915/i915_gem_clflush.c | 3 +- + drivers/gpu/drm/i915/i915_gem_context.c | 275 +- + drivers/gpu/drm/i915/i915_gem_context.h | 79 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 4 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 642 ++- + drivers/gpu/drm/i915/i915_gem_gtt.c | 109 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 3 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 7 +- + drivers/gpu/drm/i915/i915_gem_object.c | 48 + + drivers/gpu/drm/i915/i915_gem_object.h | 32 +- + drivers/gpu/drm/i915/i915_gem_request.c | 104 +- + drivers/gpu/drm/i915/i915_gem_request.h | 2 + + drivers/gpu/drm/i915/i915_gem_stolen.c | 8 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 4 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 11 +- + drivers/gpu/drm/i915/i915_irq.c | 377 +- + drivers/gpu/drm/i915/i915_oa_bdw.c | 5362 +------------------- + drivers/gpu/drm/i915/i915_oa_bdw.h | 8 +- + drivers/gpu/drm/i915/i915_oa_bxt.c | 2624 +--------- + drivers/gpu/drm/i915/i915_oa_bxt.h | 8 +- + drivers/gpu/drm/i915/i915_oa_chv.c | 2808 +--------- + drivers/gpu/drm/i915/i915_oa_chv.h | 8 +- + drivers/gpu/drm/i915/i915_oa_glk.c | 2536 +-------- + drivers/gpu/drm/i915/i915_oa_glk.h | 8 +- + drivers/gpu/drm/i915/i915_oa_hsw.c | 765 +-- + drivers/gpu/drm/i915/i915_oa_hsw.h | 8 +- + drivers/gpu/drm/i915/i915_oa_kblgt2.c | 2972 +---------- + drivers/gpu/drm/i915/i915_oa_kblgt2.h | 8 +- + drivers/gpu/drm/i915/i915_oa_kblgt3.c | 3021 +---------- + drivers/gpu/drm/i915/i915_oa_kblgt3.h | 8 +- + drivers/gpu/drm/i915/i915_oa_sklgt2.c | 3459 +------------ + drivers/gpu/drm/i915/i915_oa_sklgt2.h | 8 +- + drivers/gpu/drm/i915/i915_oa_sklgt3.c | 3020 +---------- + drivers/gpu/drm/i915/i915_oa_sklgt3.h | 8 +- + drivers/gpu/drm/i915/i915_oa_sklgt4.c | 3074 +---------- + drivers/gpu/drm/i915/i915_oa_sklgt4.h | 8 +- + drivers/gpu/drm/i915/i915_params.c | 10 +- + drivers/gpu/drm/i915/i915_params.h | 3 +- + drivers/gpu/drm/i915/i915_pci.c | 7 +- + drivers/gpu/drm/i915/i915_perf.c | 809 ++- + drivers/gpu/drm/i915/i915_pvinfo.h | 8 +- + drivers/gpu/drm/i915/i915_reg.h | 521 +- + drivers/gpu/drm/i915/i915_selftest.h | 2 - + drivers/gpu/drm/i915/i915_sysfs.c | 16 +- + drivers/gpu/drm/i915/i915_vgpu.c | 7 + + drivers/gpu/drm/i915/i915_vgpu.h | 3 + + drivers/gpu/drm/i915/i915_vma.c | 31 +- + drivers/gpu/drm/i915/i915_vma.h | 6 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 15 + + drivers/gpu/drm/i915/intel_bios.c | 9 + + drivers/gpu/drm/i915/intel_color.c | 47 +- + drivers/gpu/drm/i915/intel_crt.c | 2 - + drivers/gpu/drm/i915/intel_ddi.c | 119 +- + drivers/gpu/drm/i915/intel_device_info.c | 2 +- + drivers/gpu/drm/i915/intel_display.c | 1815 +++---- + drivers/gpu/drm/i915/intel_dp.c | 218 +- + drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 98 +- + drivers/gpu/drm/i915/intel_dp_link_training.c | 8 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 52 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 11 +- + drivers/gpu/drm/i915/intel_drv.h | 57 +- + drivers/gpu/drm/i915/intel_dsi.c | 4 +- + drivers/gpu/drm/i915/intel_dvo.c | 4 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 45 +- + drivers/gpu/drm/i915/intel_fbc.c | 4 +- + drivers/gpu/drm/i915/intel_fbdev.c | 72 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 6 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 2 +- + drivers/gpu/drm/i915/intel_hdmi.c | 204 +- + drivers/gpu/drm/i915/intel_hotplug.c | 57 +- + drivers/gpu/drm/i915/intel_i2c.c | 36 +- + drivers/gpu/drm/i915/intel_lrc.c | 38 +- + drivers/gpu/drm/i915/intel_lvds.c | 5 +- + drivers/gpu/drm/i915/intel_opregion.c | 45 + + drivers/gpu/drm/i915/intel_overlay.c | 11 +- + drivers/gpu/drm/i915/intel_panel.c | 9 +- + drivers/gpu/drm/i915/intel_pm.c | 245 +- + drivers/gpu/drm/i915/intel_psr.c | 1 + + drivers/gpu/drm/i915/intel_renderstate_gen9.c | 4 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 8 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 13 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 1028 ++-- + drivers/gpu/drm/i915/intel_sdvo.c | 81 +- + drivers/gpu/drm/i915/intel_sprite.c | 161 +- + drivers/gpu/drm/i915/intel_tv.c | 2 - + drivers/gpu/drm/i915/intel_uc.c | 4 +- + drivers/gpu/drm/i915/intel_uncore.c | 22 +- + drivers/gpu/drm/i915/selftests/huge_gem_object.c | 6 +- + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 6 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 10 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 8 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 343 +- + drivers/gpu/drm/i915/selftests/mock_context.c | 36 +- + drivers/gpu/drm/i915/selftests/mock_context.h | 5 + + drivers/gpu/drm/i915/selftests/mock_engine.c | 8 +- + drivers/gpu/drm/i915/selftests/mock_engine.h | 3 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 30 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 3 +- + drivers/gpu/drm/imx/imx-drm-core.c | 10 +- + drivers/gpu/drm/imx/imx-ldb.c | 1 - + drivers/gpu/drm/imx/imx-tve.c | 1 - + drivers/gpu/drm/imx/ipuv3-crtc.c | 5 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 57 +- + drivers/gpu/drm/imx/parallel-display.c | 1 - + drivers/gpu/drm/mediatek/mtk_disp_color.c | 4 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 4 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 4 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 6 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 17 +- + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 6 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 32 +- + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 27 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.h | 3 - + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 5 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 11 +- + drivers/gpu/drm/meson/meson_crtc.c | 10 +- + drivers/gpu/drm/meson/meson_drv.c | 7 +- + drivers/gpu/drm/meson/meson_plane.c | 1 + + drivers/gpu/drm/meson/meson_venc_cvbs.c | 1 - + drivers/gpu/drm/mga/mga_drv.c | 5 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 7 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 5 - + drivers/gpu/drm/mgag200/mgag200_fb.c | 7 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 10 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 62 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 1 - + drivers/gpu/drm/msm/edp/edp_connector.c | 1 - + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 1 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 11 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 4 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 1 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 12 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 6 +- + drivers/gpu/drm/msm/msm_atomic.c | 34 +- + drivers/gpu/drm/msm/msm_drv.c | 1 - + drivers/gpu/drm/msm/msm_fbdev.c | 1 - + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 7 +- + drivers/gpu/drm/mxsfb/mxsfb_out.c | 1 - + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 62 +- + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 71 +- + .../drm/nouveau/include/nvkm/subdev/bios/conn.h | 1 + + .../gpu/drm/nouveau/include/nvkm/subdev/bios/dcb.h | 1 + + .../gpu/drm/nouveau/include/nvkm/subdev/therm.h | 1 + + drivers/gpu/drm/nouveau/nouveau_bios.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 16 +- + drivers/gpu/drm/nouveau/nouveau_crtc.h | 3 - + drivers/gpu/drm/nouveau/nouveau_display.c | 23 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 35 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 22 - + drivers/gpu/drm/nouveau/nouveau_ttm.c | 6 +- + drivers/gpu/drm/nouveau/nv50_display.c | 157 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 33 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 4 + + .../gpu/drm/nouveau/nvkm/engine/disp/headgf119.c | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv40.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c | 6 + + drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.h | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gf100.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/pci/base.c | 4 + + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf100.c | 19 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gf119.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk104.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk110.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk208.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gk20a.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm107.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp100.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c | 7 + + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gt215.c | 15 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/therm/g84.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm200.c | 39 + + drivers/gpu/drm/nouveau/nvkm/subdev/therm/priv.h | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/therm/temp.c | 6 +- + .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 3 + + drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 104 + + .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 81 + + drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 3 + + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 2 +- + .../omapdrm/displays/panel-lgphilips-lb035q02.c | 2 +- + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 5 +- + .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 2 +- + .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 2 +- + drivers/gpu/drm/omapdrm/dss/Makefile | 2 +- + drivers/gpu/drm/omapdrm/dss/core.c | 190 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 824 ++- + drivers/gpu/drm/omapdrm/dss/dpi.c | 88 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 329 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 406 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 46 +- + drivers/gpu/drm/omapdrm/dss/dss_features.c | 905 ---- + drivers/gpu/drm/omapdrm/dss/dss_features.h | 109 - + drivers/gpu/drm/omapdrm/dss/hdmi.h | 16 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 7 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 38 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 7 +- + drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 60 +- + drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 24 +- + drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 12 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 25 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 21 +- + drivers/gpu/drm/omapdrm/dss/video-pll.c | 1 - + drivers/gpu/drm/omapdrm/omap_connector.c | 38 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 137 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 77 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 3 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 2 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 1 - + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 3 +- + drivers/gpu/drm/panel/panel-lvds.c | 16 +- + drivers/gpu/drm/pl111/pl111_connector.c | 1 - + drivers/gpu/drm/pl111/pl111_display.c | 5 +- + drivers/gpu/drm/pl111/pl111_drv.c | 9 +- + drivers/gpu/drm/qxl/qxl_display.c | 35 +- + drivers/gpu/drm/qxl/qxl_drv.c | 8 +- + drivers/gpu/drm/qxl/qxl_drv.h | 1 + + drivers/gpu/drm/qxl/qxl_fb.c | 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/atombios_crtc.c | 1 - + drivers/gpu/drm/radeon/radeon.h | 4 +- + drivers/gpu/drm/radeon/radeon_acpi.c | 2 +- + drivers/gpu/drm/radeon/radeon_acpi.h | 3 - + drivers/gpu/drm/radeon/radeon_audio.c | 2 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 7 +- + drivers/gpu/drm/radeon/radeon_cs.c | 10 +- + drivers/gpu/drm/radeon/radeon_cursor.c | 6 +- + drivers/gpu/drm/radeon/radeon_display.c | 95 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 7 - + drivers/gpu/drm/radeon/radeon_drv.c | 7 +- + drivers/gpu/drm/radeon/radeon_fb.c | 14 +- + drivers/gpu/drm/radeon/radeon_gem.c | 30 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 5 +- + drivers/gpu/drm/radeon/radeon_kfd.c | 15 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 1 - + drivers/gpu/drm/radeon/radeon_mode.h | 4 - + drivers/gpu/drm/radeon/radeon_object.c | 4 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 32 +- + drivers/gpu/drm/radeon/radeon_vm.c | 4 +- + drivers/gpu/drm/radeon/vce_v2_0.c | 4 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 199 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 17 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 30 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_group.c | 38 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 129 +- + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 1 - + drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 12 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 119 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 3 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 56 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 10 +- + drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 1 - + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 1 - + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 110 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 5 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 21 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 31 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 28 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.h | 3 - + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 174 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 81 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 375 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 905 +++- + drivers/gpu/drm/savage/savage_drv.c | 5 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 6 +- + drivers/gpu/drm/sis/sis_drv.c | 5 +- + drivers/gpu/drm/sti/sti_crtc.c | 10 +- + drivers/gpu/drm/sti/sti_cursor.c | 3 +- + drivers/gpu/drm/sti/sti_drv.c | 3 - + drivers/gpu/drm/sti/sti_dvo.c | 3 +- + drivers/gpu/drm/sti/sti_gdp.c | 3 +- + drivers/gpu/drm/sti/sti_hda.c | 1 - + drivers/gpu/drm/sti/sti_hdmi.c | 4 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 8 +- + drivers/gpu/drm/stm/Kconfig | 9 +- + drivers/gpu/drm/stm/Makefile | 2 + + drivers/gpu/drm/stm/drv.c | 23 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 352 ++ + drivers/gpu/drm/stm/ltdc.c | 470 +- + drivers/gpu/drm/stm/ltdc.h | 4 +- + drivers/gpu/drm/sun4i/Kconfig | 16 +- + drivers/gpu/drm/sun4i/Makefile | 1 + + drivers/gpu/drm/sun4i/sun4i_crtc.c | 10 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 11 +- + drivers/gpu/drm/sun4i/sun4i_hdmi.h | 32 + + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 159 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c | 220 + + drivers/gpu/drm/sun4i/sun4i_layer.c | 11 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 11 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 2 - + drivers/gpu/drm/sun4i/sun4i_tv.c | 11 +- + drivers/gpu/drm/sun4i/sun8i_layer.c | 2 +- + drivers/gpu/drm/tdfx/tdfx_drv.c | 5 +- + drivers/gpu/drm/tegra/Kconfig | 1 + + drivers/gpu/drm/tegra/Makefile | 2 + + drivers/gpu/drm/tegra/dc.c | 22 +- + drivers/gpu/drm/tegra/dpaux.c | 12 +- + drivers/gpu/drm/tegra/drm.c | 116 +- + drivers/gpu/drm/tegra/drm.h | 12 +- + drivers/gpu/drm/tegra/dsi.c | 15 +- + drivers/gpu/drm/tegra/fb.c | 8 +- + drivers/gpu/drm/tegra/gem.c | 78 +- + drivers/gpu/drm/tegra/gem.h | 2 - + drivers/gpu/drm/tegra/hdmi.c | 15 +- + drivers/gpu/drm/tegra/rgb.c | 1 - + drivers/gpu/drm/tegra/sor.c | 15 +- + drivers/gpu/drm/tegra/trace.c | 2 + + drivers/gpu/drm/tegra/trace.h | 68 + + drivers/gpu/drm/tegra/vic.c | 15 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 20 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 8 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 1 - + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 1 - + drivers/gpu/drm/tinydrm/Kconfig | 23 + + drivers/gpu/drm/tinydrm/Makefile | 2 + + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 60 +- + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 5 +- + drivers/gpu/drm/tinydrm/mi0283qt.c | 8 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 17 +- + drivers/gpu/drm/tinydrm/repaper.c | 1117 ++++ + drivers/gpu/drm/tinydrm/st7586.c | 428 ++ + drivers/gpu/drm/ttm/ttm_bo.c | 64 +- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 5 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 79 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 2 +- + drivers/gpu/drm/udl/udl_connector.c | 2 +- + drivers/gpu/drm/udl/udl_dmabuf.c | 2 +- + drivers/gpu/drm/udl/udl_drv.c | 11 +- + drivers/gpu/drm/udl/udl_fb.c | 9 +- + drivers/gpu/drm/udl/udl_gem.c | 4 +- + drivers/gpu/drm/udl/udl_main.c | 2 - + drivers/gpu/drm/vc4/Kconfig | 8 + + drivers/gpu/drm/vc4/vc4_bo.c | 291 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 50 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 13 +- + drivers/gpu/drm/vc4/vc4_drv.c | 11 +- + drivers/gpu/drm/vc4/vc4_drv.h | 40 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 24 +- + drivers/gpu/drm/vc4/vc4_gem.c | 44 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 291 +- + drivers/gpu/drm/vc4/vc4_kms.c | 85 +- + drivers/gpu/drm/vc4/vc4_plane.c | 19 +- + drivers/gpu/drm/vc4/vc4_regs.h | 113 + + drivers/gpu/drm/vc4/vc4_render_cl.c | 63 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 3 +- + drivers/gpu/drm/vc4/vc4_validate.c | 78 +- + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 72 +- + drivers/gpu/drm/vc4/vc4_vec.c | 2 - + drivers/gpu/drm/vgem/vgem_drv.c | 86 +- + drivers/gpu/drm/vgem/vgem_drv.h | 4 + + drivers/gpu/drm/vgem/vgem_fence.c | 2 +- + drivers/gpu/drm/via/via_drv.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 11 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - + drivers/gpu/drm/virtio/virtgpu_drv.h | 3 - + drivers/gpu/drm/virtio/virtgpu_fb.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 7 - + drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 2 - + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 35 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 27 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 41 +- + drivers/gpu/drm/zte/zx_drm_drv.c | 6 +- + drivers/gpu/drm/zte/zx_hdmi.c | 3 +- + drivers/gpu/drm/zte/zx_plane.c | 2 +- + drivers/gpu/drm/zte/zx_tvenc.c | 1 - + drivers/gpu/drm/zte/zx_vga.c | 1 - + drivers/gpu/drm/zte/zx_vou.c | 10 +- + drivers/gpu/host1x/bus.c | 19 +- + drivers/gpu/host1x/dev.c | 4 +- + drivers/gpu/host1x/hw/intr_hw.c | 24 +- + drivers/gpu/host1x/hw/syncpt_hw.c | 2 +- + drivers/gpu/host1x/job.c | 8 - + drivers/gpu/ipu-v3/ipu-common.c | 4 +- + drivers/media/platform/vsp1/vsp1.h | 7 +- + drivers/media/platform/vsp1/vsp1_bru.c | 45 +- + drivers/media/platform/vsp1/vsp1_bru.h | 4 +- + drivers/media/platform/vsp1/vsp1_dl.c | 205 +- + drivers/media/platform/vsp1/vsp1_dl.h | 1 - + drivers/media/platform/vsp1/vsp1_drm.c | 286 +- + drivers/media/platform/vsp1/vsp1_drm.h | 38 +- + drivers/media/platform/vsp1/vsp1_drv.c | 115 +- + drivers/media/platform/vsp1/vsp1_entity.c | 40 +- + drivers/media/platform/vsp1/vsp1_entity.h | 5 +- + drivers/media/platform/vsp1/vsp1_lif.c | 5 +- + drivers/media/platform/vsp1/vsp1_lif.h | 2 +- + drivers/media/platform/vsp1/vsp1_pipe.c | 27 +- + drivers/media/platform/vsp1/vsp1_pipe.h | 2 +- + drivers/media/platform/vsp1/vsp1_regs.h | 46 +- + drivers/media/platform/vsp1/vsp1_video.c | 69 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 4 +- + drivers/staging/vboxvideo/vbox_drv.c | 5 +- + drivers/staging/vboxvideo/vbox_fb.c | 17 +- + drivers/staging/vboxvideo/vbox_main.c | 8 +- + drivers/staging/vboxvideo/vbox_mode.c | 7 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 2 +- + include/drm/bridge/dw_mipi_dsi.h | 39 + + include/drm/drmP.h | 161 +- + include/drm/drm_atomic.h | 132 +- + include/drm/drm_atomic_helper.h | 27 +- + include/drm/drm_bridge.h | 3 + + include/drm/drm_connector.h | 42 +- + include/drm/drm_crtc.h | 17 +- + include/drm/drm_device.h | 190 + + include/drm/drm_dp_mst_helper.h | 10 + + include/drm/drm_drv.h | 94 +- + include/drm/drm_edid.h | 11 +- + include/drm/drm_fb_cma_helper.h | 4 +- + include/drm/drm_fb_helper.h | 74 +- + include/drm/drm_framebuffer.h | 7 + + include/drm/drm_gem.h | 17 +- + include/drm/drm_gem_cma_helper.h | 5 - + include/drm/drm_gem_framebuffer_helper.h | 37 + + include/drm/drm_mode_config.h | 6 + + include/drm/drm_modes.h | 11 + + include/drm/drm_modeset_helper_vtables.h | 125 +- + include/drm/drm_pci.h | 11 +- + include/drm/drm_plane.h | 28 +- + include/drm/drm_property.h | 2 + + include/drm/drm_scdc_helper.h | 25 - + include/drm/drm_simple_kms_helper.h | 1 + + include/drm/drm_vblank.h | 3 +- + include/drm/tinydrm/mipi-dbi.h | 6 +- + include/drm/tinydrm/tinydrm-helpers.h | 2 + + include/drm/tinydrm/tinydrm.h | 4 +- + include/drm/ttm/ttm_bo_driver.h | 22 +- + include/linux/dma-fence.h | 19 +- + include/linux/platform_data/omap_drm.h | 53 - + include/linux/reservation.h | 3 + + include/media/vsp1.h | 12 +- + include/sound/omap-hdmi-audio.h | 2 +- + include/uapi/drm/armada_drm.h | 22 +- + include/uapi/drm/drm_fourcc.h | 31 + + include/uapi/drm/drm_mode.h | 50 + + include/uapi/drm/i915_drm.h | 51 +- + include/uapi/drm/qxl_drm.h | 6 +- + include/uapi/drm/vc4_drm.h | 22 + + include/uapi/linux/kfd_ioctl.h | 37 +- + lib/radix-tree.c | 1 + + sound/soc/omap/omap-hdmi-audio.c | 9 +- + 809 files changed, 26935 insertions(+), 45311 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 Documentation/devicetree/bindings/display/sitronix,st7586.txt + delete mode 100644 arch/arm/mach-omap2/drm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vf_error.h + create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c + create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.h + create mode 100644 drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c + create mode 100644 drivers/gpu/drm/drm_gem_framebuffer_helper.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_object.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/therm/gm200.c + delete mode 100644 drivers/gpu/drm/omapdrm/dss/dss_features.c + delete mode 100644 drivers/gpu/drm/omapdrm/dss/dss_features.h + create mode 100644 drivers/gpu/drm/stm/dw_mipi_dsi-stm.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_i2c.c + create mode 100644 drivers/gpu/drm/tegra/trace.c + create mode 100644 drivers/gpu/drm/tegra/trace.h + create mode 100644 drivers/gpu/drm/tinydrm/repaper.c + create mode 100644 drivers/gpu/drm/tinydrm/st7586.c + create mode 100644 include/drm/bridge/dw_mipi_dsi.h + create mode 100644 include/drm/drm_device.h + create mode 100644 include/drm/drm_gem_framebuffer_helper.h + delete mode 100644 include/linux/platform_data/omap_drm.h +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 (908b6e6e8ab4 drm/i915: Quietly cancel FBC activation if CRTC is turned off before worker) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_drv.c | 3 +- + drivers/gpu/drm/i915/i915_drv.h | 8 +- + drivers/gpu/drm/i915/i915_gem.c | 9 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 1 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 126 ++++++++++--- + drivers/gpu/drm/i915/i915_irq.c | 8 +- + drivers/gpu/drm/i915/i915_pci.c | 1 - + drivers/gpu/drm/i915/i915_reg.h | 13 ++ + drivers/gpu/drm/i915/i915_vma.h | 6 + + drivers/gpu/drm/i915/intel_bios.c | 196 ++++++++++---------- + drivers/gpu/drm/i915/intel_crt.c | 22 +-- + drivers/gpu/drm/i915/intel_ddi.c | 69 ++++--- + drivers/gpu/drm/i915/intel_display.c | 77 +++++++- + drivers/gpu/drm/i915/intel_dp.c | 152 +++++++-------- + drivers/gpu/drm/i915/intel_dp_mst.c | 16 +- + drivers/gpu/drm/i915/intel_drv.h | 68 +++---- + drivers/gpu/drm/i915/intel_dsi.c | 22 +-- + drivers/gpu/drm/i915/intel_dvo.c | 12 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 35 ++++ + drivers/gpu/drm/i915/intel_fbc.c | 21 ++- + drivers/gpu/drm/i915/intel_hdmi.c | 157 ++++++++-------- + drivers/gpu/drm/i915/intel_lrc.c | 2 + + drivers/gpu/drm/i915/intel_lvds.c | 24 +-- + drivers/gpu/drm/i915/intel_pipe_crc.c | 62 +++---- + drivers/gpu/drm/i915/intel_pm.c | 67 +++---- + drivers/gpu/drm/i915/intel_psr.c | 79 ++++---- + drivers/gpu/drm/i915/intel_runtime_pm.c | 85 +++++---- + drivers/gpu/drm/i915/intel_sdvo.c | 40 ++-- + drivers/gpu/drm/i915/intel_tv.c | 14 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 284 +++++++++++++++-------------- + 30 files changed, 982 insertions(+), 697 deletions(-) +Merging drm-tegra/drm/tegra/for-next (65d5d30ccebd drm/tegra: trace: Fix path to include) +$ git merge drm-tegra/drm/tegra/for-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/tegra/trace.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging drm-misc/for-linux-next (f44d85389e17 drm: rename u32 in __u32 in uapi) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + include/uapi/drm/drm_mode.h | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) +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 (0502a625c2ee drm/msm: fix error path cleanup) +$ git merge drm-msm/msm-next +Resolved 'drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c' using previous resolution. +Auto-merging drivers/gpu/drm/msm/msm_fbdev.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_connector.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi_bridge.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2da1a6843f55] Merge remote-tracking branch 'drm-msm/msm-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/msm/Makefile | 4 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 12 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.h | 1 - + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 12 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.h | 1 - + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 269 ++++++++++++++++++---- + drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 104 ++++++++- + drivers/gpu/drm/msm/adreno/a5xx_power.c | 20 +- + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 294 ++++++++++++++++++++++++ + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 224 ++++++++---------- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 43 ++-- + drivers/gpu/drm/msm/dsi/dsi.c | 5 + + drivers/gpu/drm/msm/dsi/dsi.h | 2 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 94 ++++---- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 2 + + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 4 + + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 63 +++-- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 7 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 27 ++- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 12 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 27 ++- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 54 ++++- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 7 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_mdss.c | 63 ++++- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_smp.c | 59 ++++- + drivers/gpu/drm/msm/msm_drv.c | 103 ++++++++- + drivers/gpu/drm/msm/msm_drv.h | 34 ++- + drivers/gpu/drm/msm/msm_fb.c | 45 +++- + drivers/gpu/drm/msm/msm_fbdev.c | 57 ++--- + drivers/gpu/drm/msm/msm_fence.c | 2 +- + drivers/gpu/drm/msm/msm_fence.h | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 46 ++++ + drivers/gpu/drm/msm/msm_gem.h | 5 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 25 +- + drivers/gpu/drm/msm/msm_gpu.c | 259 +++++++++++++++------ + drivers/gpu/drm/msm/msm_gpu.h | 54 ++++- + drivers/gpu/drm/msm/msm_kms.h | 2 + + drivers/gpu/drm/msm/msm_ringbuffer.c | 35 +-- + drivers/gpu/drm/msm/msm_ringbuffer.h | 32 ++- + drivers/gpu/drm/msm/msm_submitqueue.c | 160 +++++++++++++ + include/uapi/drm/msm_drm.h | 24 ++ + 42 files changed, 1783 insertions(+), 514 deletions(-) + create mode 100644 drivers/gpu/drm/msm/adreno/a5xx_preempt.c + create mode 100644 drivers/gpu/drm/msm/msm_submitqueue.c +Merging hdlcd/for-upstream/hdlcd (fee4964f0a6c drm/arm: hdlcd: remove unused variables) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging mali-dp/for-upstream/mali-dp (e46477b8f23c drm: mali-dp: Restore commit_tail behaviour to the runtime_pm friendly version.) +$ git merge mali-dp/for-upstream/mali-dp +Auto-merging drivers/gpu/drm/arm/malidp_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/malidp_crtc.c | 4 ++++ + drivers/gpu/drm/arm/malidp_drv.c | 11 +++-------- + 2 files changed, 7 insertions(+), 8 deletions(-) +Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (9303519985ed drm/imx: parallel-display: use correct connector enum) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- + drivers/gpu/drm/imx/parallel-display.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging etnaviv/etnaviv/next (65375b873cb5 drm/etnaviv: switch GEM allocations to __GFP_RETRY_MAYFAIL) +$ git merge etnaviv/etnaviv/next +Already up-to-date. +Merging kconfig/for-next (6f7da290413b Linux 4.12) +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (1874021ec3a8 Merge remote-tracking branches 'regmap/topic/const' and 'regmap/topic/namespace' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-spi.c | 2 +- + drivers/base/regmap/regmap-spmi.c | 4 ++-- + include/linux/regmap.h | 17 +++++++++-------- + 3 files changed, 12 insertions(+), 11 deletions(-) +Merging sound/for-next (e6b4c525d94e ALSA: pcm: Correct broken procfs set up) +$ git merge sound/for-next +Auto-merging sound/parisc/harmony.c +Merge made by the 'recursive' strategy. + include/sound/core.h | 2 - + sound/aoa/codecs/onyx.c | 12 +- + sound/aoa/soundbus/i2sbus/pcm.c | 4 +- + sound/arm/aaci.c | 8 +- + sound/arm/pxa2xx-pcm.c | 2 +- + sound/atmel/ac97c.c | 8 +- + sound/core/control.c | 346 ++++++++++++++++----------- + sound/core/init.c | 1 - + sound/core/pcm.c | 69 +++--- + sound/core/timer.c | 13 +- + sound/drivers/aloop.c | 6 +- + sound/drivers/dummy.c | 2 +- + sound/drivers/ml403-ac97cr.c | 8 +- + sound/drivers/mpu401/mpu401.c | 2 +- + sound/drivers/mpu401/mpu401_uart.c | 24 +- + sound/drivers/opl3/opl3_lib.c | 4 +- + sound/drivers/pcsp/pcsp.c | 29 +-- + sound/drivers/pcsp/pcsp_lib.c | 2 +- + sound/drivers/vx/vx_pcm.c | 4 +- + sound/firewire/bebob/bebob.h | 2 +- + sound/firewire/bebob/bebob_focusrite.c | 6 +- + sound/firewire/bebob/bebob_maudio.c | 2 +- + sound/firewire/bebob/bebob_terratec.c | 2 +- + sound/firewire/bebob/bebob_yamaha_terratec.c | 2 +- + sound/firewire/dice/dice.c | 2 +- + sound/firewire/fireface/ff-pcm.c | 20 +- + sound/firewire/fireface/ff-protocol-ff400.c | 2 +- + sound/firewire/fireface/ff.c | 2 +- + sound/firewire/fireface/ff.h | 4 +- + sound/firewire/fireworks/fireworks_proc.c | 2 +- + sound/firewire/isight.c | 2 +- + sound/firewire/motu/motu-midi.c | 4 +- + sound/firewire/motu/motu-pcm.c | 6 +- + sound/firewire/motu/motu-protocol-v2.c | 5 - + sound/firewire/motu/motu-protocol-v3.c | 5 - + sound/firewire/motu/motu-stream.c | 38 ++- + sound/firewire/motu/motu.c | 28 ++- + sound/firewire/motu/motu.h | 6 +- + sound/firewire/oxfw/oxfw-scs1x.c | 11 +- + sound/firewire/tascam/tascam.c | 2 +- + sound/hda/hdac_i915.c | 2 +- + sound/isa/ad1816a/ad1816a.c | 2 +- + sound/isa/ad1816a/ad1816a_lib.c | 8 +- + sound/isa/ad1848/ad1848.c | 18 +- + sound/isa/als100.c | 15 +- + sound/isa/azt2320.c | 2 +- + sound/isa/cmi8330.c | 2 +- + sound/isa/cs423x/cs4231.c | 18 +- + sound/isa/cs423x/cs4236.c | 22 +- + sound/isa/es1688/es1688.c | 2 +- + sound/isa/es1688/es1688_lib.c | 8 +- + sound/isa/es18xx.c | 12 +- + sound/isa/gus/gus_pcm.c | 8 +- + sound/isa/gus/interwave.c | 2 +- + sound/isa/msnd/msnd.c | 8 +- + sound/isa/msnd/msnd_pinnacle.c | 2 +- + sound/isa/opl3sa2.c | 4 +- + sound/isa/opti9xx/miro.c | 9 +- + sound/isa/opti9xx/opti92x-ad1848.c | 16 +- + sound/isa/sb/emu8000_callback.c | 2 +- + sound/isa/sb/emu8000_pcm.c | 4 +- + sound/isa/sb/sb16.c | 2 +- + sound/isa/sb/sb16_main.c | 8 +- + sound/isa/sb/sb8_main.c | 8 +- + sound/isa/sscape.c | 2 +- + sound/isa/wavefront/wavefront.c | 2 +- + sound/isa/wss/wss_lib.c | 8 +- + sound/mips/hal2.c | 6 +- + sound/mips/sgio2audio.c | 8 +- + sound/parisc/harmony.c | 8 +- + sound/pci/ad1889.c | 4 +- + sound/pci/ali5451/ali5451.c | 12 +- + sound/pci/als300.c | 4 +- + sound/pci/als4000.c | 4 +- + sound/pci/atiixp.c | 4 +- + sound/pci/atiixp_modem.c | 2 +- + sound/pci/au88x0/au88x0_pcm.c | 10 +- + sound/pci/aw2/aw2-alsa.c | 4 +- + sound/pci/bt87x.c | 4 +- + sound/pci/ca0106/ca0106_main.c | 10 +- + sound/pci/cmipci.c | 31 +-- + sound/pci/cs4281.c | 4 +- + sound/pci/cs46xx/cs46xx_lib.c | 4 +- + sound/pci/cs5535audio/cs5535audio_pcm.c | 4 +- + sound/pci/ctxfi/cthw20k1.c | 2 +- + sound/pci/ctxfi/cthw20k2.c | 2 +- + sound/pci/ctxfi/ctpcm.c | 48 ++-- + sound/pci/echoaudio/echoaudio.c | 8 +- + sound/pci/emu10k1/emu10k1x.c | 4 +- + sound/pci/emu10k1/emupcm.c | 10 +- + sound/pci/emu10k1/p16v.c | 4 +- + sound/pci/ens1370.c | 6 +- + sound/pci/es1938.c | 4 +- + sound/pci/es1968.c | 4 +- + sound/pci/fm801.c | 4 +- + sound/pci/hda/dell_wmi_helper.c | 87 ++++++- + sound/pci/hda/hda_intel.c | 3 + + sound/pci/hda/patch_analog.c | 4 +- + sound/pci/hda/patch_sigmatel.c | 2 +- + sound/pci/ice1712/delta.c | 24 +- + sound/pci/ice1712/ews.c | 12 +- + sound/pci/ice1712/hoontech.c | 43 +++- + sound/pci/ice1712/hoontech.h | 1 + + sound/pci/ice1712/juli.c | 2 +- + sound/pci/ice1712/phase.c | 4 +- + sound/pci/ice1712/quartet.c | 2 +- + sound/pci/ice1712/revo.c | 20 +- + sound/pci/intel8x0.c | 28 +-- + sound/pci/intel8x0m.c | 10 +- + sound/pci/korg1212/korg1212.c | 4 +- + sound/pci/lola/lola_pcm.c | 2 +- + sound/pci/lx6464es/lx6464es.c | 2 +- + sound/pci/maestro3.c | 4 +- + sound/pci/mixart/mixart.c | 18 +- + sound/pci/mixart/mixart.h | 4 - + sound/pci/nm256/nm256.c | 2 +- + sound/pci/pcxhr/pcxhr.c | 25 +- + sound/pci/pcxhr/pcxhr.h | 3 +- + sound/pci/pcxhr/pcxhr_mixer.c | 4 +- + sound/pci/riptide/riptide.c | 4 +- + sound/pci/rme32.c | 8 +- + sound/pci/rme96.c | 51 ++-- + sound/pci/rme9652/hdsp.c | 17 +- + sound/pci/rme9652/hdspm.c | 90 +++---- + sound/pci/rme9652/rme9652.c | 18 +- + sound/pci/sis7019.c | 8 +- + sound/pci/sonicvibes.c | 4 +- + sound/pci/trident/trident_main.c | 20 +- + sound/pci/via82xx.c | 2 +- + sound/pci/via82xx_modem.c | 2 +- + sound/pci/ymfpci/ymfpci_main.c | 4 +- + sound/pcmcia/pdaudiocf/pdaudiocf_pcm.c | 4 +- + sound/ppc/pmac.c | 8 +- + sound/ppc/snd_ps3.c | 2 +- + sound/sh/aica.c | 4 +- + sound/sh/sh_dac_audio.c | 4 +- + sound/sparc/amd7930.c | 6 +- + sound/sparc/cs4231.c | 8 +- + sound/sparc/dbri.c | 4 +- + sound/spi/at73c213.c | 2 +- + sound/synth/emux/emux_seq.c | 20 +- + sound/usb/6fire/chip.c | 2 +- + sound/usb/6fire/pcm.c | 2 +- + sound/usb/bcd2000/bcd2000.c | 2 +- + sound/usb/caiaq/audio.c | 5 +- + sound/usb/caiaq/device.c | 2 +- + sound/usb/card.c | 4 +- + sound/usb/hiface/pcm.c | 2 +- + sound/usb/midi.c | 22 +- + sound/usb/misc/ua101.c | 6 +- + sound/usb/mixer.c | 20 +- + sound/usb/pcm.c | 6 +- + sound/usb/quirks.c | 5 +- + sound/usb/stream.c | 4 +- + sound/usb/usx2y/us122l.c | 2 +- + sound/usb/usx2y/usbusx2y.c | 2 +- + sound/usb/usx2y/usbusx2yaudio.c | 11 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- + 158 files changed, 1022 insertions(+), 791 deletions(-) +Merging sound-asoc/for-next (cfc9a6b9fc1e Merge remote-tracking branches 'asoc/topic/wm8524', 'asoc/topic/wm8804' and 'asoc/topic/zte' into asoc-next) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/codecs/rt5645.c +Auto-merging sound/atmel/ac97c.c +Removing include/sound/rt5677.h +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/dmic.txt | 16 + + .../devicetree/bindings/sound/mt2701-afe-pcm.txt | 4 +- + .../bindings/sound/qcom,msm8916-wcd-analog.txt | 18 +- + .../devicetree/bindings/sound/rockchip,pdm.txt | 7 +- + .../devicetree/bindings/sound/rockchip-i2s.txt | 4 + + Documentation/devicetree/bindings/sound/rt274.txt | 33 + + Documentation/devicetree/bindings/sound/rt5663.txt | 8 + + .../devicetree/bindings/sound/samsung,odroid.txt | 6 - + .../devicetree/bindings/sound/simple-scu-card.txt | 1 + + .../devicetree/bindings/sound/sun4i-i2s.txt | 2 + + .../devicetree/bindings/sound/tlv320aic32x4.txt | 13 +- + Documentation/devicetree/bindings/sound/wm8524.txt | 16 + + include/sound/rt5663.h | 22 + + include/sound/rt5677.h | 45 - + include/sound/soc.h | 31 +- + include/sound/tlv320aic32x4.h | 23 + + include/uapi/sound/snd_sst_tokens.h | 92 +- + sound/atmel/ac97c.c | 8 +- + sound/soc/atmel/atmel-classd.c | 1 - + sound/soc/atmel/atmel-pdmic.c | 1 - + sound/soc/au1x/db1200.c | 2 +- + sound/soc/au1x/dbdma2.c | 2 +- + sound/soc/au1x/dma.c | 2 +- + sound/soc/au1x/psc-ac97.c | 2 +- + sound/soc/au1x/psc-i2s.c | 2 +- + sound/soc/bcm/cygnus-ssp.c | 237 +--- + sound/soc/blackfin/bf5xx-ac97-pcm.c | 2 +- + sound/soc/blackfin/bf5xx-i2s-pcm.c | 2 +- + sound/soc/blackfin/bf6xx-i2s.c | 2 +- + sound/soc/blackfin/bf6xx-sport.c | 38 +- + sound/soc/cirrus/edb93xx.c | 2 +- + sound/soc/cirrus/snappercl15.c | 2 +- + sound/soc/codecs/88pm860x-codec.c | 2 +- + sound/soc/codecs/Kconfig | 14 +- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/ab8500-codec.c | 2 +- + sound/soc/codecs/ac97.c | 2 +- + sound/soc/codecs/ad1836.c | 2 +- + sound/soc/codecs/ad193x.c | 2 +- + sound/soc/codecs/ad1980.c | 2 +- + sound/soc/codecs/ad73311.c | 2 +- + sound/soc/codecs/adau1373.c | 2 +- + sound/soc/codecs/adau1701.c | 2 +- + sound/soc/codecs/adau1977.c | 8 +- + sound/soc/codecs/adav80x.c | 2 +- + sound/soc/codecs/ads117x.c | 2 +- + sound/soc/codecs/ak4104.c | 2 +- + sound/soc/codecs/ak4535.c | 2 +- + sound/soc/codecs/ak4554.c | 2 +- + sound/soc/codecs/ak4613.c | 2 +- + sound/soc/codecs/ak4641.c | 2 +- + sound/soc/codecs/ak4642.c | 2 +- + sound/soc/codecs/ak4671.c | 2 +- + sound/soc/codecs/ak5386.c | 2 +- + sound/soc/codecs/alc5623.c | 2 +- + sound/soc/codecs/arizona.c | 4 +- + sound/soc/codecs/bt-sco.c | 2 +- + sound/soc/codecs/cq93vc.c | 2 +- + sound/soc/codecs/cs35l33.c | 14 +- + sound/soc/codecs/cs35l34.c | 5 +- + sound/soc/codecs/cs35l35.c | 2 +- + sound/soc/codecs/cs4271.c | 2 +- + sound/soc/codecs/cs42l42.c | 11 +- + sound/soc/codecs/cs42l51.c | 2 +- + sound/soc/codecs/cs4349.c | 2 +- + sound/soc/codecs/cs47l24.c | 6 +- + sound/soc/codecs/cs53l30.c | 17 +- + sound/soc/codecs/cx20442.c | 2 +- + sound/soc/codecs/da7210.c | 2 +- + sound/soc/codecs/da7213.c | 2 +- + sound/soc/codecs/da7218.c | 2 +- + sound/soc/codecs/da7219.c | 2 +- + sound/soc/codecs/da732x.c | 2 +- + sound/soc/codecs/da9055.c | 2 +- + sound/soc/codecs/dmic.c | 54 +- + sound/soc/codecs/es7134.c | 2 +- + sound/soc/codecs/es8316.c | 4 +- + sound/soc/codecs/es8328.c | 2 +- + sound/soc/codecs/hdac_hdmi.c | 43 +- + sound/soc/codecs/hdmi-codec.c | 43 +- + sound/soc/codecs/ics43432.c | 2 +- + sound/soc/codecs/inno_rk3036.c | 4 +- + sound/soc/codecs/isabelle.c | 2 +- + sound/soc/codecs/jz4740.c | 2 +- + sound/soc/codecs/lm4857.c | 2 +- + sound/soc/codecs/lm49453.c | 2 +- + sound/soc/codecs/max9768.c | 2 +- + sound/soc/codecs/max98088.c | 2 +- + sound/soc/codecs/max98090.c | 2 +- + sound/soc/codecs/max98095.c | 2 +- + sound/soc/codecs/max98357a.c | 2 +- + sound/soc/codecs/max9850.c | 2 +- + sound/soc/codecs/max9860.c | 2 +- + sound/soc/codecs/max9867.c | 4 +- + sound/soc/codecs/max98926.c | 8 +- + sound/soc/codecs/max98927.c | 1 - + sound/soc/codecs/mc13783.c | 2 +- + sound/soc/codecs/ml26124.c | 2 +- + sound/soc/codecs/msm8916-wcd-analog.c | 415 ++++++- + sound/soc/codecs/msm8916-wcd-digital.c | 39 +- + sound/soc/codecs/nau8540.c | 2 +- + sound/soc/codecs/nau8810.c | 2 +- + sound/soc/codecs/nau8824.c | 2 +- + sound/soc/codecs/nau8825.c | 28 +- + sound/soc/codecs/pcm1681.c | 2 +- + sound/soc/codecs/pcm179x.c | 2 +- + sound/soc/codecs/pcm3008.c | 2 +- + sound/soc/codecs/pcm512x.c | 2 +- + sound/soc/codecs/rt274.c | 1228 ++++++++++++++++++++ + sound/soc/codecs/rt274.h | 217 ++++ + sound/soc/codecs/rt286.c | 2 +- + sound/soc/codecs/rt298.c | 2 +- + sound/soc/codecs/rt5514-spi.c | 146 +-- + sound/soc/codecs/rt5514-spi.h | 7 +- + sound/soc/codecs/rt5514.c | 163 ++- + sound/soc/codecs/rt5514.h | 22 + + sound/soc/codecs/rt5616.c | 4 +- + sound/soc/codecs/rt5631.c | 2 +- + sound/soc/codecs/rt5640.c | 2 +- + sound/soc/codecs/rt5645.c | 28 +- + sound/soc/codecs/rt5651.c | 2 +- + sound/soc/codecs/rt5659.c | 4 +- + sound/soc/codecs/rt5660.c | 2 +- + sound/soc/codecs/rt5663.c | 261 ++++- + sound/soc/codecs/rt5663.h | 2 + + sound/soc/codecs/rt5665.c | 55 +- + sound/soc/codecs/rt5665.h | 21 + + sound/soc/codecs/rt5670.c | 64 +- + sound/soc/codecs/rt5677.c | 82 +- + sound/soc/codecs/rt5677.h | 30 +- + sound/soc/codecs/sgtl5000.c | 2 +- + sound/soc/codecs/si476x.c | 2 +- + sound/soc/codecs/sirf-audio-codec.c | 2 +- + sound/soc/codecs/sn95031.c | 2 +- + sound/soc/codecs/spdif_receiver.c | 2 +- + sound/soc/codecs/spdif_transmitter.c | 2 +- + sound/soc/codecs/ssm2518.c | 2 +- + sound/soc/codecs/ssm2602.c | 2 +- + sound/soc/codecs/ssm4567.c | 2 +- + sound/soc/codecs/sta32x.c | 3 +- + sound/soc/codecs/stac9766.c | 2 +- + sound/soc/codecs/tas2552.c | 2 +- + sound/soc/codecs/tas5086.c | 2 +- + sound/soc/codecs/tas5720.c | 4 +- + sound/soc/codecs/tlv320aic23.c | 2 +- + sound/soc/codecs/tlv320aic26.c | 2 +- + sound/soc/codecs/tlv320aic31xx.c | 2 +- + sound/soc/codecs/tlv320aic32x4-i2c.c | 2 + + sound/soc/codecs/tlv320aic32x4-spi.c | 2 + + sound/soc/codecs/tlv320aic32x4.c | 208 +++- + sound/soc/codecs/tlv320aic32x4.h | 3 + + sound/soc/codecs/tlv320aic3x.c | 2 +- + sound/soc/codecs/tlv320dac33.c | 2 +- + sound/soc/codecs/twl4030.c | 2 +- + sound/soc/codecs/twl6040.c | 6 +- + sound/soc/codecs/uda134x.c | 2 +- + sound/soc/codecs/uda1380.c | 2 +- + sound/soc/codecs/wl1273.c | 2 +- + sound/soc/codecs/wm5102.c | 4 +- + sound/soc/codecs/wm5110.c | 4 +- + sound/soc/codecs/wm8523.c | 6 +- + sound/soc/codecs/wm8524.c | 261 +++++ + sound/soc/codecs/wm8804.c | 3 +- + sound/soc/codecs/zx_aud96p22.c | 6 +- + sound/soc/davinci/davinci-mcasp.c | 6 +- + sound/soc/davinci/davinci-vcif.c | 5 +- + sound/soc/dwc/dwc-i2s.c | 6 +- + sound/soc/fsl/fsl-asoc-card.c | 2 +- + sound/soc/fsl/fsl_asrc.c | 2 +- + sound/soc/fsl/fsl_asrc_dma.c | 6 +- + sound/soc/fsl/fsl_dma.c | 7 +- + sound/soc/fsl/fsl_esai.c | 2 +- + sound/soc/fsl/fsl_spdif.c | 2 +- + sound/soc/fsl/fsl_ssi.c | 4 +- + sound/soc/fsl/imx-audmux.c | 16 +- + sound/soc/fsl/imx-es8328.c | 3 - + sound/soc/fsl/imx-pcm-fiq.c | 6 +- + sound/soc/fsl/mpc5200_dma.c | 4 +- + sound/soc/generic/audio-graph-card.c | 3 +- + sound/soc/generic/audio-graph-scu-card.c | 3 +- + sound/soc/generic/simple-card.c | 10 - + sound/soc/generic/simple-scu-card.c | 5 + + sound/soc/hisilicon/hi6210-i2s.c | 2 +- + sound/soc/img/img-i2s-in.c | 2 +- + sound/soc/img/img-i2s-out.c | 2 +- + sound/soc/img/img-parallel-out.c | 2 +- + sound/soc/img/img-spdif-in.c | 2 +- + sound/soc/img/img-spdif-out.c | 2 +- + sound/soc/intel/Kconfig | 3 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 10 +- + sound/soc/intel/atom/sst/sst_drv_interface.c | 4 +- + sound/soc/intel/atom/sst/sst_pci.c | 2 +- + sound/soc/intel/baytrail/sst-baytrail-pcm.c | 4 +- + sound/soc/intel/boards/bxt_rt298.c | 86 +- + sound/soc/intel/boards/byt-max98090.c | 12 - + sound/soc/intel/boards/cht_bsw_rt5672.c | 10 + + sound/soc/intel/boards/kbl_rt5663_max98927.c | 290 ++++- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 62 +- + sound/soc/intel/boards/mfld_machine.c | 4 +- + sound/soc/intel/haswell/sst-haswell-pcm.c | 2 +- + sound/soc/intel/skylake/Makefile | 5 +- + sound/soc/intel/skylake/bxt-sst.c | 14 +- + sound/soc/intel/skylake/cnl-sst-dsp.c | 274 +++++ + sound/soc/intel/skylake/cnl-sst-dsp.h | 112 ++ + sound/soc/intel/skylake/cnl-sst.c | 497 ++++++++ + sound/soc/intel/skylake/skl-messages.c | 110 +- + sound/soc/intel/skylake/skl-pcm.c | 82 +- + sound/soc/intel/skylake/skl-sst-dsp.c | 6 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 6 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 12 +- + sound/soc/intel/skylake/skl-sst-utils.c | 6 +- + sound/soc/intel/skylake/skl-sst.c | 12 +- + sound/soc/intel/skylake/skl-topology.c | 741 ++++++++++-- + sound/soc/intel/skylake/skl-topology.h | 78 ++ + sound/soc/intel/skylake/skl.c | 32 +- + sound/soc/intel/skylake/skl.h | 3 + + sound/soc/jz4740/jz4740-i2s.c | 21 +- + sound/soc/kirkwood/kirkwood-dma.c | 2 +- + sound/soc/kirkwood/kirkwood-i2s.c | 11 +- + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c | 2 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 15 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 1 - + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 1 - + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 1 - + sound/soc/mxs/mxs-saif.c | 13 +- + sound/soc/mxs/mxs-sgtl5000.c | 1 - + sound/soc/nuc900/nuc900-pcm.c | 4 +- + sound/soc/omap/ams-delta.c | 10 - + sound/soc/omap/omap-pcm.c | 4 +- + sound/soc/omap/omap-twl4030.c | 13 - + sound/soc/omap/rx51.c | 9 - + sound/soc/pxa/hx4700.c | 8 - + sound/soc/pxa/mmp-pcm.c | 4 +- + sound/soc/pxa/mmp-sspa.c | 2 +- + sound/soc/pxa/pxa2xx-pcm.c | 4 +- + sound/soc/qcom/apq8016_sbc.c | 58 +- + sound/soc/qcom/lpass-platform.c | 4 +- + sound/soc/qcom/storm.c | 1 - + sound/soc/rockchip/rk3288_hdmi_analog.c | 4 +- + sound/soc/rockchip/rk3399_gru_sound.c | 15 +- + sound/soc/rockchip/rockchip_i2s.c | 4 +- + sound/soc/rockchip/rockchip_pdm.c | 2 +- + sound/soc/samsung/h1940_uda1380.c | 9 - + sound/soc/samsung/i2s.c | 45 +- + sound/soc/samsung/idma.c | 4 +- + sound/soc/samsung/jive_wm8750.c | 2 +- + sound/soc/samsung/odroid.c | 44 +- + sound/soc/samsung/pcm.c | 8 +- + sound/soc/samsung/rx1950_uda1380.c | 10 - + sound/soc/samsung/s3c-i2s-v2.c | 14 +- + sound/soc/samsung/s3c-i2s-v2.h | 7 + + sound/soc/samsung/s3c2412-i2s.c | 15 +- + sound/soc/samsung/s3c24xx-i2s.c | 11 +- + sound/soc/samsung/s3c24xx_simtec.c | 2 +- + sound/soc/samsung/s3c24xx_uda134x.c | 3 +- + sound/soc/samsung/smartq_wm8987.c | 9 - + sound/soc/samsung/smdk_spdif.c | 2 +- + sound/soc/samsung/spdif.c | 8 +- + sound/soc/samsung/tm2_wm5110.c | 4 +- + sound/soc/sh/dma-sh7760.c | 6 +- + sound/soc/sh/fsi.c | 12 +- + sound/soc/sh/migor.c | 2 +- + sound/soc/sh/rcar/adg.c | 11 +- + sound/soc/sh/rcar/core.c | 109 +- + sound/soc/sh/rcar/ctu.c | 5 +- + sound/soc/sh/rcar/dma.c | 2 +- + sound/soc/sh/rcar/dvc.c | 5 +- + sound/soc/sh/rcar/gen.c | 4 +- + sound/soc/sh/rcar/mix.c | 5 +- + sound/soc/sh/rcar/rsnd.h | 1 + + sound/soc/sh/rcar/src.c | 14 +- + sound/soc/sh/rcar/ssi.c | 141 ++- + sound/soc/sh/rcar/ssiu.c | 2 +- + sound/soc/sh/siu_dai.c | 2 +- + sound/soc/sh/siu_pcm.c | 2 +- + sound/soc/soc-compress.c | 23 +- + sound/soc/soc-core.c | 218 ++-- + sound/soc/soc-jack.c | 54 +- + sound/soc/soc-pcm.c | 43 +- + sound/soc/soc-utils.c | 2 +- + sound/soc/spear/spdif_in.c | 12 +- + sound/soc/spear/spdif_out.c | 4 +- + sound/soc/stm/stm32_i2s.c | 2 +- + sound/soc/stm/stm32_sai.c | 2 +- + sound/soc/stm/stm32_spdifrx.c | 2 +- + sound/soc/sunxi/sun4i-codec.c | 15 +- + sound/soc/sunxi/sun4i-i2s.c | 455 +++++++- + sound/soc/sunxi/sun4i-spdif.c | 14 +- + sound/soc/sunxi/sun8i-codec.c | 4 +- + sound/soc/tegra/Kconfig | 42 +- + sound/soc/tegra/tegra30_ahub.c | 4 +- + sound/soc/tegra/tegra30_i2s.c | 2 +- + sound/soc/tegra/tegra_alc5632.c | 14 - + sound/soc/tegra/tegra_max98090.c | 19 - + sound/soc/tegra/tegra_rt5640.c | 14 - + sound/soc/tegra/tegra_rt5677.c | 19 - + sound/soc/tegra/tegra_sgtl5000.c | 1 - + sound/soc/tegra/tegra_wm8753.c | 1 - + sound/soc/tegra/tegra_wm8903.c | 7 - + sound/soc/tegra/tegra_wm9712.c | 1 - + sound/soc/tegra/trimslice.c | 1 - + sound/soc/txx9/txx9aclc.c | 4 +- + sound/soc/ux500/mop500.c | 1 - + sound/soc/ux500/ux500_msp_dai.c | 2 +- + sound/soc/zte/zx-i2s.c | 2 +- + sound/soc/zte/zx-spdif.c | 2 +- + sound/soc/zte/zx-tdm.c | 2 +- + 307 files changed, 6952 insertions(+), 1737 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/dmic.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt274.txt + create mode 100644 Documentation/devicetree/bindings/sound/wm8524.txt + create mode 100644 include/sound/rt5663.h + delete mode 100644 include/sound/rt5677.h + create mode 100644 sound/soc/codecs/rt274.c + create mode 100644 sound/soc/codecs/rt274.h + create mode 100644 sound/soc/codecs/wm8524.c + create mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.c + create mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.h + create mode 100644 sound/soc/intel/skylake/cnl-sst.c +$ git am -3 ../patches/0001-Revert-ASoC-rt5514-expose-Hotword-Model-control.patch +Applying: Revert "ASoC: rt5514: expose Hotword Model control" +$ git reset HEAD^ +Unstaged changes after reset: +M sound/soc/codecs/rt5514.c +M sound/soc/codecs/rt5514.h +$ git add -A . +$ git commit -v -a --amend +[master 539bd0cc566e] Merge remote-tracking branch 'sound-asoc/for-next' + Date: Mon Aug 28 12:46:28 2017 +1000 +Merging modules/modules-next (0bf8bf50eddc module: Remove const attribute from alias for MODULE_DEVICE_TABLE) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + include/linux/module.h | 2 +- + kernel/module.c | 12 ++++++------ + scripts/mod/modpost.c | 29 ++++++++++++++++++++++++----- + 3 files changed, 31 insertions(+), 12 deletions(-) +Merging input/next (b54bf2fd156c Input: ambakmi - constify amba_id) +$ git merge input/next +Auto-merging lib/kobject_uevent.c +Auto-merging include/linux/kobject.h +Auto-merging include/linux/device.h +Auto-merging drivers/input/mouse/elan_i2c_core.c +Auto-merging drivers/base/core.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/atmel,maxtouch.txt | 2 + + arch/arm/mach-pxa/raumfeld.c | 2 +- + drivers/base/base.h | 5 - + drivers/base/core.c | 132 ++++++++++++++++ + drivers/base/dd.c | 4 + + drivers/input/input.c | 6 +- + drivers/input/joystick/iforce/iforce-serio.c | 2 +- + drivers/input/joystick/iforce/iforce-usb.c | 2 +- + drivers/input/joystick/magellan.c | 2 +- + drivers/input/joystick/spaceball.c | 2 +- + drivers/input/joystick/spaceorb.c | 2 +- + drivers/input/joystick/stinger.c | 2 +- + drivers/input/joystick/twidjoy.c | 2 +- + drivers/input/joystick/warrior.c | 2 +- + drivers/input/joystick/xpad.c | 2 +- + drivers/input/joystick/zhenhua.c | 2 +- + drivers/input/keyboard/atkbd.c | 2 +- + drivers/input/keyboard/gpio_keys.c | 18 +-- + drivers/input/keyboard/hil_kbd.c | 2 +- + drivers/input/keyboard/lkkbd.c | 2 +- + drivers/input/keyboard/newtonkbd.c | 2 +- + drivers/input/keyboard/stowaway.c | 2 +- + drivers/input/keyboard/sunkbd.c | 2 +- + drivers/input/keyboard/xtkbd.c | 2 +- + drivers/input/misc/Kconfig | 11 ++ + drivers/input/misc/Makefile | 1 + + drivers/input/misc/ati_remote2.c | 2 +- + drivers/input/misc/axp20x-pek.c | 167 +++++++++++++-------- + drivers/input/misc/ims-pcu.c | 4 +- + drivers/input/misc/keyspan_remote.c | 2 +- + drivers/input/misc/pcspkr.c | 17 ++- + drivers/input/misc/powermate.c | 2 +- + drivers/input/misc/rk805-pwrkey.c | 111 ++++++++++++++ + drivers/input/misc/yealink.c | 2 +- + drivers/input/mouse/appletouch.c | 2 +- + drivers/input/mouse/elan_i2c.h | 2 +- + drivers/input/mouse/elan_i2c_core.c | 9 +- + drivers/input/mouse/elan_i2c_i2c.c | 13 +- + drivers/input/mouse/elan_i2c_smbus.c | 4 +- + drivers/input/mouse/elantech.c | 2 +- + drivers/input/mouse/psmouse-base.c | 2 +- + drivers/input/mouse/synaptics_usb.c | 2 +- + drivers/input/mousedev.c | 62 ++++---- + drivers/input/rmi4/rmi_f01.c | 13 +- + drivers/input/rmi4/rmi_f34.c | 2 +- + drivers/input/serio/ambakmi.c | 2 +- + drivers/input/serio/i8042-x86ia64io.h | 4 +- + drivers/input/serio/serio.c | 4 +- + drivers/input/serio/serio_raw.c | 2 +- + drivers/input/tablet/acecad.c | 2 +- + drivers/input/tablet/aiptek.c | 2 +- + drivers/input/tablet/kbtab.c | 2 +- + drivers/input/tablet/wacom_serial4.c | 2 +- + drivers/input/touchscreen/ads7846.c | 4 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 46 ++++-- + drivers/input/touchscreen/dynapro.c | 2 +- + drivers/input/touchscreen/elants_i2c.c | 2 +- + drivers/input/touchscreen/elo.c | 2 +- + drivers/input/touchscreen/fujitsu_ts.c | 2 +- + drivers/input/touchscreen/gunze.c | 2 +- + drivers/input/touchscreen/hampshire.c | 2 +- + drivers/input/touchscreen/inexio.c | 2 +- + drivers/input/touchscreen/mtouch.c | 2 +- + drivers/input/touchscreen/mxs-lradc-ts.c | 8 +- + drivers/input/touchscreen/penmount.c | 2 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 2 +- + drivers/input/touchscreen/sun4i-ts.c | 2 +- + drivers/input/touchscreen/sur40.c | 46 ++++-- + drivers/input/touchscreen/touchit213.c | 2 +- + drivers/input/touchscreen/touchright.c | 2 +- + drivers/input/touchscreen/touchwin.c | 2 +- + drivers/input/touchscreen/tsc40.c | 2 +- + drivers/input/touchscreen/wacom_w8001.c | 2 +- + include/linux/device.h | 30 ++++ + include/linux/kobject.h | 2 + + lib/kobject_uevent.c | 2 + + 76 files changed, 603 insertions(+), 222 deletions(-) + create mode 100644 drivers/input/misc/rk805-pwrkey.c +Merging block/for-next (9cc5e072cbf3 Merge branch 'for-4.14/block' into for-next) +$ git merge block/for-next +Auto-merging include/linux/fs.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/meta_io.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/f2fs/segment.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/raid56.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/check-integrity.c +Auto-merging drivers/nvme/host/rdma.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/block/loop.c +Auto-merging block/blk-throttle.c +Auto-merging block/blk-mq-debugfs.c +Auto-merging arch/powerpc/sysdev/axonram.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 6 + + arch/powerpc/sysdev/axonram.c | 2 +- + block/bfq-iosched.c | 148 +- + block/bfq-iosched.h | 25 +- + block/bio-integrity.c | 26 +- + block/bio.c | 30 +- + block/blk-cgroup.c | 8 +- + block/blk-core.c | 148 +- + block/blk-flush.c | 26 +- + block/blk-lib.c | 8 +- + block/blk-merge.c | 6 +- + block/blk-mq-debugfs.c | 4 +- + block/blk-mq-tag.c | 23 +- + block/blk-mq.c | 54 +- + block/blk-mq.h | 3 + + block/blk-settings.c | 1 + + block/blk-tag.c | 1 - + block/blk-throttle.c | 13 +- + block/blk-zoned.c | 4 +- + block/blk.h | 2 + + block/cfq-iosched.c | 18 +- + block/compat_ioctl.c | 2 +- + block/genhd.c | 91 +- + block/partition-generic.c | 23 +- + drivers/block/DAC960.c | 12 +- + drivers/block/Kconfig | 1 + + drivers/block/brd.c | 5 +- + drivers/block/drbd/drbd_actlog.c | 2 +- + drivers/block/drbd/drbd_bitmap.c | 2 +- + drivers/block/drbd/drbd_int.h | 4 +- + drivers/block/drbd/drbd_receiver.c | 4 +- + drivers/block/drbd/drbd_req.c | 12 +- + drivers/block/drbd/drbd_worker.c | 2 +- + drivers/block/floppy.c | 2 +- + drivers/block/loop.c | 14 +- + drivers/block/nbd.c | 13 +- + drivers/block/null_blk.c | 1310 ++++++++++++-- + drivers/block/pktcdvd.c | 11 +- + drivers/block/rsxx/dev.c | 6 +- + drivers/block/skd_main.c | 3210 +++++++++-------------------------- + drivers/block/skd_s1120.h | 38 +- + drivers/block/virtio_blk.c | 2 +- + drivers/block/xen-blkback/blkback.c | 9 +- + drivers/block/xen-blkback/xenbus.c | 3 +- + drivers/block/xen-blkfront.c | 2 +- + drivers/block/zram/zram_drv.c | 5 +- + drivers/ide/ide-floppy.c | 2 +- + drivers/md/bcache/debug.c | 2 +- + drivers/md/bcache/io.c | 2 +- + drivers/md/bcache/journal.c | 6 +- + drivers/md/bcache/request.c | 21 +- + drivers/md/bcache/super.c | 6 +- + drivers/md/bcache/writeback.c | 5 +- + drivers/md/dm-bio-record.h | 9 +- + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-cache-target.c | 4 +- + drivers/md/dm-crypt.c | 7 +- + drivers/md/dm-delay.c | 4 +- + drivers/md/dm-era-target.c | 2 +- + drivers/md/dm-flakey.c | 2 +- + drivers/md/dm-integrity.c | 11 +- + drivers/md/dm-io.c | 2 +- + drivers/md/dm-linear.c | 2 +- + drivers/md/dm-log-writes.c | 8 +- + drivers/md/dm-mpath.c | 2 +- + drivers/md/dm-raid1.c | 12 +- + drivers/md/dm-snap.c | 16 +- + drivers/md/dm-stripe.c | 10 +- + drivers/md/dm-switch.c | 2 +- + drivers/md/dm-thin.c | 6 +- + drivers/md/dm-verity-target.c | 2 +- + drivers/md/dm-zoned-metadata.c | 6 +- + drivers/md/dm-zoned-target.c | 4 +- + drivers/md/dm.c | 16 +- + drivers/md/faulty.c | 4 +- + drivers/md/linear.c | 6 +- + drivers/md/md.c | 10 +- + drivers/md/md.h | 9 +- + drivers/md/multipath.c | 8 +- + drivers/md/raid0.c | 7 +- + drivers/md/raid1.c | 34 +- + drivers/md/raid10.c | 50 +- + drivers/md/raid5-cache.c | 6 +- + drivers/md/raid5-ppl.c | 6 +- + drivers/md/raid5.c | 16 +- + drivers/nvdimm/nd.h | 9 +- + drivers/nvme/host/core.c | 11 +- + drivers/nvme/host/fc.c | 4 +- + drivers/nvme/host/lightnvm.c | 15 +- + drivers/nvme/host/rdma.c | 11 +- + drivers/nvme/target/io-cmd.c | 6 +- + drivers/s390/block/dcssblk.c | 4 +- + drivers/s390/block/xpram.c | 2 +- + drivers/target/target_core_iblock.c | 4 +- + fs/block_dev.c | 5 +- + fs/btrfs/check-integrity.c | 41 +- + fs/btrfs/disk-io.c | 2 +- + fs/btrfs/extent_io.c | 6 +- + fs/btrfs/raid56.c | 8 +- + fs/btrfs/scrub.c | 12 +- + fs/btrfs/volumes.c | 2 +- + fs/buffer.c | 4 +- + fs/crypto/bio.c | 2 +- + fs/direct-io.c | 8 +- + fs/exofs/ore.c | 2 +- + fs/ext4/page-io.c | 4 +- + fs/ext4/readpage.c | 2 +- + fs/f2fs/data.c | 5 +- + fs/f2fs/segment.c | 2 +- + fs/gfs2/lops.c | 2 +- + fs/gfs2/meta_io.c | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/hfsplus/wrapper.c | 2 +- + fs/iomap.c | 4 +- + fs/jfs/jfs_logmgr.c | 4 +- + fs/jfs/jfs_metapage.c | 4 +- + fs/kernfs/dir.c | 111 +- + fs/kernfs/file.c | 10 +- + fs/kernfs/inode.c | 9 +- + fs/kernfs/kernfs-internal.h | 9 + + fs/kernfs/mount.c | 94 +- + fs/kernfs/symlink.c | 6 +- + fs/mpage.c | 2 +- + fs/nfs/blocklayout/blocklayout.c | 2 +- + fs/nilfs2/segbuf.c | 2 +- + fs/ocfs2/cluster/heartbeat.c | 2 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_buf.c | 2 +- + include/linux/bio.h | 27 +- + include/linux/blk-cgroup.h | 3 + + include/linux/blk-mq.h | 5 +- + include/linux/blk_types.h | 3 +- + include/linux/blkdev.h | 60 +- + include/linux/blktrace_api.h | 13 +- + include/linux/cgroup.h | 16 +- + include/linux/fs.h | 1 + + include/linux/genhd.h | 26 +- + include/linux/kernfs.h | 28 +- + include/trace/events/bcache.h | 6 +- + include/trace/events/block.h | 16 +- + include/trace/events/f2fs.h | 2 +- + include/trace/events/writeback.h | 2 +- + include/uapi/linux/blktrace_api.h | 3 + + kernel/cgroup/cgroup.c | 15 +- + kernel/power/swap.c | 5 +- + kernel/trace/blktrace.c | 261 ++- + mm/page_io.c | 17 +- + 147 files changed, 3314 insertions(+), 3307 deletions(-) +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 (2298b6212f1c dm ioctl: constify ioctl lookup table) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm-verity-target.c +Auto-merging drivers/md/dm-thin.c +Auto-merging drivers/md/dm-switch.c +Auto-merging drivers/md/dm-mpath.c +Auto-merging drivers/md/dm-integrity.c +Auto-merging drivers/md/dm-flakey.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/md/dm-cache-target.c +Auto-merging drivers/md/dm-bufio.c +Merge made by the 'recursive' strategy. + drivers/md/dm-bufio.c | 95 ++++++++++++++++++++++++++++++------------- + drivers/md/dm-bufio.h | 9 ++++ + drivers/md/dm-cache-target.c | 4 +- + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-flakey.c | 4 +- + drivers/md/dm-integrity.c | 14 +++++-- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-mpath.c | 10 ++--- + drivers/md/dm-switch.c | 2 +- + drivers/md/dm-table.c | 7 ++-- + drivers/md/dm-thin.c | 2 +- + drivers/md/dm-verity-target.c | 2 +- + include/linux/device-mapper.h | 4 +- + 13 files changed, 106 insertions(+), 51 deletions(-) +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/next (93cbcc68719b mmc: meson-gx: clean up some constants) +$ git merge mmc/next +Auto-merging include/linux/mfd/tmio.h +Auto-merging drivers/clk/sunxi-ng/Makefile +Auto-merging arch/arc/boot/dts/axs10x_mb.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/renesas,mmcif.txt | 4 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 1 + + .../devicetree/bindings/mmc/sunxi-mmc.txt | 1 + + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 8 +- + arch/arc/boot/dts/axs10x_mb.dtsi | 1 - + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 1 - + drivers/clk/sunxi-ng/Makefile | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 10 +- + drivers/clk/sunxi-ng/ccu_common.h | 4 + + drivers/clk/sunxi-ng/ccu_mmc_timing.c | 70 +++++ + drivers/clk/sunxi-ng/ccu_mp.c | 80 ++++++ + drivers/clk/sunxi-ng/ccu_mp.h | 30 +++ + drivers/mmc/Kconfig | 7 - + drivers/mmc/Makefile | 2 - + drivers/mmc/core/block.c | 257 ++++++++++++++---- + drivers/mmc/core/core.c | 68 ++--- + drivers/mmc/core/debugfs.c | 89 ------ + drivers/mmc/core/host.c | 6 + + drivers/mmc/core/host.h | 1 + + drivers/mmc/core/mmc.c | 31 +-- + drivers/mmc/core/mmc_ops.c | 3 +- + drivers/mmc/core/mmc_test.c | 97 +++---- + drivers/mmc/core/queue.h | 6 +- + drivers/mmc/core/sd.c | 12 +- + drivers/mmc/host/Kconfig | 32 ++- + drivers/mmc/host/Makefile | 8 +- + drivers/mmc/host/android-goldfish.c | 8 +- + drivers/mmc/host/atmel-mci.c | 10 +- + drivers/mmc/host/bcm2835.c | 2 +- + drivers/mmc/host/cavium-octeon.c | 13 +- + drivers/mmc/host/cavium.c | 6 +- + drivers/mmc/host/davinci_mmc.c | 2 +- + drivers/mmc/host/dw_mmc-k3.c | 298 +++++++++++++++++++++ + drivers/mmc/host/dw_mmc.c | 62 ++++- + drivers/mmc/host/dw_mmc.h | 4 + + drivers/mmc/host/meson-gx-mmc.c | 8 +- + drivers/mmc/host/moxart-mmc.c | 2 +- + drivers/mmc/host/mtk-sd.c | 3 +- + drivers/mmc/host/mxcmmc.c | 34 ++- + drivers/mmc/host/of_mmc_spi.c | 2 +- + drivers/mmc/host/omap_hsmmc.c | 8 +- + drivers/mmc/host/renesas_sdhi.h | 2 + + drivers/mmc/host/renesas_sdhi_core.c | 31 ++- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 287 ++++++++++++++++++++ + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 32 ++- + drivers/mmc/host/rtsx_usb_sdmmc.c | 2 +- + drivers/mmc/host/s3cmci.c | 2 +- + drivers/mmc/host/sdhci-acpi.c | 7 +- + drivers/mmc/host/sdhci-bcm-kona.c | 4 +- + drivers/mmc/host/sdhci-brcmstb.c | 2 +- + drivers/mmc/host/sdhci-esdhc.h | 3 + + drivers/mmc/host/sdhci-msm.c | 5 +- + drivers/mmc/host/sdhci-of-arasan.c | 8 +- + drivers/mmc/host/sdhci-of-at91.c | 177 +++++++----- + drivers/mmc/host/sdhci-of-esdhc.c | 23 +- + drivers/mmc/host/sdhci-pci-core.c | 50 ++-- + drivers/mmc/host/sdhci-pic32.c | 2 +- + drivers/mmc/host/sdhci-pxav3.c | 2 +- + drivers/mmc/host/sdhci-s3c.c | 34 +-- + drivers/mmc/host/sdhci-sirf.c | 4 +- + drivers/mmc/host/sdhci-st.c | 28 +- + drivers/mmc/host/sdhci-tegra.c | 26 +- + drivers/mmc/host/sdhci-xenon.c | 47 +++- + drivers/mmc/host/sdhci.c | 63 ++--- + drivers/mmc/host/sdhci.h | 3 + + drivers/mmc/host/sdricoh_cs.c | 2 +- + drivers/mmc/host/sh_mmcif.c | 2 +- + drivers/mmc/host/sunxi-mmc.c | 93 ++++++- + drivers/mmc/host/tmio_mmc.h | 9 +- + drivers/mmc/host/tmio_mmc_core.c | 32 ++- + drivers/mmc/host/toshsd.c | 2 +- + drivers/mmc/host/usdhi6rol0.c | 2 +- + drivers/mmc/host/via-sdmmc.c | 2 +- + drivers/mmc/host/vub300.c | 4 +- + drivers/mmc/host/wbsd.c | 2 - + drivers/mmc/host/wmt-sdmmc.c | 8 +- + include/linux/clk/sunxi-ng.h | 35 +++ + include/linux/mfd/tmio.h | 5 + + include/linux/mmc/card.h | 4 +- + include/linux/mmc/core.h | 13 +- + include/linux/mmc/host.h | 66 ++++- + include/trace/events/mmc.h | 36 ++- + 82 files changed, 1807 insertions(+), 646 deletions(-) + create mode 100644 drivers/clk/sunxi-ng/ccu_mmc_timing.c + create mode 100644 drivers/mmc/host/renesas_sdhi_internal_dmac.c + create mode 100644 include/linux/clk/sunxi-ng.h +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 (8a8e6f84ad10 md/raid0: attach correct cgroup info in bio) +$ git merge md/for-next +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid5-cache.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/raid0.c +Auto-merging drivers/md/md.c +Auto-merging block/bio.c +Merge made by the 'recursive' strategy. + block/bio.c | 2 +- + drivers/md/bitmap.c | 4 ++-- + drivers/md/md.c | 4 +++- + drivers/md/raid0.c | 1 + + drivers/md/raid1.c | 19 ++++++++++++++++++- + drivers/md/raid10.c | 35 ++++++++++++++++++++++++++++++++--- + drivers/md/raid5-cache.c | 12 ++++++++++-- + drivers/md/raid5.c | 15 +++++---------- + lib/raid6/avx512.c | 2 +- + 9 files changed, 73 insertions(+), 21 deletions(-) +Merging mfd/for-mfd-next (f7e889c747eb mfd: Add ROHM BD9571MWV-M PMIC DT bindings) +$ git merge mfd/for-mfd-next +Auto-merging drivers/mtd/nand/atmel/nand-controller.c +Auto-merging drivers/mfd/atmel-smc.c +Auto-merging drivers/memory/atmel-ebi.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/atmel-smc.txt | 1 + + Documentation/devicetree/bindings/mfd/axp20x.txt | 50 ++++- + .../devicetree/bindings/mfd/bd9571mwv.txt | 49 +++++ + .../devicetree/bindings/mfd/da9052-i2c.txt | 8 + + MAINTAINERS | 11 + + drivers/memory/atmel-ebi.c | 13 +- + drivers/mfd/Kconfig | 35 +++- + drivers/mfd/Makefile | 2 + + drivers/mfd/ab8500-core.c | 6 +- + drivers/mfd/atmel-smc.c | 67 ++++-- + drivers/mfd/axp20x-rsb.c | 1 + + drivers/mfd/axp20x.c | 32 ++- + drivers/mfd/bd9571mwv.c | 230 +++++++++++++++++++++ + drivers/mfd/da9052-core.c | 2 + + drivers/mfd/hi6421-pmic-core.c | 89 +++++--- + drivers/mfd/lp87565.c | 7 +- + drivers/mfd/lpc_ich.c | 10 - + drivers/mfd/max8925-i2c.c | 2 +- + drivers/mfd/max8998.c | 6 +- + drivers/mfd/rtsx_pcr.c | 4 +- + drivers/mfd/tps68470.c | 106 ++++++++++ + drivers/mfd/twl-core.c | 4 +- + drivers/mtd/nand/atmel/nand-controller.c | 10 +- + include/linux/mfd/axp20x.h | 29 +++ + include/linux/mfd/bd9571mwv.h | 115 +++++++++++ + include/linux/mfd/hi6421-pmic.h | 5 + + include/linux/mfd/syscon/atmel-smc.h | 32 ++- + include/linux/mfd/tps68470.h | 97 +++++++++ + 28 files changed, 924 insertions(+), 99 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/bd9571mwv.txt + create mode 100644 drivers/mfd/bd9571mwv.c + create mode 100644 drivers/mfd/tps68470.c + create mode 100644 include/linux/mfd/bd9571mwv.h + create mode 100644 include/linux/mfd/tps68470.h +Merging backlight/for-backlight-next (2606706e4d7b backlight: gpio_backlight: Delete pdata inversion) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/gpio_backlight.c | 62 +++++++++++++++------------- + drivers/video/backlight/lm3630a_bl.c | 5 ++- + drivers/video/backlight/pwm_bl.c | 2 +- + include/linux/platform_data/gpio_backlight.h | 1 - + 4 files changed, 37 insertions(+), 33 deletions(-) +Merging battery/for-next (810e006a82c9 power: supply: lp8788: Make several arrays static const * const) +$ git merge battery/for-next +Removing drivers/w1/slaves/w1_bq27000.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/supply/ltc2941.txt | 15 +- + drivers/power/reset/at91-sama5d2_shdwc.c | 4 +- + drivers/power/supply/Kconfig | 23 ++ + drivers/power/supply/Makefile | 2 + + drivers/power/supply/act8945a_charger.c | 4 +- + drivers/power/supply/bq27xxx_battery.c | 104 ----- + drivers/power/supply/bq27xxx_battery_hdq.c | 135 +++++++ + drivers/power/supply/charger-manager.c | 9 +- + drivers/power/supply/ds2780_battery.c | 4 +- + drivers/power/supply/ds2781_battery.c | 4 +- + drivers/power/supply/lp8788-charger.c | 18 +- + drivers/power/supply/ltc2941-battery-gauge.c | 156 +++++-- + drivers/power/supply/max1721x_battery.c | 448 +++++++++++++++++++++ + drivers/power/supply/olpc_battery.c | 2 +- + drivers/power/supply/pcf50633-charger.c | 2 +- + drivers/power/supply/power_supply_core.c | 5 +- + drivers/power/supply/sbs-battery.c | 26 +- + drivers/w1/slaves/Kconfig | 6 - + drivers/w1/slaves/Makefile | 1 - + drivers/w1/slaves/w1_bq27000.c | 117 ------ + include/linux/power/bq27xxx_battery.h | 17 - + 21 files changed, 771 insertions(+), 331 deletions(-) + create mode 100644 drivers/power/supply/bq27xxx_battery_hdq.c + create mode 100644 drivers/power/supply/max1721x_battery.c + delete mode 100644 drivers/w1/slaves/w1_bq27000.c +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 (90607532ac04 Merge remote-tracking branches 'regulator/topic/mtk', 'regulator/topic/pwm', 'regulator/topic/qcom' and 'regulator/topic/rc5t619' into regulator-next) +$ git merge regulator/for-next +Auto-merging drivers/regulator/of_regulator.c +Merge made by the 'recursive' strategy. + .../bindings/regulator/mt6311-regulator.txt | 2 +- + .../bindings/regulator/mt6323-regulator.txt | 2 +- + .../bindings/regulator/mt6380-regulator.txt | 89 ++++++ + .../bindings/regulator/mt6397-regulator.txt | 2 +- + .../bindings/regulator/pwm-regulator.txt | 2 +- + drivers/regulator/Kconfig | 13 +- + drivers/regulator/Makefile | 1 + + drivers/regulator/axp20x-regulator.c | 6 + + drivers/regulator/core.c | 16 +- + drivers/regulator/cpcap-regulator.c | 21 +- + drivers/regulator/fan53555.c | 15 +- + drivers/regulator/ltc3589.c | 2 +- + drivers/regulator/max1586.c | 2 +- + drivers/regulator/mt6380-regulator.c | 352 +++++++++++++++++++++ + drivers/regulator/of_regulator.c | 2 +- + drivers/regulator/pwm-regulator.c | 6 +- + drivers/regulator/qcom_rpm-regulator.c | 5 + + drivers/regulator/qcom_smd-regulator.c | 5 + + drivers/regulator/rn5t618-regulator.c | 35 +- + drivers/regulator/s5m8767.c | 4 +- + drivers/reset/reset-socfpga.c | 4 +- + include/linux/mfd/rn5t618.h | 6 + + include/linux/regulator/mt6380-regulator.h | 32 ++ + 23 files changed, 587 insertions(+), 37 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/mt6380-regulator.txt + create mode 100644 drivers/regulator/mt6380-regulator.c + create mode 100644 include/linux/regulator/mt6380-regulator.h +Merging security/next (b6fd397b9008 apparmor: fix build failure on sparc caused by undeclared, signals) +$ git merge security/next +Auto-merging mm/shmem.c +Auto-merging kernel/fork.c +Auto-merging include/linux/fs.h +Auto-merging fs/ubifs/file.c +Auto-merging fs/jfs/file.c +Auto-merging fs/jffs2/file.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/ext4/file.c +Auto-merging fs/btrfs/file.c +Auto-merging MAINTAINERS +Auto-merging Documentation/networking/filter.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/ima_policy | 3 +- + Documentation/admin-guide/LSM/tomoyo.rst | 24 +- + Documentation/admin-guide/kernel-parameters.txt | 8 +- + .../devicetree/bindings/security/tpm/tpm-i2c.txt | 6 + + Documentation/networking/filter.txt | 2 +- + Documentation/sysctl/kernel.txt | 1 + + Documentation/userspace-api/seccomp_filter.rst | 52 +- + MAINTAINERS | 24 +- + drivers/char/tpm/tpm-interface.c | 10 +- + drivers/char/tpm/tpm.h | 9 +- + drivers/char/tpm/tpm2-cmd.c | 2 +- + drivers/char/tpm/tpm_crb.c | 2 +- + drivers/char/tpm/tpm_ibmvtpm.c | 98 +-- + drivers/char/tpm/tpm_infineon.c | 6 +- + drivers/char/tpm/tpm_tis_core.c | 8 +- + fs/btrfs/file.c | 1 + + fs/efivarfs/file.c | 12 +- + fs/ext2/file.c | 17 + + fs/ext4/file.c | 20 + + fs/f2fs/file.c | 1 + + fs/jffs2/file.c | 1 + + fs/jfs/file.c | 1 + + fs/libfs.c | 32 + + fs/nilfs2/file.c | 1 + + fs/ramfs/file-mmu.c | 1 + + fs/ramfs/file-nommu.c | 1 + + fs/ubifs/file.c | 1 + + fs/xfs/xfs_file.c | 21 + + include/linux/audit.h | 6 +- + include/linux/fs.h | 3 + + include/linux/lsm_hooks.h | 7 - + include/linux/seccomp.h | 3 +- + include/linux/security.h | 6 - + include/uapi/linux/seccomp.h | 23 +- + kernel/fork.c | 4 - + kernel/seccomp.c | 321 +++++++++- + mm/shmem.c | 1 + + security/apparmor/.gitignore | 1 + + security/apparmor/Makefile | 43 +- + security/apparmor/apparmorfs.c | 37 +- + security/apparmor/domain.c | 4 +- + security/apparmor/file.c | 30 + + security/apparmor/include/apparmor.h | 2 + + security/apparmor/include/audit.h | 39 +- + security/apparmor/include/domain.h | 5 + + security/apparmor/include/ipc.h | 6 + + security/apparmor/include/label.h | 1 + + security/apparmor/include/mount.h | 54 ++ + security/apparmor/include/net.h | 114 ++++ + security/apparmor/include/perms.h | 5 +- + security/apparmor/include/policy.h | 13 + + security/apparmor/include/sig_names.h | 98 +++ + security/apparmor/ipc.c | 99 +++ + security/apparmor/label.c | 36 +- + security/apparmor/lib.c | 5 +- + security/apparmor/lsm.c | 472 ++++++++++++++ + security/apparmor/mount.c | 696 +++++++++++++++++++++ + security/apparmor/net.c | 184 ++++++ + security/apparmor/policy.c | 166 ++--- + security/apparmor/policy_ns.c | 2 + + security/apparmor/policy_unpack.c | 105 +++- + security/commoncap.c | 6 +- + security/integrity/iint.c | 20 +- + security/integrity/ima/ima.h | 1 + + security/integrity/ima/ima_api.c | 67 +- + security/integrity/ima/ima_crypto.c | 10 + + security/integrity/ima/ima_fs.c | 4 +- + security/integrity/ima/ima_main.c | 19 +- + security/integrity/ima/ima_policy.c | 41 +- + security/security.c | 5 - + tools/testing/selftests/seccomp/Makefile | 18 +- + .../testing/selftests/seccomp/seccomp_benchmark.c | 99 +++ + tools/testing/selftests/seccomp/seccomp_bpf.c | 610 +++++++++++++++--- + 73 files changed, 3448 insertions(+), 408 deletions(-) + create mode 100644 security/apparmor/include/mount.h + create mode 100644 security/apparmor/include/net.h + create mode 100644 security/apparmor/include/sig_names.h + create mode 100644 security/apparmor/mount.c + create mode 100644 security/apparmor/net.c + create mode 100644 tools/testing/selftests/seccomp/seccomp_benchmark.c +Merging integrity/next (ed301d2614d2 ima: define "fs_unsafe" builtin policy) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (8ab2a6905b28 KEYS: Add documentation for asymmetric keyring restrictions) +$ git merge keys/keys-next +Merge made by the 'recursive' strategy. +Merging selinux/next (901ef845fa24 selinux: allow per-file labeling for cgroupfs) +$ git merge selinux/next +Auto-merging security/selinux/hooks.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 8 ++--- + MAINTAINERS | 5 +-- + include/linux/lsm_audit.h | 2 +- + scripts/selinux/genheaders/genheaders.c | 7 ++++- + security/lsm_audit.c | 2 +- + security/selinux/avc.c | 16 +++++----- + security/selinux/hooks.c | 54 ++++++++++++++++++++++----------- + security/selinux/include/avc.h | 2 +- + security/selinux/include/avc_ss.h | 2 +- + security/selinux/include/classmap.h | 2 ++ + security/selinux/include/objsec.h | 2 +- + security/selinux/include/security.h | 4 ++- + security/selinux/ss/avtab.c | 2 +- + security/selinux/ss/avtab.h | 2 +- + security/selinux/ss/constraint.h | 2 +- + security/selinux/ss/context.h | 2 +- + security/selinux/ss/ebitmap.c | 2 +- + security/selinux/ss/ebitmap.h | 2 +- + security/selinux/ss/hashtab.c | 2 +- + security/selinux/ss/hashtab.h | 2 +- + security/selinux/ss/mls.c | 2 +- + security/selinux/ss/mls.h | 2 +- + security/selinux/ss/mls_types.h | 2 +- + security/selinux/ss/policydb.c | 2 +- + security/selinux/ss/policydb.h | 2 +- + security/selinux/ss/services.c | 9 ++++-- + security/selinux/ss/services.h | 2 +- + security/selinux/ss/sidtab.c | 2 +- + security/selinux/ss/sidtab.h | 2 +- + security/selinux/ss/symtab.c | 2 +- + security/selinux/ss/symtab.h | 2 +- + 31 files changed, 91 insertions(+), 60 deletions(-) +Merging tpmdd/next (05e79b68dfac tpm: migrate pubek_show to struct tpm_buf) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-sysfs.c | 87 ++++++++++++++++++++++++-------------------- + drivers/char/tpm/tpm.h | 13 ------- + 2 files changed, 48 insertions(+), 52 deletions(-) +Merging watchdog/master (c013b65ad8a1 watchdog: introduce watchdog_worker_should_ping helper) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (b2f34dad02c7 Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/rockchip', 'arm/omap', 'arm/mediatek', 'arm/tegra', 'arm/qcom', 'arm/smmu', 'ppc/pamu', 'x86/vt-d', 'x86/amd', 's390' and 'core' into next) +$ git merge iommu/next +Auto-merging arch/s390/pci/pci.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/iommu/qcom,iommu.txt | 121 +++ + .../devicetree/bindings/iommu/rockchip,iommu.txt | 5 + + .../memory-controllers/mediatek,smi-larb.txt | 15 + + MAINTAINERS | 7 + + arch/s390/include/asm/pci.h | 7 + + arch/s390/pci/pci.c | 9 +- + drivers/iommu/Kconfig | 13 + + drivers/iommu/Makefile | 1 + + drivers/iommu/amd_iommu.c | 294 +------ + drivers/iommu/amd_iommu_init.c | 223 ++++- + drivers/iommu/amd_iommu_proto.h | 2 + + drivers/iommu/amd_iommu_types.h | 59 +- + drivers/iommu/amd_iommu_v2.c | 18 +- + drivers/iommu/arm-smmu-regs.h | 220 +++++ + drivers/iommu/arm-smmu-v3.c | 7 + + drivers/iommu/arm-smmu.c | 384 +++------ + drivers/iommu/dmar.c | 2 +- + drivers/iommu/exynos-iommu.c | 40 +- + drivers/iommu/fsl_pamu.c | 44 +- + drivers/iommu/fsl_pamu.h | 3 + + drivers/iommu/fsl_pamu_domain.c | 15 +- + drivers/iommu/fsl_pamu_domain.h | 2 + + drivers/iommu/intel-iommu.c | 239 ++---- + drivers/iommu/iommu-sysfs.c | 32 +- + drivers/iommu/iommu.c | 27 +- + drivers/iommu/iova.c | 183 ++++ + drivers/iommu/ipmmu-vmsa.c | 192 +---- + drivers/iommu/msm_iommu.c | 15 +- + drivers/iommu/of_iommu.c | 144 ++-- + drivers/iommu/omap-iommu.c | 125 ++- + drivers/iommu/omap-iommu.h | 1 + + drivers/iommu/qcom_iommu.c | 932 +++++++++++++++++++++ + drivers/iommu/rockchip-iommu.c | 52 +- + drivers/iommu/s390-iommu.c | 35 + + drivers/iommu/tegra-gart.c | 45 + + drivers/iommu/tegra-smmu.c | 34 + + drivers/memory/mtk-smi.c | 31 +- + include/linux/iommu.h | 17 +- + include/linux/iova.h | 67 ++ + 39 files changed, 2564 insertions(+), 1098 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/qcom,iommu.txt + create mode 100644 drivers/iommu/arm-smmu-regs.h + create mode 100644 drivers/iommu/qcom_iommu.c +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (f203f7f1dbb2 vfio/type1: Give hardware MSI regions precedence) +$ git merge vfio/next +Merge made by the 'recursive' strategy. + drivers/vfio/vfio_iommu_type1.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) +Merging trivial/for-next (6fbc8798d946 tty: fix comment for __tty_alloc_driver()) +$ git merge trivial/for-next +Already up-to-date. +Merging audit/next (4070ad3e8ffa audit: update the function comments) +$ git merge audit/next +Auto-merging security/selinux/avc.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 7 ++++--- + kernel/audit.c | 4 ++-- + kernel/auditsc.c | 20 ++++++++++---------- + security/selinux/avc.c | 2 -- + 4 files changed, 16 insertions(+), 17 deletions(-) +Merging devicetree/for-next (6d7e3bf8d12c of: Use PLATFORM_DEVID_NONE definition) +$ git merge devicetree/for-next +Auto-merging drivers/of/property.c +Auto-merging drivers/of/of_mdio.c +Auto-merging drivers/of/irq.c +Auto-merging drivers/of/device.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/chosen.txt | 26 +++- + .../devicetree/bindings/clock/silabs,si5351.txt | 6 +- + .../devicetree/bindings/clock/ti,sci-clk.txt | 7 +- + .../bindings/display/imx/fsl-imx-drm.txt | 2 +- + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 5 + + .../devicetree/bindings/input/ti,drv260x.txt | 2 +- + .../devicetree/bindings/nvmem/mtk-efuse.txt | 5 +- + Documentation/devicetree/bindings/pci/pci.txt | 4 +- + .../devicetree/bindings/trivial-devices.txt | 14 ++ + .../devicetree/bindings/usb/usb-device.txt | 2 +- + .../devicetree/bindings/vendor-prefixes.txt | 4 +- + Documentation/devicetree/booting-without-of.txt | 2 +- + drivers/of/address.c | 24 ++-- + drivers/of/base.c | 46 +++---- + drivers/of/device.c | 75 +++++------ + drivers/of/dynamic.c | 33 +++-- + drivers/of/irq.c | 77 +++++------ + drivers/of/of_mdio.c | 4 +- + drivers/of/of_pci.c | 72 +++++------ + drivers/of/overlay.c | 142 ++++++++++++++++++--- + drivers/of/platform.c | 34 ++--- + drivers/of/property.c | 23 ++-- + drivers/of/unittest-data/Makefile | 19 ++- + drivers/of/unittest-data/overlay.dts | 25 +++- + drivers/of/unittest-data/overlay_bad_symbol.dts | 22 ++++ + drivers/of/unittest-data/overlay_base.dts | 11 ++ + drivers/of/unittest.c | 77 ++++++----- + include/linux/of_device.h | 2 +- + scripts/Makefile.lib | 8 +- + 29 files changed, 484 insertions(+), 289 deletions(-) + create mode 100644 drivers/of/unittest-data/overlay_bad_symbol.dts +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 (8273871c2979 Merge remote-tracking branches 'spi/topic/stm32', 'spi/topic/sunxi', 'spi/topic/tegra', 'spi/topic/tools' and 'spi/topic/xlp' into spi-next) +$ git merge spi/for-next +Resolved 'drivers/spi/spi.c' using previous resolution. +Auto-merging drivers/spi/spi.c +CONFLICT (content): Merge conflict in drivers/spi/spi.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bf85e2dbc1b0] Merge remote-tracking branch 'spi/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/spi/fsl-imx-cspi.txt | 1 + + Documentation/devicetree/bindings/spi/sh-msiof.txt | 1 + + .../devicetree/bindings/spi/spi-rockchip.txt | 1 + + drivers/spi/Kconfig | 5 +- + drivers/spi/spi-altera.c | 163 +++--- + drivers/spi/spi-ath79.c | 13 +- + drivers/spi/spi-bcm-qspi.c | 89 ++-- + drivers/spi/spi-bcm63xx-hsspi.c | 10 +- + drivers/spi/spi-bcm63xx.c | 4 +- + drivers/spi/spi-cadence.c | 4 +- + drivers/spi/spi-ep93xx.c | 501 +++++++----------- + drivers/spi/spi-imx.c | 210 +++++++- + drivers/spi/spi-loopback-test.c | 34 +- + drivers/spi/spi-omap2-mcspi.c | 4 - + drivers/spi/spi-orion.c | 4 +- + drivers/spi/spi-pic32.c | 4 +- + drivers/spi/spi-pl022.c | 2 +- + drivers/spi/spi-pxa2xx.c | 35 +- + drivers/spi/spi-pxa2xx.h | 2 +- + drivers/spi/spi-qup.c | 564 ++++++++++++++------- + drivers/spi/spi-rockchip.c | 60 +-- + drivers/spi/spi-sh-msiof.c | 32 +- + drivers/spi/spi-sh.c | 4 +- + drivers/spi/spi-stm32.c | 2 +- + drivers/spi/spi-sun6i.c | 2 +- + drivers/spi/spi-tegra114.c | 2 +- + drivers/spi/spi-tegra20-sflash.c | 2 +- + drivers/spi/spi-tegra20-slink.c | 2 +- + drivers/spi/spi-xlp.c | 4 +- + drivers/spi/spi.c | 110 ++-- + tools/Makefile | 4 +- + tools/spi/Build | 2 + + tools/spi/Makefile | 64 ++- + 33 files changed, 1122 insertions(+), 819 deletions(-) + create mode 100644 tools/spi/Build +Merging tip/auto-latest (84472d8795bf Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Resolved 'drivers/firmware/efi/libstub/arm64-stub.c' using previous resolution. +Resolved 'drivers/iommu/amd_iommu.c' using previous resolution. +Resolved 'drivers/iommu/amd_iommu_init.c' using previous resolution. +Resolved 'drivers/iommu/amd_iommu_proto.h' using previous resolution. +Resolved 'drivers/iommu/amd_iommu_types.h' using previous resolution. +Resolved 'drivers/video/fbdev/core/fbmem.c' using previous resolution. +Resolved 'kernel/sched/fair.c' using previous resolution. +Resolved 'mm/page_alloc.c' using previous resolution. +Recorded preimage for 'tools/Makefile' +Removing tools/testing/selftests/rcutorture/configs/rcu/SRCU-C.boot +Auto-merging tools/perf/tests/attr/test-record-no-buffering +Auto-merging tools/perf/scripts/python/call-graph-from-sql.py +Auto-merging tools/lib/bpf/Makefile +Removing tools/lguest/lguest.txt +Removing tools/lguest/lguest.c +Removing tools/lguest/extract +Removing tools/lguest/Makefile +Removing tools/lguest/.gitignore +Auto-merging tools/include/uapi/linux/bpf.h +Auto-merging tools/Makefile +CONFLICT (content): Merge conflict in tools/Makefile +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/ipv6/udp.c +Auto-merging net/ipv4/udp.c +Auto-merging mm/page_alloc.c +CONFLICT (content): Merge conflict in mm/page_alloc.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/fair.c +CONFLICT (content): Merge conflict in kernel/sched/fair.c +Auto-merging kernel/sched/deadline.c +Removing kernel/rcu/tiny_plugin.h +Removing kernel/membarrier.c +Auto-merging kernel/irq/irqdomain.c +Auto-merging kernel/fork.c +Auto-merging kernel/events/core.c +Auto-merging include/linux/syscalls.h +Removing include/linux/lguest_launcher.h +Removing include/linux/lguest.h +Auto-merging include/linux/irqdomain.h +Auto-merging include/linux/hyperv.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging fs/overlayfs/readdir.c +Auto-merging drivers/video/fbdev/core/fbmem.c +CONFLICT (content): Merge conflict in drivers/video/fbdev/core/fbmem.c +Auto-merging drivers/pci/host/pci-hyperv.c +Removing drivers/lguest/x86/switcher_32.S +Removing drivers/lguest/x86/core.c +Removing drivers/lguest/segments.c +Removing drivers/lguest/page_tables.c +Removing drivers/lguest/lguest_user.c +Removing drivers/lguest/lg.h +Removing drivers/lguest/interrupts_and_traps.c +Removing drivers/lguest/hypercalls.c +Removing drivers/lguest/core.c +Removing drivers/lguest/README +Removing drivers/lguest/Makefile +Removing drivers/lguest/Kconfig +Auto-merging drivers/iommu/amd_iommu_types.h +CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu_types.h +Auto-merging drivers/iommu/amd_iommu_proto.h +CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu_proto.h +Auto-merging drivers/iommu/amd_iommu_init.c +CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu_init.c +Auto-merging drivers/iommu/amd_iommu.c +CONFLICT (content): Merge conflict in drivers/iommu/amd_iommu.c +Auto-merging drivers/idle/intel_idle.c +Auto-merging drivers/gpu/drm/udl/udl_fb.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/drm_vm.c +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/firmware/efi/libstub/arm64-stub.c +CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/arm64-stub.c +Auto-merging drivers/block/Kconfig +Auto-merging drivers/acpi/processor_idle.c +Removing arch/x86/xen/xen-asm.h +Removing arch/x86/lguest/head_32.S +Removing arch/x86/lguest/boot.c +Removing arch/x86/lguest/Makefile +Removing arch/x86/lguest/Kconfig +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c +Auto-merging arch/x86/kernel/acpi/boot.c +Removing arch/x86/include/asm/lguest_hcall.h +Removing arch/x86/include/asm/lguest.h +Auto-merging arch/x86/include/asm/kvm_host.h +Removing arch/x86/include/asm/intel_rdt_common.h +Removing arch/x86/include/asm/intel_rdt.h +Removing arch/x86/events/intel/cqm.c +Auto-merging arch/sh/include/asm/futex.h +Auto-merging arch/s390/include/asm/spinlock.h +Auto-merging arch/arm64/kernel/signal.c +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/include/asm/uaccess.h +Auto-merging arch/arm64/include/asm/traps.h +Auto-merging arch/arm64/include/asm/thread_info.h +Auto-merging arch/arm64/include/asm/efi.h +Auto-merging arch/arm/kernel/entry-common.S +Auto-merging arch/arc/include/asm/spinlock.h +Auto-merging MAINTAINERS +Removing Documentation/x86/early-microcode.txt +Auto-merging Documentation/sysctl/kernel.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'tools/Makefile'. +[master a94c8bae92b9] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .../RCU/Design/Requirements/Requirements.html | 130 + + 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.rst | 1 + + Documentation/admin-guide/kernel-parameters.txt | 26 +- + Documentation/atomic_bitops.txt | 66 + + Documentation/atomic_t.txt | 242 ++ + Documentation/core-api/kernel-api.rst | 49 + + Documentation/driver-model/devres.txt | 1 + + Documentation/locking/crossrelease.txt | 874 +++++ + Documentation/memory-barriers.txt | 142 +- + Documentation/static-keys.txt | 20 + + Documentation/sysctl/kernel.txt | 13 +- + .../translations/ko_KR/memory-barriers.txt | 5 +- + Documentation/x86/amd-memory-encryption.txt | 68 + + Documentation/x86/early-microcode.txt | 70 - + Documentation/x86/intel_rdt_ui.txt | 323 +- + Documentation/x86/microcode.txt | 137 + + Documentation/x86/orc-unwinder.txt | 179 + + Documentation/x86/protection-keys.txt | 6 +- + Documentation/x86/x86_64/5level-paging.txt | 64 + + MAINTAINERS | 16 +- + arch/Kconfig | 12 + + arch/alpha/include/asm/futex.h | 26 +- + arch/alpha/include/asm/spinlock.h | 5 - + arch/arc/include/asm/atomic.h | 2 + + arch/arc/include/asm/futex.h | 40 +- + arch/arc/include/asm/spinlock.h | 5 - + arch/arm/boot/compressed/efi-header.S | 160 +- + arch/arm/boot/compressed/vmlinux.lds.S | 30 +- + arch/arm/include/asm/futex.h | 26 +- + arch/arm/include/asm/spinlock.h | 16 - + arch/arm/include/asm/thread_info.h | 15 +- + arch/arm/include/asm/traps.h | 7 - + arch/arm/include/asm/uaccess.h | 2 + + arch/arm/kernel/entry-common.S | 9 +- + arch/arm/kernel/signal.c | 5 + + arch/arm/mach-hisi/Kconfig | 1 + + arch/arm64/include/asm/efi.h | 3 + + arch/arm64/include/asm/futex.h | 26 +- + arch/arm64/include/asm/spinlock.h | 69 +- + arch/arm64/include/asm/thread_info.h | 4 +- + arch/arm64/include/asm/traps.h | 7 - + arch/arm64/include/asm/uaccess.h | 3 + + arch/arm64/kernel/process.c | 2 + + arch/arm64/kernel/signal.c | 5 + + arch/blackfin/include/asm/spinlock.h | 5 - + arch/blackfin/kernel/module.c | 39 +- + arch/cris/arch-v32/mach-a3/arbiter.c | 4 +- + arch/cris/arch-v32/mach-fs/arbiter.c | 4 +- + arch/cris/kernel/traps.c | 6 +- + arch/frv/include/asm/futex.h | 3 +- + arch/frv/kernel/futex.c | 27 +- + arch/h8300/include/asm/traps.h | 6 +- + arch/hexagon/include/asm/atomic.h | 2 + + arch/hexagon/include/asm/futex.h | 38 +- + arch/hexagon/include/asm/spinlock.h | 5 - + arch/ia64/include/asm/acpi.h | 2 - + arch/ia64/include/asm/futex.h | 25 +- + arch/ia64/include/asm/spinlock.h | 21 - + arch/ia64/kernel/efi.c | 4 +- + arch/m32r/include/asm/spinlock.h | 5 - + arch/metag/Kconfig | 1 + + arch/metag/include/asm/atomic_lock1.h | 2 + + arch/metag/include/asm/spinlock.h | 5 - + arch/microblaze/include/asm/futex.h | 38 +- + arch/mips/include/asm/futex.h | 25 +- + arch/mn10300/include/asm/spinlock.h | 5 - + arch/openrisc/include/asm/futex.h | 39 +- + arch/parisc/include/asm/atomic.h | 2 + + arch/parisc/include/asm/futex.h | 26 +- + arch/parisc/include/asm/spinlock.h | 7 - + arch/powerpc/include/asm/barrier.h | 7 - + arch/powerpc/include/asm/futex.h | 26 +- + arch/powerpc/include/asm/spinlock.h | 36 +- + arch/s390/include/asm/futex.h | 23 +- + arch/s390/include/asm/spinlock.h | 7 - + arch/sh/include/asm/futex.h | 26 +- + arch/sh/include/asm/spinlock-cas.h | 5 - + arch/sh/include/asm/spinlock-llsc.h | 5 - + arch/sparc/include/asm/atomic_32.h | 2 + + arch/sparc/include/asm/futex_64.h | 26 +- + arch/sparc/include/asm/spinlock_32.h | 5 - + arch/tile/include/asm/atomic_32.h | 2 + + arch/tile/include/asm/futex.h | 40 +- + arch/tile/include/asm/spinlock_32.h | 2 - + arch/tile/include/asm/spinlock_64.h | 2 - + arch/tile/lib/spinlock_32.c | 23 - + arch/tile/lib/spinlock_64.c | 22 - + arch/um/include/asm/unwind.h | 8 + + arch/x86/Kbuild | 5 +- + arch/x86/Kconfig | 67 +- + arch/x86/Kconfig.debug | 59 +- + arch/x86/Makefile | 17 +- + arch/x86/boot/compressed/eboot.c | 5 +- + arch/x86/boot/compressed/kaslr.c | 125 +- + arch/x86/boot/compressed/pagetable.c | 7 + + arch/x86/configs/tiny.config | 2 + + arch/x86/entry/Makefile | 1 - + arch/x86/entry/calling.h | 5 + + arch/x86/entry/common.c | 3 + + arch/x86/entry/entry_64.S | 188 +- + arch/x86/entry/entry_64_compat.S | 7 +- + arch/x86/events/amd/uncore.c | 21 +- + arch/x86/events/core.c | 34 +- + arch/x86/events/intel/Makefile | 2 +- + arch/x86/events/intel/core.c | 117 +- + arch/x86/events/intel/cqm.c | 1766 ---------- + arch/x86/events/intel/ds.c | 56 +- + arch/x86/events/intel/lbr.c | 52 +- + arch/x86/events/perf_event.h | 8 +- + arch/x86/hyperv/Makefile | 2 +- + arch/x86/hyperv/hv_init.c | 90 +- + arch/x86/hyperv/mmu.c | 138 + + arch/x86/ia32/ia32_signal.c | 2 +- + arch/x86/include/asm/acpi.h | 13 +- + arch/x86/include/asm/asm.h | 6 + + arch/x86/include/asm/atomic.h | 69 +- + arch/x86/include/asm/atomic64_32.h | 81 +- + arch/x86/include/asm/atomic64_64.h | 73 +- + arch/x86/include/asm/cmdline.h | 2 + + arch/x86/include/asm/cmpxchg.h | 2 +- + arch/x86/include/asm/cpufeatures.h | 3 +- + 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/elf.h | 19 +- + arch/x86/include/asm/fixmap.h | 20 + + arch/x86/include/asm/futex.h | 40 +- + arch/x86/include/asm/init.h | 1 + + arch/x86/include/asm/intel_rdt.h | 286 -- + arch/x86/include/asm/intel_rdt_common.h | 27 - + arch/x86/include/asm/intel_rdt_sched.h | 92 + + arch/x86/include/asm/io.h | 106 +- + arch/x86/include/asm/kexec.h | 11 +- + arch/x86/include/asm/kvm_host.h | 2 +- + arch/x86/include/asm/lguest.h | 91 - + arch/x86/include/asm/lguest_hcall.h | 74 - + arch/x86/include/asm/mem_encrypt.h | 80 + + arch/x86/include/asm/mmu.h | 25 +- + arch/x86/include/asm/mmu_context.h | 15 +- + arch/x86/include/asm/module.h | 9 + + arch/x86/include/asm/mpx.h | 9 + + arch/x86/include/asm/mshyperv.h | 147 +- + arch/x86/include/asm/msr-index.h | 2 + + arch/x86/include/asm/orc_lookup.h | 46 + + arch/x86/include/asm/orc_types.h | 107 + + arch/x86/include/asm/page_64.h | 4 + + arch/x86/include/asm/page_types.h | 3 +- + arch/x86/include/asm/pgtable.h | 28 +- + arch/x86/include/asm/pgtable_types.h | 58 +- + arch/x86/include/asm/processor-flags.h | 13 +- + arch/x86/include/asm/processor.h | 25 +- + arch/x86/include/asm/ptrace.h | 43 +- + arch/x86/include/asm/realmode.h | 12 + + arch/x86/include/asm/refcount.h | 109 + + arch/x86/include/asm/rmwcc.h | 37 +- + arch/x86/include/asm/set_memory.h | 3 + + arch/x86/include/asm/thread_info.h | 5 +- + arch/x86/include/asm/tlbflush.h | 87 +- + arch/x86/include/asm/topology.h | 6 - + arch/x86/include/asm/uaccess.h | 7 +- + arch/x86/include/asm/unwind.h | 76 +- + arch/x86/include/asm/unwind_hints.h | 105 + + arch/x86/include/asm/vga.h | 14 +- + arch/x86/include/uapi/asm/bootparam.h | 2 +- + arch/x86/include/uapi/asm/hyperv.h | 7 + + arch/x86/kernel/Makefile | 8 +- + arch/x86/kernel/acpi/boot.c | 6 +- + arch/x86/kernel/alternative.c | 22 +- + arch/x86/kernel/apic/io_apic.c | 2 +- + arch/x86/kernel/asm-offsets_32.c | 20 - + arch/x86/kernel/cpu/Makefile | 2 +- + arch/x86/kernel/cpu/amd.c | 55 +- + arch/x86/kernel/cpu/bugs.c | 8 + + arch/x86/kernel/cpu/common.c | 40 + + arch/x86/kernel/cpu/intel_cacheinfo.c | 32 +- + arch/x86/kernel/cpu/intel_rdt.c | 375 ++- + arch/x86/kernel/cpu/intel_rdt.h | 440 +++ + ...ntel_rdt_schemata.c => intel_rdt_ctrlmondata.c} | 67 +- + arch/x86/kernel/cpu/intel_rdt_monitor.c | 499 +++ + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 1131 +++++-- + arch/x86/kernel/cpu/mcheck/mce.c | 43 + + arch/x86/kernel/cpu/mcheck/mce_amd.c | 9 +- + arch/x86/kernel/cpu/microcode/amd.c | 5 +- + arch/x86/kernel/cpu/mshyperv.c | 1 + + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/dumpstack.c | 14 +- + 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 | 95 +- + arch/x86/kernel/head_32.S | 22 +- + arch/x86/kernel/head_64.S | 40 +- + arch/x86/kernel/kdebugfs.c | 34 +- + arch/x86/kernel/kprobes/opt.c | 9 +- + arch/x86/kernel/ksysfs.c | 28 +- + arch/x86/kernel/ldt.c | 21 + + arch/x86/kernel/machine_kexec_64.c | 25 +- + arch/x86/kernel/module.c | 11 +- + arch/x86/kernel/mpparse.c | 108 +- + arch/x86/kernel/nmi.c | 18 +- + arch/x86/kernel/pci-dma.c | 11 +- + arch/x86/kernel/pci-nommu.c | 2 +- + arch/x86/kernel/pci-swiotlb.c | 15 +- + arch/x86/kernel/platform-quirks.c | 1 - + arch/x86/kernel/process.c | 17 +- + arch/x86/kernel/process_32.c | 4 +- + arch/x86/kernel/process_64.c | 244 +- + arch/x86/kernel/relocate_kernel_64.S | 14 + + arch/x86/kernel/setup.c | 12 + + arch/x86/kernel/signal.c | 2 +- + arch/x86/kernel/step.c | 2 +- + arch/x86/kernel/sys_x86_64.c | 30 +- + arch/x86/kernel/unwind_frame.c | 41 +- + arch/x86/kernel/unwind_guess.c | 5 + + arch/x86/kernel/unwind_orc.c | 582 ++++ + arch/x86/kernel/vmlinux.lds.S | 3 + + arch/x86/kvm/Kconfig | 1 - + arch/x86/kvm/mmu.c | 41 +- + arch/x86/kvm/svm.c | 35 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/kvm/x86.c | 3 +- + arch/x86/lguest/Kconfig | 14 - + arch/x86/lguest/Makefile | 2 - + arch/x86/lguest/boot.c | 1558 --------- + arch/x86/lguest/head_32.S | 192 -- + arch/x86/lib/cmdline.c | 105 + + arch/x86/mm/Makefile | 2 + + arch/x86/mm/dump_pagetables.c | 93 +- + arch/x86/mm/extable.c | 44 +- + arch/x86/mm/hugetlbpage.c | 27 +- + arch/x86/mm/ident_map.c | 12 +- + arch/x86/mm/init.c | 2 +- + 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/mmap.c | 12 +- + arch/x86/mm/mpx.c | 33 +- + arch/x86/mm/numa_emulation.c | 55 +- + arch/x86/mm/pageattr.c | 67 + + arch/x86/mm/pat.c | 9 +- + arch/x86/mm/tlb.c | 331 +- + arch/x86/pci/common.c | 4 +- + arch/x86/pci/intel_mid_pci.c | 12 +- + arch/x86/platform/efi/efi.c | 19 - + arch/x86/platform/efi/efi_64.c | 15 +- + .../platform/intel-mid/device_libs/platform_bt.c | 2 +- + .../intel-mid/device_libs/platform_mrfld_wdt.c | 6 +- + arch/x86/platform/intel-mid/intel-mid.c | 2 +- + arch/x86/realmode/init.c | 12 + + arch/x86/realmode/rm/trampoline_64.S | 24 + + arch/x86/xen/Kconfig | 5 + + arch/x86/xen/enlighten_pv.c | 66 +- + arch/x86/xen/mmu_pv.c | 5 +- + arch/x86/xen/xen-asm.S | 26 +- + arch/x86/xen/xen-asm.h | 12 - + arch/x86/xen/xen-asm_32.S | 27 +- + arch/x86/xen/xen-asm_64.S | 61 +- + arch/x86/xen/xen-head.S | 2 +- + arch/x86/xen/xen-ops.h | 15 +- + arch/xtensa/include/asm/futex.h | 27 +- + arch/xtensa/include/asm/spinlock.h | 5 - + arch/xtensa/kernel/setup.c | 6 +- + drivers/Makefile | 1 - + drivers/acpi/processor_idle.c | 2 - + drivers/ata/libata-eh.c | 8 +- + drivers/block/Kconfig | 2 +- + drivers/char/Kconfig | 2 +- + drivers/char/virtio_console.c | 2 +- + drivers/clocksource/arm_arch_timer.c | 6 +- + drivers/firmware/dcdbas.c | 2 +- + drivers/firmware/dmi-sysfs.c | 5 +- + drivers/firmware/efi/Kconfig | 10 + + drivers/firmware/efi/arm-init.c | 8 + + drivers/firmware/efi/efi-bgrt.c | 22 +- + drivers/firmware/efi/efi.c | 75 +- + drivers/firmware/efi/esrt.c | 2 +- + drivers/firmware/efi/libstub/Makefile | 3 +- + drivers/firmware/efi/libstub/arm-stub.c | 3 + + drivers/firmware/efi/libstub/arm64-stub.c | 10 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 4 +- + drivers/firmware/efi/libstub/random.c | 10 +- + drivers/firmware/efi/libstub/tpm.c | 58 + + drivers/firmware/efi/reboot.c | 12 +- + drivers/firmware/pcdp.c | 4 +- + drivers/gpu/drm/drm_gem.c | 2 + + drivers/gpu/drm/drm_vm.c | 4 + + drivers/gpu/drm/i915/i915_debugfs.c | 5 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 7 +- + drivers/gpu/drm/udl/udl_fb.c | 4 + + drivers/hv/Kconfig | 1 + + drivers/hv/channel_mgmt.c | 20 +- + drivers/hv/connection.c | 7 +- + drivers/hv/hv.c | 9 - + drivers/hv/hyperv_vmbus.h | 11 - + drivers/hv/vmbus_drv.c | 17 - + 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/Kconfig | 7 + + drivers/irqchip/irq-armada-370-xp.c | 3 + + drivers/irqchip/irq-bcm6345-l1.c | 3 + + drivers/irqchip/irq-bcm7038-l1.c | 3 + + drivers/irqchip/irq-gic-v3-its.c | 7 +- + drivers/irqchip/irq-gic-v3.c | 3 + + drivers/irqchip/irq-gic.c | 3 + + drivers/irqchip/irq-hip04.c | 3 + + drivers/irqchip/irq-metag-ext.c | 4 + + drivers/irqchip/irq-mips-gic.c | 10 +- + drivers/irqchip/irq-xtensa-mx.c | 6 +- + drivers/lguest/Kconfig | 13 - + drivers/lguest/Makefile | 26 - + drivers/lguest/README | 47 - + drivers/lguest/core.c | 398 --- + drivers/lguest/hypercalls.c | 304 -- + drivers/lguest/interrupts_and_traps.c | 706 ---- + drivers/lguest/lg.h | 258 -- + drivers/lguest/lguest_user.c | 446 --- + drivers/lguest/page_tables.c | 1239 ------- + drivers/lguest/segments.c | 228 -- + drivers/lguest/x86/core.c | 724 ----- + drivers/lguest/x86/switcher_32.S | 388 --- + drivers/net/Kconfig | 2 +- + drivers/pci/host/pci-hyperv.c | 54 +- + drivers/sfi/sfi_core.c | 23 +- + drivers/tty/hvc/Kconfig | 2 +- + drivers/video/fbdev/core/fbmem.c | 12 + + drivers/video/fbdev/efifb.c | 31 +- + drivers/virtio/Kconfig | 4 +- + fs/overlayfs/readdir.c | 4 +- + fs/proc/base.c | 3 +- + fs/userfaultfd.c | 25 +- + include/asm-generic/atomic64.h | 2 + + include/asm-generic/early_ioremap.h | 2 + + include/asm-generic/futex.h | 50 +- + include/asm-generic/io.h | 27 + + include/asm-generic/pgtable.h | 12 + + include/asm-generic/qspinlock.h | 14 - + include/asm-generic/sections.h | 4 + + include/asm-generic/vmlinux.lds.h | 35 +- + include/linux/atomic.h | 3 + + include/linux/compiler-gcc.h | 13 +- + include/linux/compiler.h | 32 +- + include/linux/completion.h | 45 +- + include/linux/cpuset.h | 6 - + include/linux/dma-mapping.h | 13 + + include/linux/efi.h | 40 +- + include/linux/futex.h | 7 +- + include/linux/hyperv.h | 17 +- + include/linux/init_task.h | 8 +- + include/linux/interrupt.h | 14 +- + include/linux/io.h | 2 + + include/linux/irq.h | 7 +- + include/linux/irq_sim.h | 44 + + include/linux/irqdomain.h | 3 + + include/linux/irqflags.h | 24 +- + include/linux/jump_label.h | 33 +- + include/linux/kasan-checks.h | 10 +- + include/linux/kernel.h | 7 + + include/linux/kexec.h | 8 + + include/linux/lguest.h | 73 - + include/linux/lguest_launcher.h | 44 - + include/linux/lockdep.h | 164 +- + include/linux/mem_encrypt.h | 48 + + include/linux/mm_inline.h | 6 + + include/linux/mm_types.h | 95 +- + include/linux/perf_event.h | 18 - + include/linux/rcupdate.h | 15 +- + include/linux/rcutiny.h | 8 +- + include/linux/refcount.h | 4 + + include/linux/rwsem-spinlock.h | 1 + + include/linux/rwsem.h | 1 + + include/linux/sched.h | 35 +- + include/linux/sched/debug.h | 4 +- + include/linux/sched/mm.h | 8 + + include/linux/sched/task.h | 1 - + include/linux/sched/topology.h | 8 + + include/linux/spinlock.h | 72 +- + include/linux/spinlock_up.h | 6 - + include/linux/srcutiny.h | 13 + + include/linux/srcutree.h | 3 +- + include/linux/swait.h | 55 + + include/linux/swiotlb.h | 1 + + include/linux/syscalls.h | 16 + + include/trace/events/rcu.h | 7 +- + include/uapi/linux/membarrier.h | 23 +- + include/uapi/linux/perf_event.h | 57 +- + include/uapi/linux/virtio_ring.h | 4 +- + init/Kconfig | 7 +- + init/main.c | 13 +- + ipc/sem.c | 3 +- + kernel/Makefile | 1 - + kernel/cgroup/cpuset.c | 13 +- + kernel/cpu.c | 13 +- + kernel/events/core.c | 46 +- + kernel/events/internal.h | 6 +- + kernel/events/ring_buffer.c | 31 +- + kernel/exit.c | 11 +- + kernel/fork.c | 4 + + kernel/futex.c | 61 + + kernel/irq/Kconfig | 9 + + kernel/irq/Makefile | 1 + + kernel/irq/chip.c | 109 + + kernel/irq/debugfs.c | 50 +- + kernel/irq/internals.h | 2 +- + kernel/irq/irq_sim.c | 164 + + kernel/irq/irqdomain.c | 230 +- + kernel/irq/proc.c | 8 +- + kernel/jump_label.c | 104 +- + kernel/kexec_core.c | 12 +- + kernel/locking/lockdep.c | 1011 ++++-- + kernel/locking/lockdep_internals.h | 2 + + kernel/locking/lockdep_proc.c | 4 + + kernel/locking/lockdep_states.h | 1 - + kernel/locking/osq_lock.c | 13 + + kernel/locking/qspinlock.c | 117 - + kernel/locking/rtmutex_common.h | 29 + + kernel/locking/rwsem-spinlock.c | 37 +- + kernel/locking/rwsem-xadd.c | 33 +- + kernel/membarrier.c | 70 - + kernel/memremap.c | 20 +- + kernel/panic.c | 12 + + 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 | 83 +- + 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 | 213 +- + kernel/rcu/tree.h | 15 +- + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_plugin.h | 238 +- + kernel/rcu/update.c | 18 +- + kernel/sched/Makefile | 1 + + kernel/sched/autogroup.c | 3 +- + kernel/sched/completion.c | 30 +- + kernel/sched/core.c | 64 +- + kernel/sched/cpudeadline.c | 27 +- + kernel/sched/cpupri.c | 2 - + kernel/sched/deadline.c | 33 +- + kernel/sched/debug.c | 83 +- + kernel/sched/fair.c | 463 ++- + kernel/sched/membarrier.c | 152 + + kernel/sched/sched.h | 4 + + kernel/sched/swait.c | 6 - + kernel/sched/topology.c | 39 +- + kernel/task_work.c | 8 +- + kernel/time/alarmtimer.c | 11 +- + kernel/time/posix-cpu-timers.c | 14 +- + kernel/time/timekeeping.c | 2 +- + kernel/torture.c | 2 +- + kernel/workqueue.c | 54 +- + lib/Kconfig.debug | 27 +- + lib/debugobjects.c | 3 + + lib/locking-selftest.c | 117 +- + lib/swiotlb.c | 57 +- + mm/early_ioremap.c | 28 +- + mm/huge_memory.c | 12 +- + mm/kasan/kasan.c | 4 +- + mm/memory-failure.c | 2 + + mm/page_alloc.c | 49 +- + mm/slab.h | 6 +- + mm/slob.c | 6 +- + mm/vmscan.c | 13 +- + net/ipv4/udp.c | 3 +- + net/ipv6/udp.c | 3 +- + net/netfilter/nf_conntrack_core.c | 52 +- + scripts/Makefile.build | 17 +- + tools/Makefile | 11 +- + tools/arch/arm/include/uapi/asm/kvm.h | 8 + + tools/arch/arm64/include/uapi/asm/kvm.h | 3 + + tools/arch/powerpc/include/uapi/asm/kvm.h | 6 + + tools/arch/s390/include/uapi/asm/kvm.h | 12 + + tools/arch/x86/include/asm/cpufeatures.h | 2 + + tools/arch/x86/include/asm/disabled-features.h | 4 +- + tools/arch/x86/include/asm/unistd_32.h | 3 + + tools/arch/x86/include/asm/unistd_64.h | 3 + + tools/arch/x86/include/uapi/asm/unistd.h | 17 + + tools/build/Makefile.feature | 3 +- + tools/build/feature/Makefile | 6 +- + tools/build/feature/test-all.c | 5 + + tools/build/feature/test-setns.c | 7 + + tools/include/linux/string.h | 12 +- + tools/include/uapi/asm-generic/fcntl.h | 220 ++ + tools/include/uapi/asm-generic/ioctls.h | 118 + + tools/include/uapi/drm/drm.h | 933 ++++++ + tools/include/uapi/drm/i915_drm.h | 1474 +++++++++ + tools/include/uapi/linux/bpf.h | 16 +- + tools/include/uapi/linux/fcntl.h | 21 + + tools/include/uapi/linux/kvm.h | 1419 ++++++++ + tools/include/uapi/linux/perf_event.h | 57 +- + tools/include/uapi/linux/sched.h | 52 + + tools/include/uapi/linux/vhost.h | 209 ++ + tools/include/uapi/sound/asound.h | 1026 ++++++ + tools/lguest/.gitignore | 2 - + tools/lguest/Makefile | 14 - + tools/lguest/extract | 58 - + tools/lguest/lguest.c | 3420 -------------------- + tools/lguest/lguest.txt | 125 - + tools/lib/bpf/Makefile | 8 +- + tools/lib/string.c | 41 +- + tools/lib/subcmd/help.c | 2 +- + tools/lib/subcmd/parse-options.c | 18 +- + tools/objtool/Build | 3 + + tools/objtool/Documentation/stack-validation.txt | 56 +- + tools/objtool/Makefile | 6 +- + tools/objtool/arch.h | 5 +- + tools/objtool/arch/x86/decode.c | 17 +- + tools/objtool/builtin-check.c | 7 +- + tools/objtool/builtin-orc.c | 70 + + tools/objtool/builtin.h | 1 + + tools/objtool/check.c | 419 ++- + tools/objtool/check.h | 21 +- + 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/Build | 2 +- + tools/perf/Documentation/Makefile | 2 +- + tools/perf/Documentation/intel-pt.txt | 6 +- + tools/perf/Documentation/perf-annotate.txt | 6 + + tools/perf/Documentation/perf-buildid-cache.txt | 5 + + tools/perf/Documentation/perf-probe.txt | 14 + + tools/perf/Documentation/perf-record.txt | 1 + + tools/perf/Documentation/perf-top.txt | 4 + + tools/perf/Documentation/perf.data-file-format.txt | 10 +- + tools/perf/MANIFEST | 8 + + tools/perf/Makefile.config | 21 +- + tools/perf/Makefile.perf | 77 +- + tools/perf/arch/powerpc/util/sym-handling.c | 2 +- + tools/perf/arch/s390/util/Build | 1 + + tools/perf/arch/s390/util/sym-handling.c | 29 + + tools/perf/arch/x86/Makefile | 2 +- + tools/perf/arch/x86/annotate/instructions.c | 46 + + tools/perf/arch/x86/include/arch-tests.h | 11 +- + tools/perf/arch/x86/tests/insn-x86.c | 2 +- + tools/perf/arch/x86/tests/intel-cqm.c | 2 +- + tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- + tools/perf/arch/x86/tests/rdpmc.c | 2 +- + tools/perf/arch/x86/util/intel-pt.c | 3 + + tools/perf/builtin-annotate.c | 23 +- + tools/perf/builtin-buildid-cache.c | 54 +- + tools/perf/builtin-config.c | 3 +- + tools/perf/builtin-data.c | 2 +- + tools/perf/builtin-ftrace.c | 2 +- + tools/perf/builtin-help.c | 6 +- + tools/perf/builtin-inject.c | 1 + + tools/perf/builtin-probe.c | 45 +- + tools/perf/builtin-record.c | 9 +- + tools/perf/builtin-report.c | 57 +- + tools/perf/builtin-script.c | 11 +- + tools/perf/builtin-stat.c | 30 +- + tools/perf/builtin-top.c | 22 +- + tools/perf/builtin-trace.c | 736 +++-- + tools/perf/check-headers.sh | 20 +- + tools/perf/perf-sys.h | 28 +- + tools/perf/perf.c | 16 +- + tools/perf/perf.h | 1 + + tools/perf/pmu-events/README | 4 - + tools/perf/pmu-events/arch/powerpc/mapfile.csv | 16 +- + .../perf/pmu-events/arch/powerpc/power9/cache.json | 137 + + .../arch/powerpc/power9/floating-point.json | 32 + + .../pmu-events/arch/powerpc/power9/frontend.json | 377 +++ + .../pmu-events/arch/powerpc/power9/marked.json | 647 ++++ + .../pmu-events/arch/powerpc/power9/memory.json | 132 + + .../perf/pmu-events/arch/powerpc/power9/other.json | 2512 ++++++++++++++ + .../pmu-events/arch/powerpc/power9/pipeline.json | 557 ++++ + tools/perf/pmu-events/arch/powerpc/power9/pmc.json | 127 + + .../arch/powerpc/power9/translation.json | 232 ++ + tools/perf/pmu-events/arch/x86/mapfile.csv | 1 + + tools/perf/pmu-events/arch/x86/skylakex/cache.json | 1672 ++++++++++ + .../arch/x86/skylakex/floating-point.json | 88 + + .../pmu-events/arch/x86/skylakex/frontend.json | 482 +++ + .../perf/pmu-events/arch/x86/skylakex/memory.json | 1396 ++++++++ + tools/perf/pmu-events/arch/x86/skylakex/other.json | 72 + + .../pmu-events/arch/x86/skylakex/pipeline.json | 950 ++++++ + .../arch/x86/skylakex/uncore-memory.json | 172 + + .../pmu-events/arch/x86/skylakex/uncore-other.json | 1156 +++++++ + .../arch/x86/skylakex/virtual-memory.json | 284 ++ + tools/perf/pmu-events/jevents.c | 23 +- + .../python/Perf-Trace-Util/lib/Perf/Trace/Util.py | 1 + + .../scripts/python/bin/export-to-sqlite-record | 8 + + .../scripts/python/bin/export-to-sqlite-report | 29 + + ...h-from-postgresql.py => call-graph-from-sql.py} | 70 +- + tools/perf/scripts/python/export-to-postgresql.py | 5 +- + tools/perf/scripts/python/export-to-sqlite.py | 451 +++ + tools/perf/tests/Build | 1 + + tools/perf/tests/attr.c | 14 +- + tools/perf/tests/attr.py | 50 +- + tools/perf/tests/attr/base-record | 6 +- + tools/perf/tests/attr/base-stat | 4 +- + tools/perf/tests/attr/test-record-C0 | 1 + + tools/perf/tests/attr/test-record-basic | 1 + + tools/perf/tests/attr/test-record-branch-any | 2 +- + .../perf/tests/attr/test-record-branch-filter-any | 2 +- + .../tests/attr/test-record-branch-filter-any_call | 2 +- + .../tests/attr/test-record-branch-filter-any_ret | 2 +- + tools/perf/tests/attr/test-record-branch-filter-hv | 2 +- + .../tests/attr/test-record-branch-filter-ind_call | 2 +- + tools/perf/tests/attr/test-record-branch-filter-k | 2 +- + tools/perf/tests/attr/test-record-branch-filter-u | 2 +- + tools/perf/tests/attr/test-record-count | 1 + + tools/perf/tests/attr/test-record-data | 3 +- + tools/perf/tests/attr/test-record-freq | 1 + + tools/perf/tests/attr/test-record-graph-default | 1 + + tools/perf/tests/attr/test-record-graph-dwarf | 4 +- + tools/perf/tests/attr/test-record-graph-fp | 1 + + tools/perf/tests/attr/test-record-group | 1 + + tools/perf/tests/attr/test-record-group-sampling | 1 + + tools/perf/tests/attr/test-record-group1 | 1 + + ...st-record-no-delay => test-record-no-buffering} | 4 +- + tools/perf/tests/attr/test-record-no-inherit | 1 + + tools/perf/tests/attr/test-record-no-samples | 1 + + tools/perf/tests/attr/test-record-period | 1 + + tools/perf/tests/attr/test-record-raw | 2 +- + tools/perf/tests/attr/test-stat-C0 | 4 +- + tools/perf/tests/attr/test-stat-default | 2 + + tools/perf/tests/attr/test-stat-detailed-1 | 2 + + tools/perf/tests/attr/test-stat-detailed-2 | 3 + + tools/perf/tests/attr/test-stat-detailed-3 | 5 + + tools/perf/tests/backward-ring-buffer.c | 2 +- + tools/perf/tests/bitmap.c | 2 +- + tools/perf/tests/bp_signal.c | 2 +- + tools/perf/tests/bp_signal_overflow.c | 2 +- + tools/perf/tests/bpf-script-test-prologue.c | 4 +- + tools/perf/tests/bpf.c | 20 +- + tools/perf/tests/builtin-test.c | 188 +- + tools/perf/tests/clang.c | 4 +- + tools/perf/tests/code-reading.c | 2 +- + tools/perf/tests/cpumap.c | 4 +- + tools/perf/tests/dso-data.c | 6 +- + tools/perf/tests/dwarf-unwind.c | 2 +- + tools/perf/tests/event-times.c | 2 +- + tools/perf/tests/event_update.c | 2 +- + tools/perf/tests/evsel-roundtrip-name.c | 2 +- + tools/perf/tests/evsel-tp-sched.c | 2 +- + tools/perf/tests/expr.c | 7 +- + tools/perf/tests/fdarray.c | 4 +- + tools/perf/tests/hists_cumulate.c | 2 +- + tools/perf/tests/hists_filter.c | 2 +- + tools/perf/tests/hists_link.c | 2 +- + tools/perf/tests/hists_output.c | 2 +- + tools/perf/tests/is_printable_array.c | 2 +- + tools/perf/tests/keep-tracking.c | 2 +- + tools/perf/tests/kmod-path.c | 2 +- + tools/perf/tests/llvm.c | 2 +- + tools/perf/tests/mem.c | 56 + + tools/perf/tests/mmap-basic.c | 2 +- + tools/perf/tests/mmap-thread-lookup.c | 2 +- + tools/perf/tests/openat-syscall-all-cpus.c | 4 +- + tools/perf/tests/openat-syscall-tp-fields.c | 2 +- + tools/perf/tests/openat-syscall.c | 4 +- + tools/perf/tests/parse-events.c | 2 +- + tools/perf/tests/parse-no-sample-id-all.c | 2 +- + tools/perf/tests/perf-hooks.c | 2 +- + tools/perf/tests/perf-record.c | 2 +- + tools/perf/tests/pmu.c | 2 +- + tools/perf/tests/python-use.c | 2 +- + tools/perf/tests/sample-parsing.c | 2 +- + tools/perf/tests/sdt.c | 12 +- + tools/perf/tests/shell/lib/probe.sh | 6 + + tools/perf/tests/shell/lib/probe_vfs_getname.sh | 23 + + tools/perf/tests/shell/probe_vfs_getname.sh | 14 + + .../tests/shell/record+script_probe_vfs_getname.sh | 41 + + .../perf/tests/shell/trace+probe_libc_inet_pton.sh | 43 + + tools/perf/tests/shell/trace+probe_vfs_getname.sh | 35 + + tools/perf/tests/stat.c | 6 +- + tools/perf/tests/sw-clock.c | 2 +- + tools/perf/tests/switch-tracking.c | 2 +- + tools/perf/tests/task-exit.c | 2 +- + tools/perf/tests/tests.h | 114 +- + tools/perf/tests/thread-map.c | 6 +- + tools/perf/tests/thread-mg-share.c | 2 +- + tools/perf/tests/topology.c | 2 +- + tools/perf/tests/unit_number__scnprintf.c | 2 +- + tools/perf/tests/vmlinux-kallsyms.c | 2 +- + tools/perf/trace/beauty/Build | 5 + + tools/perf/trace/beauty/beauty.h | 71 + + tools/perf/trace/beauty/clone.c | 75 + + tools/perf/trace/beauty/drm_ioctl.sh | 13 + + tools/perf/trace/beauty/fcntl.c | 100 + + tools/perf/trace/beauty/ioctl.c | 162 + + tools/perf/trace/beauty/kvm_ioctl.sh | 11 + + tools/perf/trace/beauty/mmap.c | 3 + + tools/perf/trace/beauty/open_flags.c | 29 +- + tools/perf/trace/beauty/perf_ioctl.sh | 10 + + tools/perf/trace/beauty/pid.c | 4 +- + tools/perf/trace/beauty/sndrv_ctl_ioctl.sh | 8 + + tools/perf/trace/beauty/sndrv_pcm_ioctl.sh | 8 + + tools/perf/trace/beauty/vhost_virtio_ioctl.sh | 17 + + tools/perf/ui/browser.c | 32 +- + tools/perf/ui/browser.h | 2 + + tools/perf/ui/browsers/annotate.c | 94 +- + tools/perf/ui/browsers/hists.c | 3 - + tools/perf/ui/gtk/annotate.c | 6 +- + tools/perf/ui/stdio/hist.c | 6 +- + tools/perf/util/Build | 6 + + tools/perf/util/annotate.c | 137 +- + tools/perf/util/annotate.h | 22 +- + tools/perf/util/bpf-loader.c | 2 +- + tools/perf/util/bpf-prologue.c | 49 +- + tools/perf/util/branch.c | 147 + + tools/perf/util/branch.h | 25 + + tools/perf/util/build-id.c | 129 +- + tools/perf/util/build-id.h | 16 +- + tools/perf/util/callchain.c | 249 +- + tools/perf/util/callchain.h | 5 +- + tools/perf/util/cgroup.c | 8 +- + tools/perf/util/config.c | 13 +- + tools/perf/util/counts.h | 1 + + tools/perf/util/data-convert-bt.c | 127 +- + tools/perf/util/dso.c | 21 +- + tools/perf/util/dso.h | 3 + + tools/perf/util/event.c | 1 + + tools/perf/util/event.h | 11 +- + tools/perf/util/evlist.c | 16 +- + tools/perf/util/evlist.h | 14 +- + tools/perf/util/evsel.c | 206 +- + tools/perf/util/evsel.h | 12 +- + tools/perf/util/expr.h | 2 +- + tools/perf/util/expr.y | 76 +- + tools/perf/util/header.c | 1018 +++--- + tools/perf/util/header.h | 16 +- + tools/perf/util/hist.c | 7 +- + tools/perf/util/llvm-utils.c | 2 +- + tools/perf/util/machine.c | 50 +- + tools/perf/util/map.c | 23 +- + tools/perf/util/map.h | 2 +- + tools/perf/util/mem-events.c | 43 +- + tools/perf/util/namespaces.c | 211 ++ + tools/perf/util/namespaces.h | 38 + + tools/perf/util/parse-branch-options.c | 1 + + tools/perf/util/parse-events.c | 98 +- + tools/perf/util/parse-events.h | 19 +- + tools/perf/util/parse-events.l | 23 +- + tools/perf/util/parse-events.y | 94 +- + tools/perf/util/probe-event.c | 86 +- + tools/perf/util/probe-event.h | 10 +- + tools/perf/util/probe-file.c | 19 +- + tools/perf/util/probe-file.h | 4 +- + tools/perf/util/python-ext-sources | 1 + + .../util/scripting-engines/trace-event-python.c | 246 +- + tools/perf/util/session.c | 4 + + tools/perf/util/setns.c | 8 + + tools/perf/util/smt.c | 44 + + tools/perf/util/smt.h | 6 + + tools/perf/util/sort.c | 2 +- + tools/perf/util/srcline.c | 6 + + tools/perf/util/stat-shadow.c | 6 +- + tools/perf/util/stat.c | 4 + + tools/perf/util/stat.h | 5 +- + tools/perf/util/symbol-elf.c | 12 +- + tools/perf/util/symbol-minimal.c | 2 +- + tools/perf/util/symbol.c | 113 +- + tools/perf/util/symbol.h | 7 +- + tools/perf/util/thread.c | 3 + + tools/perf/util/thread.h | 1 + + tools/perf/util/tool.h | 10 +- + tools/perf/util/util.c | 40 +- + tools/perf/util/util.h | 8 +- + tools/perf/util/xyarray.c | 2 + + tools/perf/util/xyarray.h | 12 + + .../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 +- + tools/testing/selftests/timers/freq-step.c | 8 +- + tools/testing/selftests/timers/set-timer-lat.c | 103 +- + tools/testing/selftests/x86/fsgsbase.c | 41 +- + 792 files changed, 38083 insertions(+), 19200 deletions(-) + create mode 100644 Documentation/atomic_bitops.txt + create mode 100644 Documentation/atomic_t.txt + create mode 100644 Documentation/locking/crossrelease.txt + create mode 100644 Documentation/x86/amd-memory-encryption.txt + delete mode 100644 Documentation/x86/early-microcode.txt + create mode 100644 Documentation/x86/microcode.txt + create mode 100644 Documentation/x86/orc-unwinder.txt + create mode 100644 Documentation/x86/x86_64/5level-paging.txt + create mode 100644 arch/um/include/asm/unwind.h + delete mode 100644 arch/x86/events/intel/cqm.c + create mode 100644 arch/x86/hyperv/mmu.c + delete mode 100644 arch/x86/include/asm/intel_rdt.h + delete mode 100644 arch/x86/include/asm/intel_rdt_common.h + create mode 100644 arch/x86/include/asm/intel_rdt_sched.h + delete mode 100644 arch/x86/include/asm/lguest.h + delete mode 100644 arch/x86/include/asm/lguest_hcall.h + create mode 100644 arch/x86/include/asm/mem_encrypt.h + create mode 100644 arch/x86/include/asm/orc_lookup.h + create mode 100644 arch/x86/include/asm/orc_types.h + create mode 100644 arch/x86/include/asm/refcount.h + create mode 100644 arch/x86/include/asm/unwind_hints.h + create mode 100644 arch/x86/kernel/cpu/intel_rdt.h + rename arch/x86/kernel/cpu/{intel_rdt_schemata.c => intel_rdt_ctrlmondata.c} (82%) + create mode 100644 arch/x86/kernel/cpu/intel_rdt_monitor.c + create mode 100644 arch/x86/kernel/unwind_orc.c + delete mode 100644 arch/x86/lguest/Kconfig + delete mode 100644 arch/x86/lguest/Makefile + delete mode 100644 arch/x86/lguest/boot.c + delete mode 100644 arch/x86/lguest/head_32.S + create mode 100644 arch/x86/mm/mem_encrypt.c + create mode 100644 arch/x86/mm/mem_encrypt_boot.S + delete mode 100644 arch/x86/xen/xen-asm.h + create mode 100644 drivers/firmware/efi/libstub/tpm.c + delete mode 100644 drivers/lguest/Kconfig + delete mode 100644 drivers/lguest/Makefile + delete mode 100644 drivers/lguest/README + delete mode 100644 drivers/lguest/core.c + delete mode 100644 drivers/lguest/hypercalls.c + delete mode 100644 drivers/lguest/interrupts_and_traps.c + delete mode 100644 drivers/lguest/lg.h + delete mode 100644 drivers/lguest/lguest_user.c + delete mode 100644 drivers/lguest/page_tables.c + delete mode 100644 drivers/lguest/segments.c + delete mode 100644 drivers/lguest/x86/core.c + delete mode 100644 drivers/lguest/x86/switcher_32.S + create mode 100644 include/linux/irq_sim.h + delete mode 100644 include/linux/lguest.h + delete mode 100644 include/linux/lguest_launcher.h + create mode 100644 include/linux/mem_encrypt.h + create mode 100644 kernel/irq/irq_sim.c + delete mode 100644 kernel/membarrier.c + delete mode 100644 kernel/rcu/tiny_plugin.h + create mode 100644 kernel/sched/membarrier.c + create mode 100644 tools/arch/x86/include/uapi/asm/unistd.h + create mode 100644 tools/build/feature/test-setns.c + create mode 100644 tools/include/uapi/asm-generic/fcntl.h + create mode 100644 tools/include/uapi/asm-generic/ioctls.h + create mode 100644 tools/include/uapi/drm/drm.h + create mode 100644 tools/include/uapi/drm/i915_drm.h + create mode 100644 tools/include/uapi/linux/kvm.h + create mode 100644 tools/include/uapi/linux/sched.h + create mode 100644 tools/include/uapi/linux/vhost.h + create mode 100644 tools/include/uapi/sound/asound.h + delete mode 100644 tools/lguest/.gitignore + delete mode 100644 tools/lguest/Makefile + delete mode 100644 tools/lguest/extract + delete mode 100644 tools/lguest/lguest.c + delete mode 100644 tools/lguest/lguest.txt + 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 + create mode 100644 tools/perf/arch/s390/util/sym-handling.c + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/cache.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/frontend.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/marked.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/memory.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/other.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/pmc.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/translation.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/virtual-memory.json + create mode 100644 tools/perf/scripts/python/bin/export-to-sqlite-record + create mode 100644 tools/perf/scripts/python/bin/export-to-sqlite-report + rename tools/perf/scripts/python/{call-graph-from-postgresql.py => call-graph-from-sql.py} (87%) + create mode 100644 tools/perf/scripts/python/export-to-sqlite.py + rename tools/perf/tests/attr/{test-record-no-delay => test-record-no-buffering} (61%) + create mode 100644 tools/perf/tests/mem.c + create mode 100644 tools/perf/tests/shell/lib/probe.sh + create mode 100644 tools/perf/tests/shell/lib/probe_vfs_getname.sh + create mode 100755 tools/perf/tests/shell/probe_vfs_getname.sh + create mode 100755 tools/perf/tests/shell/record+script_probe_vfs_getname.sh + create mode 100755 tools/perf/tests/shell/trace+probe_libc_inet_pton.sh + create mode 100755 tools/perf/tests/shell/trace+probe_vfs_getname.sh + create mode 100644 tools/perf/trace/beauty/clone.c + create mode 100755 tools/perf/trace/beauty/drm_ioctl.sh + create mode 100644 tools/perf/trace/beauty/fcntl.c + create mode 100644 tools/perf/trace/beauty/ioctl.c + create mode 100755 tools/perf/trace/beauty/kvm_ioctl.sh + create mode 100755 tools/perf/trace/beauty/perf_ioctl.sh + create mode 100755 tools/perf/trace/beauty/sndrv_ctl_ioctl.sh + create mode 100755 tools/perf/trace/beauty/sndrv_pcm_ioctl.sh + create mode 100755 tools/perf/trace/beauty/vhost_virtio_ioctl.sh + create mode 100644 tools/perf/util/branch.c + create mode 100644 tools/perf/util/branch.h + create mode 100644 tools/perf/util/setns.c + create mode 100644 tools/perf/util/smt.c + create mode 100644 tools/perf/util/smt.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 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 (398443471f16 EDAC, mce_amd: Get rid of local var in amd_filter_mce()) +$ git merge edac-amd/for-next +Merge made by the 'recursive' strategy. + drivers/edac/altera_edac.c | 6 +-- + drivers/edac/amd64_edac.c | 1 - + drivers/edac/amd76x_edac.c | 2 - + drivers/edac/cpc925_edac.c | 3 +- + drivers/edac/e752x_edac.c | 2 - + drivers/edac/e7xxx_edac.c | 2 - + drivers/edac/edac_mc_sysfs.c | 14 +++--- + 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 | 9 ++-- + 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 | 36 ++++++-------- + drivers/edac/mv64x60_edac.c | 1 - + drivers/edac/pnd2_edac.c | 106 +++++++++++++++++++++++++++++----------- + drivers/edac/ppc4xx_edac.c | 9 ++-- + drivers/edac/r82600_edac.c | 2 - + drivers/edac/sb_edac.c | 64 +++++++++++++++++------- + drivers/edac/skx_edac.c | 3 -- + drivers/edac/synopsys_edac.c | 1 - + drivers/edac/thunderx_edac.c | 6 +-- + drivers/edac/x38_edac.c | 3 -- + drivers/edac/xgene_edac.c | 1 - + include/linux/edac.h | 1 - + 33 files changed, 161 insertions(+), 136 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 (a7e52ad7ed82 ring-buffer: Have ring_buffer_alloc_read_page() return error on offline CPU) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (f0909808dc46 rcutorture: Add interrupt-disable capability to stall-warning tests) +$ git merge rcu/rcu/next +Resolved 'arch/x86/mm/tlb.c' using previous resolution. +Auto-merging kernel/sched/core.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched/mm.h +Auto-merging include/linux/sched.h +Auto-merging arch/x86/mm/tlb.c +CONFLICT (content): Merge conflict in arch/x86/mm/tlb.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4cf2c476f87a] Merge remote-tracking branch 'rcu/rcu/next' +$ git diff -M --stat --summary HEAD^.. + .../Design/Memory-Ordering/Tree-RCU-Diagram.html | 9 + + .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 707 +++ + .../TreeRCU-callback-invocation.svg | 486 ++ + .../Memory-Ordering/TreeRCU-callback-registry.svg | 655 +++ + .../RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg | 700 +++ + .../Design/Memory-Ordering/TreeRCU-gp-cleanup.svg | 1126 +++++ + .../RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg | 1309 +++++ + .../Design/Memory-Ordering/TreeRCU-gp-init-1.svg | 656 +++ + .../Design/Memory-Ordering/TreeRCU-gp-init-2.svg | 656 +++ + .../Design/Memory-Ordering/TreeRCU-gp-init-3.svg | 632 +++ + .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 5135 ++++++++++++++++++++ + .../RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg | 775 +++ + .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 1095 +++++ + .../RCU/Design/Memory-Ordering/rcu_node-lock.svg | 229 + + Documentation/RCU/stallwarn.txt | 200 +- + Documentation/admin-guide/kernel-parameters.txt | 3 + + fs/exec.c | 1 + + include/linux/irq_work.h | 3 - + include/linux/sched.h | 55 +- + include/linux/sched/mm.h | 4 + + include/uapi/linux/membarrier.h | 1 + + kernel/fork.c | 2 + + kernel/irq_work.c | 9 +- + kernel/rcu/rcutorture.c | 18 +- + kernel/rcu/tree.c | 25 +- + kernel/rcu/tree_plugin.h | 2 +- + kernel/rcu/update.c | 34 +- + kernel/sched/core.c | 13 + + kernel/sched/membarrier.c | 39 +- + 29 files changed, 14445 insertions(+), 134 deletions(-) + create mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Diagram.html + create mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-callback-invocation.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-callback-registry.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-cleanup.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-1.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-2.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-3.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-qs.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/rcu_node-lock.svg +$ git reset --hard HEAD^ +HEAD is now at 791834413469 Merge remote-tracking branch 'edac-amd/for-next' +Merging next-20170825 version of rcu +$ git merge -m next-20170825/rcu 603859f1a9d16c50ef60e47efb51fcff37df856e +Resolved 'arch/x86/mm/tlb.c' using previous resolution. +Auto-merging kernel/sched/core.c +Auto-merging include/linux/sched/mm.h +Auto-merging include/linux/sched.h +Auto-merging arch/x86/mm/tlb.c +CONFLICT (content): Merge conflict in arch/x86/mm/tlb.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 95de37d298de] next-20170825/rcu +$ git diff -M --stat --summary HEAD^.. + .../Design/Memory-Ordering/Tree-RCU-Diagram.html | 9 + + .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 707 +++ + .../TreeRCU-callback-invocation.svg | 486 ++ + .../Memory-Ordering/TreeRCU-callback-registry.svg | 655 +++ + .../RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg | 700 +++ + .../Design/Memory-Ordering/TreeRCU-gp-cleanup.svg | 1126 +++++ + .../RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg | 1309 +++++ + .../Design/Memory-Ordering/TreeRCU-gp-init-1.svg | 656 +++ + .../Design/Memory-Ordering/TreeRCU-gp-init-2.svg | 656 +++ + .../Design/Memory-Ordering/TreeRCU-gp-init-3.svg | 632 +++ + .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 5135 ++++++++++++++++++++ + .../RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg | 775 +++ + .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 1095 +++++ + .../RCU/Design/Memory-Ordering/rcu_node-lock.svg | 229 + + Documentation/RCU/stallwarn.txt | 200 +- + Documentation/admin-guide/kernel-parameters.txt | 3 + + include/linux/irq_work.h | 3 - + include/linux/sched.h | 3 +- + include/linux/sched/mm.h | 4 + + kernel/irq_work.c | 9 +- + kernel/rcu/rcutorture.c | 18 +- + kernel/rcu/tree.c | 25 +- + kernel/rcu/tree_plugin.h | 2 +- + kernel/rcu/update.c | 34 +- + kernel/sched/core.c | 10 + + 25 files changed, 14351 insertions(+), 130 deletions(-) + create mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Diagram.html + create mode 100644 Documentation/RCU/Design/Memory-Ordering/Tree-RCU-Memory-Ordering.html + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-callback-invocation.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-callback-registry.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-cleanup.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-1.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-2.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp-init-3.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-gp.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/TreeRCU-qs.svg + create mode 100644 Documentation/RCU/Design/Memory-Ordering/rcu_node-lock.svg +Merging kvm/linux-next (712b12d72451 kvm: nVMX: Validate the virtual-APIC address on nested VM-entry) +$ git merge kvm/linux-next +Resolved 'arch/x86/include/asm/cpufeatures.h' using previous resolution. +Recorded preimage for 'arch/x86/kvm/mmu.c' +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kvm/mmu.h +Auto-merging arch/x86/kvm/mmu.c +CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c +Auto-merging arch/x86/kvm/kvm_cache_regs.h +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/include/asm/cpufeatures.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h +Auto-merging arch/s390/kvm/diag.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kvm/mmu.c'. +[master 26047518a68c] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 37 ++- + arch/arm/kvm/handle_exit.c | 2 +- + arch/arm64/kvm/handle_exit.c | 2 +- + arch/mips/kvm/mips.c | 5 + + arch/powerpc/kvm/powerpc.c | 5 + + arch/s390/kvm/diag.c | 2 +- + arch/s390/kvm/kvm-s390.c | 5 + + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/kvm_emulate.h | 4 +- + arch/x86/include/asm/kvm_host.h | 40 +-- + arch/x86/include/asm/svm.h | 6 + + arch/x86/include/asm/vmx.h | 22 +- + arch/x86/kvm/cpuid.c | 34 +- + arch/x86/kvm/cpuid.h | 186 ++++------- + arch/x86/kvm/emulate.c | 42 ++- + arch/x86/kvm/hyperv.c | 8 +- + arch/x86/kvm/kvm_cache_regs.h | 2 +- + arch/x86/kvm/lapic.c | 2 - + arch/x86/kvm/lapic.h | 3 + + arch/x86/kvm/mmu.c | 267 ++++++++++------ + arch/x86/kvm/mmu.h | 23 +- + arch/x86/kvm/mmu_audit.c | 4 +- + arch/x86/kvm/mtrr.c | 2 +- + arch/x86/kvm/paging_tmpl.h | 6 +- + arch/x86/kvm/svm.c | 139 +++++---- + arch/x86/kvm/trace.h | 11 +- + arch/x86/kvm/vmx.c | 620 +++++++++++++++++++++++++++---------- + arch/x86/kvm/x86.c | 213 ++++++++----- + arch/x86/kvm/x86.h | 54 +++- + include/linux/kvm_host.h | 9 +- + virt/kvm/arm/arm.c | 5 + + virt/kvm/kvm_main.c | 7 +- + 32 files changed, 1130 insertions(+), 638 deletions(-) +Merging kvm-arm/next (012834a6cb74 KVM: arm/arm64: vgic: constify seq_operations and file_operations) +$ git merge kvm-arm/next +Merge made by the 'recursive' strategy. + arch/arm/include/asm/kvm_arm.h | 1 - + arch/arm/include/asm/kvm_emulate.h | 24 +++++++++++++++++----- + arch/arm64/include/asm/kvm_emulate.h | 24 +++++++++++++++++----- + virt/kvm/arm/mmu.c | 40 ++++++++++-------------------------- + virt/kvm/arm/vgic/vgic-debug.c | 4 ++-- + 5 files changed, 51 insertions(+), 42 deletions(-) +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 (68e26083585b KVM: s390: sthyi: remove invalid guest write access) +$ git merge kvms390/next +Auto-merging arch/s390/tools/gen_facilities.c +Auto-merging arch/s390/kvm/vsie.c +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/devices/vm.txt | 14 ++++- + arch/s390/include/asm/kvm_host.h | 6 +- + arch/s390/include/uapi/asm/kvm.h | 6 ++ + arch/s390/kvm/kvm-s390.c | 101 +++++++++++++++++++++++++++++++ + arch/s390/kvm/kvm-s390.h | 2 + + arch/s390/kvm/sigp.c | 36 ++++++----- + arch/s390/kvm/sthyi.c | 8 --- + arch/s390/kvm/vsie.c | 10 +++ + arch/s390/tools/gen_facilities.c | 2 + + 9 files changed, 156 insertions(+), 29 deletions(-) +Merging xen-tip/linux-next (fc0bf7ea44cf xen: Don't try to call xen_alloc_p2m_entry() on autotranslating guests) +$ git merge xen-tip/linux-next +Resolved 'arch/x86/entry/entry_64.S' using previous resolution. +Recorded preimage for 'arch/x86/xen/xen-asm.S' +Recorded preimage for 'arch/x86/xen/xen-asm_64.S' +Auto-merging drivers/xen/Makefile +Auto-merging arch/x86/xen/xen-ops.h +Auto-merging arch/x86/xen/xen-asm_64.S +CONFLICT (content): Merge conflict in arch/x86/xen/xen-asm_64.S +Auto-merging arch/x86/xen/xen-asm.S +CONFLICT (content): Merge conflict in arch/x86/xen/xen-asm.S +Auto-merging arch/x86/xen/mmu_pv.c +Auto-merging arch/x86/xen/enlighten_pv.c +Auto-merging arch/x86/entry/entry_64_compat.S +Auto-merging arch/x86/entry/entry_64.S +CONFLICT (content): Merge conflict in arch/x86/entry/entry_64.S +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/xen/xen-asm.S'. +Recorded resolution for 'arch/x86/xen/xen-asm_64.S'. +[master 8735037d45b2] Merge remote-tracking branch 'xen-tip/linux-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/entry/entry_64.S | 23 +- + arch/x86/entry/entry_64_compat.S | 1 - + arch/x86/include/asm/paravirt.h | 5 - + arch/x86/include/asm/paravirt_types.h | 4 - + arch/x86/include/asm/proto.h | 3 + + arch/x86/include/asm/traps.h | 33 +- + arch/x86/include/asm/xen/page.h | 5 - + arch/x86/kernel/asm-offsets_64.c | 1 - + arch/x86/kernel/paravirt.c | 3 - + arch/x86/xen/enlighten_pv.c | 96 ++- + arch/x86/xen/irq.c | 3 - + arch/x86/xen/mmu_pv.c | 20 - + arch/x86/xen/p2m.c | 25 +- + arch/x86/xen/setup.c | 5 +- + arch/x86/xen/xen-asm.S | 6 +- + arch/x86/xen/xen-asm_64.S | 44 +- + arch/x86/xen/xen-ops.h | 1 - + drivers/xen/Kconfig | 12 + + drivers/xen/Makefile | 1 + + drivers/xen/balloon.c | 8 +- + drivers/xen/events/events_fifo.c | 7 +- + drivers/xen/platform-pci.c | 2 +- + drivers/xen/pvcalls-back.c | 1240 +++++++++++++++++++++++++++++++++ + include/trace/events/xen.h | 38 - + include/xen/interface/io/pvcalls.h | 121 ++++ + include/xen/interface/io/ring.h | 2 + + include/xen/xen.h | 20 +- + 27 files changed, 1538 insertions(+), 191 deletions(-) + create mode 100644 drivers/xen/pvcalls-back.c + create mode 100644 include/xen/interface/io/pvcalls.h +Merging percpu/for-next (5e81ee3e6a79 percpu: update header to contain bitmap allocator explanation.) +$ git merge percpu/for-next +Auto-merging init/main.c +Merge made by the 'recursive' strategy. + include/linux/percpu.h | 20 +- + init/main.c | 1 - + mm/percpu-internal.h | 82 ++- + mm/percpu-km.c | 2 +- + mm/percpu-stats.c | 111 ++-- + mm/percpu.c | 1522 ++++++++++++++++++++++++++++++------------------ + 6 files changed, 1112 insertions(+), 626 deletions(-) +Merging workqueues/for-next (f7db01f6cbac Merge branch 'for-4.14' into for-next) +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. + Documentation/core-api/workqueue.rst | 10 +++++++--- + kernel/workqueue.c | 6 +++--- + 2 files changed, 10 insertions(+), 6 deletions(-) +Merging drivers-x86/for-next (c801603e6d0c platform/x86: intel-vbtn: match power button on press rather than release) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/ibm_rtl.c +Merge made by the 'recursive' strategy. + drivers/platform/x86/alienware-wmi.c | 40 ++++++++++++++------------ + drivers/platform/x86/ibm_rtl.c | 2 +- + drivers/platform/x86/intel_telemetry_debugfs.c | 1 + + drivers/platform/x86/intel_telemetry_pltdrv.c | 36 ++++++++++++++++++++++- + drivers/platform/x86/msi-wmi.c | 2 +- + drivers/platform/x86/peaq-wmi.c | 2 +- + 6 files changed, 60 insertions(+), 23 deletions(-) +Merging chrome-platform/for-next (69237e85ece7 platform/chrome: cros_ec: register shutdown function for debugfs) +$ git merge chrome-platform/for-next +Auto-merging drivers/platform/chrome/chromeos_laptop.c +Merge made by the 'recursive' strategy. + drivers/platform/chrome/chromeos_laptop.c | 22 +++++++++++----------- + drivers/platform/chrome/cros_ec_debugfs.c | 18 ++++++++++++++++++ + drivers/platform/chrome/cros_ec_debugfs.h | 2 ++ + drivers/platform/chrome/cros_ec_dev.c | 17 +++++++++++++++-- + 4 files changed, 46 insertions(+), 13 deletions(-) +Merging hsi/for-next (67ddd75771b6 HSI: core: Use kcalloc() in two functions) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (c97598467893 leds: lp8501: make several arrays static const) +$ git merge leds/for-next +Auto-merging drivers/leds/leds-aat1290.c +Auto-merging drivers/leds/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-pca955x.txt | 88 +++++++ + drivers/leds/Kconfig | 11 + + drivers/leds/leds-aat1290.c | 6 +- + drivers/leds/leds-blinkm.c | 2 +- + drivers/leds/leds-is31fl32xx.c | 4 +- + drivers/leds/leds-lm3533.c | 2 +- + drivers/leds/leds-lp5521.c | 8 +- + drivers/leds/leds-lp5562.c | 10 +- + drivers/leds/leds-lp8501.c | 6 +- + drivers/leds/leds-pca955x.c | 264 +++++++++++++++++---- + drivers/leds/leds-tlc591xx.c | 11 +- + include/dt-bindings/leds/leds-pca955x.h | 16 ++ + 12 files changed, 357 insertions(+), 71 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-pca955x.txt + create mode 100644 include/dt-bindings/leds/leds-pca955x.h +Merging ipmi/for-next (1d51142219c3 ipmi: fix unsigned long underflow) +$ git merge ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 10 ++++++---- + drivers/char/ipmi/ipmi_si_intf.c | 2 +- + 2 files changed, 7 insertions(+), 5 deletions(-) +Merging driver-core/driver-core-next (f75f6ff2eaa6 Merge 4.13-rc5 into driver-core-next) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + drivers/base/arch_topology.c | 78 +-- + drivers/base/dd.c | 28 +- + drivers/base/firmware_class.c | 13 +- + include/linux/arch_topology.h | 4 +- + include/linux/debugfs.h | 16 + + lib/test_firmware.c | 710 ++++++++++++++++++++++ + tools/testing/selftests/firmware/fw_fallback.sh | 31 + + tools/testing/selftests/firmware/fw_filesystem.sh | 241 +++++++- + 8 files changed, 1075 insertions(+), 46 deletions(-) +Merging usb/usb-next (e593beaf60e0 phy: ralink: fix 64-bit build warning) +$ git merge usb/usb-next +Auto-merging include/linux/hid.h +Auto-merging drivers/phy/mediatek/phy-mtk-tphy.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/phy/phy-mtk-tphy.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/configfs-usb-gadget-rndis | 3 + + Documentation/devicetree/bindings/mfd/wm831x.txt | 1 + + .../phy/{phy-mt65xx-usb.txt => phy-mtk-tphy.txt} | 17 +- + .../bindings/phy/phy-rockchip-inno-usb2.txt | 11 +- + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 11 + + .../devicetree/bindings/phy/ralink-usb-phy.txt | 23 + + .../devicetree/bindings/phy/sun4i-usb-phy.txt | 10 +- + Documentation/devicetree/bindings/usb/brcm,bdc.txt | 29 ++ + .../devicetree/bindings/usb/keystone-usb.txt | 17 +- + .../devicetree/bindings/usb/renesas_usb3.txt | 16 +- + MAINTAINERS | 10 +- + drivers/phy/Kconfig | 10 +- + drivers/phy/Makefile | 3 +- + drivers/phy/allwinner/phy-sun4i-usb.c | 112 ++++- + drivers/phy/broadcom/phy-brcm-sata.c | 2 +- + drivers/phy/mediatek/Kconfig | 14 + + drivers/phy/mediatek/Makefile | 5 + + .../{phy-mt65xx-usb3.c => mediatek/phy-mtk-tphy.c} | 557 ++++++++++++++++----- + drivers/phy/motorola/phy-cpcap-usb.c | 2 +- + drivers/phy/qualcomm/phy-qcom-qmp.c | 162 +++++- + drivers/phy/ralink/Kconfig | 11 + + drivers/phy/ralink/Makefile | 1 + + drivers/phy/ralink/phy-ralink-usb.c | 249 +++++++++ + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 215 ++++++-- + drivers/phy/rockchip/phy-rockchip-typec.c | 3 +- + drivers/phy/samsung/phy-exynos-dp-video.c | 5 +- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 7 +- + drivers/phy/samsung/phy-samsung-usb2.c | 9 +- + drivers/phy/ti/phy-ti-pipe3.c | 10 +- + drivers/phy/ti/phy-twl4030-usb.c | 2 +- + drivers/power/supply/wm831x_power.c | 72 +++ + drivers/usb/atm/cxacru.c | 2 - + drivers/usb/atm/speedtch.c | 6 +- + drivers/usb/atm/ueagle-atm.c | 4 +- + drivers/usb/atm/usbatm.c | 6 +- + drivers/usb/atm/xusbatm.c | 1 - + drivers/usb/c67x00/c67x00-hcd.c | 2 +- + drivers/usb/chipidea/ci_hdrc_pci.c | 1 - + drivers/usb/chipidea/core.c | 2 +- + drivers/usb/chipidea/otg_fsm.c | 2 +- + drivers/usb/class/cdc-wdm.c | 4 - + drivers/usb/class/usbtmc.c | 4 +- + drivers/usb/common/common.c | 4 +- + drivers/usb/core/hcd.c | 2 +- + drivers/usb/core/hub.c | 19 +- + drivers/usb/core/ledtrig-usbport.c | 4 +- + drivers/usb/core/sysfs.c | 2 +- + drivers/usb/dwc2/gadget.c | 2 +- + drivers/usb/dwc2/hcd.c | 6 + + drivers/usb/dwc3/dwc3-keystone.c | 22 +- + drivers/usb/dwc3/dwc3-of-simple.c | 4 +- + drivers/usb/dwc3/dwc3-omap.c | 4 +- + drivers/usb/dwc3/dwc3-pci.c | 2 +- + drivers/usb/gadget/Kconfig | 2 +- + drivers/usb/gadget/function/f_fs.c | 7 +- + drivers/usb/gadget/function/f_hid.c | 17 +- + drivers/usb/gadget/function/f_midi.c | 68 ++- + drivers/usb/gadget/function/f_ncm.c | 2 - + drivers/usb/gadget/function/f_rndis.c | 20 + + drivers/usb/gadget/function/u_audio.c | 2 +- + drivers/usb/gadget/function/u_ether.c | 2 +- + drivers/usb/gadget/function/u_ether.h | 1 - + drivers/usb/gadget/function/u_ether_configfs.h | 35 ++ + drivers/usb/gadget/function/u_rndis.h | 4 + + drivers/usb/gadget/function/u_serial.c | 2 +- + drivers/usb/gadget/legacy/webcam.c | 1 - + drivers/usb/gadget/udc/bdc/Kconfig | 1 + + drivers/usb/gadget/udc/bdc/bdc.h | 24 +- + drivers/usb/gadget/udc/bdc/bdc_core.c | 148 +++++- + drivers/usb/gadget/udc/bdc/bdc_dbg.c | 16 +- + drivers/usb/gadget/udc/bdc/bdc_ep.c | 4 +- + drivers/usb/gadget/udc/bdc/bdc_udc.c | 7 +- + drivers/usb/gadget/udc/core.c | 20 +- + drivers/usb/gadget/udc/dummy_hcd.c | 2 +- + drivers/usb/gadget/udc/fsl_qe_udc.c | 2 +- + drivers/usb/gadget/udc/mv_udc_core.c | 2 - + drivers/usb/gadget/udc/renesas_usb3.c | 117 ++++- + drivers/usb/gadget/udc/s3c2410_udc.c | 4 +- + drivers/usb/host/ehci-omap.c | 4 +- + drivers/usb/host/fsl-mph-dr-of.c | 4 +- + drivers/usb/host/hwa-hc.c | 4 +- + drivers/usb/host/imx21-hcd.c | 6 +- + drivers/usb/host/isp116x-hcd.c | 2 +- + drivers/usb/host/isp1362-hcd.c | 2 +- + drivers/usb/host/max3421-hcd.c | 2 +- + drivers/usb/host/r8a66597-hcd.c | 2 +- + drivers/usb/host/sl811-hcd.c | 2 +- + drivers/usb/host/u132-hcd.c | 2 +- + drivers/usb/host/whci/hcd.c | 2 +- + drivers/usb/host/xhci-hub.c | 94 ++-- + drivers/usb/host/xhci-plat.c | 10 +- + drivers/usb/host/xhci-rcar.c | 40 +- + drivers/usb/host/xhci-ring.c | 22 +- + drivers/usb/host/xhci-trace.h | 23 + + drivers/usb/host/xhci.h | 90 +++- + drivers/usb/image/microtek.c | 4 - + drivers/usb/isp1760/isp1760-hcd.c | 6 +- + drivers/usb/misc/adutux.c | 2 - + drivers/usb/misc/chaoskey.c | 2 - + drivers/usb/misc/cytherm.c | 1 - + drivers/usb/misc/ftdi-elan.c | 6 +- + drivers/usb/misc/idmouse.c | 2 - + drivers/usb/misc/iowarrior.c | 4 +- + drivers/usb/misc/ldusb.c | 1 - + drivers/usb/misc/legousbtower.c | 2 - + drivers/usb/misc/rio500.c | 4 - + drivers/usb/misc/sisusbvga/sisusb.c | 13 +- + drivers/usb/misc/trancevibrator.c | 2 - + drivers/usb/misc/usb251xb.c | 1 - + drivers/usb/misc/usbsevseg.c | 2 +- + drivers/usb/misc/uss720.c | 7 +- + drivers/usb/mtu3/mtu3.h | 2 + + drivers/usb/mtu3/mtu3_dr.c | 58 ++- + drivers/usb/mtu3/mtu3_gadget.c | 4 + + drivers/usb/mtu3/mtu3_gadget_ep0.c | 23 +- + drivers/usb/mtu3/mtu3_host.c | 4 +- + drivers/usb/mtu3/mtu3_hw_regs.h | 4 +- + drivers/usb/mtu3/mtu3_plat.c | 1 + + drivers/usb/phy/phy-mv-usb.c | 4 +- + drivers/usb/phy/phy-qcom-8x16-usb.c | 9 +- + drivers/usb/phy/phy-tahvo.c | 2 +- + drivers/usb/phy/phy.c | 276 +++++++++- + drivers/usb/renesas_usbhs/mod_gadget.c | 4 +- + drivers/usb/renesas_usbhs/mod_host.c | 2 +- + drivers/usb/renesas_usbhs/pipe.c | 2 +- + drivers/usb/storage/realtek_cr.c | 1 - + drivers/usb/usbip/stub_main.c | 2 - + drivers/usb/usbip/usbip_common.c | 2 - + drivers/usb/usbip/usbip_common.h | 2 - + drivers/usb/usbip/vhci_hcd.c | 2 - + drivers/usb/wusbcore/cbaf.c | 2 +- + drivers/usb/wusbcore/dev-sysfs.c | 2 +- + drivers/usb/wusbcore/wusbhc.c | 2 +- + drivers/uwb/lc-rc.c | 2 +- + include/linux/hid.h | 6 + + include/linux/usb/gadget.h | 2 + + include/linux/usb/phy.h | 49 ++ + include/uapi/linux/usb/charger.h | 31 ++ + 138 files changed, 2528 insertions(+), 556 deletions(-) + rename Documentation/devicetree/bindings/phy/{phy-mt65xx-usb.txt => phy-mtk-tphy.txt} (88%) + create mode 100644 Documentation/devicetree/bindings/phy/ralink-usb-phy.txt + create mode 100644 Documentation/devicetree/bindings/usb/brcm,bdc.txt + create mode 100644 drivers/phy/mediatek/Kconfig + create mode 100644 drivers/phy/mediatek/Makefile + rename drivers/phy/{phy-mt65xx-usb3.c => mediatek/phy-mtk-tphy.c} (51%) + create mode 100644 drivers/phy/ralink/Kconfig + create mode 100644 drivers/phy/ralink/Makefile + create mode 100644 drivers/phy/ralink/phy-ralink-usb.c + create mode 100644 include/uapi/linux/usb/charger.h +Merging usb-gadget/next (0852659ef071 usb: gadget: f_ncm/u_ether: Move 'SKB reserve' quirk setup to u_ether) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (5771a8c08880 Linux v4.13-rc1) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (dfebb5f43a78 usb: chipidea: Add support for Tegra20/30/114/124) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/core.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/Makefile | 1 + + drivers/usb/chipidea/ci_hdrc_msm.c | 2 +- + drivers/usb/chipidea/ci_hdrc_tegra.c | 155 +++++++++++++++++++++++++++++++++++ + drivers/usb/chipidea/core.c | 4 +- + drivers/usb/chipidea/udc.c | 8 +- + include/linux/usb/chipidea.h | 1 + + 6 files changed, 164 insertions(+), 7 deletions(-) + create mode 100644 drivers/usb/chipidea/ci_hdrc_tegra.c +Merging phy-next/next (d9c51f4c53ae phy: brcm-sata: fix a timeout test in init) +$ git merge phy-next/next +Already up-to-date. +Merging tty/tty-next (cf0a1579dda4 Merge 4.13-rc5 into tty-next) +$ git merge tty/tty-next +Auto-merging drivers/tty/hvc/hvc_vio.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/serial/rs485.txt | 5 +- + .../devicetree/bindings/serial/st,stm32-usart.txt | 17 +- + drivers/tty/ehv_bytechan.c | 2 +- + drivers/tty/hvc/hvc_opal.c | 16 +- + drivers/tty/hvc/hvc_vio.c | 6 +- + drivers/tty/isicom.c | 2 +- + drivers/tty/moxa.c | 2 +- + drivers/tty/mxser.c | 2 +- + drivers/tty/serdev/core.c | 2 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 7 +- + drivers/tty/serial/8250/8250_core.c | 16 +- + drivers/tty/serial/8250/8250_dw.c | 2 +- + drivers/tty/serial/8250/8250_early.c | 8 +- + drivers/tty/serial/8250/8250_exar.c | 2 +- + drivers/tty/serial/8250/8250_ingenic.c | 8 +- + drivers/tty/serial/8250/8250_of.c | 23 +- + drivers/tty/serial/8250/8250_pci.c | 43 +- + drivers/tty/serial/8250/8250_port.c | 2 +- + drivers/tty/serial/Kconfig | 4 +- + drivers/tty/serial/arc_uart.c | 4 +- + drivers/tty/serial/fsl_lpuart.c | 63 +- + drivers/tty/serial/imx.c | 13 +- + drivers/tty/serial/jsm/jsm_driver.c | 2 +- + drivers/tty/serial/mpc52xx_uart.c | 12 +- + drivers/tty/serial/omap-serial.c | 13 +- + drivers/tty/serial/owl-uart.c | 635 ++++++++++++++++++++- + drivers/tty/serial/pmac_zilog.c | 4 +- + drivers/tty/serial/serial-tegra.c | 2 +- + drivers/tty/serial/serial_core.c | 4 +- + drivers/tty/serial/sprd_serial.c | 4 +- + drivers/tty/serial/stm32-usart.c | 121 +++- + drivers/tty/serial/stm32-usart.h | 37 +- + drivers/tty/serial/sunsu.c | 4 +- + drivers/tty/serial/xilinx_uartps.c | 2 +- + drivers/tty/synclink.c | 2 +- + drivers/tty/synclink_gt.c | 2 +- + drivers/tty/synclinkmp.c | 2 +- + drivers/tty/tty_buffer.c | 26 + + include/linux/serial_core.h | 9 +- + include/linux/tty_flip.h | 3 +- + include/uapi/linux/serial_core.h | 1 + + 41 files changed, 1009 insertions(+), 125 deletions(-) +Merging char-misc/char-misc-next (4f9adc8f91ba binder: fix incorrect cmd to binder_stat_br) +$ git merge char-misc/char-misc-next +Auto-merging include/linux/hyperv.h +Auto-merging include/linux/fs.h +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/hv/channel_mgmt.c +Auto-merging drivers/hv/channel.c +Auto-merging drivers/android/binder.c +Auto-merging block/genhd.c +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Auto-merging arch/x86/include/asm/mshyperv.h +Auto-merging MAINTAINERS +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 + + MAINTAINERS | 3 +- + arch/arm/boot/dts/imx6q-evi.dts | 16 + + arch/x86/include/asm/mshyperv.h | 2 + + arch/x86/kernel/cpu/mshyperv.c | 12 +- + block/genhd.c | 18 +- + drivers/android/Kconfig | 2 +- + drivers/android/Makefile | 2 +- + drivers/android/binder.c | 3461 +++++++++++++------- + 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-hps2fpga.c | 12 +- + drivers/fpga/altera-ps-spi.c | 308 ++ + drivers/fpga/fpga-region.c | 4 +- + drivers/hv/channel.c | 14 + + drivers/hv/channel_mgmt.c | 29 +- + drivers/hv/hv_balloon.c | 12 +- + drivers/hv/hv_kvp.c | 2 +- + drivers/hv/ring_buffer.c | 169 +- + drivers/hv/vmbus_drv.c | 3 + + drivers/misc/Makefile | 1 + + drivers/misc/aspeed-lpc-snoop.c | 34 +- + drivers/misc/lkdtm.h | 30 +- + drivers/misc/lkdtm_bugs.c | 134 +- + drivers/misc/lkdtm_core.c | 28 +- + drivers/misc/lkdtm_refcount.c | 400 +++ + 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 | 67 +- + include/uapi/linux/android/binder.h | 2 + + kernel/configs/android-base.config | 1 + + tools/hv/hv_fcopy_daemon.c | 32 +- + tools/hv/hv_kvp_daemon.c | 2 +- + tools/hv/hv_vss_daemon.c | 7 + + 51 files changed, 5079 insertions(+), 1684 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 + create mode 100644 drivers/misc/lkdtm_refcount.c +Merging extcon/extcon-next (4243c408f740 extcon: max77693: Allow MHL attach notifier) +$ git merge extcon/extcon-next +Auto-merging drivers/usb/gadget/udc/snps_udc_plat.c +Auto-merging drivers/phy/rockchip/phy-rockchip-inno-usb2.c +Merge made by the 'recursive' strategy. + .../bindings/extcon/extcon-usbc-cros-ec.txt | 24 ++ + drivers/extcon/Kconfig | 7 + + drivers/extcon/Makefile | 1 + + drivers/extcon/devres.c | 50 ++- + drivers/extcon/extcon-intel-int3496.c | 2 +- + drivers/extcon/extcon-max77693.c | 5 +- + drivers/extcon/extcon-usbc-cros-ec.c | 417 +++++++++++++++++++++ + drivers/extcon/extcon.c | 279 +++++++------- + drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c | 8 +- + drivers/phy/qualcomm/phy-qcom-usb-hs.c | 14 +- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 10 +- + drivers/usb/gadget/udc/snps_udc_plat.c | 6 +- + include/linux/extcon.h | 130 +++---- + include/linux/mfd/cros_ec_commands.h | 75 ++++ + 14 files changed, 756 insertions(+), 272 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 (4d506758295a staging: rtl8723bs: remove null check before kfree) +$ git merge staging/staging-next +Recorded preimage for 'tools/Makefile' +Auto-merging tools/Makefile +CONFLICT (content): Merge conflict in tools/Makefile +Auto-merging drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +Auto-merging drivers/staging/vboxvideo/vbox_mode.c +Auto-merging drivers/staging/vboxvideo/vbox_fb.c +Auto-merging drivers/staging/vboxvideo/vbox_drv.c +Removing drivers/staging/unisys/visorbus/vmcallinterface.h +Auto-merging drivers/staging/rtl8188eu/os_dep/usb_intf.c +Removing drivers/staging/lustre/lustre/lov/lovsub_io.c +Auto-merging drivers/staging/lustre/lustre/llite/file.c +Auto-merging drivers/staging/lustre/lustre/ldlm/ldlm_flock.c +Removing drivers/staging/lustre/lustre/include/lustre_param.h +Auto-merging drivers/staging/lustre/include/uapi/linux/lustre/lustre_user.h +Auto-merging drivers/staging/lustre/include/uapi/linux/lustre/lustre_kernelcomm.h +Auto-merging drivers/staging/lustre/include/uapi/linux/lustre/lustre_ioctl.h +Auto-merging drivers/staging/lustre/include/uapi/linux/lustre/lustre_idl.h +Auto-merging drivers/staging/lustre/include/uapi/linux/lustre/lustre_fiemap.h +Auto-merging drivers/staging/lustre/include/uapi/linux/lustre/lustre_cfg.h +Auto-merging drivers/staging/lustre/include/uapi/linux/lnet/socklnd.h +Auto-merging drivers/staging/lustre/include/uapi/linux/lnet/nidstr.h +Auto-merging drivers/staging/lustre/include/uapi/linux/lnet/lnetst.h +Auto-merging drivers/staging/lustre/include/uapi/linux/lnet/lnetctl.h +Auto-merging drivers/staging/lustre/include/uapi/linux/lnet/lnet-dlc.h +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/iio/trigger/stm32-timer-trigger.c +Auto-merging drivers/iio/magnetometer/st_magn_core.c +Auto-merging drivers/iio/adc/stm32-adc-core.c +Auto-merging drivers/iio/adc/ina2xx-adc.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'tools/Makefile'. +[master 9768ebd0d8ea] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 9 + + .../bindings/iio/adc/at91-sama5d2_adc.txt | 6 + + .../devicetree/bindings/iio/adc/mt6577_auxadc.txt | 1 + + .../bindings/iio/adc/rockchip-saradc.txt | 1 + + .../devicetree/bindings/iio/adc/st,stm32-adc.txt | 5 + + .../devicetree/bindings/iio/dac/st,stm32-dac.txt | 4 +- + .../devicetree/bindings/iio/humidity/hdc100x.txt | 17 + + .../devicetree/bindings/iio/humidity/hts221.txt | 11 +- + .../devicetree/bindings/iio/humidity/htu21.txt | 13 + + .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 8 + + .../devicetree/bindings/iio/pressure/ms5637.txt | 17 + + .../devicetree/bindings/iio/st-sensors.txt | 3 + + .../devicetree/bindings/iio/temperature/tsys01.txt | 19 + + .../bindings/iio/timer/stm32-timer-trigger.txt | 6 +- + Documentation/iio/ep93xx_adc.txt | 29 + + drivers/iio/accel/bma180.c | 2 +- + drivers/iio/accel/bmc150-accel-i2c.c | 1 + + drivers/iio/accel/da311.c | 2 +- + drivers/iio/accel/sca3000.c | 6 +- + drivers/iio/accel/st_accel.h | 5 +- + drivers/iio/accel/st_accel_core.c | 6 +- + drivers/iio/accel/st_accel_i2c.c | 8 +- + drivers/iio/accel/st_accel_spi.c | 86 +- + drivers/iio/adc/Kconfig | 33 +- + drivers/iio/adc/Makefile | 3 + + drivers/iio/adc/ad7766.c | 6 +- + drivers/iio/adc/at91-sama5d2_adc.c | 329 +- + drivers/iio/adc/at91_adc.c | 2 +- + drivers/iio/adc/dln2-adc.c | 722 + + drivers/iio/adc/ep93xx_adc.c | 255 + + drivers/iio/adc/ina2xx-adc.c | 36 +- + drivers/iio/adc/ltc2471.c | 160 + + drivers/iio/adc/ltc2497.c | 54 +- + drivers/iio/adc/max9611.c | 4 +- + drivers/iio/adc/mcp3422.c | 6 +- + drivers/iio/adc/meson_saradc.c | 13 +- + drivers/iio/adc/mt6577_auxadc.c | 37 + + drivers/iio/adc/rockchip_saradc.c | 8 +- + drivers/iio/adc/stm32-adc-core.c | 2 +- + drivers/iio/adc/stm32-adc.c | 140 +- + drivers/iio/adc/ti-ads1015.c | 611 +- + drivers/iio/adc/ti-ads7950.c | 42 +- + drivers/iio/adc/xilinx-xadc-events.c | 38 +- + drivers/iio/adc/xilinx-xadc.h | 10 +- + drivers/iio/chemical/Kconfig | 9 + + drivers/iio/chemical/Makefile | 1 + + drivers/iio/chemical/ccs811.c | 405 + + drivers/iio/common/st_sensors/st_sensors_core.c | 31 + + drivers/iio/common/st_sensors/st_sensors_i2c.c | 29 - + drivers/iio/dac/stm32-dac-core.c | 40 +- + drivers/iio/dac/stm32-dac.c | 2 +- + drivers/iio/gyro/mpu3050-core.c | 10 - + drivers/iio/gyro/st_gyro.h | 1 + + drivers/iio/gyro/st_gyro_core.c | 13 +- + drivers/iio/gyro/st_gyro_i2c.c | 8 +- + drivers/iio/gyro/st_gyro_spi.c | 54 + + drivers/iio/humidity/Kconfig | 3 +- + drivers/iio/humidity/hdc100x.c | 22 + + drivers/iio/humidity/hts221.h | 11 +- + drivers/iio/humidity/hts221_buffer.c | 43 +- + drivers/iio/humidity/hts221_core.c | 144 +- + drivers/iio/humidity/htu21.c | 8 + + drivers/iio/imu/adis16400_core.c | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 17 + + drivers/iio/inkern.c | 6 +- + drivers/iio/light/apds9300.c | 2 +- + drivers/iio/light/rpr0521.c | 336 +- + drivers/iio/light/tcs3472.c | 4 +- + drivers/iio/light/tsl2583.c | 2 +- + drivers/iio/magnetometer/Kconfig | 4 +- + drivers/iio/magnetometer/ak8974.c | 133 +- + drivers/iio/magnetometer/ak8975.c | 2 + + drivers/iio/magnetometer/st_magn.h | 1 + + drivers/iio/magnetometer/st_magn_core.c | 3 +- + drivers/iio/magnetometer/st_magn_i2c.c | 8 +- + drivers/iio/magnetometer/st_magn_spi.c | 30 + + drivers/iio/orientation/hid-sensor-rotation.c | 2 +- + drivers/iio/pressure/ms5637.c | 12 +- + drivers/iio/pressure/st_pressure_core.c | 4 +- + drivers/iio/pressure/st_pressure_i2c.c | 3 +- + drivers/iio/pressure/st_pressure_spi.c | 33 + + drivers/iio/pressure/zpa2326.c | 12 +- + drivers/iio/proximity/Kconfig | 8 +- + drivers/iio/proximity/srf08.c | 227 +- + drivers/iio/temperature/tsys01.c | 7 + + drivers/iio/trigger/stm32-timer-trigger.c | 78 +- + drivers/staging/Kconfig | 4 + + drivers/staging/Makefile | 2 + + 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 | 246 +- + drivers/staging/ccree/ssi_aead.h | 12 +- + drivers/staging/ccree/ssi_buffer_mgr.c | 473 +- + drivers/staging/ccree/ssi_cipher.c | 185 +- + drivers/staging/ccree/ssi_driver.c | 64 +- + 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 | 276 +- + drivers/staging/ccree/ssi_ivgen.c | 13 +- + drivers/staging/ccree/ssi_pm.c | 4 +- + drivers/staging/ccree/ssi_request_mgr.c | 54 +- + drivers/staging/ccree/ssi_sram_mgr.c | 6 +- + drivers/staging/ccree/ssi_sysfs.c | 80 +- + drivers/staging/comedi/comedi_buf.c | 2 +- + drivers/staging/comedi/comedi_fops.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 3 +- + drivers/staging/fbtft/fbtft-core.c | 4 +- + drivers/staging/fsl-dpaa2/Kconfig | 2 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 6 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c | 2 - + drivers/staging/fsl-dpaa2/ethernet/dpni.c | 2 +- + drivers/staging/fsl-mc/bus/Kconfig | 4 +- + drivers/staging/fsl-mc/bus/dpio/qbman-portal.c | 24 +- + drivers/staging/fsl-mc/bus/dprc-driver.c | 5 +- + drivers/staging/fsl-mc/bus/fsl-mc-bus.c | 4 +- + drivers/staging/fsl-mc/bus/fsl-mc-msi.c | 9 +- + .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 11 +- + drivers/staging/fsl-mc/bus/mc-io.c | 11 +- + drivers/staging/fsl-mc/bus/mc-sys.c | 36 +- + drivers/staging/fsl-mc/include/dpaa2-io.h | 1 + + drivers/staging/goldfish/goldfish_nand.c | 20 +- + drivers/staging/greybus/arche-platform.c | 14 +- + drivers/staging/greybus/audio_codec.c | 2 +- + drivers/staging/greybus/gbphy.c | 2 +- + drivers/staging/greybus/interface.c | 40 +- + drivers/staging/greybus/spilib.h | 3 +- + drivers/staging/greybus/tools/loopback_test.c | 48 +- + drivers/staging/greybus/usb.c | 2 +- + drivers/staging/greybus/vibrator.c | 8 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 90 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 2 +- + drivers/staging/gs_fpgaboot/io.c | 4 - + drivers/staging/iio/adc/ad7280a.c | 21 +- + drivers/staging/iio/adc/ad7606_par.c | 4 +- + drivers/staging/iio/light/tsl2x7x.c | 372 +- + drivers/staging/ks7010/ks_wlan_net.c | 2 +- + .../staging/lustre/include/linux/libcfs/libcfs.h | 28 +- + .../lustre/include/linux/libcfs/libcfs_debug.h | 104 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 26 - + drivers/staging/lustre/include/linux/lnet/api.h | 2 +- + .../staging/lustre/include/linux/lnet/lib-lnet.h | 15 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 50 +- + .../staging/lustre/include/linux/lnet/socklnd.h | 15 +- + .../lustre/include/uapi/linux/lnet/libcfs_debug.h | 149 + + .../libcfs => uapi/linux/lnet}/libcfs_ioctl.h | 0 + .../lnet/lib-dlc.h => uapi/linux/lnet/lnet-dlc.h} | 4 +- + .../lnet/types.h => uapi/linux/lnet/lnet-types.h} | 0 + .../lustre/include/{ => uapi}/linux/lnet/lnetctl.h | 51 +- + .../lustre/include/{ => uapi}/linux/lnet/lnetst.h | 129 +- + .../lustre/include/{ => uapi}/linux/lnet/nidstr.h | 2 +- + .../lnet/lnet.h => uapi/linux/lnet/socklnd.h} | 24 +- + .../uapi/linux/lustre}/lustre_cfg.h | 188 +- + .../lustre/include/uapi/linux/lustre/lustre_fid.h | 293 + + .../uapi/linux/lustre/lustre_fiemap.h} | 6 +- + .../uapi/linux}/lustre/lustre_idl.h | 689 +- + .../uapi/linux}/lustre/lustre_ioctl.h | 203 +- + .../uapi/linux/lustre/lustre_kernelcomm.h} | 6 +- + .../include/uapi/linux/lustre/lustre_ostid.h | 236 + + .../include/uapi/linux/lustre/lustre_param.h | 94 + + .../uapi/linux}/lustre/lustre_user.h | 15 +- + .../uapi/linux/lustre}/lustre_ver.h | 0 + drivers/staging/lustre/lnet/klnds/o2iblnd/Makefile | 3 + + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 5 +- + drivers/staging/lustre/lnet/klnds/socklnd/Makefile | 3 + + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 18 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 20 +- + drivers/staging/lustre/lnet/libcfs/Makefile | 3 + + drivers/staging/lustre/lnet/libcfs/debug.c | 2 +- + drivers/staging/lustre/lnet/libcfs/fail.c | 2 +- + drivers/staging/lustre/lnet/libcfs/hash.c | 49 +- + drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c | 2 +- + drivers/staging/lustre/lnet/libcfs/libcfs_lock.c | 2 +- + drivers/staging/lustre/lnet/libcfs/libcfs_mem.c | 2 +- + drivers/staging/lustre/lnet/libcfs/libcfs_string.c | 2 +- + .../staging/lustre/lnet/libcfs/linux/linux-cpu.c | 2 +- + .../lustre/lnet/libcfs/linux/linux-crypto.c | 4 +- + .../lustre/lnet/libcfs/linux/linux-curproc.c | 2 +- + .../staging/lustre/lnet/libcfs/linux/linux-debug.c | 2 +- + .../staging/lustre/lnet/libcfs/linux/linux-mem.c | 2 +- + .../lustre/lnet/libcfs/linux/linux-module.c | 4 +- + .../staging/lustre/lnet/libcfs/linux/linux-prim.c | 2 +- + .../lustre/lnet/libcfs/linux/linux-tracefile.c | 2 +- + drivers/staging/lustre/lnet/libcfs/module.c | 9 +- + drivers/staging/lustre/lnet/libcfs/prng.c | 2 +- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 2 +- + drivers/staging/lustre/lnet/libcfs/tracefile.h | 2 +- + drivers/staging/lustre/lnet/libcfs/workitem.c | 2 +- + drivers/staging/lustre/lnet/lnet/Makefile | 3 + + drivers/staging/lustre/lnet/lnet/acceptor.c | 2 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 4 +- + drivers/staging/lustre/lnet/lnet/config.c | 2 +- + drivers/staging/lustre/lnet/lnet/lib-eq.c | 3 +- + drivers/staging/lustre/lnet/lnet/lib-md.c | 2 +- + drivers/staging/lustre/lnet/lnet/lib-me.c | 2 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 2 +- + drivers/staging/lustre/lnet/lnet/lib-msg.c | 2 +- + drivers/staging/lustre/lnet/lnet/lib-ptl.c | 2 +- + drivers/staging/lustre/lnet/lnet/lib-socket.c | 4 +- + drivers/staging/lustre/lnet/lnet/lo.c | 3 +- + drivers/staging/lustre/lnet/lnet/module.c | 5 +- + drivers/staging/lustre/lnet/lnet/net_fault.c | 4 +- + drivers/staging/lustre/lnet/lnet/nidstrings.c | 4 +- + drivers/staging/lustre/lnet/lnet/peer.c | 4 +- + drivers/staging/lustre/lnet/lnet/router.c | 3 +- + drivers/staging/lustre/lnet/lnet/router_proc.c | 5 +- + drivers/staging/lustre/lnet/selftest/Makefile | 3 + + drivers/staging/lustre/lnet/selftest/conctl.c | 8 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 9 +- + drivers/staging/lustre/lnet/selftest/conrpc.h | 7 +- + drivers/staging/lustre/lnet/selftest/console.c | 4 +- + drivers/staging/lustre/lnet/selftest/console.h | 7 +- + drivers/staging/lustre/lnet/selftest/rpc.h | 2 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 9 +- + drivers/staging/lustre/lustre/Kconfig | 10 - + drivers/staging/lustre/lustre/fid/Makefile | 3 + + drivers/staging/lustre/lustre/fid/fid_internal.h | 4 +- + drivers/staging/lustre/lustre/fid/fid_lib.c | 5 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 12 +- + drivers/staging/lustre/lustre/fid/lproc_fid.c | 12 +- + drivers/staging/lustre/lustre/fld/Makefile | 3 + + drivers/staging/lustre/lustre/fld/fld_cache.c | 19 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 8 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 18 +- + drivers/staging/lustre/lustre/fld/lproc_fld.c | 14 +- + drivers/staging/lustre/lustre/include/cl_object.h | 6 +- + .../staging/lustre/lustre/include/interval_tree.h | 4 + + drivers/staging/lustre/lustre/include/llog_swab.h | 3 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 10 +- + drivers/staging/lustre/lustre/include/lu_object.h | 6 +- + .../staging/lustre/lustre/include/lustre_compat.h | 2 +- + .../staging/lustre/lustre/include/lustre_debug.h | 4 +- + .../staging/lustre/lustre/include/lustre_disk.h | 23 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 25 +- + .../lustre/include/{lustre => }/lustre_errno.h | 0 + .../staging/lustre/lustre/include/lustre_export.h | 6 +- + drivers/staging/lustre/lustre/include/lustre_fid.h | 84 +- + drivers/staging/lustre/lustre/include/lustre_fld.h | 5 +- + .../staging/lustre/lustre/include/lustre_handles.h | 2 +- + .../staging/lustre/lustre/include/lustre_import.h | 4 +- + .../lustre/lustre/include/lustre_kernelcomm.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_lib.h | 12 +- + .../staging/lustre/lustre/include/lustre_linkea.h | 15 +- + drivers/staging/lustre/lustre/include/lustre_lmv.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_log.h | 4 +- + drivers/staging/lustre/lustre/include/lustre_mdc.h | 15 +- + drivers/staging/lustre/lustre/include/lustre_mds.h | 11 +- + drivers/staging/lustre/lustre/include/lustre_net.h | 39 +- + drivers/staging/lustre/lustre/include/lustre_nrs.h | 2 +- + .../staging/lustre/lustre/include/lustre_obdo.h | 2 +- + .../staging/lustre/lustre/include/lustre_param.h | 109 - + .../staging/lustre/lustre/include/lustre_swab.h | 8 +- + drivers/staging/lustre/lustre/include/obd.h | 20 +- + drivers/staging/lustre/lustre/include/obd_cksum.h | 6 +- + drivers/staging/lustre/lustre/include/obd_class.h | 44 +- + .../staging/lustre/lustre/include/obd_support.h | 6 +- + drivers/staging/lustre/lustre/include/seq_range.h | 2 +- + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 46 +- + drivers/staging/lustre/lustre/ldlm/l_lock.c | 6 +- + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 12 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 8 +- + .../staging/lustre/lustre/ldlm/ldlm_inodebits.c | 6 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 9 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 12 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 17 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 8 +- + drivers/staging/lustre/lustre/ldlm/ldlm_plain.c | 6 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 8 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 34 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 53 +- + drivers/staging/lustre/lustre/llite/Makefile | 3 + + drivers/staging/lustre/lustre/llite/dcache.c | 6 +- + drivers/staging/lustre/lustre/llite/dir.c | 22 +- + drivers/staging/lustre/lustre/llite/file.c | 13 +- + drivers/staging/lustre/lustre/llite/glimpse.c | 16 +- + drivers/staging/lustre/lustre/llite/lcommon_cl.c | 35 +- + drivers/staging/lustre/lustre/llite/lcommon_misc.c | 8 +- + .../staging/lustre/lustre/llite/llite_internal.h | 20 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 27 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 4 +- + drivers/staging/lustre/lustre/llite/namei.c | 9 +- + drivers/staging/lustre/lustre/llite/range_lock.c | 2 +- + drivers/staging/lustre/lustre/llite/range_lock.h | 4 +- + drivers/staging/lustre/lustre/llite/rw.c | 4 +- + drivers/staging/lustre/lustre/llite/statahead.c | 4 +- + drivers/staging/lustre/lustre/llite/super25.c | 6 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 7 +- + drivers/staging/lustre/lustre/llite/vvp_internal.h | 4 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_lock.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_object.c | 4 +- + drivers/staging/lustre/lustre/llite/xattr.c | 6 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 5 +- + .../staging/lustre/lustre/llite/xattr_security.c | 23 +- + drivers/staging/lustre/lustre/lmv/Makefile | 3 + + drivers/staging/lustre/lustre/lmv/lmv_fld.c | 15 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 22 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 8 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 184 +- + drivers/staging/lustre/lustre/lmv/lproc_lmv.c | 6 +- + drivers/staging/lustre/lustre/lov/Makefile | 5 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 96 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 87 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 29 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 31 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 152 +- + drivers/staging/lustre/lustre/lov/lov_lock.c | 11 - + drivers/staging/lustre/lustre/lov/lov_merge.c | 4 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 43 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 469 +- + drivers/staging/lustre/lustre/lov/lov_offset.c | 4 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 13 +- + drivers/staging/lustre/lustre/lov/lov_page.c | 1 - + drivers/staging/lustre/lustre/lov/lov_pool.c | 4 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 46 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 1 - + drivers/staging/lustre/lustre/lov/lovsub_io.c | 51 - + drivers/staging/lustre/lustre/lov/lovsub_lock.c | 2 - + drivers/staging/lustre/lustre/lov/lproc_lov.c | 6 +- + drivers/staging/lustre/lustre/mdc/Makefile | 3 + + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 8 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 10 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 26 +- + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 4 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 25 +- + drivers/staging/lustre/lustre/mgc/Makefile | 3 + + drivers/staging/lustre/lustre/mgc/lproc_mgc.c | 4 +- + drivers/staging/lustre/lustre/mgc/mgc_internal.h | 11 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 39 +- + drivers/staging/lustre/lustre/obdclass/Makefile | 3 + + drivers/staging/lustre/lustre/obdclass/cl_io.c | 8 +- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 8 +- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 14 +- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 8 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 35 +- + drivers/staging/lustre/lustre/obdclass/debug.c | 6 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 6 +- + .../staging/lustre/lustre/obdclass/kernelcomm.c | 4 +- + drivers/staging/lustre/lustre/obdclass/linkea.c | 75 +- + .../lustre/lustre/obdclass/linux/linux-module.c | 102 +- + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 8 +- + drivers/staging/lustre/lustre/obdclass/llog.c | 6 +- + drivers/staging/lustre/lustre/obdclass/llog_cat.c | 2 +- + .../staging/lustre/lustre/obdclass/llog_internal.h | 2 +- + drivers/staging/lustre/lustre/obdclass/llog_obd.c | 4 +- + drivers/staging/lustre/lustre/obdclass/llog_swab.c | 4 +- + .../lustre/lustre/obdclass/lprocfs_counters.c | 4 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 8 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 20 +- + drivers/staging/lustre/lustre/obdclass/lu_ref.c | 10 +- + .../lustre/lustre/obdclass/lustre_handles.c | 6 +- + .../staging/lustre/lustre/obdclass/lustre_peer.c | 14 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 74 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 44 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 6 +- + .../staging/lustre/lustre/obdclass/statfs_pack.c | 8 +- + drivers/staging/lustre/lustre/obdclass/uuid.c | 6 +- + drivers/staging/lustre/lustre/obdecho/Makefile | 3 + + .../staging/lustre/lustre/obdecho/echo_client.c | 33 +- + drivers/staging/lustre/lustre/osc/Makefile | 3 + + drivers/staging/lustre/lustre/osc/lproc_osc.c | 8 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 31 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 6 +- + drivers/staging/lustre/lustre/osc/osc_dev.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 2 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_lock.c | 4 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 9 +- + drivers/staging/lustre/lustre/osc/osc_quota.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 32 +- + drivers/staging/lustre/lustre/ptlrpc/Makefile | 3 + + drivers/staging/lustre/lustre/ptlrpc/client.c | 47 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/errno.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 18 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 18 +- + drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/llog_net.c | 6 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 27 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 10 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 10 +- + drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 6 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 20 +- + drivers/staging/lustre/lustre/ptlrpc/pers.c | 10 +- + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 4 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 18 +- + drivers/staging/lustre/lustre/ptlrpc/recover.c | 18 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 16 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 20 +- + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 13 +- + drivers/staging/lustre/lustre/ptlrpc/sec_gc.c | 12 +- + drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 16 +- + drivers/staging/lustre/lustre/ptlrpc/sec_null.c | 10 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 10 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 26 +- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 24 +- + drivers/staging/most/hdm-dim2/dim2_hdm.c | 10 +- + drivers/staging/most/hdm-usb/hdm_usb.c | 22 +- + drivers/staging/nvec/nvec.c | 2 +- + drivers/staging/octeon/ethernet-rx.c | 79 +- + .../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 | 1341 ++ + drivers/staging/pi433/pi433_if.h | 152 + + drivers/staging/pi433/rf69.c | 1032 ++ + drivers/staging/pi433/rf69.h | 82 + + drivers/staging/pi433/rf69_enum.h | 201 + + drivers/staging/pi433/rf69_registers.h | 489 + + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 6 +- + drivers/staging/rtl8188eu/include/rtw_ioctl.h | 3 +- + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 78 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 23 +- + drivers/staging/rtl8192u/r8192U_hw.h | 11 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 2 +- + 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/rtl8712/usb_intf.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_btcoex.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 5 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_odm.c | 38 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 4 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 14 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 4 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 1008 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 10 +- + drivers/staging/rtlwifi/Kconfig | 22 + + drivers/staging/rtlwifi/Makefile | 70 + + drivers/staging/rtlwifi/TODO | 11 + + drivers/staging/rtlwifi/base.c | 2823 ++++ + drivers/staging/rtlwifi/base.h | 186 + + drivers/staging/rtlwifi/btcoexist/Makefile | 8 + + drivers/staging/rtlwifi/btcoexist/halbt_precomp.h | 85 + + .../staging/rtlwifi/btcoexist/halbtc8822b1ant.c | 5244 ++++++++ + .../staging/rtlwifi/btcoexist/halbtc8822b1ant.h | 444 + + .../staging/rtlwifi/btcoexist/halbtc8822b2ant.c | 5225 ++++++++ + .../staging/rtlwifi/btcoexist/halbtc8822b2ant.h | 498 + + .../rtlwifi/btcoexist/halbtc8822bwifionly.c | 65 + + .../rtlwifi/btcoexist/halbtc8822bwifionly.h | 35 + + drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 1881 +++ + drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.h | 802 ++ + drivers/staging/rtlwifi/btcoexist/rtl_btc.c | 528 + + drivers/staging/rtlwifi/btcoexist/rtl_btc.h | 75 + + drivers/staging/rtlwifi/cam.c | 326 + + drivers/staging/rtlwifi/cam.h | 50 + + drivers/staging/rtlwifi/core.c | 2046 +++ + drivers/staging/rtlwifi/core.h | 86 + + drivers/staging/rtlwifi/debug.c | 592 + + drivers/staging/rtlwifi/debug.h | 234 + + drivers/staging/rtlwifi/efuse.c | 1342 ++ + drivers/staging/rtlwifi/efuse.h | 120 + + drivers/staging/rtlwifi/halmac/halmac_2_platform.h | 52 + + .../halmac_88xx/halmac_8822b/halmac_8822b_cfg.h | 132 + + .../halmac_88xx/halmac_8822b/halmac_8822b_phy.c | 106 + + .../halmac_8822b/halmac_8822b_pwr_seq.c | 563 + + .../halmac_8822b/halmac_8822b_pwr_seq.h | 40 + + .../halmac_88xx/halmac_8822b/halmac_api_8822b.c | 343 + + .../halmac_88xx/halmac_8822b/halmac_api_8822b.h | 44 + + .../halmac_8822b/halmac_api_8822b_pcie.c | 323 + + .../halmac_8822b/halmac_api_8822b_pcie.h | 53 + + .../halmac_8822b/halmac_api_8822b_sdio.c | 184 + + .../halmac_8822b/halmac_api_8822b_sdio.h | 42 + + .../halmac_8822b/halmac_api_8822b_usb.c | 185 + + .../halmac_8822b/halmac_api_8822b_usb.h | 45 + + .../halmac_88xx/halmac_8822b/halmac_func_8822b.c | 414 + + .../halmac_88xx/halmac_8822b/halmac_func_8822b.h | 38 + + .../rtlwifi/halmac/halmac_88xx/halmac_88xx_cfg.h | 171 + + .../rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c | 5978 +++++++++ + .../rtlwifi/halmac/halmac_88xx/halmac_api_88xx.h | 396 + + .../halmac/halmac_88xx/halmac_api_88xx_pcie.c | 329 + + .../halmac/halmac_88xx/halmac_api_88xx_pcie.h | 71 + + .../halmac/halmac_88xx/halmac_api_88xx_sdio.c | 974 ++ + .../halmac/halmac_88xx/halmac_api_88xx_sdio.h | 84 + + .../halmac/halmac_88xx/halmac_api_88xx_usb.c | 554 + + .../halmac/halmac_88xx/halmac_api_88xx_usb.h | 73 + + .../rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c | 4494 +++++++ + .../rtlwifi/halmac/halmac_88xx/halmac_func_88xx.h | 321 + + drivers/staging/rtlwifi/halmac/halmac_api.c | 426 + + drivers/staging/rtlwifi/halmac/halmac_api.h | 82 + + drivers/staging/rtlwifi/halmac/halmac_bit2.h | 13407 +++++++++++++++++++ + drivers/staging/rtlwifi/halmac/halmac_bit_8822b.h | 12103 +++++++++++++++++ + drivers/staging/rtlwifi/halmac/halmac_fw_info.h | 122 + + .../rtlwifi/halmac/halmac_fw_offload_c2h_nic.h | 184 + + .../rtlwifi/halmac/halmac_fw_offload_h2c_nic.h | 515 + + .../rtlwifi/halmac/halmac_h2c_extra_info_nic.h | 115 + + .../staging/rtlwifi/halmac/halmac_intf_phy_cmd.h | 54 + + .../rtlwifi/halmac/halmac_original_c2h_nic.h | 403 + + .../rtlwifi/halmac/halmac_original_h2c_nic.h | 1011 ++ + drivers/staging/rtlwifi/halmac/halmac_pcie_reg.h | 28 + + .../staging/rtlwifi/halmac/halmac_pwr_seq_cmd.h | 116 + + drivers/staging/rtlwifi/halmac/halmac_reg2.h | 1132 ++ + drivers/staging/rtlwifi/halmac/halmac_reg_8822b.h | 728 + + drivers/staging/rtlwifi/halmac/halmac_rx_bd_chip.h | 48 + + drivers/staging/rtlwifi/halmac/halmac_rx_bd_nic.h | 48 + + .../staging/rtlwifi/halmac/halmac_rx_desc_chip.h | 118 + + .../staging/rtlwifi/halmac/halmac_rx_desc_nic.h | 133 + + drivers/staging/rtlwifi/halmac/halmac_sdio_reg.h | 62 + + drivers/staging/rtlwifi/halmac/halmac_tx_bd_chip.h | 118 + + drivers/staging/rtlwifi/halmac/halmac_tx_bd_nic.h | 123 + + .../staging/rtlwifi/halmac/halmac_tx_desc_chip.h | 444 + + .../staging/rtlwifi/halmac/halmac_tx_desc_nic.h | 506 + + drivers/staging/rtlwifi/halmac/halmac_type.h | 1934 +++ + drivers/staging/rtlwifi/halmac/halmac_usb_reg.h | 28 + + drivers/staging/rtlwifi/halmac/rtl_halmac.c | 1410 ++ + drivers/staging/rtlwifi/halmac/rtl_halmac.h | 94 + + drivers/staging/rtlwifi/pci.c | 2508 ++++ + drivers/staging/rtlwifi/pci.h | 329 + + drivers/staging/rtlwifi/phydm/halphyrf_ce.c | 965 ++ + drivers/staging/rtlwifi/phydm/halphyrf_ce.h | 85 + + drivers/staging/rtlwifi/phydm/mp_precomp.h | 24 + + drivers/staging/rtlwifi/phydm/phydm.c | 1986 +++ + drivers/staging/rtlwifi/phydm/phydm.h | 946 ++ + drivers/staging/rtlwifi/phydm/phydm_acs.c | 200 + + drivers/staging/rtlwifi/phydm/phydm_acs.h | 57 + + drivers/staging/rtlwifi/phydm/phydm_adaptivity.c | 941 ++ + drivers/staging/rtlwifi/phydm/phydm_adaptivity.h | 119 + + drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 628 + + drivers/staging/rtlwifi/phydm/phydm_adc_sampling.h | 96 + + drivers/staging/rtlwifi/phydm/phydm_antdiv.c | 83 + + drivers/staging/rtlwifi/phydm/phydm_antdiv.h | 301 + + drivers/staging/rtlwifi/phydm/phydm_beamforming.h | 48 + + drivers/staging/rtlwifi/phydm/phydm_ccx.c | 457 + + drivers/staging/rtlwifi/phydm/phydm_ccx.h | 83 + + drivers/staging/rtlwifi/phydm/phydm_cfotracking.c | 343 + + drivers/staging/rtlwifi/phydm/phydm_cfotracking.h | 60 + + drivers/staging/rtlwifi/phydm/phydm_debug.c | 2910 ++++ + drivers/staging/rtlwifi/phydm/phydm_debug.h | 175 + + drivers/staging/rtlwifi/phydm/phydm_dfs.h | 59 + + drivers/staging/rtlwifi/phydm/phydm_dig.c | 1535 +++ + drivers/staging/rtlwifi/phydm/phydm_dig.h | 241 + + .../staging/rtlwifi/phydm/phydm_dynamic_rx_path.h | 37 + + .../rtlwifi/phydm/phydm_dynamicbbpowersaving.c | 129 + + .../rtlwifi/phydm/phydm_dynamicbbpowersaving.h | 50 + + .../staging/rtlwifi/phydm/phydm_dynamictxpower.c | 102 + + .../staging/rtlwifi/phydm/phydm_dynamictxpower.h | 64 + + .../staging/rtlwifi/phydm/phydm_edcaturbocheck.c | 139 + + .../staging/rtlwifi/phydm/phydm_edcaturbocheck.h | 44 + + drivers/staging/rtlwifi/phydm/phydm_features.h | 33 + + drivers/staging/rtlwifi/phydm/phydm_hwconfig.c | 1928 +++ + drivers/staging/rtlwifi/phydm/phydm_hwconfig.h | 510 + + drivers/staging/rtlwifi/phydm/phydm_interface.c | 341 + + drivers/staging/rtlwifi/phydm/phydm_interface.h | 205 + + drivers/staging/rtlwifi/phydm/phydm_iqk.h | 76 + + drivers/staging/rtlwifi/phydm/phydm_kfree.c | 228 + + drivers/staging/rtlwifi/phydm/phydm_kfree.h | 42 + + drivers/staging/rtlwifi/phydm/phydm_noisemonitor.c | 330 + + drivers/staging/rtlwifi/phydm/phydm_noisemonitor.h | 46 + + .../staging/rtlwifi/phydm/phydm_powertracking_ce.c | 644 + + .../staging/rtlwifi/phydm/phydm_powertracking_ce.h | 293 + + drivers/staging/rtlwifi/phydm/phydm_pre_define.h | 613 + + drivers/staging/rtlwifi/phydm/phydm_precomp.h | 85 + + drivers/staging/rtlwifi/phydm/phydm_psd.c | 422 + + drivers/staging/rtlwifi/phydm/phydm_psd.h | 67 + + drivers/staging/rtlwifi/phydm/phydm_rainfo.c | 1208 ++ + drivers/staging/rtlwifi/phydm/phydm_rainfo.h | 269 + + drivers/staging/rtlwifi/phydm/phydm_reg.h | 151 + + .../staging/rtlwifi/phydm/phydm_regdefine11ac.h | 94 + + drivers/staging/rtlwifi/phydm/phydm_regdefine11n.h | 213 + + drivers/staging/rtlwifi/phydm/phydm_types.h | 130 + + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.c | 1969 +++ + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.h | 54 + + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.c | 222 + + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.h | 38 + + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.c | 4744 +++++++ + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.h | 129 + + .../rtlwifi/phydm/rtl8822b/halphyrf_8822b.c | 351 + + .../rtlwifi/phydm/rtl8822b/halphyrf_8822b.h | 45 + + .../rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.c | 1815 +++ + .../rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.h | 84 + + .../rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.c | 1410 ++ + .../rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.h | 48 + + .../rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.c | 168 + + .../rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.h | 54 + + .../rtlwifi/phydm/rtl8822b/phydm_rtl8822b.c | 225 + + .../rtlwifi/phydm/rtl8822b/phydm_rtl8822b.h | 30 + + .../rtlwifi/phydm/rtl8822b/version_rtl8822b.h | 34 + + drivers/staging/rtlwifi/phydm/rtl_phydm.c | 874 ++ + drivers/staging/rtlwifi/phydm/rtl_phydm.h | 45 + + drivers/staging/rtlwifi/phydm/txbf/halcomtxbf.h | 67 + + drivers/staging/rtlwifi/phydm/txbf/haltxbf8822b.h | 39 + + .../staging/rtlwifi/phydm/txbf/haltxbfinterface.h | 38 + + drivers/staging/rtlwifi/phydm/txbf/haltxbfjaguar.h | 36 + + .../rtlwifi/phydm/txbf/phydm_hal_txbf_api.h | 41 + + drivers/staging/rtlwifi/ps.c | 1007 ++ + drivers/staging/rtlwifi/ps.h | 50 + + drivers/staging/rtlwifi/pwrseqcmd.h | 94 + + drivers/staging/rtlwifi/rc.c | 322 + + drivers/staging/rtlwifi/rc.h | 49 + + drivers/staging/rtlwifi/regd.c | 469 + + drivers/staging/rtlwifi/regd.h | 63 + + drivers/staging/rtlwifi/rtl8822be/Makefile | 7 + + drivers/staging/rtlwifi/rtl8822be/def.h | 82 + + drivers/staging/rtlwifi/rtl8822be/fw.c | 968 ++ + drivers/staging/rtlwifi/rtl8822be/fw.h | 198 + + drivers/staging/rtlwifi/rtl8822be/hw.c | 2441 ++++ + drivers/staging/rtlwifi/rtl8822be/hw.h | 66 + + drivers/staging/rtlwifi/rtl8822be/led.c | 127 + + drivers/staging/rtlwifi/rtl8822be/led.h | 34 + + drivers/staging/rtlwifi/rtl8822be/phy.c | 2233 +++ + drivers/staging/rtlwifi/rtl8822be/phy.h | 145 + + drivers/staging/rtlwifi/rtl8822be/reg.h | 1653 +++ + drivers/staging/rtlwifi/rtl8822be/sw.c | 481 + + drivers/staging/rtlwifi/rtl8822be/sw.h | 32 + + drivers/staging/rtlwifi/rtl8822be/trx.c | 1022 ++ + drivers/staging/rtlwifi/rtl8822be/trx.h | 165 + + drivers/staging/rtlwifi/stats.c | 260 + + drivers/staging/rtlwifi/stats.h | 42 + + drivers/staging/rtlwifi/wifi.h | 3375 +++++ + drivers/staging/rts5208/ms.c | 5 +- + drivers/staging/rts5208/rtsx.c | 4 +- + drivers/staging/rts5208/rtsx_chip.c | 4 +- + drivers/staging/rts5208/rtsx_scsi.c | 2 +- + drivers/staging/rts5208/sd.c | 21 +- + drivers/staging/rts5208/spi.c | 8 +- + drivers/staging/rts5208/xd.c | 17 +- + drivers/staging/skein/skein_block.c | 323 - + drivers/staging/skein/skein_block.h | 323 + + drivers/staging/speakup/spk_ttyio.c | 73 +- + drivers/staging/typec/tcpm.c | 149 +- + drivers/staging/typec/tcpm.h | 5 +- + drivers/staging/unisys/Documentation/overview.txt | 14 +- + drivers/staging/unisys/include/channel.h | 361 +- + drivers/staging/unisys/include/iochannel.h | 551 +- + drivers/staging/unisys/include/visorbus.h | 34 +- + drivers/staging/unisys/visorbus/controlvmchannel.h | 715 +- + drivers/staging/unisys/visorbus/vbuschannel.h | 96 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 455 +- + drivers/staging/unisys/visorbus/visorbus_private.h | 32 +- + drivers/staging/unisys/visorbus/visorchannel.c | 168 +- + drivers/staging/unisys/visorbus/visorchipset.c | 398 +- + drivers/staging/unisys/visorbus/vmcallinterface.h | 54 - + drivers/staging/unisys/visorhba/visorhba_main.c | 438 +- + .../staging/unisys/visorinput/ultrainputreport.h | 68 +- + drivers/staging/unisys/visorinput/visorinput.c | 128 +- + drivers/staging/unisys/visornic/visornic_main.c | 293 +- + drivers/staging/vboxvideo/Kconfig | 11 +- + drivers/staging/vboxvideo/TODO | 4 +- + drivers/staging/vboxvideo/vbox_drv.c | 2 +- + drivers/staging/vboxvideo/vbox_fb.c | 5 + + drivers/staging/vboxvideo/vbox_mode.c | 5 - + drivers/staging/vboxvideo/vbox_ttm.c | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 4 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.c | 2 +- + drivers/staging/vt6655/card.c | 6 +- + drivers/staging/vt6655/mac.c | 2 +- + 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 | 5 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 65 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 4 +- + drivers/staging/wlan-ng/hfa384x.h | 100 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 16 +- + drivers/staging/wlan-ng/p80211conv.c | 1 + + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + drivers/staging/wlan-ng/prism2fw.c | 27 +- + drivers/staging/wlan-ng/prism2sta.c | 37 +- + include/linux/iio/common/st_sensors.h | 12 + + include/linux/iio/common/st_sensors_i2c.h | 10 - + include/linux/iio/timer/stm32-timer-trigger.h | 14 + + include/linux/msi.h | 1 + + tools/Makefile | 6 +- + tools/iio/Build | 3 + + tools/iio/Makefile | 76 +- + 692 files changed, 140901 insertions(+), 10771 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/humidity/hdc100x.txt + create mode 100644 Documentation/devicetree/bindings/iio/humidity/htu21.txt + create mode 100644 Documentation/devicetree/bindings/iio/pressure/ms5637.txt + create mode 100644 Documentation/devicetree/bindings/iio/temperature/tsys01.txt + create mode 100644 Documentation/iio/ep93xx_adc.txt + create mode 100644 drivers/iio/adc/dln2-adc.c + create mode 100644 drivers/iio/adc/ep93xx_adc.c + create mode 100644 drivers/iio/adc/ltc2471.c + create mode 100644 drivers/iio/chemical/ccs811.c + 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/lustre/include/uapi/linux/lnet/libcfs_debug.h + rename drivers/staging/lustre/include/{linux/libcfs => uapi/linux/lnet}/libcfs_ioctl.h (100%) + rename drivers/staging/lustre/include/{linux/lnet/lib-dlc.h => uapi/linux/lnet/lnet-dlc.h} (97%) + rename drivers/staging/lustre/include/{linux/lnet/types.h => uapi/linux/lnet/lnet-types.h} (100%) + rename drivers/staging/lustre/include/{ => uapi}/linux/lnet/lnetctl.h (62%) + rename drivers/staging/lustre/include/{ => uapi}/linux/lnet/lnetst.h (91%) + rename drivers/staging/lustre/include/{ => uapi}/linux/lnet/nidstr.h (98%) + rename drivers/staging/lustre/include/{linux/lnet/lnet.h => uapi/linux/lnet/socklnd.h} (70%) + rename drivers/staging/lustre/{lustre/include => include/uapi/linux/lustre}/lustre_cfg.h (52%) + create mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_fid.h + rename drivers/staging/lustre/{lustre/include/lustre/ll_fiemap.h => include/uapi/linux/lustre/lustre_fiemap.h} (96%) + rename drivers/staging/lustre/{lustre/include => include/uapi/linux}/lustre/lustre_idl.h (83%) + rename drivers/staging/lustre/{lustre/include => include/uapi/linux}/lustre/lustre_ioctl.h (63%) + rename drivers/staging/lustre/{lustre/include/uapi_kernelcomm.h => include/uapi/linux/lustre/lustre_kernelcomm.h} (95%) + create mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_ostid.h + create mode 100644 drivers/staging/lustre/include/uapi/linux/lustre/lustre_param.h + rename drivers/staging/lustre/{lustre/include => include/uapi/linux}/lustre/lustre_user.h (99%) + rename drivers/staging/lustre/{lustre/include => include/uapi/linux/lustre}/lustre_ver.h (100%) + rename drivers/staging/lustre/lustre/include/{lustre => }/lustre_errno.h (100%) + delete mode 100644 drivers/staging/lustre/lustre/include/lustre_param.h + delete mode 100644 drivers/staging/lustre/lustre/lov/lovsub_io.c + 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 + create mode 100644 drivers/staging/rtlwifi/Kconfig + create mode 100644 drivers/staging/rtlwifi/Makefile + create mode 100644 drivers/staging/rtlwifi/TODO + create mode 100644 drivers/staging/rtlwifi/base.c + create mode 100644 drivers/staging/rtlwifi/base.h + create mode 100644 drivers/staging/rtlwifi/btcoexist/Makefile + create mode 100644 drivers/staging/rtlwifi/btcoexist/halbt_precomp.h + create mode 100644 drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.c + create mode 100644 drivers/staging/rtlwifi/btcoexist/halbtc8822b1ant.h + create mode 100644 drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.c + create mode 100644 drivers/staging/rtlwifi/btcoexist/halbtc8822b2ant.h + create mode 100644 drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.c + create mode 100644 drivers/staging/rtlwifi/btcoexist/halbtc8822bwifionly.h + create mode 100644 drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c + create mode 100644 drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.h + create mode 100644 drivers/staging/rtlwifi/btcoexist/rtl_btc.c + create mode 100644 drivers/staging/rtlwifi/btcoexist/rtl_btc.h + create mode 100644 drivers/staging/rtlwifi/cam.c + create mode 100644 drivers/staging/rtlwifi/cam.h + create mode 100644 drivers/staging/rtlwifi/core.c + create mode 100644 drivers/staging/rtlwifi/core.h + create mode 100644 drivers/staging/rtlwifi/debug.c + create mode 100644 drivers/staging/rtlwifi/debug.h + create mode 100644 drivers/staging/rtlwifi/efuse.c + create mode 100644 drivers/staging/rtlwifi/efuse.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_2_platform.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_cfg.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_phy.c + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.c + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_8822b_pwr_seq.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.c + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.c + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_pcie.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.c + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_sdio.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.c + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_api_8822b_usb.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.c + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_8822b/halmac_func_8822b.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_88xx_cfg.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.c + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_pcie.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.c + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_sdio.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.c + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_api_88xx_usb.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_88xx/halmac_func_88xx.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_api.c + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_api.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_bit2.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_bit_8822b.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_fw_info.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_fw_offload_c2h_nic.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_fw_offload_h2c_nic.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_h2c_extra_info_nic.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_intf_phy_cmd.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_original_c2h_nic.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_original_h2c_nic.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_pcie_reg.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_pwr_seq_cmd.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_reg2.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_reg_8822b.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_rx_bd_chip.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_rx_bd_nic.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_rx_desc_chip.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_rx_desc_nic.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_sdio_reg.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_tx_bd_chip.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_tx_bd_nic.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_tx_desc_chip.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_tx_desc_nic.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_type.h + create mode 100644 drivers/staging/rtlwifi/halmac/halmac_usb_reg.h + create mode 100644 drivers/staging/rtlwifi/halmac/rtl_halmac.c + create mode 100644 drivers/staging/rtlwifi/halmac/rtl_halmac.h + create mode 100644 drivers/staging/rtlwifi/pci.c + create mode 100644 drivers/staging/rtlwifi/pci.h + create mode 100644 drivers/staging/rtlwifi/phydm/halphyrf_ce.c + create mode 100644 drivers/staging/rtlwifi/phydm/halphyrf_ce.h + create mode 100644 drivers/staging/rtlwifi/phydm/mp_precomp.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_acs.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_acs.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_adaptivity.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_adaptivity.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_adc_sampling.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_antdiv.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_antdiv.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_beamforming.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_ccx.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_ccx.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_cfotracking.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_cfotracking.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_debug.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_debug.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_dfs.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_dig.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_dig.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_dynamic_rx_path.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_dynamicbbpowersaving.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_dynamicbbpowersaving.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_dynamictxpower.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_dynamictxpower.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_edcaturbocheck.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_edcaturbocheck.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_features.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_hwconfig.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_hwconfig.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_interface.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_interface.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_iqk.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_kfree.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_kfree.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_noisemonitor.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_noisemonitor.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_powertracking_ce.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_powertracking_ce.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_pre_define.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_precomp.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_psd.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_psd.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_rainfo.c + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_rainfo.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_reg.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_regdefine11ac.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_regdefine11n.h + create mode 100644 drivers/staging/rtlwifi/phydm/phydm_types.h + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.c + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.h + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.c + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.h + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.c + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.h + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/halphyrf_8822b.c + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/halphyrf_8822b.h + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.c + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.h + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.c + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.h + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.c + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.h + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/phydm_rtl8822b.c + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/phydm_rtl8822b.h + create mode 100644 drivers/staging/rtlwifi/phydm/rtl8822b/version_rtl8822b.h + create mode 100644 drivers/staging/rtlwifi/phydm/rtl_phydm.c + create mode 100644 drivers/staging/rtlwifi/phydm/rtl_phydm.h + create mode 100644 drivers/staging/rtlwifi/phydm/txbf/halcomtxbf.h + create mode 100644 drivers/staging/rtlwifi/phydm/txbf/haltxbf8822b.h + create mode 100644 drivers/staging/rtlwifi/phydm/txbf/haltxbfinterface.h + create mode 100644 drivers/staging/rtlwifi/phydm/txbf/haltxbfjaguar.h + create mode 100644 drivers/staging/rtlwifi/phydm/txbf/phydm_hal_txbf_api.h + create mode 100644 drivers/staging/rtlwifi/ps.c + create mode 100644 drivers/staging/rtlwifi/ps.h + create mode 100644 drivers/staging/rtlwifi/pwrseqcmd.h + create mode 100644 drivers/staging/rtlwifi/rc.c + create mode 100644 drivers/staging/rtlwifi/rc.h + create mode 100644 drivers/staging/rtlwifi/regd.c + create mode 100644 drivers/staging/rtlwifi/regd.h + create mode 100644 drivers/staging/rtlwifi/rtl8822be/Makefile + create mode 100644 drivers/staging/rtlwifi/rtl8822be/def.h + create mode 100644 drivers/staging/rtlwifi/rtl8822be/fw.c + create mode 100644 drivers/staging/rtlwifi/rtl8822be/fw.h + create mode 100644 drivers/staging/rtlwifi/rtl8822be/hw.c + create mode 100644 drivers/staging/rtlwifi/rtl8822be/hw.h + create mode 100644 drivers/staging/rtlwifi/rtl8822be/led.c + create mode 100644 drivers/staging/rtlwifi/rtl8822be/led.h + create mode 100644 drivers/staging/rtlwifi/rtl8822be/phy.c + create mode 100644 drivers/staging/rtlwifi/rtl8822be/phy.h + create mode 100644 drivers/staging/rtlwifi/rtl8822be/reg.h + create mode 100644 drivers/staging/rtlwifi/rtl8822be/sw.c + create mode 100644 drivers/staging/rtlwifi/rtl8822be/sw.h + create mode 100644 drivers/staging/rtlwifi/rtl8822be/trx.c + create mode 100644 drivers/staging/rtlwifi/rtl8822be/trx.h + create mode 100644 drivers/staging/rtlwifi/stats.c + create mode 100644 drivers/staging/rtlwifi/stats.h + create mode 100644 drivers/staging/rtlwifi/wifi.h + delete mode 100644 drivers/staging/unisys/visorbus/vmcallinterface.h + create mode 100644 tools/iio/Build +Merging mux/for-next (fabf08a0cd63 i2c: mux: i2c-arb-gpio-challenge: allow compiling w/o OF support) +$ git merge mux/for-next +Removing include/linux/i2c-mux-pinctrl.h +Auto-merging drivers/i2c/muxes/Kconfig +Merge made by the 'recursive' strategy. + Documentation/i2c/i2c-topology | 6 + + drivers/i2c/muxes/Kconfig | 3 +- + drivers/i2c/muxes/i2c-mux-mlxcpld.c | 2 +- + drivers/i2c/muxes/i2c-mux-pca9541.c | 9 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 2 +- + drivers/i2c/muxes/i2c-mux-pinctrl.c | 225 +++++++-------------- + include/linux/i2c-mux-pinctrl.h | 41 ---- + include/linux/{i2c => platform_data}/pca954x.h | 0 + include/linux/{i2c => platform_data/x86}/mlxcpld.h | 0 + 9 files changed, 86 insertions(+), 202 deletions(-) + delete mode 100644 include/linux/i2c-mux-pinctrl.h + rename include/linux/{i2c => platform_data}/pca954x.h (100%) + rename include/linux/{i2c => platform_data/x86}/mlxcpld.h (100%) +Merging slave-dma/next (70aae0b95256 Merge branch 'topic/dmatest' into next) +$ git merge slave-dma/next +Auto-merging drivers/crypto/ccp/ccp-dmaengine.c +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-driver-dma-ioatdma | 30 + + .../devicetree/bindings/dma/renesas,usb-dmac.txt | 1 + + Documentation/dmaengine/provider.txt | 7 - + drivers/crypto/ccp/ccp-dmaengine.c | 23 - + drivers/dma/Kconfig | 6 + + drivers/dma/Makefile | 1 + + drivers/dma/altera-msgdma.c | 937 +++++++++++++++++++++ + drivers/dma/at_hdmac.c | 140 +-- + drivers/dma/at_xdmac.c | 13 +- + drivers/dma/bcm-sba-raid.c | 6 +- + drivers/dma/dmaengine.c | 103 ++- + drivers/dma/dmatest.c | 110 +-- + drivers/dma/fsldma.c | 118 --- + drivers/dma/ioat/dma.c | 10 +- + drivers/dma/ioat/dma.h | 3 + + drivers/dma/ioat/init.c | 2 +- + drivers/dma/ioat/sysfs.c | 42 + + drivers/dma/k3dma.c | 12 +- + drivers/dma/mv_xor.c | 162 +--- + drivers/dma/nbpfaxi.c | 17 - + drivers/dma/of-dma.c | 8 +- + drivers/dma/ppc4xx/adma.c | 37 +- + drivers/dma/qcom/hidma.c | 37 +- + drivers/dma/qcom/hidma.h | 7 +- + drivers/dma/qcom/hidma_ll.c | 11 +- + drivers/dma/qcom/hidma_mgmt.c | 16 +- + drivers/dma/sh/rcar-dmac.c | 85 +- + drivers/dma/ste_dma40.c | 22 +- + drivers/dma/xgene-dma.c | 160 +--- + drivers/dma/xilinx/zynqmp_dma.c | 94 --- + include/linux/dmaengine.h | 19 - + 31 files changed, 1305 insertions(+), 934 deletions(-) + create mode 100644 Documentation/ABI/stable/sysfs-driver-dma-ioatdma + create mode 100644 drivers/dma/altera-msgdma.c +Merging cgroup/for-next (9c3bace4684b Merge branch 'for-4.13-fixes' into for-next) +$ git merge cgroup/for-next +Auto-merging mm/memcontrol.c +Auto-merging kernel/events/core.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/cgroup.h +Merge made by the 'recursive' strategy. + Documentation/cgroup-v2.txt | 221 +++++++++- + include/linux/cgroup-defs.h | 68 ++- + include/linux/cgroup.h | 39 +- + kernel/cgroup/cgroup-internal.h | 12 +- + kernel/cgroup/cgroup-v1.c | 75 +++- + kernel/cgroup/cgroup.c | 947 +++++++++++++++++++++++++++++++--------- + kernel/cgroup/cpuset.c | 40 +- + kernel/cgroup/debug.c | 53 ++- + kernel/cgroup/freezer.c | 6 +- + kernel/cgroup/pids.c | 1 + + kernel/events/core.c | 1 + + mm/memcontrol.c | 2 +- + net/core/netclassid_cgroup.c | 2 +- + 13 files changed, 1195 insertions(+), 272 deletions(-) +Merging scsi/for-next (371e9fb677e2 Merge branch 'fixes' into for-next) +$ git merge scsi/for-next +Recorded preimage for 'drivers/staging/unisys/visorhba/visorhba_main.c' +Auto-merging drivers/virtio/virtio_ring.c +Auto-merging drivers/staging/unisys/visorhba/visorhba_main.c +CONFLICT (content): Merge conflict in drivers/staging/unisys/visorhba/visorhba_main.c +Auto-merging drivers/staging/rts5208/rtsx.c +Auto-merging drivers/scsi/lpfc/lpfc_nvmet.h +Auto-merging drivers/scsi/lpfc/lpfc_nvmet.c +Auto-merging drivers/scsi/lpfc/lpfc_debugfs.c +Auto-merging drivers/scsi/lpfc/lpfc_attr.c +Removing drivers/block/cciss_scsi.h +Removing drivers/block/cciss_scsi.c +Removing drivers/block/cciss_cmd.h +Removing drivers/block/cciss.h +Removing drivers/block/cciss.c +Auto-merging drivers/block/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/blockdev/cciss.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/staging/unisys/visorhba/visorhba_main.c'. +[master 8729a8fae192] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/blockdev/cciss.txt | 194 - + MAINTAINERS | 14 +- + drivers/block/Kconfig | 27 - + drivers/block/Makefile | 1 - + drivers/block/cciss.c | 5415 ---------------------- + drivers/block/cciss.h | 433 -- + drivers/block/cciss_cmd.h | 269 -- + drivers/block/cciss_scsi.c | 1653 ------- + drivers/block/cciss_scsi.h | 79 - + drivers/message/fusion/mptbase.c | 8 +- + drivers/message/fusion/mptfc.c | 10 +- + drivers/message/fusion/mptsas.c | 7 +- + drivers/s390/scsi/zfcp_aux.c | 1 - + drivers/s390/scsi/zfcp_dbf.c | 95 +- + drivers/s390/scsi/zfcp_dbf.h | 25 +- + drivers/s390/scsi/zfcp_erp.c | 5 +- + drivers/s390/scsi/zfcp_ext.h | 1 - + drivers/s390/scsi/zfcp_fc.c | 52 +- + drivers/s390/scsi/zfcp_fc.h | 25 +- + drivers/s390/scsi/zfcp_fsf.c | 35 +- + drivers/s390/scsi/zfcp_fsf.h | 12 +- + drivers/s390/scsi/zfcp_qdio.c | 2 +- + drivers/s390/scsi/zfcp_qdio.h | 17 - + drivers/s390/scsi/zfcp_scsi.c | 18 +- + drivers/scsi/53c700.c | 23 +- + drivers/scsi/NCR5380.c | 4 +- + drivers/scsi/a2091.c | 17 - + drivers/scsi/a3000.c | 17 - + drivers/scsi/aacraid/aacraid.h | 1 + + drivers/scsi/aacraid/commsup.c | 3 +- + drivers/scsi/aacraid/linit.c | 318 +- + drivers/scsi/aha152x.c | 13 +- + drivers/scsi/aha1542.c | 2 +- + drivers/scsi/aic7xxx/Makefile | 6 +- + drivers/scsi/aic7xxx/aic79xx_reg.h_shipped | 1469 ++---- + drivers/scsi/aic7xxx/aic79xx_reg_print.c_shipped | 34 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 1 - + drivers/scsi/aic7xxx/aic7xxx_osm.c | 5 - + drivers/scsi/aic7xxx/aic7xxx_osm.h | 1 - + drivers/scsi/aic7xxx/aic7xxx_reg.h_shipped | 44 +- + drivers/scsi/aic94xx/aic94xx_init.c | 6 +- + drivers/scsi/arcmsr/arcmsr_attr.c | 6 +- + drivers/scsi/arm/acornscsi.c | 11 +- + drivers/scsi/arm/cumana_1.c | 2 +- + drivers/scsi/arm/oak.c | 2 +- + drivers/scsi/atari_scsi.c | 6 +- + drivers/scsi/be2iscsi/be_iscsi.c | 6 +- + drivers/scsi/be2iscsi/be_main.c | 6 +- + drivers/scsi/be2iscsi/be_main.h | 2 +- + drivers/scsi/bfa/bfad_im.c | 37 +- + drivers/scsi/bnx2fc/bnx2fc.h | 1 - + drivers/scsi/ch.c | 22 +- + drivers/scsi/csiostor/csio_hw.h | 2 +- + drivers/scsi/csiostor/csio_init.c | 11 +- + drivers/scsi/csiostor/csio_scsi.c | 6 +- + drivers/scsi/cxgbi/libcxgbi.c | 27 +- + drivers/scsi/cxlflash/main.c | 3 +- + drivers/scsi/cxlflash/superpipe.c | 14 +- + drivers/scsi/cxlflash/vlun.c | 6 +- + drivers/scsi/dmx3191d.c | 2 +- + drivers/scsi/dpt_i2o.c | 5 - + drivers/scsi/eata.c | 9 +- + drivers/scsi/esas2r/esas2r_main.c | 2 +- + drivers/scsi/esp_scsi.c | 53 +- + drivers/scsi/esp_scsi.h | 1 - + drivers/scsi/fcoe/fcoe_sysfs.c | 4 +- + drivers/scsi/fdomain.c | 6 +- + drivers/scsi/fdomain.h | 2 +- + drivers/scsi/fnic/fnic.h | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 4 - + drivers/scsi/g_NCR5380.c | 283 +- + drivers/scsi/gdth.c | 2 +- + drivers/scsi/gdth_proc.c | 2 +- + drivers/scsi/gvp11.c | 18 - + drivers/scsi/hisi_sas/hisi_sas.h | 18 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 198 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 605 +-- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 237 +- + drivers/scsi/hpsa.c | 108 +- + drivers/scsi/hpsa.h | 81 +- + drivers/scsi/hptiop.c | 11 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 8 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 2 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 +- + drivers/scsi/imm.c | 1 - + drivers/scsi/ipr.c | 1 + + drivers/scsi/isci/init.c | 2 +- + drivers/scsi/iscsi_tcp.c | 2 - + drivers/scsi/libfc/fc_fcp.c | 2 - + drivers/scsi/libiscsi.c | 2 +- + drivers/scsi/libsas/sas_ata.c | 1 + + drivers/scsi/libsas/sas_scsi_host.c | 15 +- + drivers/scsi/lpfc/lpfc.h | 19 +- + drivers/scsi/lpfc/lpfc_attr.c | 52 +- + drivers/scsi/lpfc/lpfc_attr.h | 10 + + drivers/scsi/lpfc/lpfc_bsg.c | 9 +- + drivers/scsi/lpfc/lpfc_crtn.h | 5 +- + drivers/scsi/lpfc/lpfc_ct.c | 4 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 11 +- + drivers/scsi/lpfc/lpfc_debugfs.h | 6 +- + drivers/scsi/lpfc/lpfc_disc.h | 1 + + drivers/scsi/lpfc/lpfc_els.c | 93 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 12 +- + drivers/scsi/lpfc/lpfc_hw.h | 18 +- + drivers/scsi/lpfc/lpfc_hw4.h | 23 +- + drivers/scsi/lpfc/lpfc_init.c | 73 +- + drivers/scsi/lpfc/lpfc_mbox.c | 35 +- + drivers/scsi/lpfc/lpfc_mem.c | 90 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 25 +- + drivers/scsi/lpfc/lpfc_nvme.c | 31 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 279 +- + drivers/scsi/lpfc/lpfc_nvmet.h | 14 + + drivers/scsi/lpfc/lpfc_scsi.c | 12 +- + drivers/scsi/lpfc/lpfc_sli.c | 62 +- + drivers/scsi/lpfc/lpfc_sli4.h | 23 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mac53c94.c | 13 +- + drivers/scsi/mac_esp.c | 37 +- + drivers/scsi/mac_scsi.c | 4 +- + drivers/scsi/megaraid.c | 6 +- + drivers/scsi/megaraid/megaraid_mbox.c | 32 +- + drivers/scsi/megaraid/megaraid_mm.c | 29 +- + drivers/scsi/megaraid/megaraid_sas.h | 5 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 110 +- + drivers/scsi/megaraid/megaraid_sas_fp.c | 40 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 216 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 85 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 2 +- + drivers/scsi/mvme147.c | 16 - + drivers/scsi/mvsas/mv_init.c | 12 +- + drivers/scsi/mvsas/mv_sas.c | 6 +- + drivers/scsi/nsp32.c | 22 +- + drivers/scsi/osst.c | 8 +- + drivers/scsi/pcmcia/fdomain_stub.c | 2 +- + drivers/scsi/pcmcia/qlogic_stub.c | 4 +- + drivers/scsi/pm8001/pm8001_init.c | 7 +- + drivers/scsi/pmcraid.c | 17 +- + drivers/scsi/pmcraid.h | 2 +- + drivers/scsi/ppa.c | 1 - + drivers/scsi/qedf/qedf.h | 2 - + drivers/scsi/qedf/qedf_els.c | 14 +- + drivers/scsi/qedf/qedf_fip.c | 35 +- + drivers/scsi/qedf/qedf_main.c | 113 +- + drivers/scsi/qedf/qedf_version.h | 6 +- + drivers/scsi/qedi/qedi.h | 5 +- + drivers/scsi/qedi/qedi_iscsi.c | 2 +- + drivers/scsi/qedi/qedi_main.c | 10 +- + drivers/scsi/qla2xxx/qla_attr.c | 78 +- + drivers/scsi/qla2xxx/qla_dbg.c | 10 +- + drivers/scsi/qla2xxx/qla_def.h | 118 +- + drivers/scsi/qla2xxx/qla_fw.h | 28 +- + drivers/scsi/qla2xxx/qla_gbl.h | 21 +- + drivers/scsi/qla2xxx/qla_gs.c | 18 +- + drivers/scsi/qla2xxx/qla_init.c | 181 +- + drivers/scsi/qla2xxx/qla_iocb.c | 55 +- + drivers/scsi/qla2xxx/qla_isr.c | 76 +- + drivers/scsi/qla2xxx/qla_mbx.c | 263 +- + drivers/scsi/qla2xxx/qla_mid.c | 14 +- + drivers/scsi/qla2xxx/qla_mr.c | 7 +- + drivers/scsi/qla2xxx/qla_nvme.c | 161 +- + drivers/scsi/qla2xxx/qla_nvme.h | 17 + + drivers/scsi/qla2xxx/qla_os.c | 122 +- + drivers/scsi/qla2xxx/qla_target.c | 25 +- + drivers/scsi/qla2xxx/qla_target.h | 2 + + drivers/scsi/qla2xxx/qla_tmpl.c | 19 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qlogicfas.c | 2 +- + drivers/scsi/qlogicfas408.c | 6 +- + drivers/scsi/qlogicfas408.h | 2 +- + drivers/scsi/qlogicpti.c | 5 +- + drivers/scsi/scsi_debug.c | 3 +- + drivers/scsi/scsi_error.c | 10 +- + drivers/scsi/scsi_ioctl.c | 4 +- + drivers/scsi/scsi_lib.c | 64 +- + drivers/scsi/scsi_priv.h | 2 +- + drivers/scsi/scsi_scan.c | 2 +- + drivers/scsi/scsi_sysfs.c | 4 +- + drivers/scsi/scsi_transport_fc.c | 31 +- + drivers/scsi/scsi_transport_iscsi.c | 4 +- + drivers/scsi/scsi_transport_sas.c | 3 + + drivers/scsi/scsi_transport_srp.c | 7 +- + drivers/scsi/sd.c | 7 +- + drivers/scsi/ses.c | 62 +- + drivers/scsi/sg.c | 24 +- + drivers/scsi/sgiwd93.c | 15 - + drivers/scsi/smartpqi/smartpqi.h | 44 +- + drivers/scsi/smartpqi/smartpqi_init.c | 145 +- + drivers/scsi/smartpqi/smartpqi_sis.c | 111 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 4 +- + drivers/scsi/sr.c | 2 +- + drivers/scsi/sun3_scsi.c | 4 +- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 2 +- + drivers/scsi/virtio_scsi.c | 4 +- + drivers/scsi/wd33c93.c | 2 + + drivers/staging/rts5208/rtsx.c | 11 - + drivers/staging/unisys/visorhba/visorhba_main.c | 126 +- + drivers/usb/storage/uas.c | 4 +- + drivers/virtio/virtio_ring.c | 5 +- + include/scsi/libsas.h | 2 +- + include/scsi/scsi_cmnd.h | 1 - + include/scsi/scsi_device.h | 2 +- + include/scsi/scsi_tcq.h | 2 +- + include/scsi/scsi_transport_fc.h | 1 + + include/scsi/scsi_transport_srp.h | 2 +- + 205 files changed, 4292 insertions(+), 11653 deletions(-) + delete mode 100644 Documentation/blockdev/cciss.txt + delete mode 100644 drivers/block/cciss.c + delete mode 100644 drivers/block/cciss.h + delete mode 100644 drivers/block/cciss_cmd.h + delete mode 100644 drivers/block/cciss_scsi.c + delete mode 100644 drivers/block/cciss_scsi.h +Merging scsi-mkp/for-next (5fe5a6c9acc0 scsi: lpfc: avoid false-positive gcc-8 warning) +$ git merge scsi-mkp/for-next +Already up-to-date. +Merging target-updates/for-next (04229774f692 tcmu: Oops in unmap_thread_fn()) +$ git merge target-updates/for-next +Merge made by the 'recursive' strategy. + drivers/target/target_core_user.c | 136 ++++++++++++++++++++++++++++++++------ + 1 file changed, 114 insertions(+), 22 deletions(-) +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging target-bva/for-next (2ea659a9ef48 Linux 4.12-rc1) +$ git merge target-bva/for-next +Already up-to-date. +Merging libata/for-next (b82c949dbea2 Merge branch 'for-4.13-fixes' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + drivers/ata/ahci_da850.c | 8 +++-- + drivers/ata/ahci_platform.c | 1 + + drivers/ata/libahci_platform.c | 34 +++++++++++++++++++++ + drivers/ata/sata_gemini.c | 67 +++++++++++++++++++++--------------------- + drivers/ata/sata_svw.c | 2 +- + include/linux/ahci_platform.h | 2 ++ + 6 files changed, 78 insertions(+), 36 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 (ba74b6f7fcc0 virtio_pci: fix cpu affinity support) +$ git merge vhost/linux-next +Already up-to-date. +Merging rpmsg/for-next (3f3a62b28e7a Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Resolved 'drivers/soc/qcom/Kconfig' using previous resolution. +Auto-merging drivers/soc/qcom/Kconfig +CONFLICT (content): Merge conflict in drivers/soc/qcom/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 19064f250247] Merge remote-tracking branch 'rpmsg/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/remoteproc/ti,davinci-rproc.txt | 86 +++++++++++ + .../bindings/remoteproc/ti,keystone-rproc.txt | 73 +++++++-- + drivers/remoteproc/da8xx_remoteproc.c | 98 +++++++++++- + drivers/remoteproc/keystone_remoteproc.c | 1 + + drivers/remoteproc/qcom_adsp_pil.c | 6 + + drivers/remoteproc/qcom_common.c | 71 +++++++++ + drivers/remoteproc/qcom_common.h | 10 ++ + drivers/remoteproc/qcom_q6v5_pil.c | 3 + + drivers/remoteproc/remoteproc_core.c | 15 +- + drivers/remoteproc/remoteproc_internal.h | 1 - + drivers/rpmsg/qcom_smd.c | 1 + + drivers/rpmsg/virtio_rpmsg_bus.c | 47 ++++-- + drivers/soc/qcom/Kconfig | 9 ++ + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/glink_ssr.c | 164 +++++++++++++++++++++ + include/linux/remoteproc/qcom_rproc.h | 22 +++ + 16 files changed, 570 insertions(+), 38 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/ti,davinci-rproc.txt + create mode 100644 drivers/soc/qcom/glink_ssr.c + create mode 100644 include/linux/remoteproc/qcom_rproc.h +Merging gpio/for-next (2b40aada2e0c Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-74x164.txt | 3 + + .../devicetree/bindings/gpio/gpio-aspeed.txt | 2 +- + .../devicetree/bindings/gpio/gpio-davinci.txt | 91 ++- + .../devicetree/bindings/gpio/gpio-vf610.txt | 4 +- + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 16 +- + Documentation/driver-api/gpio.rst | 45 ++ + Documentation/driver-api/index.rst | 1 + + MAINTAINERS | 5 + + drivers/gpio/Kconfig | 26 +- + drivers/gpio/Makefile | 2 + + drivers/gpio/devres.c | 3 + + drivers/gpio/gpio-74x164.c | 10 + + drivers/gpio/gpio-altera-a10sr.c | 2 +- + drivers/gpio/gpio-altera.c | 4 +- + drivers/gpio/gpio-aspeed.c | 2 +- + drivers/gpio/gpio-brcmstb.c | 11 +- + drivers/gpio/gpio-davinci.c | 22 +- + drivers/gpio/gpio-ge.c | 6 +- + drivers/gpio/gpio-grgpio.c | 2 +- + drivers/gpio/gpio-it87.c | 3 + + drivers/gpio/gpio-max77620.c | 2 +- + drivers/gpio/gpio-mb86s7x.c | 4 +- + drivers/gpio/gpio-ml-ioh.c | 12 +- + drivers/gpio/gpio-mockup.c | 77 +-- + drivers/gpio/gpio-mpc8xxx.c | 4 +- + drivers/gpio/gpio-msic.c | 4 +- + drivers/gpio/gpio-mxc.c | 27 +- + drivers/gpio/gpio-mxs.c | 15 +- + drivers/gpio/gpio-omap.c | 2 + + drivers/gpio/gpio-pca953x.c | 8 +- + drivers/gpio/gpio-pch.c | 12 +- + drivers/gpio/gpio-pxa.c | 8 +- + drivers/gpio/gpio-rcar.c | 10 + + drivers/gpio/gpio-sta2x11.c | 14 +- + drivers/gpio/gpio-tb10x.c | 3 +- + drivers/gpio/gpio-tegra.c | 129 ++--- + drivers/gpio/gpio-thunderx.c | 639 +++++++++++++++++++++ + drivers/gpio/gpio-tps68470.c | 176 ++++++ + drivers/gpio/gpio-tz1090.c | 10 +- + drivers/gpio/gpio-vf610.c | 47 +- + drivers/gpio/gpio-xilinx.c | 4 +- + drivers/gpio/gpio-zynq.c | 160 +++++- + drivers/gpio/gpiolib-acpi.c | 4 +- + drivers/gpio/gpiolib-of.c | 36 +- + drivers/gpio/gpiolib-sysfs.c | 8 +- + drivers/gpio/gpiolib.c | 124 ++-- + drivers/gpio/gpiolib.h | 2 +- + include/linux/gpio/driver.h | 24 +- + 48 files changed, 1505 insertions(+), 320 deletions(-) + create mode 100644 Documentation/driver-api/gpio.rst + create mode 100644 drivers/gpio/gpio-thunderx.c + create mode 100644 drivers/gpio/gpio-tps68470.c +Merging pinctrl/for-next (e480b745386e pinctrl: intel: Add Intel Lewisburg GPIO support) +$ git merge pinctrl/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/cortina,gemini-pinctrl.txt | 59 + + .../bindings/pinctrl/fsl,imx7ulp-pinctrl.txt | 61 + + .../devicetree/bindings/pinctrl/pinctrl-aspeed.txt | 8 +- + .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 1 + + .../bindings/pinctrl/qcom,ipq4019-pinctrl.txt | 6 +- + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 26 +- + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 + + .../bindings/pinctrl/rockchip,pinctrl.txt | 1 + + MAINTAINERS | 5 + + arch/arm/boot/dts/imx7ulp-pinfunc.h | 468 ++++ + drivers/pinctrl/Kconfig | 7 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 70 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 64 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 19 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.h | 1 + + drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 31 +- + drivers/pinctrl/berlin/berlin.c | 4 +- + drivers/pinctrl/core.c | 16 +- + drivers/pinctrl/core.h | 6 +- + drivers/pinctrl/devicetree.c | 4 +- + drivers/pinctrl/freescale/Kconfig | 7 + + drivers/pinctrl/freescale/Makefile | 1 + + drivers/pinctrl/freescale/pinctrl-imx.c | 131 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 20 + + drivers/pinctrl/freescale/pinctrl-imx7ulp.c | 364 +++ + drivers/pinctrl/freescale/pinctrl-vf610.c | 25 + + drivers/pinctrl/intel/Kconfig | 19 + + drivers/pinctrl/intel/Makefile | 2 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 4 +- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 424 +++- + drivers/pinctrl/intel/pinctrl-denverton.c | 302 +++ + drivers/pinctrl/intel/pinctrl-intel.c | 1 + + drivers/pinctrl/intel/pinctrl-lewisburg.c | 343 +++ + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 6 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 2 +- + drivers/pinctrl/pinconf-generic.c | 7 +- + drivers/pinctrl/pinconf.c | 14 +- + drivers/pinctrl/pinconf.h | 24 +- + drivers/pinctrl/pinctrl-adi2.c | 4 +- + drivers/pinctrl/pinctrl-amd.c | 4 +- + drivers/pinctrl/pinctrl-artpec6.c | 2 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 11 +- + drivers/pinctrl/pinctrl-coh901.c | 2 +- + drivers/pinctrl/pinctrl-digicolor.c | 4 +- + drivers/pinctrl/pinctrl-gemini.c | 2359 ++++++++++++++++++++ + drivers/pinctrl/pinctrl-ingenic.c | 6 +- + drivers/pinctrl/pinctrl-rockchip.c | 249 ++- + drivers/pinctrl/pinctrl-rza1.c | 4 +- + drivers/pinctrl/pinctrl-st.c | 12 +- + drivers/pinctrl/pinctrl-tb10x.c | 8 +- + drivers/pinctrl/pinctrl-tz1090-pdc.c | 6 +- + drivers/pinctrl/pinctrl-tz1090.c | 6 +- + drivers/pinctrl/pinctrl-zynq.c | 34 +- + drivers/pinctrl/pinmux.c | 16 +- + drivers/pinctrl/pinmux.h | 29 +- + drivers/pinctrl/qcom/pinctrl-ipq4019.c | 432 +++- + drivers/pinctrl/qcom/pinctrl-msm.c | 27 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 16 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 321 ++- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 32 +- + 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 | 18 +- + drivers/pinctrl/samsung/pinctrl-samsung.h | 15 +- + drivers/pinctrl/sh-pfc/Kconfig | 5 + + drivers/pinctrl/sh-pfc/Makefile | 1 + + drivers/pinctrl/sh-pfc/core.c | 6 + + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 15 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 1082 ++++++++- + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 146 +- + drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 1812 +++++++++++++++ + drivers/pinctrl/sh-pfc/pinctrl.c | 11 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 23 +- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 13 +- + drivers/pinctrl/sirf/pinctrl-sirf.c | 10 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 2 +- + drivers/pinctrl/sunxi/Kconfig | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 273 ++- + drivers/pinctrl/sunxi/pinctrl-sun50i-h5.c | 26 +- + drivers/pinctrl/sunxi/pinctrl-sun6i-a31-r.c | 6 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-a23-r.c | 6 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-h3-r.c | 4 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c | 1 + + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 2 +- + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 4 +- + drivers/pinctrl/uniphier/Kconfig | 4 + + drivers/pinctrl/uniphier/Makefile | 1 + + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 279 ++- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 665 ++---- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 714 ++---- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 273 +-- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 386 +--- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 451 +--- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 458 +--- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 386 +--- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 989 ++++++++ + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 273 +-- + drivers/pinctrl/uniphier/pinctrl-uniphier.h | 40 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 8 +- + drivers/pinctrl/zte/pinctrl-zx.c | 7 +- + include/dt-bindings/pinctrl/qcom,pmic-gpio.h | 2 + + include/dt-bindings/pinctrl/samsung.h | 3 +- + include/linux/pinctrl/machine.h | 4 +- + 109 files changed, 10779 insertions(+), 3872 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/cortina,gemini-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx7ulp-pinctrl.txt + create mode 100644 arch/arm/boot/dts/imx7ulp-pinfunc.h + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx7ulp.c + create mode 100644 drivers/pinctrl/intel/pinctrl-denverton.c + create mode 100644 drivers/pinctrl/intel/pinctrl-lewisburg.c + create mode 100644 drivers/pinctrl/pinctrl-gemini.c + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a77995.c + create mode 100644 drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c +Merging pinctrl-samsung/for-next (bbed85f45b2b pinctrl: samsung: Remove unneeded local variable initialization) +$ git merge pinctrl-samsung/for-next +Already up-to-date. +Merging pwm/for-next (7755daf5e7e8 Merge branch 'for-4.14/drivers' into for-next) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-bcm2835.txt | 4 +- + .../devicetree/bindings/pwm/pwm-mediatek.txt | 6 +- + .../devicetree/bindings/pwm/pwm-rockchip.txt | 11 +- + .../devicetree/bindings/pwm/pwm-tiecap.txt | 1 + + Documentation/devicetree/bindings/pwm/pwm-zx.txt | 22 ++ + .../devicetree/bindings/pwm/renesas,tpu-pwm.txt | 1 - + drivers/pwm/Kconfig | 13 +- + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-bcm2835.c | 2 + + drivers/pwm/pwm-hibvt.c | 2 +- + drivers/pwm/pwm-mediatek.c | 78 ++++-- + drivers/pwm/pwm-meson.c | 2 +- + drivers/pwm/pwm-pca9685.c | 14 +- + drivers/pwm/pwm-renesas-tpu.c | 1 - + drivers/pwm/pwm-rockchip.c | 281 ++++++++++---------- + drivers/pwm/pwm-samsung.c | 70 ++--- + drivers/pwm/pwm-tegra.c | 2 +- + drivers/pwm/pwm-tiecap.c | 90 ++++--- + drivers/pwm/pwm-tiehrpwm.c | 122 +++++---- + drivers/pwm/pwm-vt8500.c | 1 + + drivers/pwm/pwm-zx.c | 282 +++++++++++++++++++++ + 21 files changed, 699 insertions(+), 307 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-zx.txt + create mode 100644 drivers/pwm/pwm-zx.c +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 062b51fa156e] 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 (64a76d0d64be signal: Fix sending signals with siginfo) +$ git merge userns/for-next +Resolved 'arch/mips/kernel/traps.c' using previous resolution. +Auto-merging security/commoncap.c +Auto-merging kernel/signal.c +Auto-merging kernel/exit.c +Auto-merging include/linux/user_namespace.h +Auto-merging arch/sparc/kernel/traps_64.c +Auto-merging arch/mips/kernel/traps.c +CONFLICT (content): Merge conflict in arch/mips/kernel/traps.c +Auto-merging arch/arm64/kernel/signal32.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e55be30b3ef7] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/uapi/asm/siginfo.h | 14 ++++ + arch/alpha/kernel/traps.c | 6 +- + arch/arm64/kernel/signal32.c | 23 ++---- + arch/blackfin/include/uapi/asm/siginfo.h | 30 ++++--- + arch/frv/include/uapi/asm/siginfo.h | 2 +- + arch/ia64/include/uapi/asm/siginfo.h | 21 +++-- + arch/ia64/kernel/signal.c | 17 ++-- + arch/ia64/kernel/traps.c | 4 +- + arch/mips/include/uapi/asm/siginfo.h | 11 ++- + arch/mips/kernel/signal32.c | 19 ++--- + arch/parisc/kernel/signal32.c | 31 ++++--- + arch/powerpc/kernel/signal_32.c | 20 ++--- + arch/s390/kernel/compat_signal.c | 32 ++++--- + arch/sparc/include/uapi/asm/siginfo.h | 9 +- + arch/sparc/kernel/signal32.c | 16 ++-- + arch/sparc/kernel/traps_32.c | 2 +- + arch/sparc/kernel/traps_64.c | 2 +- + arch/tile/include/uapi/asm/siginfo.h | 4 +- + arch/tile/kernel/compat_signal.c | 18 ++-- + arch/tile/kernel/traps.c | 2 +- + arch/x86/kernel/signal_compat.c | 21 ++--- + fs/fcntl.c | 13 ++- + fs/signalfd.c | 22 ++--- + include/linux/signal.h | 22 +++++ + include/linux/user_namespace.h | 9 +- + include/uapi/asm-generic/siginfo.h | 115 +++++++++++--------------- + kernel/exit.c | 4 +- + kernel/pid_namespace.c | 4 + + kernel/ptrace.c | 6 +- + kernel/signal.c | 72 ++++++++++++---- + kernel/sys.c | 8 +- + kernel/user_namespace.c | 20 +++-- + security/commoncap.c | 7 +- + tools/testing/selftests/x86/mpx-mini-test.c | 3 +- + tools/testing/selftests/x86/protection_keys.c | 13 ++- + 35 files changed, 348 insertions(+), 274 deletions(-) +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 (1f87c7c15d77 selftests: lib.mk: change RUN_TESTS to print messages in TAP13 format) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/timers/set-timer-lat.c +Merge made by the 'recursive' strategy. + .../selftests/breakpoints/breakpoint_test.c | 4 +- + tools/testing/selftests/capabilities/test_execve.c | 193 ++++++++++++--------- + .../testing/selftests/capabilities/validate_cap.c | 24 ++- + .../selftests/cpu-hotplug/cpu-on-off-test.sh | 14 ++ + tools/testing/selftests/ftrace/ftracetest | 51 ++++-- + .../selftests/futex/functional/futex_requeue_pi.c | 8 +- + .../functional/futex_requeue_pi_mismatched_ops.c | 3 +- + .../functional/futex_requeue_pi_signal_restart.c | 5 +- + .../functional/futex_wait_private_mapped_file.c | 6 +- + .../futex/functional/futex_wait_timeout.c | 5 +- + .../functional/futex_wait_uninitialized_heap.c | 3 +- + .../futex/functional/futex_wait_wouldblock.c | 3 +- + tools/testing/selftests/futex/include/logging.h | 20 +-- + tools/testing/selftests/kselftest.h | 30 +++- + tools/testing/selftests/lib.mk | 17 +- + tools/testing/selftests/memfd/fuse_test.c | 2 +- + tools/testing/selftests/nsfs/config | 3 + + tools/testing/selftests/pstore/.gitignore | 2 + + tools/testing/selftests/ptp/Makefile | 1 + + tools/testing/selftests/sigaltstack/sas.c | 53 +++--- + tools/testing/selftests/splice/.gitignore | 1 + + tools/testing/selftests/splice/Makefile | 5 +- + tools/testing/selftests/sync/sync_test.c | 71 +++++--- + tools/testing/selftests/sync/synctest.h | 3 +- + tools/testing/selftests/timers/Makefile | 23 +-- + tools/testing/selftests/timers/adjtick.c | 11 -- + .../testing/selftests/timers/alarmtimer-suspend.c | 11 -- + tools/testing/selftests/timers/change_skew.c | 11 -- + .../testing/selftests/timers/clocksource-switch.c | 13 +- + .../testing/selftests/timers/inconsistency-check.c | 11 -- + tools/testing/selftests/timers/leap-a-day.c | 28 +-- + tools/testing/selftests/timers/leapcrash.c | 13 -- + tools/testing/selftests/timers/mqueue-lat.c | 11 -- + tools/testing/selftests/timers/nanosleep.c | 11 -- + tools/testing/selftests/timers/nsleep-lat.c | 11 -- + tools/testing/selftests/timers/raw_skew.c | 12 -- + tools/testing/selftests/timers/rtctest.c | 7 +- + tools/testing/selftests/timers/set-2038.c | 11 -- + tools/testing/selftests/timers/set-tai.c | 11 -- + tools/testing/selftests/timers/set-timer-lat.c | 11 -- + tools/testing/selftests/timers/set-tz.c | 11 -- + tools/testing/selftests/timers/skew_consistency.c | 11 -- + tools/testing/selftests/timers/threadtest.c | 12 -- + tools/testing/selftests/timers/valid-adjtimex.c | 11 -- + tools/testing/selftests/watchdog/watchdog-test.c | 190 ++++++++++++-------- + 45 files changed, 483 insertions(+), 485 deletions(-) + create mode 100644 tools/testing/selftests/nsfs/config + create mode 100644 tools/testing/selftests/pstore/.gitignore + create mode 100644 tools/testing/selftests/splice/.gitignore +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 (6d34a5f3806d coresight: STM: Clean up __iomem type usage) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight-dynamic-replicator.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/coresight.txt | 4 +- + drivers/hwtracing/coresight/Kconfig | 10 +- + drivers/hwtracing/coresight/Makefile | 2 +- + ...cator-qcom.c => coresight-dynamic-replicator.c} | 36 ++++++- + drivers/hwtracing/coresight/coresight-etb10.c | 70 ++++++++----- + drivers/hwtracing/coresight/coresight-etm-perf.c | 4 +- + drivers/hwtracing/coresight/coresight-etm.h | 1 + + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 26 ++--- + drivers/hwtracing/coresight/coresight-etm3x.c | 44 ++++++--- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 24 ++--- + drivers/hwtracing/coresight/coresight-etm4x.c | 4 + + drivers/hwtracing/coresight/coresight-funnel.c | 9 +- + drivers/hwtracing/coresight/coresight-priv.h | 39 +++++++- + drivers/hwtracing/coresight/coresight-stm.c | 55 ++++++----- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 42 ++++++-- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 49 ++++++--- + drivers/hwtracing/coresight/coresight-tmc.c | 110 ++++++++++++++++----- + drivers/hwtracing/coresight/coresight-tmc.h | 85 +++++++++++++++- + drivers/hwtracing/coresight/coresight-tpiu.c | 9 +- + drivers/hwtracing/coresight/coresight.c | 8 ++ + include/linux/coresight-pmu.h | 6 ++ + tools/include/linux/coresight-pmu.h | 6 ++ + tools/perf/arch/arm/util/cs-etm.c | 28 +++++- + 23 files changed, 510 insertions(+), 161 deletions(-) + rename drivers/hwtracing/coresight/{coresight-replicator-qcom.c => coresight-dynamic-replicator.c} (86%) +Merging rtc/rtc-next (888f94dcb76a rtc: sun6i: Add support for the external oscillator gate) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-ds1307.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/power/wakeup-source.txt | 9 +- + .../bindings/rtc/google,goldfish-rtc.txt | 17 ++ + .../devicetree/bindings/rtc/isil,isl12057.txt | 1 - + .../devicetree/bindings/rtc/sun6i-rtc.txt | 4 +- + MAINTAINERS | 6 + + drivers/rtc/Kconfig | 22 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-dev.c | 20 +- + drivers/rtc/rtc-ds1307.c | 183 ++++++++-------- + drivers/rtc/rtc-ds1672.c | 2 +- + drivers/rtc/rtc-em3027.c | 2 +- + drivers/rtc/rtc-goldfish.c | 237 +++++++++++++++++++++ + drivers/rtc/rtc-m41t80.c | 67 ++---- + drivers/rtc/rtc-max6900.c | 2 +- + drivers/rtc/rtc-max8925.c | 2 - + drivers/rtc/rtc-mxc.c | 21 -- + drivers/rtc/rtc-puv3.c | 72 ++----- + drivers/rtc/rtc-pxa.c | 4 +- + drivers/rtc/rtc-rv3029c2.c | 2 +- + drivers/rtc/rtc-s35390a.c | 104 ++++++--- + drivers/rtc/rtc-sa1100.c | 65 ++---- + drivers/rtc/rtc-sun6i.c | 34 ++- + drivers/rtc/rtc-vr41xx.c | 18 -- + include/linux/rtc.h | 2 - + 24 files changed, 542 insertions(+), 355 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt + create mode 100644 drivers/rtc/rtc-goldfish.c +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 (bbb3be170ac2 device-dax: fix sysfs duplicate warnings) +$ git merge nvdimm/libnvdimm-for-next +Already up-to-date. +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) +$ git merge idr/idr-4.11 +Already up-to-date. +Merging kspp/for-next/kspp (cb624a11ecd5 Merge branch 'for-next/secureexec' into for-next/kspp) +$ git merge kspp/for-next/kspp +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging security/commoncap.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/include/domain.h +Auto-merging security/apparmor/domain.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging fs/binfmt_elf.c +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c +Auto-merging arch/Kconfig +Merge made by the 'recursive' strategy. + arch/Kconfig | 19 ++++++--- + drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 8 ++-- + drivers/net/wan/z85230.c | 30 +++++++------- + fs/binfmt_elf.c | 2 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/binfmt_flat.c | 2 +- + fs/exec.c | 56 +++++++++++++++++++------- + include/linux/binfmts.h | 24 ++++++++--- + include/linux/lsm_hooks.h | 14 +++---- + include/linux/security.h | 7 ---- + scripts/Makefile.gcc-plugins | 1 + + scripts/gcc-plugins/randomize_layout_plugin.c | 3 -- + scripts/gcc-plugins/structleak_plugin.c | 13 +++++- + security/apparmor/domain.c | 21 +--------- + security/apparmor/include/domain.h | 1 - + security/apparmor/include/file.h | 3 -- + security/apparmor/lsm.c | 1 - + security/commoncap.c | 50 +++++------------------ + security/security.c | 5 --- + security/selinux/hooks.c | 26 +++--------- + security/smack/smack_lsm.c | 34 ++-------------- + security/tomoyo/tomoyo.c | 2 +- + 22 files changed, 135 insertions(+), 189 deletions(-) +$ git am -3 ../patches/0001-Revert-scsi-qlogicpti-move-bus-reset-to-host-reset.patch +Applying: Revert "scsi: qlogicpti: move bus reset to host reset" +Merging akpm-current/current (0193a5e75472 ipc: optimize semget/shmget/msgget for lots of keys) +$ git merge --no-ff akpm-current/current +Resolved 'arch/parisc/include/uapi/asm/mman.h' using previous resolution. +Auto-merging tools/objtool/check.c +Auto-merging sound/soc/codecs/pcm512x.c +Auto-merging scripts/mod/modpost.c +Auto-merging mm/vmscan.c +Auto-merging mm/shmem.c +Auto-merging mm/page_io.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memcontrol.c +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging kernel/sched/topology.c +Auto-merging kernel/sched/sched.h +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/debug.c +Auto-merging kernel/sched/deadline.c +Auto-merging kernel/rcu/tree_plugin.h +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/memremap.c +Auto-merging kernel/locking/rtmutex_common.h +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup/cpuset.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/Makefile +Auto-merging ipc/sem.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/rdma/ib_verbs.h +Auto-merging include/linux/sched/mm.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/init_task.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/bio.h +Auto-merging include/asm-generic/pgtable.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/userfaultfd.c +Auto-merging fs/ubifs/file.c +Auto-merging fs/sync.c +Auto-merging fs/ramfs/file-nommu.c +Auto-merging fs/proc/base.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/ocfs2/cluster/heartbeat.c +Auto-merging fs/inode.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext2/file.c +Auto-merging fs/ceph/cache.c +Auto-merging fs/buffer.c +Auto-merging fs/aio.c +Auto-merging drivers/scsi/sym53c8xx_2/sym_hipd.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/infiniband/hw/hfi1/mmu_rb.c +Auto-merging drivers/infiniband/core/uverbs_cmd.c +Auto-merging drivers/gpu/drm/radeon/radeon_vm.c +Auto-merging drivers/gpu/drm/radeon/radeon.h +Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging drivers/block/brd.c +Auto-merging block/genhd.c +Auto-merging block/cfq-iosched.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/x86/include/asm/pgtable_types.h +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/tile/kernel/setup.c +Auto-merging arch/powerpc/sysdev/xive/native.c +Auto-merging arch/powerpc/sysdev/fsl_rmu.c +Auto-merging arch/powerpc/sysdev/fsl_rio.c +Auto-merging arch/powerpc/kernel/setup-common.c +Auto-merging arch/parisc/include/uapi/asm/mman.h +CONFLICT (content): Merge conflict in arch/parisc/include/uapi/asm/mman.h +Auto-merging arch/arm64/kernel/smp.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master eaebc50f4e5d] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/procfs-smaps_rollup | 34 + + Documentation/ABI/testing/sysfs-block-zram | 8 + + Documentation/ABI/testing/sysfs-kernel-mm-swap | 26 + + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/blockdev/zram.txt | 11 + + Documentation/filesystems/caching/netfs-api.txt | 2 - + Documentation/filesystems/dax.txt | 5 +- + Documentation/rbtree.txt | 33 + + Documentation/sysctl/vm.txt | 4 +- + Documentation/vm/hmm.txt | 384 ++++++ + Documentation/vm/numa | 7 +- + Documentation/vm/swap_numa.txt | 69 ++ + MAINTAINERS | 16 +- + arch/alpha/include/asm/string.h | 15 +- + arch/alpha/include/asm/vga.h | 2 +- + arch/alpha/include/uapi/asm/mman.h | 14 +- + arch/alpha/lib/memset.S | 10 +- + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/string.h | 14 + + arch/arm/kernel/armksyms.c | 2 + + arch/arm/lib/memset.S | 24 +- + arch/arm64/kernel/smp.c | 2 +- + arch/m32r/configs/m32104ut_defconfig | 4 - + arch/m32r/configs/m32700ut.smp_defconfig | 3 - + arch/m32r/configs/m32700ut.up_defconfig | 3 - + arch/m32r/configs/mappi.nommu_defconfig | 2 - + arch/m32r/configs/mappi.smp_defconfig | 4 - + arch/m32r/configs/mappi.up_defconfig | 4 - + arch/m32r/configs/mappi2.opsp_defconfig | 2 - + arch/m32r/configs/mappi2.vdec2_defconfig | 2 - + arch/m32r/configs/mappi3.smp_defconfig | 4 - + arch/m32r/configs/oaks32r_defconfig | 2 - + arch/m32r/configs/opsput_defconfig | 2 - + arch/m32r/configs/usrv_defconfig | 5 - + arch/metag/include/asm/topology.h | 1 - + arch/mips/include/asm/vga.h | 7 + + arch/mips/include/uapi/asm/mman.h | 14 +- + arch/mn10300/configs/asb2303_defconfig | 6 - + arch/mn10300/configs/asb2364_defconfig | 8 - + arch/parisc/include/uapi/asm/mman.h | 14 +- + arch/powerpc/include/asm/vga.h | 8 + + arch/powerpc/include/uapi/asm/mman.h | 16 - + arch/powerpc/kernel/paca.c | 2 +- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/sysdev/fsl_rio.c | 17 +- + arch/powerpc/sysdev/fsl_rmu.c | 8 + + arch/powerpc/sysdev/xive/native.c | 4 +- + arch/sh/configs/ap325rxa_defconfig | 10 - + arch/sh/configs/apsh4a3a_defconfig | 9 - + arch/sh/configs/apsh4ad0a_defconfig | 6 - + arch/sh/configs/cayman_defconfig | 4 - + arch/sh/configs/dreamcast_defconfig | 6 - + arch/sh/configs/ecovec24-romimage_defconfig | 7 - + arch/sh/configs/ecovec24_defconfig | 9 - + arch/sh/configs/edosk7705_defconfig | 2 - + arch/sh/configs/edosk7760_defconfig | 11 - + arch/sh/configs/espt_defconfig | 10 - + arch/sh/configs/hp6xx_defconfig | 4 - + arch/sh/configs/kfr2r09-romimage_defconfig | 5 - + arch/sh/configs/kfr2r09_defconfig | 7 - + arch/sh/configs/landisk_defconfig | 4 - + arch/sh/configs/lboxre2_defconfig | 3 - + arch/sh/configs/magicpanelr2_defconfig | 9 - + arch/sh/configs/microdev_defconfig | 3 - + arch/sh/configs/migor_defconfig | 8 - + arch/sh/configs/polaris_defconfig | 9 - + arch/sh/configs/r7780mp_defconfig | 4 - + arch/sh/configs/r7785rp_defconfig | 3 - + arch/sh/configs/rsk7201_defconfig | 8 - + arch/sh/configs/rsk7203_defconfig | 10 - + arch/sh/configs/rsk7264_defconfig | 3 - + arch/sh/configs/rsk7269_defconfig | 4 - + arch/sh/configs/rts7751r2d1_defconfig | 5 - + arch/sh/configs/rts7751r2dplus_defconfig | 8 - + arch/sh/configs/sdk7780_defconfig | 9 - + arch/sh/configs/sdk7786_defconfig | 9 - + arch/sh/configs/se7206_defconfig | 8 - + arch/sh/configs/se7343_defconfig | 9 - + arch/sh/configs/se7619_defconfig | 5 - + arch/sh/configs/se7705_defconfig | 5 - + arch/sh/configs/se7712_defconfig | 7 - + arch/sh/configs/se7721_defconfig | 6 - + arch/sh/configs/se7722_defconfig | 3 - + arch/sh/configs/se7724_defconfig | 9 - + arch/sh/configs/se7750_defconfig | 5 - + arch/sh/configs/se7751_defconfig | 5 - + arch/sh/configs/se7780_defconfig | 7 - + arch/sh/configs/secureedge5410_defconfig | 9 - + arch/sh/configs/sh03_defconfig | 4 - + arch/sh/configs/sh2007_defconfig | 8 - + arch/sh/configs/sh7710voipgw_defconfig | 5 - + arch/sh/configs/sh7724_generic_defconfig | 3 - + arch/sh/configs/sh7757lcr_defconfig | 4 - + arch/sh/configs/sh7763rdp_defconfig | 9 - + arch/sh/configs/sh7770_generic_defconfig | 3 - + arch/sh/configs/sh7785lcr_32bit_defconfig | 10 - + arch/sh/configs/sh7785lcr_defconfig | 9 - + arch/sh/configs/shmin_defconfig | 4 - + arch/sh/configs/shx3_defconfig | 6 - + arch/sh/configs/titan_defconfig | 8 - + arch/sh/configs/ul2_defconfig | 9 - + arch/sh/configs/urquell_defconfig | 9 - + arch/sparc/include/asm/vga.h | 25 + + arch/tile/kernel/setup.c | 2 +- + arch/x86/Kconfig | 12 +- + arch/x86/boot/compressed/misc.c | 2 +- + arch/x86/include/asm/pgtable.h | 17 + + arch/x86/include/asm/pgtable_64.h | 14 +- + arch/x86/include/asm/pgtable_types.h | 10 +- + arch/x86/include/asm/string_32.h | 24 + + arch/x86/include/asm/string_64.h | 36 + + arch/x86/include/uapi/asm/mman.h | 3 - + arch/x86/kernel/apic/apic.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/setup_percpu.c | 2 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/mm/init_64.c | 22 +- + arch/xtensa/include/uapi/asm/mman.h | 14 +- + block/cfq-iosched.c | 81 +- + block/genhd.c | 2 +- + drivers/base/cpu.c | 4 +- + drivers/base/memory.c | 30 +- + drivers/base/node.c | 22 +- + drivers/block/brd.c | 6 +- + drivers/block/zram/Kconfig | 12 + + drivers/block/zram/zram_drv.c | 553 +++++++-- + drivers/block/zram/zram_drv.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + drivers/gpu/drm/drm_mm.c | 19 +- + drivers/gpu/drm/drm_vma_manager.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 4 +- + drivers/gpu/drm/i915/i915_drv.h | 1 + + drivers/gpu/drm/i915/i915_gem.c | 4 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 24 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 6 +- + drivers/gpu/drm/radeon/radeon.h | 2 +- + drivers/gpu/drm/radeon/radeon_mn.c | 8 +- + drivers/gpu/drm/radeon/radeon_vm.c | 7 +- + drivers/infiniband/core/umem_rbtree.c | 4 +- + drivers/infiniband/core/uverbs_cmd.c | 2 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 10 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 6 +- + drivers/infiniband/hw/usnic/usnic_uiom.h | 2 +- + .../infiniband/hw/usnic/usnic_uiom_interval_tree.c | 15 +- + .../infiniband/hw/usnic/usnic_uiom_interval_tree.h | 12 +- + drivers/mtd/nand/denali.c | 3 - + drivers/nvdimm/btt.c | 4 +- + drivers/nvdimm/pmem.c | 41 +- + drivers/rapidio/devices/tsi721.c | 7 + + drivers/rapidio/rio-access.c | 40 +- + drivers/scsi/scsi_debug.c | 2 +- + drivers/scsi/sym53c8xx_2/sym_hipd.c | 11 +- + drivers/vhost/vhost.c | 2 +- + drivers/vhost/vhost.h | 2 +- + fs/9p/cache.c | 29 - + fs/adfs/dir_f.c | 5 +- + fs/afs/cache.c | 43 - + fs/aio.c | 8 + + fs/autofs4/autofs_i.h | 22 +- + fs/autofs4/dev-ioctl.c | 44 +- + fs/buffer.c | 31 +- + fs/ceph/cache.c | 31 - + fs/cifs/cache.c | 31 - + fs/dax.c | 361 +++--- + fs/eventpoll.c | 30 +- + fs/ext2/file.c | 25 +- + fs/ext4/file.c | 48 +- + fs/ext4/inode.c | 15 +- + fs/f2fs/data.c | 5 +- + fs/fat/namei_vfat.c | 35 +- + fs/fscache/page.c | 5 +- + fs/hugetlbfs/inode.c | 41 +- + fs/inode.c | 2 +- + fs/namei.c | 15 +- + fs/nfs/fscache-index.c | 40 - + fs/nilfs2/page.c | 3 +- + fs/ocfs2/acl.c | 2 +- + fs/ocfs2/acl.h | 7 - + fs/ocfs2/alloc.c | 22 +- + fs/ocfs2/alloc.h | 3 +- + fs/ocfs2/cluster/heartbeat.c | 42 +- + fs/ocfs2/dir.c | 2 +- + fs/ocfs2/dlm/dlmmaster.c | 66 +- + fs/ocfs2/dlm/dlmrecovery.c | 51 +- + fs/ocfs2/dlm/dlmthread.c | 36 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/file.c | 7 - + fs/ocfs2/filecheck.c | 357 +++--- + fs/ocfs2/filecheck.h | 29 +- + fs/ocfs2/journal.c | 1 - + fs/ocfs2/move_extents.c | 2 +- + fs/ocfs2/ocfs2.h | 12 +- + fs/ocfs2/refcounttree.c | 2 +- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/ocfs2/suballoc.c | 2 +- + fs/ocfs2/super.c | 36 +- + fs/ocfs2/xattr.c | 2 +- + fs/proc/base.c | 2 + + fs/proc/generic.c | 34 +- + fs/proc/internal.h | 5 +- + fs/proc/meminfo.c | 10 +- + fs/proc/proc_net.c | 2 +- + fs/proc/root.c | 2 +- + fs/proc/task_mmu.c | 278 +++-- + fs/proc/task_nommu.c | 5 +- + fs/ramfs/file-nommu.c | 2 +- + fs/seq_file.c | 10 - + fs/sync.c | 5 - + fs/ubifs/file.c | 5 +- + fs/userfaultfd.c | 41 +- + fs/xfs/xfs_file.c | 2 +- + include/asm-generic/pgtable.h | 52 +- + include/drm/drm_mm.h | 2 +- + include/linux/bio.h | 8 + + include/linux/bitmap.h | 32 + + include/linux/bitops.h | 5 +- + include/linux/cpumask.h | 21 +- + include/linux/crash_core.h | 2 + + include/linux/dax.h | 45 - + include/linux/fs.h | 9 +- + include/linux/fscache.h | 9 - + include/linux/hmm.h | 518 ++++++++ + include/linux/huge_mm.h | 24 +- + include/linux/init_task.h | 5 +- + include/linux/interval_tree.h | 8 +- + include/linux/interval_tree_generic.h | 48 +- + include/linux/ioport.h | 2 + + include/linux/ipc.h | 6 +- + include/linux/ipc_namespace.h | 8 +- + include/linux/kernel.h | 7 +- + include/linux/kmod.h | 60 +- + include/linux/memcontrol.h | 52 +- + include/linux/memory_hotplug.h | 13 +- + include/linux/memremap.h | 99 ++ + include/linux/migrate.h | 152 ++- + include/linux/migrate_mode.h | 5 + + include/linux/mm.h | 72 +- + include/linux/mm_types.h | 7 + + include/linux/mmzone.h | 29 +- + include/linux/page-flags.h | 4 +- + include/linux/pageblock-flags.h | 11 + + include/linux/pagemap.h | 12 +- + include/linux/pagevec.h | 12 +- + include/linux/proc_fs.h | 8 +- + include/linux/rbtree.h | 21 + + include/linux/rbtree_augmented.h | 33 +- + include/linux/reboot.h | 4 + + include/linux/rhashtable.h | 2 +- + include/linux/rmap.h | 7 +- + include/linux/rtmutex.h | 11 +- + include/linux/sched.h | 3 +- + include/linux/sched/mm.h | 6 - + include/linux/shm.h | 17 - + include/linux/shmem_fs.h | 6 + + include/linux/shrinker.h | 7 + + include/linux/slub_def.h | 4 + + include/linux/string.h | 60 +- + include/linux/swap.h | 102 +- + include/linux/swapops.h | 143 ++- + include/linux/umh.h | 69 ++ + include/linux/vm_event_item.h | 6 + + include/linux/vmstat.h | 37 +- + include/linux/vt_buffer.h | 13 + + include/rdma/ib_umem_odp.h | 11 +- + include/rdma/ib_verbs.h | 2 +- + include/trace/events/fs_dax.h | 2 - + include/trace/events/mmflags.h | 8 +- + include/uapi/asm-generic/hugetlb_encode.h | 34 + + include/uapi/asm-generic/mman-common.h | 14 +- + include/uapi/linux/auto_dev-ioctl.h | 2 +- + include/uapi/linux/auto_fs4.h | 2 - + include/uapi/linux/memfd.h | 24 + + include/uapi/linux/mman.h | 22 + + include/uapi/linux/shm.h | 31 +- + include/uapi/linux/sysctl.h | 4 + + include/uapi/linux/userfaultfd.h | 16 +- + init/Kconfig | 9 + + init/main.c | 15 +- + ipc/msg.c | 10 +- + ipc/msgutil.c | 2 +- + ipc/namespace.c | 24 +- + ipc/sem.c | 25 +- + ipc/shm.c | 12 +- + ipc/util.c | 106 +- + ipc/util.h | 21 +- + kernel/Makefile | 3 +- + kernel/cgroup/cgroup.c | 3 - + kernel/cgroup/cpuset.c | 9 +- + kernel/fork.c | 33 +- + kernel/kcov.c | 1 + + kernel/kmod.c | 563 +-------- + kernel/kthread.c | 1 + + kernel/locking/rtmutex-debug.c | 2 +- + kernel/locking/rtmutex.c | 35 +- + kernel/locking/rtmutex_common.h | 12 +- + kernel/memremap.c | 112 +- + kernel/rcu/tree.c | 2 +- + kernel/rcu/tree_plugin.h | 2 +- + kernel/reboot.c | 27 + + kernel/sched/deadline.c | 50 +- + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 39 +- + kernel/sched/sched.h | 9 +- + kernel/sched/topology.c | 2 +- + kernel/smp.c | 2 +- + kernel/trace/trace_functions_graph.c | 2 +- + kernel/umh.c | 568 +++++++++ + lib/Kconfig | 3 + + lib/Kconfig.debug | 11 + + lib/Makefile | 1 + + lib/bitmap.c | 18 +- + lib/cmdline.c | 1 - + lib/cpumask.c | 16 + + lib/hexdump.c | 5 +- + lib/interval_tree_test.c | 4 +- + lib/rbtree.c | 65 +- + lib/rbtree_test.c | 230 +++- + lib/string.c | 214 +++- + lib/test_bitmap.c | 91 ++ + lib/test_debug_virtual.c | 49 + + lib/test_kmod.c | 4 +- + mm/Kconfig | 55 +- + mm/Makefile | 1 + + mm/balloon_compaction.c | 8 + + mm/compaction.c | 59 +- + mm/fadvise.c | 6 +- + mm/filemap.c | 67 +- + mm/gup.c | 31 +- + mm/hmm.c | 1272 ++++++++++++++++++++ + mm/huge_memory.c | 206 +++- + mm/hugetlb.c | 65 +- + mm/internal.h | 12 + + mm/interval_tree.c | 10 +- + mm/ksm.c | 2 +- + mm/madvise.c | 15 +- + mm/memcontrol.c | 290 +++-- + mm/memory.c | 260 +++- + mm/memory_hotplug.c | 132 +- + mm/mempolicy.c | 137 ++- + mm/migrate.c | 1007 +++++++++++++++- + mm/mlock.c | 10 +- + mm/mmap.c | 56 +- + mm/mprotect.c | 18 +- + mm/mremap.c | 15 +- + mm/nommu.c | 4 +- + mm/oom_kill.c | 24 +- + mm/page-writeback.c | 4 +- + mm/page_alloc.c | 462 +++---- + mm/page_ext.c | 6 +- + mm/page_idle.c | 2 +- + mm/page_io.c | 21 +- + mm/page_owner.c | 50 +- + mm/page_vma_mapped.c | 28 +- + mm/pgtable-generic.c | 3 +- + mm/rmap.c | 50 +- + mm/shmem.c | 206 ++-- + mm/slub.c | 54 +- + mm/sparse-vmemmap.c | 11 +- + mm/sparse.c | 10 +- + mm/swap.c | 35 +- + mm/swap_state.c | 314 ++++- + mm/swapfile.c | 362 +++++- + mm/userfaultfd.c | 48 +- + mm/util.c | 2 +- + mm/vmalloc.c | 20 +- + mm/vmscan.c | 130 +- + mm/vmstat.c | 169 ++- + mm/z3fold.c | 479 +++++--- + mm/zsmalloc.c | 25 +- + scripts/checkpatch.pl | 24 + + scripts/mod/modpost.c | 27 +- + scripts/parse-maintainers.pl | 52 +- + sound/soc/codecs/pcm512x.c | 3 - + tools/objtool/check.c | 1 - + tools/testing/selftests/memfd/Makefile | 2 +- + tools/testing/selftests/memfd/memfd_test.c | 372 ++++-- + tools/testing/selftests/memfd/run_tests.sh | 69 ++ + tools/testing/selftests/vm/userfaultfd.c | 279 ++++- + 382 files changed, 11546 insertions(+), 4341 deletions(-) + create mode 100644 Documentation/ABI/testing/procfs-smaps_rollup + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-swap + create mode 100644 Documentation/vm/hmm.txt + create mode 100644 Documentation/vm/swap_numa.txt + create mode 100644 include/linux/hmm.h + create mode 100644 include/linux/umh.h + create mode 100644 include/uapi/asm-generic/hugetlb_encode.h + create mode 100644 kernel/umh.c + create mode 100644 lib/test_debug_virtual.c + create mode 100644 mm/hmm.c + create mode 100644 tools/testing/selftests/memfd/run_tests.sh +$ git am -3 ../mmotm/broken-out/zram-mm-vs-block.patch +Applying: zram-mm-vs-block +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/block/zram/zram_drv.c +$ git add -A . +$ git commit -v -a --amend +[master 6a63949dfd8e] Merge branch 'akpm-current/current' + Date: Mon Aug 28 18:02:51 2017 +1000 +$ git am -3 ../patches/0001-mm-hmm-struct-hmm-is-only-use-by-HMM-mirror-function.patch +Applying: mm/hmm: struct hmm is only use by HMM mirror functionality v2 fix +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: fs/select.c: fix memory corruption in compat_get_fd_set() +Applying: drivers/acpi/nfit/core.c: fix the abuse of COMPLETION_INITIALIZER_ONSTACK() +Applying: include/linux/completion.h: avoid unnecessary stack allocation for COMPLETION_INITIALIZER_ONSTACK() +Applying: drivers/media/cec/cec-adap.c: fix build with gcc-4.4.4 +Applying: fscache: fix fscache_objlist_show format processing +Applying: IB/mlx4: fix sprintf format warning +Applying: iopoll: avoid -Wint-in-bool-context warning +Applying: select: use get/put_timespec64 +Applying: io_getevents: use timespec64 to represent timeouts +Applying: sparc64: NG4 memset 32 bits overflow +Applying: mm: treewide: remove GFP_TEMPORARY allocation flag +Applying: treewide-remove-gfp_temporary-allocation-flag-fix +Applying: treewide-remove-gfp_temporary-allocation-flag-checkpatch-fixes +Applying: drm/i915: fix up for mm: treewide: remove GFP_TEMPORARY allocation flag +Applying: lib/crc-ccitt: add CCITT-FALSE CRC16 variant +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 72aeadad1e7f...ff34666b7124 akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (ff34666b7124 lib/crc-ccitt: add CCITT-FALSE CRC16 variant) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arc/kernel/setup.c | 2 +- + arch/arc/kernel/troubleshoot.c | 2 +- + arch/powerpc/kernel/rtas.c | 4 +- + arch/powerpc/platforms/pseries/suspend.c | 2 +- + arch/sparc/lib/NG4memset.S | 26 ++++----- + drivers/acpi/nfit/core.c | 2 +- + drivers/gpu/drm/drm_blend.c | 2 +- + drivers/gpu/drm/drm_dp_dual_mode_helper.c | 2 +- + drivers/gpu/drm/drm_scdc_helper.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 12 ++-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 4 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 6 +- + drivers/gpu/drm/i915/selftests/i915_random.c | 2 +- + drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c | 10 ++-- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 +- + drivers/gpu/drm/lib/drm_random.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 2 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 4 +- + drivers/infiniband/hw/mlx4/sysfs.c | 2 +- + drivers/media/cec/cec-adap.c | 5 +- + drivers/misc/cxl/pci.c | 2 +- + drivers/xen/gntalloc.c | 2 +- + fs/aio.c | 55 ++++++++++-------- + fs/coredump.c | 2 +- + fs/exec.c | 4 +- + fs/fscache/object-list.c | 3 +- + fs/overlayfs/copy_up.c | 2 +- + fs/overlayfs/dir.c | 2 +- + fs/overlayfs/namei.c | 12 ++-- + fs/proc/base.c | 8 +-- + fs/proc/task_mmu.c | 2 +- + fs/select.c | 66 ++++++++-------------- + include/linux/completion.h | 2 +- + include/linux/crc-ccitt.h | 7 +++ + include/linux/gfp.h | 2 - + include/linux/iopoll.h | 24 +++++--- + include/linux/regmap.h | 12 ++-- + include/trace/events/mmflags.h | 1 - + kernel/locking/test-ww_mutex.c | 2 +- + kernel/trace/trace_events_filter.c | 2 +- + lib/crc-ccitt.c | 58 ++++++++++++++++++- + lib/string_helpers.c | 4 +- + mm/shmem.c | 2 +- + mm/slub.c | 2 +- + tools/perf/builtin-kmem.c | 1 - + 48 files changed, 220 insertions(+), 160 deletions(-) |