Merge USB 4.20-rc8 mergepoint into usb-next

cd6a2231 · Greg Kroah-Hartman <[email protected]> · 2018-12-21 16:46:08 +01:00

We need the USB changes in here for additional patches to be able to
apply cleanly.

Signed-off-by: Greg Kroah-Hartman <[email protected]>

Commit: cd6a22310ec2a70092e136d0cd65bb77c1502521
Parents: 1e12a521 · 177c459b

Merge commit. Changes below are compared with the first parent: 1e12a521.

Changes

308 files changed · +3425 −1680

File	Status	Add	Del	Content
CREDITS	modified	+8	−0	View file
Documentation/core-api/xarray.rst	modified	+4	−1	View file
Documentation/media/uapi/v4l/extended-controls.rst	modified	+10	−0	View file
MAINTAINERS	modified	+16	−7	View file
Makefile	modified	+1	−1	View file
arch/alpha/kernel/setup.c	modified	+1	−0	View file
arch/alpha/mm/numa.c	modified	+3	−3	View file
arch/arm/boot/dts/arm-realview-pb1176.dts	modified	+2	−2	View file
arch/arm/boot/dts/arm-realview-pb11mp.dts	modified	+2	−2	View file
arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts	modified	+1	−1	View file
arch/arm/boot/dts/bcm2837-rpi-3-b.dts	modified	+1	−1	View file
arch/arm/boot/dts/imx7d-nitrogen7.dts	modified	+7	−2	View file
arch/arm/boot/dts/imx7d-pico.dtsi	modified	+21	−1	View file
arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts	modified	+2	−2	View file
arch/arm/mach-imx/cpuidle-imx6sx.c	modified	+1	−1	View file
arch/arm/mach-mmp/cputype.h	modified	+4	−2	View file
arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi	modified	+0	−4	View file
arch/arm64/boot/dts/marvell/armada-ap806.dtsi	modified	+0	−27	View file
arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts	modified	+6	−1	View file
arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts	modified	+6	−1	View file
arch/arm64/boot/dts/mediatek/mt7622.dtsi	modified	+0	−10	View file
arch/arm64/include/asm/memory.h	modified	+0	−9	View file
arch/arm64/mm/dma-mapping.c	modified	+1	−1	View file
arch/arm64/mm/init.c	modified	+0	−8	View file
arch/powerpc/boot/Makefile	modified	+1	−1	View file
arch/powerpc/boot/crt0.S	modified	+3	−1	View file
arch/powerpc/include/asm/perf_event.h	modified	+2	−0	View file
arch/powerpc/include/uapi/asm/Kbuild	modified	+0	−1	View file
arch/powerpc/include/uapi/asm/bpf_perf_event.h	added	+9	−0	View file
arch/powerpc/kernel/legacy_serial.c	modified	+5	−1	View file
arch/powerpc/kernel/msi.c	modified	+6	−1	View file
arch/powerpc/kernel/ptrace.c	modified	+6	−1	View file
arch/powerpc/mm/dump_linuxpagetables.c	modified	+1	−0	View file
arch/powerpc/mm/init_64.c	modified	+16	−3	View file
arch/powerpc/platforms/pseries/Kconfig	modified	+1	−2	View file
arch/powerpc/platforms/pseries/papr_scm.c	modified	+30	−9	View file
arch/sh/include/asm/io.h	modified	+1	−0	View file
arch/x86/include/asm/msr-index.h	modified	+1	−0	View file
arch/x86/kvm/vmx.c	modified	+2	−0	View file
arch/x86/kvm/x86.c	modified	+3	−1	View file
block/bio.c	modified	+2	−1	View file
block/blk-zoned.c	modified	+1	−1	View file
drivers/clk/qcom/gcc-qcs404.c	modified	+1	−1	View file
drivers/crypto/chelsio/chtls/chtls.h	modified	+7	−0	View file
drivers/crypto/chelsio/chtls/chtls_cm.c	modified	+52	−26	View file
drivers/crypto/chelsio/chtls/chtls_io.c	modified	+8	−12	View file
drivers/crypto/chelsio/chtls/chtls_main.c	modified	+63	−42	View file
drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c	modified	+30	−6	View file
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c	modified	+2	−2	View file
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c	modified	+7	−0	View file
drivers/gpu/drm/amd/amdkfd/kfd_device.c	modified	+7	−0	View file
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c	modified	+1	−1	View file
drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h	modified	+2	−0	View file
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c	modified	+6	−0	View file
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c	modified	+3	−0	View file
drivers/gpu/drm/i915/gvt/fb_decoder.c	modified	+1	−1	View file
drivers/gpu/drm/i915/i915_drv.c	modified	+1	−0	View file
drivers/gpu/drm/i915/i915_drv.h	modified	+9	−0	View file
drivers/gpu/drm/i915/i915_gem.c	modified	+52	−2	View file
drivers/gpu/drm/i915/i915_gem_execbuffer.c	modified	+1	−6	View file
drivers/gpu/drm/i915/i915_gpu_error.c	modified	+1	−1	View file
drivers/gpu/drm/i915/intel_engine_cs.c	modified	+2	−42	View file
drivers/gpu/drm/i915/intel_lrc.c	modified	+16	−14	View file
drivers/gpu/drm/i915/intel_ringbuffer.c	modified	+24	−28	View file
drivers/gpu/drm/i915/intel_ringbuffer.h	modified	+2	−5	View file
drivers/gpu/drm/i915/intel_workarounds.c	modified	+390	−201	View file
drivers/gpu/drm/i915/intel_workarounds.h	modified	+25	−1	View file
drivers/gpu/drm/mediatek/mtk_dsi.c	modified	+7	−4	View file
drivers/gpu/drm/nouveau/dispnv50/disp.c	modified	+19	−11	View file
drivers/gpu/drm/nouveau/nouveau_drm.c	modified	+6	−0	View file
drivers/gpu/drm/rockchip/rockchip_drm_drv.c	modified	+0	−6	View file
drivers/gpu/drm/vmwgfx/vmwgfx_drv.c	modified	+3	−1	View file
drivers/gpu/drm/vmwgfx/vmwgfx_drv.h	modified	+5	−0	View file
drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c	modified	+2	−2	View file
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c	modified	+36	−0	View file
drivers/gpu/drm/vmwgfx/vmwgfx_validation.c	modified	+20	−1	View file
drivers/gpu/drm/vmwgfx/vmwgfx_validation.h	modified	+37	−0	View file
drivers/hid/hid-ids.h	modified	+7	−0	View file
drivers/hid/hid-ite.c	modified	+1	−0	View file
drivers/hid/hid-quirks.c	modified	+2	−0	View file
drivers/infiniband/core/roce_gid_mgmt.c	modified	+3	−0	View file
drivers/infiniband/hw/hfi1/chip.c	modified	+2	−1	View file
drivers/infiniband/hw/hfi1/hfi.h	modified	+2	−0	View file
drivers/infiniband/hw/hfi1/qp.c	modified	+7	−0	View file
drivers/infiniband/hw/hfi1/verbs.c	modified	+1	−1	View file
drivers/infiniband/hw/mlx5/devx.c	modified	+3	−1	View file
drivers/infiniband/hw/mlx5/odp.c	modified	+4	−5	View file
drivers/md/dm-cache-metadata.c	modified	+4	−0	View file
drivers/md/dm-thin.c	modified	+37	−35	View file
drivers/md/dm-zoned-target.c	modified	+38	−84	View file
drivers/md/dm.c	modified	+2	−0	View file
drivers/media/Kconfig	modified	+13	−0	View file
drivers/media/common/videobuf2/videobuf2-core.c	modified	+35	−9	View file
drivers/media/common/videobuf2/videobuf2-v4l2.c	modified	+9	−4	View file
drivers/media/media-device.c	modified	+4	−0	View file
drivers/media/platform/vicodec/vicodec-core.c	modified	+10	−3	View file
drivers/media/platform/vivid/vivid-sdr-cap.c	modified	+0	−2	View file
drivers/media/platform/vivid/vivid-vbi-cap.c	modified	+0	−2	View file
drivers/media/platform/vivid/vivid-vbi-out.c	modified	+0	−2	View file
drivers/media/platform/vivid/vivid-vid-cap.c	modified	+0	−2	View file
drivers/media/platform/vivid/vivid-vid-out.c	modified	+0	−2	View file
drivers/media/platform/vsp1/vsp1_lif.c	modified	+1	−1	View file
drivers/media/v4l2-core/v4l2-ctrls.c	modified	+2	−2	View file
drivers/mmc/core/block.c	modified	+10	−5	View file
drivers/mmc/core/mmc.c	modified	+15	−9	View file
drivers/mmc/host/omap.c	modified	+9	−2	View file
drivers/mmc/host/omap_hsmmc.c	modified	+11	−1	View file
drivers/mmc/host/sdhci-omap.c	modified	+8	−4	View file
drivers/mmc/host/sdhci-tegra.c	modified	+4	−4	View file
drivers/mmc/host/sdhci.c	modified	+15	−7	View file
drivers/net/dsa/mv88e6xxx/chip.c	modified	+1	−1	View file
drivers/net/ethernet/apm/xgene/xgene_enet_main.c	modified	+0	−3	View file
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h	modified	+2	−0	View file
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c	modified	+1	−0	View file
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c	modified	+49	−21	View file
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h	modified	+3	−1	View file
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c	modified	+4	−1	View file
drivers/net/ethernet/cadence/macb_main.c	modified	+42	−6	View file
drivers/net/ethernet/cadence/macb_ptp.c	modified	+2	−0	View file
drivers/net/ethernet/chelsio/cxgb4/t4_msg.h	modified	+3	−0	View file
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c	modified	+3	−0	View file
drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c	modified	+10	−4	View file
drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c	modified	+15	−0	View file
drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c	modified	+339	−164	View file
drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h	modified	+7	−6	View file
drivers/net/ethernet/hisilicon/hns/hns_enet.c	modified	+39	−4	View file
drivers/net/ethernet/ibm/ibmvnic.c	modified	+10	−8	View file
drivers/net/ethernet/ibm/ibmvnic.h	modified	+1	−1	View file
drivers/net/ethernet/intel/i40e/i40e_main.c	modified	+7	−7	View file
drivers/net/ethernet/intel/i40e/i40e_txrx.c	modified	+12	−31	View file
drivers/net/ethernet/intel/i40e/i40e_txrx_common.h	modified	+1	−4	View file
drivers/net/ethernet/intel/i40e/i40e_xsk.c	modified	+2	−10	View file
drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c	modified	+10	−1	View file
drivers/net/ethernet/marvell/mvneta.c	modified	+3	−3	View file
drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c	modified	+9	−7	View file
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c	modified	+3	−8	View file
drivers/net/ethernet/mellanox/mlx5/core/en_main.c	modified	+6	−0	View file
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c	modified	+4	−5	View file
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c	modified	+6	−4	View file
drivers/net/ethernet/mellanox/mlx5/core/en_stats.c	modified	+0	−2	View file
drivers/net/ethernet/mellanox/mlx5/core/en_stats.h	modified	+0	−2	View file
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c	modified	+22	−14	View file
drivers/net/ethernet/mellanox/mlx5/core/fs_core.c	modified	+1	−1	View file
drivers/net/ethernet/mellanox/mlxsw/core.c	modified	+18	−1	View file
drivers/net/ethernet/mellanox/mlxsw/core.h	modified	+3	−0	View file
drivers/net/ethernet/mellanox/mlxsw/spectrum.c	modified	+7	−1	View file
drivers/net/ethernet/mellanox/mlxsw/spectrum_nve.c	modified	+1	−1	View file
drivers/net/ethernet/mellanox/mlxsw/trap.h	modified	+1	−0	View file
drivers/net/ethernet/microchip/lan743x_main.c	modified	+3	−8	View file
drivers/net/ethernet/neterion/vxge/vxge-config.c	modified	+1	−1	View file
drivers/net/ethernet/netronome/nfp/flower/offload.c	modified	+22	−6	View file
drivers/net/ethernet/nuvoton/w90p910_ether.c	modified	+1	−1	View file
drivers/net/ethernet/qlogic/qed/qed_hsi.h	modified	+2	−1	View file
drivers/net/ethernet/qlogic/qed/qed_ll2.c	modified	+1	−0	View file
drivers/net/ethernet/realtek/r8169.c	modified	+1	−1	View file
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c	modified	+1	−0	View file
drivers/net/ieee802154/ca8210.c	modified	+2	−2	View file
drivers/net/ieee802154/mac802154_hwsim.c	modified	+2	−2	View file
drivers/net/phy/phy_device.c	modified	+2	−5	View file
drivers/net/usb/hso.c	modified	+16	−2	View file
drivers/net/usb/lan78xx.c	modified	+4	−0	View file
drivers/net/usb/qmi_wwan.c	modified	+2	−0	View file
drivers/net/usb/r8152.c	modified	+22	−11	View file
drivers/net/vxlan.c	modified	+14	−7	View file
drivers/net/wireless/ath/ath10k/core.c	modified	+28	−0	View file
drivers/net/wireless/ath/ath10k/debug.c	modified	+3	−2	View file
drivers/net/wireless/ath/ath10k/thermal.c	modified	+9	−0	View file
drivers/net/wireless/ath/ath10k/wmi-tlv.h	modified	+3	−0	View file
drivers/net/wireless/ath/ath10k/wmi.h	modified	+1	−0	View file
drivers/net/wireless/intel/iwlwifi/mvm/fw.c	modified	+9	−0	View file
drivers/net/wireless/marvell/mwifiex/11n.c	modified	+2	−3	View file
drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c	modified	+49	−47	View file
drivers/net/wireless/marvell/mwifiex/uap_txrx.c	modified	+0	−3	View file
drivers/net/wireless/mediatek/mt76/tx.c	modified	+6	−1	View file
drivers/net/wireless/realtek/rtlwifi/base.c	modified	+1	−0	View file
drivers/net/xen-netfront.c	modified	+1	−1	View file
drivers/pci/pcie/aer.c	modified	+1	−1	View file
drivers/pinctrl/meson/pinctrl-meson.c	modified	+2	−1	View file
drivers/pinctrl/qcom/pinctrl-sdm660.c	modified	+15	−13	View file
drivers/pinctrl/sunxi/pinctrl-sun8i-a83t.c	modified	+1	−1	View file
drivers/scsi/bnx2fc/bnx2fc_fcoe.c	modified	+1	−1	View file
drivers/scsi/qla2xxx/qla_os.c	modified	+2	−2	View file
drivers/staging/media/sunxi/cedrus/Kconfig	modified	+1	−0	View file
drivers/staging/media/sunxi/cedrus/cedrus_hw.c	modified	+2	−2	View file
drivers/thermal/hisi_thermal.c	modified	+2	−2	View file
drivers/thermal/st/stm_thermal.c	modified	+6	−6	View file
drivers/usb/host/xhci-hub.c	modified	+2	−1	View file
drivers/usb/host/xhci.h	modified	+2	−2	View file
drivers/usb/serial/option.c	modified	+15	−1	View file
drivers/vhost/net.c	modified	+7	−1	View file
drivers/vhost/vhost.c	modified	+19	−4	View file
drivers/video/backlight/pwm_bl.c	modified	+35	−6	View file
fs/aio.c	modified	+2	−0	View file
fs/ceph/super.c	modified	+2	−2	View file
fs/ceph/super.h	modified	+3	−1	View file
fs/fuse/dir.c	modified	+23	−3	View file
fs/fuse/file.c	modified	+33	−31	View file
fs/fuse/fuse_i.h	modified	+2	−2	View file
fs/fuse/inode.c	modified	+2	−1	View file
fs/overlayfs/dir.c	modified	+13	−1	View file
fs/overlayfs/export.c	modified	+3	−3	View file
fs/overlayfs/inode.c	modified	+4	−13	View file
fs/userfaultfd.c	modified	+2	−1	View file
include/asm-generic/fixmap.h	modified	+1	−0	View file
include/linux/filter.h	modified	+1	−1	View file
include/linux/mlx5/mlx5_ifc.h	modified	+6	−4	View file
include/linux/mm_types.h	modified	+5	−0	View file
include/linux/mmzone.h	modified	+6	−0	View file
include/linux/mod_devicetable.h	modified	+1	−1	View file
include/linux/netfilter/nfnetlink.h	modified	+0	−12	View file
include/linux/t10-pi.h	modified	+5	−4	View file
include/linux/xarray.h	modified	+54	−0	View file
include/media/mpeg2-ctrls.h	added	+86	−0	View file
include/media/v4l2-ctrls.h	modified	+6	−0	View file
include/media/videobuf2-core.h	modified	+2	−0	View file
include/net/ip_tunnels.h	modified	+0	−19	View file
include/net/sock.h	modified	+21	−4	View file
include/net/tls.h	modified	+6	−0	View file
include/net/xfrm.h	modified	+1	−0	View file
include/uapi/asm-generic/Kbuild.asm	modified	+1	−0	View file
include/uapi/linux/blkzoned.h	modified	+2	−2	View file
include/uapi/linux/if_tunnel.h	modified	+20	−0	View file
include/uapi/linux/in.h	modified	+7	−3	View file
include/uapi/linux/input-event-codes.h	modified	+9	−0	View file
include/uapi/linux/net_tstamp.h	modified	+2	−2	View file
include/uapi/linux/netlink.h	modified	+1	−1	View file
include/uapi/linux/v4l2-controls.h	modified	+0	−68	View file
include/uapi/linux/videodev2.h	modified	+0	−4	View file
init/Kconfig	modified	+2	−2	View file
kernel/bpf/core.c	modified	+15	−6	View file
kernel/bpf/verifier.c	modified	+10	−3	View file
kernel/dma/direct.c	modified	+6	−1	View file
kernel/trace/ftrace.c	modified	+1	−0	View file
kernel/trace/trace_events_filter.c	modified	+4	−1	View file
kernel/trace/trace_events_trigger.c	modified	+4	−2	View file
lib/radix-tree.c	modified	+2	−2	View file
lib/test_xarray.c	modified	+112	−43	View file
lib/xarray.c	modified	+3	−5	View file
mm/hugetlb.c	modified	+3	−2	View file
mm/memblock.c	modified	+1	−1	View file
mm/shmem.c	modified	+1	−3	View file
mm/sparse.c	modified	+16	−0	View file
net/can/raw.c	modified	+1	−1	View file
net/core/flow_dissector.c	modified	+5	−1	View file
net/core/gro_cells.c	modified	+1	−0	View file
net/core/neighbour.c	modified	+6	−1	View file
net/core/sysctl_net_core.c	modified	+17	−3	View file
net/ipv4/devinet.c	modified	+3	−2	View file
net/ipv4/ip_forward.c	modified	+1	−0	View file
net/ipv4/ip_fragment.c	modified	+12	−6	View file
net/ipv4/ipconfig.c	modified	+2	−0	View file
net/ipv4/ipmr.c	modified	+4	−0	View file
net/ipv4/raw.c	modified	+1	−1	View file
net/ipv6/ip6_output.c	modified	+1	−0	View file
net/ipv6/ip6_udp_tunnel.c	modified	+2	−1	View file
net/ipv6/ip6mr.c	modified	+4	−0	View file
net/ipv6/raw.c	modified	+2	−0	View file
net/mac80211/iface.c	modified	+3	−0	View file
net/mac80211/main.c	modified	+0	−2	View file
net/mac80211/status.c	modified	+5	−0	View file
net/netfilter/ipset/ip_set_list_set.c	modified	+1	−1	View file
net/netfilter/nf_conncount.c	modified	+1	−1	View file
net/netfilter/nf_conntrack_seqadj.c	modified	+4	−3	View file
net/netfilter/nf_nat_core.c	modified	+2	−1	View file
net/netfilter/nf_tables_api.c	modified	+13	−8	View file
net/netfilter/nf_tables_core.c	modified	+1	−1	View file
net/netlink/af_netlink.c	modified	+2	−2	View file
net/packet/af_packet.c	modified	+3	−3	View file
net/rds/message.c	modified	+18	−6	View file
net/rds/rdma.c	modified	+36	−39	View file
net/rds/rds.h	modified	+18	−5	View file
net/rds/send.c	modified	+50	−11	View file
net/sched/cls_flower.c	modified	+3	−4	View file
net/sctp/ipv6.c	modified	+1	−0	View file
net/smc/af_smc.c	modified	+12	−2	View file
net/smc/smc.h	modified	+4	−0	View file
net/sunrpc/clnt.c	modified	+1	−0	View file
net/sunrpc/xprt.c	modified	+4	−31	View file
net/sunrpc/xprtsock.c	modified	+4	−6	View file
net/tipc/socket.c	modified	+24	−16	View file
net/tipc/udp_media.c	modified	+6	−3	View file
net/tls/tls_main.c	modified	+27	−17	View file
net/vmw_vsock/af_vsock.c	modified	+6	−1	View file
net/vmw_vsock/vmci_transport.c	modified	+50	−17	View file
net/wireless/nl80211.c	modified	+3	−1	View file
net/xfrm/xfrm_input.c	modified	+6	−1	View file
net/xfrm/xfrm_output.c	modified	+1	−0	View file
net/xfrm/xfrm_state.c	modified	+8	−2	View file
net/xfrm/xfrm_user.c	modified	+2	−2	View file
scripts/checkstack.pl	modified	+2	−2	View file
scripts/spdxcheck.py	modified	+4	−2	View file
security/integrity/ima/ima_policy.c	modified	+5	−5	View file
security/keys/keyctl_pkey.c	modified	+1	−1	View file
security/keys/trusted.c	modified	+1	−1	View file
sound/firewire/fireface/ff-protocol-ff400.c	modified	+1	−1	View file
sound/pci/hda/patch_realtek.c	modified	+77	−0	View file
tools/include/uapi/linux/netlink.h	modified	+1	−1	View file
tools/testing/radix-tree/Makefile	modified	+1	−0	View file
tools/testing/radix-tree/main.c	modified	+1	−0	View file
tools/testing/radix-tree/regression.h	modified	+1	−0	View file
tools/testing/radix-tree/regression4.c	added	+79	−0	View file
tools/testing/selftests/bpf/bpf_flow.c	modified	+17	−19	View file
tools/testing/selftests/bpf/test_verifier.c	modified	+33	−5	View file
tools/testing/selftests/net/Makefile	modified	+1	−0	View file
tools/testing/selftests/net/test_vxlan_fdb_changelink.sh	added	+29	−0	View file
tools/testing/selftests/seccomp/seccomp_bpf.c	modified	+7	−2	View file
tools/virtio/linux/kernel.h	modified	+4	−0	View file
virt/kvm/coalesced_mmio.c	modified	+5	−1	View file

