Merge tag 'android11-5.4.147_r00' android11-5.4

This is the merge of the upstream LTS release of 5.4.147 into the android11-5.4 branch. It contains the following commits: 5e10f36746 Merge 5.4.147 into android11-5.4-lts 48a24510c3 Linux 5.4.147 1f8ee02449 Revert "time: Handle negative seconds correctly in timespec64_to_ns()" dc15f641c6 Revert "posix-cpu-timers: Force next expiration recalc after itimer reset" 541e757944 Revert "block: nbd: add sanity check for first_minor" 5f3ecbf4d5 Revert "Bluetooth: Move shutdown callback before flushing tx and rx queue" d756462d85 Merge 5.4.146 into android11-5.4-lts 245f15a48c Linux 5.4.146 b40facee46 clk: kirkwood: Fix a clocking boot regression 8810c51077 backlight: pwm_bl: Improve bootloader/kernel device handover 5de2ee621b fbmem: don't allow too huge resolutions 4a95b04afa IMA: remove the dependency on CRYPTO_MD5 c69935f0b0 IMA: remove -Wmissing-prototypes warning 85b0726d5b fuse: flush extending writes 8a98ced6e1 fuse: truncate pagecache on atomic_o_trunc 06dad664d4 KVM: nVMX: Unconditionally clear nested.pi_pending on nested VM-Enter 1735cec1e8 KVM: x86: Update vCPU's hv_clock before back to guest when tsc_offset is adjusted 20fff3ef33 KVM: s390: index kvm->arch.idle_mask by vcpu_idx 0323ab5b25 x86/resctrl: Fix a maybe-uninitialized build warning treated as error 51f4575ca1 perf/x86/amd/ibs: Extend PERF_PMU_CAP_NO_EXCLUDE to IBS Op 03c3e977ee tty: Fix data race between tiocsti() and flush_to_ldisc() 7a25a0a94c time: Handle negative seconds correctly in timespec64_to_ns() ae968e270f bpf: Fix pointer arithmetic mask tightening under state pruning a0a4778fea bpf: verifier: Allocate idmap scratch in verifier env f5893af270 bpf: Fix leakage due to insufficient speculative store bypass mitigation e80c3533c3 bpf: Introduce BPF nospec instruction for mitigating Spectre v4 1c9424a765 ipv4: fix endianness issue in inet_rtm_getroute_build_skb() b3fe6d1921 octeontx2-af: Fix loop in free and unmap counter 8216d7157b net: qualcomm: fix QCA7000 checksum handling 4648917e49 net: sched: Fix qdisc_rate_table refcount leak when get tcf_block failed e46e23c289 ipv4: make exception cache less predictible f73cbdd1b8 ipv6: make exception cache less predictible aa167dcde4 brcmfmac: pcie: fix oops on failure to resume and reprobe 5debec63a2 bcma: Fix memory leak for internally-handled cores 574e563649 ath6kl: wmi: fix an error code in ath6kl_wmi_sync_point() d946e685d6 ASoC: wcd9335: Disable irq on slave ports in the remove function f3ec07f832 ASoC: wcd9335: Fix a memory leak in the error handling path of the probe function a6088f4ed3 ASoC: wcd9335: Fix a double irq free in the remove function 7bfa680f3b tty: serial: fsl_lpuart: fix the wrong mapbase value 0f1375fa69 usb: bdc: Fix an error handling path in 'bdc_probe()' when no suitable DMA config is available 06203abb72 usb: ehci-orion: Handle errors of clk_prepare_enable() in probe a0a9ecca2d i2c: mt65xx: fix IRQ check b444064a0e CIFS: Fix a potencially linear read overflow e37eeaf950 bpf: Fix possible out of bound write in narrow load handling fb8e695e9c mmc: moxart: Fix issue with uninitialized dma_slave_config 48b1f117e8 mmc: dw_mmc: Fix issue with uninitialized dma_slave_config 57314d8414 ASoC: Intel: Skylake: Fix module resource and format selection 92397571c2 ASoC: Intel: Skylake: Leave data as is when invoking TLV IPCs b58cf18e38 rsi: fix an error code in rsi_probe() d82fe3dd0b rsi: fix error code in rsi_load_9116_firmware() 4be8deab6f i2c: s3c2410: fix IRQ check da3e5f3204 i2c: iop3xx: fix deferred probing 2da3272ae0 Bluetooth: add timeout sanity check to hci_inquiry 70d71611eb mm/swap: consider max pages in iomap_swapfile_add_extent 8f5e26053c usb: gadget: mv_u3d: request_irq() after initializing UDC eb3c6a2501 nfsd4: Fix forced-expiry locking 81e69d3fdd lockd: Fix invalid lockowner cast after vfs_test_lock e1c02e2e6a mac80211: Fix insufficient headroom issue for AMSDU 606668e24a usb: phy: tahvo: add IRQ check ecf18ac8ff usb: host: ohci-tmio: add IRQ check abbcd61d09 Bluetooth: Move shutdown callback before flushing tx and rx queue 93ec1fd04f usb: gadget: udc: renesas_usb3: Fix soc_device_match() abuse 30d9607bcd usb: phy: twl6030: add IRQ checks e1473ac285 usb: phy: fsl-usb: add IRQ check 9535f55d0c usb: gadget: udc: at91: add IRQ check 05e5b16b79 drm/msm/dsi: Fix some reference counted resource leaks 5ccb04c6e1 Bluetooth: fix repeated calls to sco_sock_kill c2451d5439 counter: 104-quad-8: Return error when invalid mode during ceiling_write a1194b805c arm64: dts: exynos: correct GIC CPU interfaces address range on Exynos7 1b6fcd1037 drm/msm/dpu: make dpu_hw_ctl_clear_all_blendstages clear necessary LMs 156eaacba3 PM: EM: Increase energy calculation precision 5537dc810b Bluetooth: increase BTNAMSIZ to 21 chars to fix potential buffer overflow c0faa638f0 debugfs: Return error during {full/open}_proxy_open() on rmmod f44714b4eb soc: qcom: smsm: Fix missed interrupts if state changes while masked e7997fe3e9 PCI: PM: Enable PME if it can be signaled from D3cold 9e570f3d47 PCI: PM: Avoid forcing PCI_D0 for wakeup reasons inconsistently f865b316cc media: venus: venc: Fix potential null pointer dereference on pointer fmt d2ea2f0725 media: em28xx-input: fix refcount bug in em28xx_usb_disconnect ebf570042b leds: trigger: audio: Add an activate callback to ensure the initial brightness is set 0a01dc7766 leds: lt3593: Put fwnode in any case during ->probe() e39c73563a i2c: highlander: add IRQ check fba783ddd9 net: cipso: fix warnings in netlbl_cipsov4_add_std 9fdac650c4 cgroup/cpuset: Fix a partition bug with hotplug ffde058199 net/mlx5e: Prohibit inner indir TIRs in IPoIB 87f817c560 ARM: dts: meson8b: ec100: Fix the pwm regulator supply properties e55d7cbe1f ARM: dts: meson8b: mxq: Fix the pwm regulator supply properties 4b0bbc412b ARM: dts: meson8b: odroidc1: Fix the pwm regulator supply properties f7058060c0 ARM: dts: meson8: Use a higher default GPU clock frequency 37ed461b52 tcp: seq_file: Avoid skipping sk during tcp_seek_last_pos 9521362753 drm/amdgpu/acp: Make PM domain really work 252fad3d02 netns: protect netns ID lookups with RCU bd1cd32caa 6lowpan: iphc: Fix an off-by-one check of array index c4895cf45f Bluetooth: sco: prevent information leak in sco_conn_defer_accept() a96eb96ce4 media: coda: fix frame_mem_ctrl for YUV420 and YVU420 formats 7163014d7d media: go7007: remove redundant initialization 8101492879 media: dvb-usb: Fix error handling in dvb_usb_i2c_init fa8aaa7690 media: dvb-usb: fix uninit-value in vp702x_read_mac_addr 88933f9c93 media: dvb-usb: fix uninit-value in dvb_usb_adapter_dvb_init f81c89614e soc: qcom: rpmhpd: Use corner in power_off 5b3987f583 arm64: dts: renesas: r8a77995: draak: Remove bogus adv7511w properties 6c106c7320 ARM: dts: aspeed-g6: Fix HVI3C function-group in pinctrl dtsi 004778bf39 bpf: Fix potential memleak and UAF in the verifier. fa4802c54e bpf: Fix a typo of reuseport map in bpf.h. 9a193caf9d media: cxd2880-spi: Fix an error handling path 34106f5260 soc: rockchip: ROCKCHIP_GRF should not default to y, unconditionally b928930530 media: TDA1997x: enable EDID support 43282ca83a drm/panfrost: Fix missing clk_disable_unprepare() on error in panfrost_clk_init() fc9cf22290 EDAC/i10nm: Fix NVDIMM detection 32d8a3684b spi: spi-zynq-qspi: use wait_for_completion_timeout to make zynq_qspi_exec_mem_op not interruptible 4206dbc985 spi: sprd: Fix the wrong WDG_LOAD_VAL 1f70517eac regulator: vctrl: Avoid lockdep warning in enable/disable ops d255d6a645 regulator: vctrl: Use locked regulator_get_voltage in probe path 013177ccc4 certs: Trigger creation of RSA module signing key if it's not an RSA key cc74533a47 crypto: qat - use proper type for vf_mask b3fa499d72 block: nbd: add sanity check for first_minor c60a31db39 clocksource/drivers/sh_cmt: Fix wrong setting if don't request IRQ for clock source channel 6b10d3d3a9 lib/mpi: use kcalloc in mpi_resize 57c8e2ea47 genirq/timings: Fix error return code in irq_timings_test_irqs() 2d00b22c8b spi: spi-pic32: Fix issue with uninitialized dma_slave_config b29593d069 spi: spi-fsl-dspi: Fix issue with uninitialized dma_slave_config 449884aeb3 sched: Fix UCLAMP_FLAG_IDLE setting 67da2d9c9e m68k: emu: Fix invalid free in nfeth_cleanup() c68ba4a708 s390/debug: fix debug area life cycle 7a67a00ea8 s390/kasan: fix large PMD pages address alignment check 98296eb3de udf_get_extendedattr() had no boundary checks. ae4240d1f4 fcntl: fix potential deadlock for &fasync_struct.fa_lock a6273c8c2a crypto: qat - do not export adf_iov_putmsg() 7dfa7bb69e crypto: qat - fix naming for init/shutdown VF to PF notifications 843b4e713a crypto: qat - fix reuse of completion variable 4a98826455 crypto: qat - handle both source of interrupt in VF ISR c2b3f81125 crypto: qat - do not ignore errors from enable_vf2pf_comms() 1c189ccef0 libata: fix ata_host_start() e55b627d6e s390/cio: add dev_busid sysfs entry for each subchannel 0423517520 power: supply: max17042_battery: fix typo in MAx17042_TOFF eb45ae88bf nvmet: pass back cntlid on successful completion 6cb5d6ae68 nvme-rdma: don't update queue count when failing to set io queues 3073ec7f06 nvme-tcp: don't update queue count when failing to set io queues 93cf19b4d9 bcache: add proper error unwinding in bcache_device_init e55f20798f isofs: joliet: Fix iocharset=utf8 mount option 0f5cd92e5e udf: Fix iocharset=utf8 mount option 86987cf0fb udf: Check LVID earlier cc608af36e hrtimer: Ensure timerfd notification for HIGHRES=n a845787830 hrtimer: Avoid double reprogramming in __hrtimer_start_range_ns() c322a963d5 posix-cpu-timers: Force next expiration recalc after itimer reset 28996dbb8a rcu/tree: Handle VM stoppage in stall detection b7c560ae51 sched/deadline: Fix missing clock update in migrate_task_rq_dl() 40db13e3ef crypto: omap-sham - clear dma flags only after omap_sham_update_dma_stop() ebf0f71ae3 power: supply: axp288_fuel_gauge: Report register-address on readb / writeb errors bba2b82d1b sched/deadline: Fix reset_on_fork reporting of DL tasks 53a6ef40c6 crypto: mxs-dcp - Check for DMA mapping errors 344a38789a regmap: fix the offset of register error log a5e42516a6 locking/mutex: Fix HANDOFF condition f019fa5605 Merge branch 'android11-5.4' into 'android11-5.4-lts' 80833b7bc2 ANDROID: GKI: db845c: Update symbols list and ABI for lts v5.4.144 9ccfa71ab0 Merge 5.4.145 into android11-5.4-lts a0f68fb55e Linux 5.4.145 d83f0b39e7 PCI: Call Max Payload Size-related fixup quirks early 0c8277e334 x86/reboot: Limit Dell Optiplex 990 quirk to early BIOS versions d31a4c35b9 xhci: fix unsafe memory usage in xhci tracing e00d39ca92 usb: mtu3: fix the wrong HS mult value c3ffd35014 usb: mtu3: use @mult for HS isoc or intr 00b6325590 usb: host: xhci-rcar: Don't reload firmware after the completion 7a74ae301c ALSA: usb-audio: Add registration quirk for JBL Quantum 800 c1ea74f642 Revert "btrfs: compression: don't try to compress if we don't have enough pages" f05c74e104 x86/events/amd/iommu: Fix invalid Perf result due to IOMMU PMC power-gating b1ca1665e6 Revert "r8169: avoid link-up interrupt issue on RTL8106e if user enables ASPM" cf1222b877 mm/page_alloc: speed up the iteration of max_order 17d409c83e net: ll_temac: Remove left-over debug message ccadb91437 powerpc/boot: Delete unneeded .globl _zimage_start 295501c77c ipv4/icmp: l3mdev: Perform icmp error route lookup on source device routing table (v2) 6dec8e17b8 USB: serial: mos7720: improve OOM-handling in read_mos_reg() d84708451d igmp: Add ip_mc_list lock in ip_check_mc_rcu cd8ad6ed9a media: stkwebcam: fix memory leak in stk_camera_probe 9febc9153f ARC: wireup clone3 syscall 417b11d325 ALSA: pcm: fix divide error in snd_pcm_lib_ioctl cf28619cd9 ALSA: hda/realtek: Workaround for conflicting SSID on ASUS ROG Strix G17 a8146f1490 ARM: 8918/2: only build return_address() if needed ebad44b643 cryptoloop: add a deprecation warning d12526ddf5 perf/x86/amd/power: Assign pmu.module be1f76fcee perf/x86/amd/ibs: Work around erratum #1197 861118d64e perf/x86/intel/pt: Fix mask of num_address_ranges 40d23de514 qede: Fix memset corruption 468623f696 net: macb: Add a NULL check on desc_ptp 50f73f31ae qed: Fix the VF msix vectors flow 92abb09f7a reset: reset-zynqmp: Fixed the argument data type b820c4c651 gpu: ipu-v3: Fix i.MX IPU-v3 offset calculations for (semi)planar U/V formats 48051387fa xtensa: fix kconfig unmet dependency warning for HAVE_FUTEX_CMPXCHG 56c77c1b52 kthread: Fix PF_KTHREAD vs to_kthread() race af3cf928b9 ubifs: report correct st_size for encrypted symlinks aa4e216156 f2fs: report correct st_size for encrypted symlinks 52d8e5b0ab ext4: report correct st_size for encrypted symlinks 228a4203d8 fscrypt: add fscrypt_symlink_getattr() for computing st_size 9b3849ba66 ext4: fix race writing to an inline_data file while its xattrs are changing 8ac6727e49 Revert "once: Fix panic when module unload" 2e0ca55ea4 Merge 5.4.144 into android11-5.4-lts c6bf0ed9d1 Linux 5.4.144 0634c0f919 audit: move put_tree() to avoid trim_trees refcount underflow and UAF cab0003311 net: don't unconditionally copy_from_user a struct ifreq for socket ioctls 6752b3b062 Revert "parisc: Add assembly implementations for memset, strlen, strcpy, strncpy and strcat" 67871ada3a Revert "floppy: reintroduce O_NDELAY fix" d7f7eca72e btrfs: fix NULL pointer dereference when deleting device by invalid id e644da7ace arm64: dts: qcom: msm8994-angler: Fix gpio-reserved-ranges 85-88 4f76285f6d KVM: x86/mmu: Treat NX as used (not reserved) for all !TDP shadow MMUs 620681d720 net: dsa: mt7530: fix VLAN traffic leaks again 38adbf21f3 bpf: Fix cast to pointer from integer of different size warning 812ee47ad7 bpf: Track contents of read-only maps as scalars f441801520 vt_kdsetmode: extend console locking 8a19e00450 btrfs: fix race between marking inode needs to be logged and log syncing f3a1ac258e net/rds: dma_map_sg is entitled to merge entries ad6a2bc758 drm/nouveau/disp: power down unused DP links during init 689179c462 drm: Copy drm_wait_vblank to user before returning 18ceb99f84 qed: Fix null-pointer dereference in qed_rdma_create_qp() f1a0db49ab qed: qed ll2 race condition fixes 73ba9e4ece vringh: Use wiov->used to check for read/write desc order ee52acae6f virtio_pci: Support surprise removal of virtio pci device be9b79e841 virtio: Improve vq->broken access to avoid any compiler optimization 0d4ba693db opp: remove WARN when no valid OPPs remain baf56a1d81 perf/x86/intel/uncore: Fix integer overflow on 23 bit left shift of a u32 0ad96094ab usb: gadget: u_audio: fix race condition on endpoint stop c5c2b4ca50 drm/i915: Fix syncmap memory leak 2f3cefa6ab net: hns3: fix get wrong pfc_en when query PFC configuration 6f0c0b35e2 net: hns3: fix duplicate node in VLAN list 951805c23d net: hns3: clear hardware resource when loading driver 08162f6564 rtnetlink: Return correct error on changing device netns f58e42d192 net: marvell: fix MVNETA_TX_IN_PRGRS bit number 45454400a6 xgene-v2: Fix a resource leak in the error handling path of 'xge_probe()' 53b480e68c ip_gre: add validation for csum_start bb8ca7e2e6 RDMA/efa: Free IRQ vectors on error flow e29565b451 e1000e: Fix the max snoop/no-snoop latency for 10M 8a21e84334 IB/hfi1: Fix possible null-pointer dereference in _extend_sdma_tx_descs() 944a50f56f RDMA/bnxt_re: Add missing spin lock initialization 28b1895410 scsi: core: Fix hang of freezing queue between blocking and running device 628c582854 usb: dwc3: gadget: Stop EP0 transfers during pullup disable d9da281c8f usb: dwc3: gadget: Fix dwc3_calc_trbs_left() 21880abf19 USB: serial: option: add new VID/PID to support Fibocom FG150 2e098e91ee Revert "USB: serial: ch341: fix character loss at high transfer rates" 16b281a70a can: usb: esd_usb2: esd_usb2_rx_event(): fix the interchange of the CAN RX and TX error counters 765437d1f0 mm, oom: make the calculation of oom badness more accurate 1cccf5c030 mmc: sdhci-msm: Update the software timeout value for sdhc aec1e470d9 ovl: fix uninitialized pointer read in ovl_lookup_real_one() 57bd5b59f1 once: Fix panic when module unload 5892f910f4 netfilter: conntrack: collect all entries in one cycle 7c95c89b69 ARC: Fix CONFIG_STACKDEPOT a6b049aeef net: qrtr: fix another OOB Read in qrtr_endpoint_post feaf47115a Merge branch 'android11-5.4' into 'android11-5.4-lts' 4a23ba6f12 Merge branch 'android11-5.4' into 'android11-5.4-lts' 406300927b Revert "virtio: Protect vqs list access" 874997f95f Merge 5.4.143 into android11-5.4-lts 2d724dbd16 Revert "net: igmp: fix data-race in igmp_ifc_timer_expire()" 50637be299 Revert "net: igmp: increase size of mr_ifc_count" f5f155f4d6 Revert "PCI/MSI: Protect msi_desc::masked for multi-MSI" 5395faca89 Merge 5.4.142 into android11-5.4-lts 48266f7c1b Merge branch 'android11-5.4' into 'android11-5.4-lts' fd80923202 Linux 5.4.143 4bf1941581 netfilter: nft_exthdr: fix endianness of tcp option cast e4fd994f02 fs: warn about impending deprecation of mandatory locks 41c7f46c89 mm: memcontrol: fix occasional OOMs due to proportional memory.low reclaim 1a3aa81444 mm, memcg: avoid stale protection values when cgroup is above protection 9c1c449dcc ASoC: intel: atom: Fix breakage for PCM buffer address setup 846ba58a7c PCI: Increase D3 delay for AMD Renoir/Cezanne XHCI 548b75f490 btrfs: prevent rename2 from exchanging a subvol with a directory from different parents 0fc6a9c202 ipack: tpci200: fix memory leak in the tpci200_register 280d66b317 ipack: tpci200: fix many double free issues in tpci200_pci_probe cb7aa51031 slimbus: ngd: reset dma setup during runtime pm abce32d0f7 slimbus: messaging: check for valid transaction id 0786d315f5 slimbus: messaging: start transaction ids from 1 instead of zero 20c2f141b1 tracing / histogram: Fix NULL pointer dereference on strcmp() on NULL event name 8fbfebe188 ALSA: hda - fix the 'Capture Switch' value change notifications 85e60614d1 mmc: dw_mmc: Fix hang on data CRC error 4f6c9caf7b ovl: add splice file read write helper 85813f1f9e iavf: Fix ping is lost after untrusted VF had tried to change MAC a498115dcd i40e: Fix ATR queue selection 1b8a8fba78 ovs: clear skb->tstamp in forwarding path 84dbbf5482 net: mdio-mux: Handle -EPROBE_DEFER correctly 453486e79e net: mdio-mux: Don't ignore memory allocation errors 6b70c67849 net: qlcnic: add missed unlock in qlcnic_83xx_flash_read32 da92ce3645 virtio-net: use NETIF_F_GRO_HW instead of NETIF_F_LRO 9aeadce8e3 virtio-net: support XDP when not more queues 3ed7cf8386 vrf: Reset skb conntrack connection on VRF rcv 447b160289 bnxt_en: Add missing DMA memory barriers c9566df334 ptp_pch: Restore dependency on PCI a73b9aa142 net: 6pack: fix slab-out-of-bounds in decode_data 2bc7571343 bnxt: disable napi before canceling DIM a9fb0f1559 bnxt: don't lock the tx queue from napi poll 1fe038030c bpf: Clear zext_dst of dead insns 73a45f75a0 vhost: Fix the calculation in vhost_overflow() b9a59636c4 virtio: Protect vqs list access b264e37b35 dccp: add do-while-0 stubs for dccp_pr_debug macros 9112ebc299 cpufreq: armada-37xx: forbid cpufreq for 1.2 GHz variant cb9a9d5fe6 iommu: Check if group is NULL before remove device 911a8141ef Bluetooth: hidp: use correct wait queue when removing ctrl_wait 5b14c1f16e drm/amd/display: Fix Dynamic bpp issue with 8K30 with Navi 1X f92dc3a89d net: usb: lan78xx: don't modify phy_device state concurrently be70436799 ARM: dts: nomadik: Fix up interrupt controller node names 69aa1a1a56 scsi: core: Fix capacity set to zero after offlinining device 935de7ec7a scsi: core: Avoid printing an error if target_alloc() returns -ENXIO 7a721a1e18 scsi: scsi_dh_rdac: Avoid crash during rdac_bus_attach() 9900e06ae6 scsi: megaraid_mm: Fix end of loop tests for list_for_each_entry() e37cf26bd5 dmaengine: of-dma: router_xlate to return -EPROBE_DEFER if controller is not yet available 12d1322d93 ARM: dts: am43x-epos-evm: Reduce i2c0 bus speed for tps65218 11145efd29 dmaengine: usb-dmac: Fix PM reference leak in usb_dmac_probe() 9c97a05392 dmaengine: xilinx_dma: Fix read-after-free bug when terminating transfers fc566b5a21 USB: core: Avoid WARNings for 0-length descriptor requests 1bd505c814 media: drivers/media/usb: fix memory leak in zr364xx_probe 705660a6d9 media: zr364xx: fix memory leaks in probe() 79dff2a3f4 media: zr364xx: propagate errors from zr364xx_start_readpipe() 7305d6d407 mtd: cfi_cmdset_0002: fix crash when erasing/writing AMD cards 23f77ad13f ath9k: Postpone key cache entry deletion for TXQ frames reference it c6feaf806d ath: Modify ath_key_delete() to not need full key entry b7d593705e ath: Export ath_hw_keysetmac() add283e251 ath9k: Clear key cache explicitly on disabling hardware 0c049ce432 ath: Use safer key clearing with key cache entries 172b91bbbb x86/fpu: Make init_fpstate correct with optimized XSAVE 81d152c8da ext4: fix EXT4_MAX_LOGICAL_BLOCK macro 62d24bac60 Merge branch 'android11-5.4' into 'android11-5.4-lts' c15b830f7c Linux 5.4.142 a17f2f2c89 KVM: nSVM: always intercept VMLOAD/VMSAVE when nested (CVE-2021-3656) 7c1c96ffb6 KVM: nSVM: avoid picking up unsupported bits from L2 in int_ctl (CVE-2021-3653) 456fd88922 iommu/vt-d: Fix agaw for a supported 48 bit guest address width 5b5f855a79 vmlinux.lds.h: Handle clang's module.{c,d}tor sections e9b2b2b29c ceph: take snap_empty_lock atomically with snaprealm refcount change 95ff775df6 ceph: clean up locking annotation for ceph_get_snap_realm and __lookup_snap_realm 1d8c232afb ceph: add some lockdep assertions around snaprealm handling a6ff0f3f9f KVM: VMX: Use current VMCS to query WAITPKG support for MSR emulation ec25d05e18 PCI/MSI: Protect msi_desc::masked for multi-MSI 48d2439c6f PCI/MSI: Use msi_mask_irq() in pci_msi_shutdown() 386ead1d35 PCI/MSI: Correct misleading comments 76d81dec16 PCI/MSI: Do not set invalid bits in MSI mask 6b4bcbf133 PCI/MSI: Enforce MSI[X] entry updates to be visible 4495a41fbc PCI/MSI: Enforce that MSI-X table entry is masked for update 1866c8f6d4 PCI/MSI: Mask all unused MSI-X entries 3b4220c2bf PCI/MSI: Enable and mask MSI-X early 0c8dea3fd5 genirq/timings: Prevent potential array overflow in __irq_timings_store() 4dfe809271 genirq/msi: Ensure deactivation on teardown e3e54a9300 x86/resctrl: Fix default monitoring groups reporting a6b594ad74 x86/ioapic: Force affinity setup before startup db5e266694 x86/msi: Force affinity setup before startup eda32c2188 genirq: Provide IRQCHIP_AFFINITY_PRE_STARTUP 06b3477436 x86/tools: Fix objdump version check again 74451dd8bf powerpc/kprobes: Fix kprobe Oops happens in booke b74145d858 nbd: Aovid double completion of a request ad9550114d vsock/virtio: avoid potential deadlock when vsock device remove b9cd73cce5 xen/events: Fix race in set_evtchn_to_irq 4d3c5c319b net: igmp: increase size of mr_ifc_count 721ff564cc tcp_bbr: fix u32 wrap bug in round logic if bbr_init() called after 2B packets 2ce8a68a31 net: linkwatch: fix failure to restore device state across suspend/resume 33597972a2 net: bridge: fix memleak in br_add_if() f6eee53beb net: dsa: sja1105: fix broken backpressure in .port_fdb_dump 1e6a570d37 net: dsa: lantiq: fix broken backpressure in .port_fdb_dump 564f6bbd0e net: dsa: lan9303: fix broken backpressure in .port_fdb_dump a9243455e8 net: igmp: fix data-race in igmp_ifc_timer_expire() ed957c77b3 net: Fix memory leak in ieee802154_raw_deliver 13a381b8bc net: dsa: microchip: Fix ksz_read64() 991117eeee drm/meson: fix colour distortion from HDR set during vendor u-boot e114f15de8 net/mlx5: Fix return value from tracer initialization f99aa76bb8 psample: Add a fwd declaration for skbuff 9dc8e396c1 iavf: Set RSS LUT and key in reset handle path 23436edae3 net: sched: act_mirred: Reset ct info when mirror/redirect skb 9636fbfe7b ppp: Fix generating ifname when empty IFLA_IFNAME is specified 1c31ee907f net: phy: micrel: Fix link detection on ksz87xx switch" dfeb64f6e2 platform/x86: pcengines-apuv2: Add missing terminating entries to gpio-lookup tables 699db2bb96 platform/x86: pcengines-apuv2: revert wiring up simswitch GPIO as LED af7f1539cf net: dsa: mt7530: add the missing RxUnicast MIB counter d353a61860 ASoC: cs42l42: Fix LRCLK frame start edge b036452082 netfilter: nf_conntrack_bridge: Fix memory leak when error cd36a36ea4 ASoC: cs42l42: Remove duplicate control for WNF filter frequency eb789cc917 ASoC: cs42l42: Fix inversion of ADC Notch Switch control 6a33813363 ASoC: cs42l42: Don't allow SND_SOC_DAIFMT_LEFT_J 55e86f07b8 ASoC: cs42l42: Correct definition of ADC Volume control 22d2e3c6a1 ieee802154: hwsim: fix GPF in hwsim_new_edge_nl 5bac8c2a30 ieee802154: hwsim: fix GPF in hwsim_set_edge_lqi ddcf807fbb libnvdimm/region: Fix label activation vs errors bc97fde4c6 ACPI: NFIT: Fix support for virtual SPA ranges a753e3f334 ceph: reduce contention in ceph_check_delayed_caps() aa04486c41 i2c: dev: zero out array used for i2c reads from userspace c18b28e5ad ASoC: intel: atom: Fix reference to PCM buffer address aab3fa5446 ASoC: xilinx: Fix reference to PCM buffer address 60e2854acf iio: adc: Fix incorrect exit of for-loop bcac522592 iio: humidity: hdc100x: Add margin to the conversion time da7cb80905 iio: adc: ti-ads7950: Ensure CS is deasserted after reading channels 7116e6b9d8 Merge 5.4.141 into android11-5.4-lts b704883aa8 Linux 5.4.141 983d6a6b7e btrfs: don't flush from btrfs_delayed_inode_reserve_metadata ea13f678a3 btrfs: export and rename qgroup_reserve_meta 41a9b8f36d btrfs: qgroup: don't commit transaction when we already hold the handle 38b8485b72 net: xilinx_emaclite: Do not print real IOMEM pointer 654c19a7e8 btrfs: fix lockdep splat when enabling and disabling qgroups c55442cdfd btrfs: qgroup: remove ASYNC_COMMIT mechanism in favor of reserve retry-after-EDQUOT fdaf6a322f btrfs: transaction: Cleanup unused TRANS_STATE_BLOCKED 36af2de520 btrfs: qgroup: try to flush qgroup space when we get -EDQUOT 5c79287c2b btrfs: qgroup: allow to unreserve range without releasing other ranges b7a722fd75 btrfs: make btrfs_qgroup_reserve_data take btrfs_inode dfadea4061 btrfs: make qgroup_free_reserved_data take btrfs_inode 812f39ed5b ovl: prevent private clone if bind mount is not allowed eeb4742501 ppp: Fix generating ppp unit id when ifname is not specified 3460f3959d ALSA: hda: Add quirk for ASUS Flow x13 81d1a3f976 USB:ehci:fix Kunpeng920 ehci hardware problem d28adaabbb KVM: X86: MMU: Use the correct inherited permissions to get shadow page 5f4ab7e25f usb: dwc3: gadget: Avoid runtime resume if disabling pullup 1782c4af6b usb: dwc3: gadget: Disable gadget IRQ during pullup disable 54b7022f28 usb: dwc3: gadget: Clear DEP flags after stop transfers in ep disable e36245a68e usb: dwc3: gadget: Prevent EP queuing while stopping transfers 823f692508 usb: dwc3: gadget: Restart DWC3 gadget when enabling pullup 25a0625fa9 usb: dwc3: gadget: Allow runtime suspend if UDC unbinded 5f081a928d usb: dwc3: Stop active transfers before halting the controller 396f29ea0c tracing: Reject string operand in the histogram expression 28276c280f media: v4l2-mem2mem: always consider OUTPUT queue during poll 236aca7092 tee: Correct inappropriate usage of TEE_SHM_DMA_BUF flag 5b774238e8 KVM: SVM: Fix off-by-one indexing when nullifying last used SEV VMCB c33130b10f Merge 5.4.140 into android11-5.4-lts ac1d54ea63 Merge branch 'android11-5.4' into 'android11-5.4-lts' a998faa9c4 Linux 5.4.140 3c197fdd07 arm64: fix compat syscall return truncation 72fcaf6952 net/qla3xxx: fix schedule while atomic in ql_wait_for_drvr_lock and ql_adapter_reset 742e85fa9e alpha: Send stop IPI to send to online CPUs 26946d2139 virt_wifi: fix error on connect 17d7c9c940 reiserfs: check directory items on read from disk bcad6ece2a reiserfs: add check for root_inode in reiserfs_fill_super e30a88f1f5 libata: fix ata_pio_sector for CONFIG_HIGHMEM a2671d96a3 bpf, selftests: Adjust few selftest result_unpriv outcomes 4892b4f324 perf/x86/amd: Don't touch the AMD64_EVENTSEL_HOSTONLY bit inside the guest d6cf5342fa soc: ixp4xx/qmgr: fix invalid __iomem access a5bf7ef13e spi: meson-spicc: fix memory leak in meson_spicc_remove 27991c78d6 soc: ixp4xx: fix printing resources 07fd256d53 arm64: vdso: Avoid ISB after reading from cntvct_el0 90e498ef3f KVM: x86/mmu: Fix per-cpu counter corruption on 32-bit builds 2e1a80b934 KVM: Do not leak memory for duplicate debugfs directories 43486cd739 KVM: x86: accept userspace interrupt only if no event is injected 1b7b9713a5 md/raid10: properly indicate failure when ending a failed write request 790cb68d35 pcmcia: i82092: fix a null pointer dereference bug 42ac2c6348 timers: Move clearing of base::timer_running under base:: Lock 8211bb20da serial: 8250_pci: Avoid irq sharing for MSI(-X) interrupts. f73dcb5d63 serial: 8250_pci: Enumerate Elkhart Lake UARTs via dedicated driver 607460d386 MIPS: Malta: Do not byte-swap accesses to the CBUS UART 3eb686d01c serial: 8250: Mask out floating 16/32-bit bus bits 3b73a69962 serial: 8250_mtk: fix uart corruption issue when rx power off afdef443a8 serial: tegra: Only print FIFO error message when an error occurs 097a183f9c ext4: fix potential htree corruption when growing large_dir directories ac23a17381 pipe: increase minimum default pipe size to 2 pages f3cae04bd4 media: rtl28xxu: fix zero-length control request e2f6d5b038 staging: rtl8712: get rid of flush_scheduled_work 8f241df0e6 staging: rtl8723bs: Fix a resource leak in sd_int_dpc bbdd4a5162 tpm_ftpm_tee: Free and unregister TEE shared memory during kexec 3c712f14d8 optee: Fix memory leak when failing to register shm pages 0572199b78 tee: add tee_shm_alloc_kernel_buf() b247bf412c optee: Clear stale cache entries during initialization 7da261e6bb tracing / histogram: Give calculation hist_fields a size ba22053f5d scripts/tracing: fix the bug that can't parse raw_trace_func 8d1191f924 clk: fix leak on devm_clk_bulk_get_all() unwind ed5c9a49e6 usb: otg-fsm: Fix hrtimer list corruption 449a705fba usb: gadget: f_hid: idle uses the highest byte for duration 02f336cee5 usb: gadget: f_hid: fixed NULL pointer dereference f780a9580c usb: gadget: f_hid: added GET_IDLE and SET_IDLE handlers 134e27da54 usb: cdns3: Fixed incorrect gadget state df1c6eec4e ALSA: usb-audio: Add registration quirk for JBL Quantum 600 639b45456e ALSA: hda/realtek: add mic quirk for Acer SF314-42 d09639528b firmware_loader: fix use-after-free in firmware_fallback_sysfs 1deb6b9030 firmware_loader: use -ETIMEDOUT instead of -EAGAIN in fw_load_sysfs_fallback 0ee687e672 USB: serial: ftdi_sio: add device ID for Auto-M3 OP-COM v2 01b2c35b05 USB: serial: ch341: fix character loss at high transfer rates 9ed43cfaa7 USB: serial: option: add Telit FD980 composition 0x1056 518e81874c USB: usbtmc: Fix RCU stall warning ff29fe26ab Bluetooth: defer cleanup of resources in hci_unregister_dev() 580c10a40c blk-iolatency: error out if blk_get_queue() failed in iolatency_set_limit() ed169b054b net: vxge: fix use-after-free in vxge_device_unregister c5549876a9 net: fec: fix use-after-free in fec_drv_remove 3fed6dee16 net: pegasus: fix uninit-value in get_interrupt_interval 75cef4fc07 bnx2x: fix an error code in bnx2x_nic_load() 437ee90d7b mips: Fix non-POSIX regexp b1fa6747b9 net: ipv6: fix returned variable type in ip6_skb_dst_mtu 3e63b566d9 nfp: update ethtool reporting of pauseframe control d333503de1 sctp: move the active_key update after sh_keys is added de30346dd3 gpio: tqmx86: really make IRQ optional 9d440b5c1d net: natsemi: Fix missing pci_disable_device() in probe and remove 6934040698 net: phy: micrel: Fix detection of ksz87xx switch 2b8ab7aec0 net: dsa: sja1105: invalidate dynamic FDB entries learned concurrently with statically added ones 71b0a935db net: dsa: sja1105: overwrite dynamic FDB entries with static ones in .port_fdb_add 88b7781609 net, gro: Set inner transport header offset in tcp/udp GRO hook ba3abe3f82 dmaengine: imx-dma: configure the generic DMA type to make it work ee2f81330a media: videobuf2-core: dequeue if start_streaming fails 3377f2f8c6 scsi: sr: Return correct event when media event code is 3 f588d4b7be spi: imx: mx51-ecspi: Fix low-speed CONFIGREG delay calculation b58e3d59a5 spi: imx: mx51-ecspi: Reinstate low-speed CONFIGREG delay 2c1065d40a omap5-board-common: remove not physically existing vdds_1v8_main fixed-regulator 299e3968c0 ARM: dts: am437x-l4: fix typo in can@0 node 9cbe7e21dd clk: stm32f4: fix post divisor setup for I2S/SAI PLLs 3f9eed4462 ALSA: usb-audio: fix incorrect clock source setting 16db40fc4a arm64: dts: armada-3720-turris-mox: remove mrvl,i2c-fast-mode 7c08460773 ARM: dts: imx: Swap M53Menlo pinctrl_power_button/pinctrl_power_out pins 1b1f1aa225 ARM: imx: fix missing 3rd argument in macro imx_mmdc_perf_init aecff98c3e ARM: dts: colibri-imx6ull: limit SDIO clock to 25MHz c39907335b ARM: dts: imx6qdl-sr-som: Increase the PHY reset duration to 10ms 61b71c5f51 ARM: imx: add missing clk_disable_unprepare() d88d6bba3b ARM: imx: add missing iounmap() 6c629cd023 arm64: dts: ls1028a: fix node name for the sysclk 4a830a37d3 ALSA: seq: Fix racy deletion of subscriber 0658a45335 Revert "ACPICA: Fix memory leak caused by _CID repair function" ea224455dd Merge 5.4.139 into android11-5.4-lts 8ab681fd3f ANDROID: GKI: fix up android/abi_gki_aarch64.xml merge 1d03502d2e Merge branch 'android11-5.4' into 'android11-5.4-lts' e350cd02e2 Linux 5.4.139 03ff8a4f9d spi: mediatek: Fix fifo transfer a0f66ddf05 bpf, selftests: Adjust few selftest outcomes wrt unreachable code d3796e8f6b bpf, selftests: Add a verifier test for assigning 32bit reg states to 64bit ones 8dec99abcd bpf: Test_verifier, add alu32 bounds tracking tests fd568de580 bpf: Fix leakage under speculation on mispredicted branches d2f790327f bpf: Do not mark insn as seen under speculative path verification 283d742988 bpf: Inherit expanded/patched seen count from old aux data a0a9546aae Revert "watchdog: iTCO_wdt: Account for rebooting on second timeout" 76f5314d78 firmware: arm_scmi: Add delayed response status check 1b38f70bbc firmware: arm_scmi: Ensure drivers provide a probe function 44f522298c Revert "Bluetooth: Shutdown controller after workqueues are flushed or cancelled" 38f54217b4 ACPI: fix NULL pointer dereference 0ea2f55bab nvme: fix nvme_setup_command metadata trace event b508b652d4 net: Fix zero-copy head len calculation. bf692e7ef6 qed: fix possible unpaired spin_{un}lock_bh in _qed_mcp_cmd_and_union() 6bc48348ec r8152: Fix potential PM refcount imbalance a57c75ff07 ASoC: tlv320aic31xx: fix reversed bclk/wclk master bits e2cccb839a spi: stm32h7: fix full duplex irq handler handling b72f2d9e91 regulator: rt5033: Fix n_voltages settings for BUCK and LDO 86f2a3e9aa btrfs: fix lost inode on log replay after mix of fsync, rename and inode eviction b7f0fa2192 btrfs: fix race causing unnecessary inode logging during link and rename cb006da62a btrfs: do not commit logs and transactions during link and rename operations 174c27d0f9 btrfs: delete duplicated words + other fixes in comments ae7ff75631 Merge 5.4.138 into android11-5.4-lts 7b90d57b09 Linux 5.4.138 7eef18c047 can: j1939: j1939_session_deactivate(): clarify lifetime of session object 18b536de3b i40e: Add additional info to PHY type error d21eb93110 Revert "perf map: Fix dso->nsinfo refcounting" 16447b2f5c powerpc/pseries: Fix regression while building external modules 265883d1d8 PCI: mvebu: Setup BAR0 in order to fix MSI 21734a31c9 can: hi311x: fix a signedness bug in hi3110_cmd() f4fa45b0f9 sis900: Fix missing pci_disable_device() in probe and remove dff00ce448 tulip: windbond-840: Fix missing pci_disable_device() in probe and remove e0310bbeaa sctp: fix return value check in __sctp_rcv_asconf_lookup 408614108a net/mlx5e: Fix nullptr in mlx5e_hairpin_get_mdev() ac49832306 net/mlx5: Fix flow table chaining 527feae56f net: llc: fix skb_over_panic ede4c93860 mlx4: Fix missing error code in mlx4_load_one() acb97d4b2d net: Set true network header for ECN decapsulation 851946a681 tipc: fix sleeping in tipc accept routine 194b71d28b i40e: Fix log TC creation failure when max num of queues is exceeded 834af62212 i40e: Fix queue-to-TC mapping on Tx 74aea4b715 i40e: Fix firmware LLDP agent related warning b2ab34e862 i40e: Fix logic of disabling queues 519582e44e netfilter: nft_nat: allow to specify layer 4 protocol NAT only 3a7a4cee7b netfilter: conntrack: adjust stop timestamp to real expiry value 1c04378340 cfg80211: Fix possible memory leak in function cfg80211_bss_update 6cf2abea10 nfc: nfcsim: fix use after free during module unload 6b313d0ffa NIU: fix incorrect error return, missed in previous revert c4663c1627 HID: wacom: Re-enable touch by default for Cintiq 24HDT / 27QHDT e9e2ce00ae can: esd_usb2: fix memory leak 43726620b2 can: ems_usb: fix memory leak 8198673892 can: usb_8dev: fix memory leak a051dbd17b can: mcba_usb_start(): add missing urb->transfer_dma initialization 793581441b can: raw: raw_setsockopt(): fix raw_rcv panic for sock UAF c621638d0e can: j1939: j1939_xtp_rx_dat_one(): fix rxtimer value between consecutive TP.DT to 750ms a24d87b429 ocfs2: issue zeroout to EOF blocks eaaa4284e2 ocfs2: fix zero out valid data 9bd1092148 KVM: add missing compat KVM_CLEAR_DIRTY_LOG 7a94dfe5e2 x86/kvm: fix vcpu-id indexed array sizes 2dc291582c Revert "ACPI: resources: Add checks for ACPI IRQ override" a8eec69797 btrfs: mark compressed range uptodate only if all bio succeed 57429c1ec7 btrfs: fix rw device counting in __btrfs_free_extra_devids 61f2cbc792 x86/asm: Ensure asm/proto.h can be included stand-alone 99372c38a9 net_sched: check error pointer in tcf_dump_walker() 758a7acf8b Merge 5.4.137 into android11-5.4-lts 911bc13b3a Merge branch 'android11-5.4' into 'android11-5.4-lts' 5b1de8e15f Linux 5.4.137 ebb1b38be0 ipv6: ip6_finish_output2: set sk into newly allocated nskb 6c04123962 ARM: dts: versatile: Fix up interrupt controller node names befa900533 iomap: remove the length variable in iomap_seek_hole 83fb41b2f6 iomap: remove the length variable in iomap_seek_data 302e1acd4c cifs: fix the out of range assignment to bit fields in parse_server_interfaces 02a470e3c6 firmware: arm_scmi: Fix range check for the maximum number of pending messages 289dd58431 firmware: arm_scmi: Fix possible scmi_linux_errmap buffer overflow e3acb292f0 hfs: add lock nesting notation to hfs_find_init af1178296d hfs: fix high memory mapping in hfs_bnode_read 89136a47e2 hfs: add missing clean-up in hfs_fill_super ded37d0344 ipv6: allocate enough headroom in ip6_finish_output2() f65b7f377c sctp: move 198 addresses from unusable to private scope c8d32973ee net: annotate data race around sk_ll_usec c23b9a5610 net/802/garp: fix memleak in garp_request_join() 88c4cae3ed net/802/mrp: fix memleak in mrp_request_join() eef99860c6 cgroup1: fix leaked context root causing sporadic NULL deref in LTP 7f0365b4da workqueue: fix UAF in pwq_unbound_release_workfn() 85abe0d47f af_unix: fix garbage collect vs MSG_PEEK af45f3527a KVM: x86: determine if an exception has an error code only when injecting it. 828cab3c8c tools: Allow proper CC/CXX/... override with LLVM=1 in Makefile.include 525c5513b6 selftest: fix build error in tools/testing/selftests/vm/userfaultfd.c fab7e04ebb ANDROID: Update android/abi_gki_aarch64.xml c1b1b25ee2 ANDROID: Update android/abi_gki_aarch64_goldfish ccc19b14a1 Merge 5.4.136 into android11-5.4-lts 253dccefb5 Linux 5.4.136 587f86b7a2 xhci: add xhci_get_virt_ep() helper f9d0c35556 perf inject: Close inject.output on exit a9c103fa91 PCI: Mark AMD Navi14 GPU ATS as broken 11561d2f7b btrfs: compression: don't try to compress if we don't have enough pages 4980301e1c iio: accel: bma180: Fix BMA25x bandwidth register values d04f2582c4 iio: accel: bma180: Use explicit member assignment 4e0afa8895 net: bcmgenet: ensure EXT_ENERGY_DET_MASK is clear 2a4865d154 net: dsa: mv88e6xxx: use correct .stats_set_histogram() on Topaz 7d8c06b8d2 drm: Return -ENOTTY for non-drm ioctls b5d7bebd96 nds32: fix up stack guard gap ba378b7960 rbd: always kick acquire on "acquired" and "released" notifications 13066d6628 rbd: don't hold lock_rwsem while running_list is being drained b12ead825f hugetlbfs: fix mount mode command line processing 60dbbd76f1 userfaultfd: do not untag user pointers 540eee8cbb selftest: use mmap instead of posix_memalign to allocate memory e706ac3fc8 ixgbe: Fix packet corruption due to missing DMA sync e617fa62f6 media: ngene: Fix out-of-bounds bug in ngene_command_config_free_buf() 77713fb336 btrfs: check for missing device in btrfs_trim_fs f899f24d34 tracing: Fix bug in rb_per_cpu_empty() that might cause deadloop. 59a9f75fb2 tracing/histogram: Rename "cpu" to "common_cpu" 379d8da335 firmware/efi: Tell memblock about EFI iomem reservations 281a94362b usb: dwc2: gadget: Fix sending zero length packet in DDMA mode. 167079fbfa USB: serial: cp210x: add ID for CEL EM3588 USB ZigBee stick 811c4cdf29 USB: serial: cp210x: fix comments for GE CS1000 f54ee7e16d USB: serial: option: add support for u-blox LARA-R6 family e28d28eb9b usb: renesas_usbhs: Fix superfluous irqs happen after usb_pkt_pop() 863d071dbc usb: max-3421: Prevent corruption of freed memory e4077a90e6 USB: usb-storage: Add LaCie Rugged USB3-FW to IGNORE_UAS da6f6769ee usb: hub: Fix link power management max exit latency (MEL) calculations fea6b53e63 usb: hub: Disable USB 3 device initiated lpm if exit latency is too high 962ce043ef KVM: PPC: Book3S HV Nested: Sanitise H_ENTER_NESTED TM state 2b9ffddd70 KVM: PPC: Book3S: Fix H_RTAS rets buffer overflow c968f563cc xhci: Fix lost USB 2 remote wake a660ecde5c ALSA: hdmi: Expose all pins on MSI MS-7C94 board f73696354d ALSA: sb: Fix potential ABBA deadlock in CSP driver 7aa2dfbc6b ALSA: usb-audio: Add registration quirk for JBL Quantum headsets 46d62c3fe2 ALSA: usb-audio: Add missing proc text entry for BESPOKEN type f1754f96ab s390/boot: fix use of expolines in the DMA code 8eb521d192 s390/ftrace: fix ftrace_update_ftrace_func implementation 268132b070 Revert "MIPS: add PMD table accounting into MIPS'pmd_alloc_one" f323809e31 proc: Avoid mixing integer types in mem_rw() b71a75209f drm/panel: raspberrypi-touchscreen: Prevent double-free 2e6ab87f8e net: sched: cls_api: Fix the the wrong parameter b60461696a sctp: update active_key for asoc when old key is being replaced 9fa89c2cae nvme: set the PRACT bit when using Write Zeroes with T10 PI c50141b3d7 r8169: Avoid duplicate sysfs entry creation error f726817d6b afs: Fix tracepoint string placement with built-in AFS b22c9e433b Revert "USB: quirks: ignore remote wake-up on Fibocom L850-GL LTE modem" 69a49e7b5b nvme-pci: don't WARN_ON in nvme_reset_work if ctrl.state is not RESETTING 8302513614 ipv6: fix another slab-out-of-bounds in fib6_nh_flush_exceptions a88414fb11 net/sched: act_skbmod: Skip non-Ethernet packets c278b954cc net: hns3: fix rx VLAN offload state inconsistent issue 006ed6f4d0 net/tcp_fastopen: fix data races around tfo_active_disable_stamp 3942ba2356 net: hisilicon: rename CACHE_LINE_MASK to avoid redefinition f11f12decd bnxt_en: Check abort error state in bnxt_half_open_nic() 16ce6cb786 bnxt_en: Add missing check for BNXT_STATE_ABORT_ERR in bnxt_fw_rset_task() c993e7aadc bnxt_en: Refresh RoCE capabilities in bnxt_ulp_probe() 6ee8e6be30 bnxt_en: Improve bnxt_ulp_stop()/bnxt_ulp_start() call sequence. 35637acc98 spi: cadence: Correct initialisation of runtime PM again 2f2150bf41 scsi: target: Fix protect handling in WRITE SAME(32) a6cb717f85 scsi: iscsi: Fix iface sysfs attr detection 25df44e90f netrom: Decrease sock refcount when sock timers expire 8d7924ce85 net: sched: fix memory leak in tcindex_partial_destroy_work f38527f189 KVM: PPC: Fix kvm_arch_vcpu_ioctl vcpu_load leak b85dadd434 KVM: PPC: Book3S: Fix CONFIG_TRANSACTIONAL_MEM=n crash b3224bd318 net: decnet: Fix sleeping inside in af_decnet bd2b3b13aa efi/tpm: Differentiate missing and invalid final event log table. 9413c0abb5 net: fix uninit-value in caif_seqpkt_sendmsg 6d56299ff9 bpftool: Check malloc return value in mount_bpffs_for_pin edec100986 bpf, sockmap, tcp: sk_prot needs inuse_idx set for proc stats 58259e8b6e s390/bpf: Perform r1 range checking before accessing jit->seen_reg[r1] cc876a5618 liquidio: Fix unintentional sign extension issue on left shift of u16 42fe8f433b ASoC: rt5631: Fix regcache sync errors on resume d99aaf0736 spi: mediatek: fix fifo rx mode 08cdda8d89 regulator: hi6421: Fix getting wrong drvdata b25be6bf64 regulator: hi6421: Use correct variable type for regmap api val argument a1ade24ccc spi: stm32: fixes pm_runtime calls in probe/remove 40e203ce74 spi: stm32: Use dma_request_chan() instead dma_request_slave_channel() 24b78097a8 spi: imx: add a check for speed_hz before calculating the clock 52cff6123a perf data: Close all files in close_dir() 0f63857d10 perf probe-file: Delete namelist in del_events() on the error path 8b92ea243b perf lzma: Close lzma stream on exit 51351c6d5a perf script: Fix memory 'threads' and 'cpus' leaks on exit d2bfc3eda9 perf dso: Fix memory leak in dso__new_map() 05804a7d22 perf test event_update: Fix memory leak of evlist d257f3abdc perf test session_topology: Delete session->evlist 89d1762a4a perf env: Fix sibling_dies memory leak fd335143be perf probe: Fix dso->nsinfo refcounting 6513dee46f perf map: Fix dso->nsinfo refcounting ff9fc81fa8 nvme-pci: do not call nvme_dev_remove_admin from nvme_remove d029df83c6 cxgb4: fix IRQ free race during driver unload ae9b644344 pwm: sprd: Ensure configuring period and duty_cycle isn't wrongly skipped a37ca2a076 selftests: icmp_redirect: IPv6 PMTU info should be cleared after redirect 05364a2794 selftests: icmp_redirect: remove from checking for IPv6 route get 7f4848229e ipv6: fix 'disable_policy' for fwd packets c67fb96f54 gve: Fix an error handling path in 'gve_probe()' e33da4eeaa igb: Fix position of assignment to *ring 7dd8977736 igb: Check if num of q_vectors is smaller than max before array access d3d7cceee8 iavf: Fix an error handling path in 'iavf_probe()' 7a13a8a8a5 e1000e: Fix an error handling path in 'e1000_probe()' 9fc381db75 fm10k: Fix an error handling path in 'fm10k_probe()' 5d6a04927b igb: Fix an error handling path in 'igb_probe()' cddd53237d igc: Fix an error handling path in 'igc_probe()' 47f69d8828 igc: Prefer to use the pci_release_mem_regions method 83b2d55a51 ixgbe: Fix an error handling path in 'ixgbe_probe()' ba4fbb68fc igc: change default return of igc_read_phy_reg() 88e0720133 igb: Fix use-after-free error during reset a9508e0edf igc: Fix use-after-free error during reset f40a4f7a60 Merge 5.4.135 into android11-5.4-lts 0a0beb1f91 Linux 5.4.135 d2f7b384a7 udp: annotate data races around unix_sk(sk)->gso_size c72374978b perf test bpf: Free obj_buf 17bc942c0b bpftool: Properly close va_list 'ap' by va_end() on error 84ed834094 ipv6: tcp: drop silly ICMPv6 packet too big messages 315033cab3 tcp: annotate data races around tp->mtu_info 41f45e91c9 dma-buf/sync_file: Don't leak fences on merge failure 04b0671683 net: fddi: fix UAF in fza_probe 8aa13a8696 net: validate lwtstate->data before returning from skb_tunnel_info() 8cff7b28ab net: send SYNACK packet with accepted fwmark b7e5563f2a net: ti: fix UAF in tlan_remove_one 2b70ca9284 net: qcom/emac: fix UAF in emac_remove 463c0addb4 net: moxa: fix UAF in moxart_mac_probe 7ac4a6a74e net: ip_tunnel: fix mtu calculation for ETHER tunnel devices d5dc50ca1f net: bcmgenet: Ensure all TX/RX queues DMAs are disabled 7ecd40801e net: bridge: sync fdb to new unicast-filtering ports 813d45499f net/sched: act_ct: fix err check for nf_conntrack_confirm 2497307356 netfilter: ctnetlink: suspicious RCU usage in ctnetlink_dump_helpinfo c6f4a71153 net: ipv6: fix return value of ip6_skb_dst_mtu 9872273b67 net: dsa: mv88e6xxx: enable .rmu_disable() on Topaz 6148ddff2d net: dsa: mv88e6xxx: enable .port_set_policy() on Topaz d73c180e6a dm writecache: return the exact table values that were set 8a85afc662 mm: slab: fix kmem_cache_create failed when sysfs node not destroyed f53729b828 usb: cdns3: Enable TDL_CHK only for OUT ep 52b01a8086 f2fs: Show casefolding support only when supported 91d8460167 arm64: dts: marvell: armada-37xx: move firmware node to generic dtsi file f696cc7f1b firmware: turris-mox-rwtm: add marvell,armada-3700-rwtm-firmware compatible string e2b28026b8 arm64: dts: armada-3720-turris-mox: add firmware node f7d1fa65e7 cifs: prevent NULL deref in cifs_compose_mount_options() 06d8a7eb58 s390: introduce proper type handling call_on_stack() macro 2a47e0719a sched/fair: Fix CFS bandwidth hrtimer expiry type 5b7d065868 scsi: qedf: Add check to synchronize abort and flush 0fe70c15f9 scsi: libfc: Fix array index out of bound exception d7b647d055 scsi: libsas: Add LUN number check in .slave_alloc callback 863c4bc883 scsi: aic7xxx: Fix unintentional sign extension issue on left shift of u8 712e9ed613 rtc: max77686: Do not enforce (incorrect) interrupt trigger type 199d8ea4c7 kbuild: mkcompile_h: consider timestamp if KBUILD_BUILD_TIMESTAMP is set 484193b635 thermal/core: Correct function name thermal_zone_device_unregister() 556cf02830 arm64: dts: imx8mq: assign PCIe clocks 9d3eb68a53 arm64: dts: ls208xa: remove bus-num from dspi node e054b361ca firmware: tegra: bpmp: Fix Tegra234-only builds 94d0095770 soc/tegra: fuse: Fix Tegra234-only builds 270a2e9faf ARM: dts: stm32: move stmmac axi config in ethernet node on stm32mp15 4bc66215bc ARM: dts: stm32: fix i2c node name on stm32f746 to prevent warnings 856c753237 ARM: dts: rockchip: fix supply properties in io-domains nodes c5bb9cc2ce arm64: dts: juno: Update SCPI nodes as per the YAML schema f572a91393 ARM: dts: stm32: fix timer nodes on STM32 MCU to prevent warnings 95e795474c ARM: dts: stm32: fix RCC node name on stm32f429 MCU a898aa9f88 ARM: dts: stm32: fix gpio-keys node on STM32 MCU boards 5c17edaaea ARM: dts: am437x-gp-evm: fix ti,no-reset-on-init flag for gpios 3446233096 ARM: dts: am57xx-cl-som-am57x: fix ti,no-reset-on-init flag for gpios e79e29a4e1 kbuild: sink stdout from cmd for silent build f817d46775 rtc: mxc_v2: add missing MODULE_DEVICE_TABLE 0a22b51782 ARM: imx: pm-imx5: Fix references to imx5_cpu_suspend_info e20e85639e ARM: dts: imx6: phyFLEX: Fix UART hardware flow control a5b19d33ae ARM: dts: Hurricane 2: Fix NAND nodes names f83535a47f ARM: dts: BCM63xx: Fix NAND nodes names cb05b84ad7 ARM: NSP: dts: fix NAND nodes names 14e3bad3b5 ARM: Cygnus: dts: fix NAND nodes names 587a757afe ARM: brcmstb: dts: fix NAND nodes names a9c32c7aee reset: ti-syscon: fix to_ti_syscon_reset_data macro b400afa427 arm64: dts: rockchip: Fix power-controller node names for rk3328 dfb4e8ed07 arm64: dts: rockchip: Fix power-controller node names for px30 789070f178 ARM: dts: rockchip: Fix power-controller node names for rk3288 6aaffe6ce8 ARM: dts: rockchip: Fix power-controller node names for rk3188 439115ee56 ARM: dts: rockchip: Fix power-controller node names for rk3066a 3b4c347283 ARM: dts: rockchip: Fix IOMMU nodes properties on rk322x c9d29d62da ARM: dts: rockchip: Fix the timer clocks order d105e15de6 arm64: dts: rockchip: fix pinctrl sleep nodename for rk3399.dtsi cfe3d29e5c ARM: dts: rockchip: fix pinctrl sleep nodename for rk3036-kylin and rk3288 79573c6441 ARM: dts: gemini: add device_type on pci 7037876393 ARM: dts: gemini: rename mdio to the right name 2a9f50cc6e Merge branch 'android11-5.4' into 'android11-5.4-lts' Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I1dfe5c5858c0c1f38ccb32e253ff7ff7f509eced
2021-10-14 18:32:19 +02:00
parent 0dedfe3f54 5e10f36746
commit 5b84549191
717 changed files with 7342 additions and 4519 deletions
--- a/Documentation/arm64/tagged-address-abi.rst
+++ b/Documentation/arm64/tagged-address-abi.rst
@@ -45,14 +45,24 @@ how the user addresses are used by the kernel:

 1. User addresses not accessed by the kernel but used for address space
   management (e.g. ``mprotect()``, ``madvise()``). The use of valid
