--- /dev/null
+$ date -R
+Mon, 10 Dec 2018 08:13:00 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at abb8d6ecbd8f Merge tag 'trace-v4.20-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
+Merging origin/master (0844895a2e51 Merge tag 'char-misc-4.20-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc)
+$ git merge origin/master
+Updating abb8d6ecbd8f..0844895a2e51
+Fast-forward
+ .../devicetree/bindings/clock/clock-bindings.txt | 16 ++
+ MAINTAINERS | 2 +
+ arch/arm/mm/cache-v7.S | 8 +-
+ arch/arm/mm/cache-v7m.S | 14 +-
+ arch/arm/mm/dma-mapping.c | 2 +-
+ arch/arm/mm/proc-macros.S | 10 ++
+ arch/arm/probes/kprobes/opt-arm.c | 2 +-
+ arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 6 +
+ arch/arm64/kernel/hibernate.c | 2 +-
+ block/bfq-iosched.c | 76 ++++++---
+ block/bfq-iosched.h | 51 +++++-
+ block/bfq-wf2q.c | 5 +-
+ block/blk-mq.c | 33 +---
+ crypto/Kconfig | 2 +-
+ crypto/cbc.c | 6 +-
+ crypto/cfb.c | 6 +-
+ crypto/pcbc.c | 6 +-
+ drivers/acpi/nfit/core.c | 2 +-
+ drivers/clk/mmp/clk.c | 2 +-
+ drivers/clk/mvebu/cp110-system-controller.c | 4 +-
+ drivers/clk/qcom/common.c | 18 ++
+ drivers/clk/zynqmp/clkc.c | 5 +-
+ drivers/dma/dw/core.c | 6 +-
+ drivers/dma/imx-sdma.c | 69 +++++---
+ drivers/dma/ti/cppi41.c | 16 +-
+ drivers/gnss/sirf.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 44 +++--
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 3 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 2 +
+ .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 4 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 3 +
+ drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 2 -
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 12 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 12 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 54 +++---
+ drivers/gpu/drm/ast/ast_fb.c | 1 +
+ drivers/gpu/drm/bridge/ti-sn65dsi86.c | 2 +-
+ drivers/gpu/drm/drm_fb_helper.c | 2 +-
+ drivers/gpu/drm/drm_internal.h | 2 +
+ drivers/gpu/drm/drm_lease.c | 2 +-
+ drivers/gpu/drm/drm_sysfs.c | 10 ++
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 1 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 2 +-
+ drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 4 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.c | 8 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.h | 1 +
+ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 10 +-
+ drivers/gpu/drm/msm/msm_atomic.c | 5 +
+ drivers/gpu/drm/msm/msm_debugfs.c | 15 +-
+ drivers/gpu/drm/msm/msm_drv.c | 49 ++----
+ drivers/gpu/drm/msm/msm_gem_submit.c | 18 +-
+ drivers/gpu/drm/msm/msm_gpu.c | 13 +-
+ drivers/gpu/drm/msm/msm_iommu.c | 2 +-
+ drivers/gpu/drm/msm/msm_rd.c | 5 +-
+ drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 1 +
+ drivers/gpu/drm/omapdrm/dss/dsi.c | 20 +--
+ drivers/gpu/drm/omapdrm/dss/omapdss.h | 2 +-
+ drivers/gpu/drm/omapdrm/omap_encoder.c | 58 ++++---
+ drivers/gpu/drm/ttm/ttm_bo_util.c | 4 +-
+ drivers/hv/channel_mgmt.c | 189 ++++++++++++++-------
+ drivers/hv/connection.c | 24 ++-
+ drivers/hv/hyperv_vmbus.h | 7 +
+ drivers/i2c/busses/i2c-axxia.c | 40 +++--
+ drivers/i2c/busses/i2c-nvidia-gpu.c | 7 +-
+ drivers/i2c/busses/i2c-rcar.c | 9 +-
+ drivers/i2c/busses/i2c-scmi.c | 10 +-
+ drivers/i2c/busses/i2c-uniphier-f.c | 49 +++++-
+ drivers/i2c/busses/i2c-uniphier.c | 8 +-
+ drivers/nvdimm/nd-core.h | 2 +
+ drivers/nvdimm/pfn_devs.c | 64 ++++---
+ drivers/nvdimm/region_devs.c | 41 +++++
+ drivers/nvme/host/core.c | 10 +-
+ drivers/nvme/target/rdma.c | 3 +-
+ drivers/pci/pcie/aspm.c | 2 +-
+ drivers/s390/virtio/virtio_ccw.c | 17 +-
+ drivers/staging/rtl8712/mlme_linux.c | 2 +-
+ drivers/staging/rtl8712/rtl871x_mlme.c | 2 +-
+ drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +-
+ drivers/thermal/armada_thermal.c | 28 ++-
+ drivers/thermal/broadcom/bcm2835_thermal.c | 11 +-
+ drivers/thermal/broadcom/brcmstb_thermal.c | 2 +-
+ drivers/tty/serial/8250/8250_mtk.c | 16 +-
+ drivers/tty/serial/kgdboc.c | 4 +-
+ drivers/tty/tty_io.c | 11 +-
+ drivers/tty/tty_port.c | 3 +-
+ drivers/usb/core/hub.c | 5 +-
+ drivers/usb/core/quirks.c | 4 +
+ drivers/usb/core/usb.c | 6 +-
+ drivers/usb/host/hwa-hc.c | 2 +-
+ drivers/usb/host/xhci-pci.c | 4 +
+ drivers/usb/host/xhci.c | 42 ++++-
+ drivers/usb/host/xhci.h | 3 +
+ drivers/usb/misc/appledisplay.c | 1 +
+ drivers/usb/serial/console.c | 2 +-
+ drivers/vhost/vsock.c | 79 +++++----
+ fs/cifs/Kconfig | 2 +-
+ fs/cifs/dir.c | 2 +-
+ fs/cifs/file.c | 31 +---
+ fs/dax.c | 55 ++++--
+ fs/iomap.c | 9 -
+ fs/nfs/direct.c | 9 +-
+ fs/nfs/flexfilelayout/flexfilelayout.c | 6 +-
+ fs/read_write.c | 2 +-
+ fs/splice.c | 7 +-
+ fs/xfs/libxfs/xfs_btree.c | 2 +-
+ fs/xfs/xfs_bmap_util.c | 4 +-
+ fs/xfs/xfs_qm_bhv.c | 2 +-
+ include/linux/dax.h | 14 +-
+ include/linux/gfp.h | 12 +-
+ include/linux/hyperv.h | 7 +
+ include/linux/sunrpc/xdr.h | 1 -
+ include/linux/tty.h | 1 +
+ include/linux/usb.h | 4 +-
+ include/uapi/asm-generic/unistd.h | 4 +
+ kernel/stackleak.c | 2 +-
+ mm/huge_memory.c | 27 ++-
+ mm/memory-failure.c | 6 +-
+ mm/mempolicy.c | 32 +++-
+ mm/shmem.c | 2 +-
+ net/sunrpc/auth_gss/auth_gss.c | 4 +
+ net/sunrpc/clnt.c | 8 +
+ net/sunrpc/xprt.c | 13 +-
+ net/sunrpc/xprtsock.c | 81 +++++----
+ scripts/gcc-plugins/stackleak_plugin.c | 8 +-
+ tools/testing/nvdimm/test/nfit.c | 35 +++-
+ 130 files changed, 1245 insertions(+), 625 deletions(-)
+Merging fixes/master (d8c137546ef8 powerpc: tag implicit fall throughs)
+$ git merge fixes/master
+Merge made by the 'recursive' strategy.
+ arch/powerpc/kernel/nvram_64.c | 1 +
+ arch/powerpc/platforms/powermac/feature.c | 1 +
+ arch/powerpc/xmon/xmon.c | 1 +
+ 3 files changed, 3 insertions(+)
+Merging kbuild-current/fixes (ccda4af0f4b9 Linux 4.20-rc2)
+$ git merge kbuild-current/fixes
+Already up to date.
+Merging arc-current/for-curr (10d443431dc2 ARC: io.h: Implement reads{x}()/writes{x}())
+$ git merge arc-current/for-curr
+Already up to date.
+Merging arm-current/fixes (c2a3831df6dc ARM: 8816/1: dma-mapping: fix potential uninitialized return)
+$ git merge arm-current/fixes
+Already up to date.
+Merging arm64-fixes/for-next/fixes (b4aecf78083d arm64: hibernate: Avoid sending cross-calling with interrupts disabled)
+$ git merge arm64-fixes/for-next/fixes
+Already up to date.
+Merging m68k-current/for-linus (58c116fb7dc6 m68k/sun3: Remove is_medusa and m68k_pgtable_cachemode)
+$ git merge m68k-current/for-linus
+Already up to date.
+Merging powerpc-fixes/fixes (bf3d6afbb234 powerpc: Look for "stdout-path" when setting up legacy consoles)
+$ git merge powerpc-fixes/fixes
+Merge made by the 'recursive' strategy.
+ arch/powerpc/boot/crt0.S | 4 +++-
+ arch/powerpc/kernel/legacy_serial.c | 6 +++++-
+ arch/powerpc/kernel/msi.c | 7 ++++++-
+ arch/powerpc/mm/dump_linuxpagetables.c | 1 +
+ 4 files changed, 15 insertions(+), 3 deletions(-)
+Merging sparc/master (cf76c364a1e1 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi)
+$ git merge sparc/master
+Already up to date.
+Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2)
+$ git merge fscrypt-current/for-stable
+Already up to date.
+Merging net/master (35cc3cefc4de net/sched: cls_flower: Reject duplicated rules also under skip_sw)
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-net-dsa | 2 +-
+ MAINTAINERS | 7 +
+ arch/powerpc/net/bpf_jit_comp64.c | 66 ++++
+ drivers/net/bonding/bond_3ad.c | 3 +
+ drivers/net/dsa/mv88e6060.c | 10 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 2 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 60 +++-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 2 +-
+ drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 2 +-
+ drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 4 +-
+ drivers/net/ethernet/freescale/fman/fman.c | 5 +-
+ drivers/net/ethernet/ibm/emac/emac.h | 2 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 2 +-
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 34 +-
+ drivers/net/ethernet/mellanox/mlx4/Kconfig | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +-
+ drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 1 -
+ drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 6 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 4 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 5 +-
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 17 +-
+ .../net/ethernet/netronome/nfp/flower/offload.c | 18 +-
+ drivers/net/ethernet/realtek/8139cp.c | 5 +
+ drivers/net/ethernet/socionext/sni_ave.c | 24 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 23 +-
+ drivers/net/macvlan.c | 7 +-
+ drivers/net/phy/phy_device.c | 19 +-
+ drivers/net/phy/sfp-bus.c | 2 +-
+ drivers/net/tun.c | 9 +-
+ drivers/net/virtio_net.c | 14 +-
+ drivers/net/wireless/mac80211_hwsim.c | 20 +-
+ drivers/vhost/vhost.c | 3 -
+ include/linux/filter.h | 7 +
+ include/linux/sfp.h | 2 +-
+ include/net/neighbour.h | 28 +-
+ include/net/sctp/sctp.h | 5 +
+ include/net/sctp/structs.h | 2 +
+ include/uapi/linux/bpf.h | 56 +--
+ kernel/bpf/btf.c | 82 +++++
+ kernel/bpf/verifier.c | 103 +++++-
+ net/bpf/test_run.c | 21 +-
+ net/core/dev.c | 65 ++--
+ net/core/filter.c | 27 +-
+ net/core/rtnetlink.c | 3 +
+ net/dsa/master.c | 34 +-
+ net/dsa/slave.c | 28 --
+ net/ipv4/ip_fragment.c | 7 +
+ net/ipv4/ip_input.c | 4 +-
+ net/ipv4/tcp_output.c | 45 ++-
+ net/ipv4/tcp_timer.c | 10 +-
+ net/ipv6/ip6_input.c | 4 +-
+ net/ipv6/ip6_output.c | 42 +--
+ net/ipv6/netfilter/nf_conntrack_reasm.c | 8 +-
+ net/ipv6/reassembly.c | 8 +-
+ net/ipv6/seg6_iptunnel.c | 1 +
+ net/mac80211/cfg.c | 7 +-
+ net/mac80211/iface.c | 2 +
+ net/mac80211/mlme.c | 12 +-
+ net/mac80211/rx.c | 5 +-
+ net/mac80211/status.c | 2 +
+ net/mac80211/tx.c | 4 +-
+ net/openvswitch/conntrack.c | 2 +-
+ net/sched/act_police.c | 24 +-
+ net/sched/cls_flower.c | 23 +-
+ net/sched/sch_netem.c | 3 +
+ net/sctp/associola.c | 9 +-
+ net/sctp/chunk.c | 6 +
+ net/sctp/sm_make_chunk.c | 3 +
+ net/sctp/socket.c | 3 +-
+ net/wireless/mlme.c | 4 +-
+ net/wireless/nl80211.c | 1 +
+ net/wireless/sme.c | 8 +-
+ net/wireless/util.c | 2 +
+ net/x25/af_x25.c | 18 +-
+ net/x25/x25_in.c | 9 +
+ tools/bpf/bpftool/btf_dumper.c | 6 +-
+ tools/include/uapi/linux/bpf.h | 56 +--
+ tools/testing/selftests/bpf/bpf_helpers.h | 4 +-
+ tools/testing/selftests/bpf/test_btf.c | 375 ++++++++++++++++++++-
+ tools/testing/selftests/bpf/test_sk_lookup_kern.c | 18 +-
+ tools/testing/selftests/bpf/test_verifier.c | 6 +-
+ 83 files changed, 1225 insertions(+), 368 deletions(-)
+Merging bpf/master (ec3d837aac5d net/flow_dissector: correctly cap nhoff and thoff in case of BPF)
+$ git merge bpf/master
+Merge made by the 'recursive' strategy.
+ net/core/flow_dissector.c | 6 +++++-
+ tools/testing/selftests/bpf/bpf_flow.c | 36 ++++++++++++++++------------------
+ 2 files changed, 22 insertions(+), 20 deletions(-)
+Merging ipsec/master (4a135e538962 xfrm_user: fix freeing of xfrm states on acquire)
+$ git merge ipsec/master
+Auto-merging net/xfrm/xfrm_user.c
+Auto-merging net/xfrm/xfrm_state.c
+Merge made by the 'recursive' strategy.
+ include/net/xfrm.h | 1 +
+ net/xfrm/xfrm_input.c | 7 ++++++-
+ net/xfrm/xfrm_output.c | 1 +
+ net/xfrm/xfrm_state.c | 10 ++++++++--
+ net/xfrm/xfrm_user.c | 4 ++--
+ 5 files changed, 18 insertions(+), 5 deletions(-)
+Merging netfilter/master (530aad77010b netfilter: seqadj: re-load tcp header pointer after possible head reallocation)
+$ git merge netfilter/master
+Merge made by the 'recursive' strategy.
+ include/linux/netfilter/nfnetlink.h | 12 ------------
+ net/netfilter/nf_conntrack_seqadj.c | 7 ++++---
+ net/netfilter/nf_tables_api.c | 21 +++++++++++++--------
+ net/netfilter/nf_tables_core.c | 2 +-
+ 4 files changed, 18 insertions(+), 24 deletions(-)
+Merging ipvs/master (feb9f55c33e5 netfilter: nft_dynset: allow dynamic updates of non-anonymous set)
+$ git merge ipvs/master
+Already up to date.
+Merging wireless-drivers/master (2e6e902d1850 Linux 4.20-rc4)
+$ git merge wireless-drivers/master
+Already up to date.
+Merging mac80211/master (312ca38ddda6 cfg80211: Fix busy loop regression in ieee80211_ie_split_ric())
+$ git merge mac80211/master
+Already up to date.
+Merging rdma-fixes/for-rc (47f07f03b5ee IB/mlx5: Block DEVX umem from the non applicable cases)
+$ git merge rdma-fixes/for-rc
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/hw/hfi1/chip.c | 3 ++-
+ drivers/infiniband/hw/hfi1/hfi.h | 2 ++
+ drivers/infiniband/hw/hfi1/qp.c | 7 +++++++
+ drivers/infiniband/hw/hfi1/verbs.c | 2 +-
+ drivers/infiniband/hw/mlx5/devx.c | 4 +++-
+ drivers/infiniband/hw/mlx5/odp.c | 9 ++++-----
+ 6 files changed, 19 insertions(+), 8 deletions(-)
+Merging sound-current/for-linus (fa9c98e4b975 ALSA: fireface: fix reference to wrong register for clock configuration)
+$ git merge sound-current/for-linus
+Merge made by the 'recursive' strategy.
+ sound/firewire/fireface/ff-protocol-ff400.c | 2 +-
+ sound/pci/hda/patch_realtek.c | 35 +++++++++++++++++++++++++++++
+ 2 files changed, 36 insertions(+), 1 deletion(-)
+Merging sound-asoc-fixes/for-linus (b99f6edf9be5 Merge branch 'asoc-4.20' into asoc-linus)
+$ git merge sound-asoc-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ sound/soc/codecs/pcm3168a.c | 18 +++++++++++-------
+ sound/soc/codecs/rt5660.c | 1 +
+ sound/soc/intel/boards/cht_bsw_max98090_ti.c | 14 ++++++++++++++
+ sound/soc/sh/rcar/core.c | 12 ++++++++++++
+ sound/soc/sh/rcar/dvc.c | 8 --------
+ 5 files changed, 38 insertions(+), 15 deletions(-)
+Merging regmap-fixes/for-linus (9ff01193a20d Linux 4.20-rc3)
+$ git merge regmap-fixes/for-linus
+Already up to date.
+Merging regulator-fixes/for-linus (8852a24b6675 Merge branch 'regulator-4.20' into regulator-linus)
+$ git merge regulator-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/regulator/bd718x7-regulator.c | 1 +
+ drivers/regulator/core.c | 22 +++++++++++-----------
+ include/linux/regulator/consumer.h | 2 +-
+ 3 files changed, 13 insertions(+), 12 deletions(-)
+Merging spi-fixes/for-linus (a78de6b8fb72 Merge branch 'spi-4.20' into spi-linus)
+$ git merge spi-fixes/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/spi/spi-bcm2835.c | 16 +++++++---------
+ 1 file changed, 7 insertions(+), 9 deletions(-)
+Merging pci-current/for-linus (b07b864ee423 Revert "PCI/ASPM: Do not initialize link state when aspm_disabled is set")
+$ git merge pci-current/for-linus
+Already up to date.
+Merging driver-core.current/driver-core-linus (2595646791c3 Linux 4.20-rc5)
+$ git merge driver-core.current/driver-core-linus
+Already up to date.
+Merging tty.current/tty-linus (dada6a43b040 kgdboc: fix KASAN global-out-of-bounds bug in param_set_kgdboc_var())
+$ git merge tty.current/tty-linus
+Already up to date.
+Merging usb.current/usb-linus (3caad34eab57 Merge tag 'usb-serial-4.20-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus)
+$ git merge usb.current/usb-linus
+Already up to date.
+Merging usb-gadget-fixes/fixes (069caf5950df USB: omap_udc: fix rejection of out transfers when DMA is used)
+$ git merge usb-gadget-fixes/fixes
+Already up to date.
+Merging usb-serial-fixes/usb-linus (f51ccf46217c USB: serial: console: fix reported terminal settings)
+$ git merge usb-serial-fixes/usb-linus
+Already up to date.
+Merging usb-chipidea-fixes/ci-for-usb-stable (a930d8bd94d8 usb: chipidea: Always build ULPI code)
+$ git merge usb-chipidea-fixes/ci-for-usb-stable
+Already up to date.
+Merging phy/fixes (c88520db18ba phy: qcom-qusb2: Fix HSTX_TRIM tuning with fused value for SDM845)
+$ git merge phy/fixes
+Already up to date.
+Merging staging.current/staging-linus (87e4a5405f08 Revert commit ef9209b642f "staging: rtl8723bs: Fix indenting errors and an off-by-one mistake in core/rtw_mlme_ext.c")
+$ git merge staging.current/staging-linus
+Already up to date.
+Merging char-misc.current/char-misc-linus (dbde117c3126 Merge tag 'gnss-4.20-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss into char-misc-linus)
+$ git merge char-misc.current/char-misc-linus
+Already up to date.
+Merging soundwire-fixes/fixes (651022382c7f Linux 4.20-rc1)
+$ git merge soundwire-fixes/fixes
+Already up to date.
+Merging thunderbolt-fixes/fixes (2595646791c3 Linux 4.20-rc5)
+$ git merge thunderbolt-fixes/fixes
+Already up to date.
+Merging input-current/for-linus (ca5047286c9c Input: synaptics - enable RMI on ThinkPad T560)
+$ git merge input-current/for-linus
+Auto-merging drivers/input/keyboard/omap4-keypad.c
+Merge made by the 'recursive' strategy.
+ drivers/input/keyboard/omap4-keypad.c | 16 ++++------------
+ drivers/input/mouse/synaptics.c | 1 +
+ 2 files changed, 5 insertions(+), 12 deletions(-)
+Merging crypto-current/master (e61efff4ae94 crypto: user - Disable statistics interface)
+$ git merge crypto-current/master
+Already up to date.
+Merging ide/master (adf040ddd001 ide: Use of_node_name_eq for node name comparisons)
+$ git merge ide/master
+Merge made by the 'recursive' strategy.
+ drivers/ide/pmac.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging vfio-fixes/for-linus (0e714d27786c vfio/pci: Fix potential Spectre v1)
+$ git merge vfio-fixes/for-linus
+Already up to date.
+Merging kselftest-fixes/fixes (651022382c7f Linux 4.20-rc1)
+$ git merge kselftest-fixes/fixes
+Already up to date.
+Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address)
+$ git merge modules-fixes/modules-linus
+Already up to date.
+Merging slave-dma-fixes/fixes (ffe843b18211 dmaengine: dw: Fix FIFO size for Intel Merrifield)
+$ git merge slave-dma-fixes/fixes
+Already up to date.
+Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1)
+$ git merge backlight-fixes/for-backlight-fixes
+Already up to date.
+Merging mtd-fixes/master (40b412897ccb mtd: nand: Fix memory allocation in nanddev_bbt_init())
+$ git merge mtd-fixes/master
+Already up to date.
+Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1)
+$ git merge spi-nor-fixes/spi-nor/fixes
+Already up to date.
+Merging mfd-fixes/for-mfd-fixes (48a2ca0ee399 Revert "mfd: cros_ec: Use devm_kzalloc for private data")
+$ git merge mfd-fixes/for-mfd-fixes
+Already up to date.
+Merging v4l-dvb-fixes/fixes (078ab3ea2c3b media: Add a Kconfig option for the Request API)
+$ git merge v4l-dvb-fixes/fixes
+Merge made by the 'recursive' strategy.
+ Documentation/media/uapi/v4l/extended-controls.rst | 10 +++
+ drivers/media/Kconfig | 13 ++++
+ drivers/media/common/videobuf2/videobuf2-core.c | 44 ++++++++---
+ drivers/media/common/videobuf2/videobuf2-v4l2.c | 13 +++-
+ drivers/media/media-device.c | 4 +
+ drivers/media/platform/vicodec/vicodec-core.c | 13 +++-
+ drivers/media/platform/vivid/vivid-sdr-cap.c | 2 -
+ drivers/media/platform/vivid/vivid-vbi-cap.c | 2 -
+ drivers/media/platform/vivid/vivid-vbi-out.c | 2 -
+ drivers/media/platform/vivid/vivid-vid-cap.c | 2 -
+ drivers/media/platform/vivid/vivid-vid-out.c | 2 -
+ drivers/media/platform/vsp1/vsp1_lif.c | 2 +-
+ drivers/media/v4l2-core/v4l2-ctrls.c | 4 +-
+ drivers/staging/media/sunxi/cedrus/Kconfig | 1 +
+ drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 4 +-
+ include/media/mpeg2-ctrls.h | 86 ++++++++++++++++++++++
+ include/media/v4l2-ctrls.h | 6 ++
+ include/media/videobuf2-core.h | 2 +
+ include/uapi/linux/v4l2-controls.h | 68 -----------------
+ include/uapi/linux/videodev2.h | 4 -
+ 20 files changed, 181 insertions(+), 103 deletions(-)
+ create mode 100644 include/media/mpeg2-ctrls.h
+Merging reset-fixes/reset/fixes (26fce0557fa6 reset: imx7: Fix always writing bits as 0)
+$ git merge reset-fixes/reset/fixes
+Already up to date.
+Merging mips-fixes/mips-fixes (20b880a05f06 mips: bpf: fix encoding bug for mm_srlv32_op)
+$ git merge mips-fixes/mips-fixes
+Merge made by the 'recursive' strategy.
+ arch/mips/include/uapi/asm/inst.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging at91-fixes/at91-fixes (4ab7ca092c3c ARM: dts: at91: sama5d2: use the divided clock for SMC)
+$ git merge at91-fixes/at91-fixes
+Already up to date.
+Merging omap-fixes/fixes (84fb6c7feb14 ARM: dts: Fix OMAP4430 SDP Ethernet startup)
+$ git merge omap-fixes/fixes
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/am335x-pdu001.dts | 2 +-
+ arch/arm/boot/dts/omap4-sdp.dts | 1 +
+ arch/arm/boot/dts/omap5-board-common.dtsi | 1 +
+ arch/arm/mach-omap1/board-ams-delta.c | 6 ++++--
+ 4 files changed, 7 insertions(+), 3 deletions(-)
+Merging kvm-fixes/master (fd65d3142f73 kvm: svm: Ensure an IBPB on all affected CPUs when freeing a vmcb)
+$ git merge kvm-fixes/master
+Already up to date.
+Merging kvms390-fixes/master (40ebdb8e59df KVM: s390: Make huge pages unavailable in ucontrol VMs)
+$ git merge kvms390-fixes/master
+Already up to date.
+Merging hwmon-fixes/hwmon (2595646791c3 Linux 4.20-rc5)
+$ git merge hwmon-fixes/hwmon
+Already up to date.
+Merging nvdimm-fixes/libnvdimm-fixes (2c5357c6a2f2 Merge branch 'for-4.20/dax-fixes' into libnvdimm-pending)
+$ git merge nvdimm-fixes/libnvdimm-fixes
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging btrfs-fixes/next-fixes (72549bc085d6 Merge branch 'misc-4.20' into next-fixes)
+$ git merge btrfs-fixes/next-fixes
+Auto-merging fs/btrfs/inode.c
+Merge made by the 'recursive' strategy.
+ fs/btrfs/btrfs_inode.h | 6 ++++++
+ fs/btrfs/inode.c | 17 +++++++++++++++++
+ fs/btrfs/tree-log.c | 16 ++++++++++++++++
+ 3 files changed, 39 insertions(+)
+Merging vfs-fixes/fixes (73116df7bb90 afs: Use d_instantiate() rather than d_add() and don't d_drop())
+$ git merge vfs-fixes/fixes
+Already up to date.
+Merging dma-mapping-fixes/for-linus (cb216b84d6ea swiotlb: Skip cache maintenance on map error)
+$ git merge dma-mapping-fixes/for-linus
+Already up to date.
+Merging i3c-fixes/master (651022382c7f Linux 4.20-rc1)
+$ git merge i3c-fixes/master
+Already up to date.
+Merging drivers-x86-fixes/fixes (651022382c7f Linux 4.20-rc1)
+$ git merge drivers-x86-fixes/fixes
+Already up to date.
+Merging samsung-krzk-fixes/fixes (651022382c7f Linux 4.20-rc1)
+$ git merge samsung-krzk-fixes/fixes
+Already up to date.
+Merging pinctrl-samsung-fixes/pinctrl-fixes (651022382c7f Linux 4.20-rc1)
+$ git merge pinctrl-samsung-fixes/pinctrl-fixes
+Already up to date.
+Merging devicetree-fixes/dt/linus (89c38422e072 of, numa: Validate some distance map rules)
+$ git merge devicetree-fixes/dt/linus
+Already up to date.
+Merging scsi-fixes/fixes (60a89a3ce0cc scsi: t10-pi: Return correct ref tag when queue has no integrity profile)
+$ git merge scsi-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 2 +-
+ drivers/scsi/qla2xxx/qla_os.c | 4 ++--
+ include/linux/t10-pi.h | 9 +++++----
+ 3 files changed, 8 insertions(+), 7 deletions(-)
+Merging drm-fixes/drm-fixes (e594a5e349dd drm/ast: Fix connector leak during driver unload)
+$ git merge drm-fixes/drm-fixes
+Already up to date.
+Merging drm-intel-fixes/for-linux-next-fixes (d76b21ebf8ff Merge tag 'gvt-fixes-2018-12-04' of https://github.com/intel/gvt-linux into drm-intel-fixes)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/gvt/fb_decoder.c | 2 +-
+ drivers/gpu/drm/i915/i915_drv.c | 1 +
+ drivers/gpu/drm/i915/i915_drv.h | 2 +
+ drivers/gpu/drm/i915/i915_gem.c | 4 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c | 2 +
+ drivers/gpu/drm/i915/intel_lrc.c | 4 +
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 2 +
+ drivers/gpu/drm/i915/intel_workarounds.c | 591 ++++++++++++++++++++-----------
+ drivers/gpu/drm/i915/intel_workarounds.h | 26 +-
+ 9 files changed, 430 insertions(+), 204 deletions(-)
+Merging mmc-fixes/fixes (b704441e38f6 mmc: sdhci: fix the timeout check window for clock and reset)
+$ git merge mmc-fixes/fixes
+Merge made by the 'recursive' strategy.
+ drivers/mmc/core/block.c | 15 ++++++++++-----
+ drivers/mmc/host/omap.c | 11 +++++++++--
+ drivers/mmc/host/sdhci-omap.c | 12 ++++++++----
+ drivers/mmc/host/sdhci.c | 18 +++++++++++++-----
+ 4 files changed, 40 insertions(+), 16 deletions(-)
+Merging rtc-fixes/rtc-fixes (9bde0afb7a90 rtc: pcf2127: fix a kmemleak caused in pcf2127_i2c_gather_write)
+$ git merge rtc-fixes/rtc-fixes
+Already up to date.
+Merging gnss-fixes/gnss-linus (63cea1f73528 MAINTAINERS: exclude gnss from SIRFPRIMA2 regex matching)
+$ git merge gnss-fixes/gnss-linus
+Already up to date.
+Merging drm-misc-fixes/for-linux-next-fixes (b31a3ca745a4 drm/fb-helper: Fix typo in parameter description)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Already up to date.
+Merging kbuild/for-next (edc8351ce260 Merge branches 'kbuild', 'kbuild2', 'kconfig' and 'kconfig2' into for-next)
+$ git merge kbuild/for-next
+Auto-merging scripts/Makefile.build
+Auto-merging init/Kconfig
+Auto-merging arch/x86/kernel/head64.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arc/Kconfig
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/kbuild/kbuild.txt | 7 +-
+ Makefile | 97 ++++++++-------
+ arch/alpha/Kconfig | 40 ++----
+ arch/arc/Kconfig | 24 +---
+ arch/arc/plat-axs10x/Kconfig | 2 +-
+ arch/arc/plat-hsdk/Kconfig | 2 +-
+ arch/arm/Kconfig | 61 ++--------
+ arch/arm/crypto/Makefile | 2 +-
+ arch/arm/mach-alpine/Kconfig | 2 +-
+ arch/arm/mach-bcm/Kconfig | 2 +-
+ arch/arm/mach-footbridge/Kconfig | 8 +-
+ arch/arm/mach-ixp4xx/Kconfig | 22 ++--
+ arch/arm/mach-ks8695/Kconfig | 10 +-
+ arch/arm/mach-mv78xx0/Kconfig | 2 +-
+ arch/arm/mach-mvebu/Kconfig | 2 +-
+ arch/arm/mach-orion5x/Kconfig | 2 +-
+ arch/arm/mach-pxa/Kconfig | 2 +-
+ arch/arm/mach-sa1100/Kconfig | 2 +-
+ arch/arm/mach-socfpga/Kconfig | 2 +-
+ arch/arm/mm/mmu.c | 2 +-
+ arch/arm64/Kconfig | 25 +---
+ arch/arm64/crypto/Makefile | 2 +-
+ arch/hexagon/Kconfig | 3 -
+ arch/ia64/Kconfig | 28 +----
+ arch/m68k/Kconfig.bus | 13 --
+ arch/m68k/Kconfig.cpu | 1 +
+ arch/microblaze/Kconfig | 17 +--
+ arch/mips/Kconfig | 111 ++++-------------
+ arch/mips/alchemy/Kconfig | 6 +-
+ arch/mips/ath25/Kconfig | 3 +-
+ arch/mips/ath79/Kconfig | 8 +-
+ arch/mips/bcm63xx/Kconfig | 14 +--
+ arch/mips/include/asm/mach-loongson64/loongson.h | 2 +-
+ arch/mips/lantiq/Kconfig | 2 +-
+ arch/mips/loongson64/Kconfig | 7 +-
+ arch/mips/pmcs-msp71xx/Kconfig | 10 +-
+ arch/mips/ralink/Kconfig | 8 +-
+ arch/mips/sibyte/Kconfig | 10 +-
+ arch/mips/txx9/Kconfig | 8 +-
+ arch/mips/vr41xx/Kconfig | 8 +-
+ arch/openrisc/mm/cache.c | 2 +-
+ arch/parisc/Kconfig | 1 +
+ arch/powerpc/Kconfig | 47 +------
+ arch/powerpc/boot/Makefile | 5 +
+ arch/powerpc/platforms/40x/Kconfig | 10 +-
+ arch/powerpc/platforms/44x/Kconfig | 32 ++---
+ arch/powerpc/platforms/512x/Kconfig | 2 +-
+ arch/powerpc/platforms/52xx/Kconfig | 2 +-
+ arch/powerpc/platforms/83xx/Kconfig | 2 +-
+ arch/powerpc/platforms/85xx/Kconfig | 10 +-
+ arch/powerpc/platforms/86xx/Kconfig | 8 +-
+ arch/powerpc/platforms/Kconfig | 2 +-
+ arch/powerpc/platforms/Kconfig.cputype | 4 +-
+ arch/powerpc/platforms/amigaone/Kconfig | 2 +-
+ arch/powerpc/platforms/cell/Kconfig | 2 +-
+ arch/powerpc/platforms/chrp/Kconfig | 2 +-
+ arch/powerpc/platforms/embedded6xx/Kconfig | 4 +-
+ arch/powerpc/platforms/maple/Kconfig | 2 +-
+ arch/powerpc/platforms/pasemi/Kconfig | 2 +-
+ arch/powerpc/platforms/powermac/Kconfig | 2 +-
+ arch/powerpc/platforms/powernv/Kconfig | 2 +-
+ arch/powerpc/platforms/ps3/Kconfig | 2 +-
+ arch/powerpc/platforms/pseries/Kconfig | 2 +-
+ arch/riscv/Kconfig | 25 +---
+ arch/s390/Kconfig | 26 ++--
+ arch/sh/Kconfig | 24 +---
+ arch/sh/boards/Kconfig | 30 ++---
+ arch/sparc/Kconfig | 25 +---
+ arch/um/Kconfig | 6 -
+ arch/um/Makefile | 24 +---
+ arch/unicore32/Kconfig | 17 +--
+ arch/x86/Kconfig | 47 +------
+ arch/x86/configs/i386_defconfig | 1 +
+ arch/x86/configs/x86_64_defconfig | 1 +
+ arch/x86/kernel/head64.c | 2 +-
+ arch/x86/um/Makefile | 4 +-
+ arch/xtensa/Kconfig | 18 +--
+ arch/xtensa/configs/common_defconfig | 1 +
+ drivers/Kconfig | 7 ++
+ drivers/eisa/Kconfig | 21 +++-
+ drivers/mtd/maps/scx200_docflash.c | 7 --
+ drivers/parisc/Kconfig | 24 +---
+ drivers/pci/Kconfig | 30 +++++
+ drivers/pci/endpoint/Kconfig | 2 +-
+ drivers/pcmcia/Kconfig | 1 +
+ drivers/rapidio/Kconfig | 11 ++
+ drivers/watchdog/scx200_wdt.c | 7 --
+ include/asm-generic/export.h | 13 +-
+ include/linux/compiler-gcc.h | 2 +
+ include/linux/export.h | 18 +--
+ init/Kconfig | 21 ++++
+ kernel/configs/tiny.config | 1 +
+ lib/Kconfig.debug | 17 +++
+ samples/connector/Makefile | 2 +-
+ scripts/Kbuild.include | 52 ++------
+ scripts/Makefile | 4 +-
+ scripts/Makefile.build | 111 +++++++----------
+ scripts/Makefile.gcc-plugins | 8 --
+ scripts/Makefile.headersinst | 1 -
+ scripts/Makefile.lib | 2 +-
+ scripts/basic/fixdep.c | 31 +----
+ scripts/gen_ksymdeps.sh | 25 ++++
+ scripts/kconfig/confdata.c | 133 ++++++++++----------
+ scripts/kconfig/expr.c | 14 +--
+ scripts/kconfig/expr.h | 4 +-
+ scripts/kconfig/merge_config.sh | 37 ++++--
+ scripts/kconfig/symbol.c | 3 -
+ scripts/mod/Makefile | 2 -
+ scripts/mod/file2alias.c | 149 ++++++++---------------
+ scripts/mod/modpost.c | 114 +++++++++--------
+ scripts/package/Makefile | 1 -
+ scripts/setlocalversion | 12 +-
+ 112 files changed, 727 insertions(+), 1139 deletions(-)
+ create mode 100755 scripts/gen_ksymdeps.sh
+Merging compiler-attributes/compiler-attributes (24efee412c75 Compiler Attributes: improve explanation of header)
+$ git merge compiler-attributes/compiler-attributes
+Already up to date.
+Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address)
+$ git merge leaks/leaks-next
+Merge made by the 'recursive' strategy.
+Merging dma-mapping/for-next (7c703e54cc71 arch: switch the default on ARCH_HAS_SG_CHAIN)
+$ git merge dma-mapping/for-next
+Auto-merging arch/xtensa/Kconfig
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/sparc/kernel/iommu.c
+Auto-merging arch/sparc/Kconfig
+Auto-merging arch/s390/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Auto-merging arch/parisc/Kconfig
+Auto-merging arch/ia64/Kconfig
+Auto-merging arch/arm64/Kconfig
+Auto-merging arch/arm/mm/dma-mapping.c
+Auto-merging arch/arm/Kconfig
+Auto-merging arch/arc/Kconfig
+Auto-merging arch/alpha/Kconfig
+Removing Documentation/features/io/sg-chain/arch-support.txt
+Merge made by the 'recursive' strategy.
+ .../features/io/sg-chain/arch-support.txt | 33 ---
+ arch/alpha/Kconfig | 1 +
+ arch/alpha/kernel/pci_iommu.c | 14 +-
+ arch/arc/Kconfig | 1 -
+ arch/arm/Kconfig | 3 +-
+ arch/arm/common/dmabounce.c | 12 +-
+ arch/arm/include/asm/dma-iommu.h | 2 -
+ arch/arm/mm/dma-mapping.c | 39 ++--
+ arch/arm64/Kconfig | 2 +-
+ arch/arm64/mm/dma-mapping.c | 199 ++--------------
+ arch/csky/Kconfig | 2 +-
+ arch/csky/mm/dma-mapping.c | 142 +-----------
+ arch/ia64/Kconfig | 1 -
+ arch/ia64/hp/common/sba_iommu.c | 81 +++----
+ arch/ia64/sn/pci/pci_dma.c | 8 +-
+ arch/mips/include/asm/jazzdma.h | 6 -
+ arch/mips/jazz/jazzdma.c | 16 +-
+ arch/parisc/Kconfig | 1 +
+ arch/powerpc/Kconfig | 1 -
+ arch/powerpc/include/asm/iommu.h | 4 -
+ arch/powerpc/kernel/dma-iommu.c | 6 -
+ arch/powerpc/kernel/dma-swiotlb.c | 1 -
+ arch/powerpc/kernel/iommu.c | 28 +--
+ arch/powerpc/platforms/cell/iommu.c | 1 -
+ arch/powerpc/platforms/pseries/vio.c | 3 +-
+ arch/s390/Kconfig | 1 -
+ arch/s390/pci/pci_dma.c | 18 +-
+ arch/sparc/Kconfig | 1 -
+ arch/sparc/kernel/iommu.c | 12 +-
+ arch/sparc/kernel/iommu_common.h | 2 -
+ arch/sparc/kernel/pci_sun4v.c | 14 +-
+ arch/x86/Kconfig | 1 -
+ arch/x86/kernel/amd_gart_64.c | 40 +---
+ arch/x86/kernel/pci-calgary_64.c | 30 +--
+ arch/xtensa/Kconfig | 2 +-
+ drivers/iommu/amd_iommu.c | 18 +-
+ drivers/iommu/dma-iommu.c | 23 +-
+ drivers/iommu/intel-iommu.c | 26 +--
+ drivers/parisc/ccio-dma.c | 10 +-
+ drivers/parisc/sba_iommu.c | 10 +-
+ drivers/pci/controller/vmd.c | 6 -
+ drivers/xen/swiotlb-xen.c | 12 +-
+ include/linux/dma-direct.h | 6 +-
+ include/linux/dma-iommu.h | 1 -
+ include/linux/dma-mapping.h | 18 +-
+ include/linux/dma-noncoherent.h | 2 +
+ include/linux/scatterlist.h | 6 +-
+ kernel/dma/Kconfig | 9 +
+ kernel/dma/Makefile | 2 +-
+ kernel/dma/direct.c | 52 +++--
+ kernel/dma/mapping.c | 84 -------
+ kernel/dma/remap.c | 257 +++++++++++++++++++++
+ kernel/dma/swiotlb.c | 11 +-
+ lib/Kconfig | 2 +-
+ lib/scatterlist.c | 2 +-
+ 55 files changed, 476 insertions(+), 809 deletions(-)
+ delete mode 100644 Documentation/features/io/sg-chain/arch-support.txt
+ create mode 100644 kernel/dma/remap.c
+Merging asm-generic/master (b7d624ab4312 asm-generic: unistd.h: fixup broken macro include.)
+$ git merge asm-generic/master
+Already up to date.
+Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1)
+$ git merge arc/for-next
+Already up to date.
+Merging arm/for-next (eb1644e1ec8a Merge branches 'fixes', 'misc', 'sa1100-for-next' and 'spectre' into for-next)
+$ git merge arm/for-next
+Auto-merging drivers/pcmcia/Kconfig
+Auto-merging arch/arm/mach-sa1100/Kconfig
+Auto-merging arch/arm/mach-pxa/Kconfig
+Auto-merging arch/arm/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/Kconfig | 25 +++--
+ arch/arm/boot/compressed/atags_to_fdt.c | 23 +++++
+ arch/arm/common/sa1111.c | 59 ------------
+ arch/arm/include/asm/assembler.h | 6 +-
+ arch/arm/include/asm/hardware/sa1111.h | 4 -
+ arch/arm/include/asm/uaccess.h | 18 ++++
+ arch/arm/kernel/head.S | 2 +-
+ arch/arm/kernel/smp.c | 15 +++
+ arch/arm/lib/copy_from_user.S | 23 ++++-
+ arch/arm/lib/copy_to_user.S | 27 +++++-
+ arch/arm/lib/getuser.S | 11 +++
+ arch/arm/lib/putuser.S | 20 ++--
+ arch/arm/mach-omap2/Kconfig | 1 -
+ arch/arm/mach-pxa/Kconfig | 2 +-
+ arch/arm/mach-pxa/include/mach/mainstone.h | 4 +
+ arch/arm/mach-pxa/lubbock.c | 16 ++++
+ arch/arm/mach-pxa/mainstone.c | 53 +++++++++++
+ arch/arm/mach-sa1100/Kconfig | 2 +
+ arch/arm/mach-sa1100/assabet.c | 143 ++++++++++++-----------------
+ arch/arm/mach-sa1100/cerf.c | 11 +--
+ arch/arm/mach-sa1100/generic.c | 10 --
+ arch/arm/mach-sa1100/h3100.c | 1 +
+ arch/arm/mach-sa1100/jornada720.c | 12 +++
+ arch/arm/mach-sa1100/neponset.c | 19 ++++
+ arch/arm/mm/copypage-fa.c | 35 ++++---
+ arch/arm/mm/copypage-feroceon.c | 98 ++++++++++----------
+ arch/arm/mm/copypage-v4mc.c | 19 ++--
+ arch/arm/mm/copypage-v4wb.c | 41 ++++-----
+ arch/arm/mm/copypage-v4wt.c | 37 ++++----
+ arch/arm/mm/copypage-xsc3.c | 79 +++++++---------
+ arch/arm/mm/copypage-xscale.c | 79 ++++++++--------
+ arch/arm/mm/fault.c | 6 ++
+ arch/arm/mm/pv-fixup-asm.S | 16 ++--
+ arch/arm/plat-omap/Kconfig | 1 -
+ drivers/pcmcia/Kconfig | 6 ++
+ drivers/pcmcia/Makefile | 1 +
+ drivers/pcmcia/max1600.c | 122 ++++++++++++++++++++++++
+ drivers/pcmcia/max1600.h | 32 +++++++
+ drivers/pcmcia/pxa2xx_mainstone.c | 113 +++++++----------------
+ drivers/pcmcia/sa1100_simpad.c | 4 +-
+ drivers/pcmcia/sa1111_jornada720.c | 83 +++++++++++------
+ drivers/pcmcia/sa1111_lubbock.c | 110 ++++------------------
+ drivers/pcmcia/sa1111_neponset.c | 79 ++++------------
+ 43 files changed, 794 insertions(+), 674 deletions(-)
+ create mode 100644 drivers/pcmcia/max1600.c
+ create mode 100644 drivers/pcmcia/max1600.h
+Merging arm-perf/for-next/perf (69c32972d593 drivers/perf: Add Cavium ThunderX2 SoC UNCORE PMU driver)
+$ git merge arm-perf/for-next/perf
+Merge made by the 'recursive' strategy.
+ Documentation/perf/thunderx2-pmu.txt | 41 ++
+ arch/arm64/include/asm/perf_event.h | 164 ++++++-
+ arch/arm64/kernel/perf_event.c | 221 +++------
+ drivers/perf/Kconfig | 9 +
+ drivers/perf/Makefile | 1 +
+ drivers/perf/arm_spe_pmu.c | 6 +
+ drivers/perf/thunderx2_pmu.c | 861 +++++++++++++++++++++++++++++++++++
+ drivers/perf/xgene_pmu.c | 80 +++-
+ include/linux/cpuhotplug.h | 2 +
+ include/linux/perf/arm_pmu.h | 4 +-
+ 10 files changed, 1205 insertions(+), 184 deletions(-)
+ create mode 100644 Documentation/perf/thunderx2-pmu.txt
+ create mode 100644 drivers/perf/thunderx2_pmu.c
+Merging arm-soc/for-next (dabc839c6bd9 Merge branch 'fixes' into for-next)
+$ git merge arm-soc/for-next
+Auto-merging arch/arm/mach-socfpga/Kconfig
+CONFLICT (content): Merge conflict in arch/arm/mach-socfpga/Kconfig
+Auto-merging arch/arm/mach-bcm/Kconfig
+Removing arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
+Removing arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval-pins.dtsi
+Auto-merging MAINTAINERS
+Resolved 'arch/arm/mach-socfpga/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master c3dd64851b33] Merge remote-tracking branch 'arm-soc/for-next'
+$ git diff -M --stat --summary HEAD^..
+ CREDITS | 8 +
+ .../devicetree/bindings/arm/amlogic,scpi.txt | 7 +
+ Documentation/devicetree/bindings/arm/amlogic.txt | 2 +
+ Documentation/devicetree/bindings/arm/rockchip.txt | 34 +
+ Documentation/devicetree/bindings/bus/ti-sysc.txt | 1 +
+ .../devicetree/bindings/iio/adc/qcom,spmi-vadc.txt | 6 +-
+ .../bindings/soc/amlogic/clk-measure.txt | 18 +
+ .../bindings/soc/bcm/brcm,bcm2835-vchiq.txt | 3 +-
+ .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 1 +
+ .../bindings/soc/rockchip/power_domain.txt | 4 +
+ .../bindings/timer/amlogic,meson6-timer.txt | 11 +-
+ .../devicetree/bindings/timer/mrvl,mmp-timer.txt | 4 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ MAINTAINERS | 20 +-
+ arch/arm/Kconfig.debug | 50 +-
+ arch/arm/arm-soc-for-next-contents.txt | 99 +++
+ arch/arm/boot/dts/Makefile | 2 +-
+ arch/arm/boot/dts/am3517-evm.dts | 4 +
+ arch/arm/boot/dts/am437x-gp-evm.dts | 127 +++-
+ arch/arm/boot/dts/arm-realview-pb1176.dts | 4 +-
+ arch/arm/boot/dts/arm-realview-pb11mp.dts | 4 +-
+ arch/arm/boot/dts/arm-realview-pbx.dtsi | 5 +-
+ .../boot/dts/aspeed-bmc-arm-centriq2400-rep.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 2 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 3 +-
+ arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 2 +-
+ arch/arm/boot/dts/bcm-nsp.dtsi | 8 +
+ arch/arm/boot/dts/bcm2835-rpi-zero-w.dts | 8 +-
+ arch/arm/boot/dts/bcm2835-rpi-zero.dts | 8 +-
+ arch/arm/boot/dts/bcm2835-rpi.dtsi | 4 +-
+ arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 2 +-
+ arch/arm/boot/dts/bcm2836-rpi.dtsi | 6 +
+ arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 4 +-
+ arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 4 +-
+ arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi | 2 +-
+ arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts | 45 ++
+ arch/arm/boot/dts/bcm47081.dtsi | 13 +-
+ arch/arm/boot/dts/bcm4709.dtsi | 3 +-
+ arch/arm/boot/dts/bcm47094.dtsi | 3 +-
+ arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 3 +-
+ arch/arm/boot/dts/bcm5301x.dtsi | 44 ++
+ arch/arm/boot/dts/bcm53573.dtsi | 3 +-
+ arch/arm/boot/dts/bcm63138.dtsi | 31 +
+ arch/arm/boot/dts/bcm958522er.dts | 4 -
+ arch/arm/boot/dts/bcm958525er.dts | 4 -
+ arch/arm/boot/dts/bcm958525xmc.dts | 4 -
+ arch/arm/boot/dts/bcm958622hr.dts | 4 -
+ arch/arm/boot/dts/bcm958623hr.dts | 4 -
+ arch/arm/boot/dts/bcm958625hr.dts | 4 -
+ arch/arm/boot/dts/bcm958625k.dts | 5 -
+ arch/arm/boot/dts/bcm963138dvt.dts | 8 +
+ arch/arm/boot/dts/bcm988312hr.dts | 4 -
+ arch/arm/boot/dts/emev2.dtsi | 2 +-
+ arch/arm/boot/dts/imx7d-nitrogen7.dts | 9 +-
+ arch/arm/boot/dts/imx7d-pico.dtsi | 22 +-
+ arch/arm/boot/dts/meson.dtsi | 7 +-
+ arch/arm/boot/dts/meson6-atv1200.dts | 4 +
+ arch/arm/boot/dts/meson6.dtsi | 5 +
+ arch/arm/boot/dts/meson8-minix-neo-x8.dts | 4 +
+ arch/arm/boot/dts/meson8.dtsi | 17 +
+ arch/arm/boot/dts/meson8b-mxq.dts | 4 +
+ arch/arm/boot/dts/meson8b.dtsi | 14 +
+ arch/arm/boot/dts/meson8m2.dtsi | 1 +
+ arch/arm/boot/dts/mmp2.dtsi | 149 ++++-
+ arch/arm/boot/dts/omap3-gta04.dtsi | 2 +-
+ .../dts/qcom-apq8064-arrow-sd-600eval-pins.dtsi | 53 --
+ .../arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts | 415 ------------
+ arch/arm/boot/dts/qcom-apq8084.dtsi | 4 +-
+ .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 3 +-
+ arch/arm/boot/dts/qcom-msm8974.dtsi | 12 +-
+ arch/arm/boot/dts/r8a7740.dtsi | 2 +-
+ arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 119 ++++
+ arch/arm/boot/dts/r8a77470.dtsi | 222 ++++++-
+ arch/arm/boot/dts/r8a7790-lager.dts | 2 -
+ arch/arm/boot/dts/r8a7791-koelsch.dts | 2 -
+ arch/arm/boot/dts/r8a7791-porter.dts | 2 -
+ arch/arm/boot/dts/r9a06g032.dtsi | 10 +-
+ arch/arm/boot/dts/rk3066a.dtsi | 52 ++
+ arch/arm/boot/dts/rk3188.dtsi | 51 ++
+ arch/arm/boot/dts/rk322x.dtsi | 10 +-
+ arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +-
+ arch/arm/boot/dts/rk3288-veyron-mickey.dts | 24 +-
+ arch/arm/boot/dts/rk3288.dtsi | 15 +-
+ arch/arm/boot/dts/rk3xxx.dtsi | 40 ++
+ arch/arm/boot/dts/sh73a0.dtsi | 2 +-
+ arch/arm/boot/dts/socfpga.dtsi | 19 +-
+ arch/arm/boot/dts/socfpga_arria10.dtsi | 14 +-
+ arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 14 +-
+ arch/arm/boot/dts/socfpga_arria10_socdk_nand.dts | 13 +-
+ arch/arm/boot/dts/socfpga_arria10_socdk_qspi.dts | 13 +-
+ arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts | 14 +-
+ arch/arm/boot/dts/socfpga_arria5.dtsi | 15 +-
+ arch/arm/boot/dts/socfpga_arria5_socdk.dts | 16 +-
+ arch/arm/boot/dts/socfpga_cyclone5.dtsi | 16 +-
+ .../arm/boot/dts/socfpga_cyclone5_de0_nano_soc.dts | 13 +-
+ arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi | 14 +-
+ arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts | 14 +-
+ arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 16 +-
+ arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 16 +-
+ arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 16 +-
+ arch/arm/boot/dts/socfpga_cyclone5_sodia.dts | 20 +-
+ arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 46 +-
+ arch/arm/boot/dts/socfpga_vt.dts | 16 +-
+ arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 4 +-
+ arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 49 +-
+ arch/arm/boot/dts/vexpress-v2m.dtsi | 63 +-
+ arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 14 +
+ arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 108 +--
+ arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 14 +
+ arch/arm/boot/dts/vexpress-v2p-ca9.dts | 43 +-
+ arch/arm/configs/multi_v7_defconfig | 11 +
+ arch/arm/configs/omap2plus_defconfig | 1 +
+ arch/arm/configs/vexpress_defconfig | 24 +-
+ arch/arm/include/debug/brcmstb.S | 24 +-
+ arch/arm/include/debug/stm32.S | 41 ++
+ arch/arm/mach-bcm/Kconfig | 1 +
+ arch/arm/mach-bcm/board_bcm2835.c | 11 +-
+ arch/arm/mach-bcm/platsmp.c | 10 +-
+ arch/arm/mach-bcm/platsmp.h | 6 +-
+ arch/arm/mach-imx/cpuidle-imx6sx.c | 2 +-
+ arch/arm/mach-mmp/aspenite.c | 4 +
+ arch/arm/mach-mmp/common.h | 2 +-
+ arch/arm/mach-mmp/cputype.h | 6 +-
+ arch/arm/mach-mmp/devices.c | 21 +
+ arch/arm/mach-mmp/mmp2-dt.c | 4 +-
+ arch/arm/mach-mmp/mmp2.c | 2 +-
+ arch/arm/mach-mmp/pxa168.c | 2 +-
+ arch/arm/mach-mmp/pxa910.h | 1 +
+ arch/arm/mach-mmp/time.c | 32 +-
+ arch/arm/mach-mmp/ttc_dkb.c | 4 +
+ arch/arm/mach-omap2/omap_hwmod.c | 6 +-
+ arch/arm/mach-omap2/timer.c | 1 -
+ arch/arm/mach-socfpga/Kconfig | 7 +
+ arch/arm/mach-socfpga/core.h | 2 -
+ arch/arm/mach-socfpga/socfpga.c | 2 +-
+ arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 3 +-
+ arch/arm64/boot/dts/amlogic/Makefile | 2 +
+ arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 34 +-
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 155 ++++-
+ .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 1 +
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 5 +
+ .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 4 +-
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 4 +-
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 64 +-
+ .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 248 +++++++
+ .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 1 +
+ .../dts/amlogic/meson-gxl-s905d-phicomm-n1.dts | 21 +
+ .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 12 +-
+ .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 5 +-
+ .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 1 +
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 66 +-
+ .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 23 +-
+ arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 23 +
+ arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 37 +-
+ .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 14 +
+ arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 18 +-
+ arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 16 +-
+ arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts | 338 ++++++++++
+ arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 499 +++++++++++++-
+ .../boot/dts/hisilicon/hi3798cv200-poplar.dts | 13 +-
+ arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 25 +-
+ arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 9 +-
+ .../arm64/boot/dts/hisilicon/hikey970-pinctrl.dtsi | 244 +++++++
+ arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 4 -
+ arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 27 -
+ .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 7 +-
+ arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 7 +-
+ arch/arm64/boot/dts/mediatek/mt7622.dtsi | 10 -
+ arch/arm64/boot/dts/qcom/Makefile | 2 +
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 47 +-
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 7 +
+ arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 12 +
+ arch/arm64/boot/dts/qcom/msm8998-pins.dtsi | 78 +++
+ arch/arm64/boot/dts/qcom/msm8998.dtsi | 24 +-
+ arch/arm64/boot/dts/qcom/pm8998.dtsi | 5 +
+ arch/arm64/boot/dts/qcom/pms405.dtsi | 55 ++
+ arch/arm64/boot/dts/qcom/qcs404-evb-1000.dts | 11 +
+ arch/arm64/boot/dts/qcom/qcs404-evb-4000.dts | 11 +
+ arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 188 ++++++
+ arch/arm64/boot/dts/qcom/qcs404.dtsi | 490 ++++++++++++++
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 178 +++++
+ arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 606 ++++++++++++++---
+ .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 2 +
+ arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 2 +
+ .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 2 +
+ arch/arm64/boot/dts/renesas/r8a7795.dtsi | 284 +++++++-
+ arch/arm64/boot/dts/renesas/r8a7796.dtsi | 321 ++++++++-
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 81 ++-
+ arch/arm64/boot/dts/renesas/r8a77970.dtsi | 211 ++++++
+ arch/arm64/boot/dts/renesas/r8a77980.dtsi | 221 +++++++
+ arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 314 ++++++++-
+ arch/arm64/boot/dts/renesas/r8a77990.dtsi | 733 ++++++++++++++++++++-
+ arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 8 +
+ arch/arm64/boot/dts/renesas/r8a77995.dtsi | 45 ++
+ arch/arm64/boot/dts/renesas/salvator-common.dtsi | 13 +-
+ arch/arm64/boot/dts/renesas/ulcb.dtsi | 8 +-
+ arch/arm64/boot/dts/rockchip/Makefile | 2 +
+ arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 1 +
+ arch/arm64/boot/dts/rockchip/rk3328.dtsi | 5 +-
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 15 +-
+ .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 8 -
+ arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 8 +-
+ .../boot/dts/rockchip/rk3399-gru-scarlet-inx.dts | 33 +
+ .../boot/dts/rockchip/rk3399-gru-scarlet-kd.dts | 33 +
+ .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 594 +++++++++++++++++
+ .../dts/rockchip/rk3399-sapphire-excavator.dts | 46 +-
+ arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 77 +--
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 22 +-
+ arch/arm64/boot/dts/sprd/sc9836.dtsi | 78 ++-
+ arch/arm64/boot/dts/sprd/sc9860.dtsi | 215 +++---
+ arch/arm64/configs/defconfig | 19 +
+ drivers/bus/brcmstb_gisb.c | 12 +-
+ drivers/bus/ti-sysc.c | 23 +-
+ drivers/firmware/raspberrypi.c | 48 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 59 +-
+ drivers/soc/Makefile | 2 +-
+ drivers/soc/amlogic/Kconfig | 8 +
+ drivers/soc/amlogic/Makefile | 1 +
+ drivers/soc/amlogic/meson-clk-measure.c | 350 ++++++++++
+ drivers/soc/bcm/brcmstb/common.c | 6 +-
+ drivers/soc/bcm/brcmstb/pm/pm-arm.c | 2 +-
+ drivers/soc/bcm/raspberrypi-power.c | 5 +-
+ drivers/soc/qcom/Kconfig | 5 -
+ drivers/soc/qcom/cmd-db.c | 93 +--
+ drivers/soc/qcom/llcc-slice.c | 17 +-
+ drivers/soc/qcom/qcom-geni-se.c | 25 +-
+ drivers/soc/qcom/qmi_interface.c | 2 +-
+ drivers/soc/qcom/smd-rpm.c | 1 +
+ drivers/soc/rockchip/pm_domains.c | 48 ++
+ drivers/soc/ti/wkup_m3_ipc.c | 1 +
+ include/dt-bindings/power/raspberrypi-power.h | 5 +-
+ include/dt-bindings/power/rk3066-power.h | 22 +
+ include/dt-bindings/power/rk3188-power.h | 24 +
+ include/linux/soc/qcom/qmi.h | 2 +-
+ include/soc/bcm2835/raspberrypi-firmware.h | 5 +-
+ include/soc/qcom/cmd-db.h | 12 +-
+ 236 files changed, 8769 insertions(+), 1829 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/soc/amlogic/clk-measure.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ create mode 100644 arch/arm/boot/dts/bcm2836-rpi.dtsi
+ create mode 100644 arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
+ delete mode 100644 arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval-pins.dtsi
+ delete mode 100644 arch/arm/boot/dts/qcom-apq8064-arrow-sd-600eval.dts
+ create mode 100644 arch/arm/include/debug/stm32.S
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s805x-libretech-ac.dts
+ create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905d-phicomm-n1.dts
+ create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pinctrl.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/msm8998-pins.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/pms405.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/qcs404-evb-1000.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/qcs404-evb-4000.dts
+ create mode 100644 arch/arm64/boot/dts/qcom/qcs404-evb.dtsi
+ create mode 100644 arch/arm64/boot/dts/qcom/qcs404.dtsi
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-inx.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet-kd.dts
+ create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-scarlet.dtsi
+ create mode 100644 drivers/soc/amlogic/meson-clk-measure.c
+ create mode 100644 include/dt-bindings/power/rk3066-power.h
+ create mode 100644 include/dt-bindings/power/rk3188-power.h
+Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next)
+$ git merge actions/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1)
+$ git merge alpine/alpine/for-next
+Already up to date.
+Merging amlogic/for-next (5a7dbcd21188 Merge branch 'v4.21/drivers' into tmp/aml-rebuild)
+$ git merge amlogic/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/clock/amlogic,gxbb-aoclkc.txt | 10 +-
+ .../bindings/clock/amlogic,gxbb-clkc.txt | 5 +
+ MAINTAINERS | 1 -
+ arch/arm/boot/dts/meson.dtsi | 24 +++--
+ arch/arm/boot/dts/meson8.dtsi | 104 ++++++++++++++++++++-
+ arch/arm/boot/dts/meson8b.dtsi | 98 ++++++++++++++++++-
+ arch/arm/mach-meson/Kconfig | 2 +
+ arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 2 +
+ arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 23 +++--
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +-
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 1 -
+ arch/arm64/boot/dts/amlogic/meson-gxbb-wetek.dtsi | 1 -
+ arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 4 +
+ arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 4 +
+ include/dt-bindings/clock/meson8b-clkc.h | 4 +
+ 15 files changed, 252 insertions(+), 33 deletions(-)
+Merging aspeed/for-next (f59cffb441bc Merge branch 'dt-for-v4.21' into for-next)
+$ git merge aspeed/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 368 +++++++++++++++++++++++
+ arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 39 ++-
+ arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 24 +-
+ arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 9 +
+ arch/arm/boot/dts/facebook-bmc-flash-layout.dtsi | 42 +++
+ 6 files changed, 475 insertions(+), 8 deletions(-)
+ create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
+ create mode 100644 arch/arm/boot/dts/facebook-bmc-flash-layout.dtsi
+Merging at91/at91-next (39d48eea7c35 Merge branch 'at91-dt' into at91-next)
+$ git merge at91/at91-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 12 +-
+ arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 2 +-
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts | 4 +-
+ arch/arm/boot/dts/at91-sama5d4ek.dts | 2 +-
+ arch/arm/boot/dts/at91sam9260.dtsi | 308 ++-----------
+ arch/arm/boot/dts/at91sam9261.dtsi | 287 +-----------
+ arch/arm/boot/dts/at91sam9263.dtsi | 315 ++-----------
+ arch/arm/boot/dts/at91sam9g15.dtsi | 4 +
+ arch/arm/boot/dts/at91sam9g20.dtsi | 23 +-
+ arch/arm/boot/dts/at91sam9g25.dtsi | 4 +
+ arch/arm/boot/dts/at91sam9g25ek.dts | 4 +-
+ arch/arm/boot/dts/at91sam9g35.dtsi | 4 +
+ arch/arm/boot/dts/at91sam9rl.dtsi | 239 +---------
+ arch/arm/boot/dts/at91sam9x25.dtsi | 4 +
+ arch/arm/boot/dts/at91sam9x35.dtsi | 4 +
+ arch/arm/boot/dts/at91sam9x5.dtsi | 326 ++------------
+ arch/arm/boot/dts/at91sam9x5_can.dtsi | 18 +-
+ arch/arm/boot/dts/at91sam9x5_isi.dtsi | 11 +-
+ arch/arm/boot/dts/at91sam9x5_lcd.dtsi | 19 +-
+ arch/arm/boot/dts/at91sam9x5_macb0.dtsi | 11 +-
+ arch/arm/boot/dts/at91sam9x5_macb1.dtsi | 11 +-
+ arch/arm/boot/dts/at91sam9x5_usart3.dtsi | 11 +-
+ arch/arm/boot/dts/sama5d2.dtsi | 670 +++-------------------------
+ arch/arm/boot/dts/sama5d4.dtsi | 535 ++--------------------
+ 24 files changed, 287 insertions(+), 2541 deletions(-)
+Merging bcm2835/for-next (3c9d403d2fe1 Merge branch 'bcm2835-drivers-next' into for-next)
+$ git merge bcm2835/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/configs/bcm2835_defconfig | 3 +++
+ 1 file changed, 3 insertions(+)
+Merging imx-mxs/for-next (f59289ce2225 Merge branch 'imx/defconfig' into for-next)
+$ git merge imx-mxs/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging arch/arm/Kconfig.debug
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/emtrion.txt | 12 +
+ .../bindings/arm/freescale/fsl,imx7ulp-pm.txt | 23 +
+ .../devicetree/bindings/arm/freescale/fsl,scu.txt | 37 +-
+ Documentation/devicetree/bindings/arm/fsl.txt | 8 +
+ .../devicetree/bindings/clock/imx7ulp-clock.txt | 104 +++
+ .../devicetree/bindings/pci/layerscape-pci.txt | 7 +-
+ .../devicetree/bindings/power/fsl,imx-gpcv2.txt | 7 +-
+ arch/arm/Kconfig.debug | 28 +-
+ arch/arm/boot/dts/Makefile | 9 +
+ arch/arm/boot/dts/imx1-ads.dts | 1 +
+ arch/arm/boot/dts/imx1-apf9328.dts | 1 +
+ arch/arm/boot/dts/imx1.dtsi | 2 -
+ arch/arm/boot/dts/imx23-evk.dts | 1 +
+ arch/arm/boot/dts/imx23-olinuxino.dts | 1 +
+ arch/arm/boot/dts/imx23-sansa.dts | 1 +
+ arch/arm/boot/dts/imx23-stmp378x_devb.dts | 1 +
+ arch/arm/boot/dts/imx23-xfi3.dts | 1 +
+ arch/arm/boot/dts/imx23.dtsi | 2 -
+ arch/arm/boot/dts/imx25-eukrea-cpuimx25.dtsi | 1 +
+ arch/arm/boot/dts/imx25-karo-tx25.dts | 1 +
+ arch/arm/boot/dts/imx25-pdk.dts | 1 +
+ arch/arm/boot/dts/imx25.dtsi | 6 +-
+ arch/arm/boot/dts/imx27-apf27.dts | 1 +
+ arch/arm/boot/dts/imx27-eukrea-cpuimx27.dtsi | 1 +
+ arch/arm/boot/dts/imx27-pdk.dts | 1 +
+ arch/arm/boot/dts/imx27-phytec-phycard-s-som.dtsi | 1 +
+ arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 1 +
+ arch/arm/boot/dts/imx27.dtsi | 2 -
+ arch/arm/boot/dts/imx28-apf28.dts | 1 +
+ arch/arm/boot/dts/imx28-apx4devkit.dts | 1 +
+ arch/arm/boot/dts/imx28-cfa10036.dts | 1 +
+ arch/arm/boot/dts/imx28-duckbill-2-485.dts | 1 +
+ arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 1 +
+ arch/arm/boot/dts/imx28-duckbill-2-spi.dts | 1 +
+ arch/arm/boot/dts/imx28-duckbill-2.dts | 1 +
+ arch/arm/boot/dts/imx28-duckbill.dts | 1 +
+ arch/arm/boot/dts/imx28-eukrea-mbmx283lc.dts | 1 +
+ arch/arm/boot/dts/imx28-eukrea-mbmx287lc.dts | 1 +
+ arch/arm/boot/dts/imx28-evk.dts | 1 +
+ arch/arm/boot/dts/imx28-m28.dtsi | 1 +
+ arch/arm/boot/dts/imx28-m28cu3.dts | 1 +
+ arch/arm/boot/dts/imx28-m28evk.dts | 1 +
+ arch/arm/boot/dts/imx28-sps1.dts | 1 +
+ arch/arm/boot/dts/imx28-ts4600.dts | 1 +
+ arch/arm/boot/dts/imx28-tx28.dts | 1 +
+ arch/arm/boot/dts/imx28.dtsi | 2 -
+ arch/arm/boot/dts/imx31-bug.dts | 1 +
+ arch/arm/boot/dts/imx31-lite.dts | 1 +
+ arch/arm/boot/dts/imx31.dtsi | 2 -
+ arch/arm/boot/dts/imx35-eukrea-cpuimx35.dtsi | 1 +
+ arch/arm/boot/dts/imx35-pdk.dts | 1 +
+ arch/arm/boot/dts/imx35.dtsi | 2 -
+ arch/arm/boot/dts/imx50-evk.dts | 1 +
+ arch/arm/boot/dts/imx50.dtsi | 19 +-
+ arch/arm/boot/dts/imx51-apf51.dts | 1 +
+ arch/arm/boot/dts/imx51-babbage.dts | 1 +
+ arch/arm/boot/dts/imx51-digi-connectcore-som.dtsi | 1 +
+ arch/arm/boot/dts/imx51-eukrea-cpuimx51.dtsi | 1 +
+ arch/arm/boot/dts/imx51-ts4800.dts | 1 +
+ arch/arm/boot/dts/imx51-zii-rdu1.dts | 18 +-
+ arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 1 +
+ arch/arm/boot/dts/imx51-zii-scu3-esb.dts | 1 +
+ arch/arm/boot/dts/imx51.dtsi | 12 +-
+ arch/arm/boot/dts/imx53-ard.dts | 1 +
+ arch/arm/boot/dts/imx53-cx9020.dts | 1 +
+ arch/arm/boot/dts/imx53-m53.dtsi | 1 +
+ arch/arm/boot/dts/imx53-qsb-common.dtsi | 1 +
+ arch/arm/boot/dts/imx53-smd.dts | 1 +
+ arch/arm/boot/dts/imx53-tqma53.dtsi | 1 +
+ arch/arm/boot/dts/imx53-tx53.dtsi | 1 +
+ arch/arm/boot/dts/imx53-usbarmory.dts | 1 +
+ arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 8 +-
+ arch/arm/boot/dts/imx53.dtsi | 27 +-
+ arch/arm/boot/dts/imx6dl-apf6dev.dts | 1 +
+ arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 1 +
+ arch/arm/boot/dts/imx6dl-aristainetos2_7.dts | 1 +
+ arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 1 +
+ arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 1 +
+ arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 1 +
+ arch/arm/boot/dts/imx6dl-dfi-fs700-m60.dts | 1 +
+ arch/arm/boot/dts/imx6dl-emcon-avari.dts | 14 +
+ arch/arm/boot/dts/imx6dl-mamoj.dts | 6 +
+ arch/arm/boot/dts/imx6dl-phytec-pfla02.dtsi | 1 +
+ arch/arm/boot/dts/imx6dl-rex-basic.dts | 1 +
+ arch/arm/boot/dts/imx6dl-riotboard.dts | 1 +
+ arch/arm/boot/dts/imx6dl-ts4900.dts | 1 +
+ arch/arm/boot/dts/imx6dl-ts7970.dts | 1 +
+ arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 1 +
+ arch/arm/boot/dts/imx6dl-wandboard-revd1.dts | 1 +
+ arch/arm/boot/dts/imx6dl-wandboard.dts | 1 +
+ arch/arm/boot/dts/imx6dl.dtsi | 2 +-
+ arch/arm/boot/dts/imx6q-apf6dev.dts | 1 +
+ arch/arm/boot/dts/imx6q-arm2.dts | 1 +
+ arch/arm/boot/dts/imx6q-b450v3.dts | 7 -
+ arch/arm/boot/dts/imx6q-b650v3.dts | 7 -
+ arch/arm/boot/dts/imx6q-b850v3.dts | 16 +
+ arch/arm/boot/dts/imx6q-ba16.dtsi | 1 +
+ arch/arm/boot/dts/imx6q-bx50v3.dtsi | 14 -
+ arch/arm/boot/dts/imx6q-cm-fx6.dts | 1 +
+ arch/arm/boot/dts/imx6q-dfi-fs700-m60.dts | 1 +
+ arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 1 +
+ arch/arm/boot/dts/imx6q-display5.dtsi | 1 +
+ arch/arm/boot/dts/imx6q-dmo-edmqmx6.dts | 1 +
+ arch/arm/boot/dts/imx6q-emcon-avari.dts | 14 +
+ arch/arm/boot/dts/imx6q-evi.dts | 1 +
+ arch/arm/boot/dts/imx6q-gk802.dts | 1 +
+ arch/arm/boot/dts/imx6q-gw5400-a.dts | 1 +
+ arch/arm/boot/dts/imx6q-h100.dts | 1 +
+ arch/arm/boot/dts/imx6q-kp-tpc.dts | 1 +
+ arch/arm/boot/dts/imx6q-marsboard.dts | 1 +
+ arch/arm/boot/dts/imx6q-mccmon6.dts | 1 +
+ arch/arm/boot/dts/imx6q-novena.dts | 1 +
+ arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi | 1 +
+ arch/arm/boot/dts/imx6q-pistachio.dts | 1 +
+ arch/arm/boot/dts/imx6q-rex-pro.dts | 1 +
+ arch/arm/boot/dts/imx6q-sbc6x.dts | 1 +
+ arch/arm/boot/dts/imx6q-tbs2910.dts | 1 +
+ arch/arm/boot/dts/imx6q-ts4900.dts | 1 +
+ arch/arm/boot/dts/imx6q-ts7970.dts | 1 +
+ arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 1 +
+ arch/arm/boot/dts/imx6q-wandboard-revd1.dts | 1 +
+ arch/arm/boot/dts/imx6q-wandboard.dts | 1 +
+ arch/arm/boot/dts/imx6q-zii-rdu2.dts | 1 +
+ arch/arm/boot/dts/imx6q.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi | 177 +++++
+ arch/arm/boot/dts/imx6qdl-emcon.dtsi | 833 ++++++++++++++++++++
+ arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 1 +
+ 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-gw551x.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-icore.dtsi | 5 +
+ arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 105 ++-
+ arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 162 ++--
+ arch/arm/boot/dts/imx6qdl-tx6.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-udoo.dtsi | 14 +
+ arch/arm/boot/dts/imx6qdl-var-dart.dtsi | 1 +
+ arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi | 15 +-
+ arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi | 15 +-
+ arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 15 +-
+ arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 5 +-
+ arch/arm/boot/dts/imx6qdl.dtsi | 22 +-
+ arch/arm/boot/dts/imx6qp-wandboard-revd1.dts | 1 +
+ arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 1 +
+ arch/arm/boot/dts/imx6sl-evk.dts | 1 +
+ arch/arm/boot/dts/imx6sl-warp.dts | 1 +
+ arch/arm/boot/dts/imx6sl.dtsi | 11 +-
+ arch/arm/boot/dts/imx6sll-evk.dts | 31 +
+ arch/arm/boot/dts/imx6sll.dtsi | 2 +-
+ arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 1 +
+ arch/arm/boot/dts/imx6sx-sabreauto.dts | 58 ++
+ arch/arm/boot/dts/imx6sx-sdb-reva.dts | 22 +-
+ arch/arm/boot/dts/imx6sx-sdb-sai.dts | 43 +-
+ arch/arm/boot/dts/imx6sx-sdb.dts | 15 +-
+ arch/arm/boot/dts/imx6sx-sdb.dtsi | 53 +-
+ arch/arm/boot/dts/imx6sx-softing-vining-2000.dts | 1 +
+ arch/arm/boot/dts/imx6sx-udoo-neo-basic.dts | 1 +
+ arch/arm/boot/dts/imx6sx-udoo-neo-extended.dts | 1 +
+ arch/arm/boot/dts/imx6sx-udoo-neo-full.dts | 1 +
+ arch/arm/boot/dts/imx6sx.dtsi | 25 +-
+ arch/arm/boot/dts/imx6ul-14x14-evk.dtsi | 64 +-
+ arch/arm/boot/dts/imx6ul-ccimx6ulsbcpro.dts | 37 +
+ arch/arm/boot/dts/imx6ul-ccimx6ulsom.dtsi | 77 +-
+ arch/arm/boot/dts/imx6ul-geam.dts | 1 +
+ arch/arm/boot/dts/imx6ul-isiot.dtsi | 1 +
+ arch/arm/boot/dts/imx6ul-litesom.dtsi | 1 +
+ arch/arm/boot/dts/imx6ul-opos6ul.dtsi | 1 +
+ arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 534 +------------
+ arch/arm/boot/dts/imx6ul-pico-pi.dts | 97 +++
+ arch/arm/boot/dts/imx6ul-pico.dtsi | 461 +++++++++++
+ arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 1 +
+ arch/arm/boot/dts/imx6ul.dtsi | 17 +-
+ arch/arm/boot/dts/imx6ull-14x14-evk.dts | 43 +-
+ arch/arm/boot/dts/imx6ull-colibri-nonwifi.dtsi | 1 +
+ arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi | 1 +
+ arch/arm/boot/dts/imx6ull.dtsi | 10 +
+ arch/arm/boot/dts/imx6ulz-14x14-evk.dts | 2 +
+ arch/arm/boot/dts/imx6ulz.dtsi | 2 -
+ arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 3 +-
+ arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 1 +
+ arch/arm/boot/dts/imx7d-colibri.dtsi | 1 +
+ arch/arm/boot/dts/imx7d-nitrogen7.dts | 1 +
+ arch/arm/boot/dts/imx7d-pico-hobbit.dts | 105 +++
+ arch/arm/boot/dts/imx7d-pico-pi.dts | 180 ++---
+ arch/arm/boot/dts/imx7d-pico.dtsi | 356 +++++++--
+ arch/arm/boot/dts/imx7d-sdb-reva.dts | 40 +
+ arch/arm/boot/dts/imx7d-sdb.dts | 29 +-
+ arch/arm/boot/dts/imx7d.dtsi | 21 +
+ arch/arm/boot/dts/imx7s-colibri.dtsi | 1 +
+ arch/arm/boot/dts/imx7s-warp.dts | 1 +
+ arch/arm/boot/dts/imx7s.dtsi | 14 +-
+ arch/arm/boot/dts/imx7ulp-evk.dts | 77 ++
+ arch/arm/boot/dts/imx7ulp.dtsi | 346 +++++++++
+ arch/arm/boot/dts/ls1021a.dtsi | 124 ++-
+ arch/arm/boot/dts/vf500-colibri.dtsi | 1 +
+ arch/arm/boot/dts/vf500.dtsi | 1 -
+ arch/arm/boot/dts/vf610-bk4.dts | 502 ++++++++++++
+ arch/arm/boot/dts/vf610-colibri.dtsi | 1 +
+ arch/arm/boot/dts/vf610-cosmic.dts | 1 +
+ arch/arm/boot/dts/vf610-twr.dts | 1 +
+ arch/arm/boot/dts/vf610-zii-cfu1.dts | 1 +
+ arch/arm/boot/dts/vf610-zii-dev.dtsi | 1 +
+ arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 851 +++++++++++++++++++++
+ arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 1 +
+ arch/arm/boot/dts/vf610m4-colibri.dts | 1 +
+ arch/arm/boot/dts/vf610m4.dtsi | 1 -
+ arch/arm/configs/imx_v6_v7_defconfig | 10 +-
+ arch/arm/mach-imx/Kconfig | 9 +
+ arch/arm/mach-imx/Makefile | 1 +
+ arch/arm/mach-imx/common.h | 1 +
+ arch/arm/mach-imx/cpu.c | 3 +
+ arch/arm/mach-imx/mach-imx7ulp.c | 31 +
+ arch/arm/mach-imx/mxc.h | 1 +
+ arch/arm/mach-imx/pm-imx7ulp.c | 29 +
+ drivers/clk/clk-fractional-divider.c | 10 +
+ drivers/clk/imx/Makefile | 7 +-
+ drivers/clk/imx/clk-busy.c | 2 +-
+ drivers/clk/imx/clk-composite-7ulp.c | 87 +++
+ drivers/clk/imx/clk-divider-gate.c | 221 ++++++
+ drivers/clk/imx/clk-fixup-mux.c | 2 +-
+ drivers/clk/imx/clk-imx7ulp.c | 220 ++++++
+ drivers/clk/imx/clk-pfdv2.c | 203 +++++
+ drivers/clk/imx/clk-pllv4.c | 184 +++++
+ drivers/clk/imx/clk.c | 22 +
+ drivers/clk/imx/clk.h | 96 ++-
+ drivers/firmware/imx/Kconfig | 6 +
+ drivers/firmware/imx/Makefile | 3 +-
+ drivers/firmware/imx/scu-pd.c | 339 ++++++++
+ drivers/soc/imx/Kconfig | 6 +-
+ drivers/soc/imx/Makefile | 2 +-
+ drivers/soc/imx/gpc.c | 2 +-
+ drivers/soc/imx/gpcv2.c | 296 +++++--
+ include/dt-bindings/clock/imx7ulp-clock.h | 109 +++
+ include/dt-bindings/firmware/imx/rsrc.h | 559 ++++++++++++++
+ include/dt-bindings/power/imx8mq-power.h | 21 +
+ include/linux/clk-provider.h | 8 +
+ include/linux/firmware/imx/sci.h | 1 +
+ include/linux/firmware/imx/svc/pm.h | 85 ++
+ include/linux/firmware/imx/types.h | 552 -------------
+ 255 files changed, 7636 insertions(+), 1678 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/emtrion.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,imx7ulp-pm.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/imx7ulp-clock.txt
+ create mode 100644 arch/arm/boot/dts/imx6dl-emcon-avari.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-emcon-avari.dts
+ create mode 100644 arch/arm/boot/dts/imx6qdl-emcon-avari.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6qdl-emcon.dtsi
+ create mode 100644 arch/arm/boot/dts/imx6ul-pico-pi.dts
+ create mode 100644 arch/arm/boot/dts/imx6ul-pico.dtsi
+ create mode 100644 arch/arm/boot/dts/imx7d-pico-hobbit.dts
+ create mode 100644 arch/arm/boot/dts/imx7d-sdb-reva.dts
+ create mode 100644 arch/arm/boot/dts/imx7ulp-evk.dts
+ create mode 100644 arch/arm/boot/dts/imx7ulp.dtsi
+ create mode 100644 arch/arm/boot/dts/vf610-bk4.dts
+ create mode 100644 arch/arm/boot/dts/vf610-zii-scu4-aib.dts
+ create mode 100644 arch/arm/mach-imx/mach-imx7ulp.c
+ create mode 100644 arch/arm/mach-imx/pm-imx7ulp.c
+ create mode 100644 drivers/clk/imx/clk-composite-7ulp.c
+ create mode 100644 drivers/clk/imx/clk-divider-gate.c
+ create mode 100644 drivers/clk/imx/clk-imx7ulp.c
+ create mode 100644 drivers/clk/imx/clk-pfdv2.c
+ create mode 100644 drivers/clk/imx/clk-pllv4.c
+ create mode 100644 drivers/firmware/imx/scu-pd.c
+ create mode 100644 include/dt-bindings/clock/imx7ulp-clock.h
+ create mode 100644 include/dt-bindings/firmware/imx/rsrc.h
+ create mode 100644 include/dt-bindings/power/imx8mq-power.h
+ create mode 100644 include/linux/firmware/imx/svc/pm.h
+Merging keystone/next (a74cab3c7dcb Merge branch 'for_4.20/drivers-soc' into next)
+$ git merge keystone/next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging mediatek/for-next (c2f7a6c7e1e5 Merge branch 'v4.20-next/soc' into for-next)
+$ git merge mediatek/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm64/boot/dts/mediatek/mt8173.dtsi | 10 ++
+ drivers/soc/mediatek/Kconfig | 12 ++
+ drivers/soc/mediatek/Makefile | 1 +
+ drivers/soc/mediatek/mtk-cmdq-helper.c | 300 +++++++++++++++++++++++++++++++
+ include/linux/soc/mediatek/mtk-cmdq.h | 133 ++++++++++++++
+ 5 files changed, 456 insertions(+)
+ create mode 100644 drivers/soc/mediatek/mtk-cmdq-helper.c
+ create mode 100644 include/linux/soc/mediatek/mtk-cmdq.h
+Merging mvebu/for-next (280879ca263a Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm64/boot/dts/marvell/Makefile | 1 +
+ .../boot/dts/marvell/armada-3720-espressobin.dts | 22 ++
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 10 +
+ .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 22 +-
+ .../dts/marvell/armada-8040-mcbin-singleshot.dts | 29 ++
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 333 +-------------------
+ arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 346 +++++++++++++++++++++
+ 7 files changed, 433 insertions(+), 330 deletions(-)
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-8040-mcbin-singleshot.dts
+ create mode 100644 arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi
+Merging omap/for-next (36f22b9e78c5 Merge branch 'omap-for-v4.21/dt-ti-sysc' into for-next)
+$ git merge omap/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/am335x-bone-common.dtsi | 2 +-
+ arch/arm/boot/dts/am335x-boneblue.dts | 2 +-
+ arch/arm/boot/dts/am335x-evm.dts | 2 +-
+ arch/arm/boot/dts/am335x-evmsk.dts | 2 +-
+ arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 2 +-
+ arch/arm/boot/dts/am335x-shc.dts | 2 +-
+ arch/arm/boot/dts/am33xx-clocks.dtsi | 110 +-
+ arch/arm/boot/dts/am33xx-l4.dtsi | 2108 +++++++++
+ arch/arm/boot/dts/am33xx.dtsi | 596 +--
+ arch/arm/boot/dts/am4372.dtsi | 876 +---
+ arch/arm/boot/dts/am437x-l4.dtsi | 2505 +++++++++++
+ arch/arm/boot/dts/am43xx-clocks.dtsi | 74 +-
+ arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 2 +-
+ arch/arm/boot/dts/dra7-evm-common.dtsi | 4 +-
+ arch/arm/boot/dts/dra7-l4.dtsi | 4560 ++++++++++++++++++++
+ arch/arm/boot/dts/dra7.dtsi | 1434 +-----
+ arch/arm/boot/dts/dra72-evm-common.dtsi | 4 +-
+ arch/arm/boot/dts/dra72x.dtsi | 4 +-
+ arch/arm/boot/dts/dra74x.dtsi | 6 +-
+ arch/arm/boot/dts/dra76x.dtsi | 2 +-
+ arch/arm/boot/dts/dra7xx-clocks.dtsi | 159 +-
+ arch/arm/boot/dts/omap5-l4.dtsi | 2462 +++++++++++
+ arch/arm/boot/dts/omap5.dtsi | 688 +--
+ arch/arm/mach-omap1/ams-delta-fiq-handler.S | 2 +-
+ arch/arm/mach-omap1/ams-delta-fiq.c | 3 +-
+ arch/arm/mach-omap1/board-ams-delta.c | 106 +-
+ .../{include/mach => }/board-ams-delta.h | 24 +-
+ arch/arm/mach-omap1/clock.c | 14 +-
+ arch/arm/mach-omap1/devices.c | 3 +
+ arch/arm/mach-omap1/id.c | 6 +-
+ arch/arm/mach-omap1/pm.c | 13 +-
+ arch/arm/mach-omap2/id.c | 4 +-
+ 32 files changed, 12005 insertions(+), 3776 deletions(-)
+ create mode 100644 arch/arm/boot/dts/am33xx-l4.dtsi
+ create mode 100644 arch/arm/boot/dts/am437x-l4.dtsi
+ create mode 100644 arch/arm/boot/dts/dra7-l4.dtsi
+ create mode 100644 arch/arm/boot/dts/omap5-l4.dtsi
+ rename arch/arm/mach-omap1/{include/mach => }/board-ams-delta.h (66%)
+Merging reset/reset/next (8a1b9fd55f25 reset: uniphier-glue: Add AHCI reset control support in glue layer)
+$ git merge reset/reset/next
+Auto-merging arch/arm/mach-socfpga/socfpga.c
+CONFLICT (content): Merge conflict in arch/arm/mach-socfpga/socfpga.c
+Resolved 'arch/arm/mach-socfpga/socfpga.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 6554008a130f] Merge remote-tracking branch 'reset/reset/next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/reset/socfpga-reset.txt | 3 +-
+ .../devicetree/bindings/reset/uniphier-reset.txt | 25 +++---
+ arch/arm/mach-socfpga/socfpga.c | 4 +
+ drivers/reset/Kconfig | 20 +++--
+ drivers/reset/Makefile | 3 +-
+ drivers/reset/core.c | 42 +++++++++++
+ drivers/reset/reset-hsdk.c | 1 +
+ drivers/reset/reset-simple.c | 13 +---
+ drivers/reset/reset-socfpga.c | 88 ++++++++++++++++++++++
+ ...reset-uniphier-usb3.c => reset-uniphier-glue.c} | 50 +++++++-----
+ include/linux/reset.h | 15 +++-
+ 11 files changed, 212 insertions(+), 52 deletions(-)
+ create mode 100644 drivers/reset/reset-socfpga.c
+ rename drivers/reset/{reset-uniphier-usb3.c => reset-uniphier-glue.c} (73%)
+Merging qcom/for-next (9a6ff76ee3da Merge tag 'qcom-drivers-for-4.21-2' into foobar-for-4.21)
+$ git merge qcom/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 6 +-
+ arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 76 ++++++++
+ arch/arm64/boot/dts/qcom/msm8916.dtsi | 97 +++++++++-
+ arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 120 ++++++++++++
+ arch/arm64/boot/dts/qcom/msm8996.dtsi | 162 +++++++++++++++-
+ arch/arm64/boot/dts/qcom/msm8998.dtsi | 3 +-
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 270 +++++++++++++++++++++++++++
+ include/linux/qcom_scm.h | 3 +
+ 9 files changed, 729 insertions(+), 10 deletions(-)
+Merging renesas/next (87e4bacc17bc Merge branches 'fixes-for-v4.20', 'dt-bindings-for-v4.21', 'drivers-for-v4.21', 'soc-for-v4.21', 'arm-defconfig-for-v4.21', 'arm-dt-for-v4.21', 'arm64-dt-for-v4.21' and 'arm64-defconfig-for-v4.21' into next)
+$ git merge renesas/next
+Auto-merging arch/arm64/configs/defconfig
+Removing arch/arm/mach-shmobile/pm-rmobile.h
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/renesas,prr.txt | 20 +
+ Documentation/devicetree/bindings/arm/shmobile.txt | 22 +-
+ arch/arm/boot/dts/Makefile | 2 +
+ arch/arm/boot/dts/iwg20d-q7-common.dtsi | 9 +
+ arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 9 -
+ arch/arm/boot/dts/r8a7743.dtsi | 3 +-
+ arch/arm/boot/dts/r8a7744-iwg20d-q7-dbcm-ca.dts | 17 +
+ arch/arm/boot/dts/r8a7744-iwg20d-q7.dts | 15 +
+ arch/arm/boot/dts/r8a7744-iwg20m.dtsi | 90 +
+ arch/arm/boot/dts/r8a7744.dtsi | 1741 ++++++++++++++++++++
+ arch/arm/configs/shmobile_defconfig | 1 +
+ arch/arm/mach-shmobile/Kconfig | 129 --
+ arch/arm/mach-shmobile/Makefile | 1 -
+ arch/arm/mach-shmobile/pm-rmobile.h | 22 -
+ arch/arm/mach-shmobile/smp-sh73a0.c | 1 -
+ arch/arm64/Kconfig.platforms | 60 +-
+ arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 +
+ arch/arm64/boot/dts/renesas/r8a77965.dtsi | 8 -
+ arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 20 +
+ arch/arm64/configs/defconfig | 3 +
+ drivers/soc/renesas/Kconfig | 241 ++-
+ drivers/soc/renesas/Makefile | 1 +
+ drivers/soc/renesas/r8a77965-sysc.c | 1 -
+ drivers/soc/renesas/r8a77970-sysc.c | 5 +-
+ drivers/soc/renesas/r8a77980-sysc.c | 10 +-
+ drivers/soc/renesas/r8a77990-sysc.c | 23 +-
+ drivers/soc/renesas/rcar-sysc.c | 65 +-
+ .../soc/renesas/rmobile-sysc.c | 37 +-
+ include/dt-bindings/power/r8a77970-sysc.h | 7 +-
+ include/dt-bindings/power/r8a77980-sysc.h | 6 +-
+ 30 files changed, 2200 insertions(+), 371 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/renesas,prr.txt
+ create mode 100644 arch/arm/boot/dts/r8a7744-iwg20d-q7-dbcm-ca.dts
+ create mode 100644 arch/arm/boot/dts/r8a7744-iwg20d-q7.dts
+ create mode 100644 arch/arm/boot/dts/r8a7744-iwg20m.dtsi
+ create mode 100644 arch/arm/boot/dts/r8a7744.dtsi
+ delete mode 100644 arch/arm/mach-shmobile/pm-rmobile.h
+ rename arch/arm/mach-shmobile/pm-rmobile.c => drivers/soc/renesas/rmobile-sysc.c (93%)
+Merging rockchip/for-next (7c806b7f750d Merge branch 'v4.20-armsoc/dts64-fixes' into for-next)
+$ git merge rockchip/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/rockchip.txt | 4 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/rk3066a.dtsi | 3 +
+ arch/arm/boot/dts/rk3188-bqedison2qc.dts | 711 +++++++++++++++++++++
+ arch/arm/boot/dts/rk3188-px3-evb.dts | 14 +-
+ arch/arm/boot/dts/rk3188-radxarock.dts | 14 +-
+ arch/arm/boot/dts/rk3188.dtsi | 66 +-
+ arch/arm/boot/dts/rk3288.dtsi | 14 +-
+ arch/arm/boot/dts/rv1108.dtsi | 76 ++-
+ arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 7 +
+ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 27 +-
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 14 +-
+ drivers/clk/rockchip/clk-rk3188.c | 13 +-
+ drivers/clk/rockchip/clk-rk3328.c | 4 +-
+ include/dt-bindings/clock/rk3328-cru.h | 3 +-
+ 15 files changed, 931 insertions(+), 40 deletions(-)
+ create mode 100644 arch/arm/boot/dts/rk3188-bqedison2qc.dts
+Merging samsung/for-next (bebc6082da0a Linux 4.14)
+$ git merge samsung/for-next
+Already up to date.
+Merging samsung-krzk/for-next (a409a4f4933a Merge branch 'next/defconfig' into for-next)
+$ git merge samsung-krzk/for-next
+Auto-merging arch/arm/configs/multi_v7_defconfig
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/exynos3250-artik5.dtsi | 6 +-
+ arch/arm/boot/dts/exynos3250-monk.dts | 6 +-
+ arch/arm/boot/dts/exynos3250-rinato.dts | 6 +-
+ arch/arm/boot/dts/exynos3250.dtsi | 2 +-
+ arch/arm/boot/dts/exynos4210-trats.dts | 4 +-
+ arch/arm/boot/dts/exynos4210.dtsi | 4 +-
+ arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 9 +-
+ arch/arm/boot/dts/exynos4412-midas.dtsi | 8 +-
+ arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 8 +-
+ arch/arm/boot/dts/exynos4412-odroidu3.dts | 18 ++--
+ arch/arm/boot/dts/exynos4412.dtsi | 8 +-
+ arch/arm/boot/dts/exynos5250-arndale.dts | 34 ++-----
+ arch/arm/boot/dts/exynos5250.dtsi | 7 +-
+ arch/arm/boot/dts/exynos5420-arndale-octa.dts | 1 +
+ arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 7 ++
+ arch/arm/boot/dts/exynos5420-smdk5420.dts | 1 +
+ arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 11 ++-
+ arch/arm/boot/dts/exynos5422-odroidhc1.dts | 106 ++++++++++++--------
+ arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 109 +++++++++++++--------
+ arch/arm/boot/dts/s5pv210.dtsi | 9 ++
+ arch/arm/configs/exynos_defconfig | 4 +
+ arch/arm/configs/multi_v7_defconfig | 2 +
+ arch/arm/mach-exynos/common.h | 2 -
+ arch/arm/mach-exynos/platsmp.c | 26 -----
+ arch/arm/mach-exynos/suspend.c | 37 +++----
+ arch/arm/mach-s5pv210/common.h | 1 -
+ arch/arm/mach-s5pv210/pm.c | 16 ++-
+ arch/arm/plat-samsung/Kconfig | 1 +
+ arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 36 ++++---
+ arch/arm64/boot/dts/exynos/exynos5433.dtsi | 24 +++--
+ 30 files changed, 298 insertions(+), 215 deletions(-)
+Merging sunxi/sunxi/for-next (ef9c186f08d7 Merge branch 'sunxi/dt-for-4.21' into sunxi/for-next)
+$ git merge sunxi/sunxi/for-next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/sunxi.txt | 4 +-
+ .../devicetree/bindings/clock/sun8i-de2.txt | 5 +-
+ .../devicetree/bindings/clock/sunxi-ccu.txt | 1 +
+ .../devicetree/bindings/gpu/arm,mali-utgard.txt | 5 +
+ Documentation/devicetree/bindings/media/cedrus.txt | 2 +-
+ .../devicetree/bindings/net/dwmac-sun8i.txt | 1 +
+ .../devicetree/bindings/sram/sunxi-sram.txt | 9 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ .../devicetree/bindings/watchdog/sunxi-wdt.txt | 1 +
+ arch/arm/boot/dts/Makefile | 4 +
+ arch/arm/boot/dts/axp81x.dtsi | 5 +
+ arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 2 -
+ arch/arm/boot/dts/sun4i-a10-pcduino.dts | 2 -
+ arch/arm/boot/dts/sun4i-a10.dtsi | 2 -
+ arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 14 +-
+ arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 25 +-
+ arch/arm/boot/dts/sun5i-a10s-mk802.dts | 29 +-
+ arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 54 +-
+ arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 20 +-
+ arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 30 +-
+ arch/arm/boot/dts/sun5i-a10s.dtsi | 30 +-
+ .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 24 +-
+ arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 29 +-
+ arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 14 +-
+ arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 34 +-
+ arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 38 +-
+ arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 14 +-
+ arch/arm/boot/dts/sun5i-a13.dtsi | 6 +-
+ arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 34 +-
+ arch/arm/boot/dts/sun5i-gr8-evb.dts | 59 +--
+ arch/arm/boot/dts/sun5i-gr8.dtsi | 12 +-
+ arch/arm/boot/dts/sun5i-r8-chip.dts | 40 +-
+ .../boot/dts/sun5i-reference-design-tablet.dtsi | 35 +-
+ arch/arm/boot/dts/sun5i.dtsi | 68 +--
+ arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 10 +-
+ arch/arm/boot/dts/sun6i-a31-colombus.dts | 33 +-
+ arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 39 +-
+ arch/arm/boot/dts/sun6i-a31-i7.dts | 32 +-
+ arch/arm/boot/dts/sun6i-a31-m9.dts | 30 +-
+ arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 30 +-
+ arch/arm/boot/dts/sun6i-a31.dtsi | 79 +--
+ arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts | 2 +-
+ arch/arm/boot/dts/sun6i-a31s-cs908.dts | 6 +-
+ arch/arm/boot/dts/sun6i-a31s-inet-q972.dts | 8 +-
+ arch/arm/boot/dts/sun6i-a31s-primo81.dts | 27 +-
+ arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 2 +-
+ arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 27 +-
+ arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 47 +-
+ .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 20 +-
+ .../boot/dts/sun6i-reference-design-tablet.dtsi | 10 +-
+ arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts | 46 +-
+ arch/arm/boot/dts/sun7i-a20-bananapi.dts | 44 +-
+ arch/arm/boot/dts/sun7i-a20-bananapro.dts | 65 +--
+ arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 21 +-
+ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 64 +--
+ arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 60 +--
+ arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 47 +-
+ arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 10 +-
+ arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 10 +-
+ arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 48 +-
+ arch/arm/boot/dts/sun7i-a20-m3.dts | 21 +-
+ arch/arm/boot/dts/sun7i-a20-mk808c.dts | 26 +-
+ .../arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts | 2 -
+ arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 68 +--
+ .../boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts | 2 -
+ arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 36 +-
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 22 +-
+ .../boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 11 -
+ arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 32 +-
+ .../boot/dts/sun7i-a20-olinuxino-micro-emmc.dts | 2 -
+ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 54 +-
+ arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 52 +-
+ arch/arm/boot/dts/sun7i-a20-orangepi.dts | 44 +-
+ arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 31 +-
+ arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 39 +-
+ arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 39 +-
+ arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 23 +-
+ arch/arm/boot/dts/sun7i-a20.dtsi | 151 +++---
+ arch/arm/boot/dts/sun8i-a23-a33.dtsi | 88 ++--
+ arch/arm/boot/dts/sun8i-a23-evb.dts | 20 +-
+ arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts | 2 +-
+ .../boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts | 15 +-
+ .../boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 15 +-
+ arch/arm/boot/dts/sun8i-a23.dtsi | 6 +-
+ arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts | 4 +-
+ arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts | 12 +-
+ arch/arm/boot/dts/sun8i-a33-olinuxino.dts | 4 +-
+ arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 20 +-
+ arch/arm/boot/dts/sun8i-a33.dtsi | 43 +-
+ arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 1 +
+ arch/arm/boot/dts/sun8i-a83t.dtsi | 5 -
+ arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts | 153 ++++++
+ arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 20 +
+ arch/arm/boot/dts/sun8i-h3.dtsi | 30 +-
+ arch/arm/boot/dts/sun8i-q8-common.dtsi | 8 +-
+ arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts | 33 +-
+ .../boot/dts/sun8i-r16-nintendo-nes-classic.dts | 2 +-
+ arch/arm/boot/dts/sun8i-r16-parrot.dts | 42 +-
+ arch/arm/boot/dts/sun8i-r40.dtsi | 18 +-
+ .../boot/dts/sun8i-reference-design-tablet.dtsi | 17 +-
+ arch/arm/boot/dts/sun8i-t3-cqa3t-bv3.dts | 226 +++++++++
+ arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts | 8 +-
+ arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts | 4 +-
+ arch/arm/boot/dts/sun8i-v3s.dtsi | 12 +-
+ arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts | 26 +
+ arch/arm/boot/dts/suniv-f1c100s.dtsi | 147 ++++++
+ arch/arm/boot/dts/sunxi-h3-h5.dtsi | 56 ++-
+ arch/arm/boot/dts/sunxi-itead-core-common.dtsi | 2 +-
+ .../boot/dts/sunxi-reference-design-tablet.dtsi | 10 +-
+ arch/arm/mach-sunxi/Kconfig | 19 +-
+ arch/arm/mach-sunxi/sunxi.c | 9 +
+ arch/arm64/boot/dts/allwinner/Makefile | 2 +
+ arch/arm64/boot/dts/allwinner/axp803.dtsi | 33 ++
+ .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 29 ++
+ .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 27 +
+ .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 67 +++
+ .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 34 ++
+ .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 4 +
+ arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 123 ++++-
+ .../sun50i-h5-emlid-neutis-n5-devboard.dts | 149 ++++++
+ .../dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi | 61 +++
+ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 37 ++
+ .../dts/allwinner/sun50i-h6-orangepi-lite2.dts | 11 +
+ .../dts/allwinner/sun50i-h6-orangepi-one-plus.dts | 140 +-----
+ .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 210 ++++++++
+ .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 82 ++++
+ arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 311 ++++++++++++
+ arch/arm64/configs/defconfig | 4 +
+ drivers/clk/sunxi-ng/Kconfig | 6 +
+ drivers/clk/sunxi-ng/Makefile | 1 +
+ drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 46 +-
+ drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 10 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 43 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 71 ++-
+ drivers/clk/sunxi-ng/ccu-sun8i-de2.h | 4 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 4 +-
+ drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 11 +
+ drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 541 +++++++++++++++++++++
+ drivers/clk/sunxi-ng/ccu-suniv-f1c100s.h | 34 ++
+ drivers/clk/sunxi-ng/ccu_mp.c | 64 ++-
+ drivers/clk/sunxi-ng/ccu_nm.c | 18 +-
+ drivers/soc/sunxi/sunxi_sram.c | 22 +-
+ include/dt-bindings/clock/sun8i-de2.h | 3 +
+ include/dt-bindings/clock/suniv-ccu-f1c100s.h | 70 +++
+ include/dt-bindings/reset/sun8i-de2.h | 1 +
+ include/dt-bindings/reset/suniv-ccu-f1c100s.h | 38 ++
+ 146 files changed, 3372 insertions(+), 2141 deletions(-)
+ create mode 100644 arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts
+ create mode 100644 arch/arm/boot/dts/sun8i-t3-cqa3t-bv3.dts
+ create mode 100644 arch/arm/boot/dts/suniv-f1c100s-licheepi-nano.dts
+ create mode 100644 arch/arm/boot/dts/suniv-f1c100s.dtsi
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-lite2.dts
+ create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi.dtsi
+ create mode 100644 drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c
+ create mode 100644 drivers/clk/sunxi-ng/ccu-suniv-f1c100s.h
+ create mode 100644 include/dt-bindings/clock/suniv-ccu-f1c100s.h
+ create mode 100644 include/dt-bindings/reset/suniv-ccu-f1c100s.h
+Merging tegra/for-next (2731820ce27b Merge branch for-4.21/clk into for-next)
+$ git merge tegra/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/tegra/nvidia,tegra186-pmc.txt | 3 +
+ .../nvidia,tegra20-emc.txt | 4 +
+ .../thermal/nvidia,tegra186-bpmp-thermal.txt | 3 +-
+ .../bindings/usb/nvidia,tegra124-xusb.txt | 8 +
+ arch/arm/boot/dts/tegra124.dtsi | 12 +
+ arch/arm/boot/dts/tegra20.dtsi | 2 +
+ arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 6 +
+ arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 4 +
+ arch/arm64/boot/dts/nvidia/tegra186.dtsi | 45 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 30 +-
+ arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 157 ++-
+ arch/arm64/boot/dts/nvidia/tegra194.dtsi | 538 ++++++++-
+ arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 4 +
+ arch/arm64/boot/dts/nvidia/tegra210.dtsi | 2 +
+ drivers/clk/tegra/clk-tegra20.c | 46 +-
+ drivers/firmware/tegra/bpmp-debugfs.c | 29 +-
+ drivers/firmware/tegra/bpmp.c | 77 +-
+ drivers/memory/tegra/Kconfig | 10 +
+ drivers/memory/tegra/Makefile | 1 +
+ drivers/memory/tegra/tegra20-emc.c | 591 ++++++++++
+ drivers/soc/tegra/common.c | 6 +-
+ drivers/soc/tegra/pmc.c | 472 +++++++-
+ .../dt-bindings/thermal/tegra194-bpmp-thermal.h | 15 +
+ include/soc/tegra/bpmp-abi.h | 1188 ++++++++++++++++----
+ include/soc/tegra/bpmp.h | 7 +
+ include/soc/tegra/fuse.h | 1 -
+ include/soc/tegra/pmc.h | 21 +
+ 27 files changed, 2951 insertions(+), 331 deletions(-)
+ rename Documentation/devicetree/bindings/{arm/tegra => memory-controllers}/nvidia,tegra20-emc.txt (95%)
+ create mode 100644 drivers/memory/tegra/tegra20-emc.c
+ create mode 100644 include/dt-bindings/thermal/tegra194-bpmp-thermal.h
+Merging arm64/for-next/core (396244692232 arm64: preempt: Provide our own implementation of asm/preempt.h)
+$ git merge arm64/for-next/core
+Auto-merging arch/arm64/kernel/ftrace.c
+Auto-merging arch/arm64/kernel/cpufeature.c
+Auto-merging arch/arm64/kernel/cpu_errata.c
+CONFLICT (content): Merge conflict in arch/arm64/kernel/cpu_errata.c
+Auto-merging arch/arm64/include/asm/tlbflush.h
+Auto-merging arch/arm64/include/asm/sysreg.h
+Auto-merging arch/arm64/include/asm/ftrace.h
+Auto-merging arch/arm64/Kconfig
+Resolved 'arch/arm64/kernel/cpu_errata.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 52e22b685b0e] Merge remote-tracking branch 'arm64/for-next/core'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm64/Kconfig | 21 ++++
+ arch/arm64/Makefile | 2 +-
+ arch/arm64/include/asm/Kbuild | 2 -
+ arch/arm64/include/asm/acpi.h | 19 +++-
+ arch/arm64/include/asm/assembler.h | 13 +++
+ arch/arm64/include/asm/barrier.h | 4 +
+ arch/arm64/include/asm/cpucaps.h | 3 +-
+ arch/arm64/include/asm/cpufeature.h | 3 +
+ arch/arm64/include/asm/cputype.h | 2 +
+ arch/arm64/include/asm/ftrace.h | 1 +
+ arch/arm64/include/asm/insn.h | 8 ++
+ arch/arm64/include/asm/io.h | 32 ++++--
+ arch/arm64/include/asm/mmu_context.h | 2 +
+ arch/arm64/include/asm/module.h | 44 +++-----
+ arch/arm64/include/asm/neon-intrinsics.h | 39 +++++++
+ arch/arm64/include/asm/pgtable.h | 22 ++++
+ arch/arm64/include/asm/preempt.h | 89 +++++++++++++++
+ arch/arm64/include/asm/sysreg.h | 6 +
+ arch/arm64/include/asm/thread_info.h | 13 ++-
+ arch/arm64/include/asm/tlbflush.h | 15 ++-
+ arch/arm64/include/asm/uaccess.h | 3 +-
+ arch/arm64/include/asm/xor.h | 73 ++++++++++++
+ arch/arm64/include/uapi/asm/hwcap.h | 1 +
+ arch/arm64/kernel/cpu_errata.c | 109 +++++++++---------
+ arch/arm64/kernel/cpufeature.c | 181 ++++++++++++++++++------------
+ arch/arm64/kernel/cpuinfo.c | 1 +
+ arch/arm64/kernel/entry-ftrace.S | 51 ++++-----
+ arch/arm64/kernel/entry.S | 6 +-
+ arch/arm64/kernel/ftrace.c | 4 +-
+ arch/arm64/kernel/image.h | 46 +++-----
+ arch/arm64/kernel/insn.c | 29 +++++
+ arch/arm64/kernel/module-plts.c | 135 ++++++++++++++++-------
+ arch/arm64/kernel/module.c | 13 +--
+ arch/arm64/kernel/vmlinux.lds.S | 9 +-
+ arch/arm64/kvm/hyp/entry.S | 1 +
+ arch/arm64/kvm/hyp/hyp-entry.S | 4 +
+ arch/arm64/lib/Makefile | 6 +
+ arch/arm64/lib/crc32.S | 54 ++++++++-
+ arch/arm64/lib/xor-neon.c | 184 +++++++++++++++++++++++++++++++
+ arch/arm64/mm/hugetlbpage.c | 33 ++++--
+ arch/arm64/mm/mmu.c | 16 ++-
+ arch/arm64/mm/pageattr.c | 21 ++++
+ arch/s390/include/asm/preempt.h | 2 +
+ arch/x86/include/asm/preempt.h | 3 +
+ include/linux/linkage.h | 6 +
+ include/linux/preempt.h | 3 -
+ 46 files changed, 1025 insertions(+), 309 deletions(-)
+ create mode 100644 arch/arm64/include/asm/neon-intrinsics.h
+ create mode 100644 arch/arm64/include/asm/preempt.h
+ create mode 100644 arch/arm64/include/asm/xor.h
+ create mode 100644 arch/arm64/lib/xor-neon.c
+Merging clk/clk-next (ae5db7b04fec Merge branch 'clk-allwinner' into clk-next)
+$ git merge clk/clk-next
+Merge made by the 'recursive' strategy.
+ .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,ethsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,infracfg.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,pciesys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,pericfg.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,sgmiisys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,ssusbsys.txt | 1 +
+ .../bindings/arm/mediatek/mediatek,topckgen.txt | 1 +
+ .../bindings/clock/amlogic,meson8b-clkc.txt | 13 +-
+ .../devicetree/bindings/clock/imx8mq-clock.txt | 20 +
+ .../devicetree/bindings/clock/qcom,gcc.txt | 16 +
+ .../devicetree/bindings/clock/qcom,gpucc.txt | 22 +
+ .../devicetree/bindings/clock/qcom,lpasscc.txt | 26 +
+ .../devicetree/bindings/clock/qcom,rpmcc.txt | 1 +
+ .../devicetree/bindings/clock/qcom,videocc.txt | 3 +-
+ drivers/clk/bcm/clk-bcm2835-aux.c | 13 +-
+ drivers/clk/bcm/clk-bcm2835.c | 14 +-
+ drivers/clk/clk-hi655x.c | 4 +-
+ drivers/clk/clk-max77686.c | 2 +-
+ drivers/clk/clk-nomadik.c | 16 +-
+ drivers/clk/clk-palmas.c | 2 +-
+ drivers/clk/clk-qoriq.c | 11 +
+ drivers/clk/clk-rk808.c | 15 +-
+ drivers/clk/clk-s2mps11.c | 2 +-
+ drivers/clk/clk-stm32mp1.c | 2 +-
+ drivers/clk/clk-twl6040.c | 5 +-
+ drivers/clk/clk.c | 42 +-
+ drivers/clk/imgtec/clk-boston.c | 21 +-
+ drivers/clk/imx/Makefile | 8 +-
+ drivers/clk/imx/clk-composite-8m.c | 178 +++++
+ drivers/clk/imx/clk-frac-pll.c | 232 +++++++
+ drivers/clk/imx/clk-imx7d.c | 3 -
+ drivers/clk/imx/clk-imx8mq.c | 589 ++++++++++++++++
+ drivers/clk/imx/clk-sccg-pll.c | 256 +++++++
+ drivers/clk/imx/clk.h | 64 ++
+ drivers/clk/mediatek/Kconfig | 23 +
+ drivers/clk/mediatek/Makefile | 3 +
+ drivers/clk/mediatek/clk-cpumux.c | 8 +-
+ drivers/clk/mediatek/clk-mt7622.c | 4 +-
+ drivers/clk/mediatek/clk-mt7629-eth.c | 159 +++++
+ drivers/clk/mediatek/clk-mt7629-hif.c | 156 +++++
+ drivers/clk/mediatek/clk-mt7629.c | 723 +++++++++++++++++++
+ drivers/clk/meson/Makefile | 2 +-
+ drivers/clk/meson/clk-pll.c | 19 +
+ drivers/clk/meson/clk-regmap.c | 5 +
+ drivers/clk/meson/clk-regmap.h | 1 +
+ drivers/clk/meson/clkc.h | 6 +
+ drivers/clk/meson/gxbb.c | 773 ++++++++++++++++++++-
+ drivers/clk/meson/gxbb.h | 26 +-
+ drivers/clk/meson/meson8b.c | 393 ++++++++++-
+ drivers/clk/meson/meson8b.h | 17 +-
+ drivers/clk/meson/vid-pll-div.c | 91 +++
+ drivers/clk/pistachio/clk-pll.c | 8 +-
+ drivers/clk/pxa/clk-pxa.c | 4 +-
+ drivers/clk/qcom/Kconfig | 18 +
+ drivers/clk/qcom/Makefile | 2 +
+ drivers/clk/qcom/apcs-msm8916.c | 6 +-
+ drivers/clk/qcom/clk-smd-rpm.c | 45 ++
+ drivers/clk/qcom/gcc-msm8916.c | 4 +
+ drivers/clk/qcom/gcc-msm8998.c | 249 +++++--
+ drivers/clk/qcom/gcc-sdm845.c | 35 +
+ drivers/clk/qcom/gdsc.c | 6 +-
+ drivers/clk/qcom/gpucc-sdm845.c | 252 +++++++
+ drivers/clk/qcom/lpasscc-sdm845.c | 179 +++++
+ drivers/clk/renesas/r7s9210-cpg-mssr.c | 9 +-
+ drivers/clk/renesas/r8a774a1-cpg-mssr.c | 1 +
+ drivers/clk/renesas/r8a7795-cpg-mssr.c | 1 +
+ drivers/clk/renesas/r8a7796-cpg-mssr.c | 1 +
+ drivers/clk/renesas/r8a77965-cpg-mssr.c | 1 +
+ drivers/clk/renesas/r8a77970-cpg-mssr.c | 5 +
+ drivers/clk/renesas/r8a77990-cpg-mssr.c | 4 +-
+ drivers/clk/renesas/r8a77995-cpg-mssr.c | 15 +-
+ drivers/clk/renesas/rcar-gen3-cpg.c | 55 +-
+ drivers/clk/tegra/clk-dfll.c | 12 +-
+ include/dt-bindings/clock/bcm2835-aux.h | 10 +-
+ include/dt-bindings/clock/bcm2835.h | 10 +-
+ include/dt-bindings/clock/gxbb-clkc.h | 18 +
+ include/dt-bindings/clock/imx8mq-clock.h | 395 +++++++++++
+ include/dt-bindings/clock/mt7629-clk.h | 203 ++++++
+ include/dt-bindings/clock/qcom,gcc-msm8998.h | 92 +++
+ include/dt-bindings/clock/qcom,gcc-sdm845.h | 2 +
+ include/dt-bindings/clock/qcom,gpucc-sdm845.h | 24 +
+ include/dt-bindings/clock/qcom,lpass-sdm845.h | 15 +
+ include/dt-bindings/clock/qcom,rpmcc.h | 4 +
+ include/dt-bindings/clock/r8a7795-cpg-mssr.h | 2 +-
+ include/dt-bindings/clock/r8a7796-cpg-mssr.h | 2 +-
+ include/dt-bindings/clock/r8a77995-cpg-mssr.h | 5 +-
+ 87 files changed, 5436 insertions(+), 255 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/clock/imx8mq-clock.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc.txt
+ create mode 100644 Documentation/devicetree/bindings/clock/qcom,lpasscc.txt
+ create mode 100644 drivers/clk/imx/clk-composite-8m.c
+ create mode 100644 drivers/clk/imx/clk-frac-pll.c
+ create mode 100644 drivers/clk/imx/clk-imx8mq.c
+ create mode 100644 drivers/clk/imx/clk-sccg-pll.c
+ create mode 100644 drivers/clk/mediatek/clk-mt7629-eth.c
+ create mode 100644 drivers/clk/mediatek/clk-mt7629-hif.c
+ create mode 100644 drivers/clk/mediatek/clk-mt7629.c
+ create mode 100644 drivers/clk/meson/vid-pll-div.c
+ create mode 100644 drivers/clk/qcom/gpucc-sdm845.c
+ create mode 100644 drivers/clk/qcom/lpasscc-sdm845.c
+ create mode 100644 include/dt-bindings/clock/imx8mq-clock.h
+ create mode 100644 include/dt-bindings/clock/mt7629-clk.h
+ create mode 100644 include/dt-bindings/clock/qcom,gpucc-sdm845.h
+ create mode 100644 include/dt-bindings/clock/qcom,lpass-sdm845.h
+Merging clk-samsung/for-next (651022382c7f Linux 4.20-rc1)
+$ git merge clk-samsung/for-next
+Already up to date.
+Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs)
+$ git merge c6x/for-linux-next
+Already up to date.
+Merging csky/linux-next (252050365823 dt-bindings: timer: gx6605s SOC timer)
+$ git merge csky/linux-next
+Auto-merging include/linux/cpuhotplug.h
+Auto-merging drivers/clocksource/Makefile
+Merge made by the 'recursive' strategy.
+Merging h8300/h8300-next (4bdf61ccbe76 h8300: fix IRQ no)
+$ git merge h8300/h8300-next
+Already up to date.
+Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files)
+$ git merge ia64/next
+Merge made by the 'recursive' strategy.
+ arch/ia64/Makefile | 3 +
+ arch/ia64/include/asm/Kbuild | 1 +
+ arch/ia64/include/asm/unistd.h | 4 +-
+ arch/ia64/include/uapi/asm/Kbuild | 1 +
+ arch/ia64/include/uapi/asm/unistd.h | 332 +------------------------------
+ arch/ia64/kernel/entry.S | 331 +------------------------------
+ arch/ia64/kernel/syscalls/Makefile | 40 ++++
+ arch/ia64/kernel/syscalls/syscall.tbl | 337 ++++++++++++++++++++++++++++++++
+ arch/ia64/kernel/syscalls/syscallhdr.sh | 36 ++++
+ arch/ia64/kernel/syscalls/syscalltbl.sh | 32 +++
+ 10 files changed, 458 insertions(+), 659 deletions(-)
+ create mode 100644 arch/ia64/kernel/syscalls/Makefile
+ create mode 100644 arch/ia64/kernel/syscalls/syscall.tbl
+ create mode 100644 arch/ia64/kernel/syscalls/syscallhdr.sh
+ create mode 100644 arch/ia64/kernel/syscalls/syscalltbl.sh
+Merging m68k/for-next (005e13a96c0e m68k: Generate uapi header and syscall table header files)
+$ git merge m68k/for-next
+Merge made by the 'recursive' strategy.
+ arch/m68k/Kconfig.machine | 2 -
+ arch/m68k/Makefile | 3 +
+ arch/m68k/configs/amiga_defconfig | 103 +++++----
+ arch/m68k/configs/apollo_defconfig | 93 ++++----
+ arch/m68k/configs/atari_defconfig | 109 +++++----
+ arch/m68k/configs/bvme6000_defconfig | 89 ++++----
+ arch/m68k/configs/hp300_defconfig | 91 ++++----
+ arch/m68k/configs/mac_defconfig | 93 ++++----
+ arch/m68k/configs/multi_defconfig | 123 +++++-----
+ arch/m68k/configs/mvme147_defconfig | 87 +++----
+ arch/m68k/configs/mvme16x_defconfig | 89 ++++----
+ arch/m68k/configs/q40_defconfig | 89 ++++----
+ arch/m68k/configs/sun3_defconfig | 81 ++++---
+ arch/m68k/configs/sun3x_defconfig | 83 ++++---
+ arch/m68k/include/asm/Kbuild | 1 +
+ arch/m68k/include/asm/raw_io.h | 39 +++-
+ arch/m68k/include/asm/unistd.h | 3 +-
+ arch/m68k/include/uapi/asm/Kbuild | 1 +
+ arch/m68k/include/uapi/asm/unistd.h | 385 +------------------------------
+ arch/m68k/kernel/syscalls/Makefile | 38 ++++
+ arch/m68k/kernel/syscalls/syscall.tbl | 389 ++++++++++++++++++++++++++++++++
+ arch/m68k/kernel/syscalls/syscallhdr.sh | 36 +++
+ arch/m68k/kernel/syscalls/syscalltbl.sh | 32 +++
+ arch/m68k/kernel/syscalltable.S | 387 +------------------------------
+ 24 files changed, 1161 insertions(+), 1285 deletions(-)
+ create mode 100644 arch/m68k/kernel/syscalls/Makefile
+ create mode 100644 arch/m68k/kernel/syscalls/syscall.tbl
+ create mode 100644 arch/m68k/kernel/syscalls/syscallhdr.sh
+ create mode 100644 arch/m68k/kernel/syscalls/syscalltbl.sh
+Merging m68knommu/for-next (2595646791c3 Linux 4.20-rc5)
+$ git merge m68knommu/for-next
+Already up to date.
+Merging microblaze/next (1e17ab5320a6 microblaze: generate uapi header and system call table files)
+$ git merge microblaze/next
+Auto-merging arch/microblaze/include/asm/pgtable.h
+Merge made by the 'recursive' strategy.
+ arch/microblaze/Makefile | 3 +
+ arch/microblaze/include/asm/Kbuild | 1 +
+ arch/microblaze/include/asm/pgtable.h | 2 +-
+ arch/microblaze/include/asm/unistd.h | 2 -
+ arch/microblaze/include/uapi/asm/Kbuild | 1 +
+ arch/microblaze/include/uapi/asm/unistd.h | 407 +------------------------
+ arch/microblaze/kernel/syscall_table.S | 406 +------------------------
+ arch/microblaze/kernel/syscalls/Makefile | 38 +++
+ arch/microblaze/kernel/syscalls/syscall.tbl | 410 ++++++++++++++++++++++++++
+ arch/microblaze/kernel/syscalls/syscallhdr.sh | 36 +++
+ arch/microblaze/kernel/syscalls/syscalltbl.sh | 32 ++
+ 11 files changed, 527 insertions(+), 811 deletions(-)
+ create mode 100644 arch/microblaze/kernel/syscalls/Makefile
+ create mode 100644 arch/microblaze/kernel/syscalls/syscall.tbl
+ create mode 100644 arch/microblaze/kernel/syscalls/syscallhdr.sh
+ create mode 100644 arch/microblaze/kernel/syscalls/syscalltbl.sh
+Merging mips/mips-next (ff4dd232ec45 MIPS: Expand MIPS32 ASIDs to 64 bits)
+$ git merge mips/mips-next
+Removing arch/mips/mti-malta/malta-display.c
+Auto-merging arch/mips/kernel/traps.c
+Auto-merging arch/mips/configs/cavium_octeon_defconfig
+Auto-merging arch/mips/cavium-octeon/executive/cvmx-helper.c
+Auto-merging arch/mips/Kconfig
+CONFLICT (content): Merge conflict in arch/mips/Kconfig
+Resolved 'arch/mips/Kconfig' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 46df5433c583] Merge remote-tracking branch 'mips/mips-next'
+$ git diff -M --stat --summary HEAD^..
+ .../features/vm/ioremap_prot/arch-support.txt | 2 +-
+ arch/mips/Kconfig | 67 +-
+ arch/mips/Makefile | 2 +-
+ arch/mips/boot/compressed/calc_vmlinuz_load_addr.c | 7 +-
+ arch/mips/boot/dts/img/boston.dts | 6 +
+ arch/mips/boot/dts/mti/malta.dts | 5 +
+ arch/mips/cavium-octeon/csrc-octeon.c | 1 +
+ arch/mips/cavium-octeon/executive/cvmx-bootmem.c | 149 +-
+ arch/mips/cavium-octeon/executive/cvmx-cmd-queue.c | 2 +-
+ .../cavium-octeon/executive/cvmx-helper-rgmii.c | 68 -
+ .../cavium-octeon/executive/cvmx-helper-sgmii.c | 38 -
+ .../cavium-octeon/executive/cvmx-helper-util.c | 90 +-
+ .../cavium-octeon/executive/cvmx-helper-xaui.c | 39 -
+ arch/mips/cavium-octeon/executive/cvmx-helper.c | 91 +-
+ .../cavium-octeon/executive/cvmx-interrupt-rsl.c | 2 +-
+ arch/mips/cavium-octeon/executive/cvmx-l2c.c | 2 +-
+ arch/mips/cavium-octeon/executive/octeon-model.c | 12 +-
+ arch/mips/cavium-octeon/octeon-irq.c | 4 +-
+ arch/mips/cavium-octeon/octeon-platform.c | 4 +-
+ arch/mips/cavium-octeon/octeon-usb.c | 6 +-
+ arch/mips/cavium-octeon/setup.c | 8 +-
+ arch/mips/cavium-octeon/smp.c | 4 +-
+ arch/mips/configs/ar7_defconfig | 44 +-
+ arch/mips/configs/ath25_defconfig | 25 +-
+ arch/mips/configs/ath79_defconfig | 33 +-
+ arch/mips/configs/bcm47xx_defconfig | 11 +-
+ arch/mips/configs/bcm63xx_defconfig | 37 +-
+ arch/mips/configs/bigsur_defconfig | 65 +-
+ arch/mips/configs/bmips_be_defconfig | 22 +-
+ arch/mips/configs/bmips_stb_defconfig | 23 +-
+ arch/mips/configs/capcella_defconfig | 24 +-
+ arch/mips/configs/cavium_octeon_defconfig | 44 +-
+ arch/mips/configs/ci20_defconfig | 27 +-
+ arch/mips/configs/cobalt_defconfig | 8 +-
+ arch/mips/configs/db1xxx_defconfig | 47 +-
+ arch/mips/configs/decstation_64_defconfig | 227 +
+ arch/mips/configs/decstation_defconfig | 163 +-
+ arch/mips/configs/decstation_r4k_defconfig | 224 +
+ arch/mips/configs/e55_defconfig | 8 +-
+ arch/mips/configs/fuloong2e_defconfig | 79 +-
+ arch/mips/configs/gcw0_defconfig | 12 +-
+ arch/mips/configs/generic_defconfig | 26 +-
+ arch/mips/configs/gpr_defconfig | 112 +-
+ arch/mips/configs/ip22_defconfig | 76 +-
+ arch/mips/configs/ip27_defconfig | 149 +-
+ arch/mips/configs/ip28_defconfig | 26 +-
+ arch/mips/configs/ip32_defconfig | 41 +-
+ arch/mips/configs/jazz_defconfig | 62 +-
+ arch/mips/configs/jmr3927_defconfig | 13 +-
+ arch/mips/configs/lasat_defconfig | 24 +-
+ arch/mips/configs/lemote2f_defconfig | 143 +-
+ arch/mips/configs/loongson1b_defconfig | 15 +-
+ arch/mips/configs/loongson1c_defconfig | 17 +-
+ arch/mips/configs/loongson3_defconfig | 70 +-
+ arch/mips/configs/malta_defconfig | 42 +-
+ arch/mips/configs/malta_kvm_defconfig | 59 +-
+ arch/mips/configs/malta_kvm_guest_defconfig | 48 +-
+ arch/mips/configs/malta_qemu_32r6_defconfig | 22 +-
+ arch/mips/configs/maltaaprp_defconfig | 25 +-
+ arch/mips/configs/maltasmvp_defconfig | 30 +-
+ arch/mips/configs/maltasmvp_eva_defconfig | 30 +-
+ arch/mips/configs/maltaup_defconfig | 21 +-
+ arch/mips/configs/maltaup_xpa_defconfig | 44 +-
+ arch/mips/configs/markeins_defconfig | 35 +-
+ arch/mips/configs/mips_paravirt_defconfig | 35 +-
+ arch/mips/configs/mpc30x_defconfig | 7 +-
+ arch/mips/configs/msp71xx_defconfig | 20 +-
+ arch/mips/configs/mtx1_defconfig | 307 +-
+ arch/mips/configs/nlm_xlp_defconfig | 112 +-
+ arch/mips/configs/nlm_xlr_defconfig | 145 +-
+ arch/mips/configs/omega2p_defconfig | 28 +-
+ arch/mips/configs/pic32mzda_defconfig | 12 +-
+ arch/mips/configs/pistachio_defconfig | 78 +-
+ arch/mips/configs/pnx8335_stb225_defconfig | 27 +-
+ arch/mips/configs/qi_lb60_defconfig | 23 +-
+ arch/mips/configs/rb532_defconfig | 49 +-
+ arch/mips/configs/rbtx49xx_defconfig | 24 +-
+ arch/mips/configs/rm200_defconfig | 79 +-
+ arch/mips/configs/rt305x_defconfig | 45 +-
+ arch/mips/configs/sb1250_swarm_defconfig | 36 +-
+ arch/mips/configs/tb0219_defconfig | 32 +-
+ arch/mips/configs/tb0226_defconfig | 17 +-
+ arch/mips/configs/tb0287_defconfig | 29 +-
+ arch/mips/configs/vocore2_defconfig | 28 +-
+ arch/mips/configs/workpad_defconfig | 18 +-
+ arch/mips/configs/xway_defconfig | 32 +-
+ arch/mips/include/asm/atomic.h | 27 +-
+ arch/mips/include/asm/bitops.h | 42 +-
+ arch/mips/include/asm/cmpxchg.h | 6 +-
+ arch/mips/include/asm/compiler.h | 24 +-
+ arch/mips/include/asm/cpu-features.h | 60 +-
+ arch/mips/include/asm/cpu-info.h | 2 +-
+ arch/mips/include/asm/cpu.h | 3 +-
+ arch/mips/include/asm/dsemul.h | 29 +-
+ arch/mips/include/asm/edac.h | 3 +-
+ arch/mips/include/asm/elf.h | 26 +-
+ arch/mips/include/asm/fpu.h | 145 +-
+ arch/mips/include/asm/fpu_emulator.h | 11 -
+ arch/mips/include/asm/futex.h | 14 +-
+ arch/mips/include/asm/hazards.h | 6 +-
+ arch/mips/include/asm/io.h | 22 +-
+ arch/mips/include/asm/kvm_host.h | 9 +-
+ arch/mips/include/asm/local.h | 12 +-
+ .../asm/mach-loongson64/kernel-entry-init.h | 4 +-
+ arch/mips/include/asm/mach-loongson64/mmzone.h | 1 +
+ arch/mips/include/asm/mipsmtregs.h | 7 +-
+ arch/mips/include/asm/mipsregs.h | 30 +-
+ arch/mips/include/asm/mmu.h | 2 +-
+ arch/mips/include/asm/mmu_context.h | 10 +-
+ arch/mips/include/asm/mmzone.h | 13 +-
+ arch/mips/include/asm/octeon/cvmx-agl-defs.h | 699 --
+ arch/mips/include/asm/octeon/cvmx-asxx-defs.h | 105 -
+ arch/mips/include/asm/octeon/cvmx-bootmem.h | 76 -
+ arch/mips/include/asm/octeon/cvmx-ciu2-defs.h | 7060 --------------------
+ arch/mips/include/asm/octeon/cvmx-dbg-defs.h | 4 -
+ arch/mips/include/asm/octeon/cvmx-dpi-defs.h | 178 -
+ arch/mips/include/asm/octeon/cvmx-fpa-defs.h | 247 -
+ arch/mips/include/asm/octeon/cvmx-gmxx-defs.h | 5058 +-------------
+ arch/mips/include/asm/octeon/cvmx-gpio-defs.h | 116 -
+ arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 17 -
+ arch/mips/include/asm/octeon/cvmx-helper-sgmii.h | 17 -
+ arch/mips/include/asm/octeon/cvmx-helper-util.h | 23 -
+ arch/mips/include/asm/octeon/cvmx-helper-xaui.h | 16 -
+ arch/mips/include/asm/octeon/cvmx-helper.h | 36 -
+ arch/mips/include/asm/octeon/cvmx-iob-defs.h | 375 --
+ arch/mips/include/asm/octeon/cvmx-ipd-defs.h | 538 --
+ arch/mips/include/asm/octeon/cvmx-l2t-defs.h | 6 -
+ arch/mips/include/asm/octeon/cvmx-led-defs.h | 78 -
+ arch/mips/include/asm/octeon/cvmx-lmcx-defs.h | 514 --
+ arch/mips/include/asm/octeon/cvmx-mio-defs.h | 1197 ----
+ arch/mips/include/asm/octeon/cvmx-mixx-defs.h | 136 -
+ arch/mips/include/asm/octeon/cvmx-npei-defs.h | 295 -
+ arch/mips/include/asm/octeon/cvmx-npi-defs.h | 235 -
+ arch/mips/include/asm/octeon/cvmx-pci-defs.h | 392 --
+ arch/mips/include/asm/octeon/cvmx-pcsx-defs.h | 185 -
+ arch/mips/include/asm/octeon/cvmx-pcsxx-defs.h | 146 -
+ arch/mips/include/asm/octeon/cvmx-pemx-defs.h | 144 -
+ arch/mips/include/asm/octeon/cvmx-pescx-defs.h | 59 -
+ arch/mips/include/asm/octeon/cvmx-pip-defs.h | 688 --
+ arch/mips/include/asm/octeon/cvmx-pko-defs.h | 619 --
+ arch/mips/include/asm/octeon/cvmx-pko.h | 2 +-
+ arch/mips/include/asm/octeon/cvmx-pow-defs.h | 317 -
+ arch/mips/include/asm/octeon/cvmx-rnm-defs.h | 53 -
+ arch/mips/include/asm/octeon/cvmx-rst-defs.h | 28 -
+ arch/mips/include/asm/octeon/cvmx-smix-defs.h | 88 -
+ arch/mips/include/asm/octeon/cvmx-spxx-defs.h | 62 -
+ arch/mips/include/asm/octeon/cvmx-sriox-defs.h | 123 -
+ arch/mips/include/asm/octeon/cvmx-srxx-defs.h | 22 -
+ arch/mips/include/asm/octeon/cvmx-stxx-defs.h | 64 -
+ arch/mips/include/asm/octeon/cvmx-uctlx-defs.h | 89 -
+ arch/mips/include/asm/page.h | 1 +
+ arch/mips/include/asm/pgtable-64.h | 5 +
+ arch/mips/include/asm/pgtable.h | 6 +-
+ arch/mips/include/asm/processor.h | 19 +-
+ arch/mips/include/asm/r4kcache.h | 22 +
+ arch/mips/include/asm/stackframe.h | 3 +-
+ arch/mips/include/asm/switch_to.h | 6 +-
+ arch/mips/include/uapi/asm/sgidefs.h | 8 -
+ arch/mips/kernel/Makefile | 3 +-
+ arch/mips/kernel/asm-offsets.c | 7 +-
+ arch/mips/kernel/bmips_5xxx_init.S | 6 -
+ arch/mips/kernel/branch.c | 41 +-
+ arch/mips/kernel/cpu-bugs64.c | 4 +-
+ arch/mips/kernel/cpu-probe.c | 64 +-
+ arch/mips/kernel/elf.c | 4 +
+ arch/mips/kernel/genex.S | 5 +-
+ arch/mips/kernel/idle.c | 7 +-
+ arch/mips/kernel/mips-mt.c | 11 -
+ arch/mips/kernel/mips-r2-to-r6-emul.c | 39 +-
+ arch/mips/kernel/ptrace.c | 466 +-
+ arch/mips/kernel/ptrace32.c | 33 +-
+ arch/mips/kernel/r2300_fpu.S | 58 -
+ arch/mips/kernel/r4k_fpu.S | 144 -
+ arch/mips/kernel/signal.c | 39 +-
+ arch/mips/kernel/syscall.c | 6 +-
+ arch/mips/kernel/traps.c | 124 +-
+ arch/mips/kernel/unaligned.c | 40 +-
+ arch/mips/kernel/vmlinux.lds.S | 4 +-
+ arch/mips/kernel/watch.c | 13 +
+ arch/mips/kvm/Kconfig | 1 +
+ arch/mips/loongson64/common/env.c | 3 +-
+ arch/mips/loongson64/loongson-3/cop2-ex.c | 7 +-
+ arch/mips/loongson64/loongson-3/smp.c | 3 +-
+ arch/mips/math-emu/cp1emu.c | 7 +
+ arch/mips/math-emu/me-debugfs.c | 12 +-
+ arch/mips/mm/c-r3k.c | 2 +-
+ arch/mips/mm/c-r4k.c | 48 +-
+ arch/mips/mm/tlbex.c | 1 +
+ arch/mips/mti-malta/Makefile | 1 -
+ arch/mips/mti-malta/malta-display.c | 56 -
+ arch/mips/mti-malta/malta-init.c | 3 -
+ arch/mips/mti-malta/malta-setup.c | 2 -
+ arch/mips/mti-malta/malta-time.c | 2 -
+ arch/mips/pci/fixup-sb1250.c | 53 +
+ arch/mips/pci/pci-rt3883.c | 6 +-
+ arch/mips/sibyte/common/Makefile | 1 +
+ arch/mips/sibyte/common/dma.c | 14 +
+ arch/mips/vdso/Makefile | 1 +
+ drivers/platform/mips/cpu_hwmon.c | 3 +-
+ include/uapi/linux/elf.h | 1 +
+ lib/gcd.c | 2 +-
+ 201 files changed, 3042 insertions(+), 23035 deletions(-)
+ create mode 100644 arch/mips/configs/decstation_64_defconfig
+ create mode 100644 arch/mips/configs/decstation_r4k_defconfig
+ delete mode 100644 arch/mips/mti-malta/malta-display.c
+ create mode 100644 arch/mips/sibyte/common/dma.c
+Merging nds32/next (e2f3f8b4a497 nds32: support hardware prefetcher)
+$ git merge nds32/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/perf/nds32v3-pmu.txt | 17 +
+ arch/nds32/Kconfig | 12 +
+ arch/nds32/Kconfig.cpu | 41 +
+ arch/nds32/Makefile | 5 +
+ arch/nds32/boot/dts/ae3xx.dts | 5 +
+ arch/nds32/include/asm/Kbuild | 1 +
+ arch/nds32/include/asm/bitfield.h | 25 +-
+ arch/nds32/include/asm/elf.h | 11 +
+ arch/nds32/include/asm/fpu.h | 126 ++
+ arch/nds32/include/asm/fpuemu.h | 32 +
+ arch/nds32/include/asm/nds32_fpu_inst.h | 109 ++
+ arch/nds32/include/asm/perf_event.h | 16 +
+ arch/nds32/include/asm/pmu.h | 386 +++++
+ arch/nds32/include/asm/processor.h | 7 +
+ arch/nds32/include/asm/sfp-machine.h | 158 ++
+ arch/nds32/include/asm/stacktrace.h | 39 +
+ arch/nds32/include/asm/suspend.h | 11 +
+ arch/nds32/include/asm/syscalls.h | 1 +
+ arch/nds32/include/uapi/asm/auxvec.h | 7 +
+ arch/nds32/include/uapi/asm/sigcontext.h | 14 +
+ arch/nds32/include/uapi/asm/udftrap.h | 13 +
+ arch/nds32/include/uapi/asm/unistd.h | 2 +
+ arch/nds32/kernel/Makefile | 7 +-
+ arch/nds32/kernel/ex-entry.S | 24 +-
+ arch/nds32/kernel/ex-exit.S | 13 +-
+ arch/nds32/kernel/ex-scall.S | 8 +-
+ arch/nds32/kernel/fpu.c | 269 ++++
+ arch/nds32/kernel/head.S | 13 +-
+ arch/nds32/kernel/perf_event_cpu.c | 1522 ++++++++++++++++++++
+ arch/nds32/kernel/pm.c | 78 +
+ arch/nds32/kernel/process.c | 64 +-
+ arch/nds32/kernel/setup.c | 22 +-
+ arch/nds32/kernel/signal.c | 62 +-
+ arch/nds32/kernel/sleep.S | 131 ++
+ arch/nds32/kernel/sys_nds32.c | 32 +
+ arch/nds32/kernel/traps.c | 16 +
+ arch/nds32/math-emu/Makefile | 7 +
+ arch/nds32/math-emu/faddd.c | 24 +
+ arch/nds32/math-emu/fadds.c | 24 +
+ arch/nds32/math-emu/fcmpd.c | 24 +
+ arch/nds32/math-emu/fcmps.c | 24 +
+ arch/nds32/math-emu/fd2s.c | 22 +
+ arch/nds32/math-emu/fdivd.c | 27 +
+ arch/nds32/math-emu/fdivs.c | 26 +
+ arch/nds32/math-emu/fmuld.c | 23 +
+ arch/nds32/math-emu/fmuls.c | 23 +
+ arch/nds32/math-emu/fnegd.c | 21 +
+ arch/nds32/math-emu/fnegs.c | 21 +
+ arch/nds32/math-emu/fpuemu.c | 357 +++++
+ arch/nds32/math-emu/fs2d.c | 23 +
+ arch/nds32/math-emu/fsqrtd.c | 21 +
+ arch/nds32/math-emu/fsqrts.c | 21 +
+ arch/nds32/math-emu/fsubd.c | 27 +
+ arch/nds32/math-emu/fsubs.c | 27 +
+ arch/nds32/mm/Makefile | 6 +-
+ arch/nds32/mm/fault.c | 13 +-
+ drivers/irqchip/irq-ativic32.c | 31 +
+ include/math-emu/op-2.h | 99 +-
+ include/math-emu/soft-fp.h | 2 +-
+ tools/include/asm/barrier.h | 2 +
+ tools/perf/arch/nds32/Build | 1 +
+ tools/perf/arch/nds32/util/Build | 1 +
+ tools/perf/arch/nds32/util/header.c | 29 +
+ tools/perf/pmu-events/arch/nds32/mapfile.csv | 15 +
+ tools/perf/pmu-events/arch/nds32/n13/atcpmu.json | 290 ++++
+ 65 files changed, 4441 insertions(+), 89 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/perf/nds32v3-pmu.txt
+ create mode 100644 arch/nds32/include/asm/fpu.h
+ create mode 100644 arch/nds32/include/asm/fpuemu.h
+ create mode 100644 arch/nds32/include/asm/nds32_fpu_inst.h
+ create mode 100644 arch/nds32/include/asm/perf_event.h
+ create mode 100644 arch/nds32/include/asm/pmu.h
+ create mode 100644 arch/nds32/include/asm/sfp-machine.h
+ create mode 100644 arch/nds32/include/asm/stacktrace.h
+ create mode 100644 arch/nds32/include/asm/suspend.h
+ create mode 100644 arch/nds32/include/uapi/asm/udftrap.h
+ create mode 100644 arch/nds32/kernel/fpu.c
+ create mode 100644 arch/nds32/kernel/perf_event_cpu.c
+ create mode 100644 arch/nds32/kernel/pm.c
+ create mode 100644 arch/nds32/kernel/sleep.S
+ create mode 100644 arch/nds32/math-emu/Makefile
+ create mode 100644 arch/nds32/math-emu/faddd.c
+ create mode 100644 arch/nds32/math-emu/fadds.c
+ create mode 100644 arch/nds32/math-emu/fcmpd.c
+ create mode 100644 arch/nds32/math-emu/fcmps.c
+ create mode 100644 arch/nds32/math-emu/fd2s.c
+ create mode 100644 arch/nds32/math-emu/fdivd.c
+ create mode 100644 arch/nds32/math-emu/fdivs.c
+ create mode 100644 arch/nds32/math-emu/fmuld.c
+ create mode 100644 arch/nds32/math-emu/fmuls.c
+ create mode 100644 arch/nds32/math-emu/fnegd.c
+ create mode 100644 arch/nds32/math-emu/fnegs.c
+ create mode 100644 arch/nds32/math-emu/fpuemu.c
+ create mode 100644 arch/nds32/math-emu/fs2d.c
+ create mode 100644 arch/nds32/math-emu/fsqrtd.c
+ create mode 100644 arch/nds32/math-emu/fsqrts.c
+ create mode 100644 arch/nds32/math-emu/fsubd.c
+ create mode 100644 arch/nds32/math-emu/fsubs.c
+ create mode 100644 tools/perf/arch/nds32/Build
+ create mode 100644 tools/perf/arch/nds32/util/Build
+ create mode 100644 tools/perf/arch/nds32/util/header.c
+ create mode 100644 tools/perf/pmu-events/arch/nds32/mapfile.csv
+ create mode 100644 tools/perf/pmu-events/arch/nds32/n13/atcpmu.json
+Merging nios2/for-next (1c286267aedf nios2: update_mmu_cache preload the TLB with the new PTE)
+$ git merge nios2/for-next
+Merge made by the 'recursive' strategy.
+ arch/nios2/Kconfig | 1 -
+ arch/nios2/include/asm/pgtable.h | 1 -
+ arch/nios2/include/asm/tlbflush.h | 19 +++-
+ arch/nios2/kernel/nios2_ksyms.c | 12 +++
+ arch/nios2/mm/cacheflush.c | 7 +-
+ arch/nios2/mm/fault.c | 2 +-
+ arch/nios2/mm/tlb.c | 191 ++++++++++++++++++++---------------
+ arch/nios2/platform/Kconfig.platform | 9 --
+ 8 files changed, 141 insertions(+), 101 deletions(-)
+Merging openrisc/for-next (5600779ea5f3 openrisc: use generic dma_noncoherent_ops)
+$ git merge openrisc/for-next
+Already up to date.
+Merging parisc-hd/for-next (9c822e12cb23 parisc: Fix HP SDC hpa address output)
+$ git merge parisc-hd/for-next
+Merge made by the 'recursive' strategy.
+ arch/parisc/include/asm/alternative.h | 4 ++
+ arch/parisc/kernel/Makefile | 2 +-
+ arch/parisc/kernel/alternative.c | 98 +++++++++++++++++++++++++++++++++++
+ arch/parisc/kernel/module.c | 14 +++++
+ arch/parisc/kernel/setup.c | 80 ----------------------------
+ drivers/input/serio/gscps2.c | 4 +-
+ drivers/input/serio/hp_sdc.c | 4 +-
+ 7 files changed, 121 insertions(+), 85 deletions(-)
+ create mode 100644 arch/parisc/kernel/alternative.c
+Merging powerpc/next (7c91efce1608 powerpc/mm: dump block address translation on book3s/32)
+$ git merge powerpc/next
+Auto-merging arch/powerpc/xmon/xmon.c
+Auto-merging arch/powerpc/platforms/pseries/vio.c
+Auto-merging arch/powerpc/platforms/powermac/feature.c
+Auto-merging arch/powerpc/platforms/embedded6xx/Kconfig
+Auto-merging arch/powerpc/platforms/chrp/Kconfig
+Auto-merging arch/powerpc/platforms/amigaone/Kconfig
+Auto-merging arch/powerpc/platforms/Kconfig.cputype
+Auto-merging arch/powerpc/platforms/Kconfig
+Auto-merging arch/powerpc/platforms/86xx/Kconfig
+Auto-merging arch/powerpc/platforms/83xx/Kconfig
+Auto-merging arch/powerpc/platforms/52xx/Kconfig
+Auto-merging arch/powerpc/platforms/512x/Kconfig
+Auto-merging arch/powerpc/kernel/trace/ftrace.c
+Auto-merging arch/powerpc/kernel/legacy_serial.c
+Auto-merging arch/powerpc/Kconfig
+Merge made by the 'recursive' strategy.
+ arch/powerpc/Kconfig | 4 +-
+ arch/powerpc/Makefile | 10 +-
+ arch/powerpc/configs/guest.config | 13 +
+ arch/powerpc/configs/ppc64_defconfig | 82 ++---
+ arch/powerpc/configs/pseries_defconfig | 2 -
+ arch/powerpc/include/asm/asm-prototypes.h | 1 -
+ arch/powerpc/include/asm/book3s/32/mmu-hash.h | 9 +
+ arch/powerpc/include/asm/book3s/32/pgalloc.h | 40 +--
+ arch/powerpc/include/asm/book3s/32/pgtable.h | 28 +-
+ arch/powerpc/include/asm/book3s/64/mmu.h | 9 +
+ arch/powerpc/include/asm/book3s/64/pgalloc.h | 6 +-
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 2 +-
+ arch/powerpc/include/asm/cache.h | 2 +-
+ arch/powerpc/include/asm/hugetlb.h | 12 +-
+ arch/powerpc/include/asm/mmu.h | 18 +-
+ arch/powerpc/include/asm/mmu_context.h | 2 +-
+ arch/powerpc/include/asm/{ => nohash/32}/mmu-40x.h | 0
+ arch/powerpc/include/asm/{ => nohash/32}/mmu-44x.h | 0
+ arch/powerpc/include/asm/{ => nohash/32}/mmu-8xx.h | 4 +
+ arch/powerpc/include/asm/nohash/32/mmu.h | 25 ++
+ arch/powerpc/include/asm/nohash/32/pgalloc.h | 27 +-
+ arch/powerpc/include/asm/nohash/32/pgtable.h | 15 +-
+ arch/powerpc/include/asm/nohash/32/pte-40x.h | 2 +-
+ arch/powerpc/include/asm/nohash/32/pte-8xx.h | 3 -
+ arch/powerpc/include/asm/nohash/64/mmu.h | 12 +
+ arch/powerpc/include/asm/nohash/64/pgalloc.h | 5 +-
+ arch/powerpc/include/asm/{ => nohash}/mmu-book3e.h | 0
+ arch/powerpc/include/asm/nohash/mmu.h | 11 +
+ arch/powerpc/include/asm/nohash/pgtable.h | 4 +
+ arch/powerpc/include/asm/page.h | 16 +-
+ arch/powerpc/include/asm/page_32.h | 3 +-
+ arch/powerpc/include/asm/pgtable-types.h | 4 +
+ arch/powerpc/include/asm/pgtable.h | 31 +-
+ arch/powerpc/include/asm/reg.h | 2 +-
+ arch/powerpc/include/asm/sfp-machine.h | 92 ++----
+ arch/powerpc/include/asm/time.h | 2 +-
+ arch/powerpc/include/asm/tlb.h | 2 +-
+ arch/powerpc/kernel/Makefile | 2 +-
+ arch/powerpc/kernel/btext.c | 16 +-
+ arch/powerpc/kernel/cacheinfo.c | 2 +-
+ arch/powerpc/kernel/cpu_setup_6xx.S | 2 +-
+ arch/powerpc/kernel/cpu_setup_fsl_booke.S | 2 +-
+ arch/powerpc/kernel/eeh_driver.c | 2 +-
+ arch/powerpc/kernel/entry_32.S | 10 +-
+ arch/powerpc/kernel/fadump.c | 12 +-
+ arch/powerpc/kernel/head_32.S | 14 +-
+ arch/powerpc/kernel/head_8xx.S | 366 ++++++++-------------
+ arch/powerpc/kernel/isa-bridge.c | 3 +-
+ arch/powerpc/kernel/legacy_serial.c | 5 +-
+ arch/powerpc/kernel/misc_32.S | 4 +-
+ arch/powerpc/kernel/pci_of_scan.c | 11 +-
+ arch/powerpc/kernel/pmc.c | 2 +-
+ arch/powerpc/kernel/security.c | 1 +
+ arch/powerpc/kernel/setup-common.c | 6 +-
+ arch/powerpc/kernel/setup_32.c | 2 +-
+ arch/powerpc/kernel/sysfs.c | 2 +-
+ arch/powerpc/kernel/trace/ftrace.c | 2 +-
+ arch/powerpc/kernel/vmlinux.lds.S | 4 +
+ arch/powerpc/kvm/e500.h | 2 +-
+ arch/powerpc/lib/feature-fixups.c | 4 +-
+ arch/powerpc/mm/8xx_mmu.c | 4 +-
+ arch/powerpc/mm/Makefile | 11 +-
+ arch/powerpc/mm/dump_bats.c | 173 ++++++++++
+ arch/powerpc/mm/dump_sr.c | 64 ++++
+ arch/powerpc/mm/fault.c | 4 +-
+ arch/powerpc/mm/hugetlbpage.c | 40 +--
+ arch/powerpc/mm/init-common.c | 56 ++--
+ arch/powerpc/mm/mem.c | 4 +-
+ arch/powerpc/mm/mmu_context.c | 10 +
+ arch/powerpc/mm/mmu_context_book3s64.c | 15 -
+ arch/powerpc/mm/mmu_context_nohash.c | 2 +-
+ arch/powerpc/mm/mmu_decl.h | 2 +-
+ arch/powerpc/mm/numa.c | 2 +-
+ arch/powerpc/mm/pgtable-book3s64.c | 88 +----
+ arch/powerpc/mm/pgtable-frag.c | 119 +++++++
+ arch/powerpc/mm/pgtable.c | 6 +-
+ arch/powerpc/mm/pgtable_32.c | 27 +-
+ arch/powerpc/mm/pkeys.c | 15 +-
+ arch/powerpc/oprofile/Makefile | 2 +-
+ arch/powerpc/oprofile/common.c | 2 +-
+ arch/powerpc/perf/imc-pmu.c | 6 +-
+ arch/powerpc/platforms/4xx/pci.c | 6 +-
+ arch/powerpc/platforms/512x/Kconfig | 2 +-
+ arch/powerpc/platforms/52xx/Kconfig | 2 +-
+ arch/powerpc/platforms/82xx/Kconfig | 4 +-
+ arch/powerpc/platforms/83xx/Kconfig | 2 +-
+ arch/powerpc/platforms/85xx/t1042rdb_diu.c | 2 +-
+ arch/powerpc/platforms/86xx/Kconfig | 2 +-
+ arch/powerpc/platforms/Kconfig | 8 +-
+ arch/powerpc/platforms/Kconfig.cputype | 18 +-
+ arch/powerpc/platforms/amigaone/Kconfig | 2 +-
+ arch/powerpc/platforms/cell/cbe_regs.c | 6 +-
+ arch/powerpc/platforms/cell/setup.c | 3 +-
+ arch/powerpc/platforms/chrp/Kconfig | 2 +-
+ arch/powerpc/platforms/chrp/pci.c | 4 +-
+ arch/powerpc/platforms/chrp/setup.c | 5 +-
+ arch/powerpc/platforms/embedded6xx/Kconfig | 2 +-
+ arch/powerpc/platforms/maple/pci.c | 6 +-
+ arch/powerpc/platforms/pasemi/dma_lib.c | 4 +-
+ arch/powerpc/platforms/powermac/cache.S | 4 +-
+ arch/powerpc/platforms/powermac/feature.c | 2 +-
+ arch/powerpc/platforms/powermac/low_i2c.c | 7 +-
+ arch/powerpc/platforms/powermac/pic.c | 2 +-
+ arch/powerpc/platforms/powermac/sleep.S | 4 +-
+ arch/powerpc/platforms/powermac/udbg_adb.c | 2 +-
+ arch/powerpc/platforms/powernv/vas-debug.c | 28 +-
+ arch/powerpc/platforms/pseries/hotplug-memory.c | 8 +-
+ arch/powerpc/platforms/pseries/setup.c | 10 +-
+ arch/powerpc/platforms/pseries/vio.c | 27 +-
+ arch/powerpc/sysdev/Makefile | 2 +-
+ arch/powerpc/sysdev/scom.c | 4 +-
+ arch/powerpc/sysdev/xive/common.c | 2 +-
+ arch/powerpc/tools/checkpatch.sh | 1 +
+ arch/powerpc/xmon/xmon.c | 30 +-
+ drivers/cpufreq/pmac32-cpufreq.c | 4 +-
+ drivers/cpuidle/cpuidle-pseries.c | 8 +-
+ drivers/macintosh/macio_asic.c | 4 +-
+ drivers/macintosh/macio_sysfs.c | 18 +-
+ drivers/macintosh/windfarm_fcu_controls.c | 14 +-
+ drivers/macintosh/windfarm_smu_sat.c | 9 +-
+ drivers/macintosh/windfarm_smu_sensors.c | 13 +-
+ drivers/misc/cxl/pci.c | 4 +-
+ tools/testing/selftests/powerpc/include/utils.h | 10 +
+ tools/testing/selftests/powerpc/ptrace/core-pkey.c | 5 +-
+ .../testing/selftests/powerpc/ptrace/ptrace-gpr.c | 2 +-
+ .../selftests/powerpc/ptrace/ptrace-tm-gpr.c | 4 +-
+ .../selftests/powerpc/ptrace/ptrace-tm-spd-tar.c | 2 +-
+ .../selftests/powerpc/ptrace/ptrace-tm-spd-vsx.c | 3 +-
+ .../selftests/powerpc/ptrace/ptrace-tm-spr.c | 2 +-
+ .../selftests/powerpc/ptrace/ptrace-tm-tar.c | 2 +-
+ .../selftests/powerpc/ptrace/ptrace-tm-vsx.c | 3 +-
+ 131 files changed, 1052 insertions(+), 896 deletions(-)
+ create mode 100644 arch/powerpc/configs/guest.config
+ rename arch/powerpc/include/asm/{ => nohash/32}/mmu-40x.h (100%)
+ rename arch/powerpc/include/asm/{ => nohash/32}/mmu-44x.h (100%)
+ rename arch/powerpc/include/asm/{ => nohash/32}/mmu-8xx.h (98%)
+ create mode 100644 arch/powerpc/include/asm/nohash/32/mmu.h
+ create mode 100644 arch/powerpc/include/asm/nohash/64/mmu.h
+ rename arch/powerpc/include/asm/{ => nohash}/mmu-book3e.h (100%)
+ create mode 100644 arch/powerpc/include/asm/nohash/mmu.h
+ create mode 100644 arch/powerpc/mm/dump_bats.c
+ create mode 100644 arch/powerpc/mm/dump_sr.c
+ create mode 100644 arch/powerpc/mm/pgtable-frag.c
+Merging fsl/next (b6ae3550c8e2 powerpc/8xx: add missing header in 8xx_mmu.c)
+$ git merge fsl/next
+Already up to date.
+Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
+$ git merge risc-v-pjw/for-next
+Already up to date.
+Merging risc-v/for-next (7ac3574ad42f automerging branch "kernel.org-palmer-linux/next-tracepoints" into "for-next")
+$ git merge risc-v/for-next
+Auto-merging arch/riscv/Kconfig
+Auto-merging Documentation/features/vm/ioremap_prot/arch-support.txt
+CONFLICT (modify/delete): Documentation/features/io/sg-chain/arch-support.txt deleted in HEAD and modified in risc-v/for-next. Version risc-v/for-next of Documentation/features/io/sg-chain/arch-support.txt left in tree.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git rm -f Documentation/features/io/sg-chain/arch-support.txt
+Documentation/features/io/sg-chain/arch-support.txt: needs merge
+rm 'Documentation/features/io/sg-chain/arch-support.txt'
+$ git commit -v -a
+[master d3bf2aebbccf] Merge remote-tracking branch 'risc-v/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../features/core/cBPF-JIT/arch-support.txt | 1 +
+ .../features/core/eBPF-JIT/arch-support.txt | 1 +
+ .../core/generic-idle-thread/arch-support.txt | 1 +
+ .../features/core/jump-labels/arch-support.txt | 1 +
+ .../features/core/tracehook/arch-support.txt | 1 +
+ .../features/debug/KASAN/arch-support.txt | 3 +-
+ .../debug/gcov-profile-all/arch-support.txt | 1 +
+ Documentation/features/debug/kgdb/arch-support.txt | 1 +
+ .../debug/kprobes-on-ftrace/arch-support.txt | 1 +
+ .../features/debug/kprobes/arch-support.txt | 1 +
+ .../features/debug/kretprobes/arch-support.txt | 1 +
+ .../features/debug/optprobes/arch-support.txt | 1 +
+ .../features/debug/stackprotector/arch-support.txt | 3 +-
+ .../features/debug/uprobes/arch-support.txt | 1 +
+ .../debug/user-ret-profiler/arch-support.txt | 1 +
+ .../features/io/dma-contiguous/arch-support.txt | 1 +
+ .../locking/cmpxchg-local/arch-support.txt | 1 +
+ .../features/locking/lockdep/arch-support.txt | 1 +
+ .../locking/queued-rwlocks/arch-support.txt | 1 +
+ .../locking/queued-spinlocks/arch-support.txt | 3 +-
+ .../locking/rwsem-optimized/arch-support.txt | 1 +
+ .../features/perf/kprobes-event/arch-support.txt | 3 +-
+ .../features/perf/perf-regs/arch-support.txt | 1 +
+ .../features/perf/perf-stackdump/arch-support.txt | 1 +
+ .../sched/membarrier-sync-core/arch-support.txt | 1 +
+ .../features/sched/numa-balancing/arch-support.txt | 1 +
+ .../seccomp/seccomp-filter/arch-support.txt | 1 +
+ .../time/arch-tick-broadcast/arch-support.txt | 1 +
+ .../features/time/clockevents/arch-support.txt | 1 +
+ .../time/context-tracking/arch-support.txt | 1 +
+ .../features/time/irq-time-acct/arch-support.txt | 1 +
+ .../time/modern-timekeeping/arch-support.txt | 1 +
+ .../features/time/virt-cpuacct/arch-support.txt | 1 +
+ .../features/vm/ELF-ASLR/arch-support.txt | 1 +
+ .../features/vm/PG_uncached/arch-support.txt | 1 +
+ Documentation/features/vm/THP/arch-support.txt | 1 +
+ Documentation/features/vm/TLB/arch-support.txt | 1 +
+ .../features/vm/huge-vmap/arch-support.txt | 1 +
+ .../features/vm/ioremap_prot/arch-support.txt | 1 +
+ .../features/vm/numa-memblock/arch-support.txt | 1 +
+ .../features/vm/pte_special/arch-support.txt | 3 +-
+ arch/riscv/Kconfig | 3 ++
+ arch/riscv/Kconfig.debug | 2 -
+ arch/riscv/configs/defconfig | 1 +
+ arch/riscv/include/asm/atomic.h | 9 ++++
+ arch/riscv/include/asm/ptrace.h | 5 ++
+ arch/riscv/include/asm/syscall.h | 10 ++++
+ arch/riscv/include/asm/thread_info.h | 6 +++
+ arch/riscv/kernel/entry.S | 4 +-
+ arch/riscv/kernel/ftrace.c | 1 -
+ arch/riscv/kernel/ptrace.c | 7 ++-
+ arch/riscv/kernel/setup.c | 28 ----------
+ arch/riscv/kernel/time.c | 1 +
+ arch/riscv/lib/tishift.S | 59 ++++++++++++----------
+ arch/riscv/lib/udivdi3.S | 42 +++++++--------
+ drivers/tty/serial/Kconfig | 12 +++++
+ drivers/tty/serial/Makefile | 1 +
+ drivers/tty/serial/earlycon-riscv-sbi.c | 28 ++++++++++
+ include/uapi/linux/audit.h | 2 +
+ 59 files changed, 185 insertions(+), 87 deletions(-)
+ create mode 100644 drivers/tty/serial/earlycon-riscv-sbi.c
+Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux)
+$ git merge sifive/for-next
+Already up to date.
+Merging s390/features (5b39fc049ce1 s390: use common bust_spinlocks())
+$ git merge s390/features
+Merge made by the 'recursive' strategy.
+ arch/s390/include/asm/ap.h | 28 +++++++++++++++++++---------
+ arch/s390/include/uapi/asm/zcrypt.h | 4 ++--
+ arch/s390/mm/fault.c | 24 ------------------------
+ drivers/s390/crypto/vfio_ap_drv.c | 1 +
+ drivers/s390/crypto/zcrypt_error.h | 2 ++
+ lib/bust_spinlocks.c | 6 +++---
+ 6 files changed, 27 insertions(+), 38 deletions(-)
+Merging sparc-next/master (c23b8e7acea3 ALSA: sparc: Use of_node_name_eq for node name comparisons)
+$ git merge sparc-next/master
+Auto-merging sound/sparc/cs4231.c
+Auto-merging drivers/sbus/char/envctrl.c
+Merge made by the 'recursive' strategy.
+ arch/sparc/Makefile | 3 +
+ arch/sparc/include/asm/Kbuild | 4 +-
+ arch/sparc/include/asm/floppy_64.h | 8 +-
+ arch/sparc/include/asm/leon.h | 1 -
+ arch/sparc/include/asm/parport.h | 2 +-
+ arch/sparc/include/asm/unistd.h | 18 ++
+ arch/sparc/include/uapi/asm/Kbuild | 2 +
+ arch/sparc/include/uapi/asm/unistd.h | 426 +------------------------------
+ arch/sparc/kernel/auxio_64.c | 11 +-
+ arch/sparc/kernel/central.c | 2 +-
+ arch/sparc/kernel/chmc.c | 8 +-
+ arch/sparc/kernel/ioport.c | 2 +-
+ arch/sparc/kernel/irq_64.c | 2 +-
+ arch/sparc/kernel/leon_kernel.c | 14 -
+ arch/sparc/kernel/of_device_32.c | 21 +-
+ arch/sparc/kernel/of_device_64.c | 58 ++---
+ arch/sparc/kernel/of_device_common.c | 4 +-
+ arch/sparc/kernel/pci.c | 44 ++--
+ arch/sparc/kernel/pci_sabre.c | 2 +-
+ arch/sparc/kernel/power.c | 4 +-
+ arch/sparc/kernel/process_32.c | 2 +-
+ arch/sparc/kernel/prom_32.c | 44 ++--
+ arch/sparc/kernel/prom_64.c | 75 +++---
+ arch/sparc/kernel/prom_irqtrans.c | 20 +-
+ arch/sparc/kernel/reboot.c | 3 +-
+ arch/sparc/kernel/sbus.c | 4 +-
+ arch/sparc/kernel/sun4d_irq.c | 14 +-
+ arch/sparc/kernel/syscalls/Makefile | 55 ++++
+ arch/sparc/kernel/syscalls/syscall.tbl | 409 +++++++++++++++++++++++++++++
+ arch/sparc/kernel/syscalls/syscallhdr.sh | 36 +++
+ arch/sparc/kernel/syscalls/syscalltbl.sh | 36 +++
+ arch/sparc/kernel/systbls_32.S | 81 +-----
+ arch/sparc/kernel/systbls_64.S | 157 +-----------
+ arch/sparc/kernel/time_64.c | 16 +-
+ arch/sparc/kernel/vio.c | 9 +-
+ drivers/of/pdt.c | 50 +---
+ drivers/sbus/char/bbc_envctrl.c | 4 +-
+ drivers/sbus/char/envctrl.c | 6 +-
+ drivers/sbus/char/flash.c | 6 +-
+ fs/openpromfs/inode.c | 11 +-
+ include/linux/of.h | 1 -
+ sound/sparc/cs4231.c | 6 +-
+ 42 files changed, 777 insertions(+), 904 deletions(-)
+ create mode 100644 arch/sparc/kernel/syscalls/Makefile
+ create mode 100644 arch/sparc/kernel/syscalls/syscall.tbl
+ create mode 100644 arch/sparc/kernel/syscalls/syscallhdr.sh
+ create mode 100644 arch/sparc/kernel/syscalls/syscalltbl.sh
+Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM)
+$ git merge sh/for-next
+Already up to date.
+Merging uml/linux-next (917e2fd2c53e um: Make line/tty semantics use true write IRQ)
+$ git merge uml/linux-next
+Already up to date.
+Merging xtensa/xtensa-for-next (cf991521b736 Merge branch 'xtensa-cleanups' into xtensa-for-next)
+$ git merge xtensa/xtensa-for-next
+Merge made by the 'recursive' strategy.
+ arch/xtensa/Makefile | 3 +
+ arch/xtensa/boot/boot-elf/bootstrap.S | 29 +-
+ arch/xtensa/boot/dts/xtfpga.dtsi | 2 +-
+ arch/xtensa/include/asm/Kbuild | 1 +
+ arch/xtensa/include/asm/coprocessor.h | 23 -
+ arch/xtensa/include/asm/elf.h | 11 -
+ arch/xtensa/include/asm/futex.h | 8 +-
+ arch/xtensa/include/asm/irqflags.h | 1 +
+ arch/xtensa/include/asm/processor.h | 18 +-
+ arch/xtensa/include/asm/syscall.h | 19 +-
+ arch/xtensa/include/asm/thread_info.h | 1 +
+ arch/xtensa/include/asm/timex.h | 18 +-
+ arch/xtensa/include/asm/traps.h | 2 -
+ arch/xtensa/include/asm/uaccess.h | 10 +-
+ arch/xtensa/include/uapi/asm/Kbuild | 1 +
+ arch/xtensa/include/uapi/asm/unistd.h | 781 +-----------------------------
+ arch/xtensa/kernel/asm-offsets.c | 2 -
+ arch/xtensa/kernel/coprocessor.S | 102 +---
+ arch/xtensa/kernel/entry.S | 21 +-
+ arch/xtensa/kernel/head.S | 8 +-
+ arch/xtensa/kernel/hw_breakpoint.c | 21 +-
+ arch/xtensa/kernel/process.c | 9 +-
+ arch/xtensa/kernel/ptrace.c | 10 -
+ arch/xtensa/kernel/setup.c | 8 +-
+ arch/xtensa/kernel/syscall.c | 9 +-
+ arch/xtensa/kernel/syscalls/Makefile | 38 ++
+ arch/xtensa/kernel/syscalls/syscall.tbl | 374 ++++++++++++++
+ arch/xtensa/kernel/syscalls/syscallhdr.sh | 36 ++
+ arch/xtensa/kernel/syscalls/syscalltbl.sh | 32 ++
+ arch/xtensa/kernel/traps.c | 10 +-
+ drivers/irqchip/irq-xtensa-mx.c | 10 +-
+ drivers/irqchip/irq-xtensa-pic.c | 8 +-
+ 32 files changed, 596 insertions(+), 1030 deletions(-)
+ create mode 100644 arch/xtensa/kernel/syscalls/Makefile
+ create mode 100644 arch/xtensa/kernel/syscalls/syscall.tbl
+ create mode 100644 arch/xtensa/kernel/syscalls/syscallhdr.sh
+ create mode 100644 arch/xtensa/kernel/syscalls/syscalltbl.sh
+Merging fscrypt/master (889645b87e96 fscrypt: add Adiantum support)
+$ git merge fscrypt/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/filesystems/fscrypt.rst | 179 ++++---
+ Documentation/filesystems/fsverity.rst | 583 +++++++++++++++++++++
+ Documentation/filesystems/index.rst | 11 +
+ Documentation/ioctl/ioctl-number.txt | 1 +
+ MAINTAINERS | 12 +
+ fs/Kconfig | 2 +
+ fs/Makefile | 1 +
+ fs/crypto/crypto.c | 28 +-
+ fs/crypto/fname.c | 22 +-
+ fs/crypto/fscrypt_private.h | 67 ++-
+ fs/crypto/keyinfo.c | 351 ++++++++++---
+ fs/crypto/policy.c | 5 +-
+ fs/ext4/Kconfig | 20 +
+ fs/ext4/ext4.h | 22 +-
+ fs/ext4/file.c | 6 +
+ fs/ext4/inode.c | 11 +
+ fs/ext4/ioctl.c | 12 +
+ fs/ext4/readpage.c | 209 ++++++--
+ fs/ext4/super.c | 100 +++-
+ fs/ext4/sysfs.c | 6 +
+ fs/f2fs/Kconfig | 20 +
+ fs/f2fs/checkpoint.c | 2 +-
+ fs/f2fs/data.c | 43 +-
+ fs/f2fs/f2fs.h | 41 +-
+ fs/f2fs/file.c | 71 ++-
+ fs/f2fs/gc.c | 17 +-
+ fs/f2fs/inode.c | 21 +-
+ fs/f2fs/namei.c | 6 +-
+ fs/f2fs/node.c | 6 +-
+ fs/f2fs/recovery.c | 2 +-
+ fs/f2fs/segment.c | 6 +-
+ fs/f2fs/super.c | 87 ++--
+ fs/f2fs/sysfs.c | 31 +-
+ fs/verity/Kconfig | 52 ++
+ fs/verity/Makefile | 5 +
+ fs/verity/fsverity_private.h | 135 +++++
+ fs/verity/hash_algs.c | 115 +++++
+ fs/verity/ioctl.c | 164 ++++++
+ fs/verity/setup.c | 908 +++++++++++++++++++++++++++++++++
+ fs/verity/signature.c | 187 +++++++
+ fs/verity/verify.c | 298 +++++++++++
+ include/linux/fs.h | 9 +
+ include/linux/fsverity.h | 112 ++++
+ include/uapi/linux/fs.h | 4 +-
+ include/uapi/linux/fsverity.h | 98 ++++
+ 45 files changed, 3777 insertions(+), 311 deletions(-)
+ create mode 100644 Documentation/filesystems/fsverity.rst
+ create mode 100644 fs/verity/Kconfig
+ create mode 100644 fs/verity/Makefile
+ create mode 100644 fs/verity/fsverity_private.h
+ create mode 100644 fs/verity/hash_algs.c
+ create mode 100644 fs/verity/ioctl.c
+ create mode 100644 fs/verity/setup.c
+ create mode 100644 fs/verity/signature.c
+ create mode 100644 fs/verity/verify.c
+ create mode 100644 include/linux/fsverity.h
+ create mode 100644 include/uapi/linux/fsverity.h
+Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues)
+$ git merge befs/for-next
+Merge made by the 'recursive' strategy.
+ fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 51 insertions(+), 46 deletions(-)
+Merging btrfs/next (29dcea88779c Linux 4.17)
+$ git merge btrfs/next
+Already up to date.
+Merging btrfs-kdave/for-next (86db915ae814 Merge branch 'for-next-next-v4.20-20181206' into for-next-20181206)
+$ git merge btrfs-kdave/for-next
+Merge made by the 'recursive' strategy.
+ fs/btrfs/backref.c | 9 -
+ fs/btrfs/btrfs_inode.h | 8 +-
+ fs/btrfs/check-integrity.c | 22 +-
+ fs/btrfs/compression.c | 22 +-
+ fs/btrfs/ctree.c | 12 +-
+ fs/btrfs/ctree.h | 268 +++++---
+ fs/btrfs/delayed-ref.c | 60 +-
+ fs/btrfs/delayed-ref.h | 3 +-
+ fs/btrfs/dev-replace.c | 189 +++---
+ fs/btrfs/dev-replace.h | 8 -
+ fs/btrfs/disk-io.c | 121 ++--
+ fs/btrfs/disk-io.h | 10 +-
+ fs/btrfs/extent-tree.c | 1245 ++++++++++++++++++++++++--------------
+ fs/btrfs/extent_io.c | 413 ++++++-------
+ fs/btrfs/extent_io.h | 64 +-
+ fs/btrfs/extent_map.h | 21 +-
+ fs/btrfs/file-item.c | 13 +-
+ fs/btrfs/file.c | 25 +-
+ fs/btrfs/free-space-tree.c | 15 +-
+ fs/btrfs/inode.c | 721 +++++++++++++++-------
+ fs/btrfs/ioctl.c | 35 +-
+ fs/btrfs/ordered-data.c | 30 -
+ fs/btrfs/ordered-data.h | 47 +-
+ fs/btrfs/qgroup.c | 21 +-
+ fs/btrfs/qgroup.h | 2 +-
+ fs/btrfs/reada.c | 16 +-
+ fs/btrfs/relocation.c | 48 +-
+ fs/btrfs/scrub.c | 50 +-
+ fs/btrfs/send.c | 2 +-
+ fs/btrfs/super.c | 2 +-
+ fs/btrfs/sysfs.c | 14 +
+ fs/btrfs/sysfs.h | 2 +-
+ fs/btrfs/tests/btrfs-tests.c | 4 +-
+ fs/btrfs/tests/extent-io-tests.c | 29 +-
+ fs/btrfs/tests/inode-tests.c | 6 -
+ fs/btrfs/transaction.c | 89 ++-
+ fs/btrfs/transaction.h | 16 +-
+ fs/btrfs/tree-log.c | 24 +-
+ fs/btrfs/tree-log.h | 2 -
+ fs/btrfs/volumes.c | 771 ++++++++++++++++++-----
+ fs/btrfs/volumes.h | 25 +-
+ include/trace/events/btrfs.h | 4 +-
+ include/uapi/linux/btrfs.h | 1 +
+ include/uapi/linux/btrfs_tree.h | 1 +
+ 44 files changed, 2843 insertions(+), 1647 deletions(-)
+Merging ceph/master (7e241f647dc7 libceph: fall back to sendmsg for slab pages)
+$ git merge ceph/master
+Already up to date.
+Merging cifs/for-next (8ec20a4fd3a3 cifs: update internal module version number)
+$ git merge cifs/for-next
+Merge made by the 'recursive' strategy.
+ fs/cifs/cifsencrypt.c | 2 +-
+ fs/cifs/cifsfs.h | 2 +-
+ fs/cifs/cifsglob.h | 1 +
+ fs/cifs/connect.c | 3 +-
+ fs/cifs/inode.c | 2 +-
+ fs/cifs/sess.c | 4 +-
+ fs/cifs/smb2ops.c | 263 +++++++++++++++++++++++++++++++-------------------
+ fs/cifs/smb2pdu.c | 12 ---
+ fs/cifs/smb2pdu.h | 1 -
+ fs/cifs/smb2proto.h | 10 +-
+ fs/cifs/transport.c | 8 +-
+ 11 files changed, 181 insertions(+), 127 deletions(-)
+Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal)
+$ git merge configfs/for-next
+Already up to date.
+Merging ecryptfs/next (5dcea554d5ce eCryptfs: fix a couple type promotion bugs)
+$ git merge ecryptfs/next
+Merge made by the 'recursive' strategy.
+ fs/ecryptfs/crypto.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+Merging ext3/for_next (6eff7ce21cf1 Pull fanotify hardening from Kees Cook.)
+$ git merge ext3/for_next
+Auto-merging include/linux/fs.h
+Auto-merging fs/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 1 +
+ fs/Makefile | 3 +-
+ fs/ext2/dir.c | 49 +++++++----------
+ fs/ext2/super.c | 12 ++---
+ fs/ext2/xattr.c | 3 +-
+ fs/fs_types.c | 105 +++++++++++++++++++++++++++++++++++++
+ fs/notify/fanotify/fanotify.c | 32 ++++++-----
+ fs/notify/fanotify/fanotify_user.c | 10 +++-
+ fs/notify/fdinfo.c | 1 +
+ fs/notify/fsnotify.c | 2 +-
+ include/linux/fanotify.h | 5 +-
+ include/linux/fs.h | 17 +-----
+ include/linux/fs_types.h | 73 ++++++++++++++++++++++++++
+ include/linux/fsnotify.h | 61 ++++++++++++---------
+ include/linux/fsnotify_backend.h | 11 ++--
+ include/uapi/linux/fanotify.h | 2 +
+ 16 files changed, 287 insertions(+), 100 deletions(-)
+ create mode 100644 fs/fs_types.c
+ create mode 100644 include/linux/fs_types.h
+Merging ext4/dev (e647e29196b7 ext4: fix EXT4_IOC_GROUP_ADD ioctl)
+$ git merge ext4/dev
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext4/ext4.h
+Merge made by the 'recursive' strategy.
+ fs/ext4/ext4.h | 2 ++
+ fs/ext4/inline.c | 5 +++-
+ fs/ext4/migrate.c | 48 ++++++++++++++++----------------
+ fs/ext4/resize.c | 74 ++++++++++++++++++++++++-------------------------
+ fs/ext4/super.c | 62 +++++++++++++++++++++++++++--------------
+ fs/ext4/xattr.c | 76 ++++++++++++++++++++++++---------------------------
+ fs/jbd2/commit.c | 3 ++
+ fs/jbd2/transaction.c | 45 ++++++++++++++++++++++++++----
+ include/linux/jbd2.h | 7 +++--
+ 9 files changed, 190 insertions(+), 132 deletions(-)
+Merging f2fs/dev (19880e6e5ff3 f2fs: make "f2fs_fault_name[]" const char *)
+$ git merge f2fs/dev
+Auto-merging fs/f2fs/sysfs.c
+Auto-merging fs/f2fs/super.c
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/data.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-fs-f2fs | 9 ++
+ fs/f2fs/acl.c | 14 ++--
+ fs/f2fs/data.c | 140 ++++++++++++++++++++++----------
+ fs/f2fs/debug.c | 19 ++---
+ fs/f2fs/dir.c | 12 ++-
+ fs/f2fs/f2fs.h | 25 +++++-
+ fs/f2fs/file.c | 10 ++-
+ fs/f2fs/gc.c | 43 ++++++++--
+ fs/f2fs/node.c | 4 +-
+ fs/f2fs/segment.c | 16 ++--
+ fs/f2fs/segment.h | 2 +-
+ fs/f2fs/super.c | 5 +-
+ fs/f2fs/sysfs.c | 7 ++
+ 13 files changed, 220 insertions(+), 86 deletions(-)
+Merging fuse/for-next (d233c7dd1682 fuse: fix revalidation of attributes for permission check)
+$ git merge fuse/for-next
+Merge made by the 'recursive' strategy.
+ fs/fuse/dir.c | 24 ++++++++++++++++++++++--
+ fs/fuse/file.c | 43 ++++++++++++++++++++++---------------------
+ fs/fuse/fuse_i.h | 2 +-
+ fs/fuse/inode.c | 2 +-
+ 4 files changed, 46 insertions(+), 25 deletions(-)
+Merging jfs/jfs-next (a83722f45c5b jfs: fix spelling mistake, EACCESS -> EACCES)
+$ git merge jfs/jfs-next
+Merge made by the 'recursive' strategy.
+ fs/jfs/namei.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging nfs/linux-next (5f179793f0a7 Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost)
+$ git merge nfs/linux-next
+Already up to date.
+Merging nfs-anna/linux-next (9f0c5124f4a8 NFS: Don't open code clearing of delegation state)
+$ git merge nfs-anna/linux-next
+Already up to date.
+Merging nfsd/nfsd-next (255fbca65137 nfsd: Return EPERM, not EACCES, in some SETATTR cases)
+$ git merge nfsd/nfsd-next
+Merge made by the 'recursive' strategy.
+ fs/lockd/clnt4xdr.c | 22 ++++--------
+ fs/lockd/clntxdr.c | 22 ++++--------
+ fs/nfsd/nfs4proc.c | 7 ++--
+ fs/nfsd/nfs4recover.c | 17 ++++-----
+ fs/nfsd/nfs4state.c | 10 +++---
+ fs/nfsd/nfsctl.c | 2 ++
+ fs/nfsd/vfs.c | 17 +++++++--
+ include/linux/sunrpc/svc_rdma.h | 1 +
+ net/sunrpc/cache.c | 10 +++++-
+ net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 63 +++++++++++++++++++++++++++++++++
+ net/sunrpc/xprtrdma/svc_rdma_sendto.c | 53 +++++++--------------------
+ 11 files changed, 128 insertions(+), 96 deletions(-)
+Merging orangefs/for-next (22fc9db296fc orangefs: no need to check for service_operation returns > 0)
+$ git merge orangefs/for-next
+Already up to date.
+Merging overlayfs/overlayfs-next (ec7ba118b940 Revert "ovl: relax permission checking on underlying layers")
+$ git merge overlayfs/overlayfs-next
+Merge made by the 'recursive' strategy.
+ fs/overlayfs/dir.c | 14 +++++++++++++-
+ fs/overlayfs/export.c | 6 +++---
+ fs/overlayfs/inode.c | 17 ++++-------------
+ 3 files changed, 20 insertions(+), 17 deletions(-)
+Merging ubifs/linux-next (001260910c46 ubifs: auth: add CONFIG_KEYS dependency)
+$ git merge ubifs/linux-next
+Merge made by the 'recursive' strategy.
+ fs/ubifs/Kconfig | 16 ++++++++--------
+ fs/ubifs/replay.c | 35 ++++++++++++++++++++++++-----------
+ 2 files changed, 32 insertions(+), 19 deletions(-)
+Merging v9fs/9p-next (7373bc7654c1 9p/net: put a lower bound on msize)
+$ git merge v9fs/9p-next
+Merge made by the 'recursive' strategy.
+ net/9p/client.c | 21 +++++++++++++++++++++
+ net/9p/trans_common.c | 1 +
+ 2 files changed, 22 insertions(+)
+Merging xfs/for-next (8f67b5adc030 iomap: partially revert 4721a601099 (simulated directio short read on EFAULT))
+$ git merge xfs/for-next
+Already up to date.
+Merging file-locks/locks-next (7bbd1fc0e9f1 fs/locks: remove unnecessary white space.)
+$ git merge file-locks/locks-next
+Auto-merging include/linux/fs.h
+Auto-merging fs/nfsd/nfs4state.c
+Auto-merging fs/cifs/file.c
+Merge made by the 'recursive' strategy.
+ fs/cifs/file.c | 4 +-
+ fs/gfs2/file.c | 10 +-
+ fs/lockd/svclock.c | 2 +-
+ fs/locks.c | 342 +++++++++++++++++++++++++---------------
+ fs/nfs/nfs4proc.c | 6 +-
+ fs/nfsd/nfs4state.c | 6 +-
+ fs/ocfs2/locks.c | 10 +-
+ include/linux/fs.h | 13 +-
+ include/trace/events/filelock.h | 16 +-
+ 9 files changed, 252 insertions(+), 157 deletions(-)
+Merging vfs/for-next (d708e87ca399 Merge branch 'work.mount' into for-next)
+$ git merge vfs/for-next
+Auto-merging security/tomoyo/tomoyo.c
+Auto-merging security/smack/smackfs.c
+Auto-merging security/smack/smack_lsm.c
+Auto-merging security/selinux/hooks.c
+Auto-merging security/security.c
+Auto-merging security/apparmor/lsm.c
+Auto-merging security/apparmor/apparmorfs.c
+Removing samples/statx/Makefile
+Auto-merging net/socket.c
+Auto-merging mm/zsmalloc.c
+Auto-merging mm/shmem.c
+Auto-merging kernel/trace/trace.c
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging ipc/mqueue.c
+Auto-merging init/do_mounts.c
+Auto-merging init/Kconfig
+Auto-merging include/uapi/linux/fs.h
+Auto-merging include/linux/syscalls.h
+Auto-merging include/linux/security.h
+Auto-merging include/linux/module.h
+Auto-merging include/linux/lsm_hooks.h
+Auto-merging include/linux/kernfs.h
+Auto-merging include/linux/fs.h
+CONFLICT (content): Merge conflict in include/linux/fs.h
+Auto-merging include/linux/cgroup.h
+Auto-merging fs/xfs/xfs_super.c
+Auto-merging fs/udf/super.c
+Auto-merging fs/ubifs/super.c
+Auto-merging fs/sysv/inode.c
+Auto-merging fs/super.c
+Auto-merging fs/pstore/inode.c
+Auto-merging fs/proc/inode.c
+CONFLICT (content): Merge conflict in fs/proc/inode.c
+Auto-merging fs/overlayfs/super.c
+Auto-merging fs/openpromfs/inode.c
+Auto-merging fs/nfsd/nfsctl.c
+Auto-merging fs/namespace.c
+Auto-merging fs/kernfs/mount.c
+Auto-merging fs/jfs/super.c
+Auto-merging fs/jffs2/super.c
+Auto-merging fs/gfs2/super.c
+Auto-merging fs/gfs2/ops_fstype.c
+Auto-merging fs/fuse/inode.c
+Auto-merging fs/fuse/control.c
+Auto-merging fs/fat/namei_vfat.c
+Auto-merging fs/fat/namei_msdos.c
+Auto-merging fs/fat/inode.c
+Auto-merging fs/f2fs/super.c
+CONFLICT (content): Merge conflict in fs/f2fs/super.c
+Auto-merging fs/ext4/super.c
+Auto-merging fs/ext2/super.c
+Auto-merging fs/cramfs/inode.c
+Auto-merging fs/compat_ioctl.c
+CONFLICT (content): Merge conflict in fs/compat_ioctl.c
+Auto-merging fs/cifs/cifsfs.c
+Auto-merging fs/cifs/cifs_dfs_ref.c
+Auto-merging fs/ceph/super.c
+Auto-merging fs/btrfs/tests/btrfs-tests.c
+Auto-merging fs/btrfs/super.c
+Auto-merging fs/bfs/inode.c
+Auto-merging fs/aio.c
+Auto-merging fs/afs/internal.h
+Auto-merging fs/Makefile
+CONFLICT (content): Merge conflict in fs/Makefile
+Auto-merging fs/Kconfig
+Auto-merging drivers/virtio/virtio_balloon.c
+Auto-merging drivers/vfio/Kconfig
+CONFLICT (content): Merge conflict in drivers/vfio/Kconfig
+Auto-merging drivers/usb/gadget/function/f_fs.c
+Auto-merging drivers/staging/erofs/super.c
+Auto-merging drivers/infiniband/Kconfig
+CONFLICT (content): Merge conflict in drivers/infiniband/Kconfig
+Auto-merging drivers/gpu/drm/drm_drv.c
+Auto-merging drivers/gpio/Kconfig
+Auto-merging drivers/dma-buf/Kconfig
+Auto-merging drivers/char/tpm/Kconfig
+Auto-merging drivers/base/devtmpfs.c
+Auto-merging arch/x86/kernel/setup.c
+Auto-merging arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/sparc/kernel/setup_64.c
+CONFLICT (content): Merge conflict in arch/sparc/kernel/setup_64.c
+Auto-merging arch/mips/kvm/Kconfig
+Auto-merging arch/arc/kernel/setup.c
+Resolved 'arch/sparc/kernel/setup_64.c' using previous resolution.
+Resolved 'drivers/infiniband/Kconfig' using previous resolution.
+Resolved 'drivers/vfio/Kconfig' using previous resolution.
+Resolved 'fs/Makefile' using previous resolution.
+Resolved 'fs/compat_ioctl.c' using previous resolution.
+Resolved 'fs/f2fs/super.c' using previous resolution.
+Resolved 'fs/proc/inode.c' using previous resolution.
+Resolved 'include/linux/fs.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 23d66db1fe03] Merge remote-tracking branch 'vfs/for-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/filesystems/mount_api.txt | 741 +++++++++++++++++++++++
+ arch/arc/kernel/setup.c | 1 +
+ arch/arm/kernel/atags_parse.c | 1 +
+ arch/arm/kvm/Kconfig | 1 -
+ arch/arm64/kvm/Kconfig | 1 -
+ arch/ia64/kernel/perfmon.c | 3 +-
+ arch/mips/kvm/Kconfig | 1 -
+ arch/powerpc/kvm/Kconfig | 1 -
+ arch/powerpc/platforms/cell/spufs/inode.c | 6 +-
+ arch/s390/hypfs/inode.c | 7 +-
+ arch/s390/kvm/Kconfig | 1 -
+ arch/sh/kernel/setup.c | 1 +
+ arch/sparc/kernel/setup_32.c | 1 +
+ arch/sparc/kernel/setup_64.c | 1 +
+ arch/x86/Kconfig | 1 -
+ arch/x86/entry/syscalls/syscall_32.tbl | 7 +
+ arch/x86/entry/syscalls/syscall_64.tbl | 7 +
+ arch/x86/kernel/cpu/intel_rdt.h | 15 +
+ arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 183 +++---
+ arch/x86/kernel/setup.c | 1 +
+ arch/x86/kvm/Kconfig | 1 -
+ drivers/base/Kconfig | 1 -
+ drivers/base/devtmpfs.c | 7 +-
+ drivers/char/tpm/Kconfig | 1 -
+ drivers/dax/super.c | 2 +-
+ drivers/dma-buf/Kconfig | 1 -
+ drivers/gpio/Kconfig | 1 -
+ drivers/gpu/drm/drm_drv.c | 3 +-
+ drivers/gpu/drm/i915/i915_gemfs.c | 2 +-
+ drivers/iio/Kconfig | 1 -
+ drivers/infiniband/Kconfig | 1 -
+ drivers/infiniband/hw/qib/qib_fs.c | 7 +-
+ drivers/misc/cxl/api.c | 3 +-
+ drivers/misc/ibmasm/ibmasmfs.c | 11 +-
+ drivers/mtd/mtdsuper.c | 26 +-
+ drivers/oprofile/oprofilefs.c | 8 +-
+ drivers/scsi/cxlflash/ocxl_hw.c | 2 +-
+ drivers/staging/erofs/super.c | 13 +-
+ drivers/usb/gadget/function/f_fs.c | 7 +-
+ drivers/usb/gadget/legacy/inode.c | 7 +-
+ drivers/vfio/Kconfig | 1 -
+ drivers/virtio/virtio_balloon.c | 2 +-
+ drivers/xen/xenfs/super.c | 7 +-
+ fs/9p/vfs_super.c | 2 +-
+ fs/Kconfig | 7 +
+ fs/Makefile | 3 +-
+ fs/adfs/super.c | 9 +-
+ fs/affs/super.c | 13 +-
+ fs/afs/internal.h | 10 +-
+ fs/afs/mntpt.c | 143 ++---
+ fs/afs/super.c | 634 +++++++++++++-------
+ fs/afs/volume.c | 4 +-
+ fs/aio.c | 3 +-
+ fs/anon_inodes.c | 3 +-
+ fs/autofs/autofs_i.h | 2 +-
+ fs/autofs/init.c | 4 +-
+ fs/autofs/inode.c | 3 +-
+ fs/befs/linuxvfs.c | 11 +-
+ fs/bfs/inode.c | 8 +-
+ fs/binfmt_misc.c | 7 +-
+ fs/block_dev.c | 2 +-
+ fs/btrfs/super.c | 30 +-
+ fs/btrfs/tests/btrfs-tests.c | 2 +-
+ fs/ceph/super.c | 3 +-
+ fs/cifs/cifs_dfs_ref.c | 3 +-
+ fs/cifs/cifsfs.c | 18 +-
+ fs/coda/inode.c | 11 +-
+ fs/compat_ioctl.c | 33 --
+ fs/configfs/mount.c | 7 +-
+ fs/cramfs/inode.c | 17 +-
+ fs/debugfs/inode.c | 14 +-
+ fs/devpts/inode.c | 10 +-
+ fs/ecryptfs/main.c | 2 +-
+ fs/efivarfs/super.c | 9 +-
+ fs/efs/super.c | 14 +-
+ fs/exofs/super.c | 7 +-
+ fs/ext2/super.c | 14 +-
+ fs/ext4/super.c | 16 +-
+ fs/f2fs/super.c | 11 +-
+ fs/fat/inode.c | 3 +-
+ fs/fat/namei_msdos.c | 8 +-
+ fs/fat/namei_vfat.c | 8 +-
+ fs/file_table.c | 9 +-
+ fs/filesystems.c | 4 +
+ fs/freevxfs/vxfs_super.c | 12 +-
+ fs/fs_context.c | 776 ++++++++++++++++++++++++
+ fs/fs_parser.c | 555 +++++++++++++++++
+ fs/fsopen.c | 568 ++++++++++++++++++
+ fs/fuse/control.c | 9 +-
+ fs/fuse/inode.c | 16 +-
+ fs/gfs2/ops_fstype.c | 6 +-
+ fs/gfs2/super.c | 4 +-
+ fs/hfs/super.c | 12 +-
+ fs/hfsplus/super.c | 12 +-
+ fs/hostfs/hostfs_kern.c | 7 +-
+ fs/hpfs/super.c | 11 +-
+ fs/hugetlbfs/inode.c | 454 +++++++++-----
+ fs/internal.h | 19 +-
+ fs/isofs/inode.c | 11 +-
+ fs/jffs2/super.c | 10 +-
+ fs/jfs/super.c | 11 +-
+ fs/kernfs/mount.c | 103 ++--
+ fs/libfs.c | 20 +-
+ fs/minix/inode.c | 14 +-
+ fs/namei.c | 4 +-
+ fs/namespace.c | 952 +++++++++++++++++++++++-------
+ fs/nfs/internal.h | 4 +-
+ fs/nfs/namespace.c | 3 +-
+ fs/nfs/nfs4namespace.c | 3 +-
+ fs/nfs/nfs4super.c | 27 +-
+ fs/nfs/super.c | 22 +-
+ fs/nfsd/nfsctl.c | 8 +-
+ fs/nilfs2/super.c | 10 +-
+ fs/notify/fanotify/Kconfig | 1 -
+ fs/notify/inotify/Kconfig | 1 -
+ fs/nsfs.c | 3 +-
+ fs/ntfs/super.c | 13 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 5 +-
+ fs/ocfs2/super.c | 14 +-
+ fs/omfs/inode.c | 9 +-
+ fs/openpromfs/inode.c | 11 +-
+ fs/orangefs/orangefs-kernel.h | 2 +-
+ fs/orangefs/super.c | 5 +-
+ fs/overlayfs/super.c | 11 +-
+ fs/pipe.c | 3 +-
+ fs/pnode.c | 1 +
+ fs/proc/inode.c | 52 +-
+ fs/proc/internal.h | 5 +-
+ fs/proc/root.c | 253 ++++++--
+ fs/pstore/inode.c | 10 +-
+ fs/qnx4/inode.c | 14 +-
+ fs/qnx6/inode.c | 14 +-
+ fs/ramfs/inode.c | 6 +-
+ fs/reiserfs/super.c | 14 +-
+ fs/romfs/super.c | 13 +-
+ fs/squashfs/super.c | 12 +-
+ fs/statfs.c | 587 ++++++++++++++++++
+ fs/super.c | 486 +++++++++++----
+ fs/sysfs/mount.c | 67 ++-
+ fs/sysv/inode.c | 3 +-
+ fs/sysv/super.c | 16 +-
+ fs/tracefs/inode.c | 10 +-
+ fs/ubifs/super.c | 5 +-
+ fs/udf/super.c | 16 +-
+ fs/ufs/super.c | 11 +-
+ fs/xfs/xfs_super.c | 10 +-
+ include/linux/cgroup.h | 3 +-
+ include/linux/debugfs.h | 8 +-
+ include/linux/errno.h | 1 +
+ include/linux/fs.h | 47 +-
+ include/linux/fs_context.h | 215 +++++++
+ include/linux/fs_parser.h | 119 ++++
+ include/linux/fsinfo.h | 41 ++
+ include/linux/kernfs.h | 43 +-
+ include/linux/lsm_hooks.h | 84 ++-
+ include/linux/module.h | 6 +
+ include/linux/mount.h | 10 +-
+ include/linux/mtd/super.h | 4 +-
+ include/linux/ramfs.h | 4 +-
+ include/linux/security.h | 70 ++-
+ include/linux/shmem_fs.h | 3 +-
+ include/linux/syscalls.h | 13 +
+ include/uapi/linux/fcntl.h | 2 +
+ include/uapi/linux/fs.h | 56 +-
+ include/uapi/linux/fsinfo.h | 303 ++++++++++
+ include/uapi/linux/mount.h | 120 ++++
+ init/Kconfig | 10 -
+ init/do_mounts.c | 5 +-
+ init/do_mounts_initrd.c | 1 +
+ ipc/mqueue.c | 106 +++-
+ ipc/namespace.c | 2 +-
+ kernel/bpf/inode.c | 7 +-
+ kernel/cgroup/cgroup-internal.h | 50 +-
+ kernel/cgroup/cgroup-v1.c | 413 ++++++++-----
+ kernel/cgroup/cgroup.c | 291 ++++++---
+ kernel/cgroup/cpuset.c | 85 ++-
+ kernel/trace/trace.c | 7 +-
+ mm/shmem.c | 10 +-
+ mm/zsmalloc.c | 3 +-
+ net/bluetooth/hci_sock.c | 32 +-
+ net/socket.c | 3 +-
+ net/sunrpc/rpc_pipe.c | 7 +-
+ samples/Kconfig | 9 +-
+ samples/Makefile | 2 +-
+ samples/statx/Makefile | 7 -
+ samples/vfs/Makefile | 16 +
+ samples/vfs/test-fs-query.c | 145 +++++
+ samples/vfs/test-fsinfo.c | 593 +++++++++++++++++++
+ samples/vfs/test-fsmount.c | 133 +++++
+ samples/{statx => vfs}/test-statx.c | 7 +-
+ security/apparmor/apparmorfs.c | 8 +-
+ security/apparmor/include/mount.h | 11 +-
+ security/apparmor/lsm.c | 111 +++-
+ security/apparmor/mount.c | 47 ++
+ security/inode.c | 7 +-
+ security/security.c | 64 +-
+ security/selinux/hooks.c | 388 ++++++++----
+ security/selinux/include/security.h | 16 +-
+ security/selinux/selinuxfs.c | 8 +-
+ security/smack/smack.h | 21 +-
+ security/smack/smack_lsm.c | 367 ++++++++++--
+ security/smack/smackfs.c | 9 +-
+ security/tomoyo/common.h | 3 +
+ security/tomoyo/mount.c | 46 ++
+ security/tomoyo/tomoyo.c | 19 +-
+ 205 files changed, 9721 insertions(+), 2063 deletions(-)
+ create mode 100644 Documentation/filesystems/mount_api.txt
+ create mode 100644 fs/fs_context.c
+ create mode 100644 fs/fs_parser.c
+ create mode 100644 fs/fsopen.c
+ create mode 100644 include/linux/fs_context.h
+ create mode 100644 include/linux/fs_parser.h
+ create mode 100644 include/linux/fsinfo.h
+ create mode 100644 include/uapi/linux/fsinfo.h
+ create mode 100644 include/uapi/linux/mount.h
+ delete mode 100644 samples/statx/Makefile
+ create mode 100644 samples/vfs/Makefile
+ create mode 100644 samples/vfs/test-fs-query.c
+ create mode 100644 samples/vfs/test-fsinfo.c
+ create mode 100644 samples/vfs/test-fsmount.c
+ rename samples/{statx => vfs}/test-statx.c (98%)
+Merging printk/for-next (9adcfaffc34d printk: Make printk_emit() local function.)
+$ git merge printk/for-next
+Auto-merging kernel/printk/printk.c
+Auto-merging kernel/panic.c
+Merge made by the 'recursive' strategy.
+ include/linux/printk.h | 5 -----
+ kernel/panic.c | 6 +++++-
+ kernel/printk/printk.c | 30 ++++++++++++++----------------
+ 3 files changed, 19 insertions(+), 22 deletions(-)
+Merging pci/next (c189eb40c3b9 Merge branch 'remotes/lorenzo/pci/mediatek')
+$ git merge pci/next
+Auto-merging drivers/pci/controller/dwc/pcie-designware-ep.c
+Auto-merging drivers/pci/controller/dwc/pci-layerscape.c
+Auto-merging drivers/pci/controller/dwc/pci-imx6.c
+Auto-merging drivers/pci/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 4 +-
+ MAINTAINERS | 1 +
+ arch/x86/pci/broadcom_bus.c | 4 +-
+ drivers/pci/Kconfig | 6 +-
+ drivers/pci/controller/dwc/Kconfig | 4 +-
+ drivers/pci/controller/dwc/pci-imx6.c | 92 ++++++++++++++++++-
+ drivers/pci/controller/dwc/pci-layerscape.c | 10 +-
+ drivers/pci/controller/dwc/pcie-armada8k.c | 16 ++++
+ drivers/pci/controller/dwc/pcie-designware-ep.c | 4 +
+ drivers/pci/controller/dwc/pcie-designware-host.c | 3 +
+ drivers/pci/controller/dwc/pcie-designware.c | 8 +-
+ drivers/pci/controller/dwc/pcie-designware.h | 28 +++++-
+ drivers/pci/controller/dwc/pcie-histb.c | 2 +-
+ drivers/pci/controller/pcie-mediatek.c | 101 ++++++---------------
+ include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 1 +
+ 15 files changed, 183 insertions(+), 101 deletions(-)
+Merging pstore/for-next/pstore (8665569e97dd pstore/ram: Avoid NULL deref in ftrace merging failure path)
+$ git merge pstore/for-next/pstore
+Auto-merging fs/pstore/inode.c
+Auto-merging arch/powerpc/kernel/nvram_64.c
+Merge made by the 'recursive' strategy.
+ arch/powerpc/kernel/nvram_64.c | 2 -
+ drivers/acpi/apei/erst.c | 3 +-
+ drivers/firmware/efi/efi-pstore.c | 4 +-
+ fs/pstore/ftrace.c | 2 +-
+ fs/pstore/inode.c | 51 +----------
+ fs/pstore/platform.c | 173 +++++++++++++++++++++-----------------
+ fs/pstore/ram.c | 63 ++++++--------
+ fs/pstore/ram_core.c | 45 ++++++++--
+ include/linux/pstore.h | 34 +++++---
+ include/linux/pstore_ram.h | 50 ++++++++++-
+ 10 files changed, 231 insertions(+), 196 deletions(-)
+Merging hid/for-next (11478e44de6f Merge branch 'for-4.21/highres-wheel' into for-next)
+$ git merge hid/for-next
+Merge made by the 'recursive' strategy.
+ Documentation/input/event-codes.rst | 21 +-
+ drivers/hid/hid-asus.c | 20 ++
+ drivers/hid/hid-core.c | 174 +++++++++++++++
+ drivers/hid/hid-cougar.c | 2 +
+ drivers/hid/hid-ids.h | 9 +
+ drivers/hid/hid-input.c | 108 +++++++++-
+ drivers/hid/hid-ite.c | 1 +
+ drivers/hid/hid-logitech-hidpp.c | 375 ++++++++++++++++++++++++++++++---
+ drivers/hid/hid-quirks.c | 2 +
+ drivers/hid/hidraw.c | 8 +-
+ include/linux/hid.h | 17 +-
+ include/uapi/linux/input-event-codes.h | 11 +
+ samples/hidraw/hid-example.c | 2 +-
+ 13 files changed, 705 insertions(+), 45 deletions(-)
+Merging i2c/i2c/for-next (0fce295d45bf Merge branch 'i2c/for-current-fixed' into i2c/for-next)
+$ git merge i2c/i2c/for-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/i2c/i2c-sh_mobile.txt | 9 +-
+ .../devicetree/bindings/i2c/i2c-stm32.txt | 6 +
+ drivers/i2c/busses/i2c-bcm2835.c | 10 +-
+ drivers/i2c/busses/i2c-ibm_iic.c | 2 +-
+ drivers/i2c/busses/i2c-imx.c | 3 +-
+ drivers/i2c/busses/i2c-sh_mobile.c | 1 +
+ drivers/i2c/busses/i2c-stm32f7.c | 182 +++++++++++++++------
+ 7 files changed, 155 insertions(+), 58 deletions(-)
+Merging i3c/i3c/next (afe120c777b7 ic3: off by one in mode_show())
+$ git merge i3c/i3c/next
+Auto-merging drivers/Kconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-bus-i3c | 146 ++
+ .../devicetree/bindings/i3c/cdns,i3c-master.txt | 43 +
+ Documentation/devicetree/bindings/i3c/i3c.txt | 138 +
+ .../devicetree/bindings/i3c/snps,dw-i3c-master.txt | 41 +
+ Documentation/driver-api/i3c/device-driver-api.rst | 9 +
+ Documentation/driver-api/i3c/index.rst | 11 +
+ Documentation/driver-api/i3c/master-driver-api.rst | 9 +
+ Documentation/driver-api/i3c/protocol.rst | 203 ++
+ Documentation/driver-api/index.rst | 1 +
+ MAINTAINERS | 18 +
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 2 +-
+ drivers/i3c/Kconfig | 24 +
+ drivers/i3c/Makefile | 4 +
+ drivers/i3c/device.c | 233 ++
+ drivers/i3c/internals.h | 26 +
+ drivers/i3c/master.c | 2659 ++++++++++++++++++++
+ drivers/i3c/master/Kconfig | 22 +
+ drivers/i3c/master/Makefile | 2 +
+ drivers/i3c/master/dw-i3c-master.c | 1216 +++++++++
+ drivers/i3c/master/i3c-master-cdns.c | 1666 ++++++++++++
+ include/linux/i3c/ccc.h | 385 +++
+ include/linux/i3c/device.h | 331 +++
+ include/linux/i3c/master.h | 648 +++++
+ include/linux/mod_devicetable.h | 17 +
+ 25 files changed, 7855 insertions(+), 1 deletion(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-bus-i3c
+ create mode 100644 Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt
+ create mode 100644 Documentation/devicetree/bindings/i3c/i3c.txt
+ create mode 100644 Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt
+ create mode 100644 Documentation/driver-api/i3c/device-driver-api.rst
+ create mode 100644 Documentation/driver-api/i3c/index.rst
+ create mode 100644 Documentation/driver-api/i3c/master-driver-api.rst
+ create mode 100644 Documentation/driver-api/i3c/protocol.rst
+ create mode 100644 drivers/i3c/Kconfig
+ create mode 100644 drivers/i3c/Makefile
+ create mode 100644 drivers/i3c/device.c
+ create mode 100644 drivers/i3c/internals.h
+ create mode 100644 drivers/i3c/master.c
+ create mode 100644 drivers/i3c/master/Kconfig
+ create mode 100644 drivers/i3c/master/Makefile
+ create mode 100644 drivers/i3c/master/dw-i3c-master.c
+ create mode 100644 drivers/i3c/master/i3c-master-cdns.c
+ create mode 100644 include/linux/i3c/ccc.h
+ create mode 100644 include/linux/i3c/device.h
+ create mode 100644 include/linux/i3c/master.h
+Merging dmi/master (57361846b52b Linux 4.19-rc2)
+$ git merge dmi/master
+Already up to date.
+Merging hwmon-staging/hwmon-next (82b0120681e0 hwmon: (ltc4215) Auto-convert to use SENSOR_DEVICE_ATTR_{RO, RW, WO})
+$ git merge hwmon-staging/hwmon-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/fsi/ibm,p9-occ.txt | 16 +
+ .../devicetree/bindings/hwmon/adm1275.txt | 25 +
+ Documentation/devicetree/bindings/hwmon/lm90.txt | 1 +
+ .../devicetree/bindings/hwmon/ntc_thermistor.txt | 1 +
+ Documentation/devicetree/bindings/hwmon/tmp108.txt | 4 +
+ .../devicetree/bindings/i2c/ibm,p8-occ-hwmon.txt | 25 +
+ Documentation/hwmon/adm1275 | 3 +
+ Documentation/hwmon/adt7475 | 12 +
+ Documentation/hwmon/hwmon-kernel-api.txt | 24 +-
+ Documentation/hwmon/ina2xx | 15 +
+ Documentation/hwmon/lm75 | 5 +
+ Documentation/hwmon/occ | 112 ++
+ drivers/fsi/Kconfig | 10 +
+ drivers/fsi/Makefile | 1 +
+ drivers/fsi/fsi-occ.c | 599 +++++++++++
+ drivers/hwmon/Kconfig | 246 ++---
+ drivers/hwmon/Makefile | 1 +
+ drivers/hwmon/dell-smm-hwmon.c | 7 +
+ drivers/hwmon/hwmon.c | 4 +-
+ drivers/hwmon/ina2xx.c | 36 +-
+ drivers/hwmon/ina3221.c | 198 +++-
+ drivers/hwmon/k10temp.c | 10 +-
+ drivers/hwmon/lm63.c | 1 -
+ drivers/hwmon/lm75.c | 10 +
+ drivers/hwmon/lm95234.c | 161 ++-
+ drivers/hwmon/ltc2945.c | 121 +--
+ drivers/hwmon/ltc4215.c | 42 +-
+ drivers/hwmon/ltc4260.c | 26 +-
+ drivers/hwmon/max6650.c | 31 +-
+ drivers/hwmon/max6697.c | 144 ++-
+ drivers/hwmon/mlxreg-fan.c | 2 +-
+ drivers/hwmon/nct7802.c | 408 +++-----
+ drivers/hwmon/ntc_thermistor.c | 184 ++--
+ drivers/hwmon/occ/Kconfig | 31 +
+ drivers/hwmon/occ/Makefile | 5 +
+ drivers/hwmon/occ/common.c | 1098 ++++++++++++++++++++
+ drivers/hwmon/occ/common.h | 128 +++
+ drivers/hwmon/occ/p8_i2c.c | 255 +++++
+ drivers/hwmon/occ/p9_sbe.c | 106 ++
+ drivers/hwmon/occ/sysfs.c | 188 ++++
+ drivers/hwmon/pmbus/adm1275.c | 15 +-
+ drivers/hwmon/pmbus/ltc2978.c | 2 +-
+ drivers/hwmon/pwm-fan.c | 10 +-
+ drivers/hwmon/tmp401.c | 126 +--
+ include/linux/fsi-occ.h | 25 +
+ include/linux/hwmon-sysfs.h | 39 +
+ include/linux/platform_data/ntc_thermistor.h | 5 +-
+ 47 files changed, 3635 insertions(+), 883 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/fsi/ibm,p9-occ.txt
+ create mode 100644 Documentation/devicetree/bindings/hwmon/adm1275.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/ibm,p8-occ-hwmon.txt
+ create mode 100644 Documentation/hwmon/occ
+ create mode 100644 drivers/fsi/fsi-occ.c
+ create mode 100644 drivers/hwmon/occ/Kconfig
+ create mode 100644 drivers/hwmon/occ/Makefile
+ create mode 100644 drivers/hwmon/occ/common.c
+ create mode 100644 drivers/hwmon/occ/common.h
+ create mode 100644 drivers/hwmon/occ/p8_i2c.c
+ create mode 100644 drivers/hwmon/occ/p9_sbe.c
+ create mode 100644 drivers/hwmon/occ/sysfs.c
+ create mode 100644 include/linux/fsi-occ.h
+Merging jc_docs/docs-next (f77af637f29d doc:process: add links where missing)
+$ git merge jc_docs/docs-next
+Auto-merging Documentation/x86/boot.txt
+Auto-merging Documentation/networking/rxrpc.txt
+Auto-merging Documentation/media/uapi/v4l/extended-controls.rst
+Auto-merging Documentation/filesystems/index.rst
+CONFLICT (content): Merge conflict in Documentation/filesystems/index.rst
+Auto-merging Documentation/admin-guide/security-bugs.rst
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'Documentation/filesystems/index.rst' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master ec79d131efbc] Merge remote-tracking branch 'jc_docs/docs-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/EDID/1024x768.S | 5 +-
+ Documentation/EDID/1280x1024.S | 5 +-
+ Documentation/EDID/1600x1200.S | 5 +-
+ Documentation/EDID/1680x1050.S | 5 +-
+ Documentation/EDID/1920x1080.S | 5 +-
+ Documentation/EDID/800x600.S | 5 +-
+ Documentation/EDID/HOWTO.txt | 13 +-
+ Documentation/EDID/Makefile | 15 +-
+ Documentation/EDID/edid.S | 10 +-
+ Documentation/admin-guide/devices.rst | 1 +
+ Documentation/admin-guide/dynamic-debug-howto.rst | 8 +-
+ Documentation/admin-guide/index.rst | 1 +
+ Documentation/admin-guide/kernel-parameters.txt | 2 +-
+ Documentation/admin-guide/mm/concepts.rst | 51 +-
+ Documentation/admin-guide/perf-security.rst | 97 ++
+ Documentation/admin-guide/ras.rst | 2 +-
+ Documentation/admin-guide/security-bugs.rst | 2 +-
+ Documentation/arm/Booting | 2 +-
+ Documentation/arm/Samsung-S3C24XX/GPIO.txt | 2 +-
+ Documentation/arm/Samsung-S3C24XX/Overview.txt | 2 +-
+ Documentation/arm/Samsung-S3C24XX/Suspend.txt | 2 +-
+ Documentation/core-api/assoc_array.rst | 6 +-
+ Documentation/core-api/memory-allocation.rst | 2 +
+ Documentation/core-api/mm-api.rst | 29 +-
+ Documentation/dev-tools/coccinelle.rst | 2 +
+ Documentation/dev-tools/index.rst | 4 +-
+ Documentation/dev-tools/kselftest.rst | 12 +-
+ Documentation/device-mapper/dm-raid.txt | 2 +-
+ .../devicetree/bindings/arm/idle-states.txt | 2 +-
+ .../devicetree/bindings/pci/host-generic-pci.txt | 2 +-
+ Documentation/devicetree/bindings/serial/rs485.txt | 2 +-
+ Documentation/doc-guide/kernel-doc.rst | 2 +-
+ Documentation/doc-guide/sphinx.rst | 2 +
+ Documentation/driver-api/dmaengine/dmatest.rst | 4 +
+ Documentation/driver-api/pm/devices.rst | 2 +
+ Documentation/driver-model/devres.txt | 7 +
+ Documentation/early-userspace/README | 2 +-
+ Documentation/filesystems/caching/backend-api.txt | 2 +-
+ Documentation/filesystems/caching/cachefiles.txt | 4 +-
+ Documentation/filesystems/caching/netfs-api.txt | 2 +-
+ Documentation/filesystems/caching/operations.txt | 2 +-
+ Documentation/filesystems/index.rst | 11 +
+ .../{path-lookup.md => path-lookup.rst} | 912 ++++++++--------
+ Documentation/filesystems/proc.txt | 13 +-
+ Documentation/filesystems/qnx6.txt | 4 +-
+ Documentation/filesystems/spufs.txt | 2 +-
+ Documentation/filesystems/vfs.txt | 2 +-
+ .../filesystems/xfs-self-describing-metadata.txt | 2 +-
+ Documentation/filesystems/xfs.txt | 2 +-
+ Documentation/gpu/drm-uapi.rst | 4 +-
+ Documentation/leds/leds-class.txt | 2 +-
+ Documentation/media/uapi/v4l/extended-controls.rst | 2 +-
+ Documentation/memory-barriers.txt | 22 +-
+ Documentation/networking/de4x5.txt | 2 +-
+ Documentation/networking/rxrpc.txt | 10 +-
+ Documentation/power/regulator/overview.txt | 2 +-
+ Documentation/process/1.Intro.rst | 2 +
+ Documentation/process/4.Coding.rst | 3 +-
+ Documentation/process/5.Posting.rst | 23 +-
+ Documentation/process/8.Conclusion.rst | 7 +-
+ Documentation/process/adding-syscalls.rst | 3 +
+ Documentation/process/changes.rst | 2 +-
+ Documentation/process/coding-style.rst | 2 +-
+ Documentation/process/howto.rst | 13 +-
+ Documentation/process/kernel-driver-statement.rst | 2 +
+ .../process/kernel-enforcement-statement.rst | 4 +-
+ Documentation/process/magic-number.rst | 2 +
+ Documentation/process/management-style.rst | 5 +-
+ Documentation/process/submitting-drivers.rst | 8 +-
+ Documentation/s390/3270.ChangeLog | 2 +-
+ Documentation/security/credentials.rst | 8 +-
+ Documentation/security/keys/request-key.rst | 2 +-
+ Documentation/serial/serial-rs485.txt | 2 +-
+ Documentation/sound/soc/dai.rst | 6 +-
+ Documentation/sound/soc/dpcm.rst | 2 +-
+ Documentation/static-keys.txt | 2 +-
+ Documentation/thermal/power_allocator.txt | 2 +-
+ Documentation/trace/ftrace.rst | 14 +-
+ .../translations/it_IT/admin-guide/README.rst | 12 +
+ .../it_IT/admin-guide/security-bugs.rst | 12 +
+ .../translations/it_IT/doc-guide/kernel-doc.rst | 2 +-
+ Documentation/translations/it_IT/index.rst | 1 +
+ .../translations/it_IT/kernel-hacking/locking.rst | 4 +-
+ .../translations/it_IT/process/1.Intro.rst | 297 ++++++
+ .../translations/it_IT/process/2.Process.rst | 531 ++++++++++
+ .../translations/it_IT/process/3.Early-stage.rst | 241 +++++
+ .../translations/it_IT/process/4.Coding.rst | 447 ++++++++
+ .../translations/it_IT/process/5.Posting.rst | 348 +++++++
+ .../translations/it_IT/process/6.Followthrough.rst | 240 +++++
+ .../it_IT/process/7.AdvancedTopics.rst | 191 ++++
+ .../translations/it_IT/process/8.Conclusion.rst | 85 ++
+ .../translations/it_IT/process/adding-syscalls.rst | 643 ++++++++++++
+ .../it_IT/process/applying-patches.rst | 13 +
+ .../translations/it_IT/process/changes.rst | 12 +
+ .../translations/it_IT/process/clang-format.rst | 197 ++++
+ .../translations/it_IT/process/code-of-conduct.rst | 12 +
+ .../translations/it_IT/process/coding-style.rst | 1094 ++++++++++++++++++++
+ .../it_IT/process/development-process.rst | 33 +
+ .../translations/it_IT/process/email-clients.rst | 12 +
+ Documentation/translations/it_IT/process/howto.rst | 655 ++++++++++++
+ Documentation/translations/it_IT/process/index.rst | 67 ++
+ .../translations/it_IT/process/kernel-docs.rst | 13 +
+ .../it_IT/process/kernel-driver-statement.rst | 211 ++++
+ .../it_IT/process/kernel-enforcement-statement.rst | 13 +
+ .../translations/it_IT/process/magic-number.rst | 170 +++
+ .../it_IT/process/maintainer-pgp-guide.rst | 13 +
+ .../it_IT/process/management-style.rst | 12 +
+ .../it_IT/process/stable-api-nonsense.rst | 13 +
+ .../it_IT/process/stable-kernel-rules.rst | 12 +
+ .../it_IT/process/submit-checklist.rst | 12 +
+ .../it_IT/process/submitting-drivers.rst | 12 +
+ .../it_IT/process/submitting-patches.rst | 13 +
+ .../it_IT/process/volatile-considered-harmful.rst | 134 +++
+ Documentation/vm/index.rst | 4 +-
+ Documentation/x86/boot.txt | 2 +-
+ include/linux/slab.h | 55 +-
+ scripts/kernel-doc | 13 +-
+ 117 files changed, 6650 insertions(+), 641 deletions(-)
+ create mode 100644 Documentation/admin-guide/perf-security.rst
+ rename Documentation/filesystems/{path-lookup.md => path-lookup.rst} (56%)
+ create mode 100644 Documentation/translations/it_IT/admin-guide/README.rst
+ create mode 100644 Documentation/translations/it_IT/admin-guide/security-bugs.rst
+ create mode 100644 Documentation/translations/it_IT/process/1.Intro.rst
+ create mode 100644 Documentation/translations/it_IT/process/2.Process.rst
+ create mode 100644 Documentation/translations/it_IT/process/3.Early-stage.rst
+ create mode 100644 Documentation/translations/it_IT/process/4.Coding.rst
+ create mode 100644 Documentation/translations/it_IT/process/5.Posting.rst
+ create mode 100644 Documentation/translations/it_IT/process/6.Followthrough.rst
+ create mode 100644 Documentation/translations/it_IT/process/7.AdvancedTopics.rst
+ create mode 100644 Documentation/translations/it_IT/process/8.Conclusion.rst
+ create mode 100644 Documentation/translations/it_IT/process/adding-syscalls.rst
+ create mode 100644 Documentation/translations/it_IT/process/applying-patches.rst
+ create mode 100644 Documentation/translations/it_IT/process/changes.rst
+ create mode 100644 Documentation/translations/it_IT/process/clang-format.rst
+ create mode 100644 Documentation/translations/it_IT/process/code-of-conduct.rst
+ create mode 100644 Documentation/translations/it_IT/process/coding-style.rst
+ create mode 100644 Documentation/translations/it_IT/process/development-process.rst
+ create mode 100644 Documentation/translations/it_IT/process/email-clients.rst
+ create mode 100644 Documentation/translations/it_IT/process/howto.rst
+ create mode 100644 Documentation/translations/it_IT/process/index.rst
+ create mode 100644 Documentation/translations/it_IT/process/kernel-docs.rst
+ create mode 100644 Documentation/translations/it_IT/process/kernel-driver-statement.rst
+ create mode 100644 Documentation/translations/it_IT/process/kernel-enforcement-statement.rst
+ create mode 100644 Documentation/translations/it_IT/process/magic-number.rst
+ create mode 100644 Documentation/translations/it_IT/process/maintainer-pgp-guide.rst
+ create mode 100644 Documentation/translations/it_IT/process/management-style.rst
+ create mode 100644 Documentation/translations/it_IT/process/stable-api-nonsense.rst
+ create mode 100644 Documentation/translations/it_IT/process/stable-kernel-rules.rst
+ create mode 100644 Documentation/translations/it_IT/process/submit-checklist.rst
+ create mode 100644 Documentation/translations/it_IT/process/submitting-drivers.rst
+ create mode 100644 Documentation/translations/it_IT/process/submitting-patches.rst
+ create mode 100644 Documentation/translations/it_IT/process/volatile-considered-harmful.rst
+Merging v4l-dvb/master (e159b6074c82 media: vimc: fix start stream when link is disabled)
+$ git merge v4l-dvb/master
+Auto-merging include/uapi/linux/videodev2.h
+Auto-merging drivers/staging/media/sunxi/cedrus/cedrus_hw.c
+Auto-merging drivers/media/v4l2-core/v4l2-ctrls.c
+Removing drivers/media/usb/dvb-usb/friio.h
+Removing drivers/media/usb/dvb-usb/friio.c
+Removing drivers/media/usb/dvb-usb/friio-fe.c
+Auto-merging drivers/media/platform/vivid/vivid-vid-out.c
+Auto-merging drivers/media/platform/vivid/vivid-vid-cap.c
+Auto-merging drivers/media/platform/vivid/vivid-vbi-cap.c
+Auto-merging drivers/media/platform/vicodec/vicodec-core.c
+Auto-merging drivers/media/common/videobuf2/videobuf2-v4l2.c
+Auto-merging drivers/media/common/videobuf2/videobuf2-core.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/media/uapi/v4l/extended-controls.rst
+Auto-merging Documentation/devicetree/bindings/media/cedrus.txt
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/media/cedrus.txt | 2 +
+ .../devicetree/bindings/media/i2c/mt9m111.txt | 13 +-
+ .../devicetree/bindings/media/i2c/sony,imx214.txt | 53 +
+ .../devicetree/bindings/media/qcom,venus.txt | 14 +-
+ .../devicetree/bindings/media/rcar_vin.txt | 2 +
+ .../bindings/media/renesas,rcar-csi2.txt | 2 +
+ .../devicetree/bindings/media/rockchip-vpu.txt | 29 +
+ .../devicetree/bindings/media/spi/sony-cxd2880.txt | 4 +
+ .../devicetree/bindings/media/sun6i-csi.txt | 59 ++
+ Documentation/media/.gitignore | 2 +
+ Documentation/media/Makefile | 2 +
+ Documentation/media/audio.h.rst.exceptions | 2 +
+ Documentation/media/ca.h.rst.exceptions | 2 +
+ Documentation/media/cec-drivers/index.rst | 2 +-
+ Documentation/media/cec-drivers/pulse8-cec.rst | 2 +
+ Documentation/media/cec.h.rst.exceptions | 2 +
+ Documentation/media/conf.py | 2 +
+ Documentation/media/conf_nitpick.py | 2 +
+ Documentation/media/dmx.h.rst.exceptions | 2 +
+ Documentation/media/dvb-drivers/avermedia.rst | 2 +
+ Documentation/media/dvb-drivers/bt8xx.rst | 2 +
+ Documentation/media/dvb-drivers/cards.rst | 2 +
+ Documentation/media/dvb-drivers/ci.rst | 2 +
+ Documentation/media/dvb-drivers/contributors.rst | 2 +
+ Documentation/media/dvb-drivers/dvb-usb.rst | 2 +
+ Documentation/media/dvb-drivers/faq.rst | 2 +
+ Documentation/media/dvb-drivers/frontends.rst | 2 +
+ Documentation/media/dvb-drivers/index.rst | 2 +-
+ Documentation/media/dvb-drivers/intro.rst | 2 +
+ Documentation/media/dvb-drivers/lmedm04.rst | 2 +
+ Documentation/media/dvb-drivers/opera-firmware.rst | 2 +
+ Documentation/media/dvb-drivers/technisat.rst | 2 +
+ Documentation/media/dvb-drivers/ttusb-dec.rst | 2 +
+ Documentation/media/dvb-drivers/udev.rst | 2 +
+ Documentation/media/frontend.h.rst.exceptions | 2 +
+ Documentation/media/index.rst | 2 +
+ Documentation/media/intro.rst | 2 +-
+ Documentation/media/kapi/cec-core.rst | 2 +
+ Documentation/media/kapi/csi2.rst | 2 +
+ Documentation/media/kapi/dtv-ca.rst | 2 +
+ Documentation/media/kapi/dtv-common.rst | 2 +
+ Documentation/media/kapi/dtv-core.rst | 2 +
+ Documentation/media/kapi/dtv-demux.rst | 2 +
+ Documentation/media/kapi/dtv-frontend.rst | 2 +
+ Documentation/media/kapi/dtv-net.rst | 2 +
+ Documentation/media/kapi/mc-core.rst | 2 +
+ Documentation/media/kapi/rc-core.rst | 2 +
+ Documentation/media/kapi/v4l2-async.rst | 2 +
+ Documentation/media/kapi/v4l2-clocks.rst | 2 +
+ Documentation/media/kapi/v4l2-common.rst | 2 +
+ Documentation/media/kapi/v4l2-controls.rst | 2 +
+ Documentation/media/kapi/v4l2-core.rst | 2 +
+ Documentation/media/kapi/v4l2-dev.rst | 2 +
+ Documentation/media/kapi/v4l2-device.rst | 2 +
+ Documentation/media/kapi/v4l2-dv-timings.rst | 2 +
+ Documentation/media/kapi/v4l2-event.rst | 1 +
+ Documentation/media/kapi/v4l2-fh.rst | 2 +
+ Documentation/media/kapi/v4l2-flash-led-class.rst | 2 +
+ Documentation/media/kapi/v4l2-fwnode.rst | 2 +
+ Documentation/media/kapi/v4l2-intro.rst | 2 +
+ Documentation/media/kapi/v4l2-mc.rst | 2 +
+ Documentation/media/kapi/v4l2-mediabus.rst | 2 +
+ Documentation/media/kapi/v4l2-mem2mem.rst | 2 +
+ Documentation/media/kapi/v4l2-rect.rst | 2 +
+ Documentation/media/kapi/v4l2-subdev.rst | 2 +
+ Documentation/media/kapi/v4l2-tuner.rst | 2 +
+ Documentation/media/kapi/v4l2-tveeprom.rst | 2 +
+ Documentation/media/kapi/v4l2-videobuf.rst | 2 +
+ Documentation/media/kapi/v4l2-videobuf2.rst | 2 +
+ Documentation/media/lirc.h.rst.exceptions | 2 +
+ Documentation/media/media.h.rst.exceptions | 2 +
+ Documentation/media/media_kapi.rst | 2 +-
+ Documentation/media/media_uapi.rst | 8 +-
+ Documentation/media/net.h.rst.exceptions | 2 +
+ Documentation/media/typical_media_device.svg | 10 +
+ Documentation/media/uapi/cec/cec-api.rst | 9 +-
+ Documentation/media/uapi/cec/cec-func-close.rst | 9 +-
+ Documentation/media/uapi/cec/cec-func-ioctl.rst | 9 +-
+ Documentation/media/uapi/cec/cec-func-open.rst | 9 +-
+ Documentation/media/uapi/cec/cec-func-poll.rst | 9 +-
+ Documentation/media/uapi/cec/cec-funcs.rst | 9 +
+ Documentation/media/uapi/cec/cec-header.rst | 9 +-
+ Documentation/media/uapi/cec/cec-intro.rst | 9 +
+ .../media/uapi/cec/cec-ioc-adap-g-caps.rst | 9 +-
+ .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 9 +-
+ .../media/uapi/cec/cec-ioc-adap-g-phys-addr.rst | 9 +-
+ Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 9 +-
+ Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 9 +-
+ Documentation/media/uapi/cec/cec-ioc-receive.rst | 9 +-
+ Documentation/media/uapi/cec/cec-pin-error-inj.rst | 9 +
+ .../uapi/dvb/audio-bilingual-channel-select.rst | 9 +-
+ .../media/uapi/dvb/audio-channel-select.rst | 9 +-
+ .../media/uapi/dvb/audio-clear-buffer.rst | 9 +-
+ Documentation/media/uapi/dvb/audio-continue.rst | 9 +-
+ Documentation/media/uapi/dvb/audio-fclose.rst | 9 +-
+ Documentation/media/uapi/dvb/audio-fopen.rst | 9 +-
+ Documentation/media/uapi/dvb/audio-fwrite.rst | 9 +-
+ .../media/uapi/dvb/audio-get-capabilities.rst | 9 +-
+ Documentation/media/uapi/dvb/audio-get-status.rst | 9 +-
+ Documentation/media/uapi/dvb/audio-pause.rst | 9 +-
+ Documentation/media/uapi/dvb/audio-play.rst | 9 +-
+ .../media/uapi/dvb/audio-select-source.rst | 9 +-
+ Documentation/media/uapi/dvb/audio-set-av-sync.rst | 9 +-
+ .../media/uapi/dvb/audio-set-bypass-mode.rst | 9 +-
+ Documentation/media/uapi/dvb/audio-set-id.rst | 9 +-
+ Documentation/media/uapi/dvb/audio-set-mixer.rst | 9 +-
+ Documentation/media/uapi/dvb/audio-set-mute.rst | 9 +-
+ .../media/uapi/dvb/audio-set-streamtype.rst | 9 +-
+ Documentation/media/uapi/dvb/audio-stop.rst | 9 +-
+ Documentation/media/uapi/dvb/audio.rst | 9 +-
+ Documentation/media/uapi/dvb/audio_data_types.rst | 9 +-
+ .../media/uapi/dvb/audio_function_calls.rst | 9 +-
+ Documentation/media/uapi/dvb/ca-fclose.rst | 9 +-
+ Documentation/media/uapi/dvb/ca-fopen.rst | 9 +-
+ Documentation/media/uapi/dvb/ca-get-cap.rst | 9 +-
+ Documentation/media/uapi/dvb/ca-get-descr-info.rst | 9 +-
+ Documentation/media/uapi/dvb/ca-get-msg.rst | 9 +-
+ Documentation/media/uapi/dvb/ca-get-slot-info.rst | 9 +-
+ Documentation/media/uapi/dvb/ca-reset.rst | 9 +-
+ Documentation/media/uapi/dvb/ca-send-msg.rst | 9 +-
+ Documentation/media/uapi/dvb/ca-set-descr.rst | 9 +-
+ Documentation/media/uapi/dvb/ca.rst | 9 +-
+ Documentation/media/uapi/dvb/ca_data_types.rst | 9 +-
+ Documentation/media/uapi/dvb/ca_function_calls.rst | 9 +-
+ Documentation/media/uapi/dvb/demux.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx-add-pid.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx-expbuf.rst | 9 +
+ Documentation/media/uapi/dvb/dmx-fclose.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx-fopen.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx-fread.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx-fwrite.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx-get-pes-pids.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx-get-stc.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx-mmap.rst | 9 +
+ Documentation/media/uapi/dvb/dmx-munmap.rst | 9 +
+ Documentation/media/uapi/dvb/dmx-qbuf.rst | 9 +
+ Documentation/media/uapi/dvb/dmx-querybuf.rst | 9 +
+ Documentation/media/uapi/dvb/dmx-remove-pid.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx-reqbufs.rst | 9 +
+ .../media/uapi/dvb/dmx-set-buffer-size.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx-set-filter.rst | 9 +-
+ .../media/uapi/dvb/dmx-set-pes-filter.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx-start.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx-stop.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx_fcalls.rst | 9 +-
+ Documentation/media/uapi/dvb/dmx_types.rst | 9 +-
+ .../media/uapi/dvb/dvb-fe-read-status.rst | 9 +-
+ .../media/uapi/dvb/dvb-frontend-event.rst | 9 +-
+ .../media/uapi/dvb/dvb-frontend-parameters.rst | 9 +-
+ Documentation/media/uapi/dvb/dvbapi.rst | 9 +-
+ Documentation/media/uapi/dvb/dvbproperty.rst | 9 +-
+ Documentation/media/uapi/dvb/dvbstb.svg | 27 +
+ Documentation/media/uapi/dvb/examples.rst | 9 +-
+ Documentation/media/uapi/dvb/fe-bandwidth-t.rst | 9 +-
+ .../media/uapi/dvb/fe-diseqc-recv-slave-reply.rst | 9 +-
+ .../media/uapi/dvb/fe-diseqc-reset-overload.rst | 9 +-
+ .../media/uapi/dvb/fe-diseqc-send-burst.rst | 9 +-
+ .../media/uapi/dvb/fe-diseqc-send-master-cmd.rst | 9 +-
+ .../uapi/dvb/fe-dishnetwork-send-legacy-cmd.rst | 9 +-
+ .../media/uapi/dvb/fe-enable-high-lnb-voltage.rst | 9 +-
+ Documentation/media/uapi/dvb/fe-get-event.rst | 9 +-
+ Documentation/media/uapi/dvb/fe-get-frontend.rst | 9 +-
+ Documentation/media/uapi/dvb/fe-get-info.rst | 9 +-
+ Documentation/media/uapi/dvb/fe-get-property.rst | 9 +-
+ Documentation/media/uapi/dvb/fe-read-ber.rst | 9 +-
+ .../media/uapi/dvb/fe-read-signal-strength.rst | 9 +-
+ Documentation/media/uapi/dvb/fe-read-snr.rst | 9 +-
+ Documentation/media/uapi/dvb/fe-read-status.rst | 9 +-
+ .../media/uapi/dvb/fe-read-uncorrected-blocks.rst | 9 +-
+ .../media/uapi/dvb/fe-set-frontend-tune-mode.rst | 9 +-
+ Documentation/media/uapi/dvb/fe-set-frontend.rst | 9 +-
+ Documentation/media/uapi/dvb/fe-set-tone.rst | 9 +-
+ Documentation/media/uapi/dvb/fe-set-voltage.rst | 9 +-
+ Documentation/media/uapi/dvb/fe-type-t.rst | 9 +-
+ .../media/uapi/dvb/fe_property_parameters.rst | 9 +-
+ Documentation/media/uapi/dvb/frontend-header.rst | 9 +
+ .../uapi/dvb/frontend-property-cable-systems.rst | 9 +-
+ .../dvb/frontend-property-satellite-systems.rst | 9 +-
+ .../dvb/frontend-property-terrestrial-systems.rst | 9 +-
+ .../media/uapi/dvb/frontend-stat-properties.rst | 9 +-
+ Documentation/media/uapi/dvb/frontend.rst | 9 +-
+ Documentation/media/uapi/dvb/frontend_f_close.rst | 9 +-
+ Documentation/media/uapi/dvb/frontend_f_open.rst | 9 +-
+ Documentation/media/uapi/dvb/frontend_fcalls.rst | 9 +-
+ .../media/uapi/dvb/frontend_legacy_api.rst | 9 +-
+ .../media/uapi/dvb/frontend_legacy_dvbv3_api.rst | 9 +-
+ Documentation/media/uapi/dvb/headers.rst | 9 +
+ Documentation/media/uapi/dvb/intro.rst | 9 +-
+ Documentation/media/uapi/dvb/legacy_dvb_apis.rst | 9 +-
+ Documentation/media/uapi/dvb/net-add-if.rst | 9 +-
+ Documentation/media/uapi/dvb/net-get-if.rst | 9 +-
+ Documentation/media/uapi/dvb/net-remove-if.rst | 9 +-
+ Documentation/media/uapi/dvb/net-types.rst | 9 +-
+ Documentation/media/uapi/dvb/net.rst | 9 +-
+ .../media/uapi/dvb/query-dvb-frontend-info.rst | 9 +-
+ .../media/uapi/dvb/video-clear-buffer.rst | 9 +-
+ Documentation/media/uapi/dvb/video-command.rst | 9 +-
+ Documentation/media/uapi/dvb/video-continue.rst | 9 +-
+ .../media/uapi/dvb/video-fast-forward.rst | 9 +-
+ Documentation/media/uapi/dvb/video-fclose.rst | 9 +-
+ Documentation/media/uapi/dvb/video-fopen.rst | 9 +-
+ Documentation/media/uapi/dvb/video-freeze.rst | 9 +-
+ Documentation/media/uapi/dvb/video-fwrite.rst | 9 +-
+ .../media/uapi/dvb/video-get-capabilities.rst | 9 +-
+ Documentation/media/uapi/dvb/video-get-event.rst | 9 +-
+ .../media/uapi/dvb/video-get-frame-count.rst | 9 +-
+ Documentation/media/uapi/dvb/video-get-pts.rst | 9 +-
+ Documentation/media/uapi/dvb/video-get-size.rst | 9 +-
+ Documentation/media/uapi/dvb/video-get-status.rst | 9 +-
+ Documentation/media/uapi/dvb/video-play.rst | 9 +-
+ .../media/uapi/dvb/video-select-source.rst | 9 +-
+ Documentation/media/uapi/dvb/video-set-blank.rst | 9 +-
+ .../media/uapi/dvb/video-set-display-format.rst | 9 +-
+ Documentation/media/uapi/dvb/video-set-format.rst | 9 +-
+ .../media/uapi/dvb/video-set-streamtype.rst | 9 +-
+ Documentation/media/uapi/dvb/video-slowmotion.rst | 9 +-
+ .../media/uapi/dvb/video-stillpicture.rst | 9 +-
+ Documentation/media/uapi/dvb/video-stop.rst | 9 +-
+ Documentation/media/uapi/dvb/video-try-command.rst | 9 +-
+ Documentation/media/uapi/dvb/video.rst | 9 +-
+ .../media/uapi/dvb/video_function_calls.rst | 9 +-
+ Documentation/media/uapi/dvb/video_types.rst | 9 +-
+ Documentation/media/uapi/fdl-appendix.rst | 9 +-
+ Documentation/media/uapi/gen-errors.rst | 9 +-
+ .../media/uapi/mediactl/media-controller-intro.rst | 9 +-
+ .../media/uapi/mediactl/media-controller-model.rst | 9 +-
+ .../media/uapi/mediactl/media-controller.rst | 9 +-
+ .../media/uapi/mediactl/media-func-close.rst | 9 +-
+ .../media/uapi/mediactl/media-func-ioctl.rst | 9 +-
+ .../media/uapi/mediactl/media-func-open.rst | 9 +-
+ Documentation/media/uapi/mediactl/media-funcs.rst | 9 +
+ Documentation/media/uapi/mediactl/media-header.rst | 9 +-
+ .../media/uapi/mediactl/media-ioc-device-info.rst | 9 +-
+ .../uapi/mediactl/media-ioc-enum-entities.rst | 9 +-
+ .../media/uapi/mediactl/media-ioc-enum-links.rst | 9 +-
+ .../media/uapi/mediactl/media-ioc-g-topology.rst | 9 +-
+ .../media/uapi/mediactl/media-ioc-setup-link.rst | 9 +-
+ Documentation/media/uapi/mediactl/media-types.rst | 9 +-
+ Documentation/media/uapi/rc/keytable.c.rst | 9 +-
+ Documentation/media/uapi/rc/lirc-dev-intro.rst | 9 +-
+ Documentation/media/uapi/rc/lirc-dev.rst | 9 +-
+ Documentation/media/uapi/rc/lirc-func.rst | 9 +-
+ Documentation/media/uapi/rc/lirc-get-features.rst | 9 +-
+ Documentation/media/uapi/rc/lirc-get-rec-mode.rst | 9 +-
+ .../media/uapi/rc/lirc-get-rec-resolution.rst | 9 +-
+ Documentation/media/uapi/rc/lirc-get-send-mode.rst | 9 +-
+ Documentation/media/uapi/rc/lirc-get-timeout.rst | 9 +-
+ Documentation/media/uapi/rc/lirc-header.rst | 9 +-
+ Documentation/media/uapi/rc/lirc-read.rst | 9 +-
+ .../uapi/rc/lirc-set-measure-carrier-mode.rst | 9 +-
+ .../media/uapi/rc/lirc-set-rec-carrier-range.rst | 9 +-
+ .../media/uapi/rc/lirc-set-rec-carrier.rst | 9 +-
+ .../media/uapi/rc/lirc-set-rec-timeout-reports.rst | 9 +-
+ .../media/uapi/rc/lirc-set-rec-timeout.rst | 9 +-
+ .../media/uapi/rc/lirc-set-send-carrier.rst | 9 +-
+ .../media/uapi/rc/lirc-set-send-duty-cycle.rst | 9 +-
+ .../media/uapi/rc/lirc-set-transmitter-mask.rst | 9 +-
+ .../media/uapi/rc/lirc-set-wideband-receiver.rst | 9 +-
+ Documentation/media/uapi/rc/lirc-write.rst | 9 +-
+ Documentation/media/uapi/rc/rc-intro.rst | 9 +-
+ Documentation/media/uapi/rc/rc-sysfs-nodes.rst | 9 +-
+ Documentation/media/uapi/rc/rc-table-change.rst | 9 +-
+ Documentation/media/uapi/rc/rc-tables.rst | 9 +-
+ Documentation/media/uapi/rc/remote_controllers.rst | 9 +-
+ Documentation/media/uapi/v4l/app-pri.rst | 11 +-
+ Documentation/media/uapi/v4l/async.rst | 9 +-
+ Documentation/media/uapi/v4l/audio.rst | 11 +-
+ Documentation/media/uapi/v4l/bayer.svg | 27 +
+ Documentation/media/uapi/v4l/biblio.rst | 9 +-
+ Documentation/media/uapi/v4l/buffer.rst | 9 +-
+ Documentation/media/uapi/v4l/capture-example.rst | 9 +-
+ Documentation/media/uapi/v4l/capture.c.rst | 9 +-
+ Documentation/media/uapi/v4l/colorspaces-defs.rst | 9 +-
+ .../media/uapi/v4l/colorspaces-details.rst | 9 +-
+ Documentation/media/uapi/v4l/colorspaces.rst | 9 +-
+ Documentation/media/uapi/v4l/common-defs.rst | 9 +-
+ Documentation/media/uapi/v4l/common.rst | 9 +-
+ Documentation/media/uapi/v4l/compat.rst | 9 +-
+ Documentation/media/uapi/v4l/constraints.svg | 27 +
+ Documentation/media/uapi/v4l/control.rst | 9 +-
+ Documentation/media/uapi/v4l/crop.rst | 9 +-
+ Documentation/media/uapi/v4l/crop.svg | 10 +-
+ Documentation/media/uapi/v4l/depth-formats.rst | 10 +-
+ Documentation/media/uapi/v4l/dev-capture.rst | 11 +-
+ Documentation/media/uapi/v4l/dev-codec.rst | 9 +-
+ Documentation/media/uapi/v4l/dev-effect.rst | 9 +-
+ Documentation/media/uapi/v4l/dev-event.rst | 9 +-
+ Documentation/media/uapi/v4l/dev-meta.rst | 9 +-
+ Documentation/media/uapi/v4l/dev-osd.rst | 9 +-
+ Documentation/media/uapi/v4l/dev-output.rst | 9 +-
+ Documentation/media/uapi/v4l/dev-overlay.rst | 9 +-
+ Documentation/media/uapi/v4l/dev-radio.rst | 9 +-
+ Documentation/media/uapi/v4l/dev-raw-vbi.rst | 9 +-
+ Documentation/media/uapi/v4l/dev-rds.rst | 9 +-
+ Documentation/media/uapi/v4l/dev-sdr.rst | 9 +-
+ Documentation/media/uapi/v4l/dev-sliced-vbi.rst | 9 +-
+ Documentation/media/uapi/v4l/dev-subdev.rst | 9 +-
+ Documentation/media/uapi/v4l/dev-teletext.rst | 11 +-
+ Documentation/media/uapi/v4l/dev-touch.rst | 9 +-
+ Documentation/media/uapi/v4l/devices.rst | 9 +-
+ Documentation/media/uapi/v4l/diff-v4l.rst | 9 +-
+ Documentation/media/uapi/v4l/dmabuf.rst | 9 +-
+ Documentation/media/uapi/v4l/dv-timings.rst | 9 +-
+ Documentation/media/uapi/v4l/extended-controls.rst | 15 +-
+ Documentation/media/uapi/v4l/field-order.rst | 9 +-
+ Documentation/media/uapi/v4l/fieldseq_bt.svg | 12 +-
+ Documentation/media/uapi/v4l/fieldseq_tb.svg | 12 +-
+ Documentation/media/uapi/v4l/format.rst | 11 +-
+ Documentation/media/uapi/v4l/func-close.rst | 9 +-
+ Documentation/media/uapi/v4l/func-ioctl.rst | 9 +-
+ Documentation/media/uapi/v4l/func-mmap.rst | 9 +-
+ Documentation/media/uapi/v4l/func-munmap.rst | 9 +-
+ Documentation/media/uapi/v4l/func-open.rst | 9 +-
+ Documentation/media/uapi/v4l/func-poll.rst | 9 +-
+ Documentation/media/uapi/v4l/func-read.rst | 9 +-
+ Documentation/media/uapi/v4l/func-select.rst | 9 +-
+ Documentation/media/uapi/v4l/func-write.rst | 9 +-
+ Documentation/media/uapi/v4l/hist-v4l2.rst | 9 +-
+ Documentation/media/uapi/v4l/hsv-formats.rst | 9 +-
+ Documentation/media/uapi/v4l/io.rst | 9 +-
+ .../media/uapi/v4l/libv4l-introduction.rst | 9 +-
+ Documentation/media/uapi/v4l/libv4l.rst | 9 +-
+ Documentation/media/uapi/v4l/meta-formats.rst | 9 +-
+ Documentation/media/uapi/v4l/mmap.rst | 31 +-
+ Documentation/media/uapi/v4l/nv12mt.svg | 27 +
+ Documentation/media/uapi/v4l/nv12mt_example.svg | 27 +
+ Documentation/media/uapi/v4l/open.rst | 11 +-
+ Documentation/media/uapi/v4l/pipeline.dot | 2 +
+ Documentation/media/uapi/v4l/pixfmt-cnf4.rst | 31 +
+ Documentation/media/uapi/v4l/pixfmt-compressed.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-grey.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-indexed.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-intro.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-inzi.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-m420.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-meta-uvc.rst | 9 +-
+ .../media/uapi/v4l/pixfmt-meta-vsp1-hgo.rst | 9 +-
+ .../media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-nv12.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-nv12m.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-nv12mt.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-nv16.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-nv16m.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-nv24.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-reserved.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-rgb.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-sdr-cs08.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-sdr-cs14le.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-sdr-cu08.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-sdr-cu16le.rst | 9 +-
+ .../media/uapi/v4l/pixfmt-sdr-pcu16be.rst | 9 +-
+ .../media/uapi/v4l/pixfmt-sdr-pcu18be.rst | 9 +-
+ .../media/uapi/v4l/pixfmt-sdr-pcu20be.rst | 10 +-
+ Documentation/media/uapi/v4l/pixfmt-sdr-ru12le.rst | 9 +-
+ .../media/uapi/v4l/pixfmt-srggb10-ipu3.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-srggb10.rst | 9 +-
+ .../media/uapi/v4l/pixfmt-srggb10alaw8.rst | 9 +-
+ .../media/uapi/v4l/pixfmt-srggb10dpcm8.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-srggb10p.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-srggb12.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-srggb12p.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-srggb14p.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-srggb16.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-srggb8.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-tch-td08.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-tch-td16.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-tch-tu08.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-tch-tu16.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-uv8.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-uyvy.rst | 9 +-
+ .../media/uapi/v4l/pixfmt-v4l2-mplane.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-v4l2.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-vyuy.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-y10.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-y10b.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-y10p.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-y12.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-y12i.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-y16-be.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-y16.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-y41p.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-y8i.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-yuv410.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-yuv411p.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-yuv420.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-yuv420m.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-yuv422m.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-yuv422p.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-yuv444m.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-yuyv.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-yvyu.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt-z16.rst | 9 +-
+ Documentation/media/uapi/v4l/pixfmt.rst | 9 +-
+ Documentation/media/uapi/v4l/planar-apis.rst | 9 +-
+ Documentation/media/uapi/v4l/querycap.rst | 9 +-
+ Documentation/media/uapi/v4l/rw.rst | 9 +-
+ Documentation/media/uapi/v4l/sdr-formats.rst | 9 +-
+ .../media/uapi/v4l/selection-api-configuration.rst | 9 +-
+ .../media/uapi/v4l/selection-api-examples.rst | 9 +-
+ .../media/uapi/v4l/selection-api-intro.rst | 9 +-
+ .../media/uapi/v4l/selection-api-targets.rst | 9 +-
+ .../media/uapi/v4l/selection-api-vs-crop-api.rst | 9 +-
+ Documentation/media/uapi/v4l/selection-api.rst | 9 +-
+ Documentation/media/uapi/v4l/selection.svg | 27 +
+ Documentation/media/uapi/v4l/selections-common.rst | 9 +-
+ Documentation/media/uapi/v4l/standard.rst | 9 +-
+ Documentation/media/uapi/v4l/streaming-par.rst | 9 +-
+ Documentation/media/uapi/v4l/subdev-formats.rst | 9 +-
+ .../uapi/v4l/subdev-image-processing-crop.svg | 10 +
+ .../uapi/v4l/subdev-image-processing-full.svg | 10 +
+ ...ubdev-image-processing-scaling-multi-source.svg | 10 +
+ Documentation/media/uapi/v4l/tch-formats.rst | 9 +-
+ Documentation/media/uapi/v4l/tuner.rst | 13 +-
+ Documentation/media/uapi/v4l/user-func.rst | 9 +-
+ Documentation/media/uapi/v4l/userp.rst | 17 +-
+ .../media/uapi/v4l/v4l2-selection-flags.rst | 9 +-
+ .../media/uapi/v4l/v4l2-selection-targets.rst | 16 +-
+ Documentation/media/uapi/v4l/v4l2.rst | 9 +-
+ Documentation/media/uapi/v4l/v4l2grab-example.rst | 9 +-
+ Documentation/media/uapi/v4l/v4l2grab.c.rst | 9 +-
+ Documentation/media/uapi/v4l/vbi_525.svg | 12 +-
+ Documentation/media/uapi/v4l/vbi_625.svg | 12 +-
+ Documentation/media/uapi/v4l/vbi_hsync.svg | 12 +-
+ Documentation/media/uapi/v4l/video.rst | 13 +-
+ Documentation/media/uapi/v4l/videodev.rst | 9 +-
+ .../media/uapi/v4l/vidioc-create-bufs.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-cropcap.rst | 9 +-
+ .../media/uapi/v4l/vidioc-dbg-g-chip-info.rst | 9 +-
+ .../media/uapi/v4l/vidioc-dbg-g-register.rst | 9 +-
+ .../media/uapi/v4l/vidioc-decoder-cmd.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-dqevent.rst | 9 +-
+ .../media/uapi/v4l/vidioc-dv-timings-cap.rst | 9 +-
+ .../media/uapi/v4l/vidioc-encoder-cmd.rst | 9 +-
+ .../media/uapi/v4l/vidioc-enum-dv-timings.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 17 +-
+ .../media/uapi/v4l/vidioc-enum-frameintervals.rst | 9 +-
+ .../media/uapi/v4l/vidioc-enum-framesizes.rst | 9 +-
+ .../media/uapi/v4l/vidioc-enum-freq-bands.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-enumaudio.rst | 9 +-
+ .../media/uapi/v4l/vidioc-enumaudioout.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-enuminput.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-enumoutput.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-enumstd.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-expbuf.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-g-audio.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-g-audioout.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-g-crop.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-g-ctrl.rst | 9 +-
+ .../media/uapi/v4l/vidioc-g-dv-timings.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-g-edid.rst | 9 +-
+ .../media/uapi/v4l/vidioc-g-enc-index.rst | 9 +-
+ .../media/uapi/v4l/vidioc-g-ext-ctrls.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-g-fbuf.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-g-fmt.rst | 9 +-
+ .../media/uapi/v4l/vidioc-g-frequency.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-g-input.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-g-jpegcomp.rst | 9 +-
+ .../media/uapi/v4l/vidioc-g-modulator.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-g-output.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-g-parm.rst | 12 +-
+ Documentation/media/uapi/v4l/vidioc-g-priority.rst | 9 +-
+ .../media/uapi/v4l/vidioc-g-selection.rst | 9 +-
+ .../media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-g-std.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-g-tuner.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-log-status.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-overlay.rst | 9 +-
+ .../media/uapi/v4l/vidioc-prepare-buf.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-qbuf.rst | 9 +-
+ .../media/uapi/v4l/vidioc-query-dv-timings.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-querybuf.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-querycap.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-querystd.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-reqbufs.rst | 26 +-
+ .../media/uapi/v4l/vidioc-s-hw-freq-seek.rst | 9 +-
+ Documentation/media/uapi/v4l/vidioc-streamon.rst | 9 +-
+ .../uapi/v4l/vidioc-subdev-enum-frame-interval.rst | 9 +-
+ .../uapi/v4l/vidioc-subdev-enum-frame-size.rst | 9 +-
+ .../uapi/v4l/vidioc-subdev-enum-mbus-code.rst | 9 +-
+ .../media/uapi/v4l/vidioc-subdev-g-crop.rst | 9 +-
+ .../media/uapi/v4l/vidioc-subdev-g-fmt.rst | 9 +-
+ .../uapi/v4l/vidioc-subdev-g-frame-interval.rst | 12 +-
+ .../media/uapi/v4l/vidioc-subdev-g-selection.rst | 9 +-
+ .../media/uapi/v4l/vidioc-subscribe-event.rst | 9 +-
+ Documentation/media/uapi/v4l/yuv-formats.rst | 9 +-
+ .../media/v4l-drivers/au0828-cardlist.rst | 2 +
+ Documentation/media/v4l-drivers/bttv-cardlist.rst | 2 +
+ Documentation/media/v4l-drivers/bttv.rst | 2 +
+ Documentation/media/v4l-drivers/cafe_ccic.rst | 2 +
+ Documentation/media/v4l-drivers/cardlist.rst | 2 +
+ Documentation/media/v4l-drivers/cpia2.rst | 2 +
+ Documentation/media/v4l-drivers/cx18.rst | 2 +
+ Documentation/media/v4l-drivers/cx2341x.rst | 2 +
+ .../media/v4l-drivers/cx23885-cardlist.rst | 2 +
+ Documentation/media/v4l-drivers/cx88-cardlist.rst | 2 +
+ Documentation/media/v4l-drivers/cx88.rst | 2 +
+ Documentation/media/v4l-drivers/davinci-vpbe.rst | 2 +
+ .../media/v4l-drivers/em28xx-cardlist.rst | 4 +-
+ Documentation/media/v4l-drivers/fimc.rst | 2 +
+ Documentation/media/v4l-drivers/fourcc.rst | 2 +
+ Documentation/media/v4l-drivers/gspca-cardlist.rst | 2 +
+ Documentation/media/v4l-drivers/imx.rst | 2 +
+ Documentation/media/v4l-drivers/index.rst | 2 +-
+ Documentation/media/v4l-drivers/ivtv-cardlist.rst | 2 +
+ Documentation/media/v4l-drivers/ivtv.rst | 1 +
+ Documentation/media/v4l-drivers/max2175.rst | 2 +
+ Documentation/media/v4l-drivers/meye.rst | 2 +
+ Documentation/media/v4l-drivers/omap3isp.rst | 2 +
+ Documentation/media/v4l-drivers/omap4_camera.rst | 2 +
+ Documentation/media/v4l-drivers/philips.rst | 2 +
+ Documentation/media/v4l-drivers/pvrusb2.rst | 2 +
+ Documentation/media/v4l-drivers/pxa_camera.rst | 2 +
+ Documentation/media/v4l-drivers/qcom_camss.rst | 2 +
+ .../media/v4l-drivers/qcom_camss_8x96_graph.dot | 2 +
+ .../media/v4l-drivers/qcom_camss_graph.dot | 2 +
+ Documentation/media/v4l-drivers/radiotrack.rst | 2 +
+ Documentation/media/v4l-drivers/rcar-fdp1.rst | 2 +
+ .../media/v4l-drivers/saa7134-cardlist.rst | 2 +
+ Documentation/media/v4l-drivers/saa7134.rst | 2 +
+ .../media/v4l-drivers/saa7164-cardlist.rst | 2 +
+ .../media/v4l-drivers/sh_mobile_ceu_camera.rst | 4 +-
+ Documentation/media/v4l-drivers/si470x.rst | 2 +
+ Documentation/media/v4l-drivers/si4713.rst | 2 +
+ Documentation/media/v4l-drivers/si476x.rst | 2 +
+ Documentation/media/v4l-drivers/soc-camera.rst | 2 +
+ .../media/v4l-drivers/tm6000-cardlist.rst | 2 +
+ Documentation/media/v4l-drivers/tuner-cardlist.rst | 2 +
+ Documentation/media/v4l-drivers/tuners.rst | 2 +
+ .../media/v4l-drivers/usbvision-cardlist.rst | 2 +
+ Documentation/media/v4l-drivers/uvcvideo.rst | 2 +
+ Documentation/media/v4l-drivers/v4l-with-ir.rst | 2 +
+ Documentation/media/v4l-drivers/vivid.rst | 2 +
+ Documentation/media/v4l-drivers/zoran.rst | 2 +
+ Documentation/media/v4l-drivers/zr364xx.rst | 2 +
+ Documentation/media/video.h.rst.exceptions | 2 +
+ Documentation/media/videodev2.h.rst.exceptions | 2 +
+ MAINTAINERS | 45 +-
+ drivers/media/cec/cec-adap.c | 34 +-
+ drivers/media/cec/cec-core.c | 6 +
+ drivers/media/cec/cec-pin.c | 5 +-
+ drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 2 +-
+ drivers/media/common/videobuf2/videobuf2-core.c | 25 +-
+ drivers/media/common/videobuf2/videobuf2-v4l2.c | 3 +-
+ drivers/media/dvb-core/dvb_frontend.c | 11 +-
+ drivers/media/dvb-frontends/af9033.c | 12 +-
+ drivers/media/dvb-frontends/dib0090.c | 32 +-
+ drivers/media/dvb-frontends/dib7000p.c | 7 +-
+ drivers/media/dvb-frontends/lgdt3306a.c | 6 +-
+ drivers/media/dvb-frontends/mxl5xx.c | 2 +-
+ drivers/media/dvb-frontends/tda18271c2dd.c | 1 -
+ drivers/media/firewire/firedtv-avc.c | 6 +-
+ drivers/media/firewire/firedtv.h | 6 +-
+ drivers/media/i2c/Kconfig | 15 +
+ drivers/media/i2c/Makefile | 1 +
+ drivers/media/i2c/ad9389b.c | 2 +-
+ drivers/media/i2c/adv7180.c | 15 +
+ drivers/media/i2c/adv7511.c | 2 +-
+ drivers/media/i2c/adv7604.c | 68 +-
+ drivers/media/i2c/adv7842.c | 4 +-
+ drivers/media/i2c/imx214.c | 1118 ++++++++++++++++++++
+ drivers/media/i2c/imx258.c | 28 +-
+ drivers/media/i2c/imx274.c | 9 +-
+ drivers/media/i2c/imx319.c | 8 +-
+ drivers/media/i2c/imx355.c | 8 +-
+ drivers/media/i2c/mt9m111.c | 266 ++++-
+ drivers/media/i2c/ov13858.c | 6 +-
+ drivers/media/i2c/ov2640.c | 21 +-
+ drivers/media/i2c/ov2680.c | 12 +-
+ drivers/media/i2c/ov5640.c | 771 ++++++++------
+ drivers/media/i2c/ov5645.c | 2 +-
+ drivers/media/i2c/ov7670.c | 6 +-
+ drivers/media/i2c/ov772x.c | 7 +-
+ drivers/media/i2c/ov7740.c | 4 +-
+ drivers/media/i2c/tc358743.c | 2 +-
+ drivers/media/i2c/tda7432.c | 4 +-
+ drivers/media/i2c/ths8200.c | 2 +-
+ drivers/media/i2c/tvp5150.c | 2 +-
+ drivers/media/i2c/video-i2c.c | 300 +++++-
+ drivers/media/pci/b2c2/flexcop-dma.c | 70 +-
+ drivers/media/pci/bt8xx/bttv-driver.c | 12 +-
+ drivers/media/pci/cobalt/cobalt-v4l2.c | 48 +-
+ drivers/media/pci/cx18/cx18-ioctl.c | 13 +-
+ drivers/media/pci/cx23885/cx23885-i2c.c | 1 -
+ drivers/media/pci/cx23885/cx23885-video.c | 40 +-
+ drivers/media/pci/ddbridge/ddbridge.h | 52 +-
+ drivers/media/pci/intel/ipu3/ipu3-cio2.h | 2 -
+ drivers/media/pci/ivtv/ivtv-ioctl.c | 17 +-
+ drivers/media/pci/mantis/mantis_cards.c | 1 -
+ drivers/media/pci/saa7134/saa7134-core.c | 8 +-
+ drivers/media/pci/saa7134/saa7134-input.c | 115 +-
+ drivers/media/pci/saa7134/saa7134-video.c | 21 +-
+ drivers/media/pci/saa7134/saa7134.h | 10 +-
+ drivers/media/platform/Kconfig | 23 +
+ drivers/media/platform/Makefile | 4 +
+ drivers/media/platform/am437x/am437x-vpfe.c | 31 +-
+ drivers/media/platform/coda/coda-bit.c | 132 +--
+ drivers/media/platform/coda/coda-common.c | 246 +++--
+ drivers/media/platform/coda/coda.h | 34 +-
+ drivers/media/platform/coda/coda_regs.h | 2 +-
+ drivers/media/platform/coda/trace.h | 10 +-
+ drivers/media/platform/davinci/vpbe.c | 30 +-
+ drivers/media/platform/davinci/vpbe_display.c | 10 +-
+ drivers/media/platform/davinci/vpfe_capture.c | 12 +-
+ drivers/media/platform/exynos-gsc/gsc-core.c | 57 +-
+ drivers/media/platform/exynos-gsc/gsc-core.h | 3 +-
+ drivers/media/platform/exynos-gsc/gsc-m2m.c | 23 +-
+ drivers/media/platform/exynos4-is/fimc-core.h | 6 +-
+ drivers/media/platform/exynos4-is/fimc-is-errno.c | 4 +-
+ drivers/media/platform/exynos4-is/fimc-is-errno.h | 2 +-
+ drivers/media/platform/exynos4-is/fimc-m2m.c | 130 ++-
+ drivers/media/platform/exynos4-is/media-dev.c | 12 +-
+ drivers/media/platform/imx-pxp.c | 18 +-
+ drivers/media/platform/marvell-ccic/cafe-driver.c | 2 +-
+ drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 6 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_enc_pm.c | 10 +-
+ .../media/platform/mtk-vcodec/mtk_vcodec_util.h | 5 +
+ drivers/media/platform/mtk-vcodec/venc_drv_if.h | 2 +-
+ drivers/media/platform/qcom/camss/camss-vfe.c | 23 +-
+ drivers/media/platform/qcom/camss/camss.c | 2 +-
+ drivers/media/platform/qcom/camss/camss.h | 1 +
+ drivers/media/platform/qcom/venus/core.c | 32 +-
+ drivers/media/platform/qcom/venus/core.h | 6 +
+ drivers/media/platform/qcom/venus/firmware.c | 235 +++-
+ drivers/media/platform/qcom/venus/firmware.h | 17 +-
+ drivers/media/platform/qcom/venus/hfi_cmds.c | 2 +-
+ drivers/media/platform/qcom/venus/hfi_venus.c | 15 +-
+ drivers/media/platform/qcom/venus/hfi_venus_io.h | 8 +
+ drivers/media/platform/qcom/venus/vdec.c | 4 +-
+ drivers/media/platform/qcom/venus/venc.c | 23 +-
+ drivers/media/platform/qcom/venus/venc_ctrls.c | 36 +-
+ drivers/media/platform/rcar-vin/rcar-core.c | 52 +
+ drivers/media/platform/rcar-vin/rcar-csi2.c | 97 +-
+ drivers/media/platform/rcar-vin/rcar-v4l2.c | 10 +-
+ drivers/media/platform/rockchip/rga/rga.c | 4 +-
+ drivers/media/platform/s5p-g2d/g2d.c | 102 +-
+ drivers/media/platform/s5p-mfc/s5p_mfc.c | 1 +
+ drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 49 +-
+ drivers/media/platform/seco-cec/Makefile | 1 +
+ drivers/media/platform/seco-cec/seco-cec.c | 796 ++++++++++++++
+ drivers/media/platform/seco-cec/seco-cec.h | 141 +++
+ drivers/media/platform/sh_vou.c | 2 +-
+ drivers/media/platform/sti/bdisp/bdisp-hw.c | 2 +-
+ drivers/media/platform/sunxi/sun6i-csi/Kconfig | 9 +
+ drivers/media/platform/sunxi/sun6i-csi/Makefile | 3 +
+ drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c | 913 ++++++++++++++++
+ drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h | 135 +++
+ .../media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h | 196 ++++
+ .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 679 ++++++++++++
+ .../media/platform/sunxi/sun6i-csi/sun6i_video.h | 38 +
+ drivers/media/platform/ti-vpe/cal.c | 4 +-
+ drivers/media/platform/vicodec/codec-fwht.c | 84 +-
+ drivers/media/platform/vicodec/codec-fwht.h | 15 +-
+ drivers/media/platform/vicodec/codec-v4l2-fwht.c | 122 ++-
+ drivers/media/platform/vicodec/codec-v4l2-fwht.h | 3 +-
+ drivers/media/platform/vicodec/vicodec-core.c | 143 +--
+ drivers/media/platform/vim2m.c | 6 +-
+ drivers/media/platform/vimc/vimc-common.c | 2 +
+ drivers/media/platform/vimc/vimc-sensor.c | 2 +-
+ drivers/media/platform/vivid/vivid-core.c | 48 +-
+ drivers/media/platform/vivid/vivid-core.h | 5 +
+ drivers/media/platform/vivid/vivid-ctrls.c | 16 +
+ drivers/media/platform/vivid/vivid-kthread-cap.c | 56 +-
+ drivers/media/platform/vivid/vivid-kthread-out.c | 5 +-
+ drivers/media/platform/vivid/vivid-vbi-cap.c | 4 -
+ drivers/media/platform/vivid/vivid-vid-cap.c | 29 +-
+ drivers/media/platform/vivid/vivid-vid-cap.h | 2 +-
+ drivers/media/platform/vivid/vivid-vid-common.c | 2 +-
+ drivers/media/platform/vivid/vivid-vid-out.c | 18 +-
+ drivers/media/platform/vivid/vivid-vid-out.h | 2 +-
+ drivers/media/platform/xilinx/Kconfig | 2 +
+ drivers/media/platform/xilinx/Makefile | 2 +
+ drivers/media/platform/xilinx/xilinx-dma.c | 5 +-
+ drivers/media/platform/xilinx/xilinx-dma.h | 5 +-
+ drivers/media/platform/xilinx/xilinx-tpg.c | 7 +-
+ drivers/media/platform/xilinx/xilinx-vip.c | 7 +-
+ drivers/media/platform/xilinx/xilinx-vip.h | 5 +-
+ drivers/media/platform/xilinx/xilinx-vipp.c | 5 +-
+ drivers/media/platform/xilinx/xilinx-vipp.h | 5 +-
+ drivers/media/platform/xilinx/xilinx-vtc.c | 5 +-
+ drivers/media/platform/xilinx/xilinx-vtc.h | 5 +-
+ drivers/media/rc/Kconfig | 12 +
+ drivers/media/rc/Makefile | 1 +
+ drivers/media/rc/imon.c | 4 +-
+ drivers/media/rc/imon_raw.c | 47 +-
+ drivers/media/rc/keymaps/Makefile | 1 +
+ drivers/media/rc/keymaps/rc-xbox-dvd.c | 63 ++
+ drivers/media/rc/mceusb.c | 9 +
+ drivers/media/rc/rc-main.c | 8 +-
+ drivers/media/rc/xbox_remote.c | 306 ++++++
+ drivers/media/spi/cxd2880-spi.c | 17 +
+ drivers/media/usb/au0828/au0828-video.c | 38 +-
+ drivers/media/usb/cpia2/cpia2_v4l.c | 31 +-
+ drivers/media/usb/cx231xx/cx231xx-417.c | 41 +-
+ drivers/media/usb/cx231xx/cx231xx-video.c | 41 +-
+ drivers/media/usb/dvb-usb-v2/Kconfig | 1 +
+ drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 6 +-
+ drivers/media/usb/dvb-usb-v2/gl861.c | 3 +-
+ drivers/media/usb/dvb-usb-v2/lmedm04.c | 102 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 40 +-
+ drivers/media/usb/dvb-usb-v2/rtl28xxu.h | 4 +-
+ drivers/media/usb/dvb-usb-v2/usb_urb.c | 5 +-
+ drivers/media/usb/dvb-usb/dib0700_devices.c | 2 +-
+ drivers/media/usb/dvb-usb/friio-fe.c | 440 --------
+ drivers/media/usb/dvb-usb/friio.c | 522 ---------
+ drivers/media/usb/dvb-usb/friio.h | 99 --
+ drivers/media/usb/em28xx/em28xx-cards.c | 2 +-
+ drivers/media/usb/pulse8-cec/pulse8-cec.c | 2 +-
+ drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 2 +-
+ drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 13 +-
+ drivers/media/usb/siano/smsusb.c | 3 +-
+ drivers/media/usb/stkwebcam/stk-webcam.c | 13 +-
+ drivers/media/usb/uvc/uvc_driver.c | 83 +-
+ drivers/media/usb/uvc/uvc_isight.c | 6 +-
+ drivers/media/usb/uvc/uvc_queue.c | 110 +-
+ drivers/media/usb/uvc/uvc_status.c | 12 +-
+ drivers/media/usb/uvc/uvc_video.c | 274 +++--
+ drivers/media/usb/uvc/uvcvideo.h | 69 +-
+ drivers/media/v4l2-core/Kconfig | 1 +
+ drivers/media/v4l2-core/v4l2-async.c | 4 -
+ drivers/media/v4l2-core/v4l2-ctrls.c | 3 +-
+ drivers/media/v4l2-core/v4l2-dev.c | 8 +-
+ drivers/media/v4l2-core/v4l2-device.c | 1 +
+ drivers/media/v4l2-core/v4l2-fwnode.c | 8 +-
+ drivers/media/v4l2-core/v4l2-ioctl.c | 106 +-
+ drivers/media/v4l2-core/v4l2-mem2mem.c | 66 +-
+ drivers/staging/media/Kconfig | 2 +
+ drivers/staging/media/Makefile | 1 +
+ drivers/staging/media/bcm2048/radio-bcm2048.c | 5 +-
+ drivers/staging/media/imx/imx-media-of.c | 2 +-
+ drivers/staging/media/rockchip/vpu/Kconfig | 13 +
+ drivers/staging/media/rockchip/vpu/Makefile | 10 +
+ drivers/staging/media/rockchip/vpu/TODO | 13 +
+ drivers/staging/media/rockchip/vpu/rk3288_vpu_hw.c | 118 +++
+ .../media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 125 +++
+ .../staging/media/rockchip/vpu/rk3288_vpu_regs.h | 442 ++++++++
+ drivers/staging/media/rockchip/vpu/rk3399_vpu_hw.c | 118 +++
+ .../media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | 159 +++
+ .../staging/media/rockchip/vpu/rk3399_vpu_regs.h | 600 +++++++++++
+ drivers/staging/media/rockchip/vpu/rockchip_vpu.h | 232 ++++
+ .../media/rockchip/vpu/rockchip_vpu_common.h | 29 +
+ .../staging/media/rockchip/vpu/rockchip_vpu_drv.c | 537 ++++++++++
+ .../staging/media/rockchip/vpu/rockchip_vpu_enc.c | 670 ++++++++++++
+ .../staging/media/rockchip/vpu/rockchip_vpu_hw.h | 58 +
+ .../staging/media/rockchip/vpu/rockchip_vpu_jpeg.c | 290 +++++
+ .../staging/media/rockchip/vpu/rockchip_vpu_jpeg.h | 14 +
+ drivers/staging/media/sunxi/cedrus/cedrus.c | 23 +-
+ drivers/staging/media/sunxi/cedrus/cedrus.h | 2 -
+ drivers/staging/media/sunxi/cedrus/cedrus_dec.c | 11 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 37 +-
+ drivers/staging/media/sunxi/cedrus/cedrus_video.c | 5 -
+ drivers/staging/media/tegra-vde/tegra-vde.c | 222 ++--
+ drivers/staging/media/tegra-vde/trace.h | 93 ++
+ include/dt-bindings/media/xilinx-vip.h | 5 +-
+ include/media/cec.h | 1 +
+ include/media/davinci/vpbe.h | 4 -
+ include/media/rc-map.h | 1 +
+ include/media/v4l2-common.h | 5 +
+ include/media/v4l2-dev.h | 13 +-
+ include/media/v4l2-ioctl.h | 16 +-
+ include/media/v4l2-subdev.h | 6 +-
+ include/uapi/linux/v4l2-common.h | 28 +-
+ include/uapi/linux/videodev2.h | 2 +
+ samples/v4l/v4l2-pci-skeleton.c | 11 +-
+ 768 files changed, 15700 insertions(+), 3618 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx214.txt
+ create mode 100644 Documentation/devicetree/bindings/media/rockchip-vpu.txt
+ create mode 100644 Documentation/devicetree/bindings/media/sun6i-csi.txt
+ create mode 100644 Documentation/media/uapi/v4l/pixfmt-cnf4.rst
+ create mode 100644 drivers/media/i2c/imx214.c
+ create mode 100644 drivers/media/platform/seco-cec/Makefile
+ create mode 100644 drivers/media/platform/seco-cec/seco-cec.c
+ create mode 100644 drivers/media/platform/seco-cec/seco-cec.h
+ create mode 100644 drivers/media/platform/sunxi/sun6i-csi/Kconfig
+ create mode 100644 drivers/media/platform/sunxi/sun6i-csi/Makefile
+ create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.c
+ create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi.h
+ create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_reg.h
+ create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_video.c
+ create mode 100644 drivers/media/platform/sunxi/sun6i-csi/sun6i_video.h
+ create mode 100644 drivers/media/rc/keymaps/rc-xbox-dvd.c
+ create mode 100644 drivers/media/rc/xbox_remote.c
+ delete mode 100644 drivers/media/usb/dvb-usb/friio-fe.c
+ delete mode 100644 drivers/media/usb/dvb-usb/friio.c
+ delete mode 100644 drivers/media/usb/dvb-usb/friio.h
+ create mode 100644 drivers/staging/media/rockchip/vpu/Kconfig
+ create mode 100644 drivers/staging/media/rockchip/vpu/Makefile
+ create mode 100644 drivers/staging/media/rockchip/vpu/TODO
+ create mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_hw.c
+ create mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c
+ create mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_regs.h
+ create mode 100644 drivers/staging/media/rockchip/vpu/rk3399_vpu_hw.c
+ create mode 100644 drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c
+ create mode 100644 drivers/staging/media/rockchip/vpu/rk3399_vpu_regs.h
+ create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu.h
+ create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_common.h
+ create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c
+ create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c
+ create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_hw.h
+ create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.c
+ create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_jpeg.h
+ create mode 100644 drivers/staging/media/tegra-vde/trace.h
+Merging v4l-dvb-next/master (357b50f3ccc8 drm: amd: dc: don't use FP math when Kcov is enabled)
+$ git merge v4l-dvb-next/master
+Auto-merging drivers/gpu/drm/amd/display/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/amd/display/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+Merging fbdev/fbdev-for-next (217188d9f985 video: fbdev: remove redundant 'default n' from Kconfig-s)
+$ git merge fbdev/fbdev-for-next
+Already up to date.
+Merging pm/linux-next (0b71efed2eda Merge branch 'pm-cpuidle' into linux-next)
+$ git merge pm/linux-next
+Removing Documentation/cpuidle/sysfs.txt
+Removing Documentation/cpuidle/core.txt
+Merge made by the 'recursive' strategy.
+ .../ABI/testing/sysfs-devices-software_node | 10 +
+ Documentation/admin-guide/pm/cpuidle.rst | 614 +++++++++++++++++++
+ Documentation/admin-guide/pm/intel_pstate.rst | 10 +-
+ Documentation/admin-guide/pm/working-state.rst | 1 +
+ Documentation/cpuidle/core.txt | 23 -
+ Documentation/cpuidle/sysfs.txt | 98 ---
+ drivers/acpi/acpica/acnamesp.h | 1 +
+ drivers/acpi/acpica/dbxface.c | 118 ++--
+ drivers/acpi/acpica/dswload2.c | 8 +
+ drivers/acpi/acpica/nsaccess.c | 23 +-
+ drivers/acpi/acpica/psloop.c | 8 +-
+ drivers/acpi/acpica/psobject.c | 3 +-
+ drivers/acpi/bus.c | 1 -
+ drivers/acpi/glue.c | 21 +-
+ drivers/acpi/internal.h | 1 -
+ drivers/acpi/spcr.c | 11 +
+ drivers/base/Makefile | 2 +-
+ drivers/base/core.c | 34 +-
+ drivers/base/platform.c | 1 -
+ drivers/base/property.c | 511 +---------------
+ drivers/base/swnode.c | 678 +++++++++++++++++++++
+ drivers/cpufreq/imx6q-cpufreq.c | 17 +-
+ drivers/cpufreq/intel_pstate.c | 28 +-
+ drivers/cpufreq/pmac64-cpufreq.c | 1 +
+ drivers/cpufreq/powernv-cpufreq.c | 17 +-
+ drivers/cpufreq/s3c24xx-cpufreq-debugfs.c | 46 +-
+ drivers/power/avs/smartreflex.c | 31 -
+ include/acpi/acpixf.h | 2 +-
+ include/acpi/actbl3.h | 23 +
+ include/linux/acpi.h | 12 +-
+ include/linux/power/smartreflex.h | 5 -
+ include/linux/property.h | 12 +
+ kernel/power/qos.c | 15 +-
+ tools/power/acpi/tools/acpidump/apmain.c | 2 +-
+ 34 files changed, 1589 insertions(+), 799 deletions(-)
+ create mode 100644 Documentation/ABI/testing/sysfs-devices-software_node
+ create mode 100644 Documentation/admin-guide/pm/cpuidle.rst
+ delete mode 100644 Documentation/cpuidle/core.txt
+ delete mode 100644 Documentation/cpuidle/sysfs.txt
+ create mode 100644 drivers/base/swnode.c
+Merging cpupower/cpupower (901d32bc69f3 cpupower : Auto-completion for cpupower tool)
+$ git merge cpupower/cpupower
+Merge made by the 'recursive' strategy.
+ tools/power/cpupower/Makefile | 6 +-
+ tools/power/cpupower/cpupower-completion.sh | 128 ++++++++++++++++++++++++++++
+ 2 files changed, 133 insertions(+), 1 deletion(-)
+ create mode 100644 tools/power/cpupower/cpupower-completion.sh
+Merging opp/opp/linux-next (e822eac560a8 Merge branch 'opp/genpd/required-opps' into opp/linux-next)
+$ git merge opp/opp/linux-next
+Merge made by the 'recursive' strategy.
+ drivers/base/power/domain.c | 70 ++++------
+ drivers/opp/core.c | 261 ++++++++++++++++++++++++++----------
+ drivers/opp/of.c | 313 ++++++++++++++++++++++++++++++++++++++------
+ drivers/opp/opp.h | 20 +++
+ include/linux/pm_domain.h | 8 +-
+ include/linux/pm_opp.h | 16 ++-
+ 6 files changed, 526 insertions(+), 162 deletions(-)
+Merging thermal/next (eaaa598c0a28 Merge branches 'for-rc' and 'thermal-core' into next)
+$ git merge thermal/next
+Merge made by the 'recursive' strategy.
+ drivers/thermal/Kconfig | 94 ++--------------------
+ drivers/thermal/Makefile | 10 +--
+ drivers/thermal/intel/Kconfig | 77 ++++++++++++++++++
+ drivers/thermal/intel/Makefile | 12 +++
+ .../thermal/{ => intel}/int340x_thermal/Kconfig | 0
+ .../thermal/{ => intel}/int340x_thermal/Makefile | 0
+ .../{ => intel}/int340x_thermal/acpi_thermal_rel.c | 0
+ .../{ => intel}/int340x_thermal/acpi_thermal_rel.h | 0
+ .../{ => intel}/int340x_thermal/int3400_thermal.c | 9 +--
+ .../{ => intel}/int340x_thermal/int3402_thermal.c | 0
+ .../{ => intel}/int340x_thermal/int3403_thermal.c | 0
+ .../{ => intel}/int340x_thermal/int3406_thermal.c | 0
+ .../int340x_thermal/int340x_thermal_zone.c | 0
+ .../int340x_thermal/int340x_thermal_zone.h | 0
+ .../int340x_thermal/processor_thermal_device.c | 0
+ .../thermal/{ => intel}/intel_bxt_pmic_thermal.c | 0
+ drivers/thermal/{ => intel}/intel_pch_thermal.c | 0
+ drivers/thermal/{ => intel}/intel_powerclamp.c | 0
+ .../thermal/{ => intel}/intel_quark_dts_thermal.c | 0
+ drivers/thermal/{ => intel}/intel_soc_dts_iosf.c | 0
+ drivers/thermal/{ => intel}/intel_soc_dts_iosf.h | 0
+ .../thermal/{ => intel}/intel_soc_dts_thermal.c | 0
+ drivers/thermal/{ => intel}/x86_pkg_temp_thermal.c | 0
+ drivers/thermal/qcom/Kconfig | 11 +++
+ drivers/thermal/qcom/Makefile | 1 +
+ drivers/thermal/{ => qcom}/qcom-spmi-temp-alarm.c | 2 +-
+ drivers/thermal/rockchip_thermal.c | 8 +-
+ drivers/thermal/spear_thermal.c | 8 +-
+ drivers/thermal/st/st_thermal.c | 6 +-
+ drivers/thermal/thermal_core.c | 18 +++--
+ drivers/thermal/thermal_sysfs.c | 11 ++-
+ drivers/thermal/zx2967_thermal.c | 6 +-
+ 32 files changed, 138 insertions(+), 135 deletions(-)
+ create mode 100644 drivers/thermal/intel/Kconfig
+ create mode 100644 drivers/thermal/intel/Makefile
+ rename drivers/thermal/{ => intel}/int340x_thermal/Kconfig (100%)
+ rename drivers/thermal/{ => intel}/int340x_thermal/Makefile (100%)
+ rename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.c (100%)
+ rename drivers/thermal/{ => intel}/int340x_thermal/acpi_thermal_rel.h (100%)
+ rename drivers/thermal/{ => intel}/int340x_thermal/int3400_thermal.c (96%)
+ rename drivers/thermal/{ => intel}/int340x_thermal/int3402_thermal.c (100%)
+ rename drivers/thermal/{ => intel}/int340x_thermal/int3403_thermal.c (100%)
+ rename drivers/thermal/{ => intel}/int340x_thermal/int3406_thermal.c (100%)
+ rename drivers/thermal/{ => intel}/int340x_thermal/int340x_thermal_zone.c (100%)
+ rename drivers/thermal/{ => intel}/int340x_thermal/int340x_thermal_zone.h (100%)
+ rename drivers/thermal/{ => intel}/int340x_thermal/processor_thermal_device.c (100%)
+ rename drivers/thermal/{ => intel}/intel_bxt_pmic_thermal.c (100%)
+ rename drivers/thermal/{ => intel}/intel_pch_thermal.c (100%)
+ rename drivers/thermal/{ => intel}/intel_powerclamp.c (100%)
+ rename drivers/thermal/{ => intel}/intel_quark_dts_thermal.c (100%)
+ rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.c (100%)
+ rename drivers/thermal/{ => intel}/intel_soc_dts_iosf.h (100%)
+ rename drivers/thermal/{ => intel}/intel_soc_dts_thermal.c (100%)
+ rename drivers/thermal/{ => intel}/x86_pkg_temp_thermal.c (100%)
+ rename drivers/thermal/{ => qcom}/qcom-spmi-temp-alarm.c (99%)
+Merging thermal-soc/next (760eea43f8c6 thermal: da9062/61: Prevent hardware access during system suspend)
+$ git merge thermal-soc/next
+Already up to date.
+Merging ieee1394/for-next (c820518f6ca1 firewire: Remove depends on HAS_DMA in case of platform dependency)
+$ git merge ieee1394/for-next
+Merge made by the 'recursive' strategy.
+ drivers/firewire/Kconfig | 1 -
+ 1 file changed, 1 deletion(-)
+Merging dlm/next (3595c559326d dlm: fix invalid cluster name warning)
+$ git merge dlm/next
+Merge made by the 'recursive' strategy.
+ fs/dlm/ast.c | 10 ++++++++++
+ fs/dlm/lock.c | 17 ++++++++++-------
+ fs/dlm/lockspace.c | 9 ++++-----
+ fs/dlm/member.c | 7 ++++---
+ fs/dlm/memory.c | 9 +++------
+ fs/dlm/user.c | 5 +++--
+ 6 files changed, 34 insertions(+), 23 deletions(-)
+Merging swiotlb/linux-next (da689221f952 xen/blkfront: avoid NULL blkfront_info dereference on device removal)
+$ git merge swiotlb/linux-next
+Auto-merging drivers/block/xen-blkfront.c
+Merge made by the 'recursive' strategy.
+Merging rdma/for-next (81fce6291d99 RDMA/hns: Add SRQ asynchronous event support)
+$ git merge rdma/for-next
+Removing include/linux/mlx5/srq.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h
+Auto-merging drivers/infiniband/hw/mlx5/qp.c
+Auto-merging drivers/infiniband/hw/mlx5/odp.c
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Auto-merging drivers/infiniband/hw/mlx5/devx.c
+Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+Auto-merging drivers/infiniband/core/umem_odp.c
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/core/cma_configfs.c | 3 +
+ drivers/infiniband/core/cma_priv.h | 28 +
+ drivers/infiniband/core/core_priv.h | 30 +-
+ drivers/infiniband/core/device.c | 26 +-
+ drivers/infiniband/core/fmr_pool.c | 4 +-
+ drivers/infiniband/core/nldev.c | 21 +-
+ drivers/infiniband/core/rdma_core.c | 48 +-
+ drivers/infiniband/core/rdma_core.h | 74 +-
+ drivers/infiniband/core/restrack.c | 5 +
+ drivers/infiniband/core/umem_odp.c | 14 +-
+ drivers/infiniband/core/uverbs.h | 62 -
+ drivers/infiniband/core/uverbs_cmd.c | 1989 ++++++++++----------
+ drivers/infiniband/core/uverbs_ioctl.c | 10 +-
+ drivers/infiniband/core/uverbs_main.c | 228 +--
+ drivers/infiniband/core/uverbs_std_types.c | 50 +-
+ .../infiniband/core/uverbs_std_types_counters.c | 10 +-
+ drivers/infiniband/core/uverbs_std_types_cq.c | 19 +-
+ drivers/infiniband/core/uverbs_std_types_dm.c | 11 +-
+ .../infiniband/core/uverbs_std_types_flow_action.c | 17 +-
+ drivers/infiniband/core/uverbs_std_types_mr.c | 8 +-
+ drivers/infiniband/core/uverbs_uapi.c | 512 ++++-
+ drivers/infiniband/hw/cxgb3/cxio_hal.c | 3 +-
+ drivers/infiniband/hw/cxgb4/cm.c | 3 +-
+ drivers/infiniband/hw/cxgb4/qp.c | 3 +-
+ drivers/infiniband/hw/hns/Makefile | 2 +-
+ drivers/infiniband/hw/hns/hns_roce_alloc.c | 2 +
+ drivers/infiniband/hw/hns/hns_roce_cmd.h | 4 +
+ drivers/infiniband/hw/hns/hns_roce_device.h | 92 +-
+ drivers/infiniband/hw/hns/hns_roce_hem.c | 41 +-
+ drivers/infiniband/hw/hns/hns_roce_hem.h | 2 +
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 415 +++-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 95 +
+ drivers/infiniband/hw/hns/hns_roce_main.c | 83 +
+ drivers/infiniband/hw/hns/hns_roce_mr.c | 137 +-
+ drivers/infiniband/hw/hns/hns_roce_qp.c | 21 +-
+ drivers/infiniband/hw/hns/hns_roce_srq.c | 456 +++++
+ drivers/infiniband/hw/i40iw/i40iw_verbs.c | 20 -
+ drivers/infiniband/hw/mlx4/main.c | 27 +
+ drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 +
+ drivers/infiniband/hw/mlx5/Makefile | 4 +-
+ drivers/infiniband/hw/mlx5/cq.c | 4 +-
+ drivers/infiniband/hw/mlx5/devx.c | 207 +-
+ drivers/infiniband/hw/mlx5/flow.c | 43 +-
+ drivers/infiniband/hw/mlx5/ib_rep.c | 4 +
+ drivers/infiniband/hw/mlx5/main.c | 321 ++--
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 50 +-
+ drivers/infiniband/hw/mlx5/odp.c | 331 +++-
+ drivers/infiniband/hw/mlx5/qp.c | 419 +++--
+ drivers/infiniband/hw/mlx5/srq.c | 65 +-
+ drivers/infiniband/hw/mlx5/srq.h | 73 +
+ .../core/srq.c => infiniband/hw/mlx5/srq_cmd.c} | 302 +--
+ drivers/infiniband/hw/qib/qib_iba6120.c | 1 -
+ drivers/infiniband/hw/qib/qib_iba7220.c | 2 -
+ drivers/infiniband/hw/qib/qib_iba7322.c | 3 -
+ drivers/infiniband/hw/qib/qib_init.c | 1 -
+ drivers/infiniband/hw/qib/qib_pcie.c | 2 +-
+ drivers/infiniband/hw/qib/qib_sdma.c | 1 -
+ drivers/infiniband/hw/qib/qib_ud.c | 1 -
+ drivers/infiniband/hw/qib/qib_user_sdma.c | 1 -
+ drivers/infiniband/hw/qib/qib_verbs.c | 3 -
+ drivers/infiniband/hw/usnic/usnic_ib_main.c | 2 +-
+ drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 2 +-
+ drivers/infiniband/sw/rxe/rxe.h | 5 +-
+ drivers/infiniband/sw/rxe/rxe_comp.c | 6 +
+ drivers/infiniband/sw/rxe/rxe_hw_counters.c | 7 +-
+ drivers/infiniband/sw/rxe/rxe_hw_counters.h | 3 +
+ drivers/infiniband/sw/rxe/rxe_loc.h | 5 +-
+ drivers/infiniband/sw/rxe/rxe_net.c | 3 +-
+ drivers/infiniband/sw/rxe/rxe_req.c | 3 +-
+ drivers/infiniband/sw/rxe/rxe_resp.c | 33 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 12 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.h | 2 +-
+ drivers/infiniband/ulp/iser/iser_memory.c | 5 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 50 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cq.c | 15 +-
+ drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 11 +
+ drivers/net/ethernet/mellanox/mlx5/core/dev.c | 140 +-
+ .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 27 +-
+ .../ethernet/mellanox/mlx5/core/diag/fw_tracer.h | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 43 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 1257 +++++++------
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 45 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/events.c | 298 +++
+ .../net/ethernet/mellanox/mlx5/core/fpga/core.c | 38 +-
+ .../net/ethernet/mellanox/mlx5/core/fpga/core.h | 11 +-
+ drivers/net/ethernet/mellanox/mlx5/core/health.c | 29 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 24 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/clock.h | 3 -
+ drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 98 +
+ drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 35 +
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 343 +---
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 39 +-
+ .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 44 +-
+ drivers/net/ethernet/mellanox/mlx5/core/port.c | 57 -
+ drivers/net/ethernet/mellanox/mlx5/core/qp.c | 86 +-
+ drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 109 --
+ include/linux/mlx5/cq.h | 2 +-
+ include/linux/mlx5/device.h | 17 +-
+ include/linux/mlx5/driver.h | 248 +--
+ include/linux/mlx5/eq.h | 72 +
+ include/linux/mlx5/mlx5_ifc.h | 36 +-
+ include/linux/mlx5/port.h | 3 -
+ include/linux/mlx5/qp.h | 5 +
+ include/linux/mlx5/srq.h | 72 -
+ include/linux/mlx5/transobj.h | 11 -
+ include/rdma/ib_fmr_pool.h | 2 +-
+ include/rdma/ib_verbs.h | 25 +-
+ include/rdma/restrack.h | 4 +
+ include/rdma/uverbs_ioctl.h | 220 ++-
+ include/rdma/uverbs_named_ioctl.h | 11 +-
+ include/rdma/uverbs_std_types.h | 73 +-
+ include/uapi/rdma/hns-abi.h | 6 +
+ include/uapi/rdma/ib_user_verbs.h | 16 +-
+ include/uapi/rdma/mlx5_user_ioctl_cmds.h | 1 +
+ 119 files changed, 6231 insertions(+), 3923 deletions(-)
+ create mode 100644 drivers/infiniband/hw/hns/hns_roce_srq.c
+ create mode 100644 drivers/infiniband/hw/mlx5/srq.h
+ rename drivers/{net/ethernet/mellanox/mlx5/core/srq.c => infiniband/hw/mlx5/srq_cmd.c} (71%)
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/events.c
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h
+ create mode 100644 include/linux/mlx5/eq.h
+ delete mode 100644 include/linux/mlx5/srq.h
+$ git reset --hard HEAD^
+HEAD is now at 940bd697c8b6 Merge remote-tracking branch 'swiotlb/linux-next'
+Merging next-20181203 version of rdma
+$ git merge -m next-20181203/rdma b024dd0eba6e6d568f69d63c5e3153aba94c23e3
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h
+Auto-merging drivers/infiniband/hw/mlx5/qp.c
+Auto-merging drivers/infiniband/hw/mlx5/odp.c
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+Auto-merging drivers/infiniband/hw/mlx5/devx.c
+Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+Auto-merging drivers/infiniband/core/umem_odp.c
+Merge made by the 'recursive' strategy.
+ drivers/infiniband/core/cma_configfs.c | 3 +
+ drivers/infiniband/core/cma_priv.h | 28 +
+ drivers/infiniband/core/core_priv.h | 30 +-
+ drivers/infiniband/core/device.c | 26 +-
+ drivers/infiniband/core/fmr_pool.c | 4 +-
+ drivers/infiniband/core/nldev.c | 20 +-
+ drivers/infiniband/core/rdma_core.c | 19 +-
+ drivers/infiniband/core/rdma_core.h | 58 +-
+ drivers/infiniband/core/umem_odp.c | 14 +-
+ drivers/infiniband/core/uverbs.h | 62 --
+ drivers/infiniband/core/uverbs_cmd.c | 1093 ++++++++++++--------
+ drivers/infiniband/core/uverbs_ioctl.c | 10 +-
+ drivers/infiniband/core/uverbs_main.c | 215 ++--
+ drivers/infiniband/core/uverbs_std_types.c | 50 +-
+ .../infiniband/core/uverbs_std_types_counters.c | 10 +-
+ drivers/infiniband/core/uverbs_std_types_cq.c | 19 +-
+ drivers/infiniband/core/uverbs_std_types_dm.c | 11 +-
+ .../infiniband/core/uverbs_std_types_flow_action.c | 17 +-
+ drivers/infiniband/core/uverbs_std_types_mr.c | 8 +-
+ drivers/infiniband/core/uverbs_uapi.c | 519 ++++++++--
+ drivers/infiniband/hw/cxgb3/cxio_hal.c | 3 +-
+ drivers/infiniband/hw/cxgb4/cm.c | 3 +-
+ drivers/infiniband/hw/cxgb4/qp.c | 3 +-
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 9 +-
+ drivers/infiniband/hw/i40iw/i40iw_verbs.c | 20 -
+ drivers/infiniband/hw/mlx4/main.c | 27 +
+ drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 +
+ drivers/infiniband/hw/mlx5/devx.c | 65 +-
+ drivers/infiniband/hw/mlx5/flow.c | 43 +-
+ drivers/infiniband/hw/mlx5/main.c | 107 +-
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 31 +-
+ drivers/infiniband/hw/mlx5/odp.c | 331 +++++-
+ drivers/infiniband/hw/mlx5/qp.c | 2 +-
+ drivers/infiniband/hw/qib/qib_iba6120.c | 1 -
+ drivers/infiniband/hw/qib/qib_iba7220.c | 2 -
+ drivers/infiniband/hw/qib/qib_iba7322.c | 3 -
+ drivers/infiniband/hw/qib/qib_init.c | 1 -
+ drivers/infiniband/hw/qib/qib_pcie.c | 2 +-
+ drivers/infiniband/hw/qib/qib_sdma.c | 1 -
+ drivers/infiniband/hw/qib/qib_ud.c | 1 -
+ drivers/infiniband/hw/qib/qib_user_sdma.c | 1 -
+ drivers/infiniband/hw/qib/qib_verbs.c | 3 -
+ drivers/infiniband/hw/usnic/usnic_ib_main.c | 2 +-
+ drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 2 +-
+ drivers/infiniband/sw/rxe/rxe.h | 5 +-
+ drivers/infiniband/sw/rxe/rxe_comp.c | 6 +
+ drivers/infiniband/sw/rxe/rxe_hw_counters.c | 7 +-
+ drivers/infiniband/sw/rxe/rxe_hw_counters.h | 3 +
+ drivers/infiniband/sw/rxe/rxe_loc.h | 5 +-
+ drivers/infiniband/sw/rxe/rxe_net.c | 3 +-
+ drivers/infiniband/sw/rxe/rxe_req.c | 3 +-
+ drivers/infiniband/sw/rxe/rxe_resp.c | 33 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.c | 12 +-
+ drivers/infiniband/sw/rxe/rxe_verbs.h | 2 +-
+ drivers/infiniband/ulp/iser/iser_memory.c | 5 +-
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cq.c | 15 +-
+ drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 11 +
+ drivers/net/ethernet/mellanox/mlx5/core/dev.c | 34 -
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 18 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 967 ++++++++++-------
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/health.c | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 93 ++
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 287 +----
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 23 -
+ drivers/net/ethernet/mellanox/mlx5/core/qp.c | 20 +-
+ include/linux/mlx5/cq.h | 2 +-
+ include/linux/mlx5/device.h | 7 +
+ include/linux/mlx5/driver.h | 151 +--
+ include/linux/mlx5/eq.h | 60 ++
+ include/linux/mlx5/mlx5_ifc.h | 10 +-
+ include/linux/mlx5/qp.h | 5 +
+ include/rdma/ib_fmr_pool.h | 2 +-
+ include/rdma/ib_verbs.h | 21 +-
+ include/rdma/uverbs_ioctl.h | 217 +++-
+ include/rdma/uverbs_named_ioctl.h | 11 +-
+ include/rdma/uverbs_std_types.h | 61 +-
+ include/uapi/rdma/ib_user_verbs.h | 16 +-
+ include/uapi/rdma/mlx5_user_ioctl_cmds.h | 1 +
+ 82 files changed, 3006 insertions(+), 2003 deletions(-)
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h
+ create mode 100644 include/linux/mlx5/eq.h
+Merging net-next/master (a60956ed72f7 net: dsa: Make dsa_master_set_mtu() static)
+$ git merge net-next/master
+Auto-merging tools/testing/selftests/bpf/test_verifier.c
+Auto-merging tools/testing/selftests/bpf/test_btf.c
+Auto-merging tools/testing/selftests/bpf/bpf_helpers.h
+Auto-merging tools/testing/selftests/bpf/bpf_flow.c
+Auto-merging tools/include/uapi/linux/bpf.h
+CONFLICT (content): Merge conflict in tools/include/uapi/linux/bpf.h
+Auto-merging tools/bpf/bpftool/btf_dumper.c
+Auto-merging net/sctp/socket.c
+Auto-merging net/sctp/chunk.c
+Auto-merging net/sctp/associola.c
+Auto-merging net/sched/sch_netem.c
+Auto-merging net/sched/cls_flower.c
+CONFLICT (content): Merge conflict in net/sched/cls_flower.c
+Auto-merging net/ipv6/ip6_output.c
+Auto-merging net/ipv6/ip6_input.c
+Auto-merging net/ipv4/tcp_output.c
+Auto-merging net/ipv4/ip_input.c
+Auto-merging net/dsa/slave.c
+Auto-merging net/dsa/master.c
+CONFLICT (content): Merge conflict in net/dsa/master.c
+Auto-merging net/core/rtnetlink.c
+Auto-merging net/core/flow_dissector.c
+Auto-merging net/core/filter.c
+CONFLICT (content): Merge conflict in net/core/filter.c
+Auto-merging net/core/dev.c
+Auto-merging lib/Kconfig.debug
+Auto-merging lib/Kconfig
+Auto-merging kernel/bpf/verifier.c
+Auto-merging kernel/bpf/btf.c
+CONFLICT (content): Merge conflict in kernel/bpf/btf.c
+Auto-merging include/uapi/linux/bpf.h
+CONFLICT (content): Merge conflict in include/uapi/linux/bpf.h
+Auto-merging include/net/sctp/structs.h
+Auto-merging include/net/sctp/sctp.h
+Auto-merging include/net/neighbour.h
+Auto-merging include/linux/filter.h
+Auto-merging drivers/s390/virtio/virtio_ccw.c
+Auto-merging drivers/net/tun.c
+Auto-merging drivers/net/phy/phy_device.c
+CONFLICT (content): Merge conflict in drivers/net/phy/phy_device.c
+Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+Auto-merging drivers/net/ethernet/socionext/sni_ave.c
+Auto-merging drivers/net/ethernet/netronome/nfp/flower/offload.c
+CONFLICT (content): Merge conflict in drivers/net/ethernet/netronome/nfp/flower/offload.c
+Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c
+Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c
+Auto-merging drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h
+Auto-merging drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+Removing drivers/net/dsa/microchip/ksz_spi.c
+Removing drivers/isdn/hardware/eicon/xdi_vers.h
+Removing drivers/isdn/hardware/eicon/xdi_msg.h
+Removing drivers/isdn/hardware/eicon/xdi_adapter.h
+Removing drivers/isdn/hardware/eicon/um_xdi.h
+Removing drivers/isdn/hardware/eicon/um_idi.h
+Removing drivers/isdn/hardware/eicon/um_idi.c
+Removing drivers/isdn/hardware/eicon/sdp_hdr.h
+Removing drivers/isdn/hardware/eicon/s_pri.c
+Removing drivers/isdn/hardware/eicon/s_bri.c
+Removing drivers/isdn/hardware/eicon/s_4bri.c
+Removing drivers/isdn/hardware/eicon/pr_pc.h
+Removing drivers/isdn/hardware/eicon/platform.h
+Removing drivers/isdn/hardware/eicon/pkmaint.h
+Removing drivers/isdn/hardware/eicon/pc_maint.h
+Removing drivers/isdn/hardware/eicon/pc_init.h
+Removing drivers/isdn/hardware/eicon/pc.h
+Removing drivers/isdn/hardware/eicon/os_pri.h
+Removing drivers/isdn/hardware/eicon/os_pri.c
+Removing drivers/isdn/hardware/eicon/os_capi.h
+Removing drivers/isdn/hardware/eicon/os_bri.h
+Removing drivers/isdn/hardware/eicon/os_bri.c
+Removing drivers/isdn/hardware/eicon/os_4bri.h
+Removing drivers/isdn/hardware/eicon/os_4bri.c
+Removing drivers/isdn/hardware/eicon/mntfunc.c
+Removing drivers/isdn/hardware/eicon/mi_pc.h
+Removing drivers/isdn/hardware/eicon/message.c
+Removing drivers/isdn/hardware/eicon/mdm_msg.h
+Removing drivers/isdn/hardware/eicon/man_defs.h
+Removing drivers/isdn/hardware/eicon/maintidi.h
+Removing drivers/isdn/hardware/eicon/maintidi.c
+Removing drivers/isdn/hardware/eicon/kst_ifc.h
+Removing drivers/isdn/hardware/eicon/istream.c
+Removing drivers/isdn/hardware/eicon/io.h
+Removing drivers/isdn/hardware/eicon/io.c
+Removing drivers/isdn/hardware/eicon/idifunc.c
+Removing drivers/isdn/hardware/eicon/helpers.h
+Removing drivers/isdn/hardware/eicon/entity.h
+Removing drivers/isdn/hardware/eicon/dsrv_pri.h
+Removing drivers/isdn/hardware/eicon/dsrv_bri.h
+Removing drivers/isdn/hardware/eicon/dsrv4bri.h
+Removing drivers/isdn/hardware/eicon/dspdids.h
+Removing drivers/isdn/hardware/eicon/dsp_tst.h
+Removing drivers/isdn/hardware/eicon/dsp_defs.h
+Removing drivers/isdn/hardware/eicon/dqueue.h
+Removing drivers/isdn/hardware/eicon/dqueue.c
+Removing drivers/isdn/hardware/eicon/divasync.h
+Removing drivers/isdn/hardware/eicon/divasproc.c
+Removing drivers/isdn/hardware/eicon/divasmain.c
+Removing drivers/isdn/hardware/eicon/divasi.c
+Removing drivers/isdn/hardware/eicon/divasfunc.c
+Removing drivers/isdn/hardware/eicon/divamnt.c
+Removing drivers/isdn/hardware/eicon/divacapi.h
+Removing drivers/isdn/hardware/eicon/diva_pci.h
+Removing drivers/isdn/hardware/eicon/diva_dma.h
+Removing drivers/isdn/hardware/eicon/diva_dma.c
+Removing drivers/isdn/hardware/eicon/diva_didd.c
+Removing drivers/isdn/hardware/eicon/diva.h
+Removing drivers/isdn/hardware/eicon/diva.c
+Removing drivers/isdn/hardware/eicon/diddfunc.c
+Removing drivers/isdn/hardware/eicon/did_vers.h
+Removing drivers/isdn/hardware/eicon/di_defs.h
+Removing drivers/isdn/hardware/eicon/di_dbg.h
+Removing drivers/isdn/hardware/eicon/di.h
+Removing drivers/isdn/hardware/eicon/di.c
+Removing drivers/isdn/hardware/eicon/dfifo.h
+Removing drivers/isdn/hardware/eicon/debuglib.h
+Removing drivers/isdn/hardware/eicon/debuglib.c
+Removing drivers/isdn/hardware/eicon/debug_if.h
+Removing drivers/isdn/hardware/eicon/debug.c
+Removing drivers/isdn/hardware/eicon/dadapter.h
+Removing drivers/isdn/hardware/eicon/dadapter.c
+Removing drivers/isdn/hardware/eicon/cp_vers.h
+Removing drivers/isdn/hardware/eicon/cardtype.h
+Removing drivers/isdn/hardware/eicon/capimain.c
+Removing drivers/isdn/hardware/eicon/capifunc.h
+Removing drivers/isdn/hardware/eicon/capifunc.c
+Removing drivers/isdn/hardware/eicon/capidtmf.h
+Removing drivers/isdn/hardware/eicon/capidtmf.c
+Removing drivers/isdn/hardware/eicon/capi20.h
+Removing drivers/isdn/hardware/eicon/adapter.h
+Removing drivers/isdn/hardware/eicon/Makefile
+Removing drivers/isdn/hardware/eicon/Kconfig
+Auto-merging drivers/infiniband/hw/cxgb4/cm.c
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Resolved 'drivers/net/ethernet/netronome/nfp/flower/offload.c' using previous resolution.
+Resolved 'drivers/net/phy/phy_device.c' using previous resolution.
+Resolved 'include/uapi/linux/bpf.h' using previous resolution.
+Resolved 'kernel/bpf/btf.c' using previous resolution.
+Resolved 'net/core/filter.c' using previous resolution.
+Recorded preimage for 'net/dsa/master.c'
+Recorded preimage for 'net/sched/cls_flower.c'
+Resolved 'tools/include/uapi/linux/bpf.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'net/dsa/master.c'.
+Recorded resolution for 'net/sched/cls_flower.c'.
+[master 5085239657e5] Merge remote-tracking branch 'net-next/master'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/misc/fsl,qoriq-mc.txt | 2 +-
+ .../devicetree/bindings/net/can/fsl-flexcan.txt | 8 +
+ .../devicetree/bindings/net/can/xilinx_can.txt | 1 +
+ .../devicetree/bindings/net/icplus-ip101ag.txt | 19 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ .../networking/{ => device_drivers/3com}/3c509.txt | 0
+ .../{ => device_drivers/3com}/vortex.txt | 2 +-
+ .../networking/{ => device_drivers/amazon}/ena.txt | 0
+ .../{ => device_drivers/chelsio}/cxgb.txt | 0
+ .../{ => device_drivers/cirrus}/cs89x0.txt | 0
+ .../{ => device_drivers/davicom}/dm9000.txt | 0
+ .../networking/{ => device_drivers/dec}/de4x5.txt | 0
+ .../networking/{ => device_drivers/dec}/dmfe.txt | 0
+ .../networking/{ => device_drivers/dlink}/dl2k.txt | 0
+ .../{ => device_drivers/freescale}/dpaa.txt | 0
+ .../freescale}/dpaa2/dpio-driver.rst | 4 +-
+ .../freescale}/dpaa2/ethernet-driver.rst | 2 +-
+ .../{ => device_drivers/freescale}/dpaa2/index.rst | 0
+ .../freescale}/dpaa2/overview.rst | 0
+ .../{ => device_drivers/freescale}/gianfar.txt | 0
+ .../networking/{ => device_drivers/intel}/e100.rst | 0
+ .../{ => device_drivers/intel}/e1000.rst | 0
+ .../{ => device_drivers/intel}/e1000e.rst | 0
+ .../{ => device_drivers/intel}/fm10k.rst | 0
+ .../networking/{ => device_drivers/intel}/i40e.rst | 0
+ .../networking/{ => device_drivers/intel}/iavf.rst | 0
+ .../networking/{ => device_drivers/intel}/ice.rst | 0
+ .../networking/{ => device_drivers/intel}/igb.rst | 0
+ .../{ => device_drivers/intel}/igbvf.rst | 0
+ .../intel/ipw2100.txt} | 0
+ .../intel/ipw2200.txt} | 0
+ .../networking/{ => device_drivers/intel}/ixgb.rst | 0
+ .../{ => device_drivers/intel}/ixgbe.rst | 13 +
+ .../{ => device_drivers/intel}/ixgbevf.rst | 0
+ .../{ => device_drivers/microsoft}/netvsc.txt | 0
+ .../{ => device_drivers/neterion}/s2io.txt | 0
+ .../{ => device_drivers/neterion}/vxge.txt | 0
+ .../{ => device_drivers/qlogic}/LICENSE.qla3xxx | 0
+ .../{ => device_drivers/qlogic}/LICENSE.qlcnic | 0
+ .../{ => device_drivers/qlogic}/LICENSE.qlge | 0
+ .../{ => device_drivers/qualcomm}/rmnet.txt | 0
+ .../{README.sb1000 => device_drivers/sb1000.txt} | 0
+ .../networking/{ => device_drivers/smsc}/smc9.txt | 0
+ .../{ => device_drivers/stmicro}/stmmac.txt | 0
+ .../{ti-cpsw.txt => device_drivers/ti/cpsw.txt} | 0
+ .../networking/{ => device_drivers/ti}/tlan.txt | 0
+ .../{ => device_drivers/toshiba}/spider_net.txt | 0
+ Documentation/networking/devlink-params.txt | 9 +
+ Documentation/networking/index.rst | 1 +
+ Documentation/networking/ip-sysctl.txt | 18 +-
+ Documentation/networking/netdev-features.txt | 2 +-
+ Documentation/networking/snmp_counter.rst | 947 ++
+ Documentation/networking/vrf.txt | 22 +-
+ MAINTAINERS | 64 +-
+ arch/mips/net/bpf_jit.c | 18 +-
+ arch/powerpc/net/bpf_jit_comp.c | 15 +-
+ arch/sparc/net/bpf_jit_comp_32.c | 13 +-
+ drivers/atm/fore200e.c | 4 +-
+ drivers/crypto/chelsio/chtls/chtls_cm.c | 3 +-
+ drivers/infiniband/hw/cxgb4/cm.c | 8 +-
+ drivers/infiniband/hw/i40iw/i40iw_cm.c | 8 +-
+ drivers/infiniband/hw/mlx4/cq.c | 9 +-
+ drivers/infiniband/hw/nes/nes_mgt.c | 8 +-
+ drivers/infiniband/ulp/ipoib/ipoib_main.c | 6 +-
+ drivers/isdn/hardware/Kconfig | 2 -
+ drivers/isdn/hardware/Makefile | 1 -
+ drivers/isdn/hardware/eicon/Kconfig | 51 -
+ drivers/isdn/hardware/eicon/Makefile | 24 -
+ drivers/isdn/hardware/eicon/adapter.h | 18 -
+ drivers/isdn/hardware/eicon/capi20.h | 699 -
+ drivers/isdn/hardware/eicon/capidtmf.c | 685 -
+ drivers/isdn/hardware/eicon/capidtmf.h | 79 -
+ drivers/isdn/hardware/eicon/capifunc.c | 1219 --
+ drivers/isdn/hardware/eicon/capifunc.h | 40 -
+ drivers/isdn/hardware/eicon/capimain.c | 141 -
+ drivers/isdn/hardware/eicon/cardtype.h | 1098 --
+ drivers/isdn/hardware/eicon/cp_vers.h | 26 -
+ drivers/isdn/hardware/eicon/dadapter.c | 364 -
+ drivers/isdn/hardware/eicon/dadapter.h | 34 -
+ drivers/isdn/hardware/eicon/debug.c | 2128 ---
+ drivers/isdn/hardware/eicon/debug_if.h | 88 -
+ drivers/isdn/hardware/eicon/debuglib.c | 156 -
+ drivers/isdn/hardware/eicon/debuglib.h | 322 -
+ drivers/isdn/hardware/eicon/dfifo.h | 54 -
+ drivers/isdn/hardware/eicon/di.c | 835 --
+ drivers/isdn/hardware/eicon/di.h | 118 -
+ drivers/isdn/hardware/eicon/di_dbg.h | 37 -
+ drivers/isdn/hardware/eicon/di_defs.h | 181 -
+ drivers/isdn/hardware/eicon/did_vers.h | 26 -
+ drivers/isdn/hardware/eicon/diddfunc.c | 115 -
+ drivers/isdn/hardware/eicon/diva.c | 666 -
+ drivers/isdn/hardware/eicon/diva.h | 33 -
+ drivers/isdn/hardware/eicon/diva_didd.c | 139 -
+ drivers/isdn/hardware/eicon/diva_dma.c | 94 -
+ drivers/isdn/hardware/eicon/diva_dma.h | 48 -
+ drivers/isdn/hardware/eicon/diva_pci.h | 20 -
+ drivers/isdn/hardware/eicon/divacapi.h | 1350 --
+ drivers/isdn/hardware/eicon/divamnt.c | 239 -
+ drivers/isdn/hardware/eicon/divasfunc.c | 237 -
+ drivers/isdn/hardware/eicon/divasi.c | 562 -
+ drivers/isdn/hardware/eicon/divasmain.c | 848 --
+ drivers/isdn/hardware/eicon/divasproc.c | 412 -
+ drivers/isdn/hardware/eicon/divasync.h | 489 -
+ drivers/isdn/hardware/eicon/dqueue.c | 110 -
+ drivers/isdn/hardware/eicon/dqueue.h | 32 -
+ drivers/isdn/hardware/eicon/dsp_defs.h | 301 -
+ drivers/isdn/hardware/eicon/dsp_tst.h | 48 -
+ drivers/isdn/hardware/eicon/dspdids.h | 75 -
+ drivers/isdn/hardware/eicon/dsrv4bri.h | 40 -
+ drivers/isdn/hardware/eicon/dsrv_bri.h | 37 -
+ drivers/isdn/hardware/eicon/dsrv_pri.h | 38 -
+ drivers/isdn/hardware/eicon/entity.h | 29 -
+ drivers/isdn/hardware/eicon/helpers.h | 51 -
+ drivers/isdn/hardware/eicon/idifunc.c | 268 -
+ drivers/isdn/hardware/eicon/io.c | 852 --
+ drivers/isdn/hardware/eicon/io.h | 308 -
+ drivers/isdn/hardware/eicon/istream.c | 226 -
+ drivers/isdn/hardware/eicon/kst_ifc.h | 335 -
+ drivers/isdn/hardware/eicon/maintidi.c | 2194 ---
+ drivers/isdn/hardware/eicon/maintidi.h | 171 -
+ drivers/isdn/hardware/eicon/man_defs.h | 133 -
+ drivers/isdn/hardware/eicon/mdm_msg.h | 346 -
+ drivers/isdn/hardware/eicon/message.c | 14954 -------------------
+ drivers/isdn/hardware/eicon/mi_pc.h | 204 -
+ drivers/isdn/hardware/eicon/mntfunc.c | 370 -
+ drivers/isdn/hardware/eicon/os_4bri.c | 1132 --
+ drivers/isdn/hardware/eicon/os_4bri.h | 9 -
+ drivers/isdn/hardware/eicon/os_bri.c | 815 -
+ drivers/isdn/hardware/eicon/os_bri.h | 9 -
+ drivers/isdn/hardware/eicon/os_capi.h | 21 -
+ drivers/isdn/hardware/eicon/os_pri.c | 1053 --
+ drivers/isdn/hardware/eicon/os_pri.h | 9 -
+ drivers/isdn/hardware/eicon/pc.h | 738 -
+ drivers/isdn/hardware/eicon/pc_init.h | 267 -
+ drivers/isdn/hardware/eicon/pc_maint.h | 160 -
+ drivers/isdn/hardware/eicon/pkmaint.h | 43 -
+ drivers/isdn/hardware/eicon/platform.h | 369 -
+ drivers/isdn/hardware/eicon/pr_pc.h | 76 -
+ drivers/isdn/hardware/eicon/s_4bri.c | 510 -
+ drivers/isdn/hardware/eicon/s_bri.c | 191 -
+ drivers/isdn/hardware/eicon/s_pri.c | 205 -
+ drivers/isdn/hardware/eicon/sdp_hdr.h | 117 -
+ drivers/isdn/hardware/eicon/um_idi.c | 886 --
+ drivers/isdn/hardware/eicon/um_idi.h | 44 -
+ drivers/isdn/hardware/eicon/um_xdi.h | 69 -
+ drivers/isdn/hardware/eicon/xdi_adapter.h | 71 -
+ drivers/isdn/hardware/eicon/xdi_msg.h | 128 -
+ drivers/isdn/hardware/eicon/xdi_vers.h | 26 -
+ drivers/isdn/hardware/mISDN/w6692.c | 3 -
+ drivers/isdn/hisax/hfc_pci.c | 3 +-
+ drivers/misc/mic/vop/vop_main.c | 13 +
+ drivers/net/Kconfig | 8 +-
+ drivers/net/bonding/bond_main.c | 2 +-
+ drivers/net/can/Kconfig | 2 +-
+ drivers/net/can/flexcan.c | 365 +-
+ drivers/net/can/rcar/Kconfig | 1 +
+ drivers/net/can/rcar/Makefile | 1 +
+ drivers/net/can/rcar/rcar_can.c | 6 +-
+ drivers/net/can/rcar/rcar_canfd.c | 6 +-
+ drivers/net/can/sja1000/Kconfig | 1 +
+ drivers/net/can/sja1000/plx_pci.c | 65 +-
+ drivers/net/can/usb/ucan.c | 2 +-
+ drivers/net/can/vxcan.c | 2 +-
+ drivers/net/can/xilinx_can.c | 36 +-
+ drivers/net/dsa/bcm_sf2.c | 10 +
+ drivers/net/dsa/bcm_sf2.h | 3 +
+ drivers/net/dsa/bcm_sf2_cfp.c | 497 +-
+ drivers/net/dsa/microchip/Kconfig | 16 +-
+ drivers/net/dsa/microchip/Makefile | 5 +-
+ drivers/net/dsa/microchip/ksz9477.c | 1316 ++
+ .../microchip/{ksz_9477_reg.h => ksz9477_reg.h} | 17 +-
+ drivers/net/dsa/microchip/ksz9477_spi.c | 177 +
+ drivers/net/dsa/microchip/ksz_common.c | 1183 +-
+ drivers/net/dsa/microchip/ksz_common.h | 214 +
+ drivers/net/dsa/microchip/ksz_priv.h | 245 +-
+ drivers/net/dsa/microchip/ksz_spi.c | 217 -
+ drivers/net/dsa/microchip/ksz_spi.h | 69 +
+ drivers/net/dsa/mt7530.c | 3 +-
+ drivers/net/dsa/mv88e6xxx/chip.c | 38 +-
+ drivers/net/dsa/mv88e6xxx/port.c | 24 +-
+ drivers/net/dsa/mv88e6xxx/port.h | 2 +
+ drivers/net/dsa/mv88e6xxx/serdes.c | 26 +-
+ drivers/net/dsa/mv88e6xxx/serdes.h | 2 +
+ drivers/net/ethernet/3com/3c59x.c | 4 +-
+ drivers/net/ethernet/3com/Kconfig | 5 +-
+ drivers/net/ethernet/aeroflex/greth.c | 2 +-
+ drivers/net/ethernet/amd/sunlance.c | 4 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 41 +-
+ drivers/net/ethernet/apm/xgene-v2/mdio.c | 22 +-
+ drivers/net/ethernet/aquantia/atlantic/Makefile | 1 +
+ drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 6 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_common.h | 2 +-
+ .../net/ethernet/aquantia/atlantic/aq_ethtool.c | 69 +-
+ .../net/ethernet/aquantia/atlantic/aq_filters.c | 876 ++
+ .../net/ethernet/aquantia/atlantic/aq_filters.h | 36 +
+ drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 29 +
+ drivers/net/ethernet/aquantia/atlantic/aq_main.c | 55 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 8 +-
+ drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 21 +-
+ .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 +
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 164 +-
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 109 +
+ .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 48 +
+ .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 135 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_utils.c | 6 +-
+ .../aquantia/atlantic/hw_atl/hw_atl_utils.h | 58 +
+ drivers/net/ethernet/arc/emac_main.c | 3 +-
+ drivers/net/ethernet/broadcom/b44.c | 12 +-
+ drivers/net/ethernet/broadcom/bcmsysport.c | 83 +-
+ drivers/net/ethernet/broadcom/bcmsysport.h | 2 +-
+ .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 30 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 5 +
+ drivers/net/ethernet/broadcom/cnic.c | 2 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 65 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 2 +
+ drivers/net/ethernet/broadcom/genet/bcmmii.c | 5 +-
+ drivers/net/ethernet/broadcom/tg3.c | 105 +-
+ drivers/net/ethernet/cadence/macb_main.c | 2 +-
+ drivers/net/ethernet/cavium/common/cavium_ptp.c | 4 -
+ drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 7 +-
+ drivers/net/ethernet/chelsio/Kconfig | 3 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 12 +-
+ drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 73 +-
+ drivers/net/ethernet/chelsio/cxgb4/l2t.c | 13 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 62 +-
+ drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 1 +
+ drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 20 +
+ .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 12 +-
+ drivers/net/ethernet/cirrus/Kconfig | 2 +-
+ drivers/net/ethernet/cisco/enic/enic_ethtool.c | 2 +-
+ drivers/net/ethernet/dec/tulip/Kconfig | 4 +-
+ drivers/net/ethernet/dlink/dl2k.c | 2 +-
+ drivers/net/ethernet/emulex/benet/be_main.c | 15 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 5 +-
+ drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 71 +
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 454 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 28 +-
+ .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 19 +-
+ drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 5 +-
+ drivers/net/ethernet/freescale/fman/mac.c | 2 +-
+ drivers/net/ethernet/freescale/fsl_pq_mdio.c | 2 +-
+ drivers/net/ethernet/freescale/gianfar.c | 22 +-
+ drivers/net/ethernet/freescale/gianfar_ethtool.c | 8 +-
+ drivers/net/ethernet/freescale/ucc_geth.c | 7 +-
+ drivers/net/ethernet/hisilicon/hns/hns_enet.c | 6 +-
+ drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 2 +-
+ drivers/net/ethernet/hisilicon/hns3/Makefile | 2 +-
+ drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 9 +
+ drivers/net/ethernet/hisilicon/hns3/hnae3.h | 46 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_dcbnl.c | 12 +
+ drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 265 +
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 506 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 53 +-
+ drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 21 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/Makefile | 2 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 11 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 58 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_dcb.c | 70 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 487 +
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h | 23 +
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 1556 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 79 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 926 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 94 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 84 +-
+ .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 13 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 14 +-
+ .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 10 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 154 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.h | 9 +
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 734 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 96 +-
+ .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 18 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h | 2 +
+ drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c | 55 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_wq.h | 3 +-
+ drivers/net/ethernet/huawei/hinic/hinic_hw_wqe.h | 4 +
+ drivers/net/ethernet/huawei/hinic/hinic_main.c | 14 +-
+ drivers/net/ethernet/huawei/hinic/hinic_port.c | 30 +
+ drivers/net/ethernet/huawei/hinic/hinic_port.h | 10 +
+ drivers/net/ethernet/huawei/hinic/hinic_rx.c | 26 +-
+ drivers/net/ethernet/huawei/hinic/hinic_rx.h | 4 +
+ drivers/net/ethernet/ibm/emac/core.c | 9 +-
+ drivers/net/ethernet/intel/Kconfig | 24 +-
+ drivers/net/ethernet/intel/e100.c | 10 +-
+ drivers/net/ethernet/intel/e1000/e1000_main.c | 11 +-
+ drivers/net/ethernet/intel/e1000e/e1000.h | 3 +
+ drivers/net/ethernet/intel/e1000e/netdev.c | 59 +-
+ drivers/net/ethernet/intel/e1000e/ptp.c | 25 +-
+ drivers/net/ethernet/intel/fm10k/fm10k_main.c | 10 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 3 +-
+ drivers/net/ethernet/intel/i40e/i40e_adminq.c | 6 +
+ drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e_common.c | 3 +
+ drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 27 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 41 +-
+ drivers/net/ethernet/intel/i40e/i40e_ptp.c | 2 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 17 +-
+ drivers/net/ethernet/intel/i40e/i40e_type.h | 1 +
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 67 +-
+ drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 4 +-
+ drivers/net/ethernet/intel/iavf/iavf_txrx.c | 13 +-
+ drivers/net/ethernet/intel/ice/ice.h | 35 +-
+ drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 23 +-
+ drivers/net/ethernet/intel/ice/ice_common.c | 44 +-
+ drivers/net/ethernet/intel/ice/ice_controlq.c | 223 +-
+ drivers/net/ethernet/intel/ice/ice_ethtool.c | 26 +-
+ drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 3 +
+ drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 79 +-
+ drivers/net/ethernet/intel/ice/ice_lib.c | 152 +-
+ drivers/net/ethernet/intel/ice/ice_main.c | 75 +-
+ drivers/net/ethernet/intel/ice/ice_sched.c | 122 +-
+ drivers/net/ethernet/intel/ice/ice_sched.h | 3 +
+ drivers/net/ethernet/intel/ice/ice_sriov.c | 2 +-
+ drivers/net/ethernet/intel/ice/ice_switch.c | 55 +-
+ drivers/net/ethernet/intel/ice/ice_txrx.c | 46 +-
+ drivers/net/ethernet/intel/ice/ice_type.h | 4 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 34 +-
+ drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 2 +-
+ drivers/net/ethernet/intel/igb/igb_ethtool.c | 2 +-
+ drivers/net/ethernet/intel/igb/igb_main.c | 27 +-
+ drivers/net/ethernet/intel/igb/igb_ptp.c | 65 +-
+ drivers/net/ethernet/intel/igbvf/mbx.c | 4 +-
+ drivers/net/ethernet/intel/igbvf/netdev.c | 9 +-
+ drivers/net/ethernet/intel/igc/igc.h | 11 -
+ drivers/net/ethernet/intel/igc/igc_base.c | 8 -
+ drivers/net/ethernet/intel/igc/igc_main.c | 48 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 3 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 4 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 13 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 54 +-
+ drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 24 +-
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 21 +-
+ drivers/net/ethernet/marvell/mvneta.c | 3 +-
+ drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 162 +-
+ drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 36 +-
+ .../net/ethernet/marvell/octeontx2/af/cgx_fw_if.h | 14 +-
+ drivers/net/ethernet/marvell/octeontx2/af/common.h | 32 +-
+ drivers/net/ethernet/marvell/octeontx2/af/mbox.c | 2 +-
+ drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 340 +-
+ drivers/net/ethernet/marvell/octeontx2/af/npc.h | 24 +
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 986 +-
+ drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 220 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 133 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 1414 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_npa.c | 25 +-
+ .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 1538 +-
+ drivers/net/ethernet/marvell/skge.c | 14 +-
+ drivers/net/ethernet/marvell/sky2.c | 20 +-
+ drivers/net/ethernet/mediatek/mtk_eth_soc.c | 7 +-
+ drivers/net/ethernet/mellanox/mlx4/cq.c | 71 +-
+ drivers/net/ethernet/mellanox/mlx4/en_cq.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx4/fw.c | 3 +
+ drivers/net/ethernet/mellanox/mlx4/main.c | 17 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 42 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 16 +
+ .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 135 +-
+ .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 112 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 223 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 6 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 2 +-
+ .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 2 +-
+ drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 +
+ drivers/net/ethernet/mellanox/mlxsw/core.c | 45 +-
+ drivers/net/ethernet/mellanox/mlxsw/core.h | 2 +
+ .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 22 +-
+ .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 7 +-
+ drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 56 +-
+ drivers/net/ethernet/mellanox/mlxsw/pci.c | 11 +-
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 215 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 296 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 49 +-
+ .../ethernet/mellanox/mlxsw/spectrum2_acl_tcam.c | 12 +-
+ .../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 75 +-
+ .../ethernet/mellanox/mlxsw/spectrum_acl_ctcam.c | 5 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 454 +-
+ .../mellanox/mlxsw/spectrum_acl_flex_keys.c | 32 +-
+ .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 42 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_fid.c | 148 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c | 58 +-
+ drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.h | 2 +
+ .../ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c | 28 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 11 +-
+ .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 651 +-
+ drivers/net/ethernet/mscc/ocelot.c | 30 +-
+ drivers/net/ethernet/mscc/ocelot.h | 1 +
+ drivers/net/ethernet/mscc/ocelot_board.c | 3 +
+ drivers/net/ethernet/neterion/Kconfig | 4 +-
+ drivers/net/ethernet/neterion/vxge/vxge-traffic.c | 7 -
+ drivers/net/ethernet/netronome/nfp/Makefile | 2 +
+ drivers/net/ethernet/netronome/nfp/abm/cls.c | 283 +
+ drivers/net/ethernet/netronome/nfp/abm/ctrl.c | 370 +-
+ drivers/net/ethernet/netronome/nfp/abm/main.c | 348 +-
+ drivers/net/ethernet/netronome/nfp/abm/main.h | 206 +-
+ drivers/net/ethernet/netronome/nfp/abm/qdisc.c | 850 ++
+ drivers/net/ethernet/netronome/nfp/bpf/main.c | 2 +-
+ drivers/net/ethernet/netronome/nfp/bpf/main.h | 6 +-
+ drivers/net/ethernet/netronome/nfp/bpf/offload.c | 43 +-
+ drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 11 +-
+ drivers/net/ethernet/netronome/nfp/flower/action.c | 164 +-
+ drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 51 +
+ .../net/ethernet/netronome/nfp/flower/lag_conf.c | 48 +-
+ drivers/net/ethernet/netronome/nfp/flower/main.c | 41 +-
+ drivers/net/ethernet/netronome/nfp/flower/main.h | 24 +-
+ drivers/net/ethernet/netronome/nfp/flower/match.c | 38 +-
+ .../net/ethernet/netronome/nfp/flower/metadata.c | 12 +-
+ .../net/ethernet/netronome/nfp/flower/offload.c | 243 +-
+ .../ethernet/netronome/nfp/flower/tunnel_conf.c | 62 +-
+ drivers/net/ethernet/netronome/nfp/nfp_app.c | 89 +
+ drivers/net/ethernet/netronome/nfp/nfp_app.h | 25 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net.h | 6 +-
+ .../net/ethernet/netronome/nfp/nfp_net_common.c | 113 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.c | 21 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 9 +
+ .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 42 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 4 +-
+ drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 90 +
+ drivers/net/ethernet/netronome/nfp/nfp_net_repr.h | 2 +
+ .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 3 +-
+ drivers/net/ethernet/nxp/lpc_eth.c | 6 +-
+ drivers/net/ethernet/qlogic/qed/qed.h | 31 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev.c | 334 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 28 +
+ drivers/net/ethernet/qlogic/qed/qed_hsi.h | 6 +
+ drivers/net/ethernet/qlogic/qed/qed_int.c | 152 +-
+ drivers/net/ethernet/qlogic/qed/qed_int.h | 10 +
+ drivers/net/ethernet/qlogic/qed/qed_ll2.c | 30 +-
+ drivers/net/ethernet/qlogic/qed/qed_ll2.h | 1 +
+ drivers/net/ethernet/qlogic/qed/qed_main.c | 79 +-
+ drivers/net/ethernet/qlogic/qed/qed_mcp.c | 65 +-
+ drivers/net/ethernet/qlogic/qed/qed_mcp.h | 10 -
+ drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 50 +
+ drivers/net/ethernet/qlogic/qed/qed_sp.h | 4 +-
+ drivers/net/ethernet/qlogic/qed/qed_spq.c | 47 +-
+ drivers/net/ethernet/qlogic/qede/qede.h | 13 +-
+ drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 1 +
+ drivers/net/ethernet/qlogic/qede/qede_fp.c | 4 +-
+ drivers/net/ethernet/qlogic/qede/qede_main.c | 19 +-
+ drivers/net/ethernet/qlogic/qede/qede_ptp.c | 6 +-
+ drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 13 +-
+ drivers/net/ethernet/qualcomm/qca_debug.c | 17 +-
+ drivers/net/ethernet/qualcomm/qca_spi.c | 16 +-
+ drivers/net/ethernet/qualcomm/qca_spi.h | 1 +
+ drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 5 +-
+ .../ethernet/qualcomm/rmnet/rmnet_map_command.c | 9 -
+ drivers/net/ethernet/realtek/r8169.c | 388 +-
+ drivers/net/ethernet/renesas/ravb.h | 1 -
+ drivers/net/ethernet/renesas/ravb_main.c | 23 +-
+ drivers/net/ethernet/rocker/rocker_main.c | 60 +-
+ drivers/net/ethernet/sfc/ef10.c | 7 +
+ drivers/net/ethernet/sfc/ethtool.c | 2 +-
+ drivers/net/ethernet/sfc/falcon/ethtool.c | 2 +-
+ drivers/net/ethernet/sfc/tx.c | 5 +-
+ drivers/net/ethernet/smsc/Kconfig | 4 +-
+ drivers/net/ethernet/socionext/netsec.c | 238 +-
+ drivers/net/ethernet/socionext/sni_ave.c | 62 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 12 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 36 +-
+ drivers/net/ethernet/sun/sunhme.c | 2 +-
+ drivers/net/ethernet/ti/Kconfig | 3 +-
+ drivers/net/ethernet/ti/cpsw.c | 241 +-
+ drivers/net/ethernet/ti/cpts.c | 32 +-
+ drivers/net/ethernet/ti/cpts.h | 38 -
+ drivers/net/ethernet/ti/davinci_emac.c | 14 +-
+ drivers/net/ethernet/ti/netcp_ethss.c | 36 +-
+ drivers/net/ethernet/ti/tlan.c | 4 +-
+ drivers/net/ethernet/toshiba/tc35815.c | 29 +-
+ drivers/net/geneve.c | 111 +-
+ drivers/net/hyperv/netvsc_drv.c | 15 +-
+ drivers/net/ipvlan/ipvlan_main.c | 19 +-
+ drivers/net/net_failover.c | 8 +-
+ drivers/net/netdevsim/bpf.c | 52 +-
+ drivers/net/phy/amd.c | 1 -
+ drivers/net/phy/aquantia.c | 15 +-
+ drivers/net/phy/at803x.c | 3 -
+ drivers/net/phy/bcm63xx.c | 6 +-
+ drivers/net/phy/bcm7xxx.c | 2 +
+ drivers/net/phy/bcm87xx.c | 10 +-
+ drivers/net/phy/broadcom.c | 16 -
+ drivers/net/phy/cicada.c | 2 -
+ drivers/net/phy/davicom.c | 4 -
+ drivers/net/phy/dp83640.c | 1 -
+ drivers/net/phy/dp83822.c | 1 -
+ drivers/net/phy/dp83848.c | 1 -
+ drivers/net/phy/dp83867.c | 1 -
+ drivers/net/phy/dp83tc811.c | 1 -
+ drivers/net/phy/fixed_phy.c | 19 +-
+ drivers/net/phy/icplus.c | 145 +-
+ drivers/net/phy/intel-xway.c | 10 -
+ drivers/net/phy/lxt.c | 6 +-
+ drivers/net/phy/marvell.c | 97 +-
+ drivers/net/phy/marvell10g.c | 37 +-
+ drivers/net/phy/mdio-gpio.c | 7 +
+ drivers/net/phy/meson-gxl.c | 2 +-
+ drivers/net/phy/micrel.c | 31 +-
+ drivers/net/phy/microchip.c | 1 -
+ drivers/net/phy/microchip_t1.c | 1 -
+ drivers/net/phy/mscc.c | 6 -
+ drivers/net/phy/national.c | 1 -
+ drivers/net/phy/phy-c45.c | 12 +-
+ drivers/net/phy/phy-core.c | 213 +-
+ drivers/net/phy/phy.c | 458 +-
+ drivers/net/phy/phy_device.c | 191 +-
+ drivers/net/phy/phy_led_triggers.c | 15 +-
+ drivers/net/phy/phylink.c | 19 +-
+ drivers/net/phy/qsemi.c | 1 -
+ drivers/net/phy/realtek.c | 45 +-
+ drivers/net/phy/smsc.c | 7 +-
+ drivers/net/phy/ste10Xp.c | 2 -
+ drivers/net/phy/uPD60620.c | 6 +-
+ drivers/net/phy/vitesse.c | 21 -
+ drivers/net/team/team.c | 2 +-
+ drivers/net/tun.c | 89 +-
+ drivers/net/usb/Kconfig | 11 +
+ drivers/net/usb/Makefile | 1 +
+ drivers/net/usb/aqc111.c | 1459 ++
+ drivers/net/usb/aqc111.h | 232 +
+ drivers/net/usb/cdc_ether.c | 26 +
+ drivers/net/usb/lan78xx.c | 27 +-
+ drivers/net/usb/smsc95xx.c | 55 +-
+ drivers/net/veth.c | 2 +-
+ drivers/net/vrf.c | 30 +-
+ drivers/net/vxlan.c | 390 +-
+ drivers/net/wan/fsl_ucc_hdlc.c | 8 +
+ drivers/net/wireless/ath/ath10k/core.c | 5 +
+ drivers/net/wireless/ath/ath10k/core.h | 5 +
+ drivers/net/wireless/ath/ath10k/coredump.c | 118 +-
+ drivers/net/wireless/ath/ath10k/coredump.h | 1 +
+ drivers/net/wireless/ath/ath10k/debugfs_sta.c | 12 +-
+ drivers/net/wireless/ath/ath10k/htt_rx.c | 17 +-
+ drivers/net/wireless/ath/ath10k/mac.c | 11 +-
+ drivers/net/wireless/ath/ath10k/qmi.c | 8 +-
+ drivers/net/wireless/ath/ath10k/snoc.c | 228 +-
+ drivers/net/wireless/ath/ath10k/snoc.h | 17 +-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.c | 6 +-
+ drivers/net/wireless/ath/ath10k/wmi-tlv.h | 10 +
+ drivers/net/wireless/ath/ath10k/wmi.c | 128 +-
+ drivers/net/wireless/ath/ath10k/wmi.h | 13 +
+ drivers/net/wireless/ath/ath10k/wow.c | 4 +-
+ drivers/net/wireless/ath/ath6kl/main.c | 1 +
+ drivers/net/wireless/ath/ath9k/Kconfig | 2 +-
+ drivers/net/wireless/ath/ath9k/ar5008_phy.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9002_phy.c | 2 +-
+ drivers/net/wireless/ath/ath9k/ar9003_mci.c | 4 +-
+ drivers/net/wireless/ath/ath9k/ath9k.h | 2 +-
+ drivers/net/wireless/ath/ath9k/dynack.c | 61 +-
+ drivers/net/wireless/ath/ath9k/dynack.h | 6 +-
+ drivers/net/wireless/ath/ath9k/hw.c | 1 +
+ drivers/net/wireless/ath/ath9k/xmit.c | 5 +-
+ drivers/net/wireless/ath/carl9170/rx.c | 1 +
+ drivers/net/wireless/ath/carl9170/tx.c | 3 +
+ drivers/net/wireless/ath/wil6210/cfg80211.c | 104 +-
+ drivers/net/wireless/ath/wil6210/debugfs.c | 17 +-
+ drivers/net/wireless/ath/wil6210/main.c | 227 +-
+ drivers/net/wireless/ath/wil6210/netdev.c | 5 +-
+ drivers/net/wireless/ath/wil6210/txrx.c | 14 +-
+ drivers/net/wireless/ath/wil6210/txrx_edma.c | 92 +-
+ drivers/net/wireless/ath/wil6210/txrx_edma.h | 4 +-
+ drivers/net/wireless/ath/wil6210/wil6210.h | 21 +-
+ drivers/net/wireless/ath/wil6210/wmi.c | 56 +-
+ drivers/net/wireless/broadcom/b43/Kconfig | 1 +
+ drivers/net/wireless/broadcom/b43/phy_common.c | 47 -
+ drivers/net/wireless/broadcom/b43/phy_common.h | 9 -
+ drivers/net/wireless/broadcom/b43/phy_lp.c | 13 +-
+ drivers/net/wireless/broadcom/b43/phy_n.c | 13 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/Makefile | 2 +
+ .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 137 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/common.c | 7 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/common.h | 8 +
+ .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 116 +
+ .../broadcom/brcm80211/brcmfmac/firmware.c | 215 +-
+ .../broadcom/brcm80211/brcmfmac/firmware.h | 1 +
+ .../broadcom/brcm80211/brcmfmac/fwil_types.h | 40 +-
+ .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 11 +-
+ .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 1 +
+ .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 1 +
+ .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 4 +-
+ .../broadcom/brcm80211/brcmsmac/phy/phy_int.h | 7 -
+ .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 4 +-
+ .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 4 +-
+ .../net/wireless/broadcom/brcm80211/brcmutil/d11.c | 14 +-
+ drivers/net/wireless/cisco/airo.c | 2 +-
+ drivers/net/wireless/intel/ipw2x00/Kconfig | 10 +-
+ drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +-
+ drivers/net/wireless/intel/iwlegacy/3945-rs.c | 2 +-
+ drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +-
+ drivers/net/wireless/intel/iwlegacy/common.c | 2 +
+ drivers/net/wireless/intel/iwlwifi/Makefile | 1 +
+ drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 1 -
+ .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 401 +
+ drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 39 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 384 +-
+ drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 40 +-
+ drivers/net/wireless/intel/iwlwifi/fw/file.h | 7 +
+ drivers/net/wireless/intel/iwlwifi/fw/img.h | 26 +
+ drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 5 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 230 +
+ drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h | 87 +
+ drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 24 +-
+ drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 +
+ drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 7 +
+ drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 25 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +-
+ .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 14 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 5 +
+ drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 46 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 31 +
+ drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 10 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 18 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 4 +
+ drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 6 -
+ drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 114 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 4 +
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 83 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 54 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 52 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 44 +
+ drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 225 +-
+ drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 3 +-
+ drivers/net/wireless/intersil/hostap/hostap_main.c | 2 +-
+ .../net/wireless/intersil/orinoco/orinoco_usb.c | 1 +
+ drivers/net/wireless/intersil/prism54/isl_38xx.c | 1 +
+ drivers/net/wireless/intersil/prism54/isl_ioctl.c | 1 +
+ drivers/net/wireless/intersil/prism54/islpci_dev.c | 1 +
+ drivers/net/wireless/marvell/libertas/if_spi.c | 4 +-
+ drivers/net/wireless/marvell/mwifiex/ie.c | 1 +
+ drivers/net/wireless/quantenna/qtnfmac/Kconfig | 15 +-
+ drivers/net/wireless/quantenna/qtnfmac/Makefile | 9 +-
+ drivers/net/wireless/quantenna/qtnfmac/commands.c | 21 +-
+ drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 282 +-
+ .../wireless/quantenna/qtnfmac/pcie/pcie_priv.h | 20 +-
+ .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 211 +-
+ .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 1219 ++
+ .../quantenna/qtnfmac/pcie/topaz_pcie_ipc.h | 94 +
+ .../quantenna/qtnfmac/pcie/topaz_pcie_regs.h | 45 +
+ .../net/wireless/quantenna/qtnfmac/qtn_hw_ids.h | 4 +-
+ drivers/net/wireless/quantenna/qtnfmac/util.c | 18 +
+ drivers/net/wireless/quantenna/qtnfmac/util.h | 2 +
+ drivers/net/wireless/ralink/rt2x00/rt2400pci.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2500pci.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 4 +
+ drivers/net/wireless/ralink/rt2x00/rt61pci.c | 2 +-
+ drivers/net/wireless/ray_cs.c | 2 +
+ .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 5 +
+ .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 4 -
+ .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 1 -
+ .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 2 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/phy.c | 5 +-
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/table.c | 4 -
+ .../net/wireless/realtek/rtlwifi/rtl8723ae/table.h | 2 -
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 1 +
+ .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 1 -
+ drivers/net/wireless/rsi/rsi_91x_sdio_ops.c | 4 +-
+ drivers/net/wireless/st/cw1200/sta.c | 2 +-
+ drivers/net/wireless/ti/wlcore/vendor_cmd.c | 2 +-
+ drivers/net/wireless/zydas/zd1201.c | 1 +
+ drivers/net/xen-netfront.c | 2 -
+ drivers/of/of_net.c | 39 -
+ drivers/ptp/ptp_chardev.c | 55 +-
+ drivers/ptp/ptp_clock.c | 10 +-
+ drivers/remoteproc/remoteproc_virtio.c | 13 +
+ drivers/s390/net/qeth_core.h | 19 +-
+ drivers/s390/net/qeth_core_main.c | 137 +-
+ drivers/s390/net/qeth_core_mpc.c | 1 -
+ drivers/s390/net/qeth_core_mpc.h | 32 +-
+ drivers/s390/net/qeth_l2_main.c | 47 +-
+ drivers/s390/net/qeth_l3_main.c | 140 +-
+ drivers/s390/virtio/virtio_ccw.c | 14 +
+ drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 3 +-
+ drivers/soc/fsl/qbman/qman.c | 35 +-
+ drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 70 +-
+ drivers/staging/unisys/visornic/visornic_main.c | 2 +-
+ drivers/target/iscsi/cxgbit/cxgbit_cm.c | 8 +-
+ drivers/vhost/net.c | 54 +-
+ drivers/virtio/virtio_ring.c | 1811 ++-
+ include/linux/avf/virtchnl.h | 10 +-
+ include/linux/bpf.h | 18 +-
+ include/linux/bpf_verifier.h | 2 +-
+ include/linux/brcmphy.h | 1 +
+ include/linux/btf.h | 16 +
+ include/linux/cordic.h | 9 +
+ include/linux/etherdevice.h | 1 +
+ include/linux/filter.h | 16 +-
+ include/linux/if_bridge.h | 12 +
+ include/linux/if_vlan.h | 53 +-
+ include/linux/linkmode.h | 9 +
+ include/linux/mii.h | 121 +-
+ include/linux/mlx4/device.h | 4 +-
+ include/linux/netdevice.h | 51 +-
+ include/linux/objagg.h | 46 +
+ include/linux/of_net.h | 6 -
+ include/linux/pci_ids.h | 2 +
+ include/linux/phy.h | 90 +-
+ include/linux/phy_led_triggers.h | 2 +-
+ include/linux/platform_data/mdio-gpio.h | 14 +
+ include/linux/ptp_clock_kernel.h | 33 +
+ include/linux/qed/qed_if.h | 41 +
+ include/linux/rhashtable.h | 34 +-
+ include/linux/skbuff.h | 34 +-
+ include/linux/udp.h | 26 +-
+ include/net/devlink.h | 4 +
+ include/net/dsa.h | 1 +
+ include/net/flow.h | 2 +-
+ include/net/flow_dissector.h | 6 +-
+ include/net/gen_stats.h | 2 +-
+ include/net/geneve.h | 6 +
+ include/net/icmp.h | 2 +-
+ include/net/inet6_hashtables.h | 5 +-
+ include/net/inet_hashtables.h | 24 +-
+ include/net/inet_sock.h | 21 +
+ include/net/ip.h | 4 +-
+ include/net/ip6_tunnel.h | 2 +
+ include/net/ip_tunnels.h | 1 +
+ include/net/ipv6.h | 2 +
+ include/net/l3mdev.h | 22 +
+ include/net/neighbour.h | 3 +
+ include/net/netns/ipv4.h | 3 +
+ include/net/pkt_cls.h | 104 +-
+ include/net/protocol.h | 9 +-
+ include/net/raw.h | 14 +-
+ include/net/rtnetlink.h | 3 +-
+ include/net/sch_generic.h | 27 +
+ include/net/sctp/constants.h | 2 +-
+ include/net/sctp/sctp.h | 4 +-
+ include/net/sctp/sm.h | 4 +-
+ include/net/sctp/structs.h | 10 +-
+ include/net/sctp/ulpevent.h | 39 +-
+ include/net/sock.h | 20 +-
+ include/net/switchdev.h | 89 +-
+ include/net/tcp.h | 51 +-
+ include/net/udp.h | 58 +-
+ include/net/udp_tunnel.h | 10 +
+ include/net/vxlan.h | 17 +
+ include/soc/fsl/qman.h | 8 +-
+ include/trace/events/net.h | 59 +
+ include/trace/events/objagg.h | 228 +
+ include/uapi/linux/bpf.h | 39 +-
+ include/uapi/linux/btf.h | 18 +-
+ include/uapi/linux/devlink.h | 5 +
+ include/uapi/linux/ethtool.h | 4 +-
+ include/uapi/linux/if_bridge.h | 21 +
+ include/uapi/linux/if_link.h | 19 +
+ include/uapi/linux/if_tun.h | 1 +
+ include/uapi/linux/ncsi.h | 15 +
+ include/uapi/linux/net_namespace.h | 2 +
+ include/uapi/linux/pkt_cls.h | 7 +
+ include/uapi/linux/pkt_sched.h | 30 +
+ include/uapi/linux/ptp_clock.h | 12 +
+ include/uapi/linux/sctp.h | 13 +-
+ include/uapi/linux/snmp.h | 1 +
+ include/uapi/linux/tcp.h | 1 +
+ include/uapi/linux/udp.h | 1 +
+ include/uapi/linux/virtio_config.h | 3 +
+ include/uapi/linux/virtio_ring.h | 52 +
+ kernel/bpf/btf.c | 397 +-
+ kernel/bpf/core.c | 14 +
+ kernel/bpf/hashtab.c | 13 +-
+ kernel/bpf/local_storage.c | 3 +-
+ kernel/bpf/lpm_trie.c | 59 +-
+ kernel/bpf/offload.c | 76 +-
+ kernel/bpf/syscall.c | 42 +-
+ kernel/bpf/verifier.c | 176 +-
+ lib/Kconfig | 3 +
+ lib/Kconfig.debug | 10 +
+ lib/Makefile | 2 +
+ lib/cordic.c | 23 +-
+ lib/objagg.c | 501 +
+ lib/rhashtable.c | 8 +-
+ lib/test_bpf.c | 14 +-
+ lib/test_objagg.c | 836 ++
+ net/8021q/vlan.c | 101 +-
+ net/8021q/vlan.h | 12 +
+ net/8021q/vlan_core.c | 128 +-
+ net/8021q/vlan_dev.c | 2 +
+ net/batman-adv/Kconfig | 10 +-
+ net/batman-adv/bat_iv_ogm.c | 25 +-
+ net/batman-adv/bat_v.c | 26 +-
+ net/batman-adv/bridge_loop_avoidance.c | 82 +-
+ net/batman-adv/debugfs.c | 2 +
+ net/batman-adv/distributed-arp-table.c | 42 +-
+ net/batman-adv/gateway_client.c | 3 +
+ net/batman-adv/hard-interface.c | 3 +
+ net/batman-adv/hash.c | 2 +
+ net/batman-adv/hash.h | 6 +
+ net/batman-adv/log.c | 60 +-
+ net/batman-adv/main.c | 3 +
+ net/batman-adv/main.h | 3 +-
+ net/batman-adv/multicast.c | 51 +-
+ net/batman-adv/netlink.c | 24 +-
+ net/batman-adv/trace.c | 2 -
+ net/batman-adv/trace.h | 6 +
+ net/batman-adv/translation-table.c | 41 +-
+ net/batman-adv/types.h | 5 +-
+ net/bluetooth/6lowpan.c | 2 +-
+ net/bridge/br.c | 76 +
+ net/bridge/br_device.c | 10 +
+ net/bridge/br_fdb.c | 20 +
+ net/bridge/br_if.c | 12 +
+ net/bridge/br_input.c | 4 +-
+ net/bridge/br_mdb.c | 122 +-
+ net/bridge/br_multicast.c | 439 +-
+ net/bridge/br_netfilter_hooks.c | 15 +-
+ net/bridge/br_netlink.c | 37 +-
+ net/bridge/br_private.h | 53 +-
+ net/bridge/br_sysfs_br.c | 36 +-
+ net/bridge/br_sysfs_if.c | 3 -
+ net/bridge/br_vlan.c | 12 +-
+ net/core/datagram.c | 45 +-
+ net/core/dev.c | 108 +-
+ net/core/dev_addr_lists.c | 97 +
+ net/core/dev_ioctl.c | 2 +-
+ net/core/devlink.c | 5 +
+ net/core/filter.c | 409 +-
+ net/core/flow_dissector.c | 3 +-
+ net/core/neighbour.c | 174 +-
+ net/core/net-sysfs.c | 2 +-
+ net/core/net_namespace.c | 159 +-
+ net/core/netpoll.c | 2 +-
+ net/core/rtnetlink.c | 353 +-
+ net/core/skbuff.c | 115 +-
+ net/core/sock.c | 14 +-
+ net/core/sock_reuseport.c | 1 +
+ net/core/stream.c | 2 +-
+ net/dccp/ipv4.c | 13 +-
+ net/dccp/ipv6.c | 13 +-
+ net/dccp/proto.c | 2 +-
+ net/decnet/af_decnet.c | 2 +-
+ net/dsa/master.c | 29 +
+ net/dsa/port.c | 3 -
+ net/dsa/slave.c | 58 +-
+ net/dsa/tag_brcm.c | 2 +
+ net/dsa/tag_dsa.c | 1 +
+ net/dsa/tag_edsa.c | 1 +
+ net/dsa/tag_gswip.c | 1 +
+ net/dsa/tag_ksz.c | 1 +
+ net/dsa/tag_lan9303.c | 1 +
+ net/dsa/tag_mtk.c | 1 +
+ net/dsa/tag_qca.c | 1 +
+ net/dsa/tag_trailer.c | 1 +
+ net/ethernet/eth.c | 56 +-
+ net/ipv4/af_inet.c | 4 +-
+ net/ipv4/devinet.c | 2 +-
+ net/ipv4/fib_semantics.c | 2 +-
+ net/ipv4/fou.c | 68 +
+ net/ipv4/gre_demux.c | 9 +-
+ net/ipv4/icmp.c | 6 +-
+ net/ipv4/inet_connection_sock.c | 14 +-
+ net/ipv4/inet_hashtables.c | 34 +-
+ net/ipv4/ip_forward.c | 7 +
+ net/ipv4/ip_gre.c | 50 +-
+ net/ipv4/ip_input.c | 73 +-
+ net/ipv4/ip_output.c | 38 +-
+ net/ipv4/ip_tunnel_core.c | 2 +-
+ net/ipv4/ipconfig.c | 6 +-
+ net/ipv4/ipip.c | 14 +-
+ net/ipv4/ipmr.c | 6 +-
+ net/ipv4/metrics.c | 26 +-
+ net/ipv4/proc.c | 1 +
+ net/ipv4/protocol.c | 1 +
+ net/ipv4/raw.c | 31 +-
+ net/ipv4/route.c | 2 +-
+ net/ipv4/sysctl_net_ipv4.c | 11 +
+ net/ipv4/tcp.c | 17 +-
+ net/ipv4/tcp_bbr.c | 15 +-
+ net/ipv4/tcp_bpf.c | 17 +-
+ net/ipv4/tcp_input.c | 78 +-
+ net/ipv4/tcp_ipv4.c | 132 +-
+ net/ipv4/tcp_output.c | 37 +-
+ net/ipv4/tunnel4.c | 18 +-
+ net/ipv4/udp.c | 190 +-
+ net/ipv4/udp_impl.h | 2 +-
+ net/ipv4/udp_offload.c | 109 +-
+ net/ipv4/udp_tunnel.c | 18 +
+ net/ipv4/udplite.c | 4 +-
+ net/ipv4/xfrm4_protocol.c | 18 +-
+ net/ipv6/addrconf.c | 2 +-
+ net/ipv6/anycast.c | 6 +-
+ net/ipv6/datagram.c | 10 +-
+ net/ipv6/fou6.c | 74 +
+ net/ipv6/icmp.c | 4 +-
+ net/ipv6/inet6_hashtables.c | 14 +-
+ net/ipv6/ip6_gre.c | 18 +-
+ net/ipv6/ip6_input.c | 63 +-
+ net/ipv6/ip6_offload.c | 13 +-
+ net/ipv6/ip6_output.c | 45 +-
+ net/ipv6/ip6_udp_tunnel.c | 16 +
+ net/ipv6/ip6mr.c | 2 +-
+ net/ipv6/ipv6_sockglue.c | 2 +-
+ net/ipv6/raw.c | 5 +-
+ net/ipv6/route.c | 5 +-
+ net/ipv6/tcp_ipv6.c | 13 +-
+ net/ipv6/tunnel6.c | 12 +-
+ net/ipv6/udp.c | 241 +-
+ net/ipv6/udp_impl.h | 4 +-
+ net/ipv6/udp_offload.c | 6 +-
+ net/ipv6/udplite.c | 5 +-
+ net/ipv6/xfrm6_protocol.c | 18 +-
+ net/iucv/af_iucv.c | 41 +-
+ net/l3mdev/l3mdev.c | 18 +
+ net/ncsi/internal.h | 24 +-
+ net/ncsi/ncsi-aen.c | 75 +-
+ net/ncsi/ncsi-manage.c | 550 +-
+ net/ncsi/ncsi-netlink.c | 233 +-
+ net/ncsi/ncsi-pkt.h | 9 +
+ net/ncsi/ncsi-rsp.c | 43 +-
+ net/netfilter/nfnetlink_queue.c | 5 +-
+ net/openvswitch/actions.c | 13 +-
+ net/openvswitch/flow.c | 6 +-
+ net/openvswitch/flow.h | 2 +-
+ net/openvswitch/flow_netlink.c | 22 +-
+ net/openvswitch/vport-geneve.c | 2 +-
+ net/openvswitch/vport-gre.c | 2 +-
+ net/openvswitch/vport-netdev.c | 1 -
+ net/openvswitch/vport-vxlan.c | 2 +-
+ net/sched/act_tunnel_key.c | 25 +-
+ net/sched/act_vlan.c | 2 +-
+ net/sched/cls_api.c | 256 +-
+ net/sched/cls_flower.c | 155 +-
+ net/sched/cls_u32.c | 2 +
+ net/sched/sch_api.c | 95 +-
+ net/sched/sch_etf.c | 79 +-
+ net/sched/sch_fq.c | 28 +-
+ net/sched/sch_gred.c | 375 +-
+ net/sched/sch_mq.c | 18 +-
+ net/sched/sch_netem.c | 89 +-
+ net/sched/sch_prio.c | 47 +-
+ net/sched/sch_red.c | 48 +-
+ net/sctp/associola.c | 2 +
+ net/sctp/bind_addr.c | 28 +
+ net/sctp/chunk.c | 8 +-
+ net/sctp/input.c | 134 +-
+ net/sctp/ipv6.c | 7 +-
+ net/sctp/primitive.c | 2 +-
+ net/sctp/sm_sideeffect.c | 12 +-
+ net/sctp/sm_statetable.c | 2 +-
+ net/sctp/socket.c | 174 +-
+ net/sctp/stream_interleave.c | 46 +-
+ net/sctp/ulpqueue.c | 8 +-
+ net/smc/af_smc.c | 51 +-
+ net/smc/smc_clc.c | 33 +-
+ net/smc/smc_clc.h | 3 +-
+ net/smc/smc_core.c | 16 +-
+ net/smc/smc_core.h | 6 +-
+ net/smc/smc_llc.c | 57 +-
+ net/smc/smc_llc.h | 2 +
+ net/sunrpc/socklib.c | 2 +-
+ net/switchdev/switchdev.c | 193 +-
+ net/tipc/link.c | 59 +-
+ net/tipc/msg.h | 1 +
+ net/tipc/node.c | 6 +
+ net/tls/tls_sw.c | 11 +-
+ samples/bpf/Makefile | 8 +
+ samples/bpf/bpf_load.c | 37 +-
+ tools/bpf/bpftool/Documentation/bpftool-map.rst | 3 +-
+ tools/bpf/bpftool/Documentation/bpftool-prog.rst | 42 +-
+ tools/bpf/bpftool/Makefile | 13 +-
+ tools/bpf/bpftool/bash-completion/bpftool | 21 +-
+ tools/bpf/bpftool/btf_dumper.c | 136 +
+ tools/bpf/bpftool/common.c | 39 +-
+ tools/bpf/bpftool/jit_disasm.c | 8 +-
+ tools/bpf/bpftool/main.c | 3 -
+ tools/bpf/bpftool/main.h | 19 +
+ tools/bpf/bpftool/map.c | 132 +-
+ tools/bpf/bpftool/prog.c | 244 +-
+ tools/bpf/bpftool/xlated_dumper.c | 33 +
+ tools/bpf/bpftool/xlated_dumper.h | 3 +
+ tools/include/uapi/linux/bpf.h | 39 +-
+ tools/include/uapi/linux/btf.h | 18 +-
+ tools/lib/bpf/Makefile | 38 +-
+ tools/lib/bpf/README.rst | 139 +
+ tools/lib/bpf/bpf.c | 50 +-
+ tools/lib/bpf/bpf.h | 13 +
+ tools/lib/bpf/btf.c | 347 +
+ tools/lib/bpf/btf.h | 59 +
+ tools/lib/bpf/libbpf.c | 557 +-
+ tools/lib/bpf/libbpf.h | 29 +
+ tools/lib/bpf/libbpf.map | 121 +
+ tools/lib/bpf/libbpf_errno.c | 1 +
+ tools/lib/bpf/test_libbpf.cpp | 18 +
+ tools/testing/selftests/bpf/Makefile | 25 +-
+ tools/testing/selftests/bpf/bpf_flow.c | 2 +-
+ tools/testing/selftests/bpf/bpf_helpers.h | 2 +
+ tools/testing/selftests/bpf/config | 1 +
+ tools/testing/selftests/bpf/connect4_prog.c | 43 +-
+ tools/testing/selftests/bpf/connect6_prog.c | 56 +-
+ tools/testing/selftests/bpf/test_btf.c | 896 +-
+ tools/testing/selftests/bpf/test_btf_haskv.c | 16 +-
+ tools/testing/selftests/bpf/test_btf_nokv.c | 16 +-
+ tools/testing/selftests/bpf/test_flow_dissector.sh | 2 +-
+ tools/testing/selftests/bpf/test_libbpf.sh | 14 +-
+ tools/testing/selftests/bpf/test_map_in_map.c | 49 +
+ tools/testing/selftests/bpf/test_maps.c | 154 +-
+ tools/testing/selftests/bpf/test_progs.c | 12 +-
+ tools/testing/selftests/bpf/test_sock_addr.c | 28 +-
+ tools/testing/selftests/bpf/test_sockmap.c | 127 +-
+ tools/testing/selftests/bpf/test_sockmap_kern.h | 70 +-
+ tools/testing/selftests/bpf/test_tcpnotify.h | 19 +
+ tools/testing/selftests/bpf/test_tcpnotify_kern.c | 95 +
+ tools/testing/selftests/bpf/test_tcpnotify_user.c | 186 +
+ tools/testing/selftests/bpf/test_verifier.c | 77 +-
+ tools/testing/selftests/bpf/xdp_dummy.c | 13 +
+ .../testing/selftests/drivers/net/mlxsw/extack.sh | 84 +
+ .../drivers/net/mlxsw/one_armed_router.sh | 259 +
+ .../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 86 +-
+ tools/testing/selftests/drivers/net/mlxsw/vxlan.sh | 1043 ++
+ .../selftests/drivers/net/mlxsw/vxlan_flooding.sh | 309 +
+ tools/testing/selftests/net/.gitignore | 1 +
+ tools/testing/selftests/net/Makefile | 3 +-
+ tools/testing/selftests/net/config | 14 +
+ tools/testing/selftests/net/forwarding/lib.sh | 42 +-
+ .../selftests/net/forwarding/vxlan_bridge_1d.sh | 786 +
+ .../net/forwarding/vxlan_bridge_1d_port_8472.sh | 10 +
+ .../selftests/net/forwarding/vxlan_bridge_1q.sh | 860 ++
+ .../net/forwarding/vxlan_bridge_1q_port_8472.sh | 10 +
+ tools/testing/selftests/net/msg_zerocopy.c | 3 +-
+ tools/testing/selftests/net/msg_zerocopy.sh | 2 +
+ tools/testing/selftests/net/pmtu.sh | 377 +-
+ tools/testing/selftests/net/run_afpackettests | 10 +
+ .../testing/selftests/net/test_vxlan_under_vrf.sh | 129 +
+ tools/testing/selftests/net/txring_overwrite.c | 179 +
+ tools/testing/selftests/net/udpgro.sh | 182 +
+ tools/testing/selftests/net/udpgro_bench.sh | 95 +
+ tools/testing/selftests/net/udpgso_bench.sh | 5 +-
+ tools/testing/selftests/net/udpgso_bench_rx.c | 156 +-
+ tools/testing/selftests/net/udpgso_bench_tx.c | 22 +-
+ tools/testing/selftests/tc-testing/.gitignore | 3 +
+ tools/testing/selftests/tc-testing/TdcPlugin.py | 3 +-
+ tools/testing/selftests/tc-testing/TdcResults.py | 132 +
+ .../tc-testing/plugin-lib/valgrindPlugin.py | 22 +-
+ tools/testing/selftests/tc-testing/tdc.py | 133 +-
+ tools/testing/selftests/tc-testing/tdc_config.py | 2 +
+ 1035 files changed, 49458 insertions(+), 54533 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/net/icplus-ip101ag.txt
+ rename Documentation/networking/{ => device_drivers/3com}/3c509.txt (100%)
+ rename Documentation/networking/{ => device_drivers/3com}/vortex.txt (99%)
+ rename Documentation/networking/{ => device_drivers/amazon}/ena.txt (100%)
+ rename Documentation/networking/{ => device_drivers/chelsio}/cxgb.txt (100%)
+ rename Documentation/networking/{ => device_drivers/cirrus}/cs89x0.txt (100%)
+ rename Documentation/networking/{ => device_drivers/davicom}/dm9000.txt (100%)
+ rename Documentation/networking/{ => device_drivers/dec}/de4x5.txt (100%)
+ rename Documentation/networking/{ => device_drivers/dec}/dmfe.txt (100%)
+ rename Documentation/networking/{ => device_drivers/dlink}/dl2k.txt (100%)
+ rename Documentation/networking/{ => device_drivers/freescale}/dpaa.txt (100%)
+ rename Documentation/networking/{ => device_drivers/freescale}/dpaa2/dpio-driver.rst (97%)
+ rename Documentation/networking/{ => device_drivers/freescale}/dpaa2/ethernet-driver.rst (98%)
+ rename Documentation/networking/{ => device_drivers/freescale}/dpaa2/index.rst (100%)
+ rename Documentation/networking/{ => device_drivers/freescale}/dpaa2/overview.rst (100%)
+ rename Documentation/networking/{ => device_drivers/freescale}/gianfar.txt (100%)
+ rename Documentation/networking/{ => device_drivers/intel}/e100.rst (100%)
+ rename Documentation/networking/{ => device_drivers/intel}/e1000.rst (100%)
+ rename Documentation/networking/{ => device_drivers/intel}/e1000e.rst (100%)
+ rename Documentation/networking/{ => device_drivers/intel}/fm10k.rst (100%)
+ rename Documentation/networking/{ => device_drivers/intel}/i40e.rst (100%)
+ rename Documentation/networking/{ => device_drivers/intel}/iavf.rst (100%)
+ rename Documentation/networking/{ => device_drivers/intel}/ice.rst (100%)
+ rename Documentation/networking/{ => device_drivers/intel}/igb.rst (100%)
+ rename Documentation/networking/{ => device_drivers/intel}/igbvf.rst (100%)
+ rename Documentation/networking/{README.ipw2100 => device_drivers/intel/ipw2100.txt} (100%)
+ rename Documentation/networking/{README.ipw2200 => device_drivers/intel/ipw2200.txt} (100%)
+ rename Documentation/networking/{ => device_drivers/intel}/ixgb.rst (100%)
+ rename Documentation/networking/{ => device_drivers/intel}/ixgbe.rst (97%)
+ rename Documentation/networking/{ => device_drivers/intel}/ixgbevf.rst (100%)
+ rename Documentation/networking/{ => device_drivers/microsoft}/netvsc.txt (100%)
+ rename Documentation/networking/{ => device_drivers/neterion}/s2io.txt (100%)
+ rename Documentation/networking/{ => device_drivers/neterion}/vxge.txt (100%)
+ rename Documentation/networking/{ => device_drivers/qlogic}/LICENSE.qla3xxx (100%)
+ rename Documentation/networking/{ => device_drivers/qlogic}/LICENSE.qlcnic (100%)
+ rename Documentation/networking/{ => device_drivers/qlogic}/LICENSE.qlge (100%)
+ rename Documentation/networking/{ => device_drivers/qualcomm}/rmnet.txt (100%)
+ rename Documentation/networking/{README.sb1000 => device_drivers/sb1000.txt} (100%)
+ rename Documentation/networking/{ => device_drivers/smsc}/smc9.txt (100%)
+ rename Documentation/networking/{ => device_drivers/stmicro}/stmmac.txt (100%)
+ rename Documentation/networking/{ti-cpsw.txt => device_drivers/ti/cpsw.txt} (100%)
+ rename Documentation/networking/{ => device_drivers/ti}/tlan.txt (100%)
+ rename Documentation/networking/{ => device_drivers/toshiba}/spider_net.txt (100%)
+ create mode 100644 Documentation/networking/snmp_counter.rst
+ delete mode 100644 drivers/isdn/hardware/eicon/Kconfig
+ delete mode 100644 drivers/isdn/hardware/eicon/Makefile
+ delete mode 100644 drivers/isdn/hardware/eicon/adapter.h
+ delete mode 100644 drivers/isdn/hardware/eicon/capi20.h
+ delete mode 100644 drivers/isdn/hardware/eicon/capidtmf.c
+ delete mode 100644 drivers/isdn/hardware/eicon/capidtmf.h
+ delete mode 100644 drivers/isdn/hardware/eicon/capifunc.c
+ delete mode 100644 drivers/isdn/hardware/eicon/capifunc.h
+ delete mode 100644 drivers/isdn/hardware/eicon/capimain.c
+ delete mode 100644 drivers/isdn/hardware/eicon/cardtype.h
+ delete mode 100644 drivers/isdn/hardware/eicon/cp_vers.h
+ delete mode 100644 drivers/isdn/hardware/eicon/dadapter.c
+ delete mode 100644 drivers/isdn/hardware/eicon/dadapter.h
+ delete mode 100644 drivers/isdn/hardware/eicon/debug.c
+ delete mode 100644 drivers/isdn/hardware/eicon/debug_if.h
+ delete mode 100644 drivers/isdn/hardware/eicon/debuglib.c
+ delete mode 100644 drivers/isdn/hardware/eicon/debuglib.h
+ delete mode 100644 drivers/isdn/hardware/eicon/dfifo.h
+ delete mode 100644 drivers/isdn/hardware/eicon/di.c
+ delete mode 100644 drivers/isdn/hardware/eicon/di.h
+ delete mode 100644 drivers/isdn/hardware/eicon/di_dbg.h
+ delete mode 100644 drivers/isdn/hardware/eicon/di_defs.h
+ delete mode 100644 drivers/isdn/hardware/eicon/did_vers.h
+ delete mode 100644 drivers/isdn/hardware/eicon/diddfunc.c
+ delete mode 100644 drivers/isdn/hardware/eicon/diva.c
+ delete mode 100644 drivers/isdn/hardware/eicon/diva.h
+ delete mode 100644 drivers/isdn/hardware/eicon/diva_didd.c
+ delete mode 100644 drivers/isdn/hardware/eicon/diva_dma.c
+ delete mode 100644 drivers/isdn/hardware/eicon/diva_dma.h
+ delete mode 100644 drivers/isdn/hardware/eicon/diva_pci.h
+ delete mode 100644 drivers/isdn/hardware/eicon/divacapi.h
+ delete mode 100644 drivers/isdn/hardware/eicon/divamnt.c
+ delete mode 100644 drivers/isdn/hardware/eicon/divasfunc.c
+ delete mode 100644 drivers/isdn/hardware/eicon/divasi.c
+ delete mode 100644 drivers/isdn/hardware/eicon/divasmain.c
+ delete mode 100644 drivers/isdn/hardware/eicon/divasproc.c
+ delete mode 100644 drivers/isdn/hardware/eicon/divasync.h
+ delete mode 100644 drivers/isdn/hardware/eicon/dqueue.c
+ delete mode 100644 drivers/isdn/hardware/eicon/dqueue.h
+ delete mode 100644 drivers/isdn/hardware/eicon/dsp_defs.h
+ delete mode 100644 drivers/isdn/hardware/eicon/dsp_tst.h
+ delete mode 100644 drivers/isdn/hardware/eicon/dspdids.h
+ delete mode 100644 drivers/isdn/hardware/eicon/dsrv4bri.h
+ delete mode 100644 drivers/isdn/hardware/eicon/dsrv_bri.h
+ delete mode 100644 drivers/isdn/hardware/eicon/dsrv_pri.h
+ delete mode 100644 drivers/isdn/hardware/eicon/entity.h
+ delete mode 100644 drivers/isdn/hardware/eicon/helpers.h
+ delete mode 100644 drivers/isdn/hardware/eicon/idifunc.c
+ delete mode 100644 drivers/isdn/hardware/eicon/io.c
+ delete mode 100644 drivers/isdn/hardware/eicon/io.h
+ delete mode 100644 drivers/isdn/hardware/eicon/istream.c
+ delete mode 100644 drivers/isdn/hardware/eicon/kst_ifc.h
+ delete mode 100644 drivers/isdn/hardware/eicon/maintidi.c
+ delete mode 100644 drivers/isdn/hardware/eicon/maintidi.h
+ delete mode 100644 drivers/isdn/hardware/eicon/man_defs.h
+ delete mode 100644 drivers/isdn/hardware/eicon/mdm_msg.h
+ delete mode 100644 drivers/isdn/hardware/eicon/message.c
+ delete mode 100644 drivers/isdn/hardware/eicon/mi_pc.h
+ delete mode 100644 drivers/isdn/hardware/eicon/mntfunc.c
+ delete mode 100644 drivers/isdn/hardware/eicon/os_4bri.c
+ delete mode 100644 drivers/isdn/hardware/eicon/os_4bri.h
+ delete mode 100644 drivers/isdn/hardware/eicon/os_bri.c
+ delete mode 100644 drivers/isdn/hardware/eicon/os_bri.h
+ delete mode 100644 drivers/isdn/hardware/eicon/os_capi.h
+ delete mode 100644 drivers/isdn/hardware/eicon/os_pri.c
+ delete mode 100644 drivers/isdn/hardware/eicon/os_pri.h
+ delete mode 100644 drivers/isdn/hardware/eicon/pc.h
+ delete mode 100644 drivers/isdn/hardware/eicon/pc_init.h
+ delete mode 100644 drivers/isdn/hardware/eicon/pc_maint.h
+ delete mode 100644 drivers/isdn/hardware/eicon/pkmaint.h
+ delete mode 100644 drivers/isdn/hardware/eicon/platform.h
+ delete mode 100644 drivers/isdn/hardware/eicon/pr_pc.h
+ delete mode 100644 drivers/isdn/hardware/eicon/s_4bri.c
+ delete mode 100644 drivers/isdn/hardware/eicon/s_bri.c
+ delete mode 100644 drivers/isdn/hardware/eicon/s_pri.c
+ delete mode 100644 drivers/isdn/hardware/eicon/sdp_hdr.h
+ delete mode 100644 drivers/isdn/hardware/eicon/um_idi.c
+ delete mode 100644 drivers/isdn/hardware/eicon/um_idi.h
+ delete mode 100644 drivers/isdn/hardware/eicon/um_xdi.h
+ delete mode 100644 drivers/isdn/hardware/eicon/xdi_adapter.h
+ delete mode 100644 drivers/isdn/hardware/eicon/xdi_msg.h
+ delete mode 100644 drivers/isdn/hardware/eicon/xdi_vers.h
+ create mode 100644 drivers/net/dsa/microchip/ksz9477.c
+ rename drivers/net/dsa/microchip/{ksz_9477_reg.h => ksz9477_reg.h} (98%)
+ create mode 100644 drivers/net/dsa/microchip/ksz9477_spi.c
+ create mode 100644 drivers/net/dsa/microchip/ksz_common.h
+ delete mode 100644 drivers/net/dsa/microchip/ksz_spi.c
+ create mode 100644 drivers/net/dsa/microchip/ksz_spi.h
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_filters.c
+ create mode 100644 drivers/net/ethernet/aquantia/atlantic/aq_filters.h
+ create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c
+ create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
+ create mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h
+ create mode 100644 drivers/net/ethernet/netronome/nfp/abm/cls.c
+ create mode 100644 drivers/net/ethernet/netronome/nfp/abm/qdisc.c
+ create mode 100644 drivers/net/usb/aqc111.c
+ create mode 100644 drivers/net/usb/aqc111.h
+ create mode 100644 drivers/net/wireless/broadcom/brcm80211/brcmfmac/dmi.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
+ create mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie.c
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie_ipc.h
+ create mode 100644 drivers/net/wireless/quantenna/qtnfmac/pcie/topaz_pcie_regs.h
+ create mode 100644 include/linux/objagg.h
+ create mode 100644 include/linux/platform_data/mdio-gpio.h
+ create mode 100644 include/trace/events/objagg.h
+ create mode 100644 lib/objagg.c
+ create mode 100644 lib/test_objagg.c
+ create mode 100644 tools/lib/bpf/README.rst
+ create mode 100644 tools/lib/bpf/libbpf.map
+ create mode 100644 tools/lib/bpf/test_libbpf.cpp
+ create mode 100644 tools/testing/selftests/bpf/test_map_in_map.c
+ create mode 100644 tools/testing/selftests/bpf/test_tcpnotify.h
+ create mode 100644 tools/testing/selftests/bpf/test_tcpnotify_kern.c
+ create mode 100644 tools/testing/selftests/bpf/test_tcpnotify_user.c
+ create mode 100644 tools/testing/selftests/bpf/xdp_dummy.c
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/extack.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/one_armed_router.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/vxlan.sh
+ create mode 100755 tools/testing/selftests/drivers/net/mlxsw/vxlan_flooding.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/vxlan_bridge_1d.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/vxlan_bridge_1d_port_8472.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/vxlan_bridge_1q.sh
+ create mode 100755 tools/testing/selftests/net/forwarding/vxlan_bridge_1q_port_8472.sh
+ create mode 100755 tools/testing/selftests/net/test_vxlan_under_vrf.sh
+ create mode 100644 tools/testing/selftests/net/txring_overwrite.c
+ create mode 100755 tools/testing/selftests/net/udpgro.sh
+ create mode 100755 tools/testing/selftests/net/udpgro_bench.sh
+ create mode 100644 tools/testing/selftests/tc-testing/TdcResults.py
+Merging bpf-next/master (01d3240a04f4 media: bpf: add bpf function to report mouse movement)
+$ git merge bpf-next/master
+Auto-merging tools/testing/selftests/bpf/test_verifier.c
+CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/test_verifier.c
+Auto-merging tools/testing/selftests/bpf/test_btf.c
+Auto-merging tools/testing/selftests/bpf/bpf_helpers.h
+Auto-merging tools/include/uapi/linux/bpf.h
+Auto-merging tools/bpf/bpftool/btf_dumper.c
+Auto-merging net/core/filter.c
+CONFLICT (content): Merge conflict in net/core/filter.c
+Auto-merging net/bpf/test_run.c
+Auto-merging kernel/bpf/verifier.c
+Auto-merging kernel/bpf/btf.c
+Auto-merging include/uapi/linux/bpf.h
+CONFLICT (content): Merge conflict in include/uapi/linux/bpf.h
+Auto-merging include/linux/filter.h
+Auto-merging arch/powerpc/net/bpf_jit_comp64.c
+Auto-merging arch/mips/include/uapi/asm/inst.h
+CONFLICT (content): Merge conflict in arch/mips/include/uapi/asm/inst.h
+Recorded preimage for 'arch/mips/include/uapi/asm/inst.h'
+Resolved 'include/uapi/linux/bpf.h' using previous resolution.
+Resolved 'net/core/filter.c' using previous resolution.
+Resolved 'tools/testing/selftests/bpf/test_verifier.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/mips/include/uapi/asm/inst.h'.
+[master 0158552e25df] Merge remote-tracking branch 'bpf-next/master'
+$ git diff -M --stat --summary HEAD^..
+ arch/arm64/include/asm/memory.h | 5 +-
+ arch/arm64/net/bpf_jit_comp.c | 30 +-
+ arch/mips/include/asm/uasm.h | 1 +
+ arch/mips/include/uapi/asm/inst.h | 1 +
+ arch/mips/mm/uasm-micromips.c | 1 +
+ arch/mips/mm/uasm-mips.c | 1 +
+ arch/mips/mm/uasm.c | 9 +-
+ arch/mips/net/ebpf_jit.c | 4 +
+ arch/powerpc/include/asm/ppc-opcode.h | 2 +
+ arch/powerpc/net/bpf_jit.h | 4 +
+ arch/powerpc/net/bpf_jit_comp64.c | 6 +
+ arch/s390/net/bpf_jit_comp.c | 12 +
+ arch/x86/net/bpf_jit_comp.c | 2 +
+ drivers/media/rc/bpf-lirc.c | 24 +
+ drivers/net/ethernet/netronome/nfp/bpf/jit.c | 45 ++
+ include/linux/bpf.h | 21 +
+ include/linux/bpf_verifier.h | 1 +
+ include/linux/btf.h | 1 +
+ include/linux/filter.h | 7 +
+ include/uapi/linux/bpf.h | 149 ++--
+ kernel/bpf/btf.c | 2 +-
+ kernel/bpf/core.c | 186 ++++-
+ kernel/bpf/syscall.c | 124 +++-
+ kernel/bpf/verifier.c | 223 +++++-
+ net/bpf/test_run.c | 15 +-
+ net/core/filter.c | 16 +
+ samples/bpf/bpf_load.c | 4 +-
+ samples/bpf/xdp1_user.c | 27 +-
+ tools/bpf/bpftool/Documentation/bpftool-prog.rst | 29 +-
+ tools/bpf/bpftool/bash-completion/bpftool | 86 ++-
+ tools/bpf/bpftool/btf_dumper.c | 64 ++
+ tools/bpf/bpftool/common.c | 7 +-
+ tools/bpf/bpftool/jit_disasm.c | 34 +-
+ tools/bpf/bpftool/main.h | 50 +-
+ tools/bpf/bpftool/map.c | 50 +-
+ tools/bpf/bpftool/prog.c | 136 +++-
+ tools/bpf/bpftool/tracelog.c | 157 ++++
+ tools/bpf/bpftool/xlated_dumper.c | 34 +-
+ tools/bpf/bpftool/xlated_dumper.h | 7 +-
+ tools/include/uapi/linux/bpf.h | 61 +-
+ tools/lib/bpf/Build | 2 +-
+ tools/lib/bpf/README.rst | 2 +-
+ tools/lib/bpf/bpf.c | 124 +++-
+ tools/lib/bpf/bpf.h | 24 +-
+ tools/lib/bpf/bpf_prog_linfo.c | 253 +++++++
+ tools/lib/bpf/btf.c | 344 +++++----
+ tools/lib/bpf/btf.h | 25 +-
+ tools/lib/bpf/libbpf.c | 159 ++--
+ tools/lib/bpf/libbpf.h | 13 +
+ tools/lib/bpf/libbpf.map | 5 +
+ tools/testing/selftests/bpf/bpf_helpers.h | 2 +
+ tools/testing/selftests/bpf/test_align.c | 4 +-
+ tools/testing/selftests/bpf/test_btf.c | 798 ++++++++++++++++++---
+ tools/testing/selftests/bpf/test_lirc_mode2.sh | 3 +-
+ tools/testing/selftests/bpf/test_lirc_mode2_kern.c | 3 +
+ tools/testing/selftests/bpf/test_lirc_mode2_user.c | 65 +-
+ tools/testing/selftests/bpf/test_progs.c | 55 +-
+ tools/testing/selftests/bpf/test_verifier.c | 163 ++++-
+ 58 files changed, 3028 insertions(+), 654 deletions(-)
+ create mode 100644 tools/bpf/bpftool/tracelog.c
+ create mode 100644 tools/lib/bpf/bpf_prog_linfo.c
+Merging ipsec-next/master (88584c30e319 xfrm: policy: fix policy hash rebuild)
+$ git merge ipsec-next/master
+Auto-merging tools/testing/selftests/net/Makefile
+Auto-merging include/net/xfrm.h
+Merge made by the 'recursive' strategy.
+ include/net/netns/xfrm.h | 2 +
+ include/net/xfrm.h | 3 +
+ net/ipv6/xfrm6_policy.c | 1 -
+ net/key/af_key.c | 2 +-
+ net/xfrm/xfrm_policy.c | 1248 +++++++++++++++++++++++++---
+ tools/testing/selftests/net/Makefile | 3 +-
+ tools/testing/selftests/net/xfrm_policy.sh | 302 +++++++
+ 7 files changed, 1427 insertions(+), 134 deletions(-)
+ create mode 100755 tools/testing/selftests/net/xfrm_policy.sh
+Merging mlx5-next/mlx5-next (3fd3c80acc17 net/mlx5: Expose packet based credit mode)
+$ git merge mlx5-next/mlx5-next
+Removing include/linux/mlx5/srq.h
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_stats.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h
+Auto-merging drivers/infiniband/hw/mlx5/mlx5_ib.h
+CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mlx5_ib.h
+Auto-merging drivers/infiniband/hw/mlx5/main.c
+CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/main.c
+Resolved 'drivers/infiniband/hw/mlx5/main.c' using previous resolution.
+Resolved 'drivers/infiniband/hw/mlx5/mlx5_ib.h' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 35c2621a2f87] Merge remote-tracking branch 'mlx5-next/mlx5-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/infiniband/hw/mlx5/Makefile | 4 +-
+ drivers/infiniband/hw/mlx5/cq.c | 4 +-
+ drivers/infiniband/hw/mlx5/ib_rep.c | 4 +
+ drivers/infiniband/hw/mlx5/main.c | 212 ++++++++++----
+ drivers/infiniband/hw/mlx5/mlx5_ib.h | 9 +-
+ drivers/infiniband/hw/mlx5/srq.c | 49 +---
+ drivers/infiniband/hw/mlx5/srq.h | 73 +++++
+ .../core/srq.c => infiniband/hw/mlx5/srq_cmd.c} | 302 +++++++++----------
+ drivers/net/ethernet/mellanox/mlx5/core/Makefile | 4 +-
+ drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 48 ++-
+ drivers/net/ethernet/mellanox/mlx5/core/dev.c | 106 +------
+ .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 27 +-
+ .../ethernet/mellanox/mlx5/core/diag/fw_tracer.h | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 27 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 9 +-
+ drivers/net/ethernet/mellanox/mlx5/core/eq.c | 322 ++++++---------------
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 44 +--
+ drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 3 +-
+ drivers/net/ethernet/mellanox/mlx5/core/events.c | 298 +++++++++++++++++++
+ .../net/ethernet/mellanox/mlx5/core/fpga/core.c | 38 ++-
+ .../net/ethernet/mellanox/mlx5/core/fpga/core.h | 11 +-
+ drivers/net/ethernet/mellanox/mlx5/core/health.c | 28 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 24 +-
+ .../net/ethernet/mellanox/mlx5/core/lib/clock.h | 3 -
+ drivers/net/ethernet/mellanox/mlx5/core/lib/eq.h | 5 +
+ drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 35 +++
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 56 ++--
+ .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 16 +-
+ .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 44 ++-
+ drivers/net/ethernet/mellanox/mlx5/core/port.c | 57 ----
+ drivers/net/ethernet/mellanox/mlx5/core/qp.c | 68 ++++-
+ drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 109 -------
+ include/linux/mlx5/device.h | 10 +-
+ include/linux/mlx5/driver.h | 97 +------
+ include/linux/mlx5/eq.h | 16 +-
+ include/linux/mlx5/mlx5_ifc.h | 22 +-
+ include/linux/mlx5/port.h | 3 -
+ include/linux/mlx5/srq.h | 72 -----
+ include/linux/mlx5/transobj.h | 11 -
+ 40 files changed, 1180 insertions(+), 1095 deletions(-)
+ create mode 100644 drivers/infiniband/hw/mlx5/srq.h
+ rename drivers/{net/ethernet/mellanox/mlx5/core/srq.c => infiniband/hw/mlx5/srq_cmd.c} (71%)
+ create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/events.c
+ delete mode 100644 include/linux/mlx5/srq.h
+Merging netfilter-next/master (6ed5943f8735 netfilter: nat: remove l4 protocol port rovers)
+$ git merge netfilter-next/master
+Auto-merging net/netfilter/xt_hashlimit.c
+Merge made by the 'recursive' strategy.
+ include/linux/netfilter/ipset/ip_set.h | 2 +-
+ include/net/netfilter/nf_flow_table.h | 4 -
+ include/net/netfilter/nf_nat_l4proto.h | 2 +-
+ include/uapi/linux/netfilter.h | 4 -
+ include/uapi/linux/netfilter/ipset/ip_set.h | 19 ++--
+ include/uapi/linux/netfilter_decnet.h | 10 --
+ include/uapi/linux/netfilter_ipv4.h | 28 -----
+ include/uapi/linux/netfilter_ipv6.h | 29 -----
+ net/ipv4/netfilter/ipt_CLUSTERIP.c | 6 +-
+ net/netfilter/ipset/ip_set_bitmap_ipmac.c | 13 ++-
+ net/netfilter/ipset/ip_set_core.c | 164 +++++++++++++++++++++++++---
+ net/netfilter/ipset/ip_set_hash_gen.h | 4 +-
+ net/netfilter/ipset/ip_set_hash_ipmac.c | 27 ++---
+ net/netfilter/ipset/ip_set_hash_mac.c | 10 +-
+ net/netfilter/nf_conntrack_netlink.c | 29 +++--
+ net/netfilter/nf_flow_table_core.c | 42 ++-----
+ net/netfilter/nf_nat_proto_common.c | 8 +-
+ net/netfilter/nf_nat_proto_dccp.c | 5 +-
+ net/netfilter/nf_nat_proto_sctp.c | 5 +-
+ net/netfilter/nf_nat_proto_tcp.c | 5 +-
+ net/netfilter/nf_nat_proto_udp.c | 10 +-
+ net/netfilter/nfnetlink_log.c | 2 +-
+ net/netfilter/xt_hashlimit.c | 4 +-
+ 23 files changed, 233 insertions(+), 199 deletions(-)
+Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings)
+$ git merge nfc-next/master
+Auto-merging drivers/nfc/fdp/i2c.c
+Merge made by the 'recursive' strategy.
+ drivers/nfc/fdp/fdp.c | 35 +++++------------------------------
+ drivers/nfc/fdp/i2c.c | 26 +++++++++++++-------------
+ drivers/nfc/st21nfca/dep.c | 3 ++-
+ drivers/nfc/st21nfca/se.c | 5 +++--
+ drivers/nfc/st95hf/core.c | 7 ++-----
+ net/nfc/netlink.c | 6 ++++--
+ 6 files changed, 29 insertions(+), 53 deletions(-)
+Merging ipvs-next/master (26a1ccc6c117 bpf: test: fix spelling mistake "REUSEEPORT" -> "REUSEPORT")
+$ git merge ipvs-next/master
+Already up to date.
+Merging wireless-drivers-next/master (d9bbd6a1a56e net: marvell: convert to DEFINE_SHOW_ATTRIBUTE)
+$ git merge wireless-drivers-next/master
+Already up to date.
+Merging bluetooth/master (ef2df7fc11f8 Merge branch 'Pass-extack-to-NETDEV_PRE_UP')
+$ git merge bluetooth/master
+Already up to date.
+Merging mac80211-next/master (f6c7f03f69f7 mac80211: fix deauth TX when we disconnect)
+$ git merge mac80211-next/master
+Auto-merging net/wireless/nl80211.c
+Auto-merging net/mac80211/tx.c
+Auto-merging net/mac80211/cfg.c
+Auto-merging drivers/net/wireless/mac80211_hwsim.c
+Merge made by the 'recursive' strategy.
+ drivers/net/wireless/Kconfig | 7 +
+ drivers/net/wireless/Makefile | 2 +
+ drivers/net/wireless/mac80211_hwsim.c | 258 +++++++++-----
+ drivers/net/wireless/mac80211_hwsim.h | 4 +
+ drivers/net/wireless/virt_wifi.c | 632 ++++++++++++++++++++++++++++++++++
+ include/linux/ieee80211.h | 2 +
+ include/linux/netlink.h | 9 +
+ include/net/cfg80211.h | 274 ++++++++++++++-
+ include/net/mac80211.h | 12 +
+ include/uapi/linux/nl80211.h | 439 ++++++++++++++++++++++-
+ net/mac80211/Kconfig | 11 +-
+ net/mac80211/cfg.c | 25 ++
+ net/mac80211/debugfs_netdev.c | 3 +
+ net/mac80211/debugfs_sta.c | 14 +-
+ net/mac80211/driver-ops.h | 34 ++
+ net/mac80211/mesh.c | 8 +-
+ net/mac80211/mesh.h | 3 +-
+ net/mac80211/mesh_plink.c | 35 +-
+ net/mac80211/scan.c | 22 +-
+ net/mac80211/sta_info.c | 11 +-
+ net/mac80211/sta_info.h | 2 +
+ net/mac80211/trace.h | 18 +-
+ net/mac80211/tx.c | 4 +-
+ net/mac80211/util.c | 49 ++-
+ net/wireless/Makefile | 1 +
+ net/wireless/core.c | 48 +++
+ net/wireless/core.h | 5 +
+ net/wireless/nl80211.c | 236 +++++++++++--
+ net/wireless/nl80211.h | 32 ++
+ net/wireless/pmsr.c | 590 +++++++++++++++++++++++++++++++
+ net/wireless/rdev-ops.h | 25 ++
+ net/wireless/trace.h | 92 ++++-
+ 32 files changed, 2720 insertions(+), 187 deletions(-)
+ create mode 100644 drivers/net/wireless/virt_wifi.c
+ create mode 100644 net/wireless/pmsr.c
+Merging gfs2/for-next (b62cd8c96191 gfs2: Fix loop in gfs2_rbm_find)
+$ git merge gfs2/for-next
+Auto-merging fs/gfs2/super.c
+Auto-merging fs/gfs2/ops_fstype.c
+Auto-merging fs/gfs2/bmap.c
+Merge made by the 'recursive' strategy.
+ fs/gfs2/aops.c | 16 ++--
+ fs/gfs2/bmap.c | 8 +-
+ fs/gfs2/glops.c | 1 +
+ fs/gfs2/incore.h | 1 -
+ fs/gfs2/inode.c | 18 ++--
+ fs/gfs2/inode.h | 10 +-
+ fs/gfs2/log.c | 5 +-
+ fs/gfs2/log.h | 5 +-
+ fs/gfs2/lops.c | 257 +++++++++++++++++++++++++++++++++++++++++++--------
+ fs/gfs2/lops.h | 4 +-
+ fs/gfs2/ops_fstype.c | 1 +
+ fs/gfs2/recovery.c | 178 +++++++----------------------------
+ fs/gfs2/recovery.h | 5 +-
+ fs/gfs2/rgrp.c | 2 +-
+ fs/gfs2/super.c | 1 +
+ fs/gfs2/trans.c | 8 +-
+ 16 files changed, 298 insertions(+), 222 deletions(-)
+Merging mtd/mtd/next (9d3b5086f6d4 mtd: physmap_of_gemini: Handle pin control)
+$ git merge mtd/mtd/next
+Auto-merging fs/jffs2/super.c
+Removing drivers/mtd/maps/physmap_of_core.c
+Removing drivers/mtd/maps/physmap.c
+Removing drivers/mtd/maps/latch-addr-flash.c
+Removing drivers/mtd/maps/gpio-addr-flash.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mtd/mtd-physmap.txt | 2 +
+ .../bindings/mtd/partitions/redboot-fis.txt | 27 +
+ drivers/mtd/Kconfig | 52 +-
+ drivers/mtd/Makefile | 1 -
+ drivers/mtd/chips/cfi_cmdset_0020.c | 6 +
+ drivers/mtd/devices/block2mtd.c | 2 +
+ drivers/mtd/devices/docg3.c | 16 +-
+ drivers/mtd/devices/docg3.h | 11 -
+ drivers/mtd/maps/Kconfig | 37 +-
+ drivers/mtd/maps/Makefile | 11 +-
+ drivers/mtd/maps/gpio-addr-flash.c | 281 ---------
+ drivers/mtd/maps/latch-addr-flash.c | 229 -------
+ drivers/mtd/maps/physmap-core.c | 665 +++++++++++++++++++++
+ .../maps/{physmap_of_gemini.c => physmap-gemini.c} | 112 +++-
+ .../maps/{physmap_of_gemini.h => physmap-gemini.h} | 2 +-
+ ...{physmap_of_versatile.c => physmap-versatile.c} | 2 +-
+ ...{physmap_of_versatile.h => physmap-versatile.h} | 2 +-
+ drivers/mtd/maps/physmap.c | 280 ---------
+ drivers/mtd/maps/physmap_of_core.c | 368 ------------
+ drivers/mtd/mtdblock.c | 2 +-
+ drivers/mtd/mtdcore.c | 8 +-
+ drivers/mtd/mtdpart.c | 16 +-
+ drivers/mtd/mtdswap.c | 13 +-
+ drivers/mtd/nand/raw/nandsim.c | 17 +-
+ drivers/mtd/nftlmount.c | 39 +-
+ drivers/mtd/parsers/Kconfig | 50 ++
+ drivers/mtd/parsers/Makefile | 1 +
+ drivers/mtd/{ => parsers}/redboot.c | 32 +-
+ fs/jffs2/super.c | 3 +-
+ include/linux/mtd/mtd.h | 3 +-
+ 30 files changed, 971 insertions(+), 1319 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mtd/partitions/redboot-fis.txt
+ delete mode 100644 drivers/mtd/maps/gpio-addr-flash.c
+ delete mode 100644 drivers/mtd/maps/latch-addr-flash.c
+ create mode 100644 drivers/mtd/maps/physmap-core.c
+ rename drivers/mtd/maps/{physmap_of_gemini.c => physmap-gemini.c} (50%)
+ rename drivers/mtd/maps/{physmap_of_gemini.h => physmap-gemini.h} (90%)
+ rename drivers/mtd/maps/{physmap_of_versatile.c => physmap-versatile.c} (99%)
+ rename drivers/mtd/maps/{physmap_of_versatile.h => physmap-versatile.h} (90%)
+ delete mode 100644 drivers/mtd/maps/physmap.c
+ delete mode 100644 drivers/mtd/maps/physmap_of_core.c
+ rename drivers/mtd/{ => parsers}/redboot.c (92%)
+Merging nand/nand/next (38842572df1c mtd: rawnand: jz4780: annotate implicit fall throughs)
+$ git merge nand/nand/next
+Removing drivers/staging/mt29f_spinand/mt29f_spinand.h
+Removing drivers/staging/mt29f_spinand/mt29f_spinand.c
+Removing drivers/staging/mt29f_spinand/TODO
+Removing drivers/staging/mt29f_spinand/Makefile
+Removing drivers/staging/mt29f_spinand/Kconfig
+Auto-merging drivers/mtd/nand/raw/qcom_nandc.c
+Auto-merging drivers/mtd/nand/raw/nandsim.c
+Auto-merging drivers/mtd/nand/raw/atmel/nand-controller.c
+Auto-merging arch/arm/mach-omap1/board-ams-delta.c
+Merge made by the 'recursive' strategy.
+ arch/arm/mach-omap1/board-ams-delta.c | 22 +-
+ drivers/mtd/nand/raw/Kconfig | 2 +-
+ drivers/mtd/nand/raw/ams-delta.c | 263 +++---
+ drivers/mtd/nand/raw/atmel/nand-controller.c | 9 +-
+ drivers/mtd/nand/raw/au1550nd.c | 2 +-
+ drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c | 2 +-
+ drivers/mtd/nand/raw/cafe_nand.c | 4 +-
+ drivers/mtd/nand/raw/davinci_nand.c | 4 +-
+ drivers/mtd/nand/raw/denali.c | 59 +-
+ drivers/mtd/nand/raw/denali.h | 2 +-
+ drivers/mtd/nand/raw/diskonchip.c | 4 +-
+ drivers/mtd/nand/raw/fsl_elbc_nand.c | 2 +-
+ drivers/mtd/nand/raw/fsl_ifc_nand.c | 2 +-
+ drivers/mtd/nand/raw/fsl_upm.c | 2 +-
+ drivers/mtd/nand/raw/fsmc_nand.c | 303 ++++---
+ drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 29 +-
+ drivers/mtd/nand/raw/hisi504_nand.c | 4 +-
+ drivers/mtd/nand/raw/internals.h | 33 +
+ drivers/mtd/nand/raw/jz4740_nand.c | 8 +-
+ drivers/mtd/nand/raw/jz4780_bch.c | 2 +
+ drivers/mtd/nand/raw/jz4780_nand.c | 2 +-
+ drivers/mtd/nand/raw/lpc32xx_mlc.c | 2 +-
+ drivers/mtd/nand/raw/lpc32xx_slc.c | 2 +-
+ drivers/mtd/nand/raw/marvell_nand.c | 34 +-
+ drivers/mtd/nand/raw/mpc5121_nfc.c | 4 +-
+ drivers/mtd/nand/raw/mtk_nand.c | 4 +-
+ drivers/mtd/nand/raw/mxc_nand.c | 16 +-
+ drivers/mtd/nand/raw/nand_base.c | 769 ++++++++++--------
+ drivers/mtd/nand/raw/nand_bbt.c | 285 +++----
+ drivers/mtd/nand/raw/nand_hynix.c | 8 +-
+ drivers/mtd/nand/raw/nand_legacy.c | 35 +-
+ drivers/mtd/nand/raw/nand_macronix.c | 7 +
+ drivers/mtd/nand/raw/nandsim.c | 2 +-
+ drivers/mtd/nand/raw/ndfc.c | 2 +-
+ drivers/mtd/nand/raw/plat_nand.c | 2 +-
+ drivers/mtd/nand/raw/qcom_nandc.c | 2 +-
+ drivers/mtd/nand/raw/r852.c | 30 +-
+ drivers/mtd/nand/raw/s3c2410.c | 7 +-
+ drivers/mtd/nand/raw/sh_flctl.c | 21 +-
+ drivers/mtd/nand/raw/sm_common.c | 2 +-
+ drivers/mtd/nand/raw/sunxi_nand.c | 4 +-
+ drivers/mtd/nand/raw/tango_nand.c | 4 +-
+ drivers/mtd/nand/raw/tegra_nand.c | 32 +-
+ drivers/mtd/nand/raw/vf610_nfc.c | 98 ++-
+ drivers/mtd/nand/raw/xway_nand.c | 2 +-
+ drivers/mtd/nand/spi/Makefile | 2 +-
+ drivers/mtd/nand/spi/core.c | 2 +
+ drivers/mtd/nand/spi/gigadevice.c | 148 ++++
+ drivers/mtd/nand/spi/toshiba.c | 137 ++++
+ drivers/mtd/nand/spi/winbond.c | 8 +
+ drivers/staging/Kconfig | 2 -
+ drivers/staging/Makefile | 1 -
+ drivers/staging/mt29f_spinand/Kconfig | 16 -
+ drivers/staging/mt29f_spinand/Makefile | 1 -
+ drivers/staging/mt29f_spinand/TODO | 13 -
+ drivers/staging/mt29f_spinand/mt29f_spinand.c | 980 -----------------------
+ drivers/staging/mt29f_spinand/mt29f_spinand.h | 106 ---
+ include/linux/mtd/rawnand.h | 158 ++--
+ include/linux/mtd/sh_flctl.h | 16 +-
+ include/linux/mtd/spinand.h | 2 +
+ 60 files changed, 1495 insertions(+), 2231 deletions(-)
+ create mode 100644 drivers/mtd/nand/spi/gigadevice.c
+ create mode 100644 drivers/mtd/nand/spi/toshiba.c
+ delete mode 100644 drivers/staging/mt29f_spinand/Kconfig
+ delete mode 100644 drivers/staging/mt29f_spinand/Makefile
+ delete mode 100644 drivers/staging/mt29f_spinand/TODO
+ delete mode 100644 drivers/staging/mt29f_spinand/mt29f_spinand.c
+ delete mode 100644 drivers/staging/mt29f_spinand/mt29f_spinand.h
+Merging spi-nor/spi-nor/next (52f1b43fd12e mtd: spi-nor: Add support for is25lp016d)
+$ git merge spi-nor/spi-nor/next
+Auto-merging drivers/mtd/spi-nor/spi-nor.c
+Merge made by the 'recursive' strategy.
+ drivers/mtd/spi-nor/spi-nor.c | 1824 +++++++++++++++++++++++------------------
+ include/linux/mtd/cfi.h | 1 +
+ include/linux/mtd/spi-nor.h | 11 +-
+ 3 files changed, 1050 insertions(+), 786 deletions(-)
+Merging crypto/master (88d905e20b11 crypto: cavium/nitrox - convert to DEFINE_SHOW_ATTRIBUTE)
+$ git merge crypto/master
+Auto-merging lib/Makefile
+Removing include/crypto/chacha20.h
+Auto-merging drivers/net/wireless/cisco/airo.c
+Removing crypto/chacha20_generic.c
+Removing arch/arm/crypto/chacha20-neon-glue.c
+Auto-merging arch/arm/crypto/Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/crypto/arm-cryptocell.txt | 8 +-
+ .../devicetree/bindings/crypto/fsl-dcp.txt | 2 +
+ MAINTAINERS | 11 +-
+ arch/arm/crypto/Kconfig | 16 +-
+ arch/arm/crypto/Makefile | 6 +-
+ arch/arm/crypto/aes-ce-glue.c | 1 -
+ arch/arm/crypto/aes-cipher-core.S | 62 +-
+ .../{chacha20-neon-core.S => chacha-neon-core.S} | 98 +-
+ arch/arm/crypto/chacha-neon-glue.c | 201 ++
+ arch/arm/crypto/chacha20-neon-glue.c | 127 -
+ arch/arm/crypto/nh-neon-core.S | 116 +
+ arch/arm/crypto/nhpoly1305-neon-glue.c | 77 +
+ arch/arm64/crypto/chacha20-neon-glue.c | 40 +-
+ arch/s390/crypto/aes_s390.c | 2 +-
+ arch/sparc/crypto/aes_glue.c | 5 -
+ arch/sparc/crypto/camellia_glue.c | 5 -
+ arch/sparc/crypto/des_glue.c | 5 -
+ arch/x86/crypto/Makefile | 5 +
+ arch/x86/crypto/chacha20-avx2-x86_64.S | 696 ++++-
+ arch/x86/crypto/chacha20-avx512vl-x86_64.S | 839 ++++++
+ arch/x86/crypto/chacha20-ssse3-x86_64.S | 237 +-
+ arch/x86/crypto/chacha20_glue.c | 148 +-
+ arch/x86/crypto/poly1305_glue.c | 20 +-
+ crypto/Kconfig | 71 +-
+ crypto/Makefile | 8 +-
+ crypto/ablkcipher.c | 32 +-
+ crypto/acompress.c | 10 +-
+ crypto/adiantum.c | 658 +++++
+ crypto/aead.c | 14 +-
+ crypto/aes_generic.c | 9 +-
+ crypto/aes_ti.c | 18 +
+ crypto/ahash.c | 29 +-
+ crypto/akcipher.c | 11 +-
+ crypto/algapi.c | 247 +-
+ crypto/blkcipher.c | 16 +-
+ crypto/cfb.c | 2 +-
+ crypto/chacha20_generic.c | 137 -
+ crypto/chacha20poly1305.c | 12 +-
+ crypto/chacha_generic.c | 217 ++
+ crypto/crypto_user_base.c | 95 +-
+ crypto/crypto_user_stat.c | 268 +-
+ crypto/ecc.c | 58 +-
+ crypto/hash_info.c | 4 +
+ crypto/kpp.c | 10 +-
+ crypto/lz4.c | 1 -
+ crypto/lz4hc.c | 1 -
+ crypto/nhpoly1305.c | 254 ++
+ crypto/pcrypt.c | 2 +-
+ crypto/poly1305_generic.c | 174 +-
+ crypto/rng.c | 16 +-
+ crypto/scompress.c | 11 +-
+ crypto/shash.c | 12 +-
+ crypto/skcipher.c | 15 +-
+ crypto/streebog_generic.c | 1140 ++++++++
+ crypto/tcrypt.c | 57 +-
+ crypto/testmgr.c | 62 +
+ crypto/testmgr.h | 3048 +++++++++++++++++++-
+ drivers/block/drbd/drbd_receiver.c | 2 +-
+ drivers/char/hw_random/bcm2835-rng.c | 7 +-
+ drivers/char/random.c | 51 +-
+ drivers/crypto/Kconfig | 4 +-
+ drivers/crypto/amcc/crypto4xx_alg.c | 3 +-
+ drivers/crypto/bcm/cipher.c | 8 +-
+ drivers/crypto/caam/caamalg.c | 266 +-
+ drivers/crypto/caam/caamalg_desc.c | 139 +-
+ drivers/crypto/caam/caamalg_desc.h | 5 +
+ drivers/crypto/caam/caamalg_qi.c | 37 +-
+ drivers/crypto/caam/caamalg_qi2.c | 156 +-
+ drivers/crypto/caam/caamhash.c | 20 +-
+ drivers/crypto/caam/caampkc.c | 10 +-
+ drivers/crypto/caam/caamrng.c | 10 +-
+ drivers/crypto/caam/compat.h | 2 +
+ drivers/crypto/caam/ctrl.c | 28 +-
+ drivers/crypto/caam/desc.h | 28 +
+ drivers/crypto/caam/desc_constr.h | 7 +-
+ drivers/crypto/caam/regs.h | 74 +-
+ drivers/crypto/cavium/nitrox/nitrox_algs.c | 123 +-
+ drivers/crypto/cavium/nitrox/nitrox_debugfs.c | 48 +-
+ drivers/crypto/cavium/nitrox/nitrox_dev.h | 15 +-
+ drivers/crypto/cavium/nitrox/nitrox_isr.c | 84 +-
+ drivers/crypto/cavium/nitrox/nitrox_isr.h | 2 +
+ drivers/crypto/cavium/nitrox/nitrox_lib.c | 22 +-
+ drivers/crypto/cavium/nitrox/nitrox_req.h | 101 +-
+ drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 266 +-
+ drivers/crypto/cavium/nitrox/nitrox_sriov.c | 51 +-
+ drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 4 +-
+ drivers/crypto/ccree/cc_aead.c | 35 +-
+ drivers/crypto/ccree/cc_cipher.c | 104 +-
+ drivers/crypto/ccree/cc_crypto_ctx.h | 4 +-
+ drivers/crypto/ccree/cc_driver.c | 50 +-
+ drivers/crypto/ccree/cc_driver.h | 15 +-
+ drivers/crypto/ccree/cc_hash.c | 189 +-
+ drivers/crypto/ccree/cc_hw_queue_defs.h | 30 +
+ drivers/crypto/chelsio/chcr_algo.c | 16 +-
+ drivers/crypto/chelsio/chcr_core.h | 9 +
+ drivers/crypto/chelsio/chcr_ipsec.c | 180 +-
+ drivers/crypto/geode-aes.c | 2 +-
+ drivers/crypto/inside-secure/safexcel_cipher.c | 8 +-
+ drivers/crypto/mxs-dcp.c | 28 +-
+ drivers/crypto/omap-aes.c | 2 -
+ drivers/crypto/omap-des.c | 1 -
+ drivers/crypto/qce/ablkcipher.c | 1 -
+ drivers/crypto/qce/sha.c | 1 -
+ drivers/crypto/sahara.c | 1 -
+ drivers/md/dm-crypt.c | 2 +-
+ drivers/md/dm-integrity.c | 2 +-
+ drivers/net/wireless/cisco/airo.c | 2 +-
+ drivers/net/wireless/intersil/orinoco/mic.c | 6 +-
+ drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 2 +-
+ .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 2 +-
+ drivers/usb/wusbcore/crypto.c | 2 +-
+ fs/ubifs/auth.c | 5 +-
+ include/crypto/acompress.h | 38 +-
+ include/crypto/aead.h | 38 +-
+ include/crypto/akcipher.h | 74 +-
+ include/crypto/chacha.h | 54 +
+ include/crypto/chacha20.h | 27 -
+ include/crypto/hash.h | 32 +-
+ include/crypto/hash_info.h | 1 +
+ include/crypto/internal/cryptouser.h | 17 +
+ include/crypto/kpp.h | 48 +-
+ include/crypto/nhpoly1305.h | 74 +
+ include/crypto/poly1305.h | 28 +-
+ include/crypto/rng.h | 27 +-
+ include/crypto/skcipher.h | 36 +-
+ include/crypto/streebog.h | 34 +
+ include/linux/crypto.h | 290 +-
+ include/uapi/linux/cryptouser.h | 102 +-
+ include/uapi/linux/hash_info.h | 2 +
+ kernel/padata.c | 2 +-
+ lib/Makefile | 2 +-
+ lib/{chacha20.c => chacha.c} | 59 +-
+ net/bluetooth/smp.c | 8 +-
+ net/mac80211/wep.c | 4 +-
+ net/wireless/lib80211_crypt_ccmp.c | 2 +-
+ net/wireless/lib80211_crypt_tkip.c | 4 +-
+ net/wireless/lib80211_crypt_wep.c | 4 +-
+ security/apparmor/crypto.c | 2 +-
+ security/integrity/evm/evm_crypto.c | 3 +-
+ security/keys/encrypted-keys/encrypted.c | 4 +-
+ security/keys/trusted.c | 4 +-
+ tools/crypto/getstat.c | 72 +-
+ 142 files changed, 10773 insertions(+), 2037 deletions(-)
+ rename arch/arm/crypto/{chacha20-neon-core.S => chacha-neon-core.S} (90%)
+ create mode 100644 arch/arm/crypto/chacha-neon-glue.c
+ delete mode 100644 arch/arm/crypto/chacha20-neon-glue.c
+ create mode 100644 arch/arm/crypto/nh-neon-core.S
+ create mode 100644 arch/arm/crypto/nhpoly1305-neon-glue.c
+ create mode 100644 arch/x86/crypto/chacha20-avx512vl-x86_64.S
+ create mode 100644 crypto/adiantum.c
+ delete mode 100644 crypto/chacha20_generic.c
+ create mode 100644 crypto/chacha_generic.c
+ create mode 100644 crypto/nhpoly1305.c
+ create mode 100644 crypto/streebog_generic.c
+ create mode 100644 include/crypto/chacha.h
+ delete mode 100644 include/crypto/chacha20.h
+ create mode 100644 include/crypto/nhpoly1305.h
+ create mode 100644 include/crypto/streebog.h
+ rename lib/{chacha20.c => chacha.c} (58%)
+Merging drm/drm-next (e69aa5f9b97f Merge tag 'drm-misc-next-2018-12-06' of git://anongit.freedesktop.org/drm/drm-misc into drm-next)
+$ git merge drm/drm-next
+Removing scripts/coccinelle/api/drm-get-put.cocci
+Auto-merging mm/shmem.c
+Removing include/drm/drm_global.h
+Auto-merging drivers/media/i2c/tc358743.c
+Auto-merging drivers/media/i2c/adv7842.c
+Auto-merging drivers/media/i2c/adv7604.c
+Auto-merging drivers/media/i2c/adv7511.c
+Removing drivers/gpu/drm/selftests/drm_helper_selftests.h
+Removing drivers/gpu/drm/rockchip/dw-mipi-dsi.c
+Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c
+Auto-merging drivers/gpu/drm/msm/msm_drv.c
+Auto-merging drivers/gpu/drm/msm/hdmi/hdmi.c
+Auto-merging drivers/gpu/drm/meson/meson_viu.c
+Auto-merging drivers/gpu/drm/meson/meson_venc.c
+Auto-merging drivers/gpu/drm/meson/meson_dw_hdmi.c
+Auto-merging drivers/gpu/drm/meson/meson_crtc.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/meson/meson_crtc.c
+Auto-merging drivers/gpu/drm/i915/intel_workarounds.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_workarounds.h
+Auto-merging drivers/gpu/drm/i915/intel_workarounds.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_workarounds.c
+Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.h
+Auto-merging drivers/gpu/drm/i915/intel_lrc.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c
+Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_cs.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Removing drivers/gpu/drm/exynos/exynos_drm_iommu.h
+Removing drivers/gpu/drm/exynos/exynos_drm_iommu.c
+Auto-merging drivers/gpu/drm/drm_lease.c
+Auto-merging drivers/gpu/drm/drm_internal.h
+Removing drivers/gpu/drm/drm_info.c
+Removing drivers/gpu/drm/drm_global.c
+Auto-merging drivers/gpu/drm/drm_fb_helper.c
+Auto-merging drivers/gpu/drm/drm_drv.c
+Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c
+Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
+Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+Removing drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
+Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/gpu/drm-uapi.rst
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution.
+Resolved 'drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/i915_drv.h' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/i915_gem.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_engine_cs.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_lrc.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_ringbuffer.h' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_workarounds.c' using previous resolution.
+Resolved 'drivers/gpu/drm/i915/intel_workarounds.h' using previous resolution.
+Resolved 'drivers/gpu/drm/meson/meson_crtc.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 60a3b9fda5ad] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/bus/sun50i-de2-bus.txt | 9 +-
+ .../bindings/display/amlogic,meson-vpu.txt | 2 +
+ .../bindings/display/bridge/renesas,lvds.txt | 1 +
+ .../devicetree/bindings/display/himax,hx8357d.txt | 26 +
+ .../bindings/display/panel/auo,g101evn010 | 12 +
+ .../display/panel/bananapi,s070wv20-ct16.txt | 12 +
+ .../display/panel/cdtech,s043wq26h-ct7.txt | 12 +
+ .../display/panel/cdtech,s070wv95-ct16.txt | 12 +
+ .../bindings/display/panel/dlc,dlc1010gig.txt | 12 +
+ .../display/panel/olimex,lcd-olinuxino.txt | 42 +
+ .../bindings/display/panel/samsung,s6d16d0.txt | 30 +
+ .../bindings/display/panel/tpo,tpg110.txt | 81 +-
+ .../devicetree/bindings/display/renesas,du.txt | 4 +
+ .../bindings/display/rockchip/dw_hdmi-rockchip.txt | 3 +
+ .../bindings/display/sunxi/sun4i-drm.txt | 30 +-
+ .../devicetree/bindings/display/truly,nt35597.txt | 59 +
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/gpu/amdgpu-dc.rst | 68 +
+ Documentation/gpu/drivers.rst | 1 +
+ Documentation/gpu/drm-kms-helpers.rst | 31 +-
+ Documentation/gpu/drm-kms.rst | 19 +
+ Documentation/gpu/drm-mm.rst | 7 +-
+ Documentation/gpu/drm-uapi.rst | 3 +
+ Documentation/gpu/todo.rst | 58 +-
+ Documentation/gpu/vkms.rst | 101 +-
+ Documentation/vm/unevictable-lru.rst | 6 +-
+ MAINTAINERS | 15 +-
+ drivers/dma-buf/dma-fence.c | 36 +-
+ drivers/dma-buf/reservation.c | 189 +-
+ drivers/gpu/drm/Makefile | 9 +-
+ drivers/gpu/drm/amd/amdgpu/Makefile | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu.h | 144 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 114 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 49 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 25 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 25 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 120 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 171 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 33 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 11 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 117 ++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_csa.h | 39 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 432 ++--
+ drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 12 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 243 +++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 54 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 6 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 49 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 21 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 25 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 18 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 223 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 61 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 8 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 282 +++
+ drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 98 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 28 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 15 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 105 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 12 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 20 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 38 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 100 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 142 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 37 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 80 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 39 +
+ drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/cik.c | 1 +
+ drivers/gpu/drm/amd/amdgpu/cik.h | 1 +
+ drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 66 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 144 +-
+ drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 278 +--
+ drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 362 ++--
+ drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 390 ++--
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 5 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +-
+ drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 109 +-
+ drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 1 -
+ drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 3 -
+ drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 141 +-
+ drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 69 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 71 +-
+ drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 747 ++++---
+ drivers/gpu/drm/amd/amdgpu/si_dma.c | 68 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.c | 23 +-
+ drivers/gpu/drm/amd/amdgpu/soc15.h | 2 +
+ drivers/gpu/drm/amd/amdgpu/ta_xgmi_if.h | 130 ++
+ drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 37 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 36 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 84 +-
+ drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 86 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 6 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 14 +-
+ drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 19 +-
+ drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 42 +-
+ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 28 +
+ drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 33 +
+ drivers/gpu/drm/amd/amdgpu/vi.c | 19 +
+ drivers/gpu/drm/amd/amdgpu/vi.h | 1 +
+ drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 3 +-
+ drivers/gpu/drm/amd/amdkfd/cik_regs.h | 2 -
+ drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 21 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 15 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_device.c | 57 +-
+ .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 38 +-
+ .../drm/amd/amdkfd/kfd_device_queue_manager_vi.c | 1 -
+ drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 +
+ drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 35 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 2 +
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 5 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 5 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 2 +
+ drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 5 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 +
+ drivers/gpu/drm/amd/amdkfd/kfd_process.c | 34 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 12 +-
+ drivers/gpu/drm/amd/display/Makefile | 3 +-
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 863 +++++---
+ drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 112 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 2 +-
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 5 +
+ .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 115 +-
+ .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 20 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 +
+ .../drm/amd/display/dc/bios/bios_parser_helper.c | 93 +
+ .../drm/amd/display/dc/bios/bios_parser_helper.h | 4 +
+ drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 32 +-
+ drivers/gpu/drm/amd/display/dc/core/dc.c | 73 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 7 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link.c | 70 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 17 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 695 +++----
+ drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 3 +-
+ drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 1 +
+ drivers/gpu/drm/amd/display/dc/dc.h | 18 +-
+ drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 5 +
+ drivers/gpu/drm/amd/display/dc/dc_link.h | 11 +-
+ drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 -
+ drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 104 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 884 ++++++++
+ .../display/dc/dce/{dce_clocks.h => dce_clk_mgr.h} | 105 +-
+ drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 947 ---------
+ drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 52 +
+ .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 2 +-
+ .../drm/amd/display/dc/dce/dce_stream_encoder.c | 23 +-
+ .../amd/display/dc/dce100/dce100_hw_sequencer.c | 73 +-
+ .../amd/display/dc/dce100/dce100_hw_sequencer.h | 5 +-
+ .../drm/amd/display/dc/dce100/dce100_resource.c | 25 +-
+ .../amd/display/dc/dce110/dce110_hw_sequencer.c | 279 +--
+ .../amd/display/dc/dce110/dce110_hw_sequencer.h | 11 +-
+ .../drm/amd/display/dc/dce110/dce110_resource.c | 30 +-
+ .../drm/amd/display/dc/dce112/dce112_resource.c | 39 +-
+ .../drm/amd/display/dc/dce120/dce120_resource.c | 20 +-
+ .../drm/amd/display/dc/dce80/dce80_hw_sequencer.c | 3 +-
+ .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 42 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c | 375 ++++
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.h | 37 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 253 ++-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 2 +-
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 2 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 96 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 3 +
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 203 +-
+ .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 30 +
+ .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 59 +-
+ .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 8 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 45 +-
+ drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 2 +
+ .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 32 +-
+ .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 3 -
+ drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 28 +-
+ drivers/gpu/drm/amd/display/dc/dm_services_types.h | 18 +-
+ .../drm/amd/display/dc/dml/display_mode_structs.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/inc/bw_fixed.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/inc/core_types.h | 5 +-
+ drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 12 +-
+ .../dc/inc/hw/{display_clock.h => clk_mgr.h} | 34 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 44 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 7 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 6 +
+ drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 16 +-
+ .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 4 +-
+ drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 21 +-
+ drivers/gpu/drm/amd/display/dc/inc/resource.h | 3 -
+ .../drm/amd/display/modules/color/color_gamma.c | 192 +-
+ .../drm/amd/display/modules/color/color_gamma.h | 11 +-
+ .../drm/amd/display/modules/freesync/freesync.c | 37 +-
+ drivers/gpu/drm/amd/display/modules/power/Makefile | 31 +
+ .../drm/amd/display/modules/power/power_helpers.c | 326 +++
+ .../drm/amd/display/modules/power/power_helpers.h | 47 +
+ drivers/gpu/drm/amd/include/amd_acpi.h | 175 +-
+ drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 115 -
+ drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 52 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 6 +-
+ .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 12 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 6 +-
+ .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 36 +-
+ drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 139 +-
+ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 4 +-
+ drivers/gpu/drm/amd/powerplay/inc/smu7_common.h | 4 -
+ .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 1 -
+ .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 1 -
+ drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 49 +-
+ drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 3 +
+ .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 1 -
+ drivers/gpu/drm/arc/arcpgu.h | 4 -
+ drivers/gpu/drm/arc/arcpgu_crtc.c | 3 -
+ drivers/gpu/drm/arc/arcpgu_drv.c | 38 +-
+ drivers/gpu/drm/arm/malidp_hw.c | 14 +-
+ drivers/gpu/drm/arm/malidp_planes.c | 28 +-
+ drivers/gpu/drm/ast/ast_drv.h | 2 -
+ drivers/gpu/drm/ast/ast_ttm.c | 64 -
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 2 -
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 15 +-
+ drivers/gpu/drm/bochs/bochs.h | 4 +-
+ drivers/gpu/drm/bochs/bochs_hw.c | 30 +
+ drivers/gpu/drm/bochs/bochs_kms.c | 20 +-
+ drivers/gpu/drm/bochs/bochs_mm.c | 65 +-
+ drivers/gpu/drm/bridge/Kconfig | 1 +
+ drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 12 +-
+ drivers/gpu/drm/bridge/sii902x.c | 247 ++-
+ drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 +-
+ drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 114 +-
+ drivers/gpu/drm/bridge/tc358764.c | 2 +-
+ drivers/gpu/drm/cirrus/cirrus_drv.h | 2 -
+ drivers/gpu/drm/cirrus/cirrus_fbdev.c | 3 -
+ drivers/gpu/drm/cirrus/cirrus_ttm.c | 64 -
+ drivers/gpu/drm/drm_atomic.c | 142 +-
+ drivers/gpu/drm/drm_atomic_helper.c | 689 ++----
+ drivers/gpu/drm/drm_atomic_state_helper.c | 444 ++++
+ drivers/gpu/drm/drm_atomic_uapi.c | 21 +
+ drivers/gpu/drm/drm_bufs.c | 3 +
+ drivers/gpu/drm/drm_client.c | 12 +-
+ drivers/gpu/drm/drm_color_mgmt.c | 14 +-
+ drivers/gpu/drm/drm_connector.c | 180 +-
+ drivers/gpu/drm/drm_crtc.c | 33 +-
+ drivers/gpu/drm/drm_crtc_helper.c | 115 -
+ drivers/gpu/drm/drm_damage_helper.c | 334 +++
+ drivers/gpu/drm/drm_debugfs.c | 89 +
+ drivers/gpu/drm/drm_dp_cec.c | 2 -
+ drivers/gpu/drm/drm_dp_helper.c | 92 +
+ drivers/gpu/drm/drm_dp_mst_topology.c | 9 +-
+ drivers/gpu/drm/drm_drv.c | 23 +-
+ drivers/gpu/drm/drm_dsc.c | 228 ++
+ drivers/gpu/drm/drm_fb_cma_helper.c | 43 +-
+ drivers/gpu/drm/drm_fb_helper.c | 6 +
+ drivers/gpu/drm/drm_fourcc.c | 79 +-
+ drivers/gpu/drm/drm_framebuffer.c | 13 +-
+ drivers/gpu/drm/drm_gem.c | 109 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 86 +
+ drivers/gpu/drm/drm_gem_framebuffer_helper.c | 2 +-
+ drivers/gpu/drm/drm_global.c | 137 --
+ drivers/gpu/drm/drm_info.c | 137 --
+ drivers/gpu/drm/drm_internal.h | 5 -
+ drivers/gpu/drm/drm_lease.c | 38 +-
+ drivers/gpu/drm/drm_memory.c | 10 +-
+ drivers/gpu/drm/drm_mode_config.c | 12 +
+ drivers/gpu/drm/drm_mode_object.c | 3 +-
+ drivers/gpu/drm/drm_modes.c | 4 +-
+ drivers/gpu/drm/drm_modeset_helper.c | 15 +
+ drivers/gpu/drm/drm_modeset_lock.c | 6 +
+ drivers/gpu/drm/drm_panel_orientation_quirks.c | 16 +
+ drivers/gpu/drm/drm_pci.c | 5 +-
+ drivers/gpu/drm/drm_plane.c | 39 +-
+ drivers/gpu/drm/drm_plane_helper.c | 331 +--
+ drivers/gpu/drm/drm_prime.c | 118 +-
+ drivers/gpu/drm/drm_simple_kms_helper.c | 8 +
+ drivers/gpu/drm/drm_syncobj.c | 80 +-
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 +-
+ drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +-
+ drivers/gpu/drm/etnaviv/etnaviv_sched.c | 5 +-
+ drivers/gpu/drm/exynos/Kconfig | 5 -
+ drivers/gpu/drm/exynos/Makefile | 3 +-
+ drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 87 +-
+ drivers/gpu/drm/exynos/exynos7_drm_decon.c | 5 +-
+ drivers/gpu/drm/exynos/exynos_drm_dma.c | 157 ++
+ drivers/gpu/drm/exynos/exynos_drm_drv.c | 55 +-
+ drivers/gpu/drm/exynos/exynos_drm_drv.h | 11 +
+ drivers/gpu/drm/exynos/exynos_drm_fb.c | 1 -
+ drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 1 -
+ drivers/gpu/drm/exynos/exynos_drm_fimc.c | 5 +-
+ drivers/gpu/drm/exynos/exynos_drm_fimd.c | 5 +-
+ drivers/gpu/drm/exynos/exynos_drm_g2d.c | 5 +-
+ drivers/gpu/drm/exynos/exynos_drm_gem.c | 1 -
+ drivers/gpu/drm/exynos/exynos_drm_gsc.c | 5 +-
+ drivers/gpu/drm/exynos/exynos_drm_iommu.c | 111 -
+ drivers/gpu/drm/exynos/exynos_drm_iommu.h | 134 --
+ drivers/gpu/drm/exynos/exynos_drm_rotator.c | 5 +-
+ drivers/gpu/drm/exynos/exynos_drm_scaler.c | 5 +-
+ drivers/gpu/drm/exynos/exynos_mixer.c | 30 +-
+ drivers/gpu/drm/exynos/regs-decon5433.h | 22 +
+ drivers/gpu/drm/exynos/regs-mixer.h | 9 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 33 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 25 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 1 -
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 2 -
+ drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 57 -
+ drivers/gpu/drm/i915/Makefile | 13 +-
+ drivers/gpu/drm/i915/gvt/scheduler.c | 28 +
+ drivers/gpu/drm/i915/i915_debugfs.c | 309 ++-
+ drivers/gpu/drm/i915/i915_drv.c | 122 +-
+ drivers/gpu/drm/i915/i915_drv.h | 296 +--
+ drivers/gpu/drm/i915/i915_fixed.h | 143 ++
+ drivers/gpu/drm/i915/i915_gem.c | 174 +-
+ drivers/gpu/drm/i915/i915_gem.h | 4 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 19 +-
+ drivers/gpu/drm/i915/i915_gem_context.h | 1 +
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 244 +--
+ drivers/gpu/drm/i915/i915_gem_gtt.h | 11 +-
+ drivers/gpu/drm/i915/i915_gpu_error.c | 353 ++--
+ drivers/gpu/drm/i915/i915_gpu_error.h | 28 +-
+ drivers/gpu/drm/i915/i915_irq.c | 83 +-
+ drivers/gpu/drm/i915/i915_oa_bdw.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_bdw.h | 27 +-
+ drivers/gpu/drm/i915/i915_oa_bxt.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_bxt.h | 27 +-
+ drivers/gpu/drm/i915/i915_oa_cflgt2.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_cflgt2.h | 27 +-
+ drivers/gpu/drm/i915/i915_oa_cflgt3.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_cflgt3.h | 27 +-
+ drivers/gpu/drm/i915/i915_oa_chv.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_chv.h | 27 +-
+ drivers/gpu/drm/i915/i915_oa_cnl.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_cnl.h | 27 +-
+ drivers/gpu/drm/i915/i915_oa_glk.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_glk.h | 27 +-
+ drivers/gpu/drm/i915/i915_oa_hsw.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_hsw.h | 27 +-
+ drivers/gpu/drm/i915/i915_oa_icl.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_icl.h | 27 +-
+ drivers/gpu/drm/i915/i915_oa_kblgt2.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_kblgt2.h | 27 +-
+ drivers/gpu/drm/i915/i915_oa_kblgt3.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_kblgt3.h | 27 +-
+ drivers/gpu/drm/i915/i915_oa_sklgt2.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_sklgt2.h | 27 +-
+ drivers/gpu/drm/i915/i915_oa_sklgt3.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_sklgt3.h | 27 +-
+ drivers/gpu/drm/i915/i915_oa_sklgt4.c | 27 +-
+ drivers/gpu/drm/i915/i915_oa_sklgt4.h | 27 +-
+ drivers/gpu/drm/i915/i915_params.c | 9 +-
+ drivers/gpu/drm/i915/i915_params.h | 1 -
+ drivers/gpu/drm/i915/i915_pci.c | 186 +-
+ drivers/gpu/drm/i915/i915_perf.c | 49 +-
+ drivers/gpu/drm/i915/i915_query.c | 3 +-
+ drivers/gpu/drm/i915/i915_reg.h | 829 ++++++--
+ drivers/gpu/drm/i915/i915_request.c | 121 +-
+ drivers/gpu/drm/i915/i915_request.h | 13 +-
+ drivers/gpu/drm/i915/i915_scheduler.c | 399 ++++
+ drivers/gpu/drm/i915/i915_scheduler.h | 36 +
+ drivers/gpu/drm/i915/i915_sw_fence.c | 7 +-
+ drivers/gpu/drm/i915/i915_sw_fence.h | 5 +-
+ drivers/gpu/drm/i915/i915_syncmap.c | 2 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 31 +-
+ drivers/gpu/drm/i915/i915_timeline.h | 19 +
+ drivers/gpu/drm/i915/i915_utils.h | 13 +-
+ drivers/gpu/drm/i915/i915_vma.c | 10 +-
+ drivers/gpu/drm/i915/icl_dsi.c | 1337 +++++++++++-
+ drivers/gpu/drm/i915/intel_atomic.c | 119 +-
+ drivers/gpu/drm/i915/intel_atomic_plane.c | 184 +-
+ drivers/gpu/drm/i915/intel_audio.c | 37 +-
+ drivers/gpu/drm/i915/intel_bios.c | 91 +-
+ drivers/gpu/drm/i915/intel_breadcrumbs.c | 6 +-
+ drivers/gpu/drm/i915/intel_cdclk.c | 39 +-
+ drivers/gpu/drm/i915/intel_color.c | 3 +-
+ drivers/gpu/drm/i915/intel_combo_phy.c | 254 +++
+ .../drm/i915/{intel_modes.c => intel_connector.c} | 129 ++
+ drivers/gpu/drm/i915/intel_crt.c | 11 +-
+ drivers/gpu/drm/i915/intel_csr.c | 162 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 666 ++++--
+ drivers/gpu/drm/i915/intel_device_info.c | 77 +-
+ drivers/gpu/drm/i915/intel_device_info.h | 52 +-
+ drivers/gpu/drm/i915/intel_display.c | 2197 +++++++++-----------
+ drivers/gpu/drm/i915/intel_display.h | 58 +-
+ drivers/gpu/drm/i915/intel_dp.c | 1108 ++++++----
+ drivers/gpu/drm/i915/intel_dp_mst.c | 33 +-
+ drivers/gpu/drm/i915/intel_dpio_phy.c | 4 +-
+ drivers/gpu/drm/i915/intel_dpll_mgr.c | 120 +-
+ drivers/gpu/drm/i915/intel_dpll_mgr.h | 8 +-
+ drivers/gpu/drm/i915/intel_drv.h | 274 ++-
+ drivers/gpu/drm/i915/intel_dsi.c | 128 ++
+ drivers/gpu/drm/i915/intel_dsi.h | 35 +
+ drivers/gpu/drm/i915/intel_dsi_vbt.c | 306 ++-
+ drivers/gpu/drm/i915/intel_dvo.c | 10 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c | 75 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 12 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 10 +-
+ drivers/gpu/drm/i915/intel_guc.c | 45 +-
+ drivers/gpu/drm/i915/intel_guc.h | 5 +
+ drivers/gpu/drm/i915/intel_guc_fw.c | 113 +-
+ drivers/gpu/drm/i915/intel_guc_fwif.h | 41 +-
+ drivers/gpu/drm/i915/intel_guc_reg.h | 12 +
+ drivers/gpu/drm/i915/intel_guc_submission.c | 216 +-
+ drivers/gpu/drm/i915/intel_hdcp.c | 214 +-
+ drivers/gpu/drm/i915/intel_hdmi.c | 237 ++-
+ drivers/gpu/drm/i915/intel_hotplug.c | 67 +-
+ drivers/gpu/drm/i915/intel_huc.c | 7 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 2 +-
+ drivers/gpu/drm/i915/intel_lrc.c | 393 +---
+ drivers/gpu/drm/i915/intel_lspcon.c | 347 +++-
+ drivers/gpu/drm/i915/intel_lvds.c | 67 +-
+ drivers/gpu/drm/i915/intel_opregion.c | 158 +-
+ drivers/gpu/drm/i915/intel_opregion.h | 15 +
+ drivers/gpu/drm/i915/intel_overlay.c | 4 +-
+ drivers/gpu/drm/i915/intel_panel.c | 13 +-
+ drivers/gpu/drm/i915/intel_pm.c | 904 ++++----
+ drivers/gpu/drm/i915/intel_psr.c | 358 ++--
+ drivers/gpu/drm/i915/intel_quirks.c | 169 ++
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 79 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 47 +-
+ drivers/gpu/drm/i915/intel_runtime_pm.c | 346 ++-
+ drivers/gpu/drm/i915/intel_sdvo.c | 56 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 740 +++++--
+ drivers/gpu/drm/i915/intel_tv.c | 10 +-
+ drivers/gpu/drm/i915/intel_uc.c | 2 +-
+ drivers/gpu/drm/i915/intel_uc_fw.h | 7 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 2 +-
+ drivers/gpu/drm/i915/intel_vbt_defs.h | 7 +
+ drivers/gpu/drm/i915/intel_vdsc.c | 1088 ++++++++++
+ drivers/gpu/drm/i915/intel_workarounds.c | 478 ++---
+ drivers/gpu/drm/i915/intel_workarounds.h | 10 +-
+ drivers/gpu/drm/i915/selftests/huge_pages.c | 34 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_context.c | 428 +++-
+ drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 2 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +-
+ drivers/gpu/drm/i915/selftests/igt_reset.c | 44 +
+ drivers/gpu/drm/i915/selftests/igt_reset.h | 15 +
+ drivers/gpu/drm/i915/selftests/igt_spinner.c | 199 ++
+ drivers/gpu/drm/i915/selftests/igt_spinner.h | 37 +
+ drivers/gpu/drm/i915/selftests/intel_guc.c | 59 +-
+ drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 70 +-
+ drivers/gpu/drm/i915/selftests/intel_lrc.c | 566 ++---
+ drivers/gpu/drm/i915/selftests/intel_workarounds.c | 247 ++-
+ drivers/gpu/drm/i915/selftests/mock_engine.c | 2 +-
+ drivers/gpu/drm/i915/vlv_dsi.c | 190 +-
+ drivers/gpu/drm/imx/dw_hdmi-imx.c | 5 +-
+ drivers/gpu/drm/imx/imx-drm-core.c | 11 +-
+ drivers/gpu/drm/imx/imx-ldb.c | 10 +-
+ drivers/gpu/drm/imx/imx-tve.c | 12 +-
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 10 +-
+ drivers/gpu/drm/imx/ipuv3-plane.c | 18 +-
+ drivers/gpu/drm/imx/parallel-display.c | 10 +-
+ drivers/gpu/drm/meson/Kconfig | 1 +
+ drivers/gpu/drm/meson/Makefile | 2 +-
+ drivers/gpu/drm/meson/meson_canvas.c | 7 +-
+ drivers/gpu/drm/meson/meson_canvas.h | 11 +-
+ drivers/gpu/drm/meson/meson_crtc.c | 265 ++-
+ drivers/gpu/drm/meson/meson_drv.c | 91 +-
+ drivers/gpu/drm/meson/meson_drv.h | 67 +-
+ drivers/gpu/drm/meson/meson_dw_hdmi.c | 12 +-
+ drivers/gpu/drm/meson/meson_overlay.c | 588 ++++++
+ drivers/gpu/drm/meson/meson_overlay.h | 14 +
+ drivers/gpu/drm/meson/meson_plane.c | 199 +-
+ drivers/gpu/drm/meson/meson_registers.h | 3 +
+ drivers/gpu/drm/meson/meson_vclk.c | 127 +-
+ drivers/gpu/drm/meson/meson_vclk.h | 2 +
+ drivers/gpu/drm/meson/meson_venc.c | 129 ++
+ drivers/gpu/drm/meson/meson_viu.c | 42 +
+ drivers/gpu/drm/meson/meson_viu.h | 1 +
+ drivers/gpu/drm/meson/meson_vpp.c | 90 +-
+ drivers/gpu/drm/mgag200/mgag200_drv.h | 2 -
+ drivers/gpu/drm/mgag200/mgag200_ttm.c | 64 -
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 5 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 -
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 1 -
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 1 -
+ drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +-
+ drivers/gpu/drm/msm/msm_drv.c | 1 +
+ drivers/gpu/drm/msm/msm_gem_submit.c | 3 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 +-
+ drivers/gpu/drm/nouveau/nouveau_drv.h | 2 -
+ drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +-
+ drivers/gpu/drm/nouveau/nouveau_ttm.c | 67 -
+ drivers/gpu/drm/panel/Kconfig | 25 +
+ drivers/gpu/drm/panel/Makefile | 3 +
+ drivers/gpu/drm/panel/panel-innolux-p079zca.c | 3 +-
+ drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 330 +++
+ drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 264 +++
+ drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 7 +-
+ drivers/gpu/drm/panel/panel-simple.c | 184 +-
+ drivers/gpu/drm/panel/panel-truly-nt35597.c | 675 ++++++
+ drivers/gpu/drm/pl111/pl111_vexpress.c | 2 +
+ drivers/gpu/drm/qxl/qxl_cmd.c | 7 +-
+ drivers/gpu/drm/qxl/qxl_debugfs.c | 5 +-
+ drivers/gpu/drm/qxl/qxl_dev.h | 1 -
+ drivers/gpu/drm/qxl/qxl_display.c | 37 +-
+ drivers/gpu/drm/qxl/qxl_draw.c | 14 +-
+ drivers/gpu/drm/qxl/qxl_drv.h | 32 +-
+ drivers/gpu/drm/qxl/qxl_dumb.c | 3 +-
+ drivers/gpu/drm/qxl/qxl_fb.c | 6 +-
+ drivers/gpu/drm/qxl/qxl_image.c | 4 +-
+ drivers/gpu/drm/qxl/qxl_ioctl.c | 2 +
+ drivers/gpu/drm/qxl/qxl_kms.c | 8 +-
+ drivers/gpu/drm/qxl/qxl_object.c | 27 +-
+ drivers/gpu/drm/qxl/qxl_object.h | 4 +-
+ drivers/gpu/drm/qxl/qxl_prime.c | 1 -
+ drivers/gpu/drm/qxl/qxl_release.c | 7 +-
+ drivers/gpu/drm/qxl/qxl_ttm.c | 73 +-
+ drivers/gpu/drm/radeon/r300.c | 4 +-
+ drivers/gpu/drm/radeon/r420.c | 1 +
+ drivers/gpu/drm/radeon/radeon.h | 3 -
+ drivers/gpu/drm/radeon/radeon_legacy_tv.c | 10 -
+ drivers/gpu/drm/radeon/radeon_object.c | 2 -
+ drivers/gpu/drm/radeon/radeon_ttm.c | 65 -
+ drivers/gpu/drm/radeon/radeon_vm.c | 4 +-
+ drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 30 +-
+ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 68 +-
+ drivers/gpu/drm/rcar-du/rcar_du_drv.h | 3 -
+ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 23 +-
+ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 3 +-
+ drivers/gpu/drm/rcar-du/rcar_lvds.c | 1 +
+ drivers/gpu/drm/rockchip/Kconfig | 2 +-
+ drivers/gpu/drm/rockchip/Makefile | 2 +-
+ drivers/gpu/drm/rockchip/cdn-dp-reg.c | 2 +-
+ drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 1076 ++++++++++
+ drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 1349 ------------
+ drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 128 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 4 +-
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 3 +
+ drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 4 +
+ drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 7 +-
+ drivers/gpu/drm/scheduler/sched_entity.c | 10 +-
+ drivers/gpu/drm/scheduler/sched_main.c | 77 +-
+ drivers/gpu/drm/selftests/Makefile | 6 +-
+ drivers/gpu/drm/selftests/drm_helper_selftests.h | 9 -
+ drivers/gpu/drm/selftests/drm_modeset_selftests.h | 34 +
+ drivers/gpu/drm/selftests/test-drm_damage_helper.c | 811 ++++++++
+ drivers/gpu/drm/selftests/test-drm_format.c | 280 +++
+ drivers/gpu/drm/selftests/test-drm_framebuffer.c | 346 +++
+ .../gpu/drm/selftests/test-drm_modeset_common.c | 32 +
+ .../gpu/drm/selftests/test-drm_modeset_common.h | 43 +
+ .../{test-drm-helper.c => test-drm_plane_helper.c} | 38 +-
+ drivers/gpu/drm/shmobile/shmob_drm_drv.c | 4 +-
+ drivers/gpu/drm/sti/sti_crtc.c | 4 +-
+ drivers/gpu/drm/sti/sti_cursor.c | 1 -
+ drivers/gpu/drm/sti/sti_drv.c | 6 +-
+ drivers/gpu/drm/sti/sti_gdp.c | 3 +-
+ drivers/gpu/drm/sti/sti_hqvdp.c | 1 -
+ drivers/gpu/drm/stm/drv.c | 13 +-
+ drivers/gpu/drm/stm/ltdc.c | 45 +
+ drivers/gpu/drm/stm/ltdc.h | 5 +
+ drivers/gpu/drm/sun4i/sun4i_backend.c | 106 +-
+ drivers/gpu/drm/sun4i/sun4i_backend.h | 3 +
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 25 +-
+ drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 12 +-
+ drivers/gpu/drm/sun4i/sun4i_framebuffer.h | 3 +-
+ drivers/gpu/drm/sun4i/sun4i_frontend.c | 113 +-
+ drivers/gpu/drm/sun4i/sun4i_frontend.h | 11 +-
+ drivers/gpu/drm/sun4i/sun4i_hdmi_tmds_clk.c | 4 +-
+ drivers/gpu/drm/sun4i/sun4i_layer.c | 15 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.c | 29 +-
+ drivers/gpu/drm/sun4i/sun4i_tcon.h | 1 +
+ drivers/gpu/drm/sun4i/sun8i_csc.c | 83 +
+ drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 45 +-
+ drivers/gpu/drm/sun4i/sun8i_dw_hdmi.h | 14 +-
+ drivers/gpu/drm/sun4i/sun8i_hdmi_phy.c | 201 +-
+ drivers/gpu/drm/sun4i/sun8i_mixer.c | 57 +-
+ drivers/gpu/drm/sun4i/sun8i_mixer.h | 80 +-
+ drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 52 +-
+ drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 49 +-
+ drivers/gpu/drm/sun4i/sun8i_ui_layer.h | 37 +-
+ drivers/gpu/drm/sun4i/sun8i_ui_scaler.c | 47 +-
+ drivers/gpu/drm/sun4i/sun8i_ui_scaler.h | 28 +-
+ drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 57 +-
+ drivers/gpu/drm/sun4i/sun8i_vi_layer.h | 25 +-
+ drivers/gpu/drm/sun4i/sun8i_vi_scaler.c | 70 +-
+ drivers/gpu/drm/sun4i/sun8i_vi_scaler.h | 68 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 11 +-
+ drivers/gpu/drm/tinydrm/Kconfig | 11 +
+ drivers/gpu/drm/tinydrm/Makefile | 1 +
+ drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 72 +-
+ drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 6 +
+ drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 6 +-
+ drivers/gpu/drm/tinydrm/hx8357d.c | 270 +++
+ drivers/gpu/drm/tinydrm/ili9225.c | 5 +-
+ drivers/gpu/drm/tinydrm/ili9341.c | 4 +-
+ drivers/gpu/drm/tinydrm/mi0283qt.c | 6 +-
+ drivers/gpu/drm/tinydrm/mipi-dbi.c | 14 +-
+ drivers/gpu/drm/tinydrm/repaper.c | 7 +-
+ drivers/gpu/drm/tinydrm/st7586.c | 5 +-
+ drivers/gpu/drm/tinydrm/st7735r.c | 4 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 73 +-
+ drivers/gpu/drm/ttm/ttm_execbuf_util.c | 6 +-
+ drivers/gpu/drm/ttm/ttm_memory.c | 14 +-
+ drivers/gpu/drm/tve200/tve200_drv.c | 4 +-
+ drivers/gpu/drm/udl/udl_main.c | 7 +-
+ drivers/gpu/drm/v3d/v3d_bo.c | 1 +
+ drivers/gpu/drm/v3d/v3d_debugfs.c | 46 +-
+ drivers/gpu/drm/v3d/v3d_drv.c | 15 +-
+ drivers/gpu/drm/v3d/v3d_drv.h | 37 +-
+ drivers/gpu/drm/v3d/v3d_fence.c | 10 +-
+ drivers/gpu/drm/v3d/v3d_gem.c | 212 +-
+ drivers/gpu/drm/v3d/v3d_irq.c | 29 +-
+ drivers/gpu/drm/v3d/v3d_regs.h | 79 +
+ drivers/gpu/drm/v3d/v3d_sched.c | 152 +-
+ drivers/gpu/drm/v3d/v3d_trace.h | 121 ++
+ drivers/gpu/drm/vc4/vc4_drv.c | 3 +
+ drivers/gpu/drm/vc4/vc4_drv.h | 6 +
+ drivers/gpu/drm/vc4/vc4_gem.c | 6 +-
+ drivers/gpu/drm/vc4/vc4_plane.c | 375 ++--
+ drivers/gpu/drm/vc4/vc4_regs.h | 8 +-
+ drivers/gpu/drm/vgem/vgem_drv.c | 19 +-
+ drivers/gpu/drm/vgem/vgem_fence.c | 2 +-
+ drivers/gpu/drm/virtio/virtgpu_display.c | 12 +
+ drivers/gpu/drm/virtio/virtgpu_drm_bus.c | 31 +
+ drivers/gpu/drm/virtio/virtgpu_drv.c | 1 +
+ drivers/gpu/drm/virtio/virtgpu_drv.h | 43 +-
+ drivers/gpu/drm/virtio/virtgpu_fb.c | 7 +-
+ drivers/gpu/drm/virtio/virtgpu_fence.c | 39 +-
+ drivers/gpu/drm/virtio/virtgpu_gem.c | 8 +-
+ drivers/gpu/drm/virtio/virtgpu_ioctl.c | 137 +-
+ drivers/gpu/drm/virtio/virtgpu_kms.c | 56 +-
+ drivers/gpu/drm/virtio/virtgpu_object.c | 26 +-
+ drivers/gpu/drm/virtio/virtgpu_plane.c | 46 +-
+ drivers/gpu/drm/virtio/virtgpu_ttm.c | 65 +-
+ drivers/gpu/drm/virtio/virtgpu_vq.c | 129 +-
+ drivers/gpu/drm/vkms/vkms_drv.c | 22 +-
+ drivers/gpu/drm/vkms/vkms_drv.h | 3 -
+ drivers/gpu/drm/vkms/vkms_gem.c | 26 -
+ drivers/gpu/drm/vkms/vkms_plane.c | 9 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 16 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 17 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 3 -
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 593 +++---
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 150 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 12 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 360 +++-
+ drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 562 +++--
+ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 54 -
+ drivers/gpu/drm/zte/zx_drm_drv.c | 5 +-
+ drivers/gpu/drm/zte/zx_plane.c | 1 -
+ drivers/gpu/ipu-v3/ipu-cpmem.c | 52 +-
+ drivers/gpu/ipu-v3/ipu-ic.c | 52 +-
+ drivers/gpu/ipu-v3/ipu-image-convert.c | 1019 +++++++--
+ drivers/gpu/vga/vgaarb.c | 21 +-
+ drivers/media/i2c/adv7511.c | 2 +-
+ drivers/media/i2c/adv7604.c | 2 +-
+ drivers/media/i2c/adv7842.c | 2 +-
+ drivers/media/i2c/tc358743.c | 2 +-
+ drivers/media/i2c/tda1997x.c | 4 +-
+ drivers/staging/vboxvideo/vbox_drv.c | 1 -
+ drivers/staging/vboxvideo/vbox_drv.h | 2 -
+ drivers/staging/vboxvideo/vbox_ttm.c | 65 +-
+ drivers/video/hdmi.c | 511 ++++-
+ fs/sysfs/file.c | 4 +-
+ include/drm/bridge/dw_hdmi.h | 1 +
+ include/drm/bridge/dw_mipi_dsi.h | 14 +-
+ include/drm/drmP.h | 7 +-
+ include/drm/drm_atomic.h | 10 +-
+ include/drm/drm_atomic_helper.h | 45 +-
+ include/drm/drm_atomic_state_helper.h | 73 +
+ include/drm/drm_connector.h | 60 +-
+ include/drm/drm_crtc.h | 9 +
+ include/drm/drm_crtc_helper.h | 6 -
+ include/drm/drm_damage_helper.h | 99 +
+ include/drm/drm_dp_helper.h | 98 +
+ include/drm/drm_dp_mst_helper.h | 6 -
+ include/drm/drm_drv.h | 14 +-
+ include/drm/drm_dsc.h | 485 +++++
+ include/drm/drm_fb_cma_helper.h | 2 -
+ include/drm/drm_file.h | 14 +-
+ include/drm/drm_fourcc.h | 89 +-
+ include/drm/drm_framebuffer.h | 24 -
+ include/drm/drm_gem.h | 181 +-
+ include/drm/drm_gem_cma_helper.h | 24 +
+ include/drm/drm_global.h | 53 -
+ include/drm/drm_hdcp.h | 212 ++
+ include/drm/drm_mipi_dsi.h | 8 +
+ include/drm/drm_mode_config.h | 27 +
+ include/drm/drm_modeset_lock.h | 59 +
+ include/drm/drm_plane.h | 44 +
+ include/drm/drm_plane_helper.h | 35 -
+ include/drm/drm_prime.h | 4 +-
+ include/drm/drm_property.h | 3 +-
+ include/drm/drm_syncobj.h | 4 +-
+ include/drm/drm_vblank.h | 8 +-
+ include/drm/gpu_scheduler.h | 5 +
+ include/drm/i915_pciids.h | 21 +-
+ include/drm/tinydrm/tinydrm.h | 35 +-
+ include/drm/ttm/ttm_bo_driver.h | 23 +-
+ include/drm/ttm/ttm_memory.h | 4 +-
+ include/linux/dma-fence.h | 1 +
+ include/linux/hdmi.h | 24 +-
+ include/linux/reservation.h | 12 +-
+ include/linux/swap.h | 4 +-
+ include/linux/sysfs.h | 8 +-
+ include/uapi/drm/amdgpu_drm.h | 6 +
+ include/uapi/drm/drm_fourcc.h | 15 +
+ include/uapi/drm/drm_mode.h | 19 +
+ include/uapi/drm/i915_drm.h | 8 +
+ include/uapi/drm/v3d_drm.h | 39 +-
+ include/uapi/drm/virtgpu_drm.h | 13 +-
+ include/uapi/linux/virtio_gpu.h | 18 +
+ include/video/imx-ipu-v3.h | 9 +
+ mm/shmem.c | 2 +-
+ mm/vmscan.c | 22 +-
+ scripts/coccinelle/api/drm-get-put.cocci | 78 -
+ sound/x86/intel_hdmi_audio.c | 26 +-
+ 734 files changed, 37495 insertions(+), 19892 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/display/himax,hx8357d.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/auo,g101evn010
+ create mode 100644 Documentation/devicetree/bindings/display/panel/bananapi,s070wv20-ct16.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/cdtech,s043wq26h-ct7.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/cdtech,s070wv95-ct16.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/dlc,dlc1010gig.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino.txt
+ create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,s6d16d0.txt
+ create mode 100644 Documentation/devicetree/bindings/display/truly,nt35597.txt
+ create mode 100644 Documentation/gpu/amdgpu-dc.rst
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_csa.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h
+ create mode 100644 drivers/gpu/drm/amd/amdgpu/ta_xgmi_if.h
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c
+ rename drivers/gpu/drm/amd/display/dc/dce/{dce_clocks.h => dce_clk_mgr.h} (54%)
+ delete mode 100644 drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c
+ create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.h
+ rename drivers/gpu/drm/amd/display/dc/inc/hw/{display_clock.h => clk_mgr.h} (63%)
+ create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h
+ create mode 100644 drivers/gpu/drm/amd/display/modules/power/Makefile
+ create mode 100644 drivers/gpu/drm/amd/display/modules/power/power_helpers.c
+ create mode 100644 drivers/gpu/drm/amd/display/modules/power/power_helpers.h
+ create mode 100644 drivers/gpu/drm/drm_atomic_state_helper.c
+ create mode 100644 drivers/gpu/drm/drm_damage_helper.c
+ create mode 100644 drivers/gpu/drm/drm_dsc.c
+ delete mode 100644 drivers/gpu/drm/drm_global.c
+ delete mode 100644 drivers/gpu/drm/drm_info.c
+ create mode 100644 drivers/gpu/drm/exynos/exynos_drm_dma.c
+ delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_iommu.c
+ delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_iommu.h
+ create mode 100644 drivers/gpu/drm/i915/i915_fixed.h
+ create mode 100644 drivers/gpu/drm/i915/i915_scheduler.c
+ create mode 100644 drivers/gpu/drm/i915/intel_combo_phy.c
+ rename drivers/gpu/drm/i915/{intel_modes.c => intel_connector.c} (54%)
+ create mode 100644 drivers/gpu/drm/i915/intel_dsi.c
+ create mode 100644 drivers/gpu/drm/i915/intel_quirks.c
+ create mode 100644 drivers/gpu/drm/i915/intel_vdsc.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/igt_reset.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/igt_reset.h
+ create mode 100644 drivers/gpu/drm/i915/selftests/igt_spinner.c
+ create mode 100644 drivers/gpu/drm/i915/selftests/igt_spinner.h
+ create mode 100644 drivers/gpu/drm/meson/meson_overlay.c
+ create mode 100644 drivers/gpu/drm/meson/meson_overlay.h
+ create mode 100644 drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c
+ create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6d16d0.c
+ create mode 100644 drivers/gpu/drm/panel/panel-truly-nt35597.c
+ create mode 100644 drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
+ delete mode 100644 drivers/gpu/drm/rockchip/dw-mipi-dsi.c
+ delete mode 100644 drivers/gpu/drm/selftests/drm_helper_selftests.h
+ create mode 100644 drivers/gpu/drm/selftests/drm_modeset_selftests.h
+ create mode 100644 drivers/gpu/drm/selftests/test-drm_damage_helper.c
+ create mode 100644 drivers/gpu/drm/selftests/test-drm_format.c
+ create mode 100644 drivers/gpu/drm/selftests/test-drm_framebuffer.c
+ create mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.c
+ create mode 100644 drivers/gpu/drm/selftests/test-drm_modeset_common.h
+ rename drivers/gpu/drm/selftests/{test-drm-helper.c => test-drm_plane_helper.c} (90%)
+ create mode 100644 drivers/gpu/drm/tinydrm/hx8357d.c
+ create mode 100644 include/drm/drm_atomic_state_helper.h
+ create mode 100644 include/drm/drm_damage_helper.h
+ create mode 100644 include/drm/drm_dsc.h
+ delete mode 100644 include/drm/drm_global.h
+ delete mode 100644 scripts/coccinelle/api/drm-get-put.cocci
+Merging drm-intel/for-linux-next (0b5b45a61d3f drm/i915: Remove dead update_wm_pre assignment from SKL wm code)
+$ git merge drm-intel/for-linux-next
+Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/drm_dp_helper.c | 2 +
+ drivers/gpu/drm/i915/Makefile | 2 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 12 +-
+ drivers/gpu/drm/i915/i915_drv.h | 1 +
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 7 +-
+ drivers/gpu/drm/i915/i915_gem_gtt.c | 2 -
+ drivers/gpu/drm/i915/i915_gpu_error.c | 23 ++-
+ drivers/gpu/drm/i915/i915_request.c | 5 -
+ drivers/gpu/drm/i915/i915_sysfs.c | 4 +-
+ drivers/gpu/drm/i915/intel_dp.c | 45 ++++-
+ drivers/gpu/drm/i915/intel_fbc.c | 5 +-
+ drivers/gpu/drm/i915/intel_hdcp.c | 16 +-
+ drivers/gpu/drm/i915/intel_lrc.c | 217 ++++++++++-----------
+ drivers/gpu/drm/i915/intel_pm.c | 15 +-
+ drivers/gpu/drm/i915/intel_psr.c | 72 +++++--
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 23 ++-
+ drivers/gpu/drm/i915/intel_workarounds.c | 4 -
+ drivers/gpu/drm/i915/selftests/huge_pages.c | 31 ++-
+ drivers/gpu/drm/i915/selftests/igt_spinner.c | 86 ++++----
+ drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 123 ++++++------
+ drivers/gpu/drm/i915/selftests/intel_workarounds.c | 15 +-
+ include/drm/drm_dp_helper.h | 11 ++
+ 22 files changed, 402 insertions(+), 319 deletions(-)
+Merging drm-tegra/drm/tegra/for-next (180b46ecdc9f drm/tegra: sor: Reset the SOR if possible)
+$ git merge drm-tegra/drm/tegra/for-next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/tegra/dc.c | 38 ++--
+ drivers/gpu/drm/tegra/drm.c | 1 +
+ drivers/gpu/drm/tegra/falcon.c | 14 +-
+ drivers/gpu/drm/tegra/hub.c | 48 ++++-
+ drivers/gpu/drm/tegra/hub.h | 3 +
+ drivers/gpu/drm/tegra/sor.c | 254 +++++++++++++++++++++++--
+ drivers/gpu/drm/tegra/sor.h | 68 +++++++
+ drivers/gpu/drm/tegra/vic.c | 46 ++++-
+ drivers/gpu/host1x/Makefile | 3 +-
+ drivers/gpu/host1x/dev.c | 13 ++
+ drivers/gpu/host1x/hw/channel_hw.c | 7 +-
+ drivers/gpu/host1x/hw/debug_hw_1x06.c | 7 +-
+ drivers/gpu/host1x/hw/host1x07.c | 44 +++++
+ drivers/gpu/host1x/hw/host1x07.h | 26 +++
+ drivers/gpu/host1x/hw/host1x07_hardware.h | 142 ++++++++++++++
+ drivers/gpu/host1x/hw/hw_host1x06_uclass.h | 2 +-
+ drivers/gpu/host1x/hw/hw_host1x07_hypervisor.h | 32 ++++
+ drivers/gpu/host1x/hw/hw_host1x07_uclass.h | 181 ++++++++++++++++++
+ drivers/gpu/host1x/hw/hw_host1x07_vm.h | 46 +++++
+ drivers/gpu/host1x/hw/syncpt_hw.c | 4 +
+ 20 files changed, 940 insertions(+), 39 deletions(-)
+ create mode 100644 drivers/gpu/host1x/hw/host1x07.c
+ create mode 100644 drivers/gpu/host1x/hw/host1x07.h
+ create mode 100644 drivers/gpu/host1x/hw/host1x07_hardware.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x07_hypervisor.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x07_uclass.h
+ create mode 100644 drivers/gpu/host1x/hw/hw_host1x07_vm.h
+Merging drm-misc/for-linux-next (0b258ed1a219 drm: revert "expand replace_fence to support timeline point v2")
+$ git merge drm-misc/for-linux-next
+Already up to date.
+Merging drm-msm/msm-next (dd1bdbcb777d drm/msm: add headless gpu device for imx5)
+$ git merge drm-msm/msm-next
+Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c
+Auto-merging drivers/gpu/drm/msm/msm_drv.c
+Auto-merging drivers/gpu/drm/msm/hdmi/hdmi.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/hdmi/hdmi.c
+Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c
+Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c
+Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c
+Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gmu.c
+Auto-merging drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/adreno/a5xx_gpu.c
+Recorded preimage for 'drivers/gpu/drm/msm/adreno/a5xx_gpu.c'
+Resolved 'drivers/gpu/drm/msm/hdmi/hdmi.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/gpu/drm/msm/adreno/a5xx_gpu.c'.
+[master 8f12e5aa88c7] Merge remote-tracking branch 'drm-msm/msm-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/display/msm/dsi.txt | 1 +
+ .../devicetree/bindings/display/msm/gpu.txt | 4 +-
+ .../devicetree/bindings/display/msm/mdp4.txt | 2 +
+ drivers/gpu/drm/msm/Kconfig | 4 +-
+ drivers/gpu/drm/msm/Makefile | 6 +-
+ drivers/gpu/drm/msm/adreno/a2xx.xml.h | 298 ++++-
+ drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 492 +++++++++
+ drivers/gpu/drm/msm/adreno/a2xx_gpu.h | 21 +
+ drivers/gpu/drm/msm/adreno/a3xx.xml.h | 10 +-
+ drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 4 +-
+ drivers/gpu/drm/msm/adreno/a4xx.xml.h | 10 +-
+ drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 4 +-
+ drivers/gpu/drm/msm/adreno/a5xx.xml.h | 10 +-
+ drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 8 +-
+ drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 45 +-
+ drivers/gpu/drm/msm/adreno/a5xx_power.c | 15 +-
+ drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 20 +-
+ drivers/gpu/drm/msm/adreno/a6xx.xml.h | 78 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 81 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 3 +
+ drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 10 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 89 +-
+ drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 8 +
+ drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 1165 ++++++++++++++++++++
+ drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 430 ++++++++
+ drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 14 +-
+ drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 19 +-
+ drivers/gpu/drm/msm/adreno/adreno_device.c | 77 +-
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 159 ++-
+ drivers/gpu/drm/msm/adreno/adreno_gpu.h | 21 +
+ drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 18 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 10 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 133 +--
+ drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 21 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_dbg.c | 28 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 65 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 6 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 12 -
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 9 +-
+ .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 7 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 5 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 32 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 12 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 3 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 2 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_io_util.c | 8 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 146 +--
+ drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 31 -
+ drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 5 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 22 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 62 +-
+ drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c | 4 +-
+ drivers/gpu/drm/msm/disp/dpu1/msm_media_info.h | 195 +---
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 8 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_dtv_encoder.c | 12 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 70 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_lcdc_encoder.c | 43 +-
+ drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 8 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 90 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 10 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 12 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_ctl.c | 16 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 30 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_mdss.c | 10 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 8 +-
+ drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 4 +-
+ drivers/gpu/drm/msm/dsi/dsi.c | 10 +-
+ drivers/gpu/drm/msm/dsi/dsi_host.c | 28 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 28 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 6 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 6 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 2 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 2 +-
+ drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 +-
+ drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 2 +-
+ drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 16 +-
+ drivers/gpu/drm/msm/dsi/pll/dsi_pll_14nm.c | 12 +-
+ drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm.c | 16 +-
+ drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm_8960.c | 10 +-
+ drivers/gpu/drm/msm/edp/edp.c | 8 +-
+ drivers/gpu/drm/msm/hdmi/hdmi.c | 32 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 10 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 10 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_i2c.c | 2 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 12 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 6 +-
+ drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 4 +-
+ drivers/gpu/drm/msm/msm_atomic.c | 3 +-
+ drivers/gpu/drm/msm/msm_debugfs.c | 8 +-
+ drivers/gpu/drm/msm/msm_drv.c | 166 ++-
+ drivers/gpu/drm/msm/msm_drv.h | 28 +-
+ drivers/gpu/drm/msm/msm_fb.c | 14 +-
+ drivers/gpu/drm/msm/msm_fbdev.c | 10 +-
+ drivers/gpu/drm/msm/msm_gem.c | 219 +++-
+ drivers/gpu/drm/msm/msm_gem.h | 5 +
+ drivers/gpu/drm/msm/msm_gem_submit.c | 24 +-
+ drivers/gpu/drm/msm/msm_gem_vma.c | 118 +-
+ drivers/gpu/drm/msm/msm_gpu.c | 124 ++-
+ drivers/gpu/drm/msm/msm_gpu.h | 2 +
+ drivers/gpu/drm/msm/msm_gpu_trace.h | 90 ++
+ drivers/gpu/drm/msm/msm_gpu_tracepoints.c | 6 +
+ drivers/gpu/drm/msm/msm_gpummu.c | 123 +++
+ drivers/gpu/drm/msm/msm_iommu.c | 3 +-
+ drivers/gpu/drm/msm/msm_kms.h | 3 -
+ drivers/gpu/drm/msm/msm_mmu.h | 6 +-
+ drivers/gpu/drm/msm/msm_rd.c | 13 +-
+ drivers/gpu/drm/msm/msm_ringbuffer.c | 14 +-
+ drivers/gpu/drm/msm/msm_ringbuffer.h | 16 +
+ include/uapi/drm/msm_drm.h | 25 +-
+ 109 files changed, 4167 insertions(+), 1342 deletions(-)
+ create mode 100644 drivers/gpu/drm/msm/adreno/a2xx_gpu.c
+ create mode 100644 drivers/gpu/drm/msm/adreno/a2xx_gpu.h
+ create mode 100644 drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c
+ create mode 100644 drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h
+ create mode 100644 drivers/gpu/drm/msm/msm_gpu_trace.h
+ create mode 100644 drivers/gpu/drm/msm/msm_gpu_tracepoints.c
+ create mode 100644 drivers/gpu/drm/msm/msm_gpummu.c
+Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane)
+$ git merge hdlcd/for-upstream/hdlcd
+Already up to date.
+Merging mali-dp/for-upstream/mali-dp (fd99bd8b805c drm: malidp: Add the size of the superblocks when calculating total size for AFBC buffers)
+$ git merge mali-dp/for-upstream/mali-dp
+Already up to date.
+Merging imx-drm/imx-drm/next (6cec571b70ec drm/imx: ipuv3-plane: add function to query atomic update status)
+$ git merge imx-drm/imx-drm/next
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/imx/ipuv3-plane.c | 20 ++++++++++++++++++++
+ drivers/gpu/drm/imx/ipuv3-plane.h | 2 ++
+ drivers/gpu/ipu-v3/ipu-pre.c | 6 ++++++
+ drivers/gpu/ipu-v3/ipu-prg.c | 16 ++++++++++++++++
+ drivers/gpu/ipu-v3/ipu-prv.h | 1 +
+ include/video/imx-ipu-v3.h | 1 +
+ 6 files changed, 46 insertions(+)
+Merging etnaviv/etnaviv/next (99e294492ef9 drm/etnaviv: Replace drm_dev_unref with drm_dev_put)
+$ git merge etnaviv/etnaviv/next
+Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/etnaviv/etnaviv_drv.c
+Resolved 'drivers/gpu/drm/etnaviv/etnaviv_drv.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 621ff58c1933] Merge remote-tracking branch 'etnaviv/etnaviv/next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/gpu/drm/etnaviv/etnaviv_drv.c | 4 ++--
+ drivers/gpu/drm/etnaviv/etnaviv_drv.h | 11 -----------
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 15 +++++++++------
+ drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 6 ------
+ 4 files changed, 11 insertions(+), 25 deletions(-)
+Merging kconfig/for-next (bebc6082da0a Linux 4.14)
+$ git merge kconfig/for-next
+Already up to date.
+Merging regmap/for-next (52d613b36fb7 Merge remote-tracking branch 'regmap/topic/irq' into regmap-next)
+$ git merge regmap/for-next
+Merge made by the 'recursive' strategy.
+ include/linux/regmap.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+Merging sound/for-next (e854747d7593 ALSA: hda/realtek - Enable headset button support for new codec)
+$ git merge sound/for-next
+Auto-merging sound/pci/hda/patch_realtek.c
+Removing sound/pci/hda/dell_wmi_helper.c
+Removing include/linux/thinkpad_acpi.h
+Removing include/linux/dell-led.h
+Merge made by the 'recursive' strategy.
+ drivers/leds/trigger/Kconfig | 7 ++
+ drivers/leds/trigger/Makefile | 1 +
+ drivers/leds/trigger/ledtrig-audio.c | 44 ++++++++
+ drivers/platform/x86/Kconfig | 4 +
+ drivers/platform/x86/dell-laptop.c | 27 +++--
+ drivers/platform/x86/thinkpad_acpi.c | 67 +++++++++---
+ include/linux/dell-led.h | 7 --
+ include/linux/leds.h | 20 ++++
+ include/linux/thinkpad_acpi.h | 16 ---
+ include/uapi/sound/firewire.h | 20 ++++
+ sound/aoa/fabrics/layout.c | 6 +-
+ sound/aoa/soundbus/core.c | 4 +-
+ sound/aoa/soundbus/i2sbus/core.c | 6 +-
+ sound/aoa/soundbus/sysfs.c | 34 +++---
+ sound/core/control.c | 123 +++++++++------------
+ sound/firewire/Kconfig | 1 +
+ sound/firewire/oxfw/oxfw.c | 8 ++
+ sound/firewire/tascam/amdtp-tascam.c | 51 ++++++++-
+ sound/firewire/tascam/tascam-hwdep.c | 115 +++++++++++++++++---
+ sound/firewire/tascam/tascam.h | 9 ++
+ sound/pci/asihpi/asihpi.c | 2 +-
+ sound/pci/hda/dell_wmi_helper.c | 48 --------
+ sound/pci/hda/hda_generic.c | 31 ++++++
+ sound/pci/hda/hda_generic.h | 2 +
+ sound/pci/hda/hda_jack.c | 56 +++++++---
+ sound/pci/hda/hda_jack.h | 12 +-
+ sound/pci/hda/hda_tegra.c | 22 +++-
+ sound/pci/hda/patch_ca0132.c | 205 +++++++++++++++++++++--------------
+ sound/pci/hda/patch_hdmi.c | 6 +-
+ sound/pci/hda/patch_realtek.c | 83 ++++++++++++--
+ sound/pci/hda/thinkpad_helper.c | 43 +-------
+ sound/ppc/pmac.c | 4 +-
+ sound/ppc/tumbler.c | 4 +-
+ sound/usb/quirks.c | 129 +++++++++++++++++++++-
+ 34 files changed, 861 insertions(+), 356 deletions(-)
+ create mode 100644 drivers/leds/trigger/ledtrig-audio.c
+ delete mode 100644 include/linux/dell-led.h
+ delete mode 100644 include/linux/thinkpad_acpi.h
+ delete mode 100644 sound/pci/hda/dell_wmi_helper.c
+Merging sound-asoc/for-next (57fe9b91fc4a Merge branch 'asoc-4.21' into asoc-next)
+$ git merge sound-asoc/for-next
+Removing sound/soc/pxa/raumfeld.c
+Removing sound/soc/omap/mcbsp.c
+Removing sound/soc/omap/am3517evm.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/sound/ak4104.txt | 4 +-
+ Documentation/devicetree/bindings/sound/ak4118.txt | 22 +
+ .../bindings/sound/audio-graph-scu-card.txt | 4 +-
+ Documentation/devicetree/bindings/sound/cs4270.txt | 4 +-
+ .../bindings/sound/davinci-mcasp-audio.txt | 5 +
+ Documentation/devicetree/bindings/sound/dmic.txt | 2 +
+ .../devicetree/bindings/sound/omap-mcpdm.txt | 10 +
+ .../devicetree/bindings/sound/pcm3060.txt | 6 +
+ .../devicetree/bindings/sound/renesas,rsnd.txt | 394 ++++---
+ Documentation/devicetree/bindings/sound/rt5631.txt | 4 +-
+ Documentation/devicetree/bindings/sound/rt5663.txt | 6 +
+ .../devicetree/bindings/sound/simple-amplifier.txt | 5 +
+ .../devicetree/bindings/sound/simple-scu-card.txt | 2 +-
+ .../bindings/sound/sun50i-codec-analog.txt | 2 +
+ include/linux/platform_data/davinci_asp.h | 1 +
+ include/sound/simple_card_utils.h | 6 +-
+ include/sound/soc-acpi-intel-match.h | 1 +
+ include/sound/soc-acpi.h | 15 +
+ include/sound/soc.h | 14 +-
+ sound/soc/amd/Kconfig | 6 +
+ sound/soc/amd/Makefile | 1 +
+ sound/soc/amd/acp-da7219-max98357a.c | 2 +-
+ sound/soc/amd/acp-pcm-dma.c | 22 +-
+ sound/soc/amd/acp.h | 2 +-
+ sound/soc/amd/raven/Makefile | 6 +
+ sound/soc/amd/raven/acp3x-pcm-dma.c | 777 ++++++++++++++
+ sound/soc/amd/raven/acp3x.h | 58 +
+ sound/soc/amd/raven/chip_offset_byte.h | 639 +++++++++++
+ sound/soc/amd/raven/pci-acp3x.c | 156 +++
+ sound/soc/codecs/Kconfig | 6 +
+ sound/soc/codecs/Makefile | 2 +
+ sound/soc/codecs/ak4104.c | 22 +-
+ sound/soc/codecs/ak4118.c | 438 ++++++++
+ sound/soc/codecs/ak4458.c | 2 +-
+ sound/soc/codecs/ak5558.c | 19 +-
+ sound/soc/codecs/cs4270.c | 23 +-
+ sound/soc/codecs/dmic.c | 40 +
+ sound/soc/codecs/hdac_hda.c | 2 +-
+ sound/soc/codecs/hdac_hdmi.c | 63 +-
+ sound/soc/codecs/max98373.c | 35 +-
+ sound/soc/codecs/max9867.c | 505 ++++-----
+ sound/soc/codecs/max9867.h | 41 +-
+ sound/soc/codecs/nau8540.c | 2 +-
+ sound/soc/codecs/nau8822.c | 26 +-
+ sound/soc/codecs/nau8822.h | 9 +-
+ sound/soc/codecs/nau8825.c | 4 +-
+ sound/soc/codecs/pcm3060.c | 14 +
+ sound/soc/codecs/pcm3060.h | 1 +
+ sound/soc/codecs/pcm3168a.c | 22 +-
+ sound/soc/codecs/rt5663.c | 75 +-
+ sound/soc/codecs/simple-amplifier.c | 4 +
+ sound/soc/codecs/tas6424.c | 2 +-
+ sound/soc/codecs/tlv320aic31xx.c | 2 +-
+ sound/soc/codecs/tlv320aic3x.c | 10 +
+ sound/soc/codecs/tlv320dac33.c | 2 +-
+ sound/soc/codecs/wm8998.c | 2 +-
+ sound/soc/codecs/wm9705.c | 10 +-
+ sound/soc/codecs/wm9712.c | 10 +-
+ sound/soc/codecs/wm9713.c | 10 +-
+ sound/soc/codecs/wm_adsp.c | 14 +-
+ sound/soc/davinci/davinci-mcasp.c | 109 +-
+ sound/soc/davinci/davinci-mcasp.h | 30 +-
+ sound/soc/fsl/fsl-asoc-card.c | 6 +-
+ sound/soc/fsl/fsl_ssi_dbg.c | 14 +-
+ sound/soc/generic/Kconfig | 2 +-
+ sound/soc/generic/audio-graph-card.c | 76 +-
+ sound/soc/generic/audio-graph-scu-card.c | 262 +++--
+ sound/soc/generic/simple-card-utils.c | 56 +-
+ sound/soc/generic/simple-card.c | 2 +-
+ sound/soc/generic/simple-scu-card.c | 13 +-
+ sound/soc/intel/atom/sst/sst_acpi.c | 4 +
+ sound/soc/intel/atom/sst/sst_loader.c | 8 +-
+ sound/soc/intel/atom/sst/sst_pvt.c | 4 +-
+ sound/soc/intel/boards/bytcr_rt5640.c | 6 +-
+ sound/soc/intel/boards/bytcr_rt5651.c | 6 +-
+ sound/soc/intel/boards/cht_bsw_rt5645.c | 6 +-
+ sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +-
+ sound/soc/intel/boards/glk_rt5682_max98357a.c | 2 +-
+ sound/soc/intel/boards/kbl_da7219_max98927.c | 8 +-
+ sound/soc/intel/boards/kbl_rt5663_max98927.c | 14 +-
+ .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 10 +-
+ sound/soc/intel/boards/skl_hda_dsp_generic.c | 22 +-
+ sound/soc/intel/boards/skl_nau88l25_max98357a.c | 14 +-
+ sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 14 +-
+ sound/soc/intel/common/Makefile | 2 +-
+ sound/soc/intel/common/soc-acpi-intel-bxt-match.c | 36 +
+ sound/soc/intel/common/soc-acpi-intel-icl-match.c | 32 +
+ sound/soc/intel/skylake/skl-sst-ipc.c | 50 +-
+ sound/soc/intel/skylake/skl.c | 19 +-
+ sound/soc/intel/skylake/skl.h | 3 -
+ sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 2 +-
+ sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 2 +-
+ sound/soc/omap/Kconfig | 9 -
+ sound/soc/omap/Makefile | 4 +-
+ sound/soc/omap/am3517evm.c | 141 ---
+ sound/soc/omap/mcbsp.c | 1104 --------------------
+ sound/soc/omap/{mcbsp.h => omap-mcbsp-priv.h} | 126 +--
+ sound/soc/omap/omap-mcbsp-st.c | 516 +++++++++
+ sound/soc/omap/omap-mcbsp.c | 857 ++++++++++++---
+ sound/soc/omap/omap-mcbsp.h | 8 +-
+ sound/soc/pxa/Kconfig | 26 +-
+ sound/soc/pxa/Makefile | 1 -
+ sound/soc/pxa/raumfeld.c | 318 ------
+ sound/soc/qcom/lpass-platform.c | 2 +-
+ sound/soc/qcom/qdsp6/q6afe-dai.c | 8 +-
+ sound/soc/qcom/sdm845.c | 186 +++-
+ sound/soc/sh/rcar/adg.c | 2 +-
+ sound/soc/sh/rcar/cmd.c | 11 +-
+ sound/soc/sh/rcar/core.c | 244 ++++-
+ sound/soc/sh/rcar/ctu.c | 69 +-
+ sound/soc/sh/rcar/dma.c | 84 +-
+ sound/soc/sh/rcar/dvc.c | 3 +-
+ sound/soc/sh/rcar/gen.c | 26 +-
+ sound/soc/sh/rcar/mix.c | 3 +-
+ sound/soc/sh/rcar/rsnd.h | 53 +-
+ sound/soc/sh/rcar/src.c | 67 +-
+ sound/soc/sh/rcar/ssi.c | 269 ++---
+ sound/soc/sh/rcar/ssiu.c | 241 ++++-
+ sound/soc/soc-core.c | 11 +-
+ sound/soc/stm/stm32_sai.c | 8 +-
+ sound/soc/stm/stm32_sai_sub.c | 3 +-
+ sound/soc/sunxi/sun50i-codec-analog.c | 2 +
+ 122 files changed, 5687 insertions(+), 3144 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/sound/ak4118.txt
+ create mode 100644 sound/soc/amd/raven/Makefile
+ create mode 100644 sound/soc/amd/raven/acp3x-pcm-dma.c
+ create mode 100644 sound/soc/amd/raven/acp3x.h
+ create mode 100644 sound/soc/amd/raven/chip_offset_byte.h
+ create mode 100644 sound/soc/amd/raven/pci-acp3x.c
+ create mode 100644 sound/soc/codecs/ak4118.c
+ create mode 100644 sound/soc/intel/common/soc-acpi-intel-icl-match.c
+ delete mode 100644 sound/soc/omap/am3517evm.c
+ delete mode 100644 sound/soc/omap/mcbsp.c
+ rename sound/soc/omap/{mcbsp.h => omap-mcbsp-priv.h} (70%)
+ create mode 100644 sound/soc/omap/omap-mcbsp-st.c
+ delete mode 100644 sound/soc/pxa/raumfeld.c
+Merging modules/modules-next (2d25bc552353 module: make it clearer when we're handling kallsyms symbols vs exported symbols)
+$ git merge modules/modules-next
+Merge made by the 'recursive' strategy.
+ kernel/module.c | 78 ++++++++++++++++++++++++++++---------------------
+ kernel/module_signing.c | 3 +-
+ 2 files changed, 46 insertions(+), 35 deletions(-)
+Merging input/next (0832e93632c6 Input: rotary-encoder - don't log EPROBE_DEFER to kernel log)
+$ git merge input/next
+Removing include/linux/platform_data/ad7879.h
+Auto-merging drivers/input/serio/Kconfig
+Auto-merging drivers/input/misc/rotary_encoder.c
+Auto-merging drivers/clk/mmp/clk-of-mmp2.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/serio/olpc,ap-sp.txt | 4 +
+ drivers/clk/mmp/clk-of-mmp2.c | 4 +
+ drivers/input/misc/rotary_encoder.c | 6 +-
+ drivers/input/serio/Kconfig | 1 -
+ drivers/input/serio/olpc_apsp.c | 28 ++++--
+ drivers/input/touchscreen/ad7879.c | 107 +++++++--------------
+ include/dt-bindings/clock/marvell,mmp2.h | 1 +
+ include/linux/platform_data/ad7879.h | 42 --------
+ 8 files changed, 66 insertions(+), 127 deletions(-)
+ delete mode 100644 include/linux/platform_data/ad7879.h
+Merging block/for-next (cfa4885ae990 Merge branch 'for-4.21/libata' into for-next)
+$ git merge block/for-next
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging init/do_mounts_initrd.c
+Auto-merging include/linux/fs.h
+Auto-merging include/linux/cgroup.h
+Auto-merging fs/block_dev.c
+Auto-merging fs/aio.c
+Auto-merging drivers/scsi/qla2xxx/qla_os.c
+Auto-merging drivers/mmc/core/block.c
+Removing block/noop-iosched.c
+Removing block/deadline-iosched.c
+Removing block/cfq-iosched.c
+Removing block/blk-tag.c
+Auto-merging Makefile
+Removing Documentation/block/cfq-iosched.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/cgroup-v2.rst | 8 +-
+ Documentation/block/biodoc.txt | 88 -
+ Documentation/block/cfq-iosched.txt | 291 --
+ Documentation/scsi/scsi-parameters.txt | 5 -
+ Makefile | 2 +-
+ arch/arm/mach-pxa/palm27x.h | 2 +
+ arch/arm/mach-pxa/palmld.c | 12 +
+ arch/mips/include/asm/mach-rc32434/rb.h | 6 -
+ arch/mips/rb532/devices.c | 12 +-
+ arch/x86/Makefile | 10 +-
+ arch/x86/boot/compressed/eboot.c | 65 +-
+ arch/x86/entry/entry_64.S | 4 +
+ arch/x86/entry/vdso/Makefile | 4 +-
+ arch/x86/include/asm/bootparam_utils.h | 1 +
+ arch/x86/kernel/kprobes/opt.c | 2 +-
+ arch/x86/platform/efi/early_printk.c | 2 +-
+ block/Kconfig | 6 -
+ block/Kconfig.iosched | 61 -
+ block/Makefile | 5 +-
+ block/bfq-cgroup.c | 6 +-
+ block/bfq-iosched.c | 21 +-
+ block/bio.c | 160 +-
+ block/blk-cgroup.c | 264 +-
+ block/blk-core.c | 1985 +----------
+ block/blk-exec.c | 20 +-
+ block/blk-flush.c | 188 +-
+ block/blk-ioc.c | 54 +-
+ block/blk-iolatency.c | 73 +-
+ block/blk-merge.c | 48 +-
+ block/blk-mq-cpumap.c | 19 +-
+ block/blk-mq-debugfs.c | 12 +-
+ block/blk-mq-pci.c | 10 +-
+ block/blk-mq-rdma.c | 4 +-
+ block/blk-mq-sched.c | 60 +-
+ block/blk-mq-sched.h | 24 +-
+ block/blk-mq-sysfs.c | 52 +-
+ block/blk-mq-tag.c | 41 +-
+ block/blk-mq-virtio.c | 8 +-
+ block/blk-mq.c | 598 ++--
+ block/blk-mq.h | 56 +-
+ block/blk-pm.c | 20 +-
+ block/blk-pm.h | 6 +-
+ block/blk-rq-qos.c | 152 +-
+ block/blk-rq-qos.h | 67 +-
+ block/blk-settings.c | 65 +-
+ block/blk-softirq.c | 27 +-
+ block/blk-stat.c | 4 -
+ block/blk-sysfs.c | 106 +-
+ block/blk-tag.c | 378 --
+ block/blk-throttle.c | 39 +-
+ block/blk-timeout.c | 117 +-
+ block/blk-wbt.c | 83 +-
+ block/blk-zoned.c | 2 +-
+ block/blk.h | 188 +-
+ block/bounce.c | 3 +-
+ block/bsg-lib.c | 146 +-
+ block/bsg.c | 2 +-
+ block/cfq-iosched.c | 4916 ---------------------------
+ block/deadline-iosched.c | 560 ---
+ block/elevator.c | 477 +--
+ block/genhd.c | 8 +-
+ block/kyber-iosched.c | 9 +-
+ block/mq-deadline.c | 3 +-
+ block/noop-iosched.c | 124 -
+ block/partition-generic.c | 8 +-
+ drivers/ata/libata-eh.c | 4 -
+ drivers/ata/pata_palmld.c | 83 +-
+ drivers/ata/pata_pxa.c | 1 -
+ drivers/ata/pata_rb532_cf.c | 45 +-
+ drivers/ata/sata_highbank.c | 37 +-
+ drivers/block/aoe/aoe.h | 4 +
+ drivers/block/aoe/aoeblk.c | 1 +
+ drivers/block/aoe/aoecmd.c | 27 +-
+ drivers/block/aoe/aoedev.c | 11 +-
+ drivers/block/ataflop.c | 26 +-
+ drivers/block/drbd/drbd_main.c | 2 +-
+ drivers/block/floppy.c | 6 -
+ drivers/block/loop.c | 413 ++-
+ drivers/block/loop.h | 1 -
+ drivers/block/mtip32xx/mtip32xx.c | 216 +-
+ drivers/block/mtip32xx/mtip32xx.h | 44 +-
+ drivers/block/nbd.c | 3 +-
+ drivers/block/null_blk.h | 1 +
+ drivers/block/null_blk_main.c | 21 +-
+ drivers/block/null_blk_zoned.c | 27 +-
+ drivers/block/paride/pd.c | 30 +-
+ drivers/block/pktcdvd.c | 2 -
+ drivers/block/skd_main.c | 16 +-
+ drivers/block/sunvdc.c | 153 +-
+ drivers/block/sx8.c | 434 +--
+ drivers/block/umem.c | 3 +-
+ drivers/block/virtio_blk.c | 17 +-
+ drivers/ide/ide-atapi.c | 27 +-
+ drivers/ide/ide-cd.c | 179 +-
+ drivers/ide/ide-devsets.c | 4 +-
+ drivers/ide/ide-disk.c | 15 +-
+ drivers/ide/ide-eh.c | 2 +-
+ drivers/ide/ide-floppy.c | 2 +-
+ drivers/ide/ide-io.c | 112 +-
+ drivers/ide/ide-park.c | 8 +-
+ drivers/ide/ide-pm.c | 46 +-
+ drivers/ide/ide-probe.c | 69 +-
+ drivers/ide/ide-tape.c | 2 +-
+ drivers/ide/ide-taskfile.c | 2 +-
+ drivers/lightnvm/core.c | 2 +-
+ drivers/md/dm-rq.c | 2 +-
+ drivers/md/dm-table.c | 4 +-
+ drivers/md/dm.c | 14 +-
+ drivers/md/raid0.c | 2 +-
+ drivers/memstick/core/ms_block.c | 109 +-
+ drivers/memstick/core/ms_block.h | 1 +
+ drivers/memstick/core/mspro_block.c | 121 +-
+ drivers/mmc/core/block.c | 26 +-
+ drivers/mmc/core/queue.c | 110 +-
+ drivers/mmc/core/queue.h | 4 +-
+ drivers/nvdimm/pmem.c | 2 +-
+ drivers/nvme/host/core.c | 74 +-
+ drivers/nvme/host/fabrics.c | 13 +-
+ drivers/nvme/host/fabrics.h | 2 +
+ drivers/nvme/host/fc.c | 41 +-
+ drivers/nvme/host/multipath.c | 20 +-
+ drivers/nvme/host/nvme.h | 15 +-
+ drivers/nvme/host/pci.c | 521 ++-
+ drivers/nvme/host/rdma.c | 58 +-
+ drivers/nvme/target/admin-cmd.c | 76 +-
+ drivers/nvme/target/configfs.c | 42 +-
+ drivers/nvme/target/core.c | 118 +-
+ drivers/nvme/target/discovery.c | 129 +-
+ drivers/nvme/target/fabrics-cmd.c | 6 +
+ drivers/nvme/target/fc.c | 66 +-
+ drivers/nvme/target/io-cmd-bdev.c | 2 -
+ drivers/nvme/target/io-cmd-file.c | 130 +-
+ drivers/nvme/target/nvmet.h | 53 +-
+ drivers/nvme/target/rdma.c | 2 +-
+ drivers/pci/msi.c | 14 +
+ drivers/s390/block/dasd_ioctl.c | 22 +-
+ drivers/scsi/Kconfig | 12 -
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 8 +-
+ drivers/scsi/csiostor/csio_scsi.c | 8 +-
+ drivers/scsi/cxlflash/main.c | 6 -
+ drivers/scsi/device_handler/scsi_dh_alua.c | 21 +-
+ drivers/scsi/device_handler/scsi_dh_emc.c | 8 +-
+ drivers/scsi/device_handler/scsi_dh_hp_sw.c | 7 +-
+ drivers/scsi/device_handler/scsi_dh_rdac.c | 7 +-
+ drivers/scsi/fnic/fnic_scsi.c | 4 +-
+ drivers/scsi/hosts.c | 29 +-
+ drivers/scsi/libsas/sas_ata.c | 5 -
+ drivers/scsi/libsas/sas_scsi_host.c | 10 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 2 +-
+ drivers/scsi/osd/osd_initiator.c | 4 +-
+ drivers/scsi/osst.c | 2 +-
+ drivers/scsi/qedi/qedi_main.c | 3 +-
+ drivers/scsi/qla2xxx/qla_nvme.c | 12 -
+ drivers/scsi/qla2xxx/qla_os.c | 37 +-
+ drivers/scsi/scsi.c | 5 +-
+ drivers/scsi/scsi_debug.c | 3 +-
+ drivers/scsi/scsi_error.c | 24 +-
+ drivers/scsi/scsi_lib.c | 806 +----
+ drivers/scsi/scsi_priv.h | 1 -
+ drivers/scsi/scsi_scan.c | 10 +-
+ drivers/scsi/scsi_sysfs.c | 8 +-
+ drivers/scsi/scsi_transport_fc.c | 71 +-
+ drivers/scsi/scsi_transport_iscsi.c | 7 +-
+ drivers/scsi/scsi_transport_sas.c | 10 +-
+ drivers/scsi/sd.c | 85 +-
+ drivers/scsi/sd.h | 6 +-
+ drivers/scsi/sd_zbc.c | 10 +-
+ drivers/scsi/sg.c | 2 +-
+ drivers/scsi/smartpqi/smartpqi_init.c | 3 +-
+ drivers/scsi/sr.c | 12 +-
+ drivers/scsi/st.c | 2 +-
+ drivers/scsi/ufs/ufs_bsg.c | 4 +-
+ drivers/scsi/virtio_scsi.c | 3 +-
+ drivers/target/iscsi/iscsi_target_util.c | 12 +-
+ drivers/target/target_core_pscsi.c | 2 +-
+ fs/aio.c | 13 +-
+ fs/block_dev.c | 50 +-
+ fs/buffer.c | 10 +-
+ fs/direct-io.c | 4 +-
+ fs/ext4/page-io.c | 2 +-
+ fs/iomap.c | 16 +-
+ include/linux/bio.h | 29 +-
+ include/linux/blk-cgroup.h | 227 +-
+ include/linux/blk-mq-pci.h | 4 +-
+ include/linux/blk-mq-virtio.h | 4 +-
+ include/linux/blk-mq.h | 73 +-
+ include/linux/blk_types.h | 12 +-
+ include/linux/blkdev.h | 249 +-
+ include/linux/bsg-lib.h | 6 +-
+ include/linux/cgroup.h | 2 +
+ include/linux/elevator.h | 94 +-
+ include/linux/fs.h | 2 +-
+ include/linux/genhd.h | 2 +-
+ include/linux/ide.h | 14 +-
+ include/linux/init.h | 1 -
+ include/linux/interrupt.h | 4 +
+ include/linux/ioprio.h | 13 +
+ include/linux/nvme-fc-driver.h | 17 -
+ include/linux/nvme.h | 51 +-
+ include/linux/sbitmap.h | 77 +-
+ include/linux/writeback.h | 5 +-
+ include/scsi/scsi_cmnd.h | 6 +-
+ include/scsi/scsi_dh.h | 2 +-
+ include/scsi/scsi_driver.h | 3 +-
+ include/scsi/scsi_host.h | 18 +-
+ include/scsi/scsi_tcq.h | 14 +-
+ include/uapi/linux/aio_abi.h | 2 +
+ init/do_mounts_initrd.c | 3 -
+ init/initramfs.c | 6 -
+ init/main.c | 12 -
+ kernel/cgroup/cgroup.c | 48 +-
+ kernel/irq/affinity.c | 148 +-
+ kernel/trace/blktrace.c | 4 +-
+ lib/sbitmap.c | 136 +-
+ mm/page_io.c | 9 +-
+ 215 files changed, 4595 insertions(+), 13764 deletions(-)
+ delete mode 100644 Documentation/block/cfq-iosched.txt
+ delete mode 100644 block/blk-tag.c
+ delete mode 100644 block/cfq-iosched.c
+ delete mode 100644 block/deadline-iosched.c
+ delete mode 100644 block/noop-iosched.c
+Merging device-mapper/for-next (417cb6275b77 dm verity: log the hash algorithm implementation)
+$ git merge device-mapper/for-next
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging include/linux/cgroup.h
+Auto-merging drivers/md/dm.c
+Auto-merging drivers/md/dm-integrity.c
+Auto-merging drivers/md/dm-crypt.c
+Auto-merging block/blk-mq.c
+Auto-merging block/bio.c
+CONFLICT (content): Merge conflict in block/bio.c
+Auto-merging block/bfq-iosched.c
+Recorded preimage for 'block/bio.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'block/bio.c'.
+[master 2233766204f6] Merge remote-tracking branch 'device-mapper/for-next'
+$ git diff -M --stat --summary HEAD^..
+ block/bio.c | 36 ++++++++++---
+ block/blk-core.c | 80 ++++-----------------------
+ block/blk-merge.c | 4 +-
+ block/blk-mq.c | 38 ++++++++++---
+ block/blk-mq.h | 3 +-
+ block/genhd.c | 55 +++++++++++--------
+ block/partition-generic.c | 10 ++--
+ drivers/md/dm-bufio.c | 12 ++---
+ drivers/md/dm-core.h | 2 -
+ drivers/md/dm-crypt.c | 17 ++++--
+ drivers/md/dm-delay.c | 2 +-
+ drivers/md/dm-flakey.c | 35 +++++++-----
+ drivers/md/dm-integrity.c | 2 +-
+ drivers/md/dm-kcopyd.c | 19 +++++--
+ drivers/md/dm-linear.c | 2 +-
+ drivers/md/dm-mpath.c | 6 ++-
+ drivers/md/dm-raid1.c | 3 +-
+ drivers/md/dm-rq.c | 23 ++++----
+ drivers/md/dm-snap.c | 22 ++++++++
+ drivers/md/dm-unstripe.c | 2 +-
+ drivers/md/dm-verity-target.c | 9 ++++
+ drivers/md/dm-writecache.c | 2 +-
+ drivers/md/dm-zoned-target.c | 122 +++++++++++++-----------------------------
+ drivers/md/dm.c | 84 +++++++++++------------------
+ drivers/md/md.c | 7 ++-
+ include/linux/genhd.h | 55 +++++++++++--------
+ 26 files changed, 318 insertions(+), 334 deletions(-)
+Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges)
+$ git merge pcmcia/pcmcia-next
+Already up to date.
+Merging mmc/next (43cee3e27ea0 sh: ecovec24: Fix an ifdef)
+$ git merge mmc/next
+Auto-merging arch/arm/mach-pxa/palmld.c
+Auto-merging arch/arm/mach-pxa/palm27x.h
+Auto-merging arch/arm/mach-pxa/mainstone.c
+Auto-merging arch/arm/mach-pxa/lubbock.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mmc/fsl-imx-esdhc.txt | 1 +
+ .../devicetree/bindings/mmc/sdhci-msm.txt | 23 +-
+ Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 3 +-
+ arch/arm/mach-ep93xx/simone.c | 14 +-
+ arch/arm/mach-ep93xx/vision_ep9307.c | 17 +-
+ arch/arm/mach-imx/mach-pcm043.c | 17 +-
+ arch/arm/mach-pxa/balloon3.c | 3 -
+ arch/arm/mach-pxa/cm-x270.c | 18 +-
+ arch/arm/mach-pxa/cm-x300.c | 18 +-
+ arch/arm/mach-pxa/colibri-evalboard.c | 40 +-
+ arch/arm/mach-pxa/colibri-pxa270-income.c | 19 +-
+ arch/arm/mach-pxa/corgi.c | 20 +-
+ arch/arm/mach-pxa/csb726.c | 19 +-
+ arch/arm/mach-pxa/em-x270.c | 34 +-
+ arch/arm/mach-pxa/gumstix.c | 3 -
+ arch/arm/mach-pxa/idp.c | 3 -
+ arch/arm/mach-pxa/littleton.c | 18 +-
+ arch/arm/mach-pxa/lubbock.c | 3 -
+ arch/arm/mach-pxa/magician.c | 26 +-
+ arch/arm/mach-pxa/mainstone.c | 3 -
+ arch/arm/mach-pxa/mioa701.c | 21 +-
+ arch/arm/mach-pxa/mxm8x10.c | 19 +-
+ arch/arm/mach-pxa/palm27x.c | 10 +-
+ arch/arm/mach-pxa/palm27x.h | 6 +-
+ arch/arm/mach-pxa/palmld.c | 16 +-
+ arch/arm/mach-pxa/palmt5.c | 16 +-
+ arch/arm/mach-pxa/palmtc.c | 19 +-
+ arch/arm/mach-pxa/palmte2.c | 18 +-
+ arch/arm/mach-pxa/palmtreo.c | 31 +-
+ arch/arm/mach-pxa/palmtx.c | 16 +-
+ arch/arm/mach-pxa/palmz72.c | 16 +-
+ arch/arm/mach-pxa/pcm990-baseboard.c | 3 -
+ arch/arm/mach-pxa/poodle.c | 15 +-
+ arch/arm/mach-pxa/raumfeld.c | 3 -
+ arch/arm/mach-pxa/spitz.c | 16 +-
+ arch/arm/mach-pxa/stargate2.c | 3 -
+ arch/arm/mach-pxa/tosa.c | 18 +-
+ arch/arm/mach-pxa/trizeps4.c | 3 -
+ arch/arm/mach-pxa/vpac270.c | 16 +-
+ arch/arm/mach-pxa/z2.c | 14 +-
+ arch/arm/mach-pxa/zeus.c | 15 +-
+ arch/arm/mach-pxa/zylonite.c | 57 +-
+ arch/arm/mach-pxa/zylonite_pxa300.c | 2 +
+ arch/arm/mach-s3c24xx/mach-at2440evb.c | 14 +-
+ arch/arm/mach-s3c24xx/mach-h1940.c | 15 +-
+ arch/arm/mach-s3c24xx/mach-mini2440.c | 15 +-
+ arch/arm/mach-s3c24xx/mach-n30.c | 15 +-
+ arch/arm/mach-s3c24xx/mach-rx1950.c | 15 +-
+ arch/mips/include/asm/mach-jz4740/jz4740_mmc.h | 4 -
+ arch/mips/jz4740/board-qi_lb60.c | 18 +-
+ arch/sh/boards/mach-ecovec24/setup.c | 43 +-
+ drivers/gpio/gpio-pca953x.c | 2 +-
+ drivers/memstick/core/memstick.c | 3 +
+ drivers/memstick/host/rtsx_usb_ms.c | 170 +--
+ drivers/misc/Makefile | 2 +-
+ drivers/misc/cardreader/Kconfig | 11 +
+ drivers/misc/cardreader/Makefile | 4 +-
+ drivers/misc/cardreader/alcor_pci.c | 371 +++++++
+ drivers/misc/cardreader/rtsx_usb.c | 8 +
+ drivers/mmc/core/core.c | 19 +-
+ drivers/mmc/core/core.h | 2 -
+ drivers/mmc/core/mmc.c | 3 +
+ drivers/mmc/core/mmc_test.c | 14 +-
+ drivers/mmc/core/slot-gpio.c | 97 +-
+ drivers/mmc/host/Kconfig | 14 +-
+ drivers/mmc/host/Makefile | 1 +
+ drivers/mmc/host/alcor.c | 1165 ++++++++++++++++++++
+ drivers/mmc/host/atmel-mci.c | 34 +-
+ drivers/mmc/host/bcm2835.c | 71 +-
+ drivers/mmc/host/dw_mmc-bluefield.c | 11 +-
+ drivers/mmc/host/jz4740_mmc.c | 202 ++--
+ drivers/mmc/host/meson-mx-sdio.c | 6 +
+ drivers/mmc/host/mmc_spi.c | 27 +-
+ drivers/mmc/host/mmci.c | 5 +-
+ drivers/mmc/host/of_mmc_spi.c | 34 -
+ drivers/mmc/host/omap_hsmmc.c | 14 +-
+ drivers/mmc/host/pxamci.c | 68 +-
+ drivers/mmc/host/renesas_sdhi_core.c | 50 +-
+ drivers/mmc/host/renesas_sdhi_internal_dmac.c | 27 +-
+ drivers/mmc/host/renesas_sdhi_sys_dmac.c | 20 +-
+ drivers/mmc/host/rtsx_usb_sdmmc.c | 44 +-
+ drivers/mmc/host/s3cmci.c | 59 +-
+ drivers/mmc/host/sdhci-cadence.c | 2 +-
+ drivers/mmc/host/sdhci-esdhc-imx.c | 26 +-
+ drivers/mmc/host/sdhci-esdhc.h | 24 +
+ drivers/mmc/host/sdhci-msm.c | 120 +-
+ drivers/mmc/host/sdhci-of-esdhc.c | 135 ++-
+ drivers/mmc/host/sdhci-omap.c | 24 +-
+ drivers/mmc/host/sdhci-pci-core.c | 4 +
+ drivers/mmc/host/sdhci.c | 94 +-
+ drivers/mmc/host/sdhci.h | 11 +-
+ drivers/mmc/host/tmio_mmc.h | 6 +
+ drivers/mmc/host/tmio_mmc_core.c | 41 +-
+ include/linux/alcor_pci.h | 286 +++++
+ include/linux/mfd/tmio.h | 9 +-
+ include/linux/mmc/host.h | 5 +-
+ include/linux/mmc/slot-gpio.h | 5 -
+ include/linux/platform_data/mmc-esdhc-imx.h | 4 -
+ include/linux/platform_data/mmc-pxamci.h | 4 -
+ include/linux/platform_data/mmc-s3cmci.h | 4 -
+ include/linux/spi/mmc_spi.h | 15 -
+ include/uapi/linux/mmc/ioctl.h | 5 +-
+ 102 files changed, 3268 insertions(+), 908 deletions(-)
+ create mode 100644 drivers/misc/cardreader/alcor_pci.c
+ create mode 100644 drivers/mmc/host/alcor.c
+ create mode 100644 include/linux/alcor_pci.h
+Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses)
+$ git merge kgdb/kgdb-next
+Auto-merging kernel/debug/kdb/kdb_support.c
+Auto-merging kernel/debug/kdb/kdb_main.c
+Merge made by the 'recursive' strategy.
+Merging md/for-next (cac09f066f0f md: remvoe redundant condition check)
+$ git merge md/for-next
+Auto-merging lib/raid6/test/Makefile
+Auto-merging lib/Kconfig
+Auto-merging drivers/md/md.c
+Merge made by the 'recursive' strategy.
+ drivers/md/md.c | 14 +++------
+ include/linux/raid/pq.h | 8 ++++-
+ lib/Kconfig | 8 +++++
+ lib/raid6/algos.c | 81 ++++++++++++++++++++++++++-----------------------
+ lib/raid6/test/Makefile | 3 ++
+ 5 files changed, 65 insertions(+), 49 deletions(-)
+Merging mfd/for-mfd-next (5391ad18eddb mfd: axp20x: Add AC power supply cell for AXP813)
+$ git merge mfd/for-mfd-next
+Auto-merging include/linux/mfd/tmio.h
+Merge made by the 'recursive' strategy.
+ drivers/mfd/Kconfig | 1 +
+ drivers/mfd/ab8500-core.c | 2 +-
+ drivers/mfd/axp20x.c | 5 +++++
+ drivers/mfd/bd9571mwv.c | 1 +
+ drivers/mfd/db8500-prcmu.c | 4 ++--
+ drivers/mfd/madera-core.c | 3 +++
+ drivers/mfd/mt6397-core.c | 3 +--
+ drivers/mfd/qcom_rpm.c | 4 ++++
+ drivers/mfd/tps6586x.c | 24 ++++++++++++++++++++++++
+ drivers/mfd/twl-core.c | 4 ++--
+ drivers/mfd/wm5110-tables.c | 2 ++
+ include/linux/mfd/madera/core.h | 7 +++++++
+ include/linux/mfd/tmio.h | 2 +-
+ 13 files changed, 54 insertions(+), 8 deletions(-)
+Merging backlight/for-backlight-next (61170ee93868 backlight: pwm_bl: Fix devicetree parsing with auto-generated brightness tables)
+$ git merge backlight/for-backlight-next
+Merge made by the 'recursive' strategy.
+ drivers/video/backlight/pwm_bl.c | 28 +++++++++++++++++-----------
+ 1 file changed, 17 insertions(+), 11 deletions(-)
+Merging battery/for-next (4a040e7c72e6 power: supply: sc27xx: Save last battery capacity)
+$ git merge battery/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/power/reset/gpio-poweroff.txt | 2 +
+ .../bindings/power/supply/axp20x_ac_power.txt | 3 +
+ .../devicetree/bindings/power/supply/battery.txt | 17 +
+ .../devicetree/bindings/power/supply/bq24190.txt | 10 +
+ .../devicetree/bindings/power/supply/sc27xx-fg.txt | 56 +
+ drivers/power/reset/at91-poweroff.c | 86 +-
+ drivers/power/reset/gpio-poweroff.c | 10 +-
+ drivers/power/reset/ocelot-reset.c | 12 +
+ drivers/power/supply/Kconfig | 8 +
+ drivers/power/supply/Makefile | 1 +
+ drivers/power/supply/axp20x_ac_power.c | 94 ++
+ drivers/power/supply/axp20x_usb_power.c | 1 +
+ drivers/power/supply/axp288_charger.c | 35 +-
+ drivers/power/supply/bq24190_charger.c | 52 +-
+ drivers/power/supply/charger-manager.c | 27 +-
+ drivers/power/supply/cpcap-battery.c | 2 +-
+ drivers/power/supply/cpcap-charger.c | 2 +-
+ drivers/power/supply/olpc_battery.c | 4 +-
+ drivers/power/supply/power_supply_core.c | 140 ++-
+ drivers/power/supply/sc2731_charger.c | 54 +-
+ drivers/power/supply/sc27xx_fuel_gauge.c | 1075 ++++++++++++++++++++
+ include/linux/mfd/axp20x.h | 1 +
+ include/linux/power_supply.h | 20 +
+ 23 files changed, 1617 insertions(+), 95 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/power/supply/sc27xx-fg.txt
+ create mode 100644 drivers/power/supply/sc27xx_fuel_gauge.c
+Merging regulator/for-next (f00e93a1224f Merge remote-tracking branch 'regulator/topic/coupled' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/regulator/cirrus,lochnagar.txt | 82 ++
+ .../devicetree/bindings/regulator/regulator.txt | 12 +-
+ arch/arm/mach-s3c64xx/mach-crag6410-module.c | 17 +-
+ drivers/mfd/wm8994-core.c | 9 -
+ drivers/regulator/88pm8607.c | 2 +-
+ drivers/regulator/as3711-regulator.c | 5 +-
+ drivers/regulator/axp20x-regulator.c | 733 ++++++++++----
+ drivers/regulator/bd718x7-regulator.c | 32 +-
+ drivers/regulator/bd9571mwv-regulator.c | 10 +-
+ drivers/regulator/core.c | 1068 ++++++++++++++++----
+ drivers/regulator/da9052-regulator.c | 2 +-
+ drivers/regulator/da9210-regulator.c | 4 +-
+ drivers/regulator/internal.h | 2 +
+ drivers/regulator/lochnagar-regulator.c | 50 +-
+ drivers/regulator/max77686-regulator.c | 19 +-
+ drivers/regulator/max8997-regulator.c | 2 +-
+ drivers/regulator/mc13xxx-regulator-core.c | 2 +-
+ drivers/regulator/of_regulator.c | 81 +-
+ drivers/regulator/pfuze100-regulator.c | 2 +
+ drivers/regulator/qcom-rpmh-regulator.c | 2 +-
+ drivers/regulator/s2mps11.c | 47 +-
+ drivers/regulator/s5m8767.c | 2 +-
+ drivers/regulator/stpmic1_regulator.c | 4 +-
+ drivers/regulator/wm8350-regulator.c | 4 +-
+ drivers/regulator/wm8994-regulator.c | 24 +-
+ drivers/spi/spi-qcom-qspi.c | 8 +-
+ include/linux/mfd/wm8994/pdata.h | 3 -
+ include/linux/regulator/driver.h | 9 +-
+ include/linux/regulator/machine.h | 3 +
+ include/linux/regulator/pfuze100.h | 3 +-
+ 30 files changed, 1748 insertions(+), 495 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/regulator/cirrus,lochnagar.txt
+Merging security/next-testing (26b76320a8a5 Merge tag 'v4.20-rc2' into next-general)
+$ git merge security/next-testing
+Merge made by the 'recursive' strategy.
+ security/tomoyo/util.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Merging apparmor/apparmor-next (43aa09fee2f0 apparmor: Fix warning about unused function apparmor_ipv6_postroute)
+$ git merge apparmor/apparmor-next
+Auto-merging security/apparmor/lsm.c
+Merge made by the 'recursive' strategy.
+ security/apparmor/lsm.c | 2 ++
+ 1 file changed, 2 insertions(+)
+Merging integrity/next-integrity (6cb1d5f9b5ac ima: Support platform keyring for kernel appraisal)
+$ git merge integrity/next-integrity
+Auto-merging tools/testing/selftests/Makefile
+Auto-merging include/linux/efi.h
+Merge made by the 'recursive' strategy.
+ Documentation/security/keys/trusted-encrypted.rst | 31 +++-
+ arch/x86/kernel/Makefile | 4 +
+ arch/x86/kernel/ima_arch.c | 75 ++++++++
+ include/linux/efi.h | 34 ++++
+ include/linux/ima.h | 15 ++
+ security/integrity/Kconfig | 11 ++
+ security/integrity/Makefile | 5 +
+ security/integrity/digsig.c | 110 ++++++++----
+ security/integrity/ima/Kconfig | 10 +-
+ security/integrity/ima/ima_appraise.c | 13 +-
+ security/integrity/ima/ima_main.c | 19 +-
+ security/integrity/ima/ima_policy.c | 171 +++++++++++++-----
+ security/integrity/integrity.h | 23 ++-
+ security/integrity/platform_certs/efi_parser.c | 108 ++++++++++++
+ security/integrity/platform_certs/load_uefi.c | 196 +++++++++++++++++++++
+ .../integrity/platform_certs/platform_keyring.c | 58 ++++++
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/ima/Makefile | 11 ++
+ tools/testing/selftests/ima/config | 4 +
+ tools/testing/selftests/ima/test_kexec_load.sh | 54 ++++++
+ 20 files changed, 862 insertions(+), 91 deletions(-)
+ create mode 100644 arch/x86/kernel/ima_arch.c
+ create mode 100644 security/integrity/platform_certs/efi_parser.c
+ create mode 100644 security/integrity/platform_certs/load_uefi.c
+ create mode 100644 security/integrity/platform_certs/platform_keyring.c
+ create mode 100644 tools/testing/selftests/ima/Makefile
+ create mode 100644 tools/testing/selftests/ima/config
+ create mode 100755 tools/testing/selftests/ima/test_kexec_load.sh
+Merging selinux/next (ee1a84fdfeed selinux: overhaul sidtab to fix bug and improve performance)
+$ git merge selinux/next
+Auto-merging security/selinux/ss/mls.c
+Auto-merging security/selinux/include/security.h
+Auto-merging security/selinux/hooks.c
+CONFLICT (content): Merge conflict in security/selinux/hooks.c
+Resolved 'security/selinux/hooks.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 136dd262fb3f] Merge remote-tracking branch 'selinux/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/LSM/SELinux.rst | 2 +-
+ security/selinux/hooks.c | 3 +-
+ security/selinux/include/security.h | 2 +-
+ security/selinux/ss/mls.c | 24 +-
+ security/selinux/ss/mls.h | 3 +-
+ security/selinux/ss/policydb.c | 61 ++-
+ security/selinux/ss/services.c | 222 +++++------
+ security/selinux/ss/services.h | 2 +-
+ security/selinux/ss/sidtab.c | 609 +++++++++++++++++++-----------
+ security/selinux/ss/sidtab.h | 96 +++--
+ 10 files changed, 627 insertions(+), 397 deletions(-)
+Merging tpmdd/next (8f82ffbc5b0b tpm: add support for partial reads)
+$ git merge tpmdd/next
+Merge made by the 'recursive' strategy.
+ drivers/char/tpm/Makefile | 16 +-
+ drivers/char/tpm/st33zp24/st33zp24.c | 2 +-
+ drivers/char/tpm/tpm-chip.c | 11 +-
+ drivers/char/tpm/tpm-dev-common.c | 51 ++-
+ drivers/char/tpm/tpm-dev.h | 5 +-
+ drivers/char/tpm/tpm-interface.c | 832 +++--------------------------------
+ drivers/char/tpm/tpm-sysfs.c | 52 +--
+ drivers/char/tpm/tpm.h | 97 ++--
+ drivers/char/tpm/tpm1-cmd.c | 781 ++++++++++++++++++++++++++++++++
+ drivers/char/tpm/tpm2-cmd.c | 308 +++++++------
+ drivers/char/tpm/tpm2-space.c | 2 +-
+ drivers/char/tpm/tpm_i2c_nuvoton.c | 11 +-
+ drivers/char/tpm/tpm_ibmvtpm.c | 6 +-
+ drivers/char/tpm/tpm_tis_core.c | 10 +-
+ include/linux/tpm.h | 11 +-
+ security/integrity/ima/ima_crypto.c | 5 +-
+ 16 files changed, 1132 insertions(+), 1068 deletions(-)
+ create mode 100644 drivers/char/tpm/tpm1-cmd.c
+Merging watchdog/master (31eb42bd9353 watchdog: w83627hf_wdt: Add quirk for Inves system)
+$ git merge watchdog/master
+Merge made by the 'recursive' strategy.
+ drivers/watchdog/Kconfig | 2 +-
+ drivers/watchdog/cpwd.c | 2 ++
+ drivers/watchdog/renesas_wdt.c | 13 +++++++++----
+ drivers/watchdog/w83627hf_wdt.c | 38 +++++++++++++++++++++++++++++++++++---
+ 4 files changed, 47 insertions(+), 8 deletions(-)
+Merging iommu/next (8c1ecb2dd889 Merge branches 'arm/renesas', 'arm/mediatek', 'arm/tegra', 'arm/omap', 'x86/vt-d', 'x86/amd' and 'core' into next)
+$ git merge iommu/next
+Removing include/linux/dma_remapping.h
+Auto-merging drivers/iommu/intel-iommu.c
+Auto-merging drivers/iommu/amd_iommu.c
+Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
+Merge made by the 'recursive' strategy.
+ .../bindings/iommu/renesas,ipmmu-vmsa.txt | 1 +
+ arch/x86/kernel/tboot.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +-
+ drivers/gpu/drm/i915/intel_display.c | 2 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 +-
+ drivers/iommu/amd_iommu.c | 266 +++++++++++++--------
+ drivers/iommu/amd_iommu_init.c | 64 ++---
+ drivers/iommu/amd_iommu_types.h | 1 +
+ drivers/iommu/amd_iommu_v2.c | 2 +
+ drivers/iommu/arm-smmu-v3.c | 25 +-
+ drivers/iommu/arm-smmu.c | 32 +--
+ drivers/iommu/intel-iommu.c | 4 +-
+ drivers/iommu/iommu-sysfs.c | 2 +-
+ drivers/iommu/iommu.c | 44 ++--
+ drivers/iommu/ipmmu-vmsa.c | 71 ++++--
+ drivers/iommu/irq_remapping.c | 1 -
+ drivers/iommu/msm_iommu.c | 13 +-
+ drivers/iommu/mtk_iommu.c | 4 +-
+ drivers/iommu/mtk_iommu_v1.c | 19 +-
+ drivers/iommu/omap-iommu-debug.c | 25 +-
+ drivers/iommu/qcom_iommu.c | 16 +-
+ drivers/iommu/rockchip-iommu.c | 13 +-
+ drivers/iommu/tegra-gart.c | 37 +--
+ drivers/iommu/tegra-smmu.c | 24 +-
+ drivers/misc/mic/scif/scif_rma.c | 2 +-
+ drivers/misc/mic/scif/scif_rma.h | 2 +-
+ drivers/vfio/vfio_iommu_type1.c | 33 +--
+ include/linux/dma_remapping.h | 58 -----
+ include/linux/intel-iommu.h | 49 +++-
+ include/linux/iommu.h | 4 +-
+ 30 files changed, 387 insertions(+), 433 deletions(-)
+ delete mode 100644 include/linux/dma_remapping.h
+Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15)
+$ git merge dwmw2-iommu/master
+Already up to date.
+Merging vfio/next (104c7405a64d vfio: add edid support to mbochs sample driver)
+$ git merge vfio/next
+Already up to date.
+Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment)
+$ git merge trivial/for-next
+Already up to date.
+Merging audit/next (9a547c7e575f audit: shorten PATH cap values when zero)
+$ git merge audit/next
+Auto-merging init/Kconfig
+Merge made by the 'recursive' strategy.
+ drivers/tty/tty_audit.c | 13 +-
+ include/linux/audit.h | 8 +-
+ init/Kconfig | 9 -
+ kernel/Makefile | 4 +-
+ kernel/audit.c | 61 ++---
+ kernel/audit.h | 10 +-
+ kernel/audit_fsnotify.c | 6 +-
+ kernel/audit_tree.c | 498 ++++++++++++++++++++++-----------------
+ kernel/audit_watch.c | 6 +-
+ kernel/auditsc.c | 150 ++++++------
+ security/integrity/ima/ima_api.c | 2 +-
+ 11 files changed, 395 insertions(+), 372 deletions(-)
+Merging devicetree/for-next (66fe674690e1 Merge branch 'yaml-bindings-for-v4.21' into dt/next)
+$ git merge devicetree/for-next
+Auto-merging scripts/Makefile.lib
+Auto-merging init/do_mounts_initrd.c
+Auto-merging include/linux/of.h
+Auto-merging drivers/of/pdt.c
+Auto-merging arch/arm64/include/asm/memory.h
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Removing Documentation/devicetree/todo.txt
+Removing Documentation/devicetree/bindings/timer/arm,global_timer.txt
+Removing Documentation/devicetree/bindings/timer/arm,arch_timer.txt
+Removing Documentation/devicetree/bindings/i2c/i2c-gpio.txt
+Removing Documentation/devicetree/bindings/arm/zte.txt
+Removing Documentation/devicetree/bindings/arm/xilinx.txt
+Removing Documentation/devicetree/bindings/arm/vt8500.txt
+Removing Documentation/devicetree/bindings/arm/sti.txt
+Removing Documentation/devicetree/bindings/arm/spear.txt
+Removing Documentation/devicetree/bindings/arm/sirf.txt
+Removing Documentation/devicetree/bindings/arm/qcom.txt
+Removing Documentation/devicetree/bindings/arm/primecell.txt
+Removing Documentation/devicetree/bindings/arm/nspire.txt
+Removing Documentation/devicetree/bindings/arm/davinci.txt
+Removing Documentation/devicetree/bindings/arm/cpus.txt
+Removing Documentation/devicetree/bindings/arm/calxeda.txt
+Removing Documentation/devicetree/bindings/arm/altera/socfpga-clk-manager.txt
+Removing Documentation/devicetree/bindings/arm/altera.txt
+Merge made by the 'recursive' strategy.
+ .gitignore | 1 +
+ Documentation/Makefile | 2 +-
+ Documentation/devicetree/bindings/.gitignore | 1 +
+ Documentation/devicetree/bindings/Makefile | 33 ++
+ Documentation/devicetree/bindings/arm/altera.txt | 14 -
+ Documentation/devicetree/bindings/arm/altera.yaml | 20 +
+ .../bindings/arm/altera/socfpga-clk-manager.txt | 11 -
+ .../bindings/arm/altera/socfpga-clk-manager.yaml | 31 ++
+ Documentation/devicetree/bindings/arm/calxeda.txt | 15 -
+ Documentation/devicetree/bindings/arm/calxeda.yaml | 22 +
+ Documentation/devicetree/bindings/arm/cpus.txt | 490 --------------------
+ Documentation/devicetree/bindings/arm/cpus.yaml | 507 +++++++++++++++++++++
+ Documentation/devicetree/bindings/arm/davinci.txt | 25 -
+ Documentation/devicetree/bindings/arm/nspire.txt | 14 -
+ .../devicetree/bindings/arm/primecell.txt | 46 --
+ .../devicetree/bindings/arm/primecell.yaml | 36 ++
+ Documentation/devicetree/bindings/arm/qcom.txt | 57 ---
+ Documentation/devicetree/bindings/arm/qcom.yaml | 125 +++++
+ Documentation/devicetree/bindings/arm/sirf.txt | 11 -
+ Documentation/devicetree/bindings/arm/sirf.yaml | 27 ++
+ Documentation/devicetree/bindings/arm/spear.txt | 26 --
+ Documentation/devicetree/bindings/arm/spear.yaml | 25 +
+ Documentation/devicetree/bindings/arm/sti.txt | 23 -
+ Documentation/devicetree/bindings/arm/sti.yaml | 23 +
+ .../devicetree/bindings/arm/ti/nspire.yaml | 24 +
+ .../devicetree/bindings/arm/ti/ti,davinci.yaml | 26 ++
+ Documentation/devicetree/bindings/arm/vt8500.txt | 22 -
+ Documentation/devicetree/bindings/arm/vt8500.yaml | 23 +
+ Documentation/devicetree/bindings/arm/xilinx.txt | 83 ----
+ Documentation/devicetree/bindings/arm/xilinx.yaml | 114 +++++
+ Documentation/devicetree/bindings/arm/zte.txt | 14 -
+ Documentation/devicetree/bindings/arm/zte.yaml | 26 ++
+ .../devicetree/bindings/example-schema.yaml | 170 +++++++
+ Documentation/devicetree/bindings/i2c/i2c-gpio.txt | 46 --
+ .../devicetree/bindings/i2c/i2c-gpio.yaml | 73 +++
+ .../devicetree/bindings/phy/phy-cadence-sierra.txt | 67 +++
+ Documentation/devicetree/bindings/rng/mtk-rng.txt | 3 +-
+ Documentation/devicetree/bindings/rtc/rtc.txt | 64 +++
+ .../devicetree/bindings/timer/arm,arch_timer.txt | 112 -----
+ .../devicetree/bindings/timer/arm,arch_timer.yaml | 103 +++++
+ .../bindings/timer/arm,arch_timer_mmio.yaml | 120 +++++
+ .../devicetree/bindings/timer/arm,global_timer.txt | 27 --
+ .../bindings/timer/arm,global_timer.yaml | 46 ++
+ .../devicetree/bindings/trivial-devices.txt | 24 -
+ Documentation/devicetree/todo.txt | 10 -
+ Documentation/devicetree/writing-schema.md | 130 ++++++
+ MAINTAINERS | 2 +-
+ Makefile | 11 +-
+ arch/arc/mm/init.c | 25 +-
+ arch/arm/mm/init.c | 28 +-
+ arch/arm64/include/asm/memory.h | 8 -
+ arch/arm64/mm/init.c | 34 +-
+ arch/nds32/mm/init.c | 2 -
+ arch/powerpc/platforms/pseries/dlpar.c | 2 +
+ arch/unicore32/mm/init.c | 24 +-
+ drivers/irqchip/irq-gic-v3.c | 4 +-
+ drivers/irqchip/irq-mscc-ocelot.c | 6 +-
+ drivers/irqchip/irq-orion.c | 22 +-
+ drivers/irqchip/irq-stm32-exti.c | 6 +-
+ drivers/irqchip/irq-tango.c | 10 +-
+ drivers/irqchip/irq-tb10x.c | 18 +-
+ drivers/memory/omap-gpmc.c | 18 +-
+ drivers/memory/samsung/exynos-srom.c | 4 +-
+ drivers/memory/tegra/mc.c | 6 +-
+ drivers/memory/tegra/tegra124-emc.c | 12 +-
+ drivers/mtd/devices/powernv_flash.c | 2 +-
+ drivers/of/address.c | 6 +-
+ drivers/of/base.c | 25 +-
+ drivers/of/device.c | 9 +-
+ drivers/of/dynamic.c | 59 ++-
+ drivers/of/fdt.c | 23 +-
+ drivers/of/kobj.c | 4 +-
+ drivers/of/overlay.c | 292 +++++++++---
+ drivers/of/pdt.c | 5 -
+ drivers/of/property.c | 10 +-
+ drivers/of/resolver.c | 4 +-
+ drivers/of/unittest-data/Makefile | 2 +
+ .../of/unittest-data/overlay_bad_add_dup_node.dts | 28 ++
+ .../of/unittest-data/overlay_bad_add_dup_prop.dts | 24 +
+ drivers/of/unittest-data/overlay_base.dts | 1 +
+ drivers/of/unittest.c | 100 +++-
+ drivers/power/reset/axxia-reset.c | 2 +-
+ drivers/video/backlight/pm8941-wled.c | 2 +-
+ include/linux/initrd.h | 3 +
+ include/linux/of.h | 21 +-
+ include/linux/of_pdt.h | 2 -
+ init/do_mounts_initrd.c | 20 +
+ scripts/Makefile.lib | 26 +-
+ scripts/dtc/checks.c | 73 ++-
+ scripts/dtc/dtc-lexer.l | 4 +-
+ scripts/dtc/dtc-parser.y | 52 ++-
+ scripts/dtc/dtc.c | 11 +-
+ scripts/dtc/dtc.h | 11 +-
+ scripts/dtc/flattree.c | 4 +-
+ scripts/dtc/fstree.c | 5 +-
+ scripts/dtc/libfdt/Makefile.libfdt | 4 +
+ scripts/dtc/libfdt/fdt_addresses.c | 16 +-
+ scripts/dtc/libfdt/libfdt.h | 24 +-
+ scripts/dtc/livetree.c | 33 +-
+ scripts/dtc/srcpos.c | 153 ++++++-
+ scripts/dtc/srcpos.h | 14 +-
+ scripts/dtc/treesource.c | 115 +++--
+ scripts/dtc/util.c | 60 ++-
+ scripts/dtc/util.h | 2 +
+ scripts/dtc/version_gen.h | 2 +-
+ 105 files changed, 2885 insertions(+), 1522 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/.gitignore
+ create mode 100644 Documentation/devicetree/bindings/Makefile
+ delete mode 100644 Documentation/devicetree/bindings/arm/altera.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/altera.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-clk-manager.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-clk-manager.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/calxeda.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/calxeda.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/cpus.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/cpus.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/davinci.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/nspire.txt
+ delete mode 100644 Documentation/devicetree/bindings/arm/primecell.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/primecell.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/qcom.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/qcom.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/sirf.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/sirf.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/spear.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/spear.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/sti.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/sti.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/ti/nspire.yaml
+ create mode 100644 Documentation/devicetree/bindings/arm/ti/ti,davinci.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/vt8500.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/vt8500.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/xilinx.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/xilinx.yaml
+ delete mode 100644 Documentation/devicetree/bindings/arm/zte.txt
+ create mode 100644 Documentation/devicetree/bindings/arm/zte.yaml
+ create mode 100644 Documentation/devicetree/bindings/example-schema.yaml
+ delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-gpio.txt
+ create mode 100644 Documentation/devicetree/bindings/i2c/i2c-gpio.yaml
+ create mode 100644 Documentation/devicetree/bindings/phy/phy-cadence-sierra.txt
+ create mode 100644 Documentation/devicetree/bindings/rtc/rtc.txt
+ delete mode 100644 Documentation/devicetree/bindings/timer/arm,arch_timer.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/arm,arch_timer.yaml
+ create mode 100644 Documentation/devicetree/bindings/timer/arm,arch_timer_mmio.yaml
+ delete mode 100644 Documentation/devicetree/bindings/timer/arm,global_timer.txt
+ create mode 100644 Documentation/devicetree/bindings/timer/arm,global_timer.yaml
+ delete mode 100644 Documentation/devicetree/todo.txt
+ create mode 100644 Documentation/devicetree/writing-schema.md
+ create mode 100644 drivers/of/unittest-data/overlay_bad_add_dup_node.dts
+ create mode 100644 drivers/of/unittest-data/overlay_bad_add_dup_prop.dts
+Merging mailbox/mailbox-for-next (9f0a0a381c5d mailbox: mediatek: Add check for possible failure of kzalloc)
+$ git merge mailbox/mailbox-for-next
+Already up to date.
+Merging spi/for-next (90d467229dee Merge remote-tracking branches 'spi/topic/mem' and 'spi/topic/mtd' into spi-next)
+$ git merge spi/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/{mtd => spi}/atmel-quadspi.txt | 0
+ .../devicetree/bindings/spi/nuvoton,npcm-pspi.txt | 43 ++
+ Documentation/devicetree/bindings/spi/omap-spi.txt | 1 +
+ .../devicetree/bindings/spi/spi-mt65xx.txt | 2 +
+ Documentation/devicetree/bindings/spi/spi-mxic.txt | 34 ++
+ .../devicetree/bindings/spi/spi-pxa2xx.txt | 3 +
+ Documentation/devicetree/bindings/spi/spi-rspi.txt | 1 +
+ .../devicetree/bindings/spi/spi-uniphier.txt | 4 +
+ drivers/mtd/spi-nor/Kconfig | 9 -
+ drivers/mtd/spi-nor/Makefile | 1 -
+ drivers/spi/Kconfig | 24 +-
+ drivers/spi/Makefile | 3 +
+ drivers/{mtd/spi-nor => spi}/atmel-quadspi.c | 528 +++++-------------
+ drivers/spi/spi-at91-usart.c | 62 +++
+ drivers/spi/spi-bcm2835.c | 482 +++++++++++-----
+ drivers/spi/spi-bcm2835aux.c | 2 +-
+ drivers/spi/spi-dw-mmio.c | 8 +
+ drivers/spi/spi-dw.c | 1 +
+ drivers/spi/spi-fsl-dspi.c | 4 +-
+ drivers/spi/spi-geni-qcom.c | 64 +--
+ drivers/spi/spi-gpio.c | 24 +-
+ drivers/spi/spi-mem.c | 278 ++++++++-
+ drivers/spi/spi-mt65xx.c | 12 +
+ drivers/spi/spi-mxic.c | 619 +++++++++++++++++++++
+ drivers/spi/spi-npcm-pspi.c | 495 ++++++++++++++++
+ drivers/spi/spi-pl022.c | 14 +-
+ drivers/spi/spi-pxa2xx.c | 109 +++-
+ drivers/spi/spi-pxa2xx.h | 3 +
+ drivers/spi/spi-rockchip.c | 579 +++++++++----------
+ drivers/spi/spi-rspi.c | 6 +-
+ drivers/spi/spi-sh-msiof.c | 6 +-
+ drivers/spi/spi-zynqmp-gqspi.c | 6 +-
+ drivers/spi/spi.c | 84 ++-
+ include/linux/spi/pxa2xx_spi.h | 1 +
+ include/linux/spi/spi-mem.h | 84 ++-
+ include/linux/spi/spi.h | 5 +-
+ 36 files changed, 2625 insertions(+), 976 deletions(-)
+ rename Documentation/devicetree/bindings/{mtd => spi}/atmel-quadspi.txt (100%)
+ create mode 100644 Documentation/devicetree/bindings/spi/nuvoton,npcm-pspi.txt
+ create mode 100644 Documentation/devicetree/bindings/spi/spi-mxic.txt
+ rename drivers/{mtd/spi-nor => spi}/atmel-quadspi.c (53%)
+ create mode 100644 drivers/spi/spi-mxic.c
+ create mode 100644 drivers/spi/spi-npcm-pspi.c
+Merging tip/auto-latest (0b02d688ca73 Merge branch 'x86/urgent')
+$ git merge tip/auto-latest
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/pci_ids.h
+Auto-merging include/linux/ftrace.h
+Auto-merging drivers/hwmon/k10temp.c
+Auto-merging arch/x86/kernel/cpu/resctrl/rdtgroup.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/resctrl/rdtgroup.c
+Auto-merging arch/x86/kernel/cpu/resctrl/internal.h
+Auto-merging arch/x86/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'arch/x86/kernel/cpu/resctrl/rdtgroup.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 9a49554e3821] Merge remote-tracking branch 'tip/auto-latest'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/admin-guide/kernel-parameters.txt | 8 +
+ .../x86/{intel_rdt_ui.txt => resctrl_ui.txt} | 9 +-
+ Kbuild | 18 +-
+ MAINTAINERS | 7 +-
+ arch/arm64/include/asm/atomic.h | 237 +-
+ arch/arm64/include/asm/atomic_ll_sc.h | 28 +-
+ arch/arm64/include/asm/atomic_lse.h | 38 +-
+ arch/arm64/include/asm/cmpxchg.h | 60 +-
+ arch/arm64/include/asm/sync_bitops.h | 16 +-
+ arch/x86/Kconfig | 22 +-
+ arch/x86/boot/boot.h | 2 +-
+ arch/x86/boot/memory.c | 31 +-
+ arch/x86/boot/tools/build.c | 1 +
+ arch/x86/entry/vsyscall/vsyscall_64.c | 2 +-
+ arch/x86/include/asm/arch_hweight.h | 10 +-
+ arch/x86/include/asm/cpufeatures.h | 1 +
+ arch/x86/include/asm/crash.h | 1 +
+ arch/x86/include/asm/disabled-features.h | 8 +-
+ arch/x86/include/asm/irq.h | 7 +
+ arch/x86/include/asm/irq_work.h | 1 +
+ arch/x86/include/asm/kvm_para.h | 1 +
+ arch/x86/include/asm/paravirt.h | 5 +
+ arch/x86/include/asm/reboot.h | 1 +
+ .../asm/{intel_rdt_sched.h => resctrl_sched.h} | 28 +-
+ arch/x86/include/asm/sighandling.h | 5 +
+ arch/x86/include/asm/smp.h | 6 +
+ arch/x86/include/asm/traps.h | 54 +-
+ arch/x86/include/asm/tsc.h | 1 +
+ arch/x86/kernel/amd_nb.c | 53 +-
+ arch/x86/kernel/aperture_64.c | 25 +-
+ arch/x86/kernel/check.c | 3 +-
+ arch/x86/kernel/cpu/Makefile | 5 +-
+ arch/x86/kernel/cpu/cpu.h | 3 -
+ arch/x86/kernel/cpu/mcheck/mce_amd.c | 5 +-
+ arch/x86/kernel/cpu/mcheck/therm_throt.c | 3 +-
+ arch/x86/kernel/cpu/mcheck/threshold.c | 3 +-
+ arch/x86/kernel/cpu/microcode/amd.c | 470 +-
+ arch/x86/kernel/cpu/resctrl/Makefile | 4 +
+ .../x86/kernel/cpu/{intel_rdt.c => resctrl/core.c} | 184 +-
+ .../ctrlmondata.c} | 105 +-
+ .../kernel/cpu/{intel_rdt.h => resctrl/internal.h} | 55 +-
+ .../cpu/{intel_rdt_monitor.c => resctrl/monitor.c} | 16 +-
+ .../pseudo_lock.c} | 40 +-
+ .../pseudo_lock_event.h} | 2 +-
+ .../{intel_rdt_rdtgroup.c => resctrl/rdtgroup.c} | 61 +-
+ arch/x86/kernel/cpu/scattered.c | 31 +-
+ arch/x86/kernel/crash.c | 1 +
+ arch/x86/kernel/devicetree.c | 1 +
+ arch/x86/kernel/jailhouse.c | 1 +
+ arch/x86/kernel/process.c | 5 +-
+ arch/x86/kernel/process_32.c | 4 +-
+ arch/x86/kernel/process_64.c | 9 +-
+ arch/x86/kernel/quirks.c | 1 +
+ arch/x86/kernel/tracepoint.c | 1 +
+ arch/x86/kernel/tsc.c | 30 +-
+ arch/x86/mm/fault.c | 244 +-
+ arch/x86/platform/olpc/olpc_dt.c | 18 -
+ drivers/hwmon/k10temp.c | 10 +-
+ include/asm-generic/atomic-instrumented.h | 1688 ++-
+ include/asm-generic/atomic-long.h | 1173 ++-
+ include/linux/atomic-fallback.h | 2294 +++++
+ include/linux/atomic.h | 1241 +--
+ include/linux/ftrace.h | 3 +
+ include/linux/hrtimer.h | 5 +-
+ include/linux/kexec.h | 1 +
+ include/linux/of_fdt.h | 1 +
+ include/linux/pci_ids.h | 3 +
+ include/linux/ptrace.h | 1 +
+ include/linux/sched.h | 2 +-
+ kernel/irq/matrix.c | 34 +-
+ kernel/sched/core.c | 4 +-
+ kernel/sched/deadline.c | 19 +-
+ kernel/sched/debug.c | 2 +-
+ kernel/sched/fair.c | 72 +-
+ kernel/sched/rt.c | 24 +-
+ kernel/sched/sched.h | 9 +-
+ kernel/time/alarmtimer.c | 5 +-
+ kernel/time/clockevents.c | 18 +-
+ kernel/time/clocksource.c | 20 +-
+ kernel/time/hrtimer.c | 19 +-
+ kernel/time/itimer.c | 2 -
+ kernel/time/jiffies.c | 28 +-
+ kernel/time/posix-clock.c | 17 +-
+ kernel/time/posix-stubs.c | 5 +-
+ kernel/time/posix-timers.c | 25 +-
+ kernel/time/sched_clock.c | 9 +-
+ kernel/time/test_udelay.c | 10 +-
+ kernel/time/tick-broadcast-hrtimer.c | 4 +-
+ kernel/time/tick-broadcast.c | 6 +-
+ kernel/time/tick-common.c | 6 +-
+ kernel/time/tick-oneshot.c | 6 +-
+ kernel/time/tick-sched.c | 5 +-
+ kernel/time/time.c | 13 +-
+ kernel/time/timeconst.bc | 2 +
+ kernel/time/timeconv.c | 1 +
+ kernel/time/timecounter.c | 17 +-
+ kernel/time/timekeeping.c | 11 +-
+ kernel/time/timekeeping_debug.c | 11 +-
+ kernel/time/timer.c | 3 +-
+ kernel/time/timer_list.c | 7 +-
+ kernel/watchdog.c | 7 +
+ scripts/atomic/atomic-tbl.sh | 186 +
+ scripts/atomic/atomics.tbl | 41 +
+ scripts/atomic/check-atomics.sh | 19 +
+ scripts/atomic/fallbacks/acquire | 9 +
+ scripts/atomic/fallbacks/add_negative | 16 +
+ scripts/atomic/fallbacks/add_unless | 16 +
+ scripts/atomic/fallbacks/andnot | 7 +
+ scripts/atomic/fallbacks/dec | 7 +
+ scripts/atomic/fallbacks/dec_and_test | 15 +
+ scripts/atomic/fallbacks/dec_if_positive | 15 +
+ scripts/atomic/fallbacks/dec_unless_positive | 14 +
+ scripts/atomic/fallbacks/fence | 11 +
+ scripts/atomic/fallbacks/fetch_add_unless | 23 +
+ scripts/atomic/fallbacks/inc | 7 +
+ scripts/atomic/fallbacks/inc_and_test | 15 +
+ scripts/atomic/fallbacks/inc_not_zero | 14 +
+ scripts/atomic/fallbacks/inc_unless_negative | 14 +
+ scripts/atomic/fallbacks/read_acquire | 7 +
+ scripts/atomic/fallbacks/release | 8 +
+ scripts/atomic/fallbacks/set_release | 7 +
+ scripts/atomic/fallbacks/sub_and_test | 16 +
+ scripts/atomic/fallbacks/try_cmpxchg | 11 +
+ scripts/atomic/gen-atomic-fallback.sh | 181 +
+ scripts/atomic/gen-atomic-instrumented.sh | 182 +
+ scripts/atomic/gen-atomic-long.sh | 101 +
+ tools/build/Makefile.feature | 1 +
+ tools/build/feature/Makefile | 8 +
+ tools/build/feature/test-all.c | 5 +
+ tools/build/feature/test-eventfd.c | 9 +
+ tools/build/feature/test-jvmti-cmlr.c | 11 +
+ tools/build/feature/test-jvmti.c | 1 -
+ tools/perf/Documentation/perf-bench.txt | 10 +
+ tools/perf/Makefile.config | 12 +-
+ tools/perf/Makefile.perf | 3 +
+ tools/perf/arch/x86/util/header.c | 66 +-
+ tools/perf/arch/x86/util/kvm-stat.c | 2 +-
+ tools/perf/bench/Build | 3 +
+ tools/perf/bench/bench.h | 14 +
+ tools/perf/bench/epoll-ctl.c | 413 +
+ tools/perf/bench/epoll-wait.c | 540 +
+ tools/perf/bench/futex.h | 12 -
+ tools/perf/builtin-bench.c | 13 +
+ tools/perf/builtin-script.c | 38 +-
+ tools/perf/builtin-trace.c | 92 +-
+ tools/perf/examples/bpf/augmented_raw_syscalls.c | 10 +-
+ tools/perf/include/bpf/bpf.h | 19 +
+ tools/perf/include/bpf/pid_filter.h | 21 +
+ tools/perf/include/bpf/unistd.h | 10 +
+ tools/perf/jvmti/libjvmti.c | 12 +
+ .../pmu-events/arch/x86/cascadelakex/cache.json | 10172 +++++++++++++++++++
+ .../arch/x86/cascadelakex/clx-metrics.json | 164 +
+ .../arch/x86/cascadelakex/floating-point.json | 85 +
+ .../pmu-events/arch/x86/cascadelakex/frontend.json | 482 +
+ .../pmu-events/arch/x86/cascadelakex/memory.json | 9909 ++++++++++++++++++
+ .../pmu-events/arch/x86/cascadelakex/other.json | 8908 ++++++++++++++++
+ .../pmu-events/arch/x86/cascadelakex/pipeline.json | 969 ++
+ .../arch/x86/cascadelakex/uncore-memory.json | 117 +
+ .../arch/x86/cascadelakex/uncore-other.json | 255 +
+ .../arch/x86/cascadelakex/virtual-memory.json | 285 +
+ tools/perf/pmu-events/arch/x86/mapfile.csv | 3 +-
+ tools/perf/util/evlist.c | 10 +-
+ tools/perf/util/evlist.h | 6 +-
+ tools/perf/util/header.c | 39 +
+ tools/perf/util/map.c | 27 +
+ tools/perf/util/map.h | 2 +
+ tools/perf/util/pmu.c | 47 +-
+ tools/perf/util/stat-shadow.c | 3 +-
+ tools/perf/util/symbol.c | 15 +-
+ 169 files changed, 39815 insertions(+), 2784 deletions(-)
+ rename Documentation/x86/{intel_rdt_ui.txt => resctrl_ui.txt} (99%)
+ rename arch/x86/include/asm/{intel_rdt_sched.h => resctrl_sched.h} (77%)
+ create mode 100644 arch/x86/kernel/cpu/resctrl/Makefile
+ rename arch/x86/kernel/cpu/{intel_rdt.c => resctrl/core.c} (83%)
+ rename arch/x86/kernel/cpu/{intel_rdt_ctrlmondata.c => resctrl/ctrlmondata.c} (81%)
+ rename arch/x86/kernel/cpu/{intel_rdt.h => resctrl/internal.h} (91%)
+ rename arch/x86/kernel/cpu/{intel_rdt_monitor.c => resctrl/monitor.c} (98%)
+ rename arch/x86/kernel/cpu/{intel_rdt_pseudo_lock.c => resctrl/pseudo_lock.c} (97%)
+ rename arch/x86/kernel/cpu/{intel_rdt_pseudo_lock_event.h => resctrl/pseudo_lock_event.h} (95%)
+ rename arch/x86/kernel/cpu/{intel_rdt_rdtgroup.c => resctrl/rdtgroup.c} (98%)
+ create mode 100644 include/linux/atomic-fallback.h
+ create mode 100755 scripts/atomic/atomic-tbl.sh
+ create mode 100755 scripts/atomic/atomics.tbl
+ create mode 100755 scripts/atomic/check-atomics.sh
+ create mode 100755 scripts/atomic/fallbacks/acquire
+ create mode 100755 scripts/atomic/fallbacks/add_negative
+ create mode 100755 scripts/atomic/fallbacks/add_unless
+ create mode 100755 scripts/atomic/fallbacks/andnot
+ create mode 100755 scripts/atomic/fallbacks/dec
+ create mode 100755 scripts/atomic/fallbacks/dec_and_test
+ create mode 100755 scripts/atomic/fallbacks/dec_if_positive
+ create mode 100755 scripts/atomic/fallbacks/dec_unless_positive
+ create mode 100755 scripts/atomic/fallbacks/fence
+ create mode 100755 scripts/atomic/fallbacks/fetch_add_unless
+ create mode 100755 scripts/atomic/fallbacks/inc
+ create mode 100755 scripts/atomic/fallbacks/inc_and_test
+ create mode 100755 scripts/atomic/fallbacks/inc_not_zero
+ create mode 100755 scripts/atomic/fallbacks/inc_unless_negative
+ create mode 100755 scripts/atomic/fallbacks/read_acquire
+ create mode 100755 scripts/atomic/fallbacks/release
+ create mode 100755 scripts/atomic/fallbacks/set_release
+ create mode 100755 scripts/atomic/fallbacks/sub_and_test
+ create mode 100755 scripts/atomic/fallbacks/try_cmpxchg
+ create mode 100755 scripts/atomic/gen-atomic-fallback.sh
+ create mode 100755 scripts/atomic/gen-atomic-instrumented.sh
+ create mode 100755 scripts/atomic/gen-atomic-long.sh
+ create mode 100644 tools/build/feature/test-eventfd.c
+ create mode 100644 tools/build/feature/test-jvmti-cmlr.c
+ create mode 100644 tools/perf/bench/epoll-ctl.c
+ create mode 100644 tools/perf/bench/epoll-wait.c
+ create mode 100644 tools/perf/include/bpf/pid_filter.h
+ create mode 100644 tools/perf/include/bpf/unistd.h
+ create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/cache.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/clx-metrics.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/floating-point.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/frontend.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/pipeline.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-memory.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/uncore-other.json
+ create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/virtual-memory.json
+Merging clockevents/clockevents/next (ded414ebcd58 clocksource/drivers/fttmr010: Fix invalid interrupt register access)
+$ git merge clockevents/clockevents/next
+Auto-merging arch/arc/Kconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/timer/renesas,cmt.txt | 15 ++-
+ arch/arc/Kconfig | 1 +
+ drivers/clocksource/Kconfig | 16 +--
+ drivers/clocksource/arc_timer.c | 22 ++++
+ drivers/clocksource/bcm2835_timer.c | 15 +--
+ drivers/clocksource/clksrc-dbx500-prcmu.c | 22 +---
+ drivers/clocksource/meson6_timer.c | 128 ++++++++++++-------
+ drivers/clocksource/nomadik-mtu.c | 4 -
+ drivers/clocksource/tegra20_timer.c | 1 -
+ drivers/clocksource/timer-fttmr010.c | 73 ++++++-----
+ drivers/clocksource/timer-imx-gpt.c | 21 +---
+ drivers/clocksource/timer-imx-tpm.c | 136 +++++++++------------
+ drivers/clocksource/timer-integrator-ap.c | 25 ++--
+ drivers/clocksource/timer-ti-dm.c | 1 -
+ drivers/clocksource/timer-vt8500.c | 2 +-
+ 15 files changed, 243 insertions(+), 239 deletions(-)
+Merging edac-amd/for-next (8a880560d58a MAINTAINERS, EDAC: Drop bouncing email)
+$ git merge edac-amd/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/memory-controllers/synopsys.txt | 27 +-
+ MAINTAINERS | 1 -
+ drivers/edac/Kconfig | 6 +-
+ drivers/edac/e752x_edac.c | 4 +-
+ drivers/edac/edac_mc.c | 9 +-
+ drivers/edac/edac_mc_sysfs.c | 33 +-
+ drivers/edac/fsl_ddr_edac.c | 4 +
+ drivers/edac/i3000_edac.c | 4 +-
+ drivers/edac/i5000_edac.c | 4 +-
+ drivers/edac/i7core_edac.c | 2 +-
+ drivers/edac/i82975x_edac.c | 21 +-
+ drivers/edac/qcom_edac.c | 8 +-
+ drivers/edac/skx_edac.c | 151 +--
+ drivers/edac/synopsys_edac.c | 1204 +++++++++++++++++---
+ include/linux/adxl.h | 5 -
+ include/linux/edac.h | 6 -
+ 16 files changed, 1169 insertions(+), 320 deletions(-)
+Merging irqchip/irq/irqchip-next (2130b789b3ef irqchip/gic: Unify GIC priority definitions)
+$ git merge irqchip/irq/irqchip-next
+Already up to date.
+Merging ftrace/for-next (50432fa18c3d selftests/ftrace: Add testcases for dynamic event)
+$ git merge ftrace/for-next
+Auto-merging kernel/trace/trace.c
+Auto-merging include/linux/ftrace.h
+Merge made by the 'recursive' strategy.
+ Documentation/trace/kprobetrace.rst | 3 +
+ Documentation/trace/uprobetracer.rst | 4 +
+ arch/arm64/kernel/stacktrace.c | 3 -
+ include/linux/ftrace.h | 35 +-
+ include/linux/ring_buffer.h | 4 +-
+ kernel/trace/Kconfig | 6 +
+ kernel/trace/Makefile | 2 +
+ kernel/trace/fgraph.c | 615 +++++++++++++++++++++
+ kernel/trace/ftrace.c | 471 ++--------------
+ kernel/trace/ftrace_internal.h | 75 +++
+ kernel/trace/ring_buffer.c | 94 +++-
+ kernel/trace/trace.c | 72 ++-
+ kernel/trace/trace.h | 13 +
+ kernel/trace/trace_dynevent.c | 217 ++++++++
+ kernel/trace/trace_dynevent.h | 119 ++++
+ kernel/trace/trace_events.c | 8 +-
+ kernel/trace/trace_events_hist.c | 316 ++++++-----
+ kernel/trace/trace_functions_graph.c | 334 ++---------
+ kernel/trace/trace_irqsoff.c | 18 +-
+ kernel/trace/trace_kprobe.c | 353 ++++++------
+ kernel/trace/trace_probe.c | 74 ++-
+ kernel/trace/trace_probe.h | 9 +-
+ kernel/trace/trace_sched_wakeup.c | 270 +++++----
+ kernel/trace/trace_selftest.c | 8 +-
+ kernel/trace/trace_stack.c | 2 +-
+ kernel/trace/trace_uprobe.c | 301 +++++-----
+ scripts/recordmcount.c | 2 +-
+ scripts/recordmcount.pl | 13 +
+ .../ftrace/test.d/dynevent/add_remove_kprobe.tc | 30 +
+ .../ftrace/test.d/dynevent/add_remove_synth.tc | 27 +
+ .../ftrace/test.d/dynevent/clear_select_events.tc | 50 ++
+ .../ftrace/test.d/dynevent/generic_clear_event.tc | 49 ++
+ 32 files changed, 2176 insertions(+), 1421 deletions(-)
+ create mode 100644 kernel/trace/fgraph.c
+ create mode 100644 kernel/trace/ftrace_internal.h
+ create mode 100644 kernel/trace/trace_dynevent.c
+ create mode 100644 kernel/trace/trace_dynevent.h
+ create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/add_remove_kprobe.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/add_remove_synth.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/clear_select_events.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/generic_clear_event.tc
+Merging rcu/rcu/next (06aa5694f870 Merge LKMM and RCU commits)
+$ git merge rcu/rcu/next
+Auto-merging net/sched/sch_api.c
+Auto-merging net/decnet/af_decnet.c
+Auto-merging net/core/netpoll.c
+Auto-merging net/bridge/br_multicast.c
+CONFLICT (content): Merge conflict in net/bridge/br_multicast.c
+Auto-merging net/bridge/br_mdb.c
+CONFLICT (content): Merge conflict in net/bridge/br_mdb.c
+Auto-merging mm/khugepaged.c
+Auto-merging kernel/trace/trace_kprobe.c
+Auto-merging kernel/trace/trace.c
+Auto-merging kernel/trace/ring_buffer.c
+Auto-merging kernel/trace/ftrace.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/module.c
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging init/main.c
+Auto-merging include/linux/tracepoint.h
+Auto-merging include/linux/sched.h
+Auto-merging fs/userfaultfd.c
+Auto-merging drivers/vhost/net.c
+Auto-merging drivers/net/ethernet/realtek/r8169.c
+Auto-merging drivers/cpufreq/intel_pstate.c
+Auto-merging crypto/pcrypt.c
+Auto-merging arch/s390/mm/pgalloc.c
+Auto-merging arch/powerpc/mm/hugetlbpage.c
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Removing Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntick.svg
+Removing Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBHdyntick.svg
+Removing Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBH.svg
+Recorded preimage for 'MAINTAINERS'
+Resolved 'net/bridge/br_mdb.c' using previous resolution.
+Resolved 'net/bridge/br_multicast.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'MAINTAINERS'.
+[master f8d7fd130459] Merge remote-tracking branch 'rcu/rcu/next'
+$ git diff -M --stat --summary HEAD^..
+ .../Design/Data-Structures/BigTreeClassicRCUBH.svg | 499 -----
+ .../Data-Structures/BigTreeClassicRCUBHdyntick.svg | 695 -------
+ .../Data-Structures/BigTreePreemptRCUBHdyntick.svg | 741 -------
+ .../BigTreePreemptRCUBHdyntickCB.svg | 834 +++-----
+ .../Design/Data-Structures/Data-Structures.html | 173 +-
+ .../RCU/Design/Data-Structures/blkd_task.svg | 676 +++---
+ .../Expedited-Grace-Periods.html | 6 +-
+ .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 2 +-
+ .../RCU/Design/Requirements/Requirements.html | 206 +-
+ Documentation/RCU/checklist.txt | 49 +-
+ Documentation/RCU/stallwarn.txt | 7 +-
+ Documentation/RCU/whatisRCU.txt | 70 +-
+ Documentation/admin-guide/kernel-parameters.txt | 35 +-
+ MAINTAINERS | 67 +-
+ arch/powerpc/mm/hugetlbpage.c | 2 +-
+ arch/s390/mm/pgalloc.c | 2 +-
+ arch/sparc/oprofile/init.c | 2 +-
+ arch/x86/pci/i386.c | 2 +-
+ crypto/pcrypt.c | 2 +-
+ drivers/char/ipmi/ipmi_si_intf.c | 2 +-
+ drivers/cpufreq/cpufreq_governor.c | 2 +-
+ drivers/cpufreq/intel_pstate.c | 2 +-
+ drivers/net/ethernet/realtek/8139too.c | 2 +-
+ drivers/net/ethernet/realtek/r8169.c | 4 +-
+ drivers/net/ethernet/sfc/efx.c | 2 +-
+ drivers/net/ethernet/sis/sis190.c | 2 +-
+ drivers/net/ethernet/smsc/smsc911x.h | 2 +-
+ drivers/vhost/net.c | 2 +-
+ fs/file.c | 2 +-
+ fs/userfaultfd.c | 2 +-
+ include/linux/percpu-rwsem.h | 2 +-
+ include/linux/rcupdate_wait.h | 17 -
+ include/linux/sched.h | 4 +-
+ include/linux/srcu.h | 79 +-
+ include/linux/srcutiny.h | 24 +-
+ include/linux/srcutree.h | 8 +-
+ include/linux/tracepoint.h | 2 +-
+ include/linux/types.h | 4 +-
+ init/main.c | 6 +-
+ kernel/cgroup/cgroup.c | 2 +-
+ kernel/events/core.c | 2 +-
+ kernel/kprobes.c | 10 +-
+ kernel/livepatch/patch.c | 4 +-
+ kernel/livepatch/transition.c | 4 +-
+ kernel/locking/lockdep.c | 2 +-
+ kernel/locking/mutex-debug.c | 4 +-
+ kernel/module.c | 14 +-
+ kernel/rcu/rcu.h | 4 +
+ kernel/rcu/rcutorture.c | 389 ++--
+ kernel/rcu/srcutiny.c | 120 +-
+ kernel/rcu/srcutree.c | 489 ++---
+ kernel/rcu/sync.c | 25 +-
+ kernel/rcu/tree.c | 114 +-
+ kernel/rcu/tree.h | 18 +-
+ kernel/rcu/tree_exp.h | 10 +-
+ kernel/rcu/tree_plugin.h | 81 +-
+ kernel/rcu/update.c | 9 +-
+ kernel/sched/core.c | 2 +-
+ kernel/sched/membarrier.c | 6 +-
+ kernel/torture.c | 34 +-
+ kernel/trace/ftrace.c | 24 +-
+ kernel/trace/ring_buffer.c | 12 +-
+ kernel/trace/trace.c | 10 +-
+ kernel/trace/trace_events_filter.c | 4 +-
+ kernel/trace/trace_kprobe.c | 2 +-
+ kernel/tracepoint.c | 4 +-
+ kernel/workqueue.c | 8 +-
+ lib/percpu-refcount.c | 2 +-
+ mm/khugepaged.c | 4 +-
+ mm/mmu_gather.c | 2 +-
+ mm/slab.c | 4 +-
+ mm/slab_common.c | 6 +-
+ mm/swap.c | 3 +-
+ net/core/netpoll.c | 4 +-
+ net/core/skmsg.c | 2 +-
+ net/decnet/af_decnet.c | 2 +-
+ net/sched/sch_api.c | 2 +-
+ net/sched/sch_generic.c | 8 +-
+ scripts/checkpatch.pl | 35 +
+ tools/include/linux/kernel.h | 2 +-
+ tools/memory-model/.gitignore | 1 +
+ tools/memory-model/README | 2 +
+ tools/memory-model/linux-kernel.bell | 3 +-
+ tools/memory-model/linux-kernel.cat | 4 +-
+ tools/memory-model/linux-kernel.def | 1 +
+ tools/memory-model/scripts/README | 70 +
+ tools/memory-model/scripts/checkalllitmus.sh | 53 +-
+ tools/memory-model/scripts/checkghlitmus.sh | 65 +
+ tools/memory-model/scripts/checklitmus.sh | 74 +-
+ tools/memory-model/scripts/checklitmushist.sh | 60 +
+ tools/memory-model/scripts/cmplitmushist.sh | 87 +
+ tools/memory-model/scripts/initlitmushist.sh | 68 +
+ tools/memory-model/scripts/judgelitmus.sh | 78 +
+ tools/memory-model/scripts/newlitmushist.sh | 61 +
+ tools/memory-model/scripts/parseargs.sh | 136 ++
+ tools/memory-model/scripts/runlitmushist.sh | 87 +
+ tools/testing/selftests/rcutorture/bin/kvm.sh | 8 +
+ tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 136 ++
+ tools/testing/selftests/rcutorture/bin/nolibc.h | 2197 ++++++++++++++++++++
+ tools/testing/selftests/rcutorture/doc/initrd.txt | 99 +-
+ .../formal/srcu-cbmc/include/linux/types.h | 4 +-
+ virt/kvm/arm/vgic/vgic.c | 12 +-
+ 102 files changed, 4932 insertions(+), 4097 deletions(-)
+ delete mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBH.svg
+ delete mode 100644 Documentation/RCU/Design/Data-Structures/BigTreeClassicRCUBHdyntick.svg
+ delete mode 100644 Documentation/RCU/Design/Data-Structures/BigTreePreemptRCUBHdyntick.svg
+ create mode 100644 tools/memory-model/.gitignore
+ create mode 100644 tools/memory-model/scripts/README
+ create mode 100755 tools/memory-model/scripts/checkghlitmus.sh
+ create mode 100755 tools/memory-model/scripts/checklitmushist.sh
+ create mode 100644 tools/memory-model/scripts/cmplitmushist.sh
+ create mode 100755 tools/memory-model/scripts/initlitmushist.sh
+ create mode 100755 tools/memory-model/scripts/judgelitmus.sh
+ create mode 100755 tools/memory-model/scripts/newlitmushist.sh
+ create mode 100755 tools/memory-model/scripts/parseargs.sh
+ create mode 100755 tools/memory-model/scripts/runlitmushist.sh
+ create mode 100755 tools/testing/selftests/rcutorture/bin/mkinitrd.sh
+ create mode 100644 tools/testing/selftests/rcutorture/bin/nolibc.h
+Merging kvm/linux-next (22a7cdcae6a4 KVM/nVMX: Do not validate that posted_intr_desc_addr is page aligned)
+$ git merge kvm/linux-next
+Already up to date.
+Merging kvm-arm/next (e4e11cc0f81e KVM: arm64: Safety check PSTATE when entering guest and handle IL)
+$ git merge kvm-arm/next
+Already up to date.
+Merging kvm-ppc/kvm-ppc-next (651022382c7f Linux 4.20-rc1)
+$ git merge kvm-ppc/kvm-ppc-next
+Already up to date.
+Merging kvms390/next (ed3054a30258 Merge branch 'apv11' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kernelorgnext)
+$ git merge kvms390/next
+Already up to date.
+Merging xen-tip/linux-next (975ef94a0284 pvcalls-front: fixes incorrect error handling)
+$ git merge xen-tip/linux-next
+Already up to date.
+Merging percpu/for-next (ad19ef010db1 Merge branch 'for-4.19-fixes' into for-next)
+$ git merge percpu/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging workqueues/for-next (87915adc3f0a workqueue: re-add lockdep dependencies for flushing)
+$ git merge workqueues/for-next
+Already up to date.
+Merging drivers-x86/for-next (f25b6302b294 platform/x86: touchscreen_dmi: Add info for the Mediacom Flexbook Edge 11)
+$ git merge drivers-x86/for-next
+Auto-merging include/linux/acpi.h
+Auto-merging drivers/platform/x86/thinkpad_acpi.c
+Auto-merging drivers/platform/x86/dell-laptop.c
+Merge made by the 'recursive' strategy.
+ drivers/acpi/scan.c | 1 +
+ drivers/i2c/i2c-core-acpi.c | 64 +++++++++----
+ drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 16 ++--
+ drivers/platform/x86/asus-nb-wmi.c | 3 +-
+ drivers/platform/x86/asus-wmi.c | 3 +-
+ drivers/platform/x86/dell-laptop.c | 2 +
+ drivers/platform/x86/i2c-multi-instantiate.c | 97 ++++++++++++++++----
+ drivers/platform/x86/ideapad-laptop.c | 7 ++
+ drivers/platform/x86/intel_atomisp2_pm.c | 69 ++++++++++----
+ drivers/platform/x86/intel_cht_int33fe.c | 20 ++--
+ drivers/platform/x86/intel_ips.c | 83 ++++-------------
+ drivers/platform/x86/intel_pmc_core.c | 131 ++++++++++++++++++++++++++-
+ drivers/platform/x86/intel_pmc_core.h | 68 ++++++++++++--
+ drivers/platform/x86/thinkpad_acpi.c | 2 +-
+ drivers/platform/x86/touchscreen_dmi.c | 8 ++
+ drivers/usb/typec/tps6598x.c | 8 +-
+ include/linux/acpi.h | 11 +++
+ 17 files changed, 433 insertions(+), 160 deletions(-)
+Merging chrome-platform/for-next (2a70a4cda0da MAINTAINERS: platform/chrome: Add Enric as a maintainer)
+$ git merge chrome-platform/for-next
+Auto-merging MAINTAINERS
+CONFLICT (content): Merge conflict in MAINTAINERS
+Resolved 'MAINTAINERS' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 142b9192e8bf] Merge remote-tracking branch 'chrome-platform/for-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 1 +
+ drivers/platform/chrome/cros_ec_proto.c | 22 +++++++++++++++++-----
+ include/linux/mfd/cros_ec.h | 6 ++++--
+ 3 files changed, 22 insertions(+), 7 deletions(-)
+Merging hsi/for-next (3a658e09a215 HSI: omap_ssi: Change to use DEFINE_SHOW_ATTRIBUTE macro)
+$ git merge hsi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/hsi/controllers/omap_ssi_core.c | 29 ++++-------------------------
+ drivers/hsi/controllers/omap_ssi_port.c | 14 ++------------
+ 2 files changed, 6 insertions(+), 37 deletions(-)
+Merging leds/for-next (cb14e6d6d8f4 leds: pwm: Use OF variant of LED registering function)
+$ git merge leds/for-next
+Merge made by the 'recursive' strategy.
+ drivers/leds/leds-88pm860x.c | 2 +-
+ drivers/leds/leds-gpio.c | 1 -
+ drivers/leds/leds-powernv.c | 12 +++++++++---
+ drivers/leds/leds-pwm.c | 22 ++--------------------
+ 4 files changed, 12 insertions(+), 25 deletions(-)
+Merging ipmi/for-next (5e6ddecfc90b ipmi:ssif: Change some pr_xxx to dev_xxx calls)
+$ git merge ipmi/for-next
+Auto-merging drivers/char/ipmi/ipmi_si_intf.c
+Merge made by the 'recursive' strategy.
+ drivers/char/ipmi/ipmi_devintf.c | 6 +-
+ drivers/char/ipmi/ipmi_msghandler.c | 149 ++++++++++++++++++-------
+ drivers/char/ipmi/ipmi_si_intf.c | 5 +-
+ drivers/char/ipmi/ipmi_ssif.c | 211 +++++++++++++++++++++++++-----------
+ drivers/char/ipmi/kcs_bmc.c | 5 +-
+ include/linux/ipmi_smi.h | 27 +++--
+ 6 files changed, 287 insertions(+), 116 deletions(-)
+Merging driver-core/driver-core-next (df44b479654f kobject: return error code if writing /sys/.../uevent fails)
+$ git merge driver-core/driver-core-next
+Auto-merging kernel/module.c
+Auto-merging drivers/base/platform.c
+CONFLICT (content): Merge conflict in drivers/base/platform.c
+Auto-merging drivers/base/core.c
+Recorded preimage for 'drivers/base/platform.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/base/platform.c'.
+[master 50cb4421d18e] Merge remote-tracking branch 'driver-core/driver-core-next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/kobject.txt | 10 ++++--
+ drivers/base/bus.c | 12 ++++---
+ drivers/base/core.c | 32 +++++++++++++------
+ drivers/base/dd.c | 15 +++++----
+ drivers/base/memory.c | 79 +++++++++++++++++++++--------------------------
+ drivers/base/platform.c | 4 +--
+ fs/kernfs/file.c | 23 +++++++-------
+ include/linux/kref.h | 5 +--
+ kernel/module.c | 6 ++--
+ lib/kobject.c | 2 +-
+ lib/kobject_uevent.c | 4 ++-
+ 11 files changed, 104 insertions(+), 88 deletions(-)
+Merging usb/usb-next (e67ebf1b3815 xhci: move usb2 get port status link resume handling to its own function)
+$ git merge usb/usb-next
+Auto-merging drivers/usb/misc/appledisplay.c
+Auto-merging drivers/usb/host/xhci.h
+Auto-merging drivers/usb/host/xhci.c
+Auto-merging drivers/usb/core/hub.c
+Auto-merging drivers/platform/x86/intel_cht_int33fe.c
+Merge made by the 'recursive' strategy.
+ .../bindings/connector/usb-connector.txt | 2 +
+ Documentation/usb/authorization.txt | 2 +-
+ drivers/platform/x86/intel_cht_int33fe.c | 2 +-
+ drivers/usb/core/hub.c | 10 +
+ drivers/usb/early/ehci-dbgp.c | 38 +--
+ drivers/usb/gadget/udc/pch_udc.c | 2 +-
+ drivers/usb/host/ohci-mem.c | 12 +-
+ drivers/usb/host/xhci-hub.c | 351 ++++++++++++---------
+ drivers/usb/host/xhci-mem.c | 30 +-
+ drivers/usb/host/xhci-ring.c | 2 +-
+ drivers/usb/host/xhci.c | 22 +-
+ drivers/usb/host/xhci.h | 13 +-
+ drivers/usb/misc/appledisplay.c | 8 +-
+ drivers/usb/mtu3/mtu3_core.c | 20 +-
+ drivers/usb/mtu3/mtu3_gadget_ep0.c | 14 +-
+ drivers/usb/mtu3/mtu3_hw_regs.h | 6 +
+ drivers/usb/mtu3/mtu3_plat.c | 8 +
+ drivers/usb/mtu3/mtu3_qmu.c | 26 --
+ drivers/usb/storage/ene_ub6250.c | 2 +-
+ drivers/usb/typec/tcpm/fusb302.c | 2 +-
+ drivers/usb/typec/tcpm/tcpm.c | 21 +-
+ drivers/uwb/i1480/dfu/usb.c | 2 +-
+ include/linux/usb/hcd.h | 5 -
+ include/linux/usb/tcpm.h | 1 +
+ 24 files changed, 312 insertions(+), 289 deletions(-)
+Merging usb-gadget/next (d53701067f04 usb: dwc3: gadget: check if dep->frame_number is still valid)
+$ git merge usb-gadget/next
+Auto-merging drivers/usb/gadget/function/f_fs.c
+Auto-merging drivers/usb/dwc3/gadget.c
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/usb/dwc3.txt | 4 +
+ drivers/usb/dwc2/gadget.c | 3 +-
+ drivers/usb/dwc2/hw.h | 2 +
+ drivers/usb/dwc3/core.c | 19 +-
+ drivers/usb/dwc3/core.h | 59 ++++-
+ drivers/usb/dwc3/debug.h | 29 +++
+ drivers/usb/dwc3/debugfs.c | 201 ++++++++++++++--
+ drivers/usb/dwc3/drd.c | 15 +-
+ drivers/usb/dwc3/gadget.c | 310 ++++++++++++++++---------
+ drivers/usb/dwc3/gadget.h | 15 ++
+ drivers/usb/dwc3/host.c | 5 +-
+ drivers/usb/dwc3/trace.h | 2 +-
+ drivers/usb/gadget/function/f_fs.c | 122 ++++++++--
+ drivers/usb/gadget/function/uvc_queue.c | 2 +-
+ drivers/usb/gadget/udc/aspeed-vhub/dev.c | 2 +-
+ drivers/usb/gadget/udc/renesas_usb3.c | 15 +-
+ include/linux/usb/ccid.h | 51 ++++
+ 17 files changed, 688 insertions(+), 168 deletions(-)
+ create mode 100644 include/linux/usb/ccid.h
+Merging usb-serial/usb-next (32899682cf45 USB: serial: mos7840: add a product ID for the new product)
+$ git merge usb-serial/usb-next
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/f81534.c | 20 +++++++++++--
+ drivers/usb/serial/ftdi_sio.c | 6 ++--
+ drivers/usb/serial/mos7840.c | 65 +++++++++++++++++--------------------------
+ drivers/usb/serial/quatech2.c | 3 --
+ 4 files changed, 45 insertions(+), 49 deletions(-)
+Merging usb-chipidea-next/ci-for-usb-next (59739131e0ca usb: chipidea: Fix otg event handler)
+$ git merge usb-chipidea-next/ci-for-usb-next
+Already up to date.
+Merging phy-next/next (013231475e12 phy: dphy: Add configuration helpers)
+$ git merge phy-next/next
+Auto-merging drivers/phy/qualcomm/phy-qcom-qusb2.c
+Auto-merging drivers/net/ethernet/ti/cpsw.c
+Auto-merging drivers/net/ethernet/mscc/ocelot.c
+Auto-merging drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/net/cpsw.txt | 8 +-
+ .../devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt | 17 +
+ .../devicetree/bindings/phy/sun4i-usb-phy.txt | 8 +-
+ .../devicetree/bindings/phy/ti-phy-gmii-sel.txt | 68 ++++
+ MAINTAINERS | 1 +
+ drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 19 +-
+ drivers/net/ethernet/mscc/ocelot.c | 9 +-
+ drivers/net/ethernet/ti/cpsw.c | 19 +-
+ drivers/phy/Kconfig | 9 +
+ drivers/phy/Makefile | 2 +
+ drivers/phy/allwinner/phy-sun4i-usb.c | 29 +-
+ drivers/phy/amlogic/phy-meson-gxl-usb2.c | 5 +-
+ drivers/phy/amlogic/phy-meson-gxl-usb3.c | 5 +-
+ drivers/phy/cadence/Kconfig | 9 +-
+ drivers/phy/cadence/Makefile | 1 +
+ drivers/phy/cadence/phy-cadence-sierra.c | 395 +++++++++++++++++++++
+ drivers/phy/freescale/Kconfig | 5 +
+ drivers/phy/freescale/Makefile | 1 +
+ drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 127 +++++++
+ drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 97 ++---
+ drivers/phy/mediatek/phy-mtk-tphy.c | 2 +-
+ drivers/phy/mediatek/phy-mtk-xsphy.c | 2 +-
+ drivers/phy/motorola/phy-mapphone-mdm6600.c | 71 ++--
+ drivers/phy/mscc/phy-ocelot-serdes.c | 24 +-
+ drivers/phy/phy-core-mipi-dphy.c | 166 +++++++++
+ drivers/phy/phy-core.c | 70 +++-
+ drivers/phy/qualcomm/phy-qcom-qmp.c | 3 +-
+ drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 +-
+ drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c | 3 +-
+ drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c | 3 +-
+ drivers/phy/qualcomm/phy-qcom-usb-hs.c | 3 +-
+ drivers/phy/renesas/phy-rcar-gen3-usb2.c | 17 +-
+ drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 6 +-
+ drivers/phy/rockchip/phy-rockchip-typec.c | 4 +-
+ drivers/phy/ti/Kconfig | 10 +
+ drivers/phy/ti/Makefile | 1 +
+ drivers/phy/ti/phy-da8xx-usb.c | 3 +-
+ drivers/phy/ti/phy-gmii-sel.c | 349 ++++++++++++++++++
+ drivers/phy/ti/phy-tusb1210.c | 2 +-
+ include/linux/phy/phy-mipi-dphy.h | 285 +++++++++++++++
+ include/linux/phy/phy.h | 83 ++++-
+ 41 files changed, 1808 insertions(+), 136 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt
+ create mode 100644 Documentation/devicetree/bindings/phy/ti-phy-gmii-sel.txt
+ create mode 100644 drivers/phy/cadence/phy-cadence-sierra.c
+ create mode 100644 drivers/phy/freescale/Kconfig
+ create mode 100644 drivers/phy/freescale/Makefile
+ create mode 100644 drivers/phy/freescale/phy-fsl-imx8mq-usb.c
+ create mode 100644 drivers/phy/phy-core-mipi-dphy.c
+ create mode 100644 drivers/phy/ti/phy-gmii-sel.c
+ create mode 100644 include/linux/phy/phy-mipi-dphy.h
+Merging tty/tty-next (1528e40fd7d3 Revert "sysctl: clean up nr_pdflush_threads leftover")
+$ git merge tty/tty-next
+Auto-merging include/linux/tty.h
+Auto-merging drivers/tty/tty_io.c
+Auto-merging drivers/tty/serial/8250/8250_mtk.c
+Auto-merging drivers/gnss/sirf.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/dma/8250_mtk_dma.txt | 33 ++++
+ .../devicetree/bindings/serial/lantiq_asc.txt | 15 ++
+ drivers/char/Kconfig | 8 +
+ drivers/char/ttyprintk.c | 4 +-
+ drivers/gnss/serial.c | 2 +-
+ drivers/gnss/sirf.c | 2 +-
+ drivers/tty/n_hdlc.c | 4 +-
+ drivers/tty/n_r3964.c | 2 +-
+ drivers/tty/n_tty.c | 8 +-
+ drivers/tty/serdev/core.c | 70 ++++++-
+ drivers/tty/serial/8250/8250_aspeed_vuart.c | 6 +-
+ drivers/tty/serial/8250/8250_fsl.c | 6 +-
+ drivers/tty/serial/8250/8250_mtk.c | 210 ++++++++++++++++++++-
+ drivers/tty/serial/8250/8250_omap.c | 6 +-
+ drivers/tty/serial/8250/8250_port.c | 8 +-
+ drivers/tty/serial/8250/Kconfig | 1 +
+ drivers/tty/serial/amba-pl011.c | 2 +
+ drivers/tty/serial/fsl_lpuart.c | 6 +-
+ drivers/tty/serial/imx.c | 2 +-
+ drivers/tty/serial/lantiq.c | 145 ++++++++------
+ drivers/tty/serial/mvebu-uart.c | 29 ++-
+ drivers/tty/serial/pch_uart.c | 3 -
+ drivers/tty/serial/pic32_uart.c | 1 +
+ drivers/tty/serial/qcom_geni_serial.c | 120 ++++++------
+ drivers/tty/serial/serial-tegra.c | 10 +-
+ drivers/tty/serial/sh-sci.c | 4 +-
+ drivers/tty/serial/uartlite.c | 97 +++++++---
+ drivers/tty/serial/xilinx_uartps.c | 1 +
+ drivers/tty/sysrq.c | 18 +-
+ drivers/tty/tty_io.c | 14 +-
+ drivers/tty/tty_ldisc.c | 16 ++
+ drivers/tty/tty_ldsem.c | 62 +++---
+ include/linux/backing-dev-defs.h | 8 +
+ include/linux/lantiq.h | 23 +++
+ include/linux/serdev.h | 2 +-
+ include/linux/serial_core.h | 38 +++-
+ include/linux/tty.h | 7 +
+ 37 files changed, 748 insertions(+), 245 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/8250_mtk_dma.txt
+ create mode 100644 include/linux/lantiq.h
+Merging char-misc/char-misc-next (48d365de7746 Merge tag 'soundwire-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next)
+$ git merge char-misc/char-misc-next
+Auto-merging include/linux/mtd/mtd.h
+Auto-merging include/linux/hyperv.h
+Removing drivers/platform/x86/pvpanic.c
+Auto-merging drivers/platform/x86/Kconfig
+Auto-merging drivers/mtd/mtdcore.c
+Auto-merging drivers/mtd/Kconfig
+Auto-merging drivers/misc/Makefile
+CONFLICT (content): Merge conflict in drivers/misc/Makefile
+Auto-merging drivers/hv/hyperv_vmbus.h
+Auto-merging drivers/hv/channel_mgmt.c
+CONFLICT (content): Merge conflict in drivers/hv/channel_mgmt.c
+Auto-merging arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi
+Auto-merging MAINTAINERS
+Resolved 'drivers/hv/channel_mgmt.c' using previous resolution.
+Resolved 'drivers/misc/Makefile' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 004586fae44e] Merge remote-tracking branch 'char-misc/char-misc-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/firmware/intel,stratix10-svc.txt | 57 ++
+ .../bindings/fpga/intel-stratix10-soc-fpga-mgr.txt | 17 +
+ .../devicetree/bindings/misc/pvpanic-mmio.txt | 29 +
+ .../devicetree/bindings/nvmem/amlogic-efuse.txt | 3 +
+ .../driver-api/firmware/other_interfaces.rst | 30 +
+ MAINTAINERS | 3 +-
+ arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 33 +
+ drivers/android/binder.c | 94 +-
+ drivers/android/binder_alloc.c | 1 +
+ drivers/android/binder_alloc.h | 20 +-
+ drivers/bus/fsl-mc/dpbp.c | 1 -
+ drivers/bus/fsl-mc/dpcon.c | 1 -
+ drivers/char/lp.c | 239 ++---
+ drivers/char/tlclk.c | 87 +-
+ drivers/char/virtio_console.c | 17 +-
+ drivers/firmware/Kconfig | 12 +
+ drivers/firmware/Makefile | 1 +
+ drivers/firmware/stratix10-svc.c | 1041 ++++++++++++++++++++
+ drivers/fpga/Kconfig | 6 +
+ drivers/fpga/Makefile | 1 +
+ drivers/fpga/altera-cvp.c | 49 +-
+ drivers/fpga/altera-ps-spi.c | 40 +-
+ drivers/fpga/dfl-fme-pr.c | 2 -
+ drivers/fpga/dfl-fme-region.c | 2 +-
+ drivers/fpga/of-fpga-region.c | 2 +-
+ drivers/fpga/stratix10-soc.c | 535 ++++++++++
+ drivers/fpga/zynq-fpga.c | 4 +
+ drivers/hv/channel.c | 1 -
+ drivers/hv/channel_mgmt.c | 44 -
+ drivers/hv/hv.c | 10 +-
+ drivers/hv/hv_kvp.c | 2 +-
+ drivers/hv/hv_util.c | 2 +-
+ drivers/hv/hyperv_vmbus.h | 2 -
+ drivers/hwtracing/coresight/coresight-etb10.c | 23 +-
+ drivers/hwtracing/coresight/coresight-etm3x.c | 12 +-
+ drivers/hwtracing/coresight/coresight-stm.c | 2 +-
+ drivers/hwtracing/coresight/coresight-tmc-etf.c | 2 +-
+ drivers/misc/Kconfig | 8 +
+ drivers/misc/Makefile | 1 +
+ drivers/misc/altera-stapl/altera.c | 3 +-
+ drivers/misc/genwqe/card_debugfs.c | 85 +-
+ drivers/misc/mei/Makefile | 1 +
+ drivers/misc/mei/client.c | 91 +-
+ drivers/misc/mei/dma-ring.c | 269 +++++
+ drivers/misc/mei/hbm.c | 92 +-
+ drivers/misc/mei/hbm.h | 2 +
+ drivers/misc/mei/hw-me.c | 6 +
+ drivers/misc/mei/hw.h | 29 +-
+ drivers/misc/mei/init.c | 2 +-
+ drivers/misc/mei/interrupt.c | 41 +-
+ drivers/misc/mei/mei_dev.h | 26 +-
+ drivers/misc/mei/pci-me.c | 4 +-
+ drivers/misc/mic/card/mic_debugfs.c | 24 +-
+ drivers/misc/mic/cosm/cosm_debugfs.c | 39 +-
+ drivers/misc/mic/host/mic_debugfs.c | 62 +-
+ drivers/misc/mic/scif/scif_debugfs.c | 44 +-
+ drivers/misc/mic/vop/vop_debugfs.c | 40 +-
+ drivers/misc/pvpanic.c | 192 ++++
+ drivers/misc/ti-st/st_kim.c | 36 +-
+ drivers/misc/vexpress-syscfg.c | 2 +-
+ drivers/misc/vmw_balloon.c | 13 +-
+ drivers/mtd/Kconfig | 1 +
+ drivers/mtd/mtdcore.c | 56 ++
+ drivers/nvmem/core.c | 31 +-
+ drivers/nvmem/meson-efuse.c | 29 +-
+ drivers/parport/parport_pc.c | 2 +-
+ drivers/platform/x86/Kconfig | 8 -
+ drivers/platform/x86/Makefile | 1 -
+ drivers/platform/x86/pvpanic.c | 124 ---
+ drivers/pps/clients/pps-gpio.c | 4 +-
+ drivers/pps/clients/pps-ktimer.c | 4 +-
+ drivers/pps/clients/pps-ldisc.c | 4 +-
+ drivers/pps/clients/pps_parport.c | 2 +-
+ drivers/pps/kapi.c | 5 +-
+ drivers/slimbus/Kconfig | 5 +-
+ drivers/slimbus/qcom-ctrl.c | 6 +-
+ drivers/slimbus/qcom-ngd-ctrl.c | 7 +-
+ drivers/soundwire/intel.c | 4 +-
+ drivers/uio/uio.c | 19 +-
+ drivers/uio/uio_fsl_elbc_gpcm.c | 6 +-
+ drivers/virt/vboxguest/vboxguest_core.c | 2 +-
+ include/linux/firmware/intel/stratix10-smc.h | 312 ++++++
+ .../linux/firmware/intel/stratix10-svc-client.h | 217 ++++
+ include/linux/fsl/mc.h | 12 +-
+ include/linux/hyperv.h | 17 -
+ include/linux/mtd/mtd.h | 2 +
+ include/linux/nvmem-provider.h | 11 +
+ tools/Makefile | 7 +-
+ tools/firmware/Makefile | 13 +
+ tools/firmware/ihex2fw.c | 281 ++++++
+ tools/hv/hv_kvp_daemon.c | 15 +-
+ 91 files changed, 3910 insertions(+), 836 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/firmware/intel,stratix10-svc.txt
+ create mode 100644 Documentation/devicetree/bindings/fpga/intel-stratix10-soc-fpga-mgr.txt
+ create mode 100644 Documentation/devicetree/bindings/misc/pvpanic-mmio.txt
+ create mode 100644 drivers/firmware/stratix10-svc.c
+ create mode 100644 drivers/fpga/stratix10-soc.c
+ create mode 100644 drivers/misc/mei/dma-ring.c
+ create mode 100644 drivers/misc/pvpanic.c
+ delete mode 100644 drivers/platform/x86/pvpanic.c
+ create mode 100644 include/linux/firmware/intel/stratix10-smc.h
+ create mode 100644 include/linux/firmware/intel/stratix10-svc-client.h
+ create mode 100644 tools/firmware/Makefile
+ create mode 100644 tools/firmware/ihex2fw.c
+Merging extcon/extcon-next (a2dc50914744 extcon: max8997: Fix lack of path setting in USB device mode)
+$ git merge extcon/extcon-next
+Merge made by the 'recursive' strategy.
+ drivers/extcon/extcon-max14577.c | 15 +++++++++++++--
+ drivers/extcon/extcon-max77693.c | 16 ++++++++++++++--
+ drivers/extcon/extcon-max77843.c | 18 +++++++++++++++---
+ drivers/extcon/extcon-max8997.c | 25 +++++++++++++++++--------
+ 4 files changed, 59 insertions(+), 15 deletions(-)
+Merging soundwire/next (b1635596860d soundwire: intel: constify snd_soc_dai_ops structures)
+$ git merge soundwire/next
+Already up to date.
+Merging thunderbolt/next (dcc3c9e37fbd thunderbolt: Export IOMMU based DMA protection support to userspace)
+$ git merge thunderbolt/next
+Auto-merging drivers/iommu/intel-iommu.c
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-bus-thunderbolt | 9 ++++
+ Documentation/admin-guide/thunderbolt.rst | 20 +++++++++
+ drivers/acpi/property.c | 11 +++++
+ drivers/iommu/dmar.c | 25 +++++++++++
+ drivers/iommu/intel-iommu.c | 56 +++++++++++++++++++++++--
+ drivers/pci/pci-acpi.c | 19 +++++++++
+ drivers/pci/probe.c | 15 +++++++
+ drivers/thunderbolt/domain.c | 17 ++++++++
+ include/linux/dmar.h | 8 ++++
+ include/linux/pci.h | 8 ++++
+ 10 files changed, 185 insertions(+), 3 deletions(-)
+Merging staging/staging-next (7146a4f02635 staging: erofs: simplify `z_erofs_vle_submit_all')
+$ git merge staging/staging-next
+Removing drivers/staging/wilc1000/coreconfigurator.h
+Removing drivers/staging/wilc1000/coreconfigurator.c
+Removing drivers/staging/vc04_services/interface/vchi/vchi_mh.h
+Auto-merging drivers/staging/vboxvideo/vbox_ttm.c
+CONFLICT (content): Merge conflict in drivers/staging/vboxvideo/vbox_ttm.c
+Removing drivers/staging/vboxvideo/vbox_err.h
+Auto-merging drivers/staging/vboxvideo/vbox_drv.h
+Auto-merging drivers/staging/vboxvideo/vbox_drv.c
+Auto-merging drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
+Auto-merging drivers/staging/media/tegra-vde/tegra-vde.c
+CONFLICT (content): Merge conflict in drivers/staging/media/tegra-vde/tegra-vde.c
+Auto-merging drivers/staging/media/bcm2048/radio-bcm2048.c
+Removing drivers/staging/iio/resolver/ad2s1210.h
+Removing drivers/staging/erofs/unzip_lz4.c
+Auto-merging drivers/staging/erofs/super.c
+Removing drivers/staging/erofs/lz4defs.h
+Auto-merging MAINTAINERS
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Recorded preimage for 'drivers/staging/media/tegra-vde/tegra-vde.c'
+Resolved 'drivers/staging/vboxvideo/vbox_ttm.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/staging/media/tegra-vde/tegra-vde.c'.
+[master 41b2c79dd1c2] Merge remote-tracking branch 'staging/staging-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/iio/adc/ad7949.txt | 16 +
+ Documentation/devicetree/bindings/iio/adc/adc.txt | 23 +
+ .../devicetree/bindings/iio/adc/adi,ad7124.txt | 75 +
+ .../bindings/iio/adc/amlogic,meson-saradc.txt | 6 +
+ .../devicetree/bindings/iio/adc/ti-adc128s052.txt | 9 +-
+ .../devicetree/bindings/iio/dac/ti,dac7311.txt | 23 +
+ .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 1 +
+ .../devicetree/bindings/iio/light/vcnl4035.txt | 18 +
+ .../bindings/iio/magnetometer/pni,rm3100.txt | 20 +
+ .../devicetree/bindings/iio/st-sensors.txt | 2 +
+ .../devicetree/bindings/vendor-prefixes.txt | 2 +
+ MAINTAINERS | 30 +-
+ drivers/iio/accel/Kconfig | 2 +-
+ drivers/iio/accel/kxcjk-1013.c | 1 +
+ drivers/iio/accel/st_accel.h | 1 +
+ drivers/iio/accel/st_accel_core.c | 1 +
+ drivers/iio/accel/st_accel_i2c.c | 5 +
+ drivers/iio/accel/st_accel_spi.c | 5 +
+ drivers/iio/adc/Kconfig | 21 +
+ drivers/iio/adc/Makefile | 2 +
+ drivers/iio/adc/ad7124.c | 684 +++++
+ drivers/iio/adc/ad7949.c | 347 +++
+ drivers/iio/adc/ad_sigma_delta.c | 22 +-
+ drivers/iio/adc/ina2xx-adc.c | 2 +
+ drivers/iio/adc/max11100.c | 5 +-
+ drivers/iio/adc/max9611.c | 5 +-
+ drivers/iio/adc/meson_saradc.c | 229 +-
+ drivers/iio/adc/rcar-gyroadc.c | 11 +-
+ drivers/iio/adc/sc27xx_adc.c | 12 +-
+ drivers/iio/adc/ti-adc128s052.c | 37 +-
+ drivers/iio/common/ssp_sensors/ssp_dev.c | 20 +-
+ drivers/iio/common/st_sensors/st_sensors_core.c | 3 +-
+ drivers/iio/common/st_sensors/st_sensors_trigger.c | 4 +-
+ drivers/iio/dac/Kconfig | 9 +
+ drivers/iio/dac/Makefile | 1 +
+ drivers/iio/dac/dpot-dac.c | 4 +-
+ drivers/iio/dac/ti-dac7311.c | 338 +++
+ drivers/iio/imu/st_lsm6dsx/Makefile | 3 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 167 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 165 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 283 +-
+ drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 777 ++++++
+ drivers/iio/light/Kconfig | 13 +
+ drivers/iio/light/Makefile | 1 +
+ drivers/iio/light/vcnl4035.c | 676 +++++
+ drivers/iio/magnetometer/Kconfig | 29 +
+ drivers/iio/magnetometer/Makefile | 4 +
+ drivers/iio/magnetometer/rm3100-core.c | 616 +++++
+ drivers/iio/magnetometer/rm3100-i2c.c | 54 +
+ drivers/iio/magnetometer/rm3100-spi.c | 64 +
+ drivers/iio/magnetometer/rm3100.h | 17 +
+ drivers/iio/magnetometer/st_magn.h | 1 +
+ drivers/iio/magnetometer/st_magn_core.c | 11 +-
+ drivers/iio/magnetometer/st_magn_i2c.c | 5 +
+ drivers/iio/magnetometer/st_magn_spi.c | 7 +
+ drivers/iio/potentiometer/mcp4131.c | 11 +-
+ drivers/iio/potentiometer/tpl0102.c | 42 +-
+ drivers/staging/android/ion/ion.c | 51 +-
+ drivers/staging/android/ion/ion.h | 9 +
+ drivers/staging/android/ion/ion_system_heap.c | 1 -
+ drivers/staging/axis-fifo/axis-fifo.c | 3 +-
+ drivers/staging/comedi/comedi_fops.c | 1 +
+ drivers/staging/comedi/drivers/8255.h | 2 +-
+ drivers/staging/comedi/drivers/addi_apci_3501.c | 9 +-
+ drivers/staging/comedi/drivers/amplc_dio200.h | 2 +-
+ drivers/staging/comedi/drivers/amplc_pc236.h | 2 +-
+ drivers/staging/comedi/drivers/cb_pcidas64.c | 44 +-
+ drivers/staging/comedi/drivers/cb_pcidda.c | 4 +-
+ drivers/staging/comedi/drivers/comedi_8254.h | 2 +-
+ drivers/staging/comedi/drivers/comedi_isadma.h | 2 +-
+ drivers/staging/comedi/drivers/das08.h | 2 +-
+ drivers/staging/comedi/drivers/dt9812.c | 2 +-
+ drivers/staging/comedi/drivers/mite.h | 2 +-
+ drivers/staging/comedi/drivers/ni_labpc.h | 2 +-
+ drivers/staging/comedi/drivers/ni_labpc_common.c | 9 +-
+ drivers/staging/comedi/drivers/ni_stc.h | 2 +-
+ drivers/staging/comedi/drivers/ni_tio.h | 2 +-
+ drivers/staging/comedi/drivers/ni_tio_internal.h | 2 +-
+ drivers/staging/comedi/drivers/plx9052.h | 2 +-
+ drivers/staging/comedi/drivers/plx9080.h | 2 +-
+ drivers/staging/comedi/drivers/s626.h | 2 +-
+ .../staging/comedi/drivers/tests/ni_routes_test.c | 2 +-
+ drivers/staging/emxx_udc/emxx_udc.c | 292 +-
+ drivers/staging/emxx_udc/emxx_udc.h | 2 +-
+ drivers/staging/erofs/Kconfig | 3 +-
+ drivers/staging/erofs/Makefile | 2 +-
+ drivers/staging/erofs/TODO | 15 +-
+ drivers/staging/erofs/data.c | 65 +-
+ drivers/staging/erofs/dir.c | 7 +-
+ drivers/staging/erofs/inode.c | 10 +-
+ drivers/staging/erofs/internal.h | 79 +-
+ drivers/staging/erofs/lz4defs.h | 227 --
+ drivers/staging/erofs/super.c | 19 +-
+ drivers/staging/erofs/unzip_lz4.c | 251 --
+ drivers/staging/erofs/unzip_vle.c | 732 +++--
+ drivers/staging/erofs/unzip_vle.h | 4 +-
+ drivers/staging/erofs/unzip_vle_lz4.c | 25 +-
+ drivers/staging/erofs/utils.c | 134 +-
+ drivers/staging/gasket/gasket_interrupt.c | 17 +-
+ drivers/staging/gasket/gasket_page_table.c | 27 +-
+ drivers/staging/goldfish/goldfish_audio.c | 1 +
+ drivers/staging/greybus/arche-apb-ctrl.c | 1 -
+ drivers/staging/greybus/arche_platform.h | 2 +-
+ drivers/staging/greybus/arpc.h | 2 +-
+ drivers/staging/greybus/audio_apbridgea.h | 2 +-
+ drivers/staging/greybus/audio_codec.h | 2 +-
+ drivers/staging/greybus/audio_manager.h | 2 +-
+ drivers/staging/greybus/audio_manager_module.c | 4 +-
+ drivers/staging/greybus/audio_manager_private.h | 2 +-
+ drivers/staging/greybus/audio_manager_sysfs.c | 22 +-
+ drivers/staging/greybus/audio_module.c | 20 +-
+ drivers/staging/greybus/audio_topology.c | 63 +-
+ drivers/staging/greybus/bootrom.c | 25 +-
+ drivers/staging/greybus/bundle.h | 2 +-
+ drivers/staging/greybus/camera.c | 13 +-
+ drivers/staging/greybus/connection.c | 86 +-
+ drivers/staging/greybus/connection.h | 2 +-
+ drivers/staging/greybus/control.c | 53 +-
+ drivers/staging/greybus/control.h | 4 +-
+ drivers/staging/greybus/core.c | 4 +-
+ drivers/staging/greybus/es2.c | 74 +-
+ drivers/staging/greybus/gpio.c | 39 +-
+ drivers/staging/greybus/greybus_protocols.h | 8 +-
+ drivers/staging/greybus/hid.c | 18 +-
+ drivers/staging/greybus/i2c.c | 21 +-
+ drivers/staging/greybus/loopback.c | 44 +-
+ drivers/staging/greybus/module.c | 19 +-
+ drivers/staging/greybus/operation.c | 135 +-
+ drivers/staging/greybus/svc.c | 93 +-
+ drivers/staging/greybus/uart.c | 4 +-
+ drivers/staging/iio/adc/Kconfig | 1 +
+ drivers/staging/iio/adc/ad7280a.c | 165 +-
+ drivers/staging/iio/adc/ad7606.c | 2 +-
+ drivers/staging/iio/adc/ad7780.c | 72 +-
+ drivers/staging/iio/adc/ad7816.c | 113 +-
+ drivers/staging/iio/addac/adt7316-i2c.c | 6 +
+ drivers/staging/iio/addac/adt7316.c | 462 ++--
+ drivers/staging/iio/addac/adt7316.h | 2 +-
+ drivers/staging/iio/cdc/ad7150.c | 9 +-
+ drivers/staging/iio/impedance-analyzer/ad5933.c | 11 +-
+ drivers/staging/iio/resolver/ad2s1210.c | 140 +-
+ drivers/staging/iio/resolver/ad2s1210.h | 20 -
+ drivers/staging/iio/resolver/ad2s90.c | 53 +-
+ drivers/staging/ks7010/michael_mic.c | 1 -
+ drivers/staging/media/bcm2048/radio-bcm2048.c | 1 +
+ drivers/staging/media/bcm2048/radio-bcm2048.h | 1 +
+ .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 5 +-
+ drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 71 +-
+ drivers/staging/media/davinci_vpfe/dm365_ipipe.h | 5 +-
+ .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 5 +-
+ .../staging/media/davinci_vpfe/dm365_ipipe_hw.h | 5 +-
+ drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 5 +-
+ drivers/staging/media/davinci_vpfe/dm365_ipipeif.h | 5 +-
+ .../media/davinci_vpfe/dm365_ipipeif_user.h | 5 +-
+ drivers/staging/media/davinci_vpfe/dm365_isif.c | 5 +-
+ drivers/staging/media/davinci_vpfe/dm365_isif.h | 5 +-
+ .../staging/media/davinci_vpfe/dm365_isif_regs.h | 5 +-
+ drivers/staging/media/davinci_vpfe/dm365_resizer.c | 5 +-
+ drivers/staging/media/davinci_vpfe/dm365_resizer.h | 5 +-
+ drivers/staging/media/davinci_vpfe/vpfe.h | 5 +-
+ .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 5 +-
+ .../staging/media/davinci_vpfe/vpfe_mc_capture.h | 5 +-
+ drivers/staging/media/davinci_vpfe/vpfe_video.c | 5 +-
+ drivers/staging/media/davinci_vpfe/vpfe_video.h | 5 +-
+ drivers/staging/media/tegra-vde/uapi.h | 4 +-
+ drivers/staging/mt7621-dma/mtk-hsdma.c | 6 +-
+ drivers/staging/mt7621-dts/mt7621.dtsi | 1 -
+ drivers/staging/mt7621-mmc/sd.c | 1 +
+ drivers/staging/mt7621-pci/mediatek,mt7621-pci.txt | 99 +
+ drivers/staging/mt7621-pci/pci-mt7621.c | 930 ++++---
+ drivers/staging/octeon-usb/octeon-hcd.c | 6 +-
+ drivers/staging/octeon/ethernet-mdio.c | 1 -
+ drivers/staging/octeon/ethernet.c | 11 +-
+ drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 90 +-
+ drivers/staging/pi433/pi433_if.c | 18 +-
+ drivers/staging/pi433/pi433_if.h | 10 -
+ drivers/staging/pi433/rf69.c | 10 -
+ drivers/staging/pi433/rf69.h | 10 -
+ drivers/staging/pi433/rf69_enum.h | 10 -
+ drivers/staging/pi433/rf69_registers.h | 10 -
+ drivers/staging/rtl8188eu/core/rtw_ap.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_cmd.c | 28 +-
+ drivers/staging/rtl8188eu/core/rtw_led.c | 20 +-
+ drivers/staging/rtl8188eu/core/rtw_mlme.c | 354 +--
+ drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_recv.c | 20 +-
+ drivers/staging/rtl8188eu/core/rtw_sreset.c | 4 +-
+ drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 2 +-
+ drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 284 +-
+ drivers/staging/rtl8188eu/core/rtw_xmit.c | 13 +-
+ .../staging/rtl8188eu/hal/hal8188e_rate_adaptive.c | 156 +-
+ drivers/staging/rtl8188eu/hal/odm.c | 8 +-
+ drivers/staging/rtl8188eu/hal/odm_hwconfig.c | 37 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 46 +-
+ drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 7 +-
+ drivers/staging/rtl8188eu/include/hal_intf.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 4 +-
+ drivers/staging/rtl8188eu/include/rtw_led.h | 12 +-
+ drivers/staging/rtl8188eu/include/rtw_mlme.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 4 +-
+ drivers/staging/rtl8188eu/include/rtw_recv.h | 2 +-
+ drivers/staging/rtl8188eu/include/rtw_sreset.h | 2 +-
+ drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 36 +-
+ drivers/staging/rtl8188eu/os_dep/os_intfs.c | 10 +-
+ drivers/staging/rtl8188eu/os_dep/recv_linux.c | 10 +-
+ drivers/staging/rtl8188eu/os_dep/rtw_android.c | 8 -
+ drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 171 +-
+ drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 14 +-
+ drivers/staging/rtl8192u/r8192U.h | 4 +-
+ drivers/staging/rtl8192u/r8192U_dm.c | 10 +-
+ drivers/staging/rtl8192u/r819xU_cmdpkt.c | 2 +-
+ drivers/staging/rtl8192u/r819xU_firmware.c | 4 +-
+ drivers/staging/rtl8192u/r819xU_phyreg.h | 2 +-
+ drivers/staging/rtl8712/hal_init.c | 10 +-
+ drivers/staging/rtl8712/rtl8712_hal.h | 8 +-
+ drivers/staging/rtl8712/rtl871x_cmd.h | 2 +-
+ drivers/staging/rtl8723bs/core/rtw_ap.c | 212 --
+ drivers/staging/rtl8723bs/core/rtw_xmit.c | 4 +-
+ drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c | 8 +-
+ drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 10 +-
+ drivers/staging/rtl8723bs/include/rtw_cmd.h | 2 +-
+ drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 4 +-
+ drivers/staging/rtlwifi/base.c | 71 +-
+ drivers/staging/rtlwifi/base.h | 6 +-
+ drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 13 +-
+ drivers/staging/rtlwifi/core.c | 3 +-
+ drivers/staging/rtlwifi/phydm/phydm.c | 2 +-
+ drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 11 +-
+ drivers/staging/rtlwifi/phydm/phydm_ccx.c | 11 +-
+ drivers/staging/rtlwifi/phydm/phydm_debug.c | 35 +-
+ drivers/staging/rtlwifi/phydm/phydm_dig.c | 9 +-
+ .../staging/rtlwifi/phydm/phydm_edcaturbocheck.c | 8 +-
+ drivers/staging/rtlwifi/phydm/phydm_hwconfig.c | 113 +-
+ drivers/staging/rtlwifi/phydm/phydm_hwconfig.h | 12 -
+ drivers/staging/rtlwifi/phydm/phydm_psd.c | 7 +-
+ drivers/staging/rtlwifi/ps.c | 4 +-
+ drivers/staging/rts5208/general.c | 17 +-
+ drivers/staging/rts5208/general.h | 18 +-
+ drivers/staging/rts5208/ms.c | 17 +-
+ drivers/staging/rts5208/ms.h | 18 +-
+ drivers/staging/rts5208/rtsx.c | 17 +-
+ drivers/staging/rts5208/rtsx.h | 18 +-
+ drivers/staging/rts5208/rtsx_card.c | 17 +-
+ drivers/staging/rts5208/rtsx_card.h | 18 +-
+ drivers/staging/rts5208/rtsx_chip.c | 17 +-
+ drivers/staging/rts5208/rtsx_chip.h | 18 +-
+ drivers/staging/rts5208/rtsx_scsi.c | 17 +-
+ drivers/staging/rts5208/rtsx_scsi.h | 18 +-
+ drivers/staging/rts5208/rtsx_sys.h | 18 +-
+ drivers/staging/rts5208/rtsx_transport.c | 14 +-
+ drivers/staging/rts5208/rtsx_transport.h | 18 +-
+ drivers/staging/rts5208/sd.c | 17 +-
+ drivers/staging/rts5208/sd.h | 18 +-
+ drivers/staging/rts5208/spi.c | 17 +-
+ drivers/staging/rts5208/spi.h | 18 +-
+ drivers/staging/rts5208/xd.c | 17 +-
+ drivers/staging/rts5208/xd.h | 20 +-
+ drivers/staging/sm750fb/sm750_accel.c | 3 +-
+ drivers/staging/speakup/i18n.c | 2 +-
+ drivers/staging/speakup/kobjects.c | 2 +-
+ drivers/staging/speakup/speakup_acntpc.c | 3 +-
+ drivers/staging/speakup/speakup_decpc.c | 6 +-
+ drivers/staging/speakup/speakup_keypc.c | 2 +-
+ drivers/staging/speakup/spk_priv.h | 6 +-
+ drivers/staging/vboxvideo/Makefile | 2 -
+ drivers/staging/vboxvideo/hgsmi_base.c | 99 +-
+ drivers/staging/vboxvideo/hgsmi_ch_setup.h | 40 +-
+ drivers/staging/vboxvideo/hgsmi_channels.h | 23 +-
+ drivers/staging/vboxvideo/hgsmi_defs.h | 23 +-
+ drivers/staging/vboxvideo/modesetting.c | 71 +-
+ drivers/staging/vboxvideo/vbox_drv.c | 55 +-
+ drivers/staging/vboxvideo/vbox_drv.h | 40 +-
+ drivers/staging/vboxvideo/vbox_err.h | 50 -
+ drivers/staging/vboxvideo/vbox_fb.c | 33 +-
+ drivers/staging/vboxvideo/vbox_hgsmi.c | 22 +-
+ drivers/staging/vboxvideo/vbox_irq.c | 26 +-
+ drivers/staging/vboxvideo/vbox_main.c | 101 +-
+ drivers/staging/vboxvideo/vbox_mode.c | 56 +-
+ drivers/staging/vboxvideo/vbox_prime.c | 20 +-
+ drivers/staging/vboxvideo/vbox_ttm.c | 27 +-
+ drivers/staging/vboxvideo/vboxvideo.h | 143 +-
+ drivers/staging/vboxvideo/vboxvideo_guest.h | 50 +-
+ drivers/staging/vboxvideo/vboxvideo_vbe.h | 34 +-
+ drivers/staging/vboxvideo/vbva_base.c | 27 +-
+ drivers/staging/vc04_services/bcm2835-audio/TODO | 25 +-
+ .../vc04_services/bcm2835-audio/bcm2835-pcm.c | 30 +-
+ .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 39 +-
+ .../staging/vc04_services/bcm2835-audio/bcm2835.c | 26 +-
+ .../staging/vc04_services/bcm2835-audio/bcm2835.h | 1 +
+ .../bcm2835-audio/vc_vchi_audioserv_defs.h | 6 +-
+ drivers/staging/vc04_services/interface/vchi/TODO | 42 +
+ .../staging/vc04_services/interface/vchi/vchi.h | 8 -
+ .../staging/vc04_services/interface/vchi/vchi_mh.h | 42 -
+ .../interface/vchiq_arm/vchiq_2835_arm.c | 18 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 626 ++---
+ .../vc04_services/interface/vchiq_arm/vchiq_core.c | 523 +---
+ .../vc04_services/interface/vchiq_arm/vchiq_core.h | 47 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_if.h | 13 +-
+ .../interface/vchiq_arm/vchiq_ioctl.h | 4 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 32 -
+ .../vc04_services/interface/vchiq_arm/vchiq_util.c | 48 +-
+ .../vc04_services/interface/vchiq_arm/vchiq_util.h | 6 +-
+ drivers/staging/vt6655/baseband.c | 2 +-
+ drivers/staging/wilc1000/Makefile | 3 +-
+ drivers/staging/wilc1000/coreconfigurator.c | 287 --
+ drivers/staging/wilc1000/coreconfigurator.h | 81 -
+ drivers/staging/wilc1000/host_interface.c | 2842 ++++++--------------
+ drivers/staging/wilc1000/host_interface.h | 242 +-
+ drivers/staging/wilc1000/linux_wlan.c | 92 +-
+ drivers/staging/wilc1000/wilc_sdio.c | 22 +-
+ drivers/staging/wilc1000/wilc_spi.c | 13 +-
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 328 +--
+ drivers/staging/wilc1000/wilc_wfi_netdevice.h | 74 +-
+ drivers/staging/wilc1000/wilc_wlan.c | 115 +-
+ drivers/staging/wilc1000/wilc_wlan_cfg.c | 1 -
+ drivers/staging/wilc1000/wilc_wlan_if.h | 221 +-
+ drivers/staging/wlan-ng/cfg80211.c | 3 +-
+ drivers/staging/wlan-ng/prism2fw.c | 4 +-
+ drivers/staging/wlan-ng/prism2mib.c | 26 +-
+ drivers/staging/xgifb/XGI_main_26.c | 5 +-
+ drivers/staging/xgifb/vb_setmode.c | 7 +-
+ include/linux/iio/adc/ad_sigma_delta.h | 3 +
+ include/linux/iio/common/st_sensors.h | 2 +-
+ include/linux/platform_data/st_sensors_pdata.h | 2 +
+ tools/iio/Makefile | 2 +-
+ 325 files changed, 10187 insertions(+), 9123 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/ad7949.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/adc.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac7311.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/light/vcnl4035.txt
+ create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/pni,rm3100.txt
+ create mode 100644 drivers/iio/adc/ad7124.c
+ create mode 100644 drivers/iio/adc/ad7949.c
+ create mode 100644 drivers/iio/dac/ti-dac7311.c
+ create mode 100644 drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c
+ create mode 100644 drivers/iio/light/vcnl4035.c
+ create mode 100644 drivers/iio/magnetometer/rm3100-core.c
+ create mode 100644 drivers/iio/magnetometer/rm3100-i2c.c
+ create mode 100644 drivers/iio/magnetometer/rm3100-spi.c
+ create mode 100644 drivers/iio/magnetometer/rm3100.h
+ delete mode 100644 drivers/staging/erofs/lz4defs.h
+ delete mode 100644 drivers/staging/erofs/unzip_lz4.c
+ delete mode 100644 drivers/staging/iio/resolver/ad2s1210.h
+ create mode 100644 drivers/staging/mt7621-pci/mediatek,mt7621-pci.txt
+ delete mode 100644 drivers/staging/vboxvideo/vbox_err.h
+ delete mode 100644 drivers/staging/vc04_services/interface/vchi/vchi_mh.h
+ delete mode 100644 drivers/staging/wilc1000/coreconfigurator.c
+ delete mode 100644 drivers/staging/wilc1000/coreconfigurator.h
+Merging mux/for-next (a1ad5ff63944 Merge branch 'i2c-mux/for-next' into for-next)
+$ git merge mux/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+Merging icc/icc-next (f8325633fbae MAINTAINERS: add a maintainer for the interconnect API)
+$ git merge icc/icc-next
+Auto-merging drivers/Makefile
+Auto-merging drivers/Kconfig
+Auto-merging arch/arm64/boot/dts/qcom/sdm845.dtsi
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/interconnect/interconnect.txt | 60 ++
+ .../bindings/interconnect/qcom,sdm845.txt | 24 +
+ Documentation/interconnect/interconnect.rst | 94 +++
+ MAINTAINERS | 10 +
+ arch/arm64/boot/dts/qcom/sdm845.dtsi | 5 +
+ drivers/Kconfig | 2 +
+ drivers/Makefile | 1 +
+ drivers/interconnect/Kconfig | 15 +
+ drivers/interconnect/Makefile | 6 +
+ drivers/interconnect/core.c | 787 +++++++++++++++++++
+ drivers/interconnect/qcom/Kconfig | 13 +
+ drivers/interconnect/qcom/Makefile | 5 +
+ drivers/interconnect/qcom/sdm845.c | 838 +++++++++++++++++++++
+ include/dt-bindings/interconnect/qcom,sdm845.h | 143 ++++
+ include/linux/interconnect-provider.h | 142 ++++
+ include/linux/interconnect.h | 59 ++
+ 16 files changed, 2204 insertions(+)
+ create mode 100644 Documentation/devicetree/bindings/interconnect/interconnect.txt
+ create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm845.txt
+ create mode 100644 Documentation/interconnect/interconnect.rst
+ create mode 100644 drivers/interconnect/Kconfig
+ create mode 100644 drivers/interconnect/Makefile
+ create mode 100644 drivers/interconnect/core.c
+ create mode 100644 drivers/interconnect/qcom/Kconfig
+ create mode 100644 drivers/interconnect/qcom/Makefile
+ create mode 100644 drivers/interconnect/qcom/sdm845.c
+ create mode 100644 include/dt-bindings/interconnect/qcom,sdm845.h
+ create mode 100644 include/linux/interconnect-provider.h
+ create mode 100644 include/linux/interconnect.h
+Merging slave-dma/next (2b4b64840d7f Merge branch 'topic/fsl' into next)
+$ git merge slave-dma/next
+Removing include/linux/sa11x0-dma.h
+Removing drivers/dma/sh/shdma-r8a73a4.c
+Auto-merging drivers/dma/imx-sdma.c
+Auto-merging drivers/dma/dw/core.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/dma/fsl-qdma.txt | 57 +
+ .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 3 +-
+ .../devicetree/bindings/dma/renesas,usb-dmac.txt | 2 +
+ Documentation/devicetree/bindings/dma/snps-dma.txt | 4 +
+ .../devicetree/bindings/dma/uniphier-mio-dmac.txt | 25 +
+ MAINTAINERS | 5 +-
+ drivers/dma/Kconfig | 25 +
+ drivers/dma/Makefile | 2 +
+ drivers/dma/bcm2835-dma.c | 13 +-
+ drivers/dma/coh901318.c | 5 -
+ drivers/dma/dmatest.c | 40 +-
+ drivers/dma/dw/core.c | 2 +
+ drivers/dma/dw/platform.c | 6 +
+ drivers/dma/dw/regs.h | 4 +
+ drivers/dma/ep93xx_dma.c | 6 +-
+ drivers/dma/fsl-qdma.c | 1258 ++++++++++++++++++++
+ drivers/dma/fsldma.c | 16 +-
+ drivers/dma/fsldma.h | 61 +-
+ drivers/dma/imx-sdma.c | 60 +-
+ drivers/dma/mediatek/Kconfig | 13 +
+ drivers/dma/mediatek/Makefile | 1 +
+ drivers/dma/mediatek/mtk-cqdma.c | 951 +++++++++++++++
+ drivers/dma/mmp_pdma.c | 28 +-
+ drivers/dma/pl330.c | 28 +-
+ drivers/dma/sa11x0-dma.c | 21 +-
+ drivers/dma/sh/Kconfig | 12 +-
+ drivers/dma/sh/Makefile | 1 -
+ drivers/dma/sh/shdma-r8a73a4.c | 74 --
+ drivers/dma/sh/shdma.h | 7 -
+ drivers/dma/sh/shdmac.c | 7 -
+ drivers/dma/sprd-dma.c | 152 ++-
+ drivers/dma/ste_dma40.c | 31 +-
+ drivers/dma/uniphier-mdmac.c | 506 ++++++++
+ drivers/dma/xilinx/xilinx_dma.c | 44 +-
+ drivers/dma/xilinx/zynqmp_dma.c | 39 +-
+ include/dt-bindings/dma/dw-dmac.h | 14 +
+ include/linux/dma/sprd-dma.h | 62 +-
+ include/linux/platform_data/dma-dw.h | 6 +
+ include/linux/sa11x0-dma.h | 24 -
+ include/linux/shdma-base.h | 7 +-
+ 40 files changed, 3321 insertions(+), 301 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/dma/fsl-qdma.txt
+ create mode 100644 Documentation/devicetree/bindings/dma/uniphier-mio-dmac.txt
+ create mode 100644 drivers/dma/fsl-qdma.c
+ create mode 100644 drivers/dma/mediatek/mtk-cqdma.c
+ delete mode 100644 drivers/dma/sh/shdma-r8a73a4.c
+ create mode 100644 drivers/dma/uniphier-mdmac.c
+ create mode 100644 include/dt-bindings/dma/dw-dmac.h
+ delete mode 100644 include/linux/sa11x0-dma.h
+Merging cgroup/for-next (87f902fab430 Merge branch 'for-4.21' into for-next)
+$ git merge cgroup/for-next
+Auto-merging kernel/cgroup/cpuset.c
+Auto-merging kernel/cgroup/cgroup.c
+Auto-merging kernel/cgroup/cgroup-internal.h
+Auto-merging Documentation/admin-guide/cgroup-v2.rst
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/cgroup-v2.rst | 182 +++++-
+ include/linux/cgroup-defs.h | 1 +
+ kernel/cgroup/cgroup-internal.h | 2 +
+ kernel/cgroup/cgroup.c | 58 +-
+ kernel/cgroup/cpuset.c | 944 +++++++++++++++++++++++++++++---
+ kernel/cgroup/debug.c | 4 +-
+ 6 files changed, 1095 insertions(+), 96 deletions(-)
+Merging scsi/for-next (95150405e108 Merge branch 'misc' into for-next)
+$ git merge scsi/for-next
+Auto-merging drivers/scsi/qedi/qedi_main.c
+Auto-merging drivers/scsi/libsas/sas_scsi_host.c
+Removing drivers/scsi/libsas/sas_dump.h
+Removing drivers/scsi/libsas/sas_dump.c
+Auto-merging drivers/scsi/libsas/sas_ata.c
+Auto-merging drivers/scsi/bnx2i/bnx2i_hwi.c
+Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/ufs/cdns,ufshc.txt | 31 ++
+ .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 6 +
+ drivers/infiniband/ulp/srpt/ib_srpt.c | 8 +-
+ drivers/s390/scsi/zfcp_aux.c | 65 +--
+ drivers/s390/scsi/zfcp_dbf.c | 25 +-
+ drivers/s390/scsi/zfcp_dbf.h | 14 +-
+ drivers/s390/scsi/zfcp_def.h | 113 +++--
+ drivers/s390/scsi/zfcp_erp.c | 345 ++++++++------
+ drivers/s390/scsi/zfcp_ext.h | 8 +-
+ drivers/s390/scsi/zfcp_fc.c | 48 +-
+ drivers/s390/scsi/zfcp_fc.h | 21 +-
+ drivers/s390/scsi/zfcp_fsf.c | 51 ++-
+ drivers/s390/scsi/zfcp_fsf.h | 4 +-
+ drivers/s390/scsi/zfcp_qdio.c | 11 +-
+ drivers/s390/scsi/zfcp_qdio.h | 9 +-
+ drivers/s390/scsi/zfcp_reqlist.h | 2 +-
+ drivers/s390/scsi/zfcp_scsi.c | 4 +-
+ drivers/scsi/aacraid/aachba.c | 5 +-
+ drivers/scsi/aacraid/linit.c | 1 +
+ drivers/scsi/aha1542.c | 126 +++--
+ drivers/scsi/aic94xx/aic94xx_hwi.c | 3 +-
+ drivers/scsi/arcmsr/arcmsr_hba.c | 8 +-
+ drivers/scsi/bfa/bfad.c | 18 +-
+ drivers/scsi/bnx2i/bnx2i_hwi.c | 2 -
+ drivers/scsi/cxgbi/cxgb4i/Kconfig | 4 +-
+ drivers/scsi/dpt_i2o.c | 12 +-
+ drivers/scsi/esas2r/esas2r_init.c | 49 +-
+ drivers/scsi/hisi_sas/hisi_sas.h | 3 +-
+ drivers/scsi/hisi_sas/hisi_sas_main.c | 50 +-
+ drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 7 +-
+ drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 7 +-
+ drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 151 +++++-
+ drivers/scsi/hpsa.c | 5 +
+ drivers/scsi/hptiop.c | 10 +-
+ drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 8 +-
+ drivers/scsi/initio.c | 2 +-
+ drivers/scsi/ips.c | 8 +-
+ drivers/scsi/ips.h | 9 -
+ drivers/scsi/isci/init.c | 19 +-
+ drivers/scsi/libfc/fc_rport.c | 3 +-
+ drivers/scsi/libsas/Makefile | 3 +-
+ drivers/scsi/libsas/sas_ata.c | 26 +-
+ drivers/scsi/libsas/sas_discover.c | 33 +-
+ drivers/scsi/libsas/sas_dump.c | 63 ---
+ drivers/scsi/libsas/sas_dump.h | 29 --
+ drivers/scsi/libsas/sas_event.c | 1 -
+ drivers/scsi/libsas/sas_expander.c | 236 +++++-----
+ drivers/scsi/libsas/sas_init.c | 10 +-
+ drivers/scsi/libsas/sas_internal.h | 16 +-
+ drivers/scsi/libsas/sas_phy.c | 8 +-
+ drivers/scsi/libsas/sas_port.c | 23 +-
+ drivers/scsi/libsas/sas_scsi_host.c | 123 +++--
+ drivers/scsi/libsas/sas_task.c | 10 +-
+ drivers/scsi/lpfc/lpfc.h | 15 +
+ drivers/scsi/lpfc/lpfc_attr.c | 115 +++++
+ drivers/scsi/lpfc/lpfc_bsg.c | 138 ++++--
+ drivers/scsi/lpfc/lpfc_bsg.h | 38 ++
+ drivers/scsi/lpfc/lpfc_crtn.h | 2 +
+ drivers/scsi/lpfc/lpfc_ct.c | 211 +++++++++
+ drivers/scsi/lpfc/lpfc_els.c | 242 ++++++++--
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 59 +++
+ drivers/scsi/lpfc/lpfc_hw.h | 1 +
+ drivers/scsi/lpfc/lpfc_hw4.h | 68 +++
+ drivers/scsi/lpfc/lpfc_init.c | 247 ++++++++--
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 23 +-
+ drivers/scsi/lpfc/lpfc_scsi.h | 4 +
+ drivers/scsi/lpfc/lpfc_sli.c | 25 +-
+ drivers/scsi/lpfc/lpfc_sli4.h | 14 +
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/megaraid/megaraid_sas.h | 69 ++-
+ drivers/scsi/megaraid/megaraid_sas_base.c | 314 ++++++++++---
+ drivers/scsi/megaraid/megaraid_sas_fp.c | 14 +-
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 386 ++++++++++------
+ drivers/scsi/megaraid/megaraid_sas_fusion.h | 26 +-
+ drivers/scsi/mpt3sas/mpi/mpi2.h | 17 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 94 ++--
+ drivers/scsi/mpt3sas/mpi/mpi2_image.h | 506 +++++++++++++++++++++
+ drivers/scsi/mpt3sas/mpi/mpi2_init.h | 2 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 359 +--------------
+ drivers/scsi/mpt3sas/mpi/mpi2_pci.h | 11 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_raid.h | 2 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_sas.h | 2 +-
+ drivers/scsi/mpt3sas/mpi/mpi2_tool.h | 72 ++-
+ drivers/scsi/mpt3sas/mpt3sas_base.c | 73 +--
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 9 +-
+ drivers/scsi/mpt3sas/mpt3sas_config.c | 29 +-
+ drivers/scsi/mpt3sas/mpt3sas_ctl.c | 21 +-
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 65 ++-
+ drivers/scsi/mpt3sas/mpt3sas_transport.c | 91 +---
+ drivers/scsi/mvumi.c | 2 +-
+ drivers/scsi/pmcraid.c | 116 ++---
+ drivers/scsi/qedi/qedi.h | 7 +-
+ drivers/scsi/qedi/qedi_main.c | 87 +++-
+ drivers/scsi/qedi/qedi_version.h | 4 +-
+ drivers/scsi/qla1280.c | 52 +--
+ drivers/scsi/qla2xxx/qla_target.c | 22 +-
+ drivers/scsi/qla2xxx/qla_target.h | 8 -
+ drivers/scsi/qla2xxx/tcm_qla2xxx.c | 16 +-
+ drivers/scsi/qla4xxx/ql4_os.c | 10 +-
+ drivers/scsi/stex.c | 17 +-
+ drivers/scsi/sym53c8xx_2/sym_glue.c | 4 +-
+ drivers/scsi/ufs/Kconfig | 8 +
+ drivers/scsi/ufs/Makefile | 1 +
+ drivers/scsi/ufs/cdns-pltfrm.c | 149 ++++++
+ drivers/scsi/ufs/ufs.h | 14 +
+ drivers/scsi/ufs/ufshcd.c | 86 ++++
+ drivers/scsi/ufs/ufshcd.h | 2 +
+ drivers/scsi/wd719x.c | 135 +++---
+ drivers/scsi/wd719x.h | 1 -
+ drivers/scsi/xen-scsifront.c | 2 +-
+ drivers/target/iscsi/iscsi_target_configfs.c | 9 +-
+ drivers/target/loopback/tcm_loop.c | 8 +-
+ drivers/target/sbp/sbp_target.c | 8 +-
+ drivers/target/target_core_alua.c | 6 +-
+ drivers/target/target_core_configfs.c | 71 +--
+ drivers/target/target_core_device.c | 39 +-
+ drivers/target/target_core_fabric_configfs.c | 2 +-
+ drivers/target/target_core_pr.c | 90 ++--
+ drivers/target/target_core_spc.c | 8 +
+ drivers/target/target_core_stat.c | 4 +-
+ drivers/target/target_core_tmr.c | 4 +-
+ drivers/target/target_core_tpg.c | 22 +-
+ drivers/target/target_core_transport.c | 10 +-
+ drivers/target/target_core_ua.c | 4 +-
+ drivers/target/target_core_xcopy.c | 7 +-
+ drivers/target/tcm_fc/tfc_conf.c | 8 +-
+ drivers/usb/gadget/function/f_tcm.c | 8 +-
+ drivers/vhost/scsi.c | 8 +-
+ drivers/xen/xen-scsiback.c | 8 +-
+ include/target/target_core_base.h | 4 +-
+ include/target/target_core_fabric.h | 14 +-
+ 131 files changed, 4104 insertions(+), 2203 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/ufs/cdns,ufshc.txt
+ delete mode 100644 drivers/scsi/libsas/sas_dump.c
+ delete mode 100644 drivers/scsi/libsas/sas_dump.h
+ create mode 100644 drivers/scsi/mpt3sas/mpi/mpi2_image.h
+ create mode 100644 drivers/scsi/ufs/cdns-pltfrm.c
+Merging scsi-mkp/for-next (de55b786b8a6 scsi: lpfc: update driver version to 12.0.0.9)
+$ git merge scsi-mkp/for-next
+Auto-merging drivers/target/target_core_transport.c
+Auto-merging drivers/target/target_core_pscsi.c
+Auto-merging drivers/scsi/ufs/ufshcd.c
+Auto-merging drivers/scsi/qla2xxx/qla_os.c
+CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c
+Auto-merging drivers/scsi/lpfc/lpfc_sli.c
+Auto-merging drivers/scsi/lpfc/lpfc_scsi.c
+Auto-merging drivers/scsi/lpfc/lpfc_init.c
+Auto-merging drivers/scsi/lpfc/lpfc_debugfs.c
+Recorded preimage for 'drivers/scsi/qla2xxx/qla_os.c'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/scsi/qla2xxx/qla_os.c'.
+[master 1488ffc5e9d3] Merge remote-tracking branch 'scsi-mkp/for-next'
+$ git diff -M --stat --summary HEAD^..
+ drivers/s390/scsi/zfcp_aux.c | 17 +-
+ drivers/s390/scsi/zfcp_ext.h | 1 +
+ drivers/s390/scsi/zfcp_scsi.c | 10 +-
+ drivers/scsi/BusLogic.c | 1 +
+ drivers/scsi/aha1542.c | 2 +-
+ drivers/scsi/csiostor/csio_init.c | 1 -
+ drivers/scsi/fnic/fnic_trace.c | 3 +-
+ drivers/scsi/lpfc/lpfc.h | 14 +-
+ drivers/scsi/lpfc/lpfc_attr.c | 27 +-
+ drivers/scsi/lpfc/lpfc_bsg.c | 56 ++--
+ drivers/scsi/lpfc/lpfc_crtn.h | 2 +-
+ drivers/scsi/lpfc/lpfc_ct.c | 2 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 2 +
+ drivers/scsi/lpfc/lpfc_disc.h | 4 +-
+ drivers/scsi/lpfc/lpfc_els.c | 246 ++++++++++++----
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 145 +++++++---
+ drivers/scsi/lpfc/lpfc_hw.h | 1 +
+ drivers/scsi/lpfc/lpfc_init.c | 30 +-
+ drivers/scsi/lpfc/lpfc_mbox.c | 44 +--
+ drivers/scsi/lpfc/lpfc_mem.c | 6 +-
+ drivers/scsi/lpfc/lpfc_nportdisc.c | 62 ++--
+ drivers/scsi/lpfc/lpfc_nvme.c | 2 -
+ drivers/scsi/lpfc/lpfc_scsi.c | 20 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 186 ++++++++----
+ drivers/scsi/lpfc/lpfc_sli.h | 6 +-
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/lpfc/lpfc_vport.c | 4 +-
+ drivers/scsi/megaraid/megaraid_mbox.c | 9 +-
+ drivers/scsi/megaraid/megaraid_mm.c | 3 +-
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 12 +-
+ drivers/scsi/qedf/qedf_main.c | 3 +-
+ drivers/scsi/qla2xxx/qla_os.c | 112 ++++----
+ drivers/scsi/snic/snic_trc.c | 3 +-
+ drivers/scsi/sun_esp.c | 7 +-
+ drivers/scsi/ufs/ufs.h | 4 +-
+ drivers/scsi/ufs/ufshcd.c | 17 +-
+ drivers/target/iscsi/iscsi_target.c | 11 +-
+ drivers/target/iscsi/iscsi_target_configfs.c | 2 +
+ drivers/target/iscsi/iscsi_target_erl1.c | 28 +-
+ drivers/target/target_core_configfs.c | 86 +++++-
+ drivers/target/target_core_device.c | 72 +----
+ drivers/target/target_core_internal.h | 2 -
+ drivers/target/target_core_pscsi.c | 50 ++--
+ drivers/target/target_core_spc.c | 20 +-
+ drivers/target/target_core_stat.c | 32 +--
+ drivers/target/target_core_tmr.c | 52 ++--
+ drivers/target/target_core_tpg.c | 1 -
+ drivers/target/target_core_transport.c | 406 +++++++++++----------------
+ drivers/target/target_core_user.c | 2 +-
+ drivers/target/target_core_xcopy.c | 6 +-
+ include/target/target_core_base.h | 21 +-
+ include/target/target_core_fabric.h | 11 +-
+ 52 files changed, 1059 insertions(+), 809 deletions(-)
+Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker)
+$ git merge target-updates/for-next
+Already up to date.
+Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1)
+$ git merge target-bva/for-next
+Already up to date.
+Merging vhost/linux-next (37d1246af2d5 virtio_net: bulk free tx skbs)
+$ git merge vhost/linux-next
+Auto-merging drivers/net/virtio_net.c
+Auto-merging drivers/block/virtio_blk.c
+Merge made by the 'recursive' strategy.
+ drivers/block/virtio_blk.c | 95 ++++++++++++++++++++++++++++++++++++++++-
+ drivers/net/virtio_net.c | 29 +++++++++----
+ include/uapi/linux/virtio_blk.h | 54 +++++++++++++++++++++++
+ 3 files changed, 167 insertions(+), 11 deletions(-)
+Merging rpmsg/for-next (9099a252d44c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Merge made by the 'recursive' strategy.
+ drivers/remoteproc/remoteproc_debugfs.c | 26 ++++++++++++++++++++++++++
+ include/linux/remoteproc.h | 4 ++--
+ 2 files changed, 28 insertions(+), 2 deletions(-)
+Merging gpio/for-next (9555fbf0b887 Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Auto-merging drivers/gpio/Kconfig
+Auto-merging MAINTAINERS
+Auto-merging Documentation/driver-model/devres.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/gpio-vf610.txt | 6 +
+ .../devicetree/bindings/gpio/nxp,lpc1850-gpio.txt | 38 ++-
+ .../devicetree/bindings/gpio/snps-dwapb-gpio.txt | 4 +-
+ Documentation/driver-model/devres.txt | 1 -
+ MAINTAINERS | 1 -
+ drivers/gpio/Kconfig | 1 +
+ drivers/gpio/TODO | 109 ++++++++
+ drivers/gpio/gpio-104-dio-48e.c | 2 +-
+ drivers/gpio/gpio-104-idi-48.c | 2 +-
+ drivers/gpio/gpio-dwapb.c | 6 +-
+ drivers/gpio/gpio-gpio-mm.c | 2 +-
+ drivers/gpio/gpio-grgpio.c | 1 -
+ drivers/gpio/gpio-ks8695.c | 15 +-
+ drivers/gpio/gpio-lpc18xx.c | 288 +++++++++++++++++++--
+ drivers/gpio/gpio-lynxpoint.c | 3 +-
+ drivers/gpio/gpio-mt7621.c | 10 +-
+ drivers/gpio/gpio-mxc.c | 41 +--
+ drivers/gpio/gpio-omap.c | 12 +-
+ drivers/gpio/gpio-pci-idio-16.c | 2 +-
+ drivers/gpio/gpio-pcie-idio-24.c | 2 +-
+ drivers/gpio/gpio-pl061.c | 21 +-
+ drivers/gpio/gpio-rcar.c | 34 +--
+ drivers/gpio/gpio-sch311x.c | 2 +-
+ drivers/gpio/gpio-tegra.c | 6 +-
+ drivers/gpio/gpio-uniphier.c | 17 +-
+ drivers/gpio/gpio-vf610.c | 44 ++++
+ drivers/gpio/gpio-ws16c48.c | 2 +-
+ drivers/gpio/gpio-zynq.c | 29 ++-
+ drivers/gpio/gpiolib-acpi.c | 149 ++++++-----
+ drivers/gpio/gpiolib-of.c | 41 ++-
+ drivers/gpio/gpiolib.c | 55 ++--
+ include/dt-bindings/gpio/tegra186-gpio.h | 41 +++
+ include/linux/gpio/consumer.h | 6 +-
+ include/linux/gpio/driver.h | 6 -
+ 34 files changed, 755 insertions(+), 244 deletions(-)
+ create mode 100644 drivers/gpio/TODO
+$ git reset --hard HEAD^
+HEAD is now at 51cf33b1a412 Merge remote-tracking branch 'rpmsg/for-next'
+Merging next-20181207 version of gpio
+$ git merge -m next-20181207/gpio 0f3e68c2be67b89da12faa2bfe3efe212e0aa224
+Auto-merging Documentation/driver-model/devres.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/gpio/gpio-vf610.txt | 6 ++
+ .../devicetree/bindings/gpio/snps-dwapb-gpio.txt | 4 +-
+ Documentation/driver-model/devres.txt | 1 -
+ drivers/gpio/TODO | 109 +++++++++++++++++++++
+ drivers/gpio/gpio-104-dio-48e.c | 2 +-
+ drivers/gpio/gpio-104-idi-48.c | 2 +-
+ drivers/gpio/gpio-dwapb.c | 6 +-
+ drivers/gpio/gpio-gpio-mm.c | 2 +-
+ drivers/gpio/gpio-grgpio.c | 1 -
+ drivers/gpio/gpio-lynxpoint.c | 3 +-
+ drivers/gpio/gpio-mxc.c | 41 ++++----
+ drivers/gpio/gpio-omap.c | 12 +--
+ drivers/gpio/gpio-pci-idio-16.c | 2 +-
+ drivers/gpio/gpio-pcie-idio-24.c | 2 +-
+ drivers/gpio/gpio-pl061.c | 21 ++--
+ drivers/gpio/gpio-rcar.c | 10 +-
+ drivers/gpio/gpio-sch311x.c | 2 +-
+ drivers/gpio/gpio-tegra.c | 6 +-
+ drivers/gpio/gpio-vf610.c | 44 +++++++++
+ drivers/gpio/gpio-ws16c48.c | 2 +-
+ drivers/gpio/gpio-zynq.c | 6 +-
+ drivers/gpio/gpiolib-of.c | 2 +-
+ drivers/gpio/gpiolib.c | 55 ++++-------
+ include/linux/gpio/consumer.h | 6 +-
+ include/linux/gpio/driver.h | 6 --
+ 25 files changed, 240 insertions(+), 113 deletions(-)
+ create mode 100644 drivers/gpio/TODO
+Merging pinctrl/for-next (7d70d9e39bd0 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/actions,s700-pinctrl.txt | 170 ++
+ .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 +
+ .../bindings/pinctrl/fsl,imx7ulp-pinctrl.txt | 66 +-
+ .../devicetree/bindings/pinctrl/pinctrl-mt6797.txt | 83 +
+ .../devicetree/bindings/pinctrl/pinctrl-mt7622.txt | 131 ++
+ .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 2 +-
+ .../bindings/pinctrl/renesas,rza2-pinctrl.txt | 87 +
+ .../bindings/pinctrl/st,stm32-pinctrl.txt | 1 +
+ MAINTAINERS | 2 +-
+ drivers/pinctrl/Kconfig | 11 +
+ drivers/pinctrl/Makefile | 1 +
+ drivers/pinctrl/actions/Kconfig | 6 +
+ drivers/pinctrl/actions/Makefile | 1 +
+ drivers/pinctrl/actions/pinctrl-owl.c | 71 +-
+ drivers/pinctrl/actions/pinctrl-owl.h | 142 +-
+ drivers/pinctrl/actions/pinctrl-s700.c | 1912 +++++++++++++++
+ drivers/pinctrl/actions/pinctrl-s900.c | 205 +-
+ drivers/pinctrl/bcm/pinctrl-bcm2835.c | 33 +-
+ drivers/pinctrl/freescale/Kconfig | 11 +
+ drivers/pinctrl/freescale/Makefile | 2 +
+ drivers/pinctrl/freescale/pinctrl-imx.c | 434 ++--
+ drivers/pinctrl/freescale/pinctrl-imx.h | 67 +-
+ drivers/pinctrl/freescale/pinctrl-imx7ulp.c | 42 -
+ drivers/pinctrl/freescale/pinctrl-imx8qxp.c | 232 ++
+ drivers/pinctrl/freescale/pinctrl-scu.c | 121 +
+ drivers/pinctrl/mediatek/Kconfig | 15 +-
+ drivers/pinctrl/mediatek/Makefile | 2 +
+ drivers/pinctrl/mediatek/pinctrl-moore.c | 4 +-
+ drivers/pinctrl/mediatek/pinctrl-mt6797.c | 82 +
+ drivers/pinctrl/mediatek/pinctrl-mt7629.c | 450 ++++
+ drivers/pinctrl/mediatek/pinctrl-mtk-mt6797.h | 2429 ++++++++++++++++++++
+ drivers/pinctrl/mediatek/pinctrl-paris.c | 8 +-
+ drivers/pinctrl/meson/pinctrl-meson-gxl.c | 12 +-
+ drivers/pinctrl/meson/pinctrl-meson.c | 3 +-
+ drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 16 +-
+ drivers/pinctrl/pinconf.c | 29 +-
+ drivers/pinctrl/pinctrl-amd.c | 6 +-
+ drivers/pinctrl/pinctrl-at91-pio4.c | 6 +-
+ drivers/pinctrl/pinctrl-lpc18xx.c | 10 +-
+ drivers/pinctrl/pinctrl-max77620.c | 14 +-
+ drivers/pinctrl/pinctrl-rockchip.c | 52 +-
+ drivers/pinctrl/pinctrl-rza2.c | 519 +++++
+ drivers/pinctrl/pinctrl-rzn1.c | 4 +-
+ drivers/pinctrl/pinctrl-sx150x.c | 11 +-
+ drivers/pinctrl/pinctrl-zynq.c | 9 +-
+ drivers/pinctrl/pinmux.c | 29 +-
+ drivers/pinctrl/qcom/pinctrl-msm.c | 19 +
+ drivers/pinctrl/qcom/pinctrl-msm.h | 2 +
+ drivers/pinctrl/qcom/pinctrl-sdm660.c | 28 +-
+ drivers/pinctrl/qcom/pinctrl-sdm845.c | 1 +
+ drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 22 +-
+ drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 23 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a77470.c | 678 +++++-
+ drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 22 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 4 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 97 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 119 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 122 +-
+ drivers/pinctrl/sh-pfc/pfc-r8a77965.c | 370 +++
+ drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 70 +
+ drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 70 +
+ drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 1934 ++++++++++++++--
+ drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 6 -
+ drivers/pinctrl/sh-pfc/sh_pfc.h | 54 +-
+ drivers/pinctrl/sprd/pinctrl-sprd.c | 6 +-
+ drivers/pinctrl/stm32/pinctrl-stm32.c | 71 +-
+ drivers/pinctrl/sunxi/Kconfig | 4 +
+ drivers/pinctrl/sunxi/Makefile | 1 +
+ drivers/pinctrl/sunxi/pinctrl-sun50i-a64.c | 52 +-
+ drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c | 2 +-
+ drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c | 416 ++++
+ drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 18 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 18 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 18 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 18 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 18 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 18 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 18 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 18 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-pxs3.c | 18 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 18 +-
+ drivers/pinctrl/uniphier/pinctrl-uniphier.h | 11 +-
+ include/dt-bindings/pinctrl/bcm2835.h | 8 +-
+ include/dt-bindings/pinctrl/mt6797-pinfunc.h | 1368 +++++++++++
+ include/dt-bindings/pinctrl/pads-imx8qxp.h | 751 ++++++
+ include/dt-bindings/pinctrl/r7s9210-pinctrl.h | 47 +
+ 86 files changed, 12930 insertions(+), 1172 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/actions,s700-pinctrl.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt6797.txt
+ create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rza2-pinctrl.txt
+ create mode 100644 drivers/pinctrl/actions/pinctrl-s700.c
+ create mode 100644 drivers/pinctrl/freescale/pinctrl-imx8qxp.c
+ create mode 100644 drivers/pinctrl/freescale/pinctrl-scu.c
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt6797.c
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7629.c
+ create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt6797.h
+ create mode 100644 drivers/pinctrl/pinctrl-rza2.c
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-suniv-f1c100s.c
+ create mode 100644 include/dt-bindings/pinctrl/mt6797-pinfunc.h
+ create mode 100644 include/dt-bindings/pinctrl/pads-imx8qxp.h
+ create mode 100644 include/dt-bindings/pinctrl/r7s9210-pinctrl.h
+Merging pinctrl-samsung/for-next (651022382c7f Linux 4.20-rc1)
+$ git merge pinctrl-samsung/for-next
+Already up to date.
+Merging pwm/for-next (f82d15e22340 pwm: lpc18xx-sct: Don't reconfigure PWM in .request and .free)
+$ git merge pwm/for-next
+Merge made by the 'recursive' strategy.
+ drivers/pwm/pwm-lpc18xx-sct.c | 3 ---
+ 1 file changed, 3 deletions(-)
+Merging userns/for-next (1e9c75fb9c47 mnt: fix __detach_mounts infinite loop)
+$ git merge userns/for-next
+Already up to date.
+Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus)
+$ git merge ktest/for-next
+Already up to date.
+Merging random/dev (05cbbb6f9ed5 drivers/char/random.c: make primary_crng static)
+$ git merge random/dev
+Auto-merging drivers/char/random.c
+Merge made by the 'recursive' strategy.
+ drivers/char/random.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+Merging kselftest/next (1d956785da55 selftests/ftrace: Fix invalid SPDX identifiers)
+$ git merge kselftest/next
+Auto-merging tools/testing/selftests/Makefile
+Merge made by the 'recursive' strategy.
+ tools/testing/selftests/Makefile | 1 +
+ tools/testing/selftests/firmware/config | 1 +
+ tools/testing/selftests/firmware/fw_filesystem.sh | 9 +-
+ .../ftrace/test.d/ftrace/func-filter-stacktrace.tc | 2 +-
+ .../selftests/ftrace/test.d/ftrace/func_cpumask.tc | 2 +-
+ tools/testing/selftests/ftrace/test.d/template | 2 +-
+ .../selftests/ftrace/test.d/tracer/wakeup.tc | 2 +-
+ .../selftests/ftrace/test.d/tracer/wakeup_rt.tc | 2 +-
+ tools/testing/selftests/gpio/Makefile | 10 +-
+ tools/testing/selftests/ir/.gitignore | 1 +
+ tools/testing/selftests/ir/Makefile | 5 +
+ tools/testing/selftests/ir/ir_loopback.c | 199 +++++++++++++++++++++
+ tools/testing/selftests/ir/ir_loopback.sh | 20 +++
+ 13 files changed, 243 insertions(+), 13 deletions(-)
+ create mode 100644 tools/testing/selftests/ir/.gitignore
+ create mode 100644 tools/testing/selftests/ir/Makefile
+ create mode 100644 tools/testing/selftests/ir/ir_loopback.c
+ create mode 100755 tools/testing/selftests/ir/ir_loopback.sh
+Merging y2038/y2038 (ccea641b6742 timekeeping: remove obsolete time accessors)
+$ git merge y2038/y2038
+Auto-merging net/socket.c
+Auto-merging kernel/time/timekeeping.c
+Auto-merging kernel/time/time.c
+Removing kernel/futex_compat.c
+Auto-merging kernel/Makefile
+Auto-merging include/linux/syscalls.h
+Auto-merging fs/inode.c
+Auto-merging fs/aio.c
+Merge made by the 'recursive' strategy.
+ Documentation/sh/new-machine.txt | 8 -
+ arch/sh/boards/mach-dreamcast/Makefile | 4 +-
+ arch/sh/boards/mach-dreamcast/rtc.c | 45 +++-
+ arch/sh/boards/mach-dreamcast/setup.c | 1 -
+ arch/sh/boards/mach-sh03/Makefile | 3 +-
+ arch/sh/boards/mach-sh03/rtc.c | 51 ++--
+ arch/sh/boards/mach-sh03/setup.c | 9 -
+ arch/sh/boards/of-generic.c | 8 -
+ arch/sh/configs/dreamcast_defconfig | 2 +
+ arch/sh/configs/sh03_defconfig | 2 +
+ arch/sh/include/asm/rtc.h | 3 -
+ arch/sh/include/mach-dreamcast/mach/sysasic.h | 1 -
+ arch/sh/kernel/time.c | 74 +-----
+ fs/aio.c | 134 +++++++---
+ fs/eventpoll.c | 52 +---
+ fs/inode.c | 4 +-
+ fs/select.c | 360 +++++++++++++++-----------
+ include/linux/compat.h | 26 ++
+ include/linux/futex.h | 8 -
+ include/linux/signal.h | 4 +
+ include/linux/socket.h | 9 +-
+ include/linux/syscalls.h | 29 ++-
+ include/linux/time32.h | 25 --
+ include/linux/timekeeping.h | 14 -
+ include/linux/timekeeping32.h | 15 --
+ kernel/Makefile | 3 -
+ kernel/futex.c | 207 ++++++++++++++-
+ kernel/futex_compat.c | 202 ---------------
+ kernel/signal.c | 143 ++++++++++
+ kernel/sys_ni.c | 2 +
+ kernel/time/ntp.c | 10 +-
+ kernel/time/time.c | 36 ---
+ kernel/time/timekeeping.c | 12 +-
+ net/compat.c | 34 +--
+ net/socket.c | 62 +++--
+ 35 files changed, 847 insertions(+), 755 deletions(-)
+ delete mode 100644 kernel/futex_compat.c
+Merging livepatching/for-next (c72a7f515329 Merge branch 'for-4.18/upstream' into for-next)
+$ git merge livepatching/for-next
+Already up to date!
+Merge made by the 'recursive' strategy.
+Merging coresight/next (7ff8957175d6 coresight: Use of_node_name_eq for node name comparisons)
+$ git merge coresight/next
+Merge made by the 'recursive' strategy.
+ drivers/hwtracing/coresight/coresight-cpu-debug.c | 4 ++++
+ drivers/hwtracing/coresight/coresight-stm.c | 12 ++++--------
+ drivers/hwtracing/coresight/of_coresight.c | 4 ++--
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+Merging rtc/rtc-next (8c4cf161a8b4 dt-bindings: rtc: sun6i-rtc: Fix register range in example)
+$ git merge rtc/rtc-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/rtc/abracon,abx80x.txt | 2 +-
+ .../devicetree/bindings/rtc/sun6i-rtc.txt | 33 ++++--
+ drivers/rtc/class.c | 26 -----
+ drivers/rtc/nvmem.c | 29 ++---
+ drivers/rtc/rtc-ep93xx.c | 2 +-
+ drivers/rtc/rtc-isl1208.c | 37 +------
+ drivers/rtc/rtc-m41t80.c | 15 ++-
+ drivers/rtc/rtc-max6916.c | 2 +-
+ drivers/rtc/rtc-max77686.c | 2 +-
+ drivers/rtc/rtc-max8997.c | 2 +-
+ drivers/rtc/rtc-omap.c | 4 +-
+ drivers/rtc/rtc-rk808.c | 2 +-
+ drivers/rtc/rtc-s3c.c | 6 -
+ drivers/rtc/rtc-sh.c | 7 +-
+ drivers/rtc/rtc-sun6i.c | 121 +++++++++++++++++++--
+ include/linux/rtc.h | 3 -
+ 16 files changed, 170 insertions(+), 123 deletions(-)
+Merging nvdimm/libnvdimm-for-next (594861215c83 acpi, nfit: Further restrict userspace ARS start requests)
+$ git merge nvdimm/libnvdimm-for-next
+Already up to date.
+Merging at24/at24/for-next (9ff01193a20d Linux 4.20-rc3)
+$ git merge at24/at24/for-next
+Already up to date.
+Merging ntb/ntb-next (651022382c7f Linux 4.20-rc1)
+$ git merge ntb/ntb-next
+Already up to date.
+Merging kspp/for-next/kspp (8fb2dfb228df stackleak: Register the 'stackleak_cleanup' pass before the '*free_cfg' pass)
+$ git merge kspp/for-next/kspp
+Already up to date.
+Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove)
+$ git merge init_task/init_task
+Already up to date.
+Merging cisco/for-next (84a401a27506 Merge branch 'for-x86' into for-next)
+$ git merge cisco/for-next
+Auto-merging init/Kconfig
+Auto-merging arch/x86/kernel/setup.c
+CONFLICT (content): Merge conflict in arch/x86/kernel/setup.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/powerpc/Kconfig
+Resolved 'arch/x86/kernel/setup.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master af18d349b077] Merge remote-tracking branch 'cisco/for-next'
+$ git diff -M --stat --summary HEAD^..
+ arch/powerpc/Kconfig | 23 +--------
+ arch/powerpc/configs/44x/fsp2_defconfig | 29 ++++++-----
+ arch/powerpc/configs/44x/iss476-smp_defconfig | 24 ++++-----
+ arch/powerpc/configs/44x/warp_defconfig | 12 ++---
+ arch/powerpc/configs/holly_defconfig | 12 ++---
+ arch/powerpc/configs/mvme5100_defconfig | 25 +++++-----
+ arch/powerpc/configs/skiroot_defconfig | 48 +++++++++---------
+ arch/powerpc/configs/storcenter_defconfig | 15 +++---
+ arch/powerpc/kernel/prom.c | 4 ++
+ arch/powerpc/kernel/prom_init.c | 8 +--
+ arch/powerpc/kernel/prom_init_check.sh | 2 +-
+ arch/x86/Kconfig | 44 +---------------
+ arch/x86/kernel/setup.c | 19 ++-----
+ include/linux/cmdline.h | 72 +++++++++++++++++++++++++++
+ init/Kconfig | 69 +++++++++++++++++++++++++
+ 15 files changed, 235 insertions(+), 171 deletions(-)
+ create mode 100644 include/linux/cmdline.h
+Merging gnss/gnss-next (2595646791c3 Linux 4.20-rc5)
+$ git merge gnss/gnss-next
+Already up to date.
+Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header)
+$ git merge fsi/master
+Already up to date.
+Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4)
+$ git merge siox/siox/next
+Already up to date.
+Merging slimbus/for-next (39a577fe6163 slimbus: ngd: fix spelling mistake "exeeds" -> "exceeds")
+$ git merge slimbus/for-next
+Auto-merging drivers/slimbus/qcom-ngd-ctrl.c
+Merge made by the 'recursive' strategy.
+Merging nvmem/for-next (5035d66cc629 nvmem: meson-efuse: add peripheral clock)
+$ git merge nvmem/for-next
+Auto-merging include/linux/nvmem-provider.h
+CONFLICT (content): Merge conflict in include/linux/nvmem-provider.h
+Auto-merging drivers/nvmem/core.c
+Recorded preimage for 'include/linux/nvmem-provider.h'
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'include/linux/nvmem-provider.h'.
+[master 707e4d8e8c9c] Merge remote-tracking branch 'nvmem/for-next'
+$ git diff -M --stat --summary HEAD^..
+Merging xarray/xarray (4f145cd66a1a XArray tests: Check iterating over multiorder entries)
+$ git merge xarray/xarray
+Auto-merging mm/shmem.c
+Merge made by the 'recursive' strategy.
+ Documentation/core-api/xarray.rst | 5 +-
+ include/linux/xarray.h | 54 +++++++++++++++
+ lib/radix-tree.c | 4 +-
+ lib/test_xarray.c | 122 +++++++++++++++++++++------------
+ mm/shmem.c | 4 +-
+ tools/testing/radix-tree/Makefile | 1 +
+ tools/testing/radix-tree/main.c | 1 +
+ tools/testing/radix-tree/regression.h | 1 +
+ tools/testing/radix-tree/regression4.c | 79 +++++++++++++++++++++
+ 9 files changed, 222 insertions(+), 49 deletions(-)
+ create mode 100644 tools/testing/radix-tree/regression4.c
+Merging akpm-current/current (59914d7a892f ipc: conserve sequence numbers in extended IPCMNI mode)
+$ git merge --no-ff akpm-current/current
+Auto-merging scripts/checkpatch.pl
+Auto-merging net/netfilter/xt_hashlimit.c
+Auto-merging net/dccp/proto.c
+Auto-merging mm/vmscan.c
+Auto-merging mm/swap.c
+Auto-merging mm/slab_common.c
+Auto-merging mm/slab.c
+Auto-merging mm/shmem.c
+Auto-merging mm/memory-failure.c
+Auto-merging mm/khugepaged.c
+Auto-merging mm/huge_memory.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/panic.c
+Auto-merging kernel/events/uprobes.c
+Auto-merging kernel/cgroup/cpuset.c
+Auto-merging init/main.c
+Auto-merging init/initramfs.c
+Auto-merging init/Kconfig
+Auto-merging include/uapi/linux/fcntl.h
+Auto-merging include/linux/swap.h
+Auto-merging include/linux/slab.h
+Auto-merging include/linux/shmem_fs.h
+Auto-merging include/linux/sched.h
+Auto-merging include/linux/printk.h
+Auto-merging include/linux/compiler-gcc.h
+Auto-merging fs/userfaultfd.c
+Auto-merging fs/proc/inode.c
+Auto-merging fs/ocfs2/dlmfs/dlmfs.c
+Auto-merging fs/iomap.c
+Auto-merging fs/hugetlbfs/inode.c
+Auto-merging fs/fuse/inode.c
+Auto-merging fs/file_table.c
+Auto-merging fs/exec.c
+Auto-merging fs/eventpoll.c
+Auto-merging fs/dax.c
+Auto-merging fs/buffer.c
+Auto-merging fs/bfs/inode.c
+Auto-merging fs/autofs/inode.c
+Auto-merging fs/autofs/init.c
+Auto-merging fs/autofs/autofs_i.h
+Auto-merging drivers/staging/android/ion/ion_system_heap.c
+Auto-merging drivers/parisc/sba_iommu.c
+Auto-merging drivers/parisc/ccio-dma.c
+Auto-merging drivers/nvdimm/pmem.c
+Auto-merging drivers/misc/vmw_balloon.c
+Auto-merging drivers/md/dm-integrity.c
+Auto-merging drivers/md/dm-crypt.c
+Auto-merging drivers/md/dm-bufio.c
+Auto-merging drivers/infiniband/core/umem_odp.c
+Auto-merging drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_crat.c
+Auto-merging drivers/base/memory.c
+Auto-merging block/genhd.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/powerpc/mm/pgtable_32.c
+Auto-merging arch/powerpc/mm/pgtable-book3s64.c
+CONFLICT (content): Merge conflict in arch/powerpc/mm/pgtable-book3s64.c
+Auto-merging arch/powerpc/mm/mem.c
+Auto-merging arch/powerpc/include/asm/nohash/64/pgalloc.h
+Auto-merging arch/powerpc/include/asm/nohash/32/pgalloc.h
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/nohash/32/pgalloc.h
+Auto-merging arch/powerpc/include/asm/book3s/64/pgalloc.h
+Auto-merging arch/powerpc/include/asm/book3s/32/pgalloc.h
+CONFLICT (content): Merge conflict in arch/powerpc/include/asm/book3s/32/pgalloc.h
+Auto-merging arch/mips/include/asm/bitops.h
+Auto-merging arch/arm64/include/asm/uaccess.h
+Auto-merging arch/arm64/include/asm/memory.h
+Auto-merging arch/arm64/Makefile
+Auto-merging arch/arm64/Kconfig
+Auto-merging Documentation/process/coding-style.rst
+Auto-merging Documentation/filesystems/proc.txt
+Auto-merging Documentation/admin-guide/kernel-parameters.txt
+Resolved 'arch/powerpc/include/asm/book3s/32/pgalloc.h' using previous resolution.
+Resolved 'arch/powerpc/include/asm/nohash/32/pgalloc.h' using previous resolution.
+Resolved 'arch/powerpc/mm/pgtable-book3s64.c' using previous resolution.
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 864ddd6450db] Merge branch 'akpm-current/current'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/ABI/testing/sysfs-block-zram | 32 +
+ Documentation/admin-guide/kernel-parameters.txt | 11 +
+ Documentation/blockdev/zram.txt | 80 +-
+ Documentation/dev-tools/kasan.rst | 232 +++---
+ Documentation/filesystems/proc.txt | 7 +-
+ Documentation/process/coding-style.rst | 3 +
+ Documentation/sysctl/kernel.txt | 17 +
+ Documentation/sysctl/vm.txt | 44 ++
+ arch/Kconfig | 5 +
+ arch/alpha/include/asm/bitops.h | 4 +-
+ arch/alpha/include/asm/pgalloc.h | 6 +-
+ arch/alpha/kernel/setup.c | 1 +
+ arch/alpha/mm/numa.c | 6 +-
+ arch/arc/include/asm/bitops.h | 4 +-
+ arch/arc/include/asm/pgalloc.h | 5 +-
+ arch/arm/include/asm/page.h | 2 +
+ arch/arm/include/asm/pgalloc.h | 4 +-
+ arch/arm64/Kconfig | 1 +
+ arch/arm64/Makefile | 11 +-
+ arch/arm64/include/asm/brk-imm.h | 2 +
+ arch/arm64/include/asm/kasan.h | 8 +-
+ arch/arm64/include/asm/memory.h | 42 +-
+ arch/arm64/include/asm/pgalloc.h | 4 +-
+ arch/arm64/include/asm/pgtable-hwdef.h | 1 +
+ arch/arm64/include/asm/uaccess.h | 7 -
+ arch/arm64/kernel/traps.c | 68 +-
+ arch/arm64/mm/fault.c | 31 +-
+ arch/arm64/mm/kasan_init.c | 58 +-
+ arch/arm64/mm/proc.S | 8 +-
+ arch/c6x/include/asm/bitops.h | 2 +-
+ arch/csky/include/asm/bitops.h | 2 +-
+ arch/csky/mm/init.c | 4 +-
+ arch/hexagon/include/asm/bitops.h | 2 +-
+ arch/hexagon/include/asm/pgalloc.h | 6 +-
+ arch/ia64/include/asm/bitops.h | 3 +-
+ arch/ia64/include/asm/pgalloc.h | 5 +-
+ arch/ia64/mm/init.c | 2 +-
+ arch/m68k/include/asm/bitops.h | 2 +-
+ arch/m68k/include/asm/mcf_pgalloc.h | 8 +-
+ arch/m68k/include/asm/motorola_pgalloc.h | 4 +-
+ arch/m68k/include/asm/sun3_pgalloc.h | 6 +-
+ arch/microblaze/include/asm/pgalloc.h | 19 +-
+ arch/microblaze/mm/pgtable.c | 3 +-
+ arch/mips/include/asm/bitops.h | 2 +-
+ arch/mips/include/asm/pgalloc.h | 6 +-
+ arch/nds32/include/asm/pgalloc.h | 5 +-
+ arch/nios2/include/asm/pgalloc.h | 6 +-
+ arch/openrisc/include/asm/bitops/fls.h | 2 +-
+ arch/openrisc/include/asm/pgalloc.h | 5 +-
+ arch/openrisc/mm/ioremap.c | 3 +-
+ arch/parisc/include/asm/bitops.h | 2 +-
+ arch/parisc/include/asm/pgalloc.h | 4 +-
+ arch/powerpc/include/asm/book3s/32/pgalloc.h | 6 +-
+ arch/powerpc/include/asm/book3s/64/pgalloc.h | 12 +-
+ arch/powerpc/include/asm/nohash/32/pgalloc.h | 6 +-
+ arch/powerpc/include/asm/nohash/64/pgalloc.h | 6 +-
+ arch/powerpc/mm/mem.c | 14 +-
+ arch/powerpc/mm/pgtable_32.c | 4 +-
+ arch/powerpc/platforms/pseries/cmm.c | 10 +-
+ arch/riscv/include/asm/pgalloc.h | 6 +-
+ arch/s390/include/asm/bitops.h | 4 +-
+ arch/s390/include/asm/pgalloc.h | 4 +-
+ arch/s390/mm/dump_pagetables.c | 17 +-
+ arch/s390/mm/init.c | 4 +-
+ arch/s390/mm/kasan_init.c | 33 +-
+ arch/sh/boards/mach-kfr2r09/setup.c | 3 +-
+ arch/sh/include/asm/io.h | 1 +
+ arch/sh/include/asm/pgalloc.h | 6 +-
+ arch/sh/mm/init.c | 6 +-
+ arch/sparc/include/asm/pgalloc_32.h | 5 +-
+ arch/sparc/include/asm/pgalloc_64.h | 6 +-
+ arch/sparc/include/asm/pgtable_64.h | 30 -
+ arch/sparc/mm/init_64.c | 6 +-
+ arch/sparc/mm/srmmu.c | 4 +-
+ arch/um/include/asm/pgalloc.h | 4 +-
+ arch/um/kernel/mem.c | 8 +-
+ arch/unicore32/include/asm/bitops.h | 2 +-
+ arch/unicore32/include/asm/pgalloc.h | 4 +-
+ arch/x86/Kconfig | 1 +
+ arch/x86/include/asm/bitops.h | 2 +-
+ arch/x86/include/asm/pgalloc.h | 4 +-
+ arch/x86/include/asm/processor.h | 2 +-
+ arch/x86/kernel/cpu/microcode/core.c | 5 +-
+ arch/x86/mm/dump_pagetables.c | 11 +-
+ arch/x86/mm/init.c | 2 +-
+ arch/x86/mm/init_32.c | 5 +-
+ arch/x86/mm/init_64.c | 11 +-
+ arch/x86/mm/kasan_init_64.c | 55 +-
+ arch/x86/mm/pgtable.c | 4 +-
+ arch/xtensa/include/asm/pgalloc.h | 8 +-
+ arch/xtensa/mm/kasan_init.c | 18 +-
+ block/genhd.c | 2 +-
+ drivers/base/memory.c | 11 +-
+ drivers/base/node.c | 39 +-
+ drivers/block/zram/Kconfig | 5 +-
+ drivers/block/zram/zram_drv.c | 502 ++++++++----
+ drivers/block/zram/zram_drv.h | 19 +-
+ drivers/char/agp/backend.c | 4 +-
+ drivers/dax/pmem.c | 14 +-
+ drivers/dma-buf/udmabuf.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 43 +-
+ drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 14 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 +-
+ drivers/gpu/drm/radeon/radeon_mn.c | 16 +-
+ drivers/hv/hv_balloon.c | 25 +-
+ drivers/infiniband/core/umem_odp.c | 20 +-
+ drivers/infiniband/hw/hfi1/mmu_rb.c | 13 +-
+ drivers/md/dm-bufio.c | 2 +-
+ drivers/md/dm-crypt.c | 2 +-
+ drivers/md/dm-integrity.c | 2 +-
+ drivers/md/dm-stats.c | 2 +-
+ drivers/media/platform/mtk-vpu/mtk_vpu.c | 2 +-
+ drivers/misc/mic/scif/scif_dma.c | 11 +-
+ drivers/misc/sgi-gru/grutlbpurge.c | 14 +-
+ drivers/misc/vmw_balloon.c | 2 +-
+ drivers/nvdimm/pmem.c | 13 +-
+ drivers/parisc/ccio-dma.c | 4 +-
+ drivers/parisc/sba_iommu.c | 4 +-
+ drivers/pci/p2pdma.c | 10 +-
+ drivers/staging/android/ion/ion_system_heap.c | 2 +-
+ drivers/xen/balloon.c | 25 +-
+ drivers/xen/gntdev.c | 12 +-
+ drivers/xen/xen-selfballoon.c | 6 +-
+ fs/autofs/autofs_i.h | 13 +-
+ fs/autofs/dev-ioctl.c | 27 +-
+ fs/autofs/init.c | 2 +-
+ fs/autofs/inode.c | 75 +-
+ fs/autofs/root.c | 16 +-
+ fs/autofs/waitq.c | 10 +-
+ fs/bfs/bfs.h | 11 +-
+ fs/bfs/dir.c | 4 +-
+ fs/bfs/file.c | 2 +-
+ fs/bfs/inode.c | 65 +-
+ fs/binfmt_script.c | 10 +-
+ fs/buffer.c | 50 +-
+ fs/ceph/super.h | 2 +-
+ fs/dax.c | 11 +-
+ fs/eventpoll.c | 218 +++---
+ fs/exec.c | 105 ++-
+ fs/file_table.c | 7 +-
+ fs/fuse/inode.c | 2 +-
+ fs/hfsplus/dir.c | 1 +
+ fs/hfsplus/hfsplus_fs.h | 2 +
+ fs/hfsplus/inode.c | 21 +
+ fs/hugetlbfs/inode.c | 52 +-
+ fs/iomap.c | 7 +
+ fs/nfs/write.c | 2 +-
+ fs/nfsd/nfscache.c | 2 +-
+ fs/ntfs/malloc.h | 2 +-
+ fs/ocfs2/Makefile | 2 +-
+ fs/ocfs2/aops.c | 22 +-
+ fs/ocfs2/buffer_head_io.c | 2 -
+ fs/ocfs2/cluster/heartbeat.c | 17 +-
+ fs/ocfs2/dlm/Makefile | 2 +-
+ fs/ocfs2/dlm/dlmrecovery.c | 1 -
+ fs/ocfs2/dlm/dlmunlock.c | 7 +
+ fs/ocfs2/dlmfs/Makefile | 2 +-
+ fs/ocfs2/dlmfs/dlmfs.c | 3 +-
+ fs/ocfs2/journal.c | 6 +-
+ fs/ocfs2/localalloc.c | 12 +-
+ fs/proc/base.c | 20 +-
+ fs/proc/inode.c | 4 +-
+ fs/proc/page.c | 2 +-
+ fs/proc/task_mmu.c | 24 +-
+ fs/proc/util.c | 1 +
+ fs/userfaultfd.c | 11 +-
+ include/asm-generic/bitops/builtin-fls.h | 2 +-
+ include/asm-generic/bitops/fls.h | 2 +-
+ include/linux/binfmts.h | 1 +
+ include/linux/build_bug.h | 36 +-
+ include/linux/compiler-clang.h | 6 +-
+ include/linux/compiler-gcc.h | 6 +
+ include/linux/compiler_attributes.h | 13 -
+ include/linux/genalloc.h | 13 +-
+ include/linux/highmem.h | 28 +-
+ include/linux/hmm.h | 4 +-
+ include/linux/ipc_namespace.h | 1 +
+ include/linux/kasan.h | 101 ++-
+ include/linux/kernel.h | 1 +
+ include/linux/memblock.h | 47 +-
+ include/linux/memcontrol.h | 11 +-
+ include/linux/memory.h | 2 +-
+ include/linux/memory_hotplug.h | 20 +-
+ include/linux/memremap.h | 2 +
+ include/linux/migrate.h | 2 +-
+ include/linux/mm.h | 140 +++-
+ include/linux/mmu_notifier.h | 111 ++-
+ include/linux/mmzone.h | 38 +-
+ include/linux/node.h | 9 +-
+ include/linux/oom.h | 10 +
+ include/linux/page-flags-layout.h | 10 +
+ include/linux/page-flags.h | 7 +
+ include/linux/pagemap.h | 2 +
+ include/linux/printk.h | 2 +-
+ include/linux/sched.h | 7 +
+ include/linux/sched/signal.h | 18 +
+ include/linux/sched/task.h | 2 +
+ include/linux/shmem_fs.h | 2 +-
+ include/linux/slab.h | 28 +-
+ include/linux/slab_def.h | 13 +
+ include/linux/swap.h | 31 +-
+ include/linux/vm_event_item.h | 1 +
+ include/linux/xxhash.h | 23 +
+ include/trace/events/kmem.h | 21 +
+ include/uapi/linux/auto_fs.h | 2 +-
+ include/uapi/linux/bfs_fs.h | 2 +-
+ include/uapi/linux/binfmts.h | 2 +-
+ include/uapi/linux/fcntl.h | 1 +
+ include/uapi/linux/msdos_fs.h | 4 +-
+ include/uapi/linux/sysctl.h | 1 +
+ init/Kconfig | 4 +-
+ init/initramfs.c | 6 +-
+ init/main.c | 5 +-
+ ipc/ipc_sysctl.c | 14 +-
+ ipc/util.c | 29 +-
+ ipc/util.h | 46 +-
+ kernel/cgroup/cpuset.c | 4 +-
+ kernel/events/uprobes.c | 13 +-
+ kernel/fork.c | 10 +-
+ kernel/kexec_core.c | 5 +-
+ kernel/memremap.c | 105 ++-
+ kernel/panic.c | 28 +
+ kernel/power/snapshot.c | 2 +-
+ kernel/ptrace.c | 15 +-
+ kernel/resource.c | 15 +
+ kernel/sysctl.c | 25 +
+ kernel/sysctl_binary.c | 1 +
+ lib/Kconfig.debug | 6 +
+ lib/Kconfig.kasan | 96 ++-
+ lib/debugobjects.c | 8 +-
+ lib/find_bit_benchmark.c | 11 +-
+ lib/genalloc.c | 20 +-
+ lib/show_mem.c | 5 +-
+ mm/Kconfig | 1 +
+ mm/cma.c | 11 +
+ mm/compaction.c | 2 +-
+ mm/debug.c | 25 +-
+ mm/filemap.c | 87 ++-
+ mm/highmem.c | 5 +-
+ mm/hmm.c | 331 ++------
+ mm/huge_memory.c | 74 +-
+ mm/hugetlb.c | 155 ++--
+ mm/internal.h | 26 +-
+ mm/kasan/Makefile | 15 +-
+ mm/kasan/{kasan.c => common.c} | 656 ++++++----------
+ mm/kasan/generic.c | 344 ++++++++
+ mm/kasan/generic_report.c | 153 ++++
+ mm/kasan/{kasan_init.c => init.c} | 73 +-
+ mm/kasan/kasan.h | 59 +-
+ mm/kasan/quarantine.c | 3 +-
+ mm/kasan/report.c | 272 ++-----
+ mm/kasan/tags.c | 161 ++++
+ mm/kasan/tags_report.c | 58 ++
+ mm/khugepaged.c | 13 +-
+ mm/ksm.c | 77 +-
+ mm/madvise.c | 22 +-
+ mm/memblock.c | 118 ++-
+ mm/memcontrol.c | 33 +-
+ mm/memfd.c | 3 +-
+ mm/memory-failure.c | 14 +-
+ mm/memory.c | 135 ++--
+ mm/memory_hotplug.c | 391 +++++-----
+ mm/migrate.c | 57 +-
+ mm/mincore.c | 12 +-
+ mm/mm_init.c | 2 +-
+ mm/mmap.c | 16 -
+ mm/mmu_notifier.c | 29 +-
+ mm/mprotect.c | 17 +-
+ mm/mremap.c | 80 +-
+ mm/oom_kill.c | 54 +-
+ mm/page-writeback.c | 35 +-
+ mm/page_alloc.c | 993 ++++++++++++++++--------
+ mm/page_owner.c | 5 +-
+ mm/readahead.c | 12 +-
+ mm/rmap.c | 37 +-
+ mm/shmem.c | 701 +++++++++--------
+ mm/slab.c | 31 +-
+ mm/slab.h | 2 +-
+ mm/slab_common.c | 10 +-
+ mm/slub.c | 97 +--
+ mm/sparse.c | 28 +-
+ mm/swap.c | 2 +-
+ mm/swap_state.c | 16 +-
+ mm/swapfile.c | 572 +++++++-------
+ mm/userfaultfd.c | 13 +-
+ mm/util.c | 2 +-
+ mm/vmalloc.c | 4 +-
+ mm/vmscan.c | 169 +++-
+ mm/vmstat.c | 5 +-
+ mm/workingset.c | 2 +-
+ mm/zswap.c | 4 +-
+ net/dccp/proto.c | 7 +-
+ net/decnet/dn_route.c | 2 +-
+ net/ipv4/tcp_metrics.c | 2 +-
+ net/netfilter/nf_conntrack_core.c | 7 +-
+ net/netfilter/xt_hashlimit.c | 5 +-
+ net/sctp/protocol.c | 7 +-
+ scripts/Makefile.kasan | 53 +-
+ scripts/bloat-o-meter | 1 +
+ scripts/checkpatch.pl | 13 +-
+ scripts/gdb/linux/proc.py | 2 +-
+ security/integrity/ima/ima_kexec.c | 2 +-
+ tools/include/asm-generic/bitops/fls.h | 2 +-
+ tools/testing/nvdimm/test/iomap.c | 17 +-
+ tools/testing/selftests/memfd/memfd_test.c | 74 ++
+ tools/vm/page-types.c | 2 +-
+ virt/kvm/arm/mmu.c | 2 +-
+ virt/kvm/kvm_main.c | 14 +-
+ 310 files changed, 6522 insertions(+), 4125 deletions(-)
+ rename mm/kasan/{kasan.c => common.c} (59%)
+ create mode 100644 mm/kasan/generic.c
+ create mode 100644 mm/kasan/generic_report.c
+ rename mm/kasan/{kasan_init.c => init.c} (82%)
+ create mode 100644 mm/kasan/tags.c
+ create mode 100644 mm/kasan/tags_report.c
+$ git am -3 ../patches/0001-mm-fix-for-stall-movable-allocations-until-kswapd-pr.patch
+Applying: mm: fix for "stall movable allocations until kswapd progresses during serious external fragmentation event"
+$ git reset HEAD^
+Unstaged changes after reset:
+M kernel/sysctl.c
+$ git add -A .
+$ git commit -v -a --amend
+[master b19f784fccd5] Merge branch 'akpm-current/current'
+ Date: Mon Dec 10 19:16:52 2018 +1100
+$ git am -3 ../patches/0001-fix-up-for-mm-treewide-remove-unused-address-argumen.patch
+Applying: fix up for "mm: treewide: remove unused address argument from pte_alloc functions"
+$ git reset HEAD^
+Unstaged changes after reset:
+M arch/powerpc/mm/pgtable-frag.c
+M arch/powerpc/mm/pgtable_32.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 3b665758b36a] Merge branch 'akpm-current/current'
+ Date: Mon Dec 10 19:16:52 2018 +1100
+$ 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: scripts/atomic/check-atomics.sh: don't assume that scripts are executable
+Applying: kernel/signal.c: remove some duplicated includes
+Applying: kernel/signal.c: remove some duplicated includes
+Applying: locking/atomics: build atomic headers as required
+Applying: mm: Introduce common STRUCT_PAGE_MAX_SHIFT define
+Applying: mm/sparse: add common helper to mark all memblocks present
+Applying: mm: balloon: update comment about isolation/migration/compaction
+Applying: mm: convert PG_balloon to PG_offline
+Applying: mm-convert-pg_balloon-to-pg_offline-fix
+Applying: mm-convert-pg_balloon-to-pg_offline-fix-fix
+Applying: kexec: export PG_offline to VMCOREINFO
+Applying: xen/balloon: mark inflated pages PG_offline
+Applying: hv_balloon: mark inflated pages PG_offline
+Applying: vmw_balloon: mark inflated pages PG_offline
+Applying: vmw_balloon-mark-inflated-pages-pg_offline-v2
+Applying: PM/Hibernate: use pfn_to_online_page()
+Applying: PM/Hibernate: exclude all PageOffline() pages
+Applying: pm-hibernate-exclude-all-pageoffline-pages-v2
+Applying: lib/lzo: tidy-up ifdefs
+Applying: lib/lzo: clean-up by introducing COPY16
+Applying: lib/lzo: enable 64-bit CTZ on Arm
+Applying: lib/lzo: 64-bit CTZ on arm64
+Applying: lib/lzo: fast 8-byte copy on arm64
+Applying: lib/lzo: implement run-length encoding
+Applying: lib-lzo-implement-run-length-encoding-v4.txt
+Applying: lib/lzo: separate lzo-rle from lzo
+Applying: lib-lzo-separate-lzo-rle-from-lzo-v4
+Applying: zram: default to lzo-rle instead of lzo
+Applying: kernel/locking/mutex.c: remove caller signal_pending branch predictions
+Applying: kernel/sched/: remove caller signal_pending branch predictions
+Applying: arch/arc/mm/fault.c: remove caller signal_pending_branch predictions
+Applying: mm/: remove caller signal_pending branch predictions
+Applying: fs/: remove caller signal_pending branch predictions
+Applying: fs-remove-caller-signal_pending-branch-predictions-fix
+Applying: include/linux/sched/signal.h: replace `tsk' with `task'
+Applying: fs: don't open code lru_to_page()
+Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow
+$ cd ../next
+$ git fetch -f ../rebase-tmp akpm:akpm/master
+From ../rebase-tmp
+ + 261c9f4d1b61...f1388414a36d akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (f1388414a36d drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow)
+$ git merge --no-ff akpm/master
+Removing include/linux/atomic-fallback.h
+Removing include/asm-generic/atomic-long.h
+Removing include/asm-generic/atomic-instrumented.h
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/mm/pagemap.rst | 9 +-
+ Documentation/lzo.txt | 39 +-
+ Kbuild | 18 +-
+ Makefile | 8 +-
+ arch/arc/mm/fault.c | 2 +-
+ arch/arm64/include/asm/atomic.h | 2 +-
+ arch/arm64/include/asm/memory.h | 9 -
+ arch/arm64/mm/init.c | 8 -
+ arch/x86/include/asm/atomic.h | 2 +-
+ crypto/Makefile | 2 +-
+ crypto/lzo-rle.c | 175 ++
+ crypto/tcrypt.c | 4 +-
+ drivers/block/zram/zcomp.c | 1 +
+ drivers/block/zram/zram_drv.c | 2 +-
+ drivers/hv/hv_balloon.c | 14 +-
+ drivers/media/platform/sti/delta/delta-ipc.c | 4 +-
+ drivers/misc/vmw_balloon.c | 32 +
+ drivers/xen/balloon.c | 3 +
+ fs/afs/file.c | 5 +-
+ fs/afs/fs_probe.c | 2 +-
+ fs/afs/vl_probe.c | 2 +-
+ fs/btrfs/extent_io.c | 2 +-
+ fs/buffer.c | 2 +-
+ fs/ceph/addr.c | 5 +-
+ fs/cifs/file.c | 3 +-
+ fs/exec.c | 4 +-
+ fs/ext4/readpage.c | 2 +-
+ fs/ocfs2/aops.c | 3 +-
+ fs/orangefs/inode.c | 2 +-
+ fs/orangefs/orangefs-bufmap.c | 2 +-
+ fs/proc/page.c | 4 +-
+ include/asm-generic/atomic-instrumented.h | 1787 --------------------
+ include/asm-generic/atomic-long.h | 1012 ------------
+ include/asm-generic/fixmap.h | 1 +
+ include/linux/atomic-fallback.h | 2294 --------------------------
+ include/linux/atomic.h | 4 +-
+ include/linux/balloon_compaction.h | 34 +-
+ include/linux/lzo.h | 6 +-
+ include/linux/mm.h | 2 +
+ include/linux/mm_inline.h | 3 -
+ include/linux/mm_types.h | 5 +
+ include/linux/mmzone.h | 6 +
+ include/linux/page-flags.h | 13 +-
+ include/linux/sched/signal.h | 51 +-
+ include/uapi/linux/kernel-page-flags.h | 2 +-
+ kernel/async.c | 1 -
+ kernel/crash_core.c | 2 +
+ kernel/locking/mutex.c | 2 +-
+ kernel/power/snapshot.c | 17 +-
+ kernel/sched/core.c | 2 +-
+ kernel/sched/swait.c | 2 +-
+ kernel/sched/wait.c | 2 +-
+ kernel/signal.c | 2 -
+ lib/lzo/lzo1x_compress.c | 139 +-
+ lib/lzo/lzo1x_decompress_safe.c | 93 +-
+ lib/lzo/lzodefs.h | 29 +-
+ mm/filemap.c | 2 +-
+ mm/gup.c | 2 +-
+ mm/hugetlb.c | 2 +-
+ mm/sparse.c | 16 +
+ mm/swap.c | 2 +-
+ scripts/Makefile.genheader | 23 +
+ scripts/atomic/check-atomics.sh | 2 +-
+ tools/vm/page-types.c | 2 +-
+ 64 files changed, 630 insertions(+), 5304 deletions(-)
+ create mode 100644 crypto/lzo-rle.c
+ delete mode 100644 include/asm-generic/atomic-instrumented.h
+ delete mode 100644 include/asm-generic/atomic-long.h
+ delete mode 100644 include/linux/atomic-fallback.h
+ create mode 100644 scripts/Makefile.genheader
projects / users / willy / linux.git / commitdiff