Only the first 600 diff lines are shown. Download the complete patch.

CREDITS

View file

diff --git a/CREDITS b/CREDITS
index c927339..7d397ee 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2541,6 +2541,10 @@ S: Ormond
 S: Victoria 3163
 S: Australia
 
+N: Eric Miao
+E: [email protected]
+D: MMP support
+
 N: Pauline Middelink
 E: [email protected]
 D: General low-level bug fixes, /proc fixes, identd support
@@ -4115,6 +4119,10 @@ S: 1507 145th Place SE #B5
 S: Bellevue, Washington 98007
 S: USA
 
+N: Haojian Zhuang
+E: [email protected]
+D: MMP support
+
 N: Richard Zidlicky
 E: [email protected], [email protected]
 W: http://www.geocities.com/rdzidlic

Documentation/core-api/xarray.rst

View file

diff --git a/Documentation/core-api/xarray.rst b/Documentation/core-api/xarray.rst
index dbe96cb..6a6d67a 100644
--- a/Documentation/core-api/xarray.rst
+++ b/Documentation/core-api/xarray.rst
@@ -187,6 +187,8 @@ Takes xa_lock internally:
  * :c:func:`xa_erase_bh`
  * :c:func:`xa_erase_irq`
  * :c:func:`xa_cmpxchg`