-   tagged pointers in this context is allowed with the exception of
-   ``brk()``, ``mmap()`` and the ``new_address`` argument to
-   ``mremap()`` as these have the potential to alias with existing
-   user addresses.
+   tagged pointers in this context is allowed with these exceptions:

-   NOTE: This behaviour changed in v5.6 and so some earlier kernels may
-   incorrectly accept valid tagged pointers for the ``brk()``,
-   ``mmap()`` and ``mremap()`` system calls.
+   - ``brk()``, ``mmap()`` and the ``new_address`` argument to
+     ``mremap()`` as these have the potential to alias with existing
+      user addresses.
+
+     NOTE: This behaviour changed in v5.6 and so some earlier kernels may
+     incorrectly accept valid tagged pointers for the ``brk()``,
+     ``mmap()`` and ``mremap()`` system calls.
+
+   - The ``range.start``, ``start`` and ``dst`` arguments to the
+     ``UFFDIO_*`` ``ioctl()``s used on a file descriptor obtained from
+     ``userfaultfd()``, as fault addresses subsequently obtained by reading
+     the file descriptor will be untagged, which may otherwise confuse
+     tag-unaware programs.
+
+     NOTE: This behaviour changed in v5.14 and so some earlier kernels may
+     incorrectly accept valid tagged pointers for this system call.

 2. User addresses accessed by the kernel (e.g. ``write()``). This ABI
   relaxation is disabled by default and the application thread needs to