+ * :c:func:`xa_cmpxchg_bh`
+ * :c:func:`xa_cmpxchg_irq`
  * :c:func:`xa_store_range`
  * :c:func:`xa_alloc`
  * :c:func:`xa_alloc_bh`
@@ -263,7 +265,8 @@ using :c:func:`xa_lock_irqsave` in both the interrupt handler and process
 context, or :c:func:`xa_lock_irq` in process context and :c:func:`xa_lock`
 in the interrupt handler.  Some of the more common patterns have helper
 functions such as :c:func:`xa_store_bh`, :c:func:`xa_store_irq`,
-:c:func:`xa_erase_bh` and :c:func:`xa_erase_irq`.
+:c:func:`xa_erase_bh`, :c:func:`xa_erase_irq`, :c:func:`xa_cmpxchg_bh`
+and :c:func:`xa_cmpxchg_irq`.
 
 Sometimes you need to protect access to the XArray with a mutex because
 that lock sits above another mutex in the locking hierarchy.  That does

Documentation/media/uapi/v4l/extended-controls.rst

View file

diff --git a/Documentation/media/uapi/v4l/extended-controls.rst b/Documentation/media/uapi/v4l/extended-controls.rst
index 65a1d87..027358b 100644
--- a/Documentation/media/uapi/v4l/extended-controls.rst
+++ b/Documentation/media/uapi/v4l/extended-controls.rst
@@ -1505,6 +1505,11 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -
     configuring a stateless hardware decoding pipeline for MPEG-2.
     The bitstream parameters are defined according to :ref:`mpeg2part2`.
 
+    .. note::
+
+       This compound control is not yet part of the public kernel API and
+       it is expected to change.
+
 .. c:type:: v4l2_ctrl_mpeg2_slice_params
 
 .. cssclass:: longtable
@@ -1625,6 +1630,11 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -
     Specifies quantization matrices (as extracted from the bitstream) for the
     associated MPEG-2 slice data.
 
+    .. note::
+
+       This compound control is not yet part of the public kernel API and
+       it is expected to change.
+
 .. c:type:: v4l2_ctrl_mpeg2_quantization
 
 .. cssclass:: longtable

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 46bf7ff..75e8e55 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1739,13 +1739,17 @@ ARM/Mediatek SoC support
 M:	Matthias Brugger <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 L:	[email protected] (moderated for non-subscribers)
+W:	https://mtk.bcnfs.org/
+C:	irc://chat.freenode.net/linux-mediatek
 S:	Maintained
 F:	arch/arm/boot/dts/mt6*
 F:	arch/arm/boot/dts/mt7*
 F:	arch/arm/boot/dts/mt8*
 F:	arch/arm/mach-mediatek/
 F:	arch/arm64/boot/dts/mediatek/
+F:	drivers/soc/mediatek/
 N:	mtk
+N:	mt[678]
 K:	mediatek
 
 ARM/Mediatek USB3 PHY DRIVER