--- a/Documentation/trace/histogram.rst
+++ b/Documentation/trace/histogram.rst
@@ -191,7 +191,7 @@ Documentation written by Tom Zanussi
                                with the event, in nanoseconds.  May be
 			        modified by .usecs to have timestamps
 			        interpreted as microseconds.
-    cpu                    int  the cpu on which the event occurred.
+    common_cpu             int  the cpu on which the event occurred.
    ====================== ==== =======================================

 Extended error information
--- a/Documentation/virt/kvm/mmu.txt
+++ b/Documentation/virt/kvm/mmu.txt
@@ -152,8 +152,8 @@ Shadow pages contain the following information:
    shadow pages) so role.quadrant takes values in the range 0..3.  Each
    quadrant maps 1GB virtual address space.
  role.access:
-    Inherited guest access permissions in the form uwx.  Note execute
-    permission is positive, not negative.
+    Inherited guest access permissions from the parent ptes in the form uwx.
+    Note execute permission is positive, not negative.
  role.invalid:
    The page is invalid and should not be used.  It is a root page that is
    currently pinned (by a cpu hardware register pointing to it); once it is
--- a/2
+++ b/2
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 4
-SUBLEVEL = 134
+SUBLEVEL = 147
 EXTRAVERSION =
 NAME = Kleptomaniac Octopus