@@ -4843,6 +4847,7 @@ F:	include/uapi/drm/vmwgfx_drm.h
 
 DRM DRIVERS
 M:	David Airlie <[email protected]>
+M:	Daniel Vetter <[email protected]>
 L:	[email protected]
 T:	git git://anongit.freedesktop.org/drm/drm
 B:	https://bugs.freedesktop.org/
@@ -8939,7 +8944,7 @@ F:	arch/mips/boot/dts/img/pistachio_marduk.dts
 
 MARVELL 88E6XXX ETHERNET SWITCH FABRIC DRIVER
 M:	Andrew Lunn <[email protected]>
-M:	Vivien Didelot <[email protected]>
+M:	Vivien Didelot <[email protected]>
 L:	[email protected]
 S:	Maintained
 F:	drivers/net/dsa/mv88e6xxx/
@@ -9444,6 +9449,13 @@ F:	drivers/media/platform/mtk-vpu/
 F:	Documentation/devicetree/bindings/media/mediatek-vcodec.txt
 F:	Documentation/devicetree/bindings/media/mediatek-vpu.txt
 
+MEDIATEK MT76 WIRELESS LAN DRIVER
+M:	Felix Fietkau <[email protected]>
+M:	Lorenzo Bianconi <[email protected]>
+L:	[email protected]
+S:	Maintained
+F:	drivers/net/wireless/mediatek/mt76/
+
 MEDIATEK MT7601U WIRELESS LAN DRIVER
 M:	Jakub Kicinski <[email protected]>
 L:	[email protected]
@@ -10006,12 +10018,9 @@ S:	Odd Fixes
 F:	drivers/media/radio/radio-miropcm20*
 
 MMP SUPPORT
-M:	Eric Miao <[email protected]>
-M:	Haojian Zhuang <[email protected]>
+R:	Lubomir Rintel <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
-T:	git git://github.com/hzhuang1/linux.git
-T:	git git://git.linaro.org/people/ycmiao/pxa-linux.git
-S:	Maintained
+S:	Odd Fixes
 F:	arch/arm/boot/dts/mmp*
 F:	arch/arm/mach-mmp/
 
@@ -10417,7 +10426,7 @@ F:	drivers/net/wireless/
 
 NETWORKING [DSA]
 M:	Andrew Lunn <[email protected]>
-M:	Vivien Didelot <[email protected]>
+M:	Vivien Didelot <[email protected]>
 M:	Florian Fainelli <[email protected]>
 S:	Maintained
 F:	Documentation/devicetree/bindings/net/dsa/

Makefile

View file

diff --git a/Makefile b/Makefile
index f2c3423..56d5270 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 VERSION = 4
 PATCHLEVEL = 20
 SUBLEVEL = 0
-EXTRAVERSION = -rc6
+EXTRAVERSION = -rc7
 NAME = Shy Crocodile
 
 # *DOCUMENTATION*

arch/alpha/kernel/setup.c

View file

diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c
index a37fd99..4b5b1b2 100644
--- a/arch/alpha/kernel/setup.c
+++ b/arch/alpha/kernel/setup.c
@@ -634,6 +634,7 @@ setup_arch(char **cmdline_p)
 
 	/* Find our memory.  */
 	setup_memory(kernel_end);
+	memblock_set_bottom_up(true);
 
 	/* First guess at cpu cache sizes.  Do this before init_arch.  */
 	determine_cpu_caches(cpu->type);

arch/alpha/mm/numa.c

View file

diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c
index 7484655..d0b7337 100644
--- a/arch/alpha/mm/numa.c
+++ b/arch/alpha/mm/numa.c
@@ -144,14 +144,14 @@ setup_memory_node(int nid, void *kernel_end)
 	if (!nid && (node_max_pfn < end_kernel_pfn || node_min_pfn > start_kernel_pfn))
 		panic("kernel loaded out of ram");
 
+	memblock_add(PFN_PHYS(node_min_pfn),
+		     (node_max_pfn - node_min_pfn) << PAGE_SHIFT);
+
 	/* Zone start phys-addr must be 2^(MAX_ORDER-1) aligned.
 	   Note that we round this down, not up - node memory
 	   has much larger alignment than 8Mb, so it's safe. */
 	node_min_pfn &= ~((1UL << (MAX_ORDER-1))-1);
 
-	memblock_add(PFN_PHYS(node_min_pfn),
-		     (node_max_pfn - node_min_pfn) << PAGE_SHIFT);
-
 	NODE_DATA(nid)->node_start_pfn = node_min_pfn;
 	NODE_DATA(nid)->node_present_pages = node_max_pfn - node_min_pfn;
 

arch/arm/boot/dts/arm-realview-pb1176.dts

View file

diff --git a/arch/arm/boot/dts/arm-realview-pb1176.dts b/arch/arm/boot/dts/arm-realview-pb1176.dts
index f2a1d25..83e0fbc 100644
--- a/arch/arm/boot/dts/arm-realview-pb1176.dts
+++ b/arch/arm/boot/dts/arm-realview-pb1176.dts
@@ -45,7 +45,7 @@
 	};
 
 	/* The voltage to the MMC card is hardwired at 3.3V */
-	vmmc: fixedregulator@0 {
+	vmmc: regulator-vmmc {
 		compatible = "regulator-fixed";
 		regulator-name = "vmmc";
 		regulator-min-microvolt = <3300000>;
@@ -53,7 +53,7 @@
 		regulator-boot-on;
         };
 
-	veth: fixedregulator@0 {
+	veth: regulator-veth {
 		compatible = "regulator-fixed";
 		regulator-name = "veth";
 		regulator-min-microvolt = <3300000>;

arch/arm/boot/dts/arm-realview-pb11mp.dts

View file

diff --git a/arch/arm/boot/dts/arm-realview-pb11mp.dts b/arch/arm/boot/dts/arm-realview-pb11mp.dts
index 7f9cbdf..2f6aa24 100644
--- a/arch/arm/boot/dts/arm-realview-pb11mp.dts
+++ b/arch/arm/boot/dts/arm-realview-pb11mp.dts
@@ -145,7 +145,7 @@
 	};
 
 	/* The voltage to the MMC card is hardwired at 3.3V */
-	vmmc: fixedregulator@0 {
+	vmmc: regulator-vmmc {
 		compatible = "regulator-fixed";
 		regulator-name = "vmmc";
 		regulator-min-microvolt = <3300000>;
@@ -153,7 +153,7 @@
 		regulator-boot-on;
         };
 
-	veth: fixedregulator@0 {
+	veth: regulator-veth {
 		compatible = "regulator-fixed";
 		regulator-name = "veth";
 		regulator-min-microvolt = <3300000>;

arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts

View file

diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
index 4adb85e..9376224 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
@@ -31,7 +31,7 @@
 
 	wifi_pwrseq: wifi-pwrseq {
 		compatible = "mmc-pwrseq-simple";
-		reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
 	};
 };
 

arch/arm/boot/dts/bcm2837-rpi-3-b.dts

View file

diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
index c318bcb..89e6fd5 100644
--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
@@ -26,7 +26,7 @@
 
 	wifi_pwrseq: wifi-pwrseq {
 		compatible = "mmc-pwrseq-simple";
-		reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>;
+		reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
 	};
 };
 

arch/arm/boot/dts/imx7d-nitrogen7.dts

View file

diff --git a/arch/arm/boot/dts/imx7d-nitrogen7.dts b/arch/arm/boot/dts/imx7d-nitrogen7.dts
index d8aac4a..177d21f 100644
--- a/arch/arm/boot/dts/imx7d-nitrogen7.dts
+++ b/arch/arm/boot/dts/imx7d-nitrogen7.dts
@@ -86,13 +86,17 @@
 		compatible = "regulator-fixed";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
-		clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;
-		clock-names = "slow";
 		regulator-name = "reg_wlan";
 		startup-delay-us = <70000>;
 		gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;
 		enable-active-high;
 	};
+
+	usdhc2_pwrseq: usdhc2_pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;
+		clock-names = "ext_clock";
+	};
 };
 
 &adc1 {
@@ -375,6 +379,7 @@
 	bus-width = <4>;
 	non-removable;
 	vmmc-supply = <&reg_wlan>;
+	mmc-pwrseq = <&usdhc2_pwrseq>;
 	cap-power-off-card;
 	keep-power-in-suspend;
 	status = "okay";

arch/arm/boot/dts/imx7d-pico.dtsi

View file

diff --git a/arch/arm/boot/dts/imx7d-pico.dtsi b/arch/arm/boot/dts/imx7d-pico.dtsi
index 21973eb..f27b384 100644
--- a/arch/arm/boot/dts/imx7d-pico.dtsi
+++ b/arch/arm/boot/dts/imx7d-pico.dtsi
@@ -100,6 +100,19 @@
 		regulator-min-microvolt = <1800000>;
 		regulator-max-microvolt = <1800000>;
 	};