--- a/android/abi_gki_aarch64.xml
+++ b/android/abi_gki_aarch64.xml
--- a/android/abi_gki_aarch64_db845c
+++ b/android/abi_gki_aarch64_db845c
@@ -1384,6 +1384,7 @@
  sdhci_remove_host
  sdhci_reset
  sdhci_set_bus_width
+  __sdhci_set_timeout

 # required by smem.ko
  hwspin_lock_free
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -585,7 +585,7 @@ void
 smp_send_stop(void)
 {
 	cpumask_t to_whom;
-	cpumask_copy(&to_whom, cpu_possible_mask);
+	cpumask_copy(&to_whom, cpu_online_mask);
 	cpumask_clear_cpu(smp_processor_id(), &to_whom);
 #ifdef DEBUG_IPI_MSG
 	if (hard_smp_processor_id() != boot_cpu_id)
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -29,6 +29,7 @@ config ARC
 	select GENERIC_SMP_IDLE_THREAD
 	select HAVE_ARCH_KGDB
 	select HAVE_ARCH_TRACEHOOK
+	select HAVE_COPY_THREAD_TLS
 	select HAVE_DEBUG_STACKOVERFLOW
 	select HAVE_FUTEX_CMPXCHG if FUTEX
 	select HAVE_IOREMAP_PROT
--- a/arch/arc/include/asm/syscalls.h
+++ b/arch/arc/include/asm/syscalls.h
@@ -11,6 +11,7 @@
 #include <linux/types.h>

 int sys_clone_wrapper(int, int, int, int, int);
+int sys_clone3_wrapper(void *, size_t);
 int sys_cacheflush(uint32_t, uint32_t uint32_t);
 int sys_arc_settls(void *);
 int sys_arc_gettls(void);
--- a/arch/arc/include/uapi/asm/unistd.h
+++ b/arch/arc/include/uapi/asm/unistd.h
@@ -21,6 +21,7 @@
 #define __ARCH_WANT_SET_GET_RLIMIT
 #define __ARCH_WANT_SYS_EXECVE
 #define __ARCH_WANT_SYS_CLONE
+#define __ARCH_WANT_SYS_CLONE3
 #define __ARCH_WANT_SYS_VFORK
 #define __ARCH_WANT_SYS_FORK
 #define __ARCH_WANT_TIME32_SYSCALLS
--- a/arch/arc/kernel/entry.S
+++ b/arch/arc/kernel/entry.S
@@ -35,6 +35,18 @@ ENTRY(sys_clone_wrapper)
 	b .Lret_from_system_call
 END(sys_clone_wrapper)

+ENTRY(sys_clone3_wrapper)
+	SAVE_CALLEE_SAVED_USER
+	bl  @sys_clone3
+	DISCARD_CALLEE_SAVED_USER
+
+	GET_CURR_THR_INFO_FLAGS   r10
+	btst r10, TIF_SYSCALL_TRACE
+	bnz  tracesys_exit
+
+	b .Lret_from_system_call
+END(sys_clone3_wrapper)
+
 ENTRY(ret_from_fork)
 	; when the forked child comes here from the __switch_to function
 	; r0 has the last task pointer.
--- a/arch/arc/kernel/process.c
+++ b/arch/arc/kernel/process.c
@@ -171,9 +171,8 @@ asmlinkage void ret_from_fork(void);
 * |    user_r25    |
 * ------------------  <===== END of PAGE
 */
-int copy_thread(unsigned long clone_flags,
-		unsigned long usp, unsigned long kthread_arg,
-		struct task_struct *p)
+int copy_thread_tls(unsigned long clone_flags, unsigned long usp,
+	unsigned long kthread_arg, struct task_struct *p, unsigned long tls)
 {
 	struct pt_regs *c_regs;        /* child's pt_regs */
 	unsigned long *childksp;       /* to unwind out of __switch_to() */
@@ -231,7 +230,7 @@ int copy_thread(unsigned long clone_flags,
 		 * set task's userland tls data ptr from 4th arg
 		 * clone C-lib call is difft from clone sys-call
 		 */
-		task_thread_info(p)->thr_ptr = regs->r3;
+		task_thread_info(p)->thr_ptr = tls;
 	} else {
 		/* Normal fork case: set parent's TLS ptr in child */
 		task_thread_info(p)->thr_ptr =
--- a/arch/arc/kernel/sys.c
+++ b/arch/arc/kernel/sys.c
@@ -7,6 +7,7 @@
 #include <asm/syscalls.h>

 #define sys_clone	sys_clone_wrapper
+#define sys_clone3	sys_clone3_wrapper

 #undef __SYSCALL
 #define __SYSCALL(nr, call) [nr] = (call),
--- a/arch/arc/kernel/vmlinux.lds.S
+++ b/arch/arc/kernel/vmlinux.lds.S
@@ -88,6 +88,8 @@ SECTIONS
 		CPUIDLE_TEXT
 		LOCK_TEXT
 		KPROBES_TEXT
+		IRQENTRY_TEXT
+		SOFTIRQENTRY_TEXT
 		*(.fixup)
 		*(.gnu.warning)
 	}
--- a/arch/arm/boot/dts/am437x-gp-evm.dts
+++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -829,11 +829,14 @@
 	status = "okay";
 };

+&gpio5_target {
+	ti,no-reset-on-init;
+};
+
 &gpio5 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&display_mux_pins>;
 	status = "okay";
-	ti,no-reset-on-init;

 	p8 {
 		/*
--- a/arch/arm/boot/dts/am437x-l4.dtsi
+++ b/arch/arm/boot/dts/am437x-l4.dtsi
@@ -1611,7 +1611,7 @@
 				compatible = "ti,am4372-d_can", "ti,am3352-d_can";
 				reg = <0x0 0x2000>;
 				clocks = <&dcan1_fck>;
-				clock-name = "fck";
+				clock-names = "fck";
 				syscon-raminit = <&scm_conf 0x644 1>;
 				interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
 				status = "disabled";
@@ -2077,7 +2077,7 @@
 			};
 		};

-		target-module@22000 {			/* 0x48322000, ap 116 64.0 */
+		gpio5_target: target-module@22000 {		/* 0x48322000, ap 116 64.0 */
 			compatible = "ti,sysc-omap2", "ti,sysc";
 			ti,hwmods = "gpio6";
 			reg = <0x22000 0x4>,
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -589,7 +589,7 @@
 	status = "okay";
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c0_pins>;
-	clock-frequency = <400000>;
+	clock-frequency = <100000>;

 	tps65218: tps65218@24 {
 		reg = <0x24>;
--- a/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
+++ b/arch/arm/boot/dts/am57xx-cl-som-am57x.dts
@@ -611,12 +611,11 @@
 	>;
 };

-&gpio3 {
-	status = "okay";
+&gpio3_target {
 	ti,no-reset-on-init;
 };

-&gpio2 {
+&gpio2_target {
 	status = "okay";
 	ti,no-reset-on-init;
 };
--- a/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi
+++ b/arch/arm/boot/dts/aspeed-g6-pinctrl.dtsi
@@ -208,12 +208,12 @@
 	};

 	pinctrl_hvi3c3_default: hvi3c3_default {
-		function = "HVI3C3";
+		function = "I3C3";
 		groups = "HVI3C3";
 	};

 	pinctrl_hvi3c4_default: hvi3c4_default {
-		function = "HVI3C4";
+		function = "I3C4";
 		groups = "HVI3C4";
 	};

--- a/arch/arm/boot/dts/bcm-cygnus.dtsi
+++ b/arch/arm/boot/dts/bcm-cygnus.dtsi
@@ -460,7 +460,7 @@
 			status = "disabled";
 		};

-		nand: nand@18046000 {
+		nand_controller: nand-controller@18046000 {
 			compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
 			reg = <0x18046000 0x600>, <0xf8105408 0x600>,
 			      <0x18046f00 0x20>;
--- a/arch/arm/boot/dts/bcm-hr2.dtsi
+++ b/arch/arm/boot/dts/bcm-hr2.dtsi
@@ -179,7 +179,7 @@
 			status = "disabled";
 		};

-		nand: nand@26000 {
+		nand_controller: nand-controller@26000 {
 			compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
 			reg = <0x26000 0x600>,
 			      <0x11b408 0x600>,
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -267,7 +267,7 @@
 			dma-coherent;
 		};

-		nand: nand@26000 {
+		nand_controller: nand-controller@26000 {
 			compatible = "brcm,nand-iproc", "brcm,brcmnand-v6.1";
 			reg = <0x026000 0x600>,
 			      <0x11b408 0x600>,
--- a/arch/arm/boot/dts/bcm63138.dtsi
+++ b/arch/arm/boot/dts/bcm63138.dtsi
@@ -203,7 +203,7 @@
 			status = "disabled";
 		};

-		nand: nand@2000 {
+		nand_controller: nand-controller@2000 {
 			#address-cells = <1>;
 			#size-cells = <0>;
 			compatible = "brcm,nand-bcm63138", "brcm,brcmnand-v7.0", "brcm,brcmnand";
--- a/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
+++ b/arch/arm/boot/dts/bcm7445-bcm97445svmb.dts
@@ -14,10 +14,10 @@
 	};
 };

-&nand {
+&nand_controller {
 	status = "okay";

-	nandcs@1 {
+	nand@1 {
 		compatible = "brcm,nandcs";
 		reg = <1>;
 		nand-ecc-step-size = <512>;
--- a/arch/arm/boot/dts/bcm7445.dtsi
+++ b/arch/arm/boot/dts/bcm7445.dtsi
@@ -148,7 +148,7 @@
 			reg-names = "aon-ctrl", "aon-sram";
 		};

-		nand: nand@3e2800 {
+		nand_controller: nand-controller@3e2800 {
 			status = "disabled";
 			#address-cells = <1>;
 			#size-cells = <0>;
--- a/arch/arm/boot/dts/bcm911360_entphn.dts
+++ b/arch/arm/boot/dts/bcm911360_entphn.dts
@@ -82,8 +82,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@1 {
+&nand_controller {
+	nand@1 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958300k.dts
+++ b/arch/arm/boot/dts/bcm958300k.dts
@@ -60,8 +60,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@1 {
+&nand_controller {
+	nand@1 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958305k.dts
+++ b/arch/arm/boot/dts/bcm958305k.dts
@@ -68,8 +68,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@1 {
+&nand_controller {
+	nand@1 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958522er.dts
+++ b/arch/arm/boot/dts/bcm958522er.dts
@@ -70,8 +70,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958525er.dts
+++ b/arch/arm/boot/dts/bcm958525er.dts
@@ -70,8 +70,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958525xmc.dts
+++ b/arch/arm/boot/dts/bcm958525xmc.dts
@@ -86,8 +86,8 @@
 	};
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958622hr.dts
+++ b/arch/arm/boot/dts/bcm958622hr.dts
@@ -74,8 +74,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958623hr.dts
+++ b/arch/arm/boot/dts/bcm958623hr.dts
@@ -74,8 +74,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958625hr.dts
+++ b/arch/arm/boot/dts/bcm958625hr.dts
@@ -90,8 +90,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm958625k.dts
+++ b/arch/arm/boot/dts/bcm958625k.dts
@@ -64,8 +64,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/bcm963138dvt.dts
+++ b/arch/arm/boot/dts/bcm963138dvt.dts
@@ -31,10 +31,10 @@
 	status = "okay";
 };

-&nand {
+&nand_controller {
 	status = "okay";

-	nandcs@0 {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-ecc-strength = <4>;
--- a/arch/arm/boot/dts/bcm988312hr.dts
+++ b/arch/arm/boot/dts/bcm988312hr.dts
@@ -74,8 +74,8 @@
 	status = "okay";
 };

-&nand {
-	nandcs@0 {
+&nand_controller {
+	nand@0 {
 		compatible = "brcm,nandcs";
 		reg = <0>;
 		nand-on-flash-bbt;
--- a/arch/arm/boot/dts/dra7-l4.dtsi
+++ b/arch/arm/boot/dts/dra7-l4.dtsi
@@ -1326,7 +1326,7 @@
 			};
 		};

-		target-module@55000 {			/* 0x48055000, ap 13 0e.0 */
+		gpio2_target: target-module@55000 {		/* 0x48055000, ap 13 0e.0 */
 			compatible = "ti,sysc-omap2", "ti,sysc";
 			reg = <0x55000 0x4>,
 			      <0x55010 0x4>,
@@ -1359,7 +1359,7 @@
 			};
 		};

-		target-module@57000 {			/* 0x48057000, ap 15 06.0 */
+		gpio3_target: target-module@57000 {		/* 0x48057000, ap 15 06.0 */
 			compatible = "ti,sysc-omap2", "ti,sysc";
 			reg = <0x57000 0x4>,
 			      <0x57010 0x4>,
--- a/arch/arm/boot/dts/gemini-dlink-dns-313.dts
+++ b/arch/arm/boot/dts/gemini-dlink-dns-313.dts
@@ -140,7 +140,7 @@
 		};
 	};

-	mdio0: ethernet-phy {
+	mdio0: mdio {
 		compatible = "virtual,mdio-gpio";
 		/* Uses MDC and MDIO */
 		gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */
--- a/arch/arm/boot/dts/gemini-nas4220b.dts
+++ b/arch/arm/boot/dts/gemini-nas4220b.dts
@@ -62,7 +62,7 @@
 		};
 	};

-	mdio0: ethernet-phy {
+	mdio0: mdio {
 		compatible = "virtual,mdio-gpio";
 		gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */
 			<&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
--- a/arch/arm/boot/dts/gemini-rut1xx.dts
+++ b/arch/arm/boot/dts/gemini-rut1xx.dts
@@ -56,7 +56,7 @@
 		};
 	};

-	mdio0: ethernet-phy {
+	mdio0: mdio {
 		compatible = "virtual,mdio-gpio";
 		gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */
 			<&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
--- a/arch/arm/boot/dts/gemini-wbd111.dts
+++ b/arch/arm/boot/dts/gemini-wbd111.dts
@@ -68,7 +68,7 @@
 		};
 	};

-	mdio0: ethernet-phy {
+	mdio0: mdio {
 		compatible = "virtual,mdio-gpio";
 		gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */
 			<&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
--- a/arch/arm/boot/dts/gemini-wbd222.dts
+++ b/arch/arm/boot/dts/gemini-wbd222.dts
@@ -67,7 +67,7 @@
 		};
 	};

-	mdio0: ethernet-phy {
+	mdio0: mdio {
 		compatible = "virtual,mdio-gpio";
 		gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>, /* MDC */
 			<&gpio0 21 GPIO_ACTIVE_HIGH>; /* MDIO */
--- a/arch/arm/boot/dts/gemini.dtsi
+++ b/arch/arm/boot/dts/gemini.dtsi
@@ -286,6 +286,7 @@
 			clock-names = "PCLK", "PCICLK";
 			pinctrl-names = "default";
 			pinctrl-0 = <&pci_default_pins>;
+			device_type = "pci";
 			#address-cells = <3>;
 			#size-cells = <2>;
 			#interrupt-cells = <1>;
--- a/arch/arm/boot/dts/imx53-m53menlo.dts
+++ b/arch/arm/boot/dts/imx53-m53menlo.dts
@@ -388,13 +388,13 @@

 		pinctrl_power_button: powerbutgrp {
 			fsl,pins = <
-				MX53_PAD_SD2_DATA2__GPIO1_13		0x1e4
+				MX53_PAD_SD2_DATA0__GPIO1_15		0x1e4
 			>;
 		};

 		pinctrl_power_out: poweroutgrp {
 			fsl,pins = <
-				MX53_PAD_SD2_DATA0__GPIO1_15		0x1e4
+				MX53_PAD_SD2_DATA2__GPIO1_13		0x1e4
 			>;
 		};

--- a/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi
@@ -315,8 +315,8 @@
 			fsl,pins = <
 				MX6QDL_PAD_EIM_D24__UART3_TX_DATA	0x1b0b1
 				MX6QDL_PAD_EIM_D25__UART3_RX_DATA	0x1b0b1
-				MX6QDL_PAD_EIM_D30__UART3_RTS_B		0x1b0b1
-				MX6QDL_PAD_EIM_D31__UART3_CTS_B		0x1b0b1
+				MX6QDL_PAD_EIM_D31__UART3_RTS_B		0x1b0b1
+				MX6QDL_PAD_EIM_D30__UART3_CTS_B		0x1b0b1
 			>;
 		};

@@ -403,6 +403,7 @@
 &uart3 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_uart3>;
+	uart-has-rtscts;
 	status = "disabled";
 };

--- a/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sr-som.dtsi
@@ -54,7 +54,13 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_microsom_enet_ar8035>;
 	phy-mode = "rgmii-id";
-	phy-reset-duration = <2>;
+
+	/*
+	 * The PHY seems to require a long-enough reset duration to avoid
+	 * some rare issues where the PHY gets stuck in an inconsistent and
+	 * non-functional state at boot-up. 10ms proved to be fine .
+	 */
+	phy-reset-duration = <10>;
 	phy-reset-gpios = <&gpio4 15 GPIO_ACTIVE_LOW>;
 	status = "okay";
 };
--- a/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
+++ b/arch/arm/boot/dts/imx6ull-colibri-wifi.dtsi
@@ -43,6 +43,7 @@
 	assigned-clock-rates = <0>, <198000000>;
 	cap-power-off-card;
 	keep-power-in-suspend;
+	max-frequency = <25000000>;
 	mmc-pwrseq = <&wifi_pwrseq>;
 	no-1-8-v;
 	non-removable;
--- a/arch/arm/boot/dts/meson8.dtsi
+++ b/arch/arm/boot/dts/meson8.dtsi
@@ -241,8 +241,13 @@
 					  "pp2", "ppmmu2", "pp4", "ppmmu4",
 					  "pp5", "ppmmu5", "pp6", "ppmmu6";
 			resets = <&reset RESET_MALI>;
+
 			clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>;
 			clock-names = "bus", "core";
+
+			assigned-clocks = <&clkc CLKID_MALI>;
+			assigned-clock-rates = <318750000>;
+
 			operating-points-v2 = <&gpu_opp_table>;
 		};
 	};
--- a/arch/arm/boot/dts/meson8b-ec100.dts
+++ b/arch/arm/boot/dts/meson8b-ec100.dts
@@ -148,7 +148,7 @@
 		regulator-min-microvolt = <860000>;
 		regulator-max-microvolt = <1140000>;

-		vin-supply = <&vcc_5v>;
+		pwm-supply = <&vcc_5v>;

 		pwms = <&pwm_cd 0 1148 0>;
 		pwm-dutycycle-range = <100 0>;
@@ -232,7 +232,7 @@
 		regulator-min-microvolt = <860000>;
 		regulator-max-microvolt = <1140000>;

-		vin-supply = <&vcc_5v>;
+		pwm-supply = <&vcc_5v>;

 		pwms = <&pwm_cd 1 1148 0>;
 		pwm-dutycycle-range = <100 0>;
--- a/arch/arm/boot/dts/meson8b-mxq.dts
+++ b/arch/arm/boot/dts/meson8b-mxq.dts
@@ -39,6 +39,8 @@
 		regulator-min-microvolt = <860000>;
 		regulator-max-microvolt = <1140000>;

+		pwm-supply = <&vcc_5v>;
+
 		pwms = <&pwm_cd 0 1148 0>;
 		pwm-dutycycle-range = <100 0>;

@@ -84,7 +86,7 @@
 		regulator-min-microvolt = <860000>;
 		regulator-max-microvolt = <1140000>;

-		vin-supply = <&vcc_5v>;
+		pwm-supply = <&vcc_5v>;

 		pwms = <&pwm_cd 1 1148 0>;
 		pwm-dutycycle-range = <100 0>;
--- a/arch/arm/boot/dts/meson8b-odroidc1.dts
+++ b/arch/arm/boot/dts/meson8b-odroidc1.dts
@@ -130,7 +130,7 @@
 		regulator-min-microvolt = <860000>;
 		regulator-max-microvolt = <1140000>;

-		vin-supply = <&p5v0>;
+		pwm-supply = <&p5v0>;

 		pwms = <&pwm_cd 0 12218 0>;
 		pwm-dutycycle-range = <91 0>;
@@ -162,7 +162,7 @@
 		regulator-min-microvolt = <860000>;
 		regulator-max-microvolt = <1140000>;

-		vin-supply = <&p5v0>;
+		pwm-supply = <&p5v0>;

 		pwms = <&pwm_cd 1 12218 0>;
 		pwm-dutycycle-range = <91 0>;
--- a/arch/arm/boot/dts/omap5-board-common.dtsi
+++ b/arch/arm/boot/dts/omap5-board-common.dtsi
@@ -30,14 +30,6 @@
 		regulator-max-microvolt = <5000000>;
 	};

-	vdds_1v8_main: fixedregulator-vdds_1v8_main {
-		compatible = "regulator-fixed";
-		regulator-name = "vdds_1v8_main";
-		vin-supply = <&smps7_reg>;
-		regulator-min-microvolt = <1800000>;
-		regulator-max-microvolt = <1800000>;
-	};
-
 	vmmcsd_fixed: fixedregulator-mmcsd {
 		compatible = "regulator-fixed";
 		regulator-name = "vmmcsd_fixed";
@@ -487,6 +479,7 @@
 					regulator-boot-on;
 				};

+				vdds_1v8_main:
 				smps7_reg: smps7 {
 					/* VDDS_1v8_OMAP over VDDS_1v8_MAIN */
 					regulator-name = "smps7";
--- a/arch/arm/boot/dts/rk3036-kylin.dts
+++ b/arch/arm/boot/dts/rk3036-kylin.dts
@@ -390,7 +390,7 @@
 		};
 	};

-	sleep {
+	suspend {
 		global_pwroff: global-pwroff {
 			rockchip,pins = <2 RK_PA7 1 &pcfg_pull_none>;
 		};
--- a/arch/arm/boot/dts/rk3066a.dtsi
+++ b/arch/arm/boot/dts/rk3066a.dtsi
@@ -761,7 +761,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;

-		pd_vio@RK3066_PD_VIO {
+		power-domain@RK3066_PD_VIO {
 			reg = <RK3066_PD_VIO>;
 			clocks = <&cru ACLK_LCDC0>,
 				 <&cru ACLK_LCDC1>,
@@ -788,7 +788,7 @@
 				 <&qos_rga>;
 		};

-		pd_video@RK3066_PD_VIDEO {
+		power-domain@RK3066_PD_VIDEO {
 			reg = <RK3066_PD_VIDEO>;
 			clocks = <&cru ACLK_VDPU>,
 				 <&cru ACLK_VEPU>,
@@ -797,7 +797,7 @@
 			pm_qos = <&qos_vpu>;
 		};

-		pd_gpu@RK3066_PD_GPU {
+		power-domain@RK3066_PD_GPU {
 			reg = <RK3066_PD_GPU>;
 			clocks = <&cru ACLK_GPU>;
 			pm_qos = <&qos_gpu>;
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -150,16 +150,16 @@
 		compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer";
 		reg = <0x2000e000 0x20>;
 		interrupts = <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&cru SCLK_TIMER3>, <&cru PCLK_TIMER3>;
-		clock-names = "timer", "pclk";
+		clocks = <&cru PCLK_TIMER3>, <&cru SCLK_TIMER3>;
+		clock-names = "pclk", "timer";
 	};

 	timer6: timer@200380a0 {
 		compatible = "rockchip,rk3188-timer", "rockchip,rk3288-timer";
 		reg = <0x200380a0 0x20>;
 		interrupts = <GIC_SPI 64 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&cru SCLK_TIMER6>, <&cru PCLK_TIMER0>;
-		clock-names = "timer", "pclk";
+		clocks = <&cru PCLK_TIMER0>, <&cru SCLK_TIMER6>;
+		clock-names = "pclk", "timer";
 	};

 	i2s0: i2s@1011a000 {
@@ -701,7 +701,7 @@
 		#address-cells = <1>;
 		#size-cells = <0>;

-		pd_vio@RK3188_PD_VIO {
+		power-domain@RK3188_PD_VIO {
 			reg = <RK3188_PD_VIO>;
 			clocks = <&cru ACLK_LCDC0>,
 				 <&cru ACLK_LCDC1>,
@@ -723,7 +723,7 @@
 				 <&qos_rga>;
 		};

-		pd_video@RK3188_PD_VIDEO {
+		power-domain@RK3188_PD_VIDEO {
 			reg = <RK3188_PD_VIDEO>;
 			clocks = <&cru ACLK_VDPU>,
 				 <&cru ACLK_VEPU>,
@@ -732,7 +732,7 @@
 			pm_qos = <&qos_vpu>;
 		};

-		pd_gpu@RK3188_PD_GPU {
+		power-domain@RK3188_PD_GPU {
 			reg = <RK3188_PD_GPU>;
 			clocks = <&cru ACLK_GPU>;
 			pm_qos = <&qos_gpu>;
--- a/arch/arm/boot/dts/rk322x.dtsi
+++ b/arch/arm/boot/dts/rk322x.dtsi
@@ -570,10 +570,9 @@
 		compatible = "rockchip,iommu";
 		reg = <0x20020800 0x100>;
 		interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "vpu_mmu";
 		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
 		clock-names = "aclk", "iface";
-		iommu-cells = <0>;
+		#iommu-cells = <0>;
 		status = "disabled";
 	};

@@ -581,10 +580,9 @@
 		compatible = "rockchip,iommu";
 		reg = <0x20030480 0x40>, <0x200304c0 0x40>;
 		interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "vdec_mmu";
 		clocks = <&cru ACLK_RKVDEC>, <&cru HCLK_RKVDEC>;
 		clock-names = "aclk", "iface";
-		iommu-cells = <0>;
+		#iommu-cells = <0>;
 		status = "disabled";
 	};

@@ -614,7 +612,6 @@
 		compatible = "rockchip,iommu";
 		reg = <0x20053f00 0x100>;
 		interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "vop_mmu";
 		clocks = <&cru ACLK_VOP>, <&cru HCLK_VOP>;
 		clock-names = "aclk", "iface";
 		#iommu-cells = <0>;
@@ -625,10 +622,9 @@
 		compatible = "rockchip,iommu";
 		reg = <0x20070800 0x100>;
 		interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
-		interrupt-names = "iep_mmu";
 		clocks = <&cru ACLK_IEP>, <&cru HCLK_IEP>;
 		clock-names = "aclk", "iface";
-		iommu-cells = <0>;
+		#iommu-cells = <0>;
 		status = "disabled";
 	};

--- a/arch/arm/boot/dts/rk3288-rock2-som.dtsi
+++ b/arch/arm/boot/dts/rk3288-rock2-som.dtsi
@@ -218,7 +218,7 @@
 	flash0-supply = <&vcc_flash>;
 	flash1-supply = <&vccio_pmu>;
 	gpio30-supply = <&vccio_pmu>;
-	gpio1830 = <&vcc_io>;
+	gpio1830-supply = <&vcc_io>;
 	lcdc-supply = <&vcc_io>;
 	sdcard-supply = <&vccio_sd>;
 	wifi-supply = <&vcc_18>;
--- a/arch/arm/boot/dts/rk3288-vyasa.dts
+++ b/arch/arm/boot/dts/rk3288-vyasa.dts
@@ -357,10 +357,10 @@
 	audio-supply = <&vcc_18>;
 	bb-supply = <&vcc_io>;
 	dvp-supply = <&vcc_io>;
-	flash0-suuply = <&vcc_18>;
+	flash0-supply = <&vcc_18>;
 	flash1-supply = <&vcc_lan>;
 	gpio30-supply = <&vcc_io>;
-	gpio1830 = <&vcc_io>;
+	gpio1830-supply = <&vcc_io>;
 	lcdc-supply = <&vcc_io>;
 	sdcard-supply = <&vccio_sd>;
 	wifi-supply = <&vcc_18>;
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -238,8 +238,8 @@
 		compatible = "rockchip,rk3288-timer";
 		reg = <0x0 0xff810000 0x0 0x20>;
 		interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_HIGH>;
-		clocks = <&xin24m>, <&cru PCLK_TIMER>;
-		clock-names = "timer", "pclk";
+		clocks = <&cru PCLK_TIMER>, <&xin24m>;
+		clock-names = "pclk", "timer";
 	};

 	display-subsystem {
@@ -771,7 +771,7 @@
 			 *	*_HDMI		HDMI
 			 *	*_MIPI_*	MIPI
 			 */
-			pd_vio@RK3288_PD_VIO {
+			power-domain@RK3288_PD_VIO {
 				reg = <RK3288_PD_VIO>;
 				clocks = <&cru ACLK_IEP>,
 					 <&cru ACLK_ISP>,
@@ -813,7 +813,7 @@
 			 * Note: The following 3 are HEVC(H.265) clocks,
 			 * and on the ACLK_HEVC_NIU (NOC).
 			 */
-			pd_hevc@RK3288_PD_HEVC {
+			power-domain@RK3288_PD_HEVC {
 				reg = <RK3288_PD_HEVC>;
 				clocks = <&cru ACLK_HEVC>,
 					 <&cru SCLK_HEVC_CABAC>,
@@ -827,7 +827,7 @@
 			 * (video endecoder & decoder) clocks that on the
 			 * ACLK_VCODEC_NIU and HCLK_VCODEC_NIU (NOC).
 			 */
-			pd_video@RK3288_PD_VIDEO {
+			power-domain@RK3288_PD_VIDEO {
 				reg = <RK3288_PD_VIDEO>;
 				clocks = <&cru ACLK_VCODEC>,
 					 <&cru HCLK_VCODEC>;
@@ -838,7 +838,7 @@
 			 * Note: ACLK_GPU is the GPU clock,
 			 * and on the ACLK_GPU_NIU (NOC).
 			 */
-			pd_gpu@RK3288_PD_GPU {
+			power-domain@RK3288_PD_GPU {
 				reg = <RK3288_PD_GPU>;
 				clocks = <&cru ACLK_GPU>;
 				pm_qos = <&qos_gpu_r>,
@@ -1575,7 +1575,7 @@
 			drive-strength = <12>;
 		};

-		sleep {
+		suspend {
 			global_pwroff: global-pwroff {
 				rockchip,pins = <0 RK_PA0 1 &pcfg_pull_none>;
 			};
--- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@ -755,14 +755,14 @@
 			status = "disabled";
 		};

-		vica: intc@10140000 {
+		vica: interrupt-controller@10140000 {
 			compatible = "arm,versatile-vic";
 			interrupt-controller;
 			#interrupt-cells = <1>;
 			reg = <0x10140000 0x20>;
 		};

-		vicb: intc@10140020 {
+		vicb: interrupt-controller@10140020 {
 			compatible = "arm,versatile-vic";
 			interrupt-controller;
 			#interrupt-cells = <1>;
--- a/arch/arm/boot/dts/stm32429i-eval.dts
+++ b/arch/arm/boot/dts/stm32429i-eval.dts
@@ -112,17 +112,15 @@
 		};
 	};

-	gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 		autorepeat;
-		button@0 {
+		button-0 {
 			label = "Wake up";
 			linux,code = <KEY_WAKEUP>;
 			gpios = <&gpioa 0 0>;
 		};
-		button@1 {
+		button-1 {
 			label = "Tamper";
 			linux,code = <KEY_RESTART>;
 			gpios = <&gpioc 13 0>;
--- a/arch/arm/boot/dts/stm32746g-eval.dts
+++ b/arch/arm/boot/dts/stm32746g-eval.dts
@@ -81,12 +81,10 @@
 		};
 	};

-	gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 		autorepeat;
-		button@0 {
+		button-0 {
 			label = "Wake up";
 			linux,code = <KEY_WAKEUP>;
 			gpios = <&gpioc 13 0>;
--- a/arch/arm/boot/dts/stm32f429-disco.dts
+++ b/arch/arm/boot/dts/stm32f429-disco.dts
@@ -79,12 +79,10 @@
 		};
 	};

-	gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 		autorepeat;
-		button@0 {
+		button-0 {
 			label = "User";
 			linux,code = <KEY_HOME>;
 			gpios = <&gpioa 0 0>;
--- a/arch/arm/boot/dts/stm32f429.dtsi
+++ b/arch/arm/boot/dts/stm32f429.dtsi
@@ -283,8 +283,6 @@
 		};

 		timers13: timers@40001c00 {
-			#address-cells = <1>;
-			#size-cells = <0>;
 			compatible = "st,stm32-timers";
 			reg = <0x40001C00 0x400>;
 			clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM13)>;
@@ -299,8 +297,6 @@
 		};

 		timers14: timers@40002000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
 			compatible = "st,stm32-timers";
 			reg = <0x40002000 0x400>;
 			clocks = <&rcc 0 STM32F4_APB1_CLOCK(TIM14)>;
@@ -623,8 +619,6 @@
 		};

 		timers10: timers@40014400 {
-			#address-cells = <1>;
-			#size-cells = <0>;
 			compatible = "st,stm32-timers";
 			reg = <0x40014400 0x400>;
 			clocks = <&rcc 0 STM32F4_APB2_CLOCK(TIM10)>;
@@ -639,8 +633,6 @@
 		};

 		timers11: timers@40014800 {
-			#address-cells = <1>;
-			#size-cells = <0>;
 			compatible = "st,stm32-timers";
 			reg = <0x40014800 0x400>;
 			clocks = <&rcc 0 STM32F4_APB2_CLOCK(TIM11)>;
@@ -696,7 +688,7 @@
 			status = "disabled";
 		};

-		rcc: rcc@40023810 {
+		rcc: rcc@40023800 {
 			#reset-cells = <1>;
 			#clock-cells = <2>;
 			compatible = "st,stm32f42xx-rcc", "st,stm32-rcc";
--- a/arch/arm/boot/dts/stm32f469-disco.dts
+++ b/arch/arm/boot/dts/stm32f469-disco.dts
@@ -104,12 +104,10 @@
 		};
 	};

-	gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 		autorepeat;
-		button@0 {
+		button-0 {
 			label = "User";
 			linux,code = <KEY_WAKEUP>;
 			gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
--- a/arch/arm/boot/dts/stm32f746.dtsi
+++ b/arch/arm/boot/dts/stm32f746.dtsi
@@ -265,8 +265,6 @@
 		};

 		timers13: timers@40001c00 {
-			#address-cells = <1>;
-			#size-cells = <0>;
 			compatible = "st,stm32-timers";
 			reg = <0x40001C00 0x400>;
 			clocks = <&rcc 0 STM32F7_APB1_CLOCK(TIM13)>;
@@ -281,8 +279,6 @@
 		};

 		timers14: timers@40002000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
 			compatible = "st,stm32-timers";
 			reg = <0x40002000 0x400>;
 			clocks = <&rcc 0 STM32F7_APB1_CLOCK(TIM14)>;
@@ -366,9 +362,9 @@
 			status = "disabled";
 		};

-		i2c3: i2c@40005C00 {
+		i2c3: i2c@40005c00 {
 			compatible = "st,stm32f7-i2c";
-			reg = <0x40005C00 0x400>;
+			reg = <0x40005c00 0x400>;
 			interrupts = <72>,
 				     <73>;
 			resets = <&rcc STM32F7_APB1_RESET(I2C3)>;
@@ -533,8 +529,6 @@
 		};

 		timers10: timers@40014400 {
-			#address-cells = <1>;
-			#size-cells = <0>;
 			compatible = "st,stm32-timers";
 			reg = <0x40014400 0x400>;
 			clocks = <&rcc 0 STM32F7_APB2_CLOCK(TIM10)>;
@@ -549,8 +543,6 @@
 		};

 		timers11: timers@40014800 {
-			#address-cells = <1>;
-			#size-cells = <0>;
 			compatible = "st,stm32-timers";
 			reg = <0x40014800 0x400>;
 			clocks = <&rcc 0 STM32F7_APB2_CLOCK(TIM11)>;
--- a/arch/arm/boot/dts/stm32f769-disco.dts
+++ b/arch/arm/boot/dts/stm32f769-disco.dts
@@ -75,12 +75,10 @@
 		};
 	};

-	gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
-		#address-cells = <1>;
-		#size-cells = <0>;
 		autorepeat;
-		button@0 {
+		button-0 {
 			label = "User";
 			linux,code = <KEY_HOME>;
 			gpios = <&gpioa 0 GPIO_ACTIVE_HIGH>;
--- a/arch/arm/boot/dts/stm32h743.dtsi
+++ b/arch/arm/boot/dts/stm32h743.dtsi
@@ -438,8 +438,6 @@
 		};

 		lptimer4: timer@58002c00 {
-			#address-cells = <1>;
-			#size-cells = <0>;
 			compatible = "st,stm32-lptimer";
 			reg = <0x58002c00 0x400>;
 			clocks = <&rcc LPTIM4_CK>;
@@ -454,8 +452,6 @@
 		};

 		lptimer5: timer@58003000 {
-			#address-cells = <1>;
-			#size-cells = <0>;
 			compatible = "st,stm32-lptimer";
 			reg = <0x58003000 0x400>;
 			clocks = <&rcc LPTIM5_CK>;
--- a/arch/arm/boot/dts/stm32mp157c.dtsi
+++ b/arch/arm/boot/dts/stm32mp157c.dtsi
@@ -1311,12 +1311,6 @@
 			status = "disabled";
 		};

-		stmmac_axi_config_0: stmmac-axi-config {
-			snps,wr_osr_lmt = <0x7>;
-			snps,rd_osr_lmt = <0x7>;
-			snps,blen = <0 0 0 0 16 8 4>;
-		};
-
 		ethernet0: ethernet@5800a000 {
 			compatible = "st,stm32mp1-dwmac", "snps,dwmac-4.20a";
 			reg = <0x5800a000 0x2000>;
@@ -1339,6 +1333,12 @@
 			snps,axi-config = <&stmmac_axi_config_0>;
 			snps,tso;
 			status = "disabled";
+
+			stmmac_axi_config_0: stmmac-axi-config {
+				snps,wr_osr_lmt = <0x7>;
+				snps,rd_osr_lmt = <0x7>;
+				snps,blen = <0 0 0 0 16 8 4>;
+			};
 		};

 		usbh_ohci: usbh-ohci@5800c000 {
--- a/arch/arm/boot/dts/versatile-ab.dts
+++ b/arch/arm/boot/dts/versatile-ab.dts
@@ -195,16 +195,15 @@
 		#size-cells = <1>;
 		ranges;

-		vic: intc@10140000 {
+		vic: interrupt-controller@10140000 {
 			compatible = "arm,versatile-vic";
 			interrupt-controller;
 			#interrupt-cells = <1>;
 			reg = <0x10140000 0x1000>;
-			clear-mask = <0xffffffff>;
 			valid-mask = <0xffffffff>;
 		};

-		sic: intc@10003000 {
+		sic: interrupt-controller@10003000 {
 			compatible = "arm,versatile-sic";
 			interrupt-controller;
 			#interrupt-cells = <1>;
--- a/arch/arm/boot/dts/versatile-pb.dts
+++ b/arch/arm/boot/dts/versatile-pb.dts
@@ -7,7 +7,7 @@

 	amba {
 		/* The Versatile PB is using more SIC IRQ lines than the AB */
-		sic: intc@10003000 {
+		sic: interrupt-controller@10003000 {
 			clear-mask = <0xffffffff>;
 			/*
 			 * Valid interrupt lines mask according to
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -17,10 +17,14 @@ CFLAGS_REMOVE_return_address.o = -pg
 # Object file lists.

 obj-y		:= elf.o entry-common.o irq.o opcodes.o \
-		   process.o ptrace.o reboot.o return_address.o \
+		   process.o ptrace.o reboot.o \
 		   setup.o signal.o sigreturn_codes.o \
 		   stacktrace.o sys_arm.o time.o traps.o

+ifneq ($(CONFIG_ARM_UNWIND),y)
+obj-$(CONFIG_FRAME_POINTER)	+= return_address.o
+endif
+
 obj-$(CONFIG_ATAGS)		+= atags_parse.o
 obj-$(CONFIG_ATAGS_PROC)	+= atags_proc.o
 obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o
--- a/arch/arm/kernel/return_address.c
+++ b/arch/arm/kernel/return_address.c
@@ -7,8 +7,6 @@
 */
 #include <linux/export.h>
 #include <linux/ftrace.h>
-
-#if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND)
 #include <linux/sched.h>

 #include <asm/stacktrace.h>
@@ -53,6 +51,4 @@ void *return_address(unsigned int level)
 		return NULL;
 }

-#endif /* if defined(CONFIG_FRAME_POINTER) && !defined(CONFIG_ARM_UNWIND) */
-
 EXPORT_SYMBOL_GPL(return_address);
--- a/arch/arm/mach-imx/mmdc.c
+++ b/arch/arm/mach-imx/mmdc.c
@@ -103,6 +103,7 @@ struct mmdc_pmu {
 	struct perf_event *mmdc_events[MMDC_NUM_COUNTERS];
 	struct hlist_node node;
 	struct fsl_mmdc_devtype_data *devtype_data;
+	struct clk *mmdc_ipg_clk;
 };

 /*
@@ -462,11 +463,14 @@ static int imx_mmdc_remove(struct platform_device *pdev)

 	cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node);
 	perf_pmu_unregister(&pmu_mmdc->pmu);
+	iounmap(pmu_mmdc->mmdc_base);
+	clk_disable_unprepare(pmu_mmdc->mmdc_ipg_clk);
 	kfree(pmu_mmdc);
 	return 0;
 }

-static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_base)
+static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_base,
+			      struct clk *mmdc_ipg_clk)
 {
 	struct mmdc_pmu *pmu_mmdc;
 	char *name;
@@ -494,6 +498,7 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b
 	}

 	mmdc_num = mmdc_pmu_init(pmu_mmdc, mmdc_base, &pdev->dev);
+	pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk;
 	if (mmdc_num == 0)
 		name = "mmdc";
 	else
@@ -529,7 +534,7 @@ pmu_free:

 #else
 #define imx_mmdc_remove NULL
-#define imx_mmdc_perf_init(pdev, mmdc_base) 0
+#define imx_mmdc_perf_init(pdev, mmdc_base, mmdc_ipg_clk) 0
 #endif

 static int imx_mmdc_probe(struct platform_device *pdev)
@@ -567,7 +572,13 @@ static int imx_mmdc_probe(struct platform_device *pdev)
 	val &= ~(1 << BP_MMDC_MAPSR_PSD);
 	writel_relaxed(val, reg);

-	return imx_mmdc_perf_init(pdev, mmdc_base);
+	err = imx_mmdc_perf_init(pdev, mmdc_base, mmdc_ipg_clk);
+	if (err) {
+		iounmap(mmdc_base);
+		clk_disable_unprepare(mmdc_ipg_clk);
+	}
+
+	return err;
 }

 int imx_mmdc_get_ddr_type(void)
--- a/arch/arm/mach-imx/suspend-imx53.S
+++ b/arch/arm/mach-imx/suspend-imx53.S
@@ -28,11 +28,11 @@
 *                              ^
 *                              ^
 *                      imx53_suspend code
- *              PM_INFO structure(imx53_suspend_info)
+ *              PM_INFO structure(imx5_cpu_suspend_info)
 * ======================== low address =======================
 */

-/* Offsets of members of struct imx53_suspend_info */
+/* Offsets of members of struct imx5_cpu_suspend_info */
 #define SUSPEND_INFO_MX53_M4IF_V_OFFSET		0x0
 #define SUSPEND_INFO_MX53_IOMUXC_V_OFFSET	0x4
 #define SUSPEND_INFO_MX53_IO_COUNT_OFFSET	0x8
--- a/arch/arm/net/bpf_jit_32.c
+++ b/arch/arm/net/bpf_jit_32.c
@@ -1602,6 +1602,9 @@ exit:
 		rn = arm_bpf_get_reg32(src_lo, tmp2[1], ctx);
 		emit_ldx_r(dst, rn, off, ctx, BPF_SIZE(code));
 		break;
+	/* speculation barrier */
+	case BPF_ST | BPF_NOSPEC:
+		break;
 	/* ST: *(size *)(dst + off) = imm */
 	case BPF_ST | BPF_MEM | BPF_W:
 	case BPF_ST | BPF_MEM | BPF_H:
--- a/arch/arm64/boot/dts/arm/juno-base.dtsi
+++ b/arch/arm64/boot/dts/arm/juno-base.dtsi
@@ -537,13 +537,13 @@
 		clocks {
 			compatible = "arm,scpi-clocks";

-			scpi_dvfs: scpi-dvfs {
+			scpi_dvfs: clocks-0 {
 				compatible = "arm,scpi-dvfs-clocks";
 				#clock-cells = <1>;
 				clock-indices = <0>, <1>, <2>;
 				clock-output-names = "atlclk", "aplclk","gpuclk";
 			};
-			scpi_clk: scpi-clk {
+			scpi_clk: clocks-1 {
 				compatible = "arm,scpi-variable-clocks";
 				#clock-cells = <1>;
 				clock-indices = <3>;
@@ -551,7 +551,7 @@
 			};
 		};

-		scpi_devpd: scpi-power-domains {
+		scpi_devpd: power-controller {
 			compatible = "arm,scpi-power-domains";
 			num-domains = <2>;
 			#power-domain-cells = <1>;
--- a/arch/arm64/boot/dts/exynos/exynos7.dtsi
+++ b/arch/arm64/boot/dts/exynos/exynos7.dtsi
@@ -113,7 +113,7 @@
 			#address-cells = <0>;
 			interrupt-controller;
 			reg =	<0x11001000 0x1000>,
-				<0x11002000 0x1000>,
+				<0x11002000 0x2000>,
 				<0x11004000 0x2000>,
 				<0x11006000 0x2000>;
 		};
--- a/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi
@@ -65,7 +65,7 @@
 		};
 	};

-	sysclk: clock-sysclk {
+	sysclk: sysclk {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <100000000>;
--- a/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
+++ b/arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi
@@ -501,7 +501,6 @@
 			clocks = <&clockgen 4 3>;
 			clock-names = "dspi";
 			spi-num-chipselects = <5>;
-			bus-num = <0>;
 		};

 		esdhc: esdhc@2140000 {
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@ -1056,6 +1056,14 @@
 			         <&src IMX8MQ_RESET_PCIE_CTRL_APPS_EN>,
 			         <&src IMX8MQ_RESET_PCIE_CTRL_APPS_TURNOFF>;
 			reset-names = "pciephy", "apps", "turnoff";
+			assigned-clocks = <&clk IMX8MQ_CLK_PCIE1_CTRL>,
+			                  <&clk IMX8MQ_CLK_PCIE1_PHY>,
+			                  <&clk IMX8MQ_CLK_PCIE1_AUX>;
+			assigned-clock-parents = <&clk IMX8MQ_SYS2_PLL_250M>,
+			                         <&clk IMX8MQ_SYS2_PLL_100M>,
+			                         <&clk IMX8MQ_SYS1_PLL_80M>;
+			assigned-clock-rates = <250000000>, <100000000>,
+			                       <10000000>;
 			status = "disabled";
 		};

@@ -1085,6 +1093,14 @@
 			         <&src IMX8MQ_RESET_PCIE2_CTRL_APPS_EN>,
 			         <&src IMX8MQ_RESET_PCIE2_CTRL_APPS_TURNOFF>;
 			reset-names = "pciephy", "apps", "turnoff";
+			assigned-clocks = <&clk IMX8MQ_CLK_PCIE2_CTRL>,
+			                  <&clk IMX8MQ_CLK_PCIE2_PHY>,
+			                  <&clk IMX8MQ_CLK_PCIE2_AUX>;
+			assigned-clock-parents = <&clk IMX8MQ_SYS2_PLL_250M>,
+			                         <&clk IMX8MQ_SYS2_PLL_100M>,
+			                         <&clk IMX8MQ_SYS1_PLL_80M>;
+			assigned-clock-rates = <250000000>, <100000000>,
+			                       <10000000>;
 			status = "disabled";
 		};

--- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
@@ -106,12 +106,19 @@
 		/* enabled by U-Boot if SFP module is present */
 		status = "disabled";
 	};
+
+	firmware {
+		armada-3700-rwtm {
+			compatible = "marvell,armada-3700-rwtm-firmware", "cznic,turris-mox-rwtm";
+		};
+	};
 };

 &i2c0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&i2c1_pins>;
 	clock-frequency = <100000>;
+	/delete-property/ mrvl,i2c-fast-mode;
 	status = "okay";

 	rtc@6f {
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -500,4 +500,12 @@
 			};
 		};
 	};
+
+	firmware {
+		armada-3700-rwtm {
+			compatible = "marvell,armada-3700-rwtm-firmware";
+			mboxes = <&rwtm 0>;
+			status = "okay";
+		};
+	};
 };
--- a/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts
+++ b/arch/arm64/boot/dts/qcom/msm8994-angler-rev-101.dts
@@ -30,3 +30,7 @@
 		};
 	};
 };
+
+&msmgpio {
+	gpio-reserved-ranges = <85 4>;
+};
--- a/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77995-draak.dts
@@ -277,10 +277,6 @@
 		interrupt-parent = <&gpio1>;
 		interrupts = <28 IRQ_TYPE_LEVEL_LOW>;

-		/* Depends on LVDS */
-		max-clock = <135000000>;
-		min-vrefresh = <50>;
-
 		adi,input-depth = <8>;
 		adi,input-colorspace = "rgb";
 		adi,input-clock = "1x";
--- a/arch/arm64/boot/dts/rockchip/px30.dtsi
+++ b/arch/arm64/boot/dts/rockchip/px30.dtsi
@@ -213,20 +213,20 @@
 			#size-cells = <0>;

 			/* These power domains are grouped by VD_LOGIC */
-			pd_usb@PX30_PD_USB {
+			power-domain@PX30_PD_USB {
 				reg = <PX30_PD_USB>;
 				clocks = <&cru HCLK_HOST>,
 					 <&cru HCLK_OTG>,
 					 <&cru SCLK_OTG_ADP>;
 				pm_qos = <&qos_usb_host>, <&qos_usb_otg>;
 			};
-			pd_sdcard@PX30_PD_SDCARD {
+			power-domain@PX30_PD_SDCARD {
 				reg = <PX30_PD_SDCARD>;
 				clocks = <&cru HCLK_SDMMC>,
 					 <&cru SCLK_SDMMC>;
 				pm_qos = <&qos_sdmmc>;
 			};
-			pd_gmac@PX30_PD_GMAC {
+			power-domain@PX30_PD_GMAC {
 				reg = <PX30_PD_GMAC>;
 				clocks = <&cru ACLK_GMAC>,
 					 <&cru PCLK_GMAC>,
@@ -234,7 +234,7 @@
 					 <&cru SCLK_GMAC_RX_TX>;
 				pm_qos = <&qos_gmac>;
 			};
-			pd_mmc_nand@PX30_PD_MMC_NAND {
+			power-domain@PX30_PD_MMC_NAND {
 				reg = <PX30_PD_MMC_NAND>;
 				clocks =  <&cru HCLK_NANDC>,
 					  <&cru HCLK_EMMC>,
@@ -247,14 +247,14 @@
 				pm_qos = <&qos_emmc>, <&qos_nand>,
 					 <&qos_sdio>, <&qos_sfc>;
 			};
-			pd_vpu@PX30_PD_VPU {
+			power-domain@PX30_PD_VPU {
 				reg = <PX30_PD_VPU>;
 				clocks = <&cru ACLK_VPU>,
 					 <&cru HCLK_VPU>,
 					 <&cru SCLK_CORE_VPU>;
 				pm_qos = <&qos_vpu>, <&qos_vpu_r128>;
 			};
-			pd_vo@PX30_PD_VO {
+			power-domain@PX30_PD_VO {
 				reg = <PX30_PD_VO>;
 				clocks = <&cru ACLK_RGA>,
 					 <&cru ACLK_VOPB>,
@@ -270,7 +270,7 @@
 				pm_qos = <&qos_rga_rd>, <&qos_rga_wr>,
 					 <&qos_vop_m0>, <&qos_vop_m1>;
 			};
-			pd_vi@PX30_PD_VI {
+			power-domain@PX30_PD_VI {
 				reg = <PX30_PD_VI>;
 				clocks = <&cru ACLK_CIF>,
 					 <&cru ACLK_ISP>,
@@ -281,7 +281,7 @@
 					 <&qos_isp_wr>, <&qos_isp_m1>,
 					 <&qos_vip>;
 			};
-			pd_gpu@PX30_PD_GPU {
+			power-domain@PX30_PD_GPU {
 				reg = <PX30_PD_GPU>;
 				clocks = <&cru SCLK_GPU>;
 				pm_qos = <&qos_gpu>;
--- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi
@@ -270,13 +270,13 @@
 			#address-cells = <1>;
 			#size-cells = <0>;

-			pd_hevc@RK3328_PD_HEVC {
+			power-domain@RK3328_PD_HEVC {
 				reg = <RK3328_PD_HEVC>;
 			};
-			pd_video@RK3328_PD_VIDEO {
+			power-domain@RK3328_PD_VIDEO {
 				reg = <RK3328_PD_VIDEO>;
 			};
-			pd_vpu@RK3328_PD_VPU {
+			power-domain@RK3328_PD_VPU {
 				reg = <RK3328_PD_VPU>;
 				clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
 			};
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -2317,7 +2317,7 @@
 			};
 		};

-		sleep {
+		suspend {
 			ap_pwroff: ap-pwroff {
 				rockchip,pins = <1 RK_PA5 1 &pcfg_pull_none>;
 			};
--- a/arch/arm64/include/asm/ptrace.h
+++ b/arch/arm64/include/asm/ptrace.h
@@ -299,7 +299,17 @@ static inline unsigned long kernel_stack_pointer(struct pt_regs *regs)

 static inline unsigned long regs_return_value(struct pt_regs *regs)
 {
-	return regs->regs[0];
+	unsigned long val = regs->regs[0];
+
+	/*
+	 * Audit currently uses regs_return_value() instead of
+	 * syscall_get_return_value(). Apply the same sign-extension here until
+	 * audit is updated to use syscall_get_return_value().
+	 */
+	if (compat_user_mode(regs))
+		val = sign_extend64(val, 31);
+
+	return val;
 }

 static inline void regs_set_return_value(struct pt_regs *regs, unsigned long rc)
--- a/arch/arm64/include/asm/syscall.h
+++ b/arch/arm64/include/asm/syscall.h
@@ -29,24 +29,25 @@ static inline void syscall_rollback(struct task_struct *task,
 	regs->regs[0] = regs->orig_x0;
 }

+static inline long syscall_get_return_value(struct task_struct *task,
+					    struct pt_regs *regs)
+{
+	unsigned long val = regs->regs[0];
+
+	if (is_compat_thread(task_thread_info(task)))
+		val = sign_extend64(val, 31);
+
+	return val;
+}

 static inline long syscall_get_error(struct task_struct *task,
 				     struct pt_regs *regs)
 {
-	unsigned long error = regs->regs[0];
-
-	if (is_compat_thread(task_thread_info(task)))
-		error = sign_extend64(error, 31);
+	unsigned long error = syscall_get_return_value(task, regs);

 	return IS_ERR_VALUE(error) ? error : 0;
 }

-static inline long syscall_get_return_value(struct task_struct *task,
-					    struct pt_regs *regs)
-{
-	return regs->regs[0];
-}
-
 static inline void syscall_set_return_value(struct task_struct *task,
 					    struct pt_regs *regs,
 					    int error, long val)
--- a/arch/arm64/kernel/ptrace.c
+++ b/arch/arm64/kernel/ptrace.c
@@ -1868,7 +1868,7 @@ void syscall_trace_exit(struct pt_regs *regs)
 	audit_syscall_exit(regs);

 	if (flags & _TIF_SYSCALL_TRACEPOINT)
-		trace_sys_exit(regs, regs_return_value(regs));
+		trace_sys_exit(regs, syscall_get_return_value(current, regs));

 	if (flags & (_TIF_SYSCALL_TRACE | _TIF_SINGLESTEP))
 		tracehook_report_syscall(regs, PTRACE_SYSCALL_EXIT);
--- a/arch/arm64/kernel/signal.c
+++ b/arch/arm64/kernel/signal.c
@@ -29,6 +29,7 @@
 #include <asm/unistd.h>
 #include <asm/fpsimd.h>
 #include <asm/ptrace.h>
+#include <asm/syscall.h>
 #include <asm/signal32.h>
 #include <asm/traps.h>
 #include <asm/vdso.h>
@@ -868,7 +869,7 @@ static void do_signal(struct pt_regs *regs)
 		     retval == -ERESTART_RESTARTBLOCK ||
 		     (retval == -ERESTARTSYS &&
 		      !(ksig.ka.sa.sa_flags & SA_RESTART)))) {
-			regs->regs[0] = -EINTR;
+			syscall_set_return_value(current, regs, -EINTR, 0);
 			regs->pc = continue_addr;
 		}

--- a/arch/arm64/kernel/syscall.c
+++ b/arch/arm64/kernel/syscall.c
@@ -50,10 +50,7 @@ static void invoke_syscall(struct pt_regs *regs, unsigned int scno,
 		ret = do_ni_syscall(regs, scno);
 	}

-	if (is_compat_task())
-		ret = lower_32_bits(ret);
-
-	regs->regs[0] = ret;
+	syscall_set_return_value(current, regs, 0, ret);
 }

 static inline bool has_syscall_work(unsigned long flags)
@@ -108,7 +105,7 @@ static void el0_svc_common(struct pt_regs *regs, int scno, int sc_nr,
 	if (has_syscall_work(flags)) {
 		/* set default errno for user-issued syscall(-1) */
 		if (scno == NO_SYSCALL)
-			regs->regs[0] = -ENOSYS;
+			syscall_set_return_value(current, regs, -ENOSYS, 0);
 		scno = syscall_trace_enter(regs);
 		if (scno == NO_SYSCALL)
 			goto trace_exit;
--- a/arch/arm64/net/bpf_jit_comp.c
+++ b/arch/arm64/net/bpf_jit_comp.c
@@ -701,6 +701,19 @@ emit_cond_jmp:
 		}
 		break;

+	/* speculation barrier */
+	case BPF_ST | BPF_NOSPEC:
+		/*
+		 * Nothing required here.
+		 *
+		 * In case of arm64, we rely on the firmware mitigation of
+		 * Speculative Store Bypass as controlled via the ssbd kernel
+		 * parameter. Whenever the mitigation is enabled, it works
+		 * for all of the kernel code with no need to provide any
+		 * additional instructions.
+		 */
+		break;
+
 	/* ST: *(size *)(dst + off) = imm */
 	case BPF_ST | BPF_MEM | BPF_W:
 	case BPF_ST | BPF_MEM | BPF_H:
--- a/arch/m68k/emu/nfeth.c
+++ b/arch/m68k/emu/nfeth.c
@@ -254,8 +254,8 @@ static void __exit nfeth_cleanup(void)

 	for (i = 0; i < MAX_UNIT; i++) {
 		if (nfeth_dev[i]) {
-			unregister_netdev(nfeth_dev[0]);
-			free_netdev(nfeth_dev[0]);
+			unregister_netdev(nfeth_dev[i]);
+			free_netdev(nfeth_dev[i]);
 		}
 	}
 	free_irq(nfEtherIRQ, nfeth_interrupt);
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -320,7 +320,7 @@ KBUILD_LDFLAGS		+= -m $(ld-emul)

 ifdef CONFIG_MIPS
 CHECKFLAGS += $(shell $(CC) $(KBUILD_CFLAGS) -dM -E -x c /dev/null | \
-	egrep -vw '__GNUC_(|MINOR_|PATCHLEVEL_)_' | \
+	egrep -vw '__GNUC_(MINOR_|PATCHLEVEL_)?_' | \
 	sed -e "s/^\#define /-D'/" -e "s/ /'='/" -e "s/$$/'/" -e 's/\$$/&&/g')
 endif

--- a/arch/mips/include/asm/pgalloc.h
+++ b/arch/mips/include/asm/pgalloc.h
@@ -62,15 +62,11 @@ do {							\

 static inline pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address)
 {
-	pmd_t *pmd = NULL;
-	struct page *pg;
+	pmd_t *pmd;

-	pg = alloc_pages(GFP_KERNEL | __GFP_ACCOUNT, PMD_ORDER);
-	if (pg) {
-		pgtable_pmd_page_ctor(pg);
-		pmd = (pmd_t *)page_address(pg);
+	pmd = (pmd_t *) __get_free_pages(GFP_KERNEL, PMD_ORDER);
+	if (pmd)
 		pmd_init((unsigned long)pmd, (unsigned long)invalid_pte_table);
-	}
 	return pmd;
 }

--- a/arch/mips/mti-malta/malta-platform.c
+++ b/arch/mips/mti-malta/malta-platform.c
@@ -47,7 +47,8 @@ static struct plat_serial8250_port uart8250_data[] = {
 		.mapbase	= 0x1f000900,	/* The CBUS UART */
 		.irq		= MIPS_CPU_IRQ_BASE + MIPSCPU_INT_MB2,
 		.uartclk	= 3686400,	/* Twice the usual clk! */
-		.iotype		= UPIO_MEM32,
+		.iotype		= IS_ENABLED(CONFIG_CPU_BIG_ENDIAN) ?
+				  UPIO_MEM32BE : UPIO_MEM32,
 		.flags		= CBUS_UART_FLAGS,
 		.regshift	= 3,
 	},
--- a/arch/mips/net/ebpf_jit.c
+++ b/arch/mips/net/ebpf_jit.c
@@ -1355,6 +1355,9 @@ jeq_common:
 		}
 		break;

+	case BPF_ST | BPF_NOSPEC: /* speculation barrier */
+		break;
+
 	case BPF_ST | BPF_B | BPF_MEM:
 	case BPF_ST | BPF_H | BPF_MEM:
 	case BPF_ST | BPF_W | BPF_MEM:
--- a/Show More
+++ b/Show More