+
+	usdhc2_pwrseq: usdhc2_pwrseq {
+		compatible = "mmc-pwrseq-simple";
+		clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;
+		clock-names = "ext_clock";
+	};
+};
+
+&clks {
+	assigned-clocks = <&clks IMX7D_CLKO2_ROOT_SRC>,
+			  <&clks IMX7D_CLKO2_ROOT_DIV>;
+	assigned-clock-parents = <&clks IMX7D_CKIL>;
+	assigned-clock-rates = <0>, <32768>;
 };
 
 &i2c4 {
@@ -199,12 +212,13 @@
 
 &usdhc2 { /* Wifi SDIO */
 	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_usdhc2>;
+	pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_wifi_clk>;
 	no-1-8-v;
 	non-removable;
 	keep-power-in-suspend;
 	wakeup-source;
 	vmmc-supply = <&reg_ap6212>;
+	mmc-pwrseq = <&usdhc2_pwrseq>;
 	status = "okay";
 };
 
@@ -301,6 +315,12 @@
 };
 
 &iomuxc_lpsr {
+	pinctrl_wifi_clk: wificlkgrp {
+		fsl,pins = <
+			MX7D_PAD_LPSR_GPIO1_IO03__CCM_CLKO2	0x7d
+		>;
+	};
+
 	pinctrl_wdog: wdoggrp {
 		fsl,pins = <
 			MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B	0x74

arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts

View file

diff --git a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
index 742d294..583a5a0 100644
--- a/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
+++ b/arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts
@@ -314,8 +314,8 @@
 
 &reg_dldo3 {
 	regulator-always-on;
-	regulator-min-microvolt = <2500000>;
-	regulator-max-microvolt = <2500000>;
+	regulator-min-microvolt = <3300000>;
+	regulator-max-microvolt = <3300000>;
 	regulator-name = "vcc-pd";
 };
 

arch/arm/mach-imx/cpuidle-imx6sx.c

View file

diff --git a/arch/arm/mach-imx/cpuidle-imx6sx.c b/arch/arm/mach-imx/cpuidle-imx6sx.c
index 243a108..fd0053e 100644
--- a/arch/arm/mach-imx/cpuidle-imx6sx.c
+++ b/arch/arm/mach-imx/cpuidle-imx6sx.c
@@ -110,7 +110,7 @@ int __init imx6sx_cpuidle_init(void)
 	 * except for power up sw2iso which need to be
 	 * larger than LDO ramp up time.
 	 */
-	imx_gpc_set_arm_power_up_timing(2, 1);
+	imx_gpc_set_arm_power_up_timing(0xf, 1);
 	imx_gpc_set_arm_power_down_timing(1, 1);
 
 	return cpuidle_register(&imx6sx_cpuidle_driver, NULL);

arch/arm/mach-mmp/cputype.h

View file

diff --git a/arch/arm/mach-mmp/cputype.h b/arch/arm/mach-mmp/cputype.h
index 446edae..a96abcf 100644
--- a/arch/arm/mach-mmp/cputype.h
+++ b/arch/arm/mach-mmp/cputype.h
@@ -44,10 +44,12 @@ static inline int cpu_is_pxa910(void)
 #define cpu_is_pxa910()	(0)
 #endif
 
-#ifdef CONFIG_CPU_MMP2
+#if defined(CONFIG_CPU_MMP2) || defined(CONFIG_MACH_MMP2_DT)
 static inline int cpu_is_mmp2(void)
 {
-	return (((read_cpuid_id() >> 8) & 0xff) == 0x58);
+	return (((read_cpuid_id() >> 8) & 0xff) == 0x58) &&
+		(((mmp_chip_id & 0xfff) == 0x410) ||
+		 ((mmp_chip_id & 0xfff) == 0x610));
 }
 #else
 #define cpu_is_mmp2()	(0)

arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi

View file

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
index 64632c8..01ea662 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi
@@ -20,28 +20,24 @@
 			compatible = "arm,cortex-a72", "arm,armv8";
 			reg = <0x000>;
 			enable-method = "psci";
-			cpu-idle-states = <&CPU_SLEEP_0>;
 		};
 		cpu1: cpu@1 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a72", "arm,armv8";
 			reg = <0x001>;
 			enable-method = "psci";
-			cpu-idle-states = <&CPU_SLEEP_0>;
 		};
 		cpu2: cpu@100 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a72", "arm,armv8";
 			reg = <0x100>;
 			enable-method = "psci";
-			cpu-idle-states = <&CPU_SLEEP_0>;
 		};
 		cpu3: cpu@101 {
 			device_type = "cpu";
 			compatible = "arm,cortex-a72", "arm,armv8";
 			reg = <0x101>;
 			enable-method = "psci";
-			cpu-idle-states = <&CPU_SLEEP_0>;
 		};
 	};
 };

arch/arm64/boot/dts/marvell/armada-ap806.dtsi

View file

diff --git a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
index 073610a..7d94c1f 100644
--- a/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-ap806.dtsi
@@ -28,33 +28,6 @@
 		method = "smc";
 	};
 
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		idle_states {
-			entry_method = "arm,pcsi";
-
-			CPU_SLEEP_0: cpu-sleep-0 {
-				compatible = "arm,idle-state";
-				local-timer-stop;
-				arm,psci-suspend-param = <0x0010000>;
-				entry-latency-us = <80>;
-				exit-latency-us  = <160>;
-				min-residency-us = <320>;
-			};
-
-			CLUSTER_SLEEP_0: cluster-sleep-0 {
-				compatible = "arm,idle-state";
-				local-timer-stop;
-				arm,psci-suspend-param = <0x1010000>;
-				entry-latency-us = <500>;
-				exit-latency-us = <1000>;
-				min-residency-us = <2500>;
-			};
-		};
-	};
-
 	ap806 {
 		#address-cells = <2>;
 		#size-cells = <2>;

arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts

View file

diff --git a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
index 5d6005c..710c5c3 100644
--- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
@@ -16,8 +16,13 @@
 	model = "Bananapi BPI-R64";
 	compatible = "bananapi,bpi-r64", "mediatek,mt7622";
 
+	aliases {
+		serial0 = &uart0;
+	};
+
 	chosen {
-		bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n1 swiotlb=512";
+		stdout-path = "serial0:115200n8";
+		bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512";
 	};
 
 	cpus {

arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts

View file

diff --git a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
index dcad086..3f78334 100644
--- a/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
+++ b/arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts
@@ -17,8 +17,13 @@
 	model = "MediaTek MT7622 RFB1 board";
 	compatible = "mediatek,mt7622-rfb1", "mediatek,mt7622";
 
+	aliases {
+		serial0 = &uart0;
+	};
+
 	chosen {
-		bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n1 swiotlb=512";
+		stdout-path = "serial0:115200n8";
+		bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512";
 	};
 
 	cpus {

arch/arm64/boot/dts/mediatek/mt7622.dtsi

View file

diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
index fe0c875..14a1028 100644
--- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -227,16 +227,6 @@
 		#reset-cells = <1>;
 	};
 
-	timer: timer@10004000 {
-		compatible = "mediatek,mt7622-timer",
-			     "mediatek,mt6577-timer";
-		reg = <0 0x10004000 0 0x80>;
-		interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_LOW>;
-		clocks = <&infracfg CLK_INFRA_APXGPT_PD>,
-			 <&topckgen CLK_TOP_RTC>;
-		clock-names = "system-clk", "rtc-clk";
-	};
-
 	scpsys: scpsys@10006000 {
 		compatible = "mediatek,mt7622-scpsys",
 			     "syscon";

arch/arm64/include/asm/memory.h

View file

diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h
index b964429..f0a5c95 100644
--- a/arch/arm64/include/asm/memory.h
+++ b/arch/arm64/include/asm/memory.h
@@ -35,15 +35,6 @@
 #define PCI_IO_SIZE		SZ_16M
 
 /*
- * Log2 of the upper bound of the size of a struct page. Used for sizing
- * the vmemmap region only, does not affect actual memory footprint.
- * We don't use sizeof(struct page) directly since taking its size here
- * requires its definition to be available at this point in the inclusion
- * chain, and it may not be a power of 2 in the first place.
- */
-#define STRUCT_PAGE_MAX_SHIFT	6
-
-/*
  * VMEMMAP_SIZE - allows the whole linear region to be covered by
  *                a struct page array
  */

arch/arm64/mm/dma-mapping.c

View file

diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c
index a3ac262..a537044 100644
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
@@ -429,9 +429,9 @@ static void *__iommu_alloc_attrs(struct device *dev, size_t size,
 						   prot,
 						   __builtin_return_address(0));
 		if (addr) {
-			memset(addr, 0, size);
 			if (!coherent)
 				__dma_flush_area(page_to_virt(page), iosize);
+			memset(addr, 0, size);
 		} else {
 			iommu_dma_unmap_page(dev, *handle, iosize, 0, attrs);
 			dma_release_from_contiguous(dev, page,

arch/arm64/mm/init.c

View file

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 9b432d9..0340e45 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -610,14 +610,6 @@ void __init mem_init(void)
 	BUILD_BUG_ON(TASK_SIZE_32			> TASK_SIZE_64);
 #endif
 
-#ifdef CONFIG_SPARSEMEM_VMEMMAP
-	/*
-	 * Make sure we chose the upper bound of sizeof(struct page)
-	 * correctly when sizing the VMEMMAP array.
-	 */
-	BUILD_BUG_ON(sizeof(struct page) > (1 << STRUCT_PAGE_MAX_SHIFT));
-#endif
-
 	if (PAGE_SIZE >= 16384 && get_num_physpages() <= 128) {
 		extern int sysctl_overcommit_memory;
 		/*

arch/powerpc/boot/Makefile

View file

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 3935436..ed98831 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -197,7 +197,7 @@ $(obj)/empty.c:
 $(obj)/zImage.coff.lds $(obj)/zImage.ps3.lds : $(obj)/%: $(srctree)/$(src)/%.S
 	$(Q)cp $< $@
 
-$(obj)/serial.c: $(obj)/autoconf.h
+$(srctree)/$(src)/serial.c: $(obj)/autoconf.h
 
 $(obj)/autoconf.h: $(obj)/%: $(objtree)/include/generated/%
 	$(Q)cp $< $@