Merge tag 'android12-5.10.198_r00' into android12-5.10

This merges catches the android12-5.10 branch up with the 5.10.198 LTS
release.  Included in here are the following commits:

* 9db823a19d Revert "netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp"
* f95f372cf9 Revert "net: bridge: use DEV_STATS_INC()"
*   3e7bedcc0e Merge 5.10.198 into android12-5.10-lts
|\
| * a8d812240f Linux 5.10.198
| * 660627c71b xen/events: replace evtchn_rwlock with RCU
| * 1e3d016a95 mmc: renesas_sdhi: only reset SCC when its pointer is populated
| * a7d86a77c3 netfilter: nftables: exthdr: fix 4-byte stack OOB write
| * 84f6b686df netfilter: nf_tables: fix kdoc warnings after gc rework
| * c17446c008 parisc: Restore __ldcw_align for PA-RISC 2.0 processors
| * cfc333393a RDMA/mlx5: Fix NULL string error
| * 0d520cdb0c RDMA/siw: Fix connection failure handling
| * 5a4a6a47e0 RDMA/uverbs: Fix typo of sizeof argument
| * 626868282c RDMA/cma: Fix truncation compilation warning in make_cma_ports
| * 7de0e42444 RDMA/cma: Initialize ib_sa_multicast structure to 0 when join
| * 36953b4da7 gpio: pxa: disable pinctrl calls for MMP_GPIO
| * 6ad972e668 gpio: aspeed: fix the GPIO number passed to pinctrl_gpio_set_config()
| * d7d8f1a679 IB/mlx4: Fix the size of a buffer in add_port_entries()
| * 204c2d485f of: dynamic: Fix potential memory leak in of_changeset_action()
| * b74f12f98b RDMA/core: Require admin capabilities to set system parameters
| * ccd87fe7a0 dm zoned: free dmz->ddev array in dmz_put_zoned_devices
| * 82d87c944e cpupower: add Makefile dependencies for install targets
| * 492241613c sctp: update hb timer immediately after users change hb_interval
| * f876584938 sctp: update transport state when processing a dupcook packet
| * ff346b01eb tcp: fix delayed ACKs for MSS boundary condition
| * 677aaa261e tcp: fix quick-ack counting to count actual ACKs of new data
| * 6a24d0661f tipc: fix a potential deadlock on &tx->lock
| * b9f1568ba3 net: stmmac: dwmac-stm32: fix resume on STM32 MCU
| * 3a5142f017 netfilter: nf_tables: nft_set_rbtree: fix spurious insertion failure
| * 0ba9348532 netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp
| * b212f361a5 net: ethernet: ti: am65-cpsw: Fix error code in am65_cpsw_nuss_init_tx_chns()
| * dba849cc98 net: nfc: llcp: Add lock when modifying device list
| * 30bc4d7aeb net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg
| * d44346dda7 net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent
| * 96b2e10903 ipv4, ipv6: Fix handling of transhdrlen in __ip{,6}_append_data()
| * 2ea52a2fb8 net: fix possible store tearing in neigh_periodic_work()
| * 6e3d9e5cab modpost: add missing else to the "of" check
| * 225cd4f67b NFSv4: Fix a nfs4_state_manager() race
| * d8f2ba9ec3 ima: rework CONFIG_IMA dependency block
| * 77f82df960 scsi: target: core: Fix deadlock due to recursive locking
| * a9430129d8 ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig
| * 725fd20805 regmap: rbtree: Fix wrong register marked as in-cache when creating new node
| * 666cdc43df wifi: mt76: mt76x02: fix MT76x0 external LNA gain handling
| * 54a4faab2b drivers/net: process the result of hdlc_open() and add call of hdlc_close() in uhdlc_close()
| * 93dd471d3a bpf: Fix tr dereferencing
| * 10a18c8bac wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet
| * 8c15c1bcc5 wifi: iwlwifi: dbg_ini: fix structure packing
| * a5f643ab11 ubi: Refuse attaching if mtd's erasesize is 0
| * 33420a8206 arm64: Add Cortex-A520 CPU part definition
| * 81d03e2518 net: prevent rewrite of msg_name in sock_sendmsg()
| * 72fc02ebfc net: replace calls to sock->ops->connect() with kernel_connect()
| * 1aeff207e2 wifi: mwifiex: Fix tlv_buf_left calculation
| * f6f25930fa qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info
| * b9c4b3ca90 scsi: zfcp: Fix a double put in zfcp_port_enqueue()
| * 04b6b67a3e Revert "PCI: qcom: Disable write access to read only registers for IP v2.3.3"
| * c2cf152e8b Revert "clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz"
| * f94471c0cc block: fix use-after-free of q->q_usage_counter
| * 0d6987d4a3 rbd: take header_rwsem in rbd_dev_refresh() only when updating
| * d3d170c5fc rbd: decouple parent info read-in from updating rbd_dev
| * 3ceb306f9b rbd: decouple header read-in from updating rbd_dev->header
| * 7c4f11d73b rbd: move rbd_dev_refresh() definition
| * d0952ce316 drm/mediatek: Fix backport issue in mtk_drm_gem_prime_vmap()
| * c33d75a57a ring-buffer: Fix bytes info in per_cpu buffer stats
| * 0ecde7dd76 ring-buffer: remove obsolete comment for free_buffer_page()
| * 2ad1a1d3d6 NFSv4: Fix a state manager thread deadlock regression
| * ec4325e806 NFS: rename nfs_client_kset to nfs_kset
| * 598539f38c NFS: Cleanup unused rpc_clnt variable
| * 19f3d5d13b spi: zynqmp-gqspi: fix clock imbalance on probe failure
| * 2cdec9c13f spi: spi-zynqmp-gqspi: Fix runtime PM imbalance in zynqmp_qspi_probe
| * ae03dafc37 fs: binfmt_elf_efpic: fix personality for ELF-FDPIC
| * 8ec1abb59a ata: libata-sata: increase PMP SRST timeout to 10s
| * dc0bd0f2da ata: libata-core: Do not register PM operations for SAS ports
| * 531d9f6dbf ata: libata-core: Fix port and device removal
| * 99d308c319 ata: libata-core: Fix ata_port_request_pm() locking
| * eaf4496662 net: thunderbolt: Fix TCPv6 GSO checksum calculation
| * 72595dbfca bpf: Fix BTF_ID symbol generation collision in tools/
| * 6a80578bd4 bpf: Fix BTF_ID symbol generation collision
| * cbbfdb4bab btrfs: properly report 0 avail for very full file systems
| * ef47f25e98 ring-buffer: Update "shortest_full" in polling
| * b7a0df4c08 proc: nommu: /proc/<pid>/maps: release mmap read lock
| * acc7fc82d0 Revert "SUNRPC dont update timeout value on connection reset"
| * e3b8c9e0fc i2c: i801: unregister tco_pdev in i801_probe() error path
| * b664e9db8d ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED OPERATION CODES
| * 25872c67de ALSA: hda: Disable power save for solving pop issue on Lenovo ThinkCentre M70q
| * 5a03b42ae1 netfilter: nf_tables: disallow rule removal from chain binding
| * 7130a87ca3 nilfs2: fix potential use after free in nilfs_gccache_submit_read_data()
| * e14afa4450 serial: 8250_port: Check IRQ data before use
| * 6d5c886293 Revert "tty: n_gsm: fix UAF in gsm_cleanup_mux"
| * 14443223e0 Smack:- Use overlay inode label in smack_inode_copy_up()
| * 297c51c63f smack: Retrieve transmuting information in smack_inode_getsecurity()
| * 41de7a6b95 smack: Record transmuting in smk_transmuted
| * 831f18c735 nvme-pci: always return an ERR_PTR from nvme_pci_alloc_dev
| * fb28f89d50 netfilter: nft_exthdr: Fix for unsafe packet data read
| * e18216cd0e netfilter: nft_exthdr: Search chunks in SCTP packets only
| * 152b8ac839 watchdog: iTCO_wdt: Set NO_REBOOT if the watchdog is not already running
| * 13b7d49f33 watchdog: iTCO_wdt: No need to stop the timer in probe
| * 0d599a3f57 nvme-pci: do not set the NUMA node of device if it has none
| * 97e148dcb9 nvme-pci: factor out a nvme_pci_alloc_dev helper
| * 71357c751f nvme-pci: factor the iod mempool creation into a helper
| * 38f82cf860 ACPI: Check StorageD3Enable _DSD property in ACPI code
| * 67025d5654 cgroup: Fix suspicious rcu_dereference_check() usage warning
| * b2788f6d49 sched/cpuacct: Optimize away RCU read lock
| * 82756d8a23 sched/cpuacct: Fix charge percpu cpuusage
| * f8e8e72c58 sched/cpuacct: Fix user/system in shown cpuacct.usage*
| * ef3c728ca0 perf build: Define YYNOMEM as YYNOABORT for bison < 3.81
| * da91481c5d fbdev/sh7760fb: Depend on FB=y
| * ffc459a930 ncsi: Propagate carrier gain/loss events to the NCSI controller
| * 8c2500228b powerpc/watchpoints: Disable preemption in thread_change_pc()
| * f5bdbed036 media: vb2: frame_vector.c: replace WARN_ONCE with a comment
| * ebc9184806 bpf: Clarify error expectations from bpf_clone_redirect
| * 0118244848 spi: nxp-fspi: reset the FLSHxCR1 registers
| * f6cf19c1b3 ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset()
| * 2afd8fcee0 scsi: pm80xx: Avoid leaking tags when processing OPC_INB_SET_CONTROLLER_CONFIG command
| * 0decc581e1 scsi: pm80xx: Use phy-specific SAS address when sending PHY_START command
| * f44e66447c platform/mellanox: mlxbf-bootctl: add NET dependency into Kconfig
| * cee5151c54 ring-buffer: Do not attempt to read past "commit"
| * 2956e33fb4 selftests: fix dependency checker script
| * 9ccce21bd7 ring-buffer: Avoid softlockup in ring_buffer_resize()
| * 5dfcb92905 selftests/ftrace: Correctly enable event in instance-event.tc
| * 38ef4b2e4d scsi: qedf: Add synchronization between I/O completions and abort
| * 2081b2a15b parisc: irq: Make irq_stack_union static to avoid sparse warning
| * f47efdffdc parisc: drivers: Fix sparse warning
| * d967a9472b parisc: iosapic.c: Fix sparse warnings
| * 7b2440c2d6 parisc: sba: Fix compile warning wrt list of SBA devices
| * c793005999 dma-debug: don't call __dma_entry_alloc_check_leak() under free_entries_lock
| * 061f402753 i2c: npcm7xx: Fix callback completion ordering
| * dd81e91b2e gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip
| * b317f69871 xtensa: boot/lib: fix function prototypes
| * be17dfdcc8 xtensa: boot: don't add include-dirs
| * a10bfbe599 xtensa: iss/network: make functions static
| * 608af5511a xtensa: add default definition for XCHAL_HAVE_DIV32
| * 3696261859 power: supply: ucs1002: fix error code in ucs1002_get_property()
| * eff55feb8b bus: ti-sysc: Fix SYSC_QUIRK_SWSUP_SIDLE_ACT handling for uart wake-up
| * 1bc8867196 ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot
| * a2a592adad ARM: dts: Unify pwm-omap-dmtimer node names
| * 2d9c9589da ARM: dts: am335x: Guardian: Update beeper label
| * ef83f35ced ARM: dts: motorola-mapphone: Drop second ti,wlcore compatible value
| * 12a28c379e ARM: dts: motorola-mapphone: Add 1.2GHz OPP
| * afdc40a74a ARM: dts: motorola-mapphone: Configure lower temperature passive cooling
| * 093a9a02d4 ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4
| * 28e5423ad8 ARM: dts: omap: correct indentation
| * 50789f3723 clk: tegra: fix error return case for recalc_rate
| * 0fd5839e25 bus: ti-sysc: Fix missing AM35xx SoC matching
| * 1d4d846e2a bus: ti-sysc: Use fsleep() instead of usleep_range() in sysc_reset()
| * a8ee76d727 MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled
| * d678c078f3 btrfs: reset destination buffer when read_extent_buffer() gets invalid range
| * a1f85bc9bc ata: ahci: Add Elkhart Lake AHCI controller
| * 51d190cc98 ata: ahci: Rename board_ahci_mobile
| * 8061c399c8 ata: ahci: Add support for AMD A85 FCH (Hudson D4)
| * 0156cce71f ata: libata: Rename link flag ATA_LFLAG_NO_DB_DELAY
| * 9f0d346630 netfilter: nft_exthdr: Fix non-linear header modification
| * ed60b8014c netfilter: exthdr: add support for tcp option removal
| * 10670abe11 netfilter: nft_exthdr: break evaluation if setting TCP option fails
| * 45b3eb6afc netfilter: nf_tables: add and use nft_thoff helper
| * 39546418b8 netfilter: nf_tables: add and use nft_sk helper
| * af844ba799 netfilter: nft_exthdr: Support SCTP chunks
| * 858ca19216 netfilter: use actual socket sk for REJECT action
| * 2d9ea86f3c media: venus: hfi_venus: Write to VIDC_CTRL_INIT after unmasking interrupts
| * c4cc1f690f media: venus: hfi: Add a 6xx boot logic
| * 4596fece3c media: venus: core: Add differentiator IS_V6(core)
| * 3ed9d3dc24 media: venus: hfi: Define additional 6xx registers
| * ebccb53232 media: venus: hfi,pm,firmware: Convert to block relative addressing
| * 4ccdeb68da media: venus: core: Add io base variables for each block
| * 6d3745bbc3 mmc: renesas_sdhi: register irqs before registering controller
| * 995ef65e4b mmc: tmio: support custom irq masks
| * 97eb045386 mmc: renesas_sdhi: populate SCC pointer at the proper place
| * 7217ceb61a mmc: renesas_sdhi: probe into TMIO after SCC parameters have been setup
| * e492f81251 Input: i8042 - add quirk for TUXEDO Gemini 17 Gen1/Clevo PD70PN
| * 677bff659f Input: i8042 - rename i8042-x86ia64io.h to i8042-acpipnpio.h
| * 3fac8ce48f netfilter: nf_tables: double hook unregistration in netns path
| * e51f30826b netfilter: nf_tables: unregister flowtable hooks on netns exit
| * 5e95c88e90 i2c: mux: demux-pinctrl: check the return value of devm_kstrdup()
| * 0a78bcc2d5 gpio: tb10x: Fix an error handling path in tb10x_gpio_probe()
| * f515112e83 net: rds: Fix possible NULL-pointer dereference
| * 466e88548e bnxt_en: Flush XDP for bnxt_poll_nitroa0()'s NAPI
| * 78106529b3 locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested()
| * a8dd21118b seqlock: Prefix internal seqcount_t-only macros with a "do_"
| * ac01a0dd79 seqlock: Rename __seqprop() users
| * a8460ee6c8 seqlock: avoid -Wshadow warnings
| * f1893feb20 netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
| * b44dd92e2a team: fix null-ptr-deref when team device type is changed
| * 04cc361f02 net: bridge: use DEV_STATS_INC()
| * 1671dc1b25 net: hns3: add 5ms delay before clear firmware reset irq source
| * 309af4a39b net: hns3: only enable unicast promisc when mac table full
| * ae806c74c0 x86/srso: Fix SBPB enablement for spec_rstack_overflow=off
| * 423ba1b3a5 x86/srso: Fix srso_show_state() side effect
| * 1ec40ef6f7 platform/x86: intel_scu_ipc: Fail IPC send if still busy
| * 4c5eaf6d8b platform/x86: intel_scu_ipc: Don't override scu in intel_scu_ipc_dev_simple_command()
| * 441b61d742 platform/x86: intel_scu_ipc: Check status upon timeout in ipc_wait_for_interrupt()
| * c463898b6e platform/x86: intel_scu_ipc: Check status after timeout in busy_loop()
| * 60d73c62e3 dccp: fix dccp_v4_err()/dccp_v6_err() again
| * 09a1c790e1 powerpc/perf/hv-24x7: Update domain value check
| * 8689c9ace9 ipv4: fix null-deref in ipv4_link_failure
| * 47907ebeb7 i40e: Fix VF VLAN offloading when port VLAN is configured
| * a91861446f ASoC: imx-audmix: Fix return error with devm_clk_get()
| * c4ecedf980 selftests: tls: swap the TX and RX sockets in some tests
| * 78ef69b6e7 selftests/tls: Add {} to avoid static checker warning
| * 388c9d3eef bpf: Avoid deadlock when using queue and stack maps from NMI
| * 6dc85d848c netfilter: nf_tables: disallow element removal on anonymous sets
| * a45632f997 ASoC: meson: spdifin: start hw on dai probe
| * 09c85f2d21 netfilter: nf_tables: fix memleak when more than 255 elements expired
| * 4deaf1316b netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration
| * 26d0e4d632 netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails
| * b796c4e4bf netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention
| * c323ed65f6 netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction
| * 09f2dda1e5 netfilter: nf_tables: defer gc run if previous batch is still pending
| * b71dcee2fc netfilter: nf_tables: use correct lock to protect gc_list
| * 23292bdfda netfilter: nf_tables: GC transaction race with abort path
| * dc0b1f0195 netfilter: nf_tables: GC transaction race with netns dismantle
| * 4046f2b56e netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path
| * 891ca5dfe3 netfilter: nf_tables: don't fail inserts if duplicate has expired
| * 911dd3cdf1 netfilter: nf_tables: remove busy mark and gc batch API
| * 77046cb008 netfilter: nft_set_hash: mark set element as dead when deleting from packet path
| * 146c768667 netfilter: nf_tables: adapt set backend to use GC transaction API
| * 448be07748 netfilter: nf_tables: GC transaction API to avoid race with control plane
| * b15ea4017a netfilter: nf_tables: don't skip expired elements during walk
| * f8bf770615 netfilter: nf_tables: integrate pipapo into commit protocol
| * 9b65bff30a tracing: Have event inject files inc the trace array ref count
| * f8a86ab3c4 ext4: do not let fstrim block system suspend
| * c502b09d9b ext4: move setting of trimmed bit into ext4_try_to_trim_range()
| * e78e9f08a2 ext4: replace the traditional ternary conditional operator with with max()/min()
| * cbf6a0f654 ext4: mark group as trimmed only if it was fully scanned
| * 5eaf4a1e06 ext4: change s_last_trim_minblks type to unsigned long
| * 24a86315a3 ext4: scope ret locally in ext4_try_to_trim_range()
| * da1895f731 ext4: add new helper interface ext4_try_to_trim_range()
| * 6f5fc957df ext4: remove the 'group' parameter of ext4_trim_extent
| * 69c9665830 ata: libahci: clear pending interrupt status
| * 11d15a115c ata: ahci: Drop pointless VPRINTK() calls and convert the remaining ones
| * 407bf1c140 tracing: Increase trace array ref count on enable and filter files
| * 3f7df02fa0 SUNRPC: Mark the cred for revalidation if the server rejects it
| * 25ae2b2fdb NFS/pNFS: Report EINVAL errors from connect() to the server
| * 26db22a639 NFS: Use the correct commit info in nfs_join_page_group()
* | 3414e62421 Merge 5.10.197 into android12-5.10-lts
|\|
| * 393e225fe8 Linux 5.10.197
| * 242c5740dd ext4: fix rec_len verify error
| * 8768583b25 scsi: pm8001: Setup IRQs on resume
| * f4fffa1abb scsi: megaraid_sas: Fix deadlock on firmware crashdump
| * 3753e568d6 ata: libata: disallow dev-initiated LPM transitions to unsupported states
| * 993bb01d22 i2c: aspeed: Reset the i2c controller when timeout occurs
| * f5e303fce3 tracefs: Add missing lockdown check to tracefs_create_dir()
| * 96afb318ae nfsd: fix change_info in NFSv4 RENAME replies
| * b3183f5f05 tracing: Have option files inc the trace array ref count
| * ec7eb8b064 tracing: Have current_trace inc the trace array ref count
| * bb3e295a38 drm/amd/display: enable cursor degamma for DCN3+ DRM legacy gamma
| * 2cdcf6481c mm/filemap: fix infinite loop in generic_file_buffered_read()
| * 0c5d5f8e0d proc: fix a dentry lock race between release_task and lookup
| * 8db844077e net/sched: Retire rsvp classifier
| * 7a8f285cb5 drm/amdgpu: fix amdgpu_cs_p1_user_fence
| * 7390bb377b btrfs: release path before inode lookup during the ino lookup ioctl
| * 3d379dd109 btrfs: fix lockdep splat and potential deadlock after failure running delayed items
| * c6422e6f17 ovl: fix incorrect fdput() on aio completion
| * 68308b0a33 attr: block mode changes of symlinks
| * 634444dea8 md/raid1: fix error: ISO C90 forbids mixed declarations
| * 7be3a38f0e samples/hw_breakpoint: fix building without module unloading
| * d20beafaa6 x86/boot/compressed: Reserve more memory for page tables
| * 7635020b9b scsi: lpfc: Fix the NULL vs IS_ERR() bug for debugfs_create_file()
| * f990052376 selftests: tracing: Fix to unmount tracefs for recovering environment
| * ae889fffae scsi: qla2xxx: Fix NULL vs IS_ERR() bug for debugfs_create_dir()
| * 82910aa550 drm: gm12u320: Fix the timeout usage for usb_bulk_msg()
| * df380d6f5c btrfs: compare the correct fsid/metadata_uuid in btrfs_validate_super
| * ab90a3930d btrfs: add a helper to read the superblock metadata_uuid
| * cc87d2bb39 btrfs: move btrfs_pinned_by_swapfile prototype into volumes.h
| * e16f5f8cab perf tools: Add an option to build without libbfd
| * c560958127 perf jevents: Make build dependency on test JSONs
| * 4954c5a054 mtd: rawnand: brcmnand: Fix ECC level field setting for v7.2 controller
| * b87d03ed6a mtd: rawnand: brcmnand: Allow SoC to provide I/O operations
| * 5df5829158 kobject: Add sanity check for kset->kobj.ktype in kset_register()
| * a3efb2b57e media: pci: ipu3-cio2: Initialise timing struct to avoid a compiler warning
| * f354456f8d serial: cpm_uart: Avoid suspicious locking
| * bbe3ff47bf scsi: target: iscsi: Fix buffer overflow in lio_target_nacl_info_show()
| * 6d3a1dd105 usb: gadget: fsl_qe_udc: validate endpoint index for ch9 udc
| * 890d10e6b7 media: pci: cx23885: replace BUG with error return
| * 2ae53dd15e media: tuners: qt1010: replace BUG_ON with a regular error
| * 578b67614a media: dvb-usb-v2: gl861: Fix null-ptr-deref in gl861_i2c_master_xfer
| * a9def3e971 media: az6007: Fix null-ptr-deref in az6007_i2c_xfer()
| * 4a9763d2bc media: anysee: fix null-ptr-deref in anysee_master_xfer
| * c7e5ac737d media: af9005: Fix null-ptr-deref in af9005_i2c_xfer
| * 97fdbdb750 media: dw2102: Fix null-ptr-deref in dw2102_i2c_transfer()
| * 6c01ef65de media: dvb-usb-v2: af9035: Fix null-ptr-deref in af9035_i2c_master_xfer
| * 9f3b2b6668 powerpc/pseries: fix possible memory leak in ibmebus_bus_init()
| * 756747d4b4 jfs: fix invalid free of JFS_IP(ipimap)->i_imap in diUnmount
| * 6f8b344589 fs/jfs: prevent double-free in dbUnmount() after failed jfs_remount()
| * 4bff1d95ba ext2: fix datatype of block number in ext2_xattr_set2()
| * 7993cfc041 md: raid1: fix potential OOB in raid1_remove_disk()
| * 5933cd6139 bus: ti-sysc: Configure uart quirks for k3 SoC
| * 5475b8bea1 drm/exynos: fix a possible null-pointer dereference due to data race in exynos_drm_crtc_atomic_disable()
| * d51d6c42d1 ALSA: hda: intel-dsp-cfg: add LunarLake support
| * fcfb71848e samples/hw_breakpoint: Fix kernel BUG 'invalid opcode: 0000'
| * 9726e8dcab drm/bridge: tc358762: Instruct DSI host to generate HSE packets
| * 672205c6f2 wifi: mac80211_hwsim: drop short frames
| * 5bf52e431c netfilter: ebtables: fix fortify warnings in size_entry_mwt()
| * f6f0a68754 alx: fix OOB-read compiler warning
| * acf0019b93 mmc: sdhci-esdhc-imx: improve ESDHC_FLAG_ERR010450
| * c7a8813d91 tpm_tis: Resend command to recover from data transfer errors
| * 0fc7147c69 crypto: lib/mpi - avoid null pointer deref in mpi_cmp_ui()
| * 03385b243b wifi: wil6210: fix fortify warnings
| * 269eb4e1d5 wifi: mwifiex: fix fortify warning
| * 08fdbe3790 wifi: ath9k: fix printk specifier
| * 268a10c9eb wifi: ath9k: fix fortify warnings
| * 8c19ddc215 crypto: lrw,xts - Replace strlcpy with strscpy
| * cfca20009b devlink: remove reload failed checks in params get/set callbacks
| * 020ecfa7b6 hw_breakpoint: fix single-stepping when using bpf_overflow_handler
| * bfc747fe07 ACPI: video: Add backlight=native DMI quirk for Apple iMac12,1 and iMac12,2
| * dc01bfdc3d perf/smmuv3: Enable HiSilicon Erratum 162001900 quirk for HIP08/09
| * 560014aefb ACPI: video: Add backlight=native DMI quirk for Lenovo Ideapad Z470
| * 3f72fdb20f scftorture: Forgive memory-allocation failure if KASAN
| * 55887adc76 rcuscale: Move rcu_scale_writer() schedule_timeout_uninterruptible() to _idle()
| * f8bab887a4 kernel/fork: beware of __put_task_struct() calling context
| * 625c12dc04 ACPICA: Add AML_NO_OPERAND_RESOLVE flag to Timer
| * a6f4129378 locks: fix KASAN: use-after-free in trace_event_raw_event_filelock_lock
| * b7c3cf2f6c btrfs: output extra debug info if we failed to find an inline backref
| * 69ddafc7a7 autofs: fix memory leak of waitqueues in autofs_catatonic_mode
* | 16aeda0b7d Merge 5.10.196 into android12-5.10-lts
|\|
| * ff0bfa8f23 Linux 5.10.196
| * 2cc1f49862 Revert "configfs: fix a race in configfs_lookup()"
* | 5b4fcff944 Revert "configfs: fix a race in configfs_lookup()"
* | 84ae70e787 FROMLIST: lib/test_meminit: fix off-by-one error in test_pages()
* | a8b0203a91 FROMLIST: drm/mediatek: Fix backport issue in mtk_drm_gem_prime_vmap()
* | cb5f0587c6 Revert "scsi: core: Use 32-bit hostnum in scsi_host_lookup()"
* | 734d166d62 Revert "fs/nls: make load_nls() take a const parameter"
* | db08d2cf82 Revert "tracing: Introduce pipe_cpumask to avoid race on trace_pipes"
* | 73c7cc0b1e Revert "tracing: Zero the pipe cpumask on alloc to avoid spurious -EBUSY"
* | 2b40885cdc Revert "crypto: api - Use work queue in crypto_destroy_instance"
* | 92ecfcb0af Revert "ip_tunnels: use DEV_STATS_INC()"
* | 8026d5839b Merge 5.10.195 into android12-5.10-lts
|\|
| * 5452d1be67 Linux 5.10.195
| * d653c35de0 parisc: Drop loops_per_jiffy from per_cpu struct
| * 1d02ef8c8a drm/amd/display: Fix a bug when searching for insert_above_mpcc
| * 2e18493c42 kcm: Fix error handling for SOCK_DGRAM in kcm_sendmsg().
| * 606a0d8ff6 ixgbe: fix timestamp configuration code
| * 6edf82223f ipv6: fix ip6_sock_set_addr_preferences() typo
| * a5096cc6e7 net/tls: do not free tls_rec on async operation in bpf_exec_tx_verdict()
| * 03be4412d3 platform/mellanox: mlxbf-tmfifo: Drop jumbo frames
| * 687031788f platform/mellanox: mlxbf-tmfifo: Drop the Rx packet if no more descriptors
| * 33db24ad81 kcm: Fix memory leak in error path of kcm_sendmsg()
| * ed584f1e72 r8152: check budget for r8152_poll()
| * 1e90a93ac4 hsr: Fix uninit-value access in fill_frame_info()
| * 75f2de75c1 net: ethernet: mtk_eth_soc: fix possible NULL pointer dereference in mtk_hwlro_get_fdir_all()
| * 61054a8ddb net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc()
| * d1c6c93c27 net/smc: use smc_lgr_list.lock to protect smc_lgr_list.list iterate in smcr_port_add
| * fcb9e879a5 kselftest/runner.sh: Propagate SIGTERM to runner child
| * d94aac13a1 selftests/kselftest/runner/run_one(): allow running non-executable files
| * 7c8ddcdab1 net: ipv4: fix one memleak in __inet_del_ifa()
| * 15dabd02a9 bus: mhi: host: Skip MHI reset if device is in RDDM
| * de20747ee6 ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2
| * 81d06d1919 ARM: dts: samsung: exynos4210-i9100: Fix LCD screen's physical size
| * 61fa6a16bb scsi: qla2xxx: Flush mailbox commands on chip reset
| * b5775b8530 scsi: qla2xxx: Fix crash in PCIe error handling
| * 41a660c204 scsi: qla2xxx: Consolidate zio threshold setting for both FCP & NVMe
| * 5c069bce2d scsi: qla2xxx: If fcport is undergoing deletion complete I/O with retry
| * e7ed3585d0 arm64: sdei: abort running SDEI handlers during crash
| * 0b55460c31 ACPI: APEI: explicit init of HEST and GHES in apci_init()
| * c6dc2a2e11 perf hists browser: Fix the number of entries for 'e' key
| * c07e4a4ef3 perf tools: Handle old data in PERF_RECORD_ATTR
| * b52a33a907 perf hists browser: Fix hierarchy mode header
| * d72b01d9f9 drm/amd/display: prevent potential division by zero errors
| * d68f639dde mtd: rawnand: brcmnand: Fix potential false time out warning
| * d00b031266 mtd: rawnand: brcmnand: Fix potential out-of-bounds access in oob write
| * c839a24d6e mtd: rawnand: brcmnand: Fix crash during the panic_write
| * e76cef3dcd btrfs: use the correct superblock to compare fsid in btrfs_validate_super
| * f2873a18c2 btrfs: don't start transaction when joining with TRANS_JOIN_NOSTART
| * 3856e7b118 fuse: nlookup missing decrement in fuse_direntplus_link
| * 1d21b03f77 ata: pata_ftide010: Add missing MODULE_DESCRIPTION
| * 35a3dec703 ata: sata_gemini: Add missing MODULE_DESCRIPTION
| * b1d63e2bbd ext4: add correct group descriptors and reserved GDT blocks to system zone
| * 6612d5b535 sh: boards: Fix CEU buffer size passed to dma_declare_coherent_memory()
| * 97ef9ba7df net: hns3: fix the port information display when sfp is absent
| * 780f60dde2 netfilter: nfnetlink_osf: avoid OOB read
| * e89a361d99 net: dsa: sja1105: fix -ENOSPC when replacing the same tc-cbs too many times
| * 94a3117eff net: dsa: sja1105: fix bandwidth discrepancy between tc-cbs software and offload
| * e90e70343b ip_tunnels: use DEV_STATS_INC()
| * 2539b28a2b idr: fix param name in idr_alloc_cyclic() doc
| * 0878052579 s390/zcrypt: don't leak memory if dev_set_name() fails
| * d878011b5d igb: Change IGB_MIN to allow set rx/tx value between 64 and 80
| * 417b11433e igbvf: Change IGBVF_MIN to allow set rx/tx value between 64 and 80
| * 9444881a37 igc: Change IGC_MIN to allow set rx/tx value between 64 and 80
| * 46f02fc7f6 kcm: Destroy mutex in kcm_exit_net()
| * 746a8df5e4 net: sched: sch_qfq: Fix UAF in qfq_dequeue()
| * 31e08e7fa6 af_unix: Fix data race around sk->sk_err.
| * 90e32f81f9 af_unix: Fix data-races around sk->sk_shutdown.
| * cf29b42766 af_unix: Fix data-race around unix_tot_inflight.
| * b401d7e485 af_unix: Fix data-races around user->unix_inflight.
| * 98e12d075c net: ipv6/addrconf: avoid integer underflow in ipv6_create_tempaddr
| * d47bc5023e veth: Fixing transmit return status for dropped packets
| * ab9796f43c igb: disable virtualization features on 82580
| * 160fdb4116 ipv4: ignore dst hint for multipath routes
| * 29039819c6 drm/i915/gvt: Drop unused helper intel_vgpu_reset_gtt()
| * 23d2651372 drm/i915/gvt: Save/restore HW status to support GVT suspend/resume
| * 895dc4c471 net: read sk->sk_family once in sk_mc_loop()
| * 8edced38db ipv4: annotate data-races around fi->fib_dead
| * ab5c26dc53 sctp: annotate data-races around sk->sk_wmem_queued
| * 94d527c375 net/sched: fq_pie: avoid stalls in fq_pie_timer()
| * a2d9d884e8 pwm: lpc32xx: Remove handling of PWM channels
| * 6909e28cf3 watchdog: intel-mid_wdt: add MODULE_ALIAS() to allow auto-load
| * aec02fba99 perf top: Don't pass an ERR_PTR() directly to perf_session__delete()
| * 28df38af32 x86/virt: Drop unnecessary check on extended CPUID level in cpu_has_svm()
| * 23ec6fc52c perf annotate bpf: Don't enclose non-debug code with an assert()
| * 934d29b9fa backlight: gpio_backlight: Drop output GPIO direction check for initial power state
| * 84f9953215 kconfig: fix possible buffer overflow
| * 6cc6f79b93 NFSv4/pnfs: minor fix for cleanup path in nfs4_get_device_info
| * 4185605cd0 NFS: Fix a potential data corruption
| * 2ccab9f827 soc: qcom: qmi_encdec: Restrict string length in decode
| * bf27518fb9 clk: qcom: gcc-mdm9615: use proper parent for pll0_vote clock
| * 972acd701b clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz
| * 9214536728 dt-bindings: clock: xlnx,versal-clk: drop select:false
| * 690a22d6c5 pinctrl: cherryview: fix address_space_handler() argument
| * b02d1fb74e parisc: led: Reduce CPU overhead for disk & lan LED computation
| * 3add85c962 parisc: led: Fix LAN receive and transmit LEDs
| * 2a1cf9fe09 lib/test_meminit: allocate pages up to order MAX_ORDER
| * 6bfa28f441 drm/ast: Fix DRAM init on AST2200
| * 4aade6c910 fbdev/ep93xx-fb: Do not assign to struct fb_info.dev
| * db8b5a2254 scsi: qla2xxx: Remove unsupported ql2xenabledif option
| * fd48544f3e scsi: qla2xxx: Turn off noisy message log
| * 931fadf972 scsi: qla2xxx: Fix erroneous link up failure
| * 3694f18bea scsi: qla2xxx: fix inconsistent TMF timeout
| * 4d7da12483 scsi: qla2xxx: Fix deletion race condition
| * f271e3d64b io_uring: break iopolling on signal
| * 9faa6d0677 io_uring: break out of iowq iopoll on teardown
| * 208858d4b0 io_uring: always lock in io_apoll_task_func
| * 6ffab754d2 net/ipv6: SKB symmetric hash should incorporate transport ports
| * 26f9ccb7a0 udf: initialize newblock to 0
| * 06494cd473 md/md-bitmap: remove unnecessary local variable in backlog_store()
| * 5103216b86 tracing: Zero the pipe cpumask on alloc to avoid spurious -EBUSY
| * 1c4c9191b3 usb: typec: tcpci: clear the fault status bit
| * beba5051dd USB: core: Fix oversight in SuperSpeed initialization
| * 9d241c5d9a USB: core: Fix race by not overwriting udev->descriptor in hub_port_init()
| * 6ceffc2ecf USB: core: Change usb_get_device_descriptor() API
| * 3cef18d13f USB: core: Unite old scheme and new scheme descriptor reads
| * 38e1f2ee82 usb: typec: bus: verify partner exists in typec_altmode_attention
| * b97e3c5e97 cpufreq: brcmstb-avs-cpufreq: Fix -Warray-bounds bug
| * a1d2e2c670 crypto: stm32 - fix loop iterating through scatterlist for DMA
| * 54d03dc5d1 s390/ipl: add missing secure/has_secure file to ipl type 'unknown'
| * dc2f60de9a pstore/ram: Check start of empty przs during init
| * 5b1f71c0b9 fsverity: skip PKCS#7 parser when keyring is empty
| * a9864e126b net: handle ARPHRD_PPP in dev_is_mac_header_xmit()
| * c681d477c0 X.509: if signature is unsupported skip validation
| * 4b8a938e32 dccp: Fix out of bounds access in DCCP error handler
| * a4f4a5b41a dlm: fix plock lookup when using multiple lockspaces
| * 9f73fd6972 parisc: Fix /proc/cpuinfo output for lscpu
| * 1f03e6dd19 procfs: block chmod on /proc/thread-self/comm
| * 9a0b35dc3a Revert "PCI: Mark NVIDIA T4 GPUs to avoid bus reset"
| * 3d8d13a174 ntb: Fix calculation ntb_transport_tx_free_entry()
| * c028e90e0d ntb: Clean up tx tail index on link down
| * 3cfdc448e8 ntb: Drop packets when qp link is down
| * ffed0c8fcf scsi: mpt3sas: Perform additional retries if doorbell read returns 0
| * bf67d43f07 Revert "scsi: qla2xxx: Fix buffer overrun"
| * 27dfaf2ee0 media: dvb: symbol fixup for dvb_attach()
| * 5a85727239 arm64: csum: Fix OoB access in IP checksum code for negative lengths
| * b24bebcea5 xtensa: PMU: fix base address for the newer hardware
| * 8594605a04 backlight/lv5207lp: Compare against struct fb_info.device
| * e2c77841cd backlight/bd6107: Compare against struct fb_info.device
| * 35c56c4873 backlight/gpio_backlight: Compare against struct fb_info.device
| * 13264260eb ARM: OMAP2+: Fix -Warray-bounds warning in _pwrdm_state_switch()
| * 5c5f02e16b ipmi_si: fix a memleak in try_smi_init()
| * 5d27baee6c scsi: core: Fix the scsi_set_resid() documentation
| * 8c90c4e619 printk: ringbuffer: Fix truncating buffer size min_t cast
| * 61b918dfb6 ALSA: pcm: Fix missing fixup call in compat hw_refine ioctl
| * ab192e5e5d PM / devfreq: Fix leak in devfreq_dev_release()
| * 3e39008e9e igb: set max size RX buffer when store bad packet is enabled
| * 8836c26620 skbuff: skb_segment, Call zero copy functions before using skbuff frags
| * 5541827d13 netfilter: xt_sctp: validate the flag_info count
| * a1b711c370 netfilter: xt_u32: validate user space input
| * 83091f8ac0 netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
| * 1186eaffd8 igmp: limit igmpv3_newpack() packet size to IP_MAX_MTU
| * 504bb3fc66 virtio_ring: fix avail_wrap_counter in virtqueue_add_packed
| * ea374bdf23 cpufreq: Fix the race condition while updating the transition_task of policy
| * 27b75c7203 dmaengine: ste_dma40: Add missing IRQ check in d40_probe
| * cfe215a04a um: Fix hostaudio build errors
| * eb33921806 mtd: rawnand: fsmc: handle clk prepare error in fsmc_nand_resume()
| * 40d8f9bffe mtd: spi-nor: Check bus width while setting QE bit
| * 71ac2ffd7f rpmsg: glink: Add check for kstrdup
| * 268fce6ec2 phy/rockchip: inno-hdmi: do not power on rk3328 post pll on reg write
| * 6739746f4b phy/rockchip: inno-hdmi: round fractal pixclock in rk3328 recalc_rate
| * 88813bd9bb phy/rockchip: inno-hdmi: use correct vco_div_5 macro on rk3328
| * 3a890f993b mtd: rawnand: brcmnand: Fix mtd oobsize
| * c5d30d6aa8 tracing: Fix race issue between cpu buffer write and swap
| * ee519526d5 x86/speculation: Mark all Skylake CPUs as vulnerable to GDS
| * 15ec7cb55e HID: multitouch: Correct devm device reference for hidinput input_dev name
| * e38a6f1268 HID: logitech-dj: Fix error handling in logi_dj_recv_switch_to_dj_mode()
| * bdb3cd9dff RDMA/siw: Correct wrong debug message
| * d006f2cb3c RDMA/siw: Balance the reference of cep->kref in the error path
| * aa950b9835 Revert "IB/isert: Fix incorrect release of isert connection"
| * 9baf2278b3 amba: bus: fix refcount leak
| * 0c6c0280f7 serial: tegra: handle clk prepare error in tegra_uart_hw_init()
| * 9cce8ef7a6 scsi: fcoe: Fix potential deadlock on &fip->ctlr_lock
| * 356da2d5c0 scsi: core: Use 32-bit hostnum in scsi_host_lookup()
| * 629079f502 cgroup:namespace: Remove unused cgroup_namespaces_init()
| * 3534ae5f17 media: ov2680: Fix regulators being left enabled on ov2680_power_on() errors
| * a427ce197e media: ov2680: Fix vflip / hflip set functions
| * cd7a0e391e media: ov2680: Fix ov2680_bayer_order()
| * faf1408a68 media: ov2680: Remove auto-gain and auto-exposure controls
| * e1552a0b99 media: i2c: ov2680: Set V4L2_CTRL_FLAG_MODIFY_LAYOUT on flips
| * 2d29ce41de media: ov5640: Enable MIPI interface in ov5640_set_power_mipi()
| * 44c71cbe7c USB: gadget: f_mass_storage: Fix unused variable warning
| * 8f7de82158 media: go7007: Remove redundant if statement
| * 3183b0cab7 iommu/vt-d: Fix to flush cache of PASID directory table
| * 4136094df5 iommu/qcom: Disable and reset context bank before programming
| * b374b039e0 fsi: aspeed: Reset master errors after CFAM reset
| * f8949c06c7 IB/uverbs: Fix an potential error pointer dereference
| * 10bd5f8ceb driver core: test_async: fix an error code
| * 19138f8cc6 dma-buf/sync_file: Fix docs syntax
| * e621dbeb9f coresight: tmc: Explicit type conversions to prevent integer overflow
| * d7f21ef741 scsi: qedf: Do not touch __user pointer in qedf_dbg_fp_int_cmd_read() directly
| * 1198a0e935 scsi: qedf: Do not touch __user pointer in qedf_dbg_debug_cmd_read() directly
| * d86d85e23e scsi: qedf: Do not touch __user pointer in qedf_dbg_stop_io_on_error_cmd_read() directly
| * 4ede2ee95b x86/APM: drop the duplicate APM_MINOR_DEV macro
| * 9a26aaea6c serial: sprd: Fix DMA buffer leak issue
| * 6232bd4dca serial: sprd: Assign sprd_port after initialized to avoid wrong access
| * 6d65079c69 scsi: qla4xxx: Add length check when parsing nlattrs
| * b65b13d01b scsi: be2iscsi: Add length check when parsing nlattrs
| * 4df82c6d6e scsi: iscsi: Add strlen() check in iscsi_if_set{_host}_param()
| * 18d49266dd scsi: iscsi: Add length check for nlattr payload
| * 3ef17ca476 scsi: iscsi: Rename iscsi_set_param() to iscsi_if_set_param()
| * 8356a3ba10 scsi: RDMA/srp: Fix residual handling
| * cc2d5cdb19 usb: phy: mxs: fix getting wrong state with mxs_phy_is_otg_host()
| * 5a6f480b2e media: mediatek: vcodec: Return NULL if no vdec_fb is found
| * 43c69dc9a3 media: rkvdec: increase max supported height for H.264
| * 1e5eac0022 scsi: hisi_sas: Fix normally completed I/O analysed as failed
| * b6aca9f5ab scsi: hisi_sas: Fix warnings detected by sparse
| * 0d383e555f scsi: hisi_sas: Modify v3 HW SATA completion error processing
| * 6342206051 scsi: hisi_sas: Modify v3 HW SSP underflow error processing
| * d84e5d445a scsi: libsas: Introduce more SAM status code aliases in enum exec_status
| * 519b9e3e5c scsi: hisi_sas: Print SAS address for v3 hw erroneous completion print
| * 5e5a528c29 media: cx24120: Add retval check for cx24120_message_send()
| * d13a84874a media: dvb-usb: m920x: Fix a potential memory leak in m920x_i2c_xfer()
| * 656423cc56 media: dib7000p: Fix potential division by zero
| * 61bc9293da drivers: usb: smsusb: fix error handling code in smsusb_init_device
| * d8a8f75fce media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link()
| * 5865926da2 media: i2c: tvp5150: check return value of devm_kasprintf()
| * 6dff92b3fe media: ad5820: Drop unsupported ad5823 from i2c_ and of_device_id tables
| * 9d82a58d2a NFSv4.2: fix handling of COPY ERR_OFFLOAD_NO_REQ
| * 7bc36ac671 NFS: Guard against READDIR loop when entry names exceed MAXNAMELEN
| * 3f1a2b0b2d NFSD: da_addr_body field missing in some GETDEVICEINFO replies
| * aaeac3a6b1 fs: lockd: avoid possible wrong NULL parameter
| * 6d53616189 jfs: validate max amount of blocks before allocation.
| * f08944e3c6 powerpc/iommu: Fix notifiers being shared by PCI and VIO buses
| * 46ff3bd14b nfs/blocklayout: Use the passed in gfp flags
| * 953c54dfdc powerpc/pseries: Rework lppaca_shared_proc() to avoid DEBUG_PREEMPT
| * e46cc0e42f powerpc: Don't include lppaca.h in paca.h
| * 9837d6a483 wifi: ath10k: Use RMW accessors for changing LNKCTL
| * 924d1ab987 net/mlx5: Use RMW accessors for changing LNKCTL
| * 37eecd5085 drm/radeon: Use RMW accessors for changing LNKCTL
| * ead3dbc92b drm/amdgpu: Use RMW accessors for changing LNKCTL
| * 2f8269ca80 powerpc/perf: Convert fsl_emb notifier to state machine callbacks
| * d45bf1528b powerpc/fadump: reset dump area size if fadump memory reserve fails
| * ad83d83dd8 vfio/type1: fix cap_migration information leak
| * d8f5613c5c clk: imx: composite-8m: fix clock pauses when set_rate would be a no-op
| * 0d81a0546b clk: imx8mp: fix sai4 clock
| * 69795c689e PCI/ASPM: Use RMW accessors for changing LNKCTL
| * f647b8fe55 PCI: pciehp: Use RMW accessors for changing LNKCTL
| * ae52f8ba45 pinctrl: mcp23s08: check return value of devm_kasprintf()
| * ef8e561ddb PCI: Mark NVIDIA T4 GPUs to avoid bus reset
| * 344c16a844 clk: qcom: reset: Use the correct type of sleep/delay based on length
| * 289f5a88f1 clk: qcom: gcc-sm8250: Fix gcc_sdcc2_apps_clk_src
| * b3a80429b1 clk: qcom: gcc-sm8250: use ARRAY_SIZE instead of specifying num_parents
| * 245759d987 ext4: correct grp validation in ext4_mb_good_group
| * 2aefe3ae09 clk: qcom: gcc-sc7180: Fix up gcc_sdcc2_apps_clk_src
| * 74a5f9755a clk: qcom: gcc-sc7180: use ARRAY_SIZE instead of specifying num_parents
| * 2640d3be82 clk: sunxi-ng: Modify mismatched function name
| * c1ff788f73 drivers: clk: keystone: Fix parameter judgment in _of_pll_clk_init()
| * 13623b966b ipmi:ssif: Fix a memory leak when scanning for an adapter
| * 6128288d8f ipmi:ssif: Add check for kstrdup
| * 8917591d72 ALSA: ac97: Fix possible error value of *rac97
| * cd062ebe0c of: unittest: Fix overlay type in apply/revert check
| * ca7634e549 bus: ti-sysc: Fix cast to enum warning
| * 43f561e809 drm/mediatek: Fix potential memory leak if vmap() fail
| * 2655155486 bus: ti-sysc: Fix build warning for 64-bit build
| * 98ef243d59 audit: fix possible soft lockup in __audit_inode_child()
| * 69800bc5d7 drm/msm/a2xx: Call adreno_gpu_init() earlier
| * 7fcbaf4bdb drm/amd/pm: fix variable dereferenced issue in amdgpu_device_attr_create()
| * 9b89db24c6 smackfs: Prevent underflow in smk_set_cipso()
| * 9f4017cac7 firmware: meson_sm: fix to avoid potential NULL pointer dereference
| * 815e42029f drm/msm/mdp5: Don't leak some plane state
| * a21e73a6d8 drm: xlnx: zynqmp_dpsub: Add missing check for dma_set_mask
| * 524f23b082 ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig
| * e2d1c9b397 drm/panel: simple: Add missing connector type and pixel format for AUO T215HVN01
| * c02917e70a drm/armada: Fix off-by-one error in armada_overlay_get_property()
| * f41c65f8d0 of: unittest: fix null pointer dereferencing in of_unittest_find_node_by_name()
| * 883fdbbdbe drm/tegra: dpaux: Fix incorrect return value of platform_get_irq
| * 5f0994e3f2 drm/tegra: Remove superfluous error messages around platform_get_irq()
| * 4a61d72585 md/md-bitmap: hold 'reconfig_mutex' in backlog_store()
| * 8563d52a4f md/bitmap: don't set max_write_behind if there is no write mostly device
| * a15f309eb9 drm/amdgpu: Update min() to min_t() in 'amdgpu_info_ioctl'
| * 8e766a94ec arm64: dts: qcom: sdm845: Fix the min frequency of "ice_core_clk"
| * 36d3e4dedb arm64: dts: qcom: sdm845: Add missing RPMh power domain to GCC
| * 0eea279e01 ARM: dts: BCM53573: Fix Ethernet info for Luxul devices
| * ed4e48de89 drm: adv7511: Fix low refresh rate register for ADV7533/5
| * 61ccdd2167 ARM: dts: samsung: s5pv210-smdkv210: correct ethernet reg addresses (split)
| * e9875d2f25 ARM: dts: s5pv210: add dummy 5V regulator for backlight on SMDKv210
| * c4c72bf42f ARM: dts: s5pv210: adjust node names to DT spec
| * bbcea0924b ARM: dts: samsung: s3c6410-mini6410: correct ethernet reg addresses (split)
| * a2d6c5e8e7 ARM: dts: s3c64xx: align pinctrl with dtschema
| * 3f0d83994e x86/mm: Fix PAT bit missing from page protection modify mask
| * b56309c77d drm/etnaviv: fix dumping of active MMU context
| * 8303282409 ARM: dts: BCM53573: Use updated "spi-gpio" binding properties
| * 031ab0f10e ARM: dts: BCM53573: Add cells sizes to PCIe node
| * 8415d803d8 ARM: dts: BCM53573: Drop nonexistent #usb-cells
| * cfc4a78e70 ARM: dts: BCM53573: Describe on-SoC BCM53125 rev 4 switch
| * 36d958ad40 ARM: dts: BCM5301X: Harmonize EHCI/OHCI DT nodes name
| * 826ef15769 drm/amdgpu: avoid integer overflow warning in amdgpu_device_resize_fb_bar()
| * 967cbc8a23 arm64: dts: qcom: msm8996: Add missing interrupt to the USB2 controller
| * 71d2d9aa2b soc: qcom: ocmem: Fix NUM_PORTS & NUM_MACROS macros
| * 1356531e92 soc: qcom: ocmem: Add OCMEM hardware version print
| * 4bf179f536 ASoC: stac9766: fix build errors with REGMAP_AC97
| * 86d89987f0 quota: fix dqput() to follow the guarantees dquot_srcu should provide
| * af4ff47489 quota: add new helper dquot_active()
| * 905e316e5e quota: rename dquot_active() to inode_quota_active()
| * a5da2849db quota: factor out dquot_write_dquot()
| * 53805176ec drm/bridge: tc358764: Fix debug print parameter order
| * abd1c17ef4 netrom: Deny concurrent connect().
| * b08cc6c039 net/sched: sch_hfsc: Ensure inner classes have fsc curve
| * ab04c731a1 hwmon: (tmp513) Fix the channel number in tmp51x_is_visible()
| * db7a353166 mlxsw: i2c: Limit single transaction buffer size
| * 3d36ba3f7e mlxsw: i2c: Fix chunk size setting in output mailbox buffer
| * 7cc9e1dcc1 net: arcnet: Do not call kfree_skb() under local_irq_disable()
| * d4f79aa9ee wifi: ath9k: use IS_ERR() with debugfs_create_dir()
| * 50f89daf9e Bluetooth: btusb: Do not call kfree_skb() under spin_lock_irqsave()
| * bef85d58f7 wifi: mwifiex: avoid possible NULL skb pointer dereference
| * cfce1973ff wifi: ath9k: protect WMI command response buffer replacement with a lock
| * ee72b2b1f5 wifi: ath9k: fix races between ath9k_wmi_cmd and ath9k_wmi_ctrl_rx
| * 91d92d8975 samples/bpf: fix broken map lookup probe
| * 08a6e99a33 wifi: mwifiex: Fix missed return in oob checks failed path
| * 0c4240d23d wifi: mwifiex: fix memory leak in mwifiex_histogram_read()
| * 0fe11dd3fe fs: ocfs2: namei: check return value of ocfs2_add_entry()
| * d8f5415d4d lwt: Check LWTUNNEL_XMIT_CONTINUE strictly
| * a97f221651 lwt: Fix return values of BPF xmit ops
| * 97ccf9f195 hwrng: iproc-rng200 - Implement suspend and resume calls
| * 49729fc472 crypto: caam - fix unchecked return value error
| * 7a97044477 ice: ice_aq_check_events: fix off-by-one check when filling buffer
| * 9b812dcf2b selftests/bpf: Clean up fmod_ret in bench_rename test script
| * 88bc7122db net: tcp: fix unexcepted socket die when snd_wnd is 0
| * e87da6a0ac Bluetooth: Fix potential use-after-free when clear keys
| * 6668886ebe Bluetooth: nokia: fix value check in nokia_bluetooth_serdev_probe()
| * 625bf86bf5 crypto: api - Use work queue in crypto_destroy_instance
| * 7545292d87 crypto: stm32 - Properly handle pm_runtime_get failing
| * 323084d77d selftests/bpf: fix static assert compilation issue for test_cls_*.c
| * a8d6965843 wifi: mwifiex: fix error recovery in PCIE buffer descriptor management
| * 3fe3923d09 wifi: mwifiex: Fix OOB and integer underflow when rx packets
| * 5120d93c24 can: gs_usb: gs_usb_receive_bulk_callback(): count RX overflow errors also in case of OOM
| * 1d6c3017ce spi: tegra20-sflash: fix to check return value of platform_get_irq() in tegra_sflash_probe()
| * ca7ee1b75c wifi: mt76: testmode: add nla_policy for MT76_TM_ATTR_TX_LENGTH
| * 791a12102e bpf: reject unhashed sockets in bpf_sk_assign
| * 4d271804f5 udp: re-score reuseport groups when connected sockets are present
| * e6e11cbaa1 regmap: rbtree: Use alloc_flags for memory allocations
| * 1d210321de hwrng: nomadik - keep clock enabled while hwrng is registered
| * f24152c209 tcp: tcp_enter_quickack_mode() should be static
| * b275f0ae35 bpf: Clear the probe_addr for uprobe
| * 514116de91 bpftool: Use a local bpf_perf_event_value to fix accessing its fields
| * 920b2f99bc cpufreq: powernow-k8: Use related_cpus instead of cpus in driver.exit()
| * 133a1f45b9 x86/efistub: Fix PCI ROM preservation in mixed mode
| * 3de36b8b9b s390/paes: fix PKEY_TYPE_EP11_AES handling for secure keyblobs
| * e06326ff3a s390/pkey: fix/harmonize internal keyblob headers
| * 08b1803bfc perf/imx_ddr: don't enable counter0 if none of 4 counters are used
| * c0e1f9bddc x86/decompressor: Don't rely on upper 32 bits of GPRs being preserved
| * 0682fc175c selftests/resctrl: Close perf value read fd on errors
| * f399938a91 selftests/resctrl: Unmount resctrl FS if child fails to run benchmark
| * bf1f7aeb57 selftests/resctrl: Don't leak buffer in fill_cache()
| * 3ee719b3a0 OPP: Fix passing 0 to PTR_ERR in _opp_attach_genpd()
| * 066fbd8bc9 refscale: Fix uninitalized use of wait_queue_head_t
| * ac96370db7 selftests/harness: Actually report SKIP for signal tests
| * ac5a73b5d9 tmpfs: verify {g,u}id mount options correctly
| * 644e93a790 fs: Fix error checking for d_hash_and_lookup()
| * 731f39e4a1 eventfd: prevent underflow for eventfd semaphores
| * 755e86f28a eventfd: Export eventfd_ctx_do_read()
| * 6b5d585e23 reiserfs: Check the return value from __getblk()
| * 5101e2c8a5 Revert "net: macsec: preserve ingress frame ordering"
| * ca8f04553e udf: Handle error when adding extent to a file
| * 4ac54312f6 udf: Check consistency of Space Bitmap Descriptor
| * 42714d3d70 net: Avoid address overwrite in kernel_connect
| * 4ded72985b platform/mellanox: Fix mlxbf-tmfifo not handling all virtio CONSOLE notifications
| * 0c0547d2a6 tracing: Introduce pipe_cpumask to avoid race on trace_pipes
| * 99d8d419dd ALSA: seq: oss: Fix racy open/close of MIDI devices
| * 21f47cc15a scsi: storvsc: Always set no_report_opcodes
| * 5cbc749d11 sctp: handle invalid error codes without calling BUG()
| * 2bdd081a7d bnx2x: fix page fault following EEH recovery
| * d11a454288 netlabel: fix shift wrapping bug in netlbl_catmap_setlong()
| * 7dd6ef1ced scsi: qedi: Fix potential deadlock on &qedi_percpu->p_work_lock
| * 7a1a7f40ad idmaengine: make FSL_EDMA and INTEL_IDMA64 depends on HAS_IOMEM
| * d399b6ce1a net: usb: qmi_wwan: add Quectel EM05GV2
| * bb8a4a3632 vmbus_testing: fix wrong python syntax for integer value comparison
| * 0ff30413a7 clk: fixed-mmio: make COMMON_CLK_FIXED_MMIO depend on HAS_IOMEM
| * 0111b7bb51 kprobes: Prohibit probing on CFI preamble symbol
| * 654e3d2779 security: keys: perform capable check only on privileged operations
| * b23cbd3c25 ata: pata_arasan_cf: Use dev_err_probe() instead dev_err() in data_xfer()
| * 331d85f0bc ovl: Always reevaluate the file signature for IMA
| * 357badc01a drm/amd/display: Exit idle optimizations before attempt to access PHY
| * de0cdcceaa platform/x86: huawei-wmi: Silence ambient light sensor
| * 8964b32a67 platform/x86: intel: hid: Always call BTNL ACPI method
| * 6b953ee81a ASoC: atmel: Fix the 8K sample parameter in I2SC master
| * 37121461dd ASoc: codecs: ES8316: Fix DMIC config
| * bc2b0d4d37 fs/nls: make load_nls() take a const parameter
| * 0a584c0779 s390/dasd: fix hanging device after request requeue
| * 0c96df6913 s390/dasd: use correct number of retries for ERP requests
| * a5fd143673 m68k: Fix invalid .section syntax
| * f7700e987f vxlan: generalize vxlan_parse_gpe_hdr and remove unused args
| * b7cd83cfff ethernet: atheros: fix return value check in atl1c_tso_csum()
| * 16c1134267 ASoC: da7219: Check for failure reading AAD IRQ events
| * afa2dbd7d1 ASoC: da7219: Flush pending AAD IRQ when suspending
| * efa372af6b 9p: virtio: make sure 'offs' is initialized in zc_request
| * 2f13007fbe media: pci: cx23885: fix error handling for cx23885 ATSC boards
| * 92704dd055 media: pulse8-cec: handle possible ping error
| * 9d9cdc32bf phy: qcom-snps-femto-v2: use qcom_snps_hsphy_suspend/resume error code
| * a8ba2b6959 ARM: dts: imx: Set default tuning step for imx7d usdhc
| * 678a88ac02 ARM: dts: imx: Adjust dma-apbh node name
| * 6895499b22 ARM: dts: imx7s: Drop dma-apb interrupt-names
| * 614c27dfde ARM: dts: imx: update sdma node name format
| * d45e2a3d2e ASoC: rt5682: Fix a problem with error handling in the io init function of the soundwire
| * 977baccbbd pinctrl: amd: Don't show `Invalid config param` errors
| * f1d637b63d nilfs2: fix WARNING in mark_buffer_dirty due to discarded buffer reuse
| * 0e11bb5ad3 nilfs2: fix general protection fault in nilfs_lookup_dirty_data_buffers()
| * 734c6d3dc7 fsi: master-ast-cf: Add MODULE_FIRMWARE macro
| * da5dc81ed2 firmware: stratix10-svc: Fix an NULL vs IS_ERR() bug in probe
| * 9fda231901 serial: sc16is7xx: fix bug when first setting GPIO direction
| * 2f982ce208 serial: sc16is7xx: fix broken port 0 uart init
| * bd0ed45dd6 serial: qcom-geni: fix opp vote on shutdown
| * c709c7ca02 configfs: fix a race in configfs_lookup()
| * 746b363bef Bluetooth: btsdio: fix use after free bug in btsdio_remove due to race condition
| * b074fb0fa0 staging: rtl8712: fix race condition
| * 65bfaf5f9d HID: wacom: remove the battery when the EKR is off
| * 542c614707 usb: chipidea: imx: improve logic if samsung,picophy-* parameter is 0
| * 5c4996c229 usb: dwc3: meson-g12a: do post init to fix broken usb after resumption
| * d44fa38193 USB: serial: option: add FOXCONN T99W368/T99W373 product
| * df6696e42e USB: serial: option: add Quectel EM05G variant (0x030e)
| * f71b0b4a49 modules: only allow symbol_get of EXPORT_SYMBOL_GPL modules
| * 92de8497c3 rtc: ds1685: use EXPORT_SYMBOL_GPL for ds1685_rtc_poweroff
| * 1aeb76ffdf net: enetc: use EXPORT_SYMBOL_GPL for enetc_phc_index
| * d90e5956c0 mmc: au1xmmc: force non-modular build and remove symbol_get usage
| * c1112a2b54 ARM: pxa: remove use of symbol_get()
| * 8c599aa78c erofs: ensure that the post-EOF tails are all zeroed
* | 397f70b65c Merge 5.10.194 into android12-5.10-lts
|\|
| * 006d584764 Linux 5.10.194
| * d93ba6e46e rcu-tasks: Add trc_inspect_reader() checks for exiting critical section
| * 3e22624f8f rcu-tasks: Wait for trc_read_check_handler() IPIs
| * 9190c1f0ae rcu-tasks: Fix IPI failure handling in trc_wait_for_one_reader
| * ad4f8c117b rcu: Prevent expedited GP from enabling tick on offline CPU
| * 268e922522 Revert "MIPS: Alchemy: fix dbdma2"
| * 79ea9eb723 Revert "drm/amdgpu: install stub fence into potential unused fence pointers"
| * be4ccafc07 mhi: pci_generic: Fix implicit conversion warning
| * df3427204f ARM: module: Use module_init_layout_section() to spot init sections
| * b59cfee8d8 arm64: module: Use module_init_layout_section() to spot init sections
| * 943ed7dc5e arm64: module-plts: inline linux/moduleloader.h
| * ecd62c8512 module: Expose module_init_layout_section()
* | feb0269d54 Revert "drm/display/dp: Fix the DP DSC Receiver cap size"
* | 3acf914de4 Merge 5.10.193 into android12-5.10-lts
|\|
| * 4566606fe3 Linux 5.10.193
| * b3ac2c1d72 mm,hwpoison: fix printing of page flags
| * 7f92be110c ASoC: Intel: sof_sdw: include rt711.h for RT711 JD mode
| * 32f71ef627 mm: memory-failure: fix unexpected return value in soft_offline_page()
| * 20c2db79f1 mm: memory-failure: kill soft_offline_free_page()
| * 406166a3ac mm: fix page reference leak in soft_offline_page()
| * 749630ce91 mm,hwpoison: refactor get_any_page
| * 0df5eaab03 dma-buf/sw_sync: Avoid recursive lock during fence signal
| * 7592a392b3 pinctrl: renesas: rza2: Add lock around pinctrl_generic{{add,remove}_group,{add,remove}_function}
| * 91cbf41a9d clk: Fix undefined reference to `clk_rate_exclusive_{get,put}'
| * 148a86651c scsi: core: raid_class: Remove raid_component_add()
| * 5d02f4320a scsi: snic: Fix double free in snic_tgt_create()
| * d643d3f322 ASoC: rt711: add two jack detection modes
| * c7b26063fc drm/i915: Fix premature release of request's reusable memory
| * 2d69f68ad4 cgroup/cpuset: Free DL BW in case can_attach() fails
| * 4603c2a104 sched/deadline: Create DL BW alloc, free & check overflow interface
| * c9546921a4 cgroup/cpuset: Iterate only if DEADLINE tasks are present
| * 5ac05ce568 sched/cpuset: Keep track of SCHED_DEADLINE task in cpusets
| * b950133d9a sched/cpuset: Bring back cpuset_mutex
| * 312713e3ea cgroup/cpuset: Rename functions dealing with DEADLINE accounting
| * b2125926ba timers/nohz: Switch to ONESHOT_STOPPED in the low-res handler when the tick is stopped
| * ae4f109b95 tick: Detect and fix jiffies update stall
| * c7e91047d3 torture: Fix hang during kthread shutdown phase
| * 4bc6a4fca1 x86/fpu: Set X86_FEATURE_OSXSAVE feature after enabling OSXSAVE in CR4
| * 9e0c0b4ce5 drm/display/dp: Fix the DP DSC Receiver cap size
| * 8735d1c66c drm/vmwgfx: Fix shader stage validation
| * ff0639b222 PCI: acpiphp: Use pci_assign_unassigned_bridge_resources() only for non-root bus
| * da4e9eff0f media: vcodec: Fix potential array out-of-bounds in encoder queue_setup
| * d2540b5f5a of: dynamic: Refactor action prints to not use "%pOF" inside devtree_lock
| * 851f686ed0 radix tree: remove unused variable
| * 3b9a61570b lib/clz_ctz.c: Fix __clzdi2() and __ctzdi2() for 32-bit kernels
| * 72e4a5a28e batman-adv: Hold rtnl lock during MTU update via netlink
| * ee1d443eef batman-adv: Fix batadv_v_ogm_aggr_send memory leak
| * 0c6da1d849 batman-adv: Fix TT global entry leak when client roamed back
| * 6f5d10c0ac batman-adv: Do not get eth header before batadv_check_management_packet
| * 7c09590883 batman-adv: Don't increase MTU when set by user
| * 480f2a129d batman-adv: Trigger events for auto adjusted MTU
| * 0dbedf9afe selinux: set next pointer before attaching to list
| * a54c2048cd nfsd: Fix race to FREE_STATEID and cl_revoked
| * 7c262127d2 NFS: Fix a use after free in nfs_direct_join_group()
| * f3c5697aae mm: add a call to flush_cache_vmap() in vmap_pfn()
| * c9a0e31d92 clk: Fix slab-out-of-bounds error in devm_clk_release()
| * f979b92db1 NFSv4: Fix dropped lock for racing OPEN and delegation return
| * 0a809e0157 ibmveth: Use dcbf rather than dcbfl
| * ffde5f9e88 bonding: fix macvlan over alb bond support
| * 615ea2603d net: remove bond_slave_has_mac_rcu()
| * c8e1e17dee rtnetlink: Reject negative ifindexes in RTM_NEWLINK
| * 7b79dabd63 rtnetlink: return ENODEV when ifname does not exist and group is given
| * d64cdb9cb6 netfilter: nf_tables: fix out of memory error handling
| * 5db1249c70 net/sched: fix a qdisc modification with ambiguous command request
| * 3847137cd1 igb: Avoid starting unnecessary workqueues
| * fa7d7a7f00 ice: fix receive buffer size miscalculation
| * 70dfdbba30 net: validate veth and vxcan peer ifindexes
| * 67c8d7ef54 net: bcmgenet: Fix return value check for fixed_phy_register()
| * 92b20b1569 net: bgmac: Fix return value check for fixed_phy_register()
| * 0b39e3070a ipvlan: Fix a reference count leak warning in ipvlan_ns_exit()
| * 8162b73eef dccp: annotate data-races in dccp_poll()
| * 403cc3e625 sock: annotate data-races around prot->memory_pressure
| * 005b6572d0 octeontx2-af: SDP: fix receive link config
| * b8205dfed6 tracing: Fix memleak due to race between current_tracer and trace
| * 9c2ceffd4e tracing: Fix cpu buffers unavailable due to 'record_disabled' missed
| * 0498107394 rbd: prevent busy loop when requesting exclusive lock
| * 5f16975233 rbd: retrieve and check lock owner twice before blocklisting
| * 2547026bb8 rbd: make get_lock_owner_info() return a single locker or NULL
| * 145248ebe0 libceph, rbd: ignore addr->type while comparing in some cases
| * 61c303cfb1 drm/amd/display: check TG is non-null before checking if enabled
| * b964eb37c0 drm/amd/display: do not wait for mpc idle if tg is disabled
| * 7e11c58b26 ALSA: pcm: Fix potential data race at PCM memory allocation helpers
| * 8c3a4c3b64 dm integrity: reduce vmalloc space footprint on 32-bit architectures
| * 4fdfd3d2f0 dm integrity: increase RECALC_SECTORS to improve recalculate speed
| * 570f52137e fbdev: fix potential OOB read in fast_imageblit()
| * 31131cce24 fbdev: Fix sys_imageblit() for arbitrary image widths
| * 209a84a14c fbdev: Improve performance of sys_imageblit()
| * 188edaaaad MIPS: cpu-features: Use boot_cpu_type for CPU type based features
| * 61913b303b MIPS: cpu-features: Enable octeon_cache by cpu_type
| * bda55fb5ca fs: dlm: fix mismatch of plock results from userspace
| * c3a1c4d996 fs: dlm: use dlm_plock_info for do_unlock_close
| * d503919895 fs: dlm: change plock interrupted message to debug again
| * 1652bcbf9e fs: dlm: add pid to debug log
| * e850cd32df dlm: replace usage of found with dedicated list iterator variable
| * 7b44c1f383 dlm: improve plock logging if interrupted
| * cd689b5912 PCI: acpiphp: Reassign resources on bridge if necessary
| * e827572152 xprtrdma: Remap Receive buffers after a reconnect
| * 8a64aadc29 NFSv4: fix out path in __nfs4_get_acl_uncached
| * c6aecc29d2 objtool/x86: Fix SRSO mess
* | 4d68de3b8c UPSTREAM: mhi: pci_generic: Fix implicit conversion warning
* | 9577f310ce Revert "macsec: Fix traffic counters/statistics"
* | 13fda7dc0e Revert "macsec: use DEV_STATS_INC()"
* | 63caeeae27 Revert "xfrm: add forgotten nla_policy for XFRMA_MTIMER_THRESH"
* | b23fd871be Merge 5.10.192 into android12-5.10-lts
|\|
| * 1599cb60ba Linux 5.10.192
| * 0e8139f923 x86/srso: Correct the mitigation status when SMT is disabled
| * 23e5987465 objtool/x86: Fixup frame-pointer vs rethunk
| * 26e3f7690c x86/retpoline,kprobes: Fix position of thunk sections with CONFIG_LTO_CLANG
| * 88e16ce7f8 x86/srso: Disable the mitigation on unaffected configurations
| * 69712baf24 x86/CPU/AMD: Fix the DIV(0) initial fix attempt
| * 62ebfeb0dc x86/retpoline: Don't clobber RFLAGS during srso_safe_ret()
| * 91b349289e x86/static_call: Fix __static_call_fixup()
| * d2be58f921 x86/srso: Explain the untraining sequences a bit more
| * 06597b650b x86/cpu: Cleanup the untrain mess
| * e0f50b0e41 x86/cpu: Rename srso_(.*)_alias to srso_alias_\1
| * 0676a39253 x86/cpu: Rename original retbleed methods
| * 8b0ff83e8a x86/cpu: Clean up SRSO return thunk mess
| * 20e24c8b4c x86/ibt: Add ANNOTATE_NOENDBR
| * bbbe1b23c7 objtool: Add frame-pointer-specific function ignore
| * bd3d12e6fd x86/alternative: Make custom return thunk unconditional
| * 043d3bfe0a x86/cpu: Fix up srso_safe_ret() and __x86_return_thunk()
| * d5b3c88d15 x86/cpu: Fix __x86_return_thunk symbol type
| * 5962f64ed2 mmc: f-sdh30: fix order of function calls in sdhci_f_sdh30_remove
| * 98c7fe38c4 net: fix the RTO timer retransmitting skb every 1ms if linear option is enabled
| * 9aead733f5 virtio-net: set queues after driver_ok
| * c080cee930 af_unix: Fix null-ptr-deref in unix_stream_sendpage().
| * 7aa165d761 netfilter: set default timeout to 3 secs for sctp shutdown send and recv state
| * e62de63c63 mmc: block: Fix in_flight[issue_type] value error
| * 9022e9e62d mmc: wbsd: fix double mmc_free_host() in wbsd_init()
| * 6e74926ede cifs: Release folio lock on fscache read hit.
| * a04ac0c318 ALSA: usb-audio: Add support for Mythware XA001AU capture and playback interfaces.
| * bd70d0b280 serial: 8250: Fix oops for port->pm on uart_change_pm()
| * 03a7f213af ALSA: hda/realtek - Remodified 3k pull low procedure
| * b7d1c71984 ASoC: meson: axg-tdm-formatter: fix channel slot allocation
| * e761b7e90a ASoC: rt5665: add missed regulator_bulk_disable
| * d23dd85903 arm64: dts: rockchip: Disable HS400 for eMMC on ROCK Pi 4
| * 70626b93d6 arm64: dts: rockchip: sort nodes/properties on rk3399-rock-4
| * 7ba9ac0b5a arm64: dts: rockchip: fix regulator name on rk3399-rock-4
| * fba59a4b55 arm64: dts: rockchip: add SPDIF node for ROCK Pi 4
| * 77806f63c3 arm64: dts: rockchip: add ES8316 codec for ROCK Pi 4
| * 1411c3e86e arm64: dts: rockchip: use USB host by default on rk3399-rock-pi-4
| * eb5b1e932c arm64: dts: rockchip: fix supplies on rk3399-rock-pi-4
| * 73990370d6 bus: ti-sysc: Flush posted write on enable before reset
| * 0a593e8a9d net: do not allow gso_size to be set to GSO_BY_FRAGS
| * 51bc052db8 sock: Fix misuse of sk_under_memory_pressure()
| * 773075d38a net: dsa: mv88e6xxx: Wait for EEPROM done before HW reset
| * 0a9040dede i40e: fix misleading debug logs
| * abe68922d7 team: Fix incorrect deletion of ETH_P_8021AD protocol vid from slaves
| * 526d42c558 net: phy: broadcom: stub c45 read/write for 54810
| * a7653eaea0 netfilter: nft_dynset: disallow object maps
| * 49f57a9087 ipvs: fix racy memcpy in proc_do_sync_threshold
| * c8d0d3811e drm/panel: simple: Fix AUO G121EAN01 panel timings according to the docs
| * 86517421f4 selftests: mirror_gre_changes: Tighten up the TTL test match
| * 614811692e xfrm: add forgotten nla_policy for XFRMA_MTIMER_THRESH
| * bd30aa9c7f xfrm: add NULL check in xfrm_update_ae_params
| * 0b4d69539f ip_vti: fix potential slab-use-after-free in decode_session6
| * ec23b25e56 ip6_vti: fix slab-use-after-free in decode_session6
| * bafa236380 xfrm: fix slab-use-after-free in decode_session6
| * 0f89909c80 net: xfrm: Amend XFRMA_SEC_CTX nla_policy structure
| * 8b92d03cfc net: af_key: fix sadb_x_filter validation
| * 7e50815d29 net: xfrm: Fix xfrm_address_filter OOB read
| * 549e4e167a i2c: designware: Handle invalid SMBus block data response length value
| * bd7bef82ce btrfs: fix BUG_ON condition in btrfs_cancel_balance
| * 483d713ba2 tty: serial: fsl_lpuart: Clear the error flags by writing 1 for lpuart32 platforms
| * 869ce5e598 tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux
| * 0ba7f969be powerpc/rtas_flash: allow user copy to flash block cache objects
| * c5f59de362 fbdev: mmp: fix value check in mmphw_probe()
| * 268cc9bc54 i2c: bcm-iproc: Fix bcm_iproc_i2c_isr deadlock issue
| * 3ff54d904f virtio-mmio: don't break lifecycle of vm_dev
| * b1fe05cc51 virtio-mmio: Use to_virtio_mmio_device() to simply code
| * 3b76d92636 tracing/probes: Fix to update dynamic data counter if fetcharg uses it
| * 265a979ded tracing/probes: Have process_fetch_insn() take a void * instead of pt_regs
| * a890545353 mmc: meson-gx: fix deferred probing
| * e8a41b4a50 mmc: meson-gx: use devm_mmc_alloc_host
| * 50ed76c9e0 mmc: core: add devm_mmc_alloc_host
| * d523ce6f51 mmc: sunxi: fix deferred probing
| * 939a12f29a mmc: bcm2835: fix deferred probing
| * 01dfc61f72 USB: dwc3: qcom: fix NULL-deref on suspend
| * 3e2b5d66e9 usb: cdns3: fix NCM gadget RX speed 20x slow than expection at iMX8QM
| * f5c11b45f3 usb: cdns3: allocate TX FIFO size according to composite EP number
| * a461bcfb36 usb: gadget: udc: core: Introduce check_config to verify USB configuration
| * a64f5fe493 irqchip/mips-gic: Use raw spinlock for gic_lock
| * 0704666c57 irqchip/mips-gic: Get rid of the reliance on irq_cpu_online()
| * 372f1752b7 bus: mhi: host: Range check CHDBOFF and ERDBOFF
| * 77944a6f3c bus: mhi: Move host MHI code to "host" directory
| * f738912615 bus: mhi: Add MMIO region length to controller structure
| * 1cacbb711e bus: mhi: Add MHI PCI support for WWAN modems
| * 436b423253 iio: addac: stx104: Fix race condition when converting analog-to-digital
| * aeecd8d97d iio: addac: stx104: Fix race condition for stx104_write_raw()
| * f6576d4851 iio: adc: stx104: Implement and utilize register structures
| * 9d16098245 iio: adc: stx104: Utilize iomap interface
| * d2ba1f40fc dt-bindings: iio: add AD74413R
| * c5e580831b iio: add addac subdirectory
| * bb70fdbfa2 IMA: allow/fix UML builds
| * 66a3b2a121 ring-buffer: Do not swap cpu_buffer during resize process
| * dd5a12cdf2 powerpc/kasan: Disable KCOV in KASAN code
| * 9f9eed4511 ALSA: hda: fix a possible null-pointer dereference due to data race in snd_hdac_regmap_sync()
| * 7a21c2e474 ALSA: hda/realtek: Add quirks for Unis H3C Desktop B760 & Q760
| * b870b9a47f drm/amdgpu: Fix potential fence use-after-free v2
| * f19add5c77 Bluetooth: btusb: Add MT7922 bluetooth ID for the Asus Ally
| * 2958cf9f80 Bluetooth: L2CAP: Fix use-after-free
| * 04bb8af40a pcmcia: rsrc_nonstatic: Fix memory leak in nonstatic_release_resource_db()
| * 7c5b2649f6 gfs2: Fix possible data races in gfs2_show_options()
| * e8f3d96051 usb: chipidea: imx: add missing USB PHY DPDM wakeup setting
| * 7a3a7c6fa0 usb: chipidea: imx: don't request QoS for imx8ulp
| * 2caeb722f0 media: platform: mediatek: vpu: fix NULL ptr dereference
| * 99d6afa19d usb: gadget: u_serial: Avoid spinlock recursion in __gs_console_push
| * e52de26cb3 media: v4l2-mem2mem: add lock to protect parameter num_rdy
| * 5c094ca994 FS: JFS: Check for read-only mounted filesystem in txBegin
| * 2a3f20efe6 FS: JFS: Fix null-ptr-deref Read in txBegin
| * e778c8b0a9 MIPS: dec: prom: Address -Warray-bounds warning
| * 911b48eec4 fs: jfs: Fix UBSAN: array-index-out-of-bounds in dbAllocDmapLev
| * 4503f6fc95 udf: Fix uninitialized array access for some pathnames
| * a2966e0436 ovl: check type and offset of struct vfsmount in ovl_entry
| * 73311dd831 RDMA/mlx5: Return the firmware result upon destroying QP/RQ
| * 19312bc3ff HID: add quirk for 03f0:464a HP Elite Presenter Mouse
| * 04bd3a362d drm/amdgpu: install stub fence into potential unused fence pointers
| * 04e774fb67 dma-remap: use kvmalloc_array/kvfree for larger dma memory remap
| * cbaebbba72 quota: fix warning in dqgrab()
| * 8a4f4d47b8 quota: Properly disable quotas when add_dquot_ref() fails
| * df907501ba iopoll: Call cpu_relax() in busy loops
| * 940ccc291c ASoC: Intel: sof_sdw: Add support for Rex soundwire
| * b2882c51e6 ARM: dts: imx6dl: prtrvt, prtvt7, prti6q, prtwd2: fix USB related warnings
| * dbe0f607f8 PCI: tegra194: Fix possible array out of bounds access
| * 10459ffd56 ASoC: Intel: sof_sdw: add quirk for LNL RVP
| * 9f4dd39696 ASoC: Intel: sof_sdw: add quirk for MTL RVP
| * 751c5b6a23 ALSA: emu10k1: roll up loops in DSP setup code for Audigy
| * e6825b30d3 drm/radeon: Fix integer overflow in radeon_cs_parser_init
| * e6c0a9728e net/mlx5: Skip clock update work when device is in error state
| * 81cc91bba4 net/mlx5: Move all internal timer metadata into a dedicated struct
| * ba2e27e510 net/mlx5: Refactor init clock function
| * e77ef78741 macsec: use DEV_STATS_INC()
| * ecf0e627fb macsec: Fix traffic counters/statistics
| * b630367a60 mmc: sdhci-f-sdh30: Replace with sdhci_pltfm
* | 412095349f Merge 5.10.191 into android12-5.10-lts
|\|
| * da742ebfa0 Linux 5.10.191
| * 3b55ce96ef sch_netem: fix issues in netem_change() vs get_dist_table()
| * db9d161a04 alpha: remove __init annotation from exported page_is_ram()
| * 4af122b5d7 scsi: qedf: Fix firmware halt over suspend and resume
| * 3bb05745ca scsi: qedi: Fix firmware halt over suspend and resume
| * aa9a76d5ff scsi: core: Fix possible memory leak if device_add() fails
| * 58889d5ad7 scsi: snic: Fix possible memory leak if device_add() fails
| * a370e2d653 scsi: 53c700: Check that command slot is not NULL
| * 1678408d08 scsi: storvsc: Fix handling of virtual Fibre Channel timeouts
| * 267ad381c2 scsi: core: Fix legacy /proc parsing buffer overflow
| * 039ce5eb6b netfilter: nf_tables: report use refcount overflow
| * 93b3195d37 nvme-rdma: fix potential unbalanced freeze & unfreeze
| * 9ad83e3e61 nvme-tcp: fix potential unbalanced freeze & unfreeze
| * 200ae5fa0b btrfs: set cache_block_group_error if we find an error
| * bd3175f9d5 btrfs: don't stop integrity writeback too early
| * c91d822127 ibmvnic: Handle DMA unmapping of login buffs in release functions
| * 9024873b94 ibmvnic: Unmap DMA login rsp buffer on send login fail
| * d4750cea76 ibmvnic: Enforce stronger sanity checks on login response
| * 879750c6a7 net/mlx5: Allow 0 for total host VFs
| * f8510dfa95 dmaengine: mcf-edma: Fix a potential un-allocated memory access
| * e8d349408a net: hns3: add wait until mac link down
| * 70660e6faa net: hns3: refactor hclge_mac_link_status_wait for interface reuse
| * b564f32fb3 net: phy: at803x: remove set/get wol callbacks for AR8032
| * 0d35738118 wifi: cfg80211: fix sband iftype data lookup for AP_VLAN
| * 33c677d1e0 IB/hfi1: Fix possible panic during hotplug remove
| * 13f7752f4a drivers: net: prevent tun_build_skb() to exceed the packet size limit
| * 6d701c95ee dccp: fix data-race around dp->dccps_mss_cache
| * 6d0bd7b7b3 bonding: Fix incorrect deletion of ETH_P_8021AD protocol vid from slaves
| * 5850c391fd tunnels: fix kasan splat when generating ipv4 pmtu error
| * b3b6b9331a net/packet: annotate data-races around tp->status
| * cafe399d4d mISDN: Update parameter type of dsp_cmx_send()
| * 4f1d1cc16a selftests: forwarding: tc_flower: Relax success criterion
| * 501e3de09a selftests: forwarding: Switch off timeout
| * fe8fac37aa selftests: forwarding: Skip test when no interfaces are specified
| * 44a47be97c selftests: forwarding: ethtool_extended_state: Skip when using veth pairs
| * 0a93fa240d selftests: forwarding: ethtool: Skip when using veth pairs
| * 7e6af9c133 selftests: forwarding: Add a helper to skip test when using veth pairs
| * e731ad5221 selftests/rseq: Fix build with undefined __weak
| * cba47d0c95 drm/nouveau/disp: Revert a NULL check inside nouveau_connector_get_modes
| * 98eaa12c96 x86: Move gds_ucode_mitigated() declaration to header
| * 09f78fc442 x86/speculation: Add cpu_show_gds() prototype
| * 5258281a93 x86/mm: Fix VDSO and VVAR placement on 5-level paging machines
| * eda9f8ffca x86/cpu/amd: Enable Zenbleed fix for AMD Custom APU 0405
| * cb1eefc046 x86/srso: Fix build breakage with the LLVM linker
| * df8d390a21 usb: common: usb-conn-gpio: Prevent bailing out if initial role is none
| * 598ccdb92d usb: dwc3: Properly handle processing of pending events
| * fe7c3a445d usb-storage: alauda: Fix uninit-value in alauda_check_media()
| * d7e5e2b87f binder: fix memory leak in binder_init()
| * 0439ce5aef iio: cros_ec: Fix the allocation size for cros_ec_command
| * aa425ee227 io_uring: correct check for O_TMPFILE
| * 3720724087 nilfs2: fix use-after-free of nilfs_root in dirtying inodes via iput
| * a16c66baa4 x86/pkeys: Revert a5eff72597 ("x86/pkeys: Add PKRU value to init_fpstate")
| * 04499d2c97 radix tree test suite: fix incorrect allocation size for pthreads
| * db0e1e2abd hwmon: (pmbus/bel-pfe) Enable PMBUS_SKIP_STATUS_CHECK for pfe1100
| * a73d999fdf drm/amd/display: check attr flag before set cursor degamma on DCN3+
| * 188e8e25ae drm/shmem-helper: Reset vma->vm_ops before calling dma_buf_mmap()
| * 6b6839e440 drm/nouveau/gr: enable memory loads on helper invocation on all channels
| * 002cde0b78 riscv,mmio: Fix readX()-to-delay() ordering
| * 8362ad5367 dmaengine: pl330: Return DMA_PAUSED when transaction is paused
| * 7328c5319e selftests/bpf: Fix sk_assign on s390x
| * b1a3e27d6b selftests/bpf: Workaround verification failure for fexit_bpf2bpf/func_replace_return_code
| * 4af2d9ddb7 selftests/bpf: make test_align selftest more robust
| * 1952a4d5e4 bpf: aggressively forget precise markings during state checkpointing
| * 7ca3e7459f bpf: stop setting precise in current state
| * 2474ec58b9 bpf: allow precision tracking for programs with subprogs
| * 6796c2a0c5 ipv6: adjust ndisc_is_useropt() to also return true for PIO
| * f327f463c7 mmc: moxart: read scr register without changing byte order
| * 890ac460b0 wireguard: allowedips: expand maximum node depth
* | e06ad3b48e Revert "drm/ttm: add ttm_bo_pin()/ttm_bo_unpin() v2"
* | 918b4c2c76 Revert "drm/ttm: make ttm_bo_unpin more defensive"
* | 1c80a01fc2 Revert "drm/ttm: never consider pinned BOs for eviction&swap"
* | 70435a8ac9 Revert "drm/ttm: check null pointer before accessing when swapping"
* | 0dd121e0e6 Revert "tracing: Show real address for trace event arguments"
* | 06fab437d7 Revert "tracing: Fix sleeping while atomic in kdb ftdump"
* | df0f5bd7a8 Merge 5.10.190 into android12-5.10-lts
|/
* ec585727b6 Linux 5.10.190
* b6fc2fbf89 x86/CPU/AMD: Do not leak quotient data after a division by 0
* 98b7ab5e8d ARM: dts: nxp/imx6sll: fix wrong property name in usbphy node
* 14f2e2ac73 ARM: dts: imx6sll: fixup of operating points
* f1c928496d ARM: dts: imx: add usb alias
* c0e7123e89 wifi: mt76: mt7615: do not advertise 5 GHz on first phy of MT7615D (DBDC)
* 37fad83ae5 mt76: mt7615: Fix fall-through warnings for Clang
* b85c7882fd mt76: move band capabilities in mt76_phy
* 381f7df0f3 exfat: check if filename entries exceeds max filename length
* bd3bdb9e0d exfat: support dynamic allocate bh for exfat_entry_set_cache
* e0d192a402 exfat: speed up iterate/lookup by fixing start point of traversing cluster chain
* 86e4e949ea PM: sleep: wakeirq: fix wake irq arming
* 9a320469ad PM / wakeirq: support enabling wake-up irq after runtime_suspend called
* 48d1d0ce07 soundwire: fix enumeration completion
* 7d949774e7 soundwire: bus: pm_runtime_request_resume on peripheral attachment
* 662735bc11 soundwire: bus: add better dev_dbg to track complete() calls
* 173d9c7090 selftests/rseq: Play nice with binaries statically linked against glibc 2.35+
* c08de20e70 selftests/rseq: check if libc rseq support is registered
* fbb6657037 powerpc/mm/altmap: Fix altmap boundary check
* 1f09d67d39 mtd: rawnand: fsl_upm: Fix an off-by one test in fun_exec_op()
* 027710952b mtd: rawnand: omap_elm: Fix incorrect type in assignment
* d328849fb6 ext2: Drop fragment support
* 7e4e87ec56 fs: Protect reconfiguration of sb read-write from racing writes
* ec0d0be417 net: usbnet: Fix WARNING in usbnet_start_xmit/usb_submit_urb
* 06f87c9621 Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb
* 7f740bc696 fs/sysv: Null check to prevent null-ptr-deref bug
* 426656e8dd tracing: Fix sleeping while atomic in kdb ftdump
* 4f86da9abe file: reinstate f_pos locking optimization for regular files
* d39971d902 drm/ttm: check null pointer before accessing when swapping
* c9c78b91c7 open: make RESOLVE_CACHED correctly test for O_TMPFILE
* 3048cb0dc0 bpf: Disable preemption in bpf_event_output
* 33a339e717 net: tap_open(): set sk_uid from current_fsuid()
* 5ea23f1cb6 net: tun_chr_open(): set sk_uid from current_fsuid()
* 8d104bfd41 arm64: dts: stratix10: fix incorrect I2C property for SCL signal
* 8625802a1b mtd: rawnand: meson: fix OOB available bytes for ECC
* 82dc2bffea mtd: spinand: toshiba: Fix ecc_get_status
* ddf7cc7029 exfat: release s_lock before calling dir_emit()
* 79d16a84ea exfat: use kvmalloc_array/kvfree instead of kmalloc_array/kfree
* a4b2673e3c ceph: defer stopping mdsc delayed_work
* b5b39ff691 USB: zaurus: Add ID for A-300/B-500/C-700
* 513bfdde8a libceph: fix potential hang in ceph_osdc_notify()
* 181274d2f3 scsi: zfcp: Defer fc_rport blocking until after ADISC response
* 6d9f5f3d89 tcp_metrics: fix data-race in tcpm_suck_dst() vs fastopen
* 05d1dc88c4 tcp_metrics: annotate data-races around tm->tcpm_net
* 079afb1815 tcp_metrics: annotate data-races around tm->tcpm_vals[]
* 57bcbbb208 tcp_metrics: annotate data-races around tm->tcpm_lock
* 289091eef3 tcp_metrics: annotate data-races around tm->tcpm_stamp
* 420aad608f tcp_metrics: fix addr_same() helper
* 80e9488ece net/mlx5: fs_core: Skip the FTs in the same FS_TYPE_PRIO_CHAINS fs_prio
* 7a634336a0 net/mlx5: fs_core: Make find_closest_ft more generic
* c650597647 vxlan: Fix nexthop hash size
* 1683124129 ip6mr: Fix skb_under_panic in ip6mr_cache_report()
* c33d5a5c5b s390/qeth: Don't call dev_close/dev_open (DOWN/UP)
* 8e309f43d0 net: dcb: choose correct policy to parse DCB_ATTR_BCN
* 6d4f24736d net: netsec: Ignore 'phy-mode' on SynQuacer in DT mode
* 216092963c net: ll_temac: fix error checking of irq_of_parse_and_map()
* 20fe059c1d net: ll_temac: Switch to use dev_err_probe() helper
* a0e42f4bd4 bpf: sockmap: Remove preempt_disable in sock_map_sk_acquire
* aaa71c4e8a net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
* a8d478200b net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free
* b4256c99a7 net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free
* 268b29ef19 net: add missing data-race annotation for sk_ll_usec
* ad417bab9d net: add missing data-race annotations around sk->sk_peek_off
* 11e0590af3 net: add missing READ_ONCE(sk->sk_rcvbuf) annotation
* dc20f7bada net: add missing READ_ONCE(sk->sk_sndbuf) annotation
* 427c611d84 net: add missing READ_ONCE(sk->sk_rcvlowat) annotation
* c7ebe08f40 net: annotate data-races around sk->sk_max_pacing_rate
* 14db69381d mISDN: hfcpci: Fix potential deadlock on &hc->lock
* d163337bef net: sched: cls_u32: Fix match key mis-addressing
* e68929f11b perf test uprobe_from_different_cu: Skip if there is no gcc
* eb8031b7ce net: dsa: fix value check in bcm_sf2_sw_probe()
* abb0172fa8 rtnetlink: let rtnl_bridge_setlink checks IFLA_BRIDGE_MODE length
* 6b93c51068 bpf: Add length check for SK_DIAG_BPF_STORAGE_REQ_MAP_FD parsing
* 2cf6791207 net/mlx5e: fix return value check in mlx5e_ipsec_remove_trailer()
* 1651598547 net/mlx5: DR, fix memory leak in mlx5dr_cmd_create_reformat_ctx
* ef3d0a732d wifi: cfg80211: Fix return value in scan logic
* b4bdcbc0e3 KVM: s390: fix sthyi error handling
* 4241cfc973 word-at-a-time: use the same return type for has_zero regardless of endianness
* 94f8447ab8 arm64: dts: imx8mn-var-som: add missing pull-up for onboard PHY reset pinmux
* 832a4d4cdb loop: Select I/O scheduler 'none' from inside add_disk()
* 3f7395c382 perf: Fix function pointer case
* a883b98dc7 io_uring: gate iowait schedule on having pending requests
* 058c0cbd25 x86/kprobes: Fix JNG/JNLE emulation
* edc2ac7c72 x86/kprobes: Update kcb status flag after singlestepping
* f07f3938c8 x86/kprobes: Move 'inline' to the beginning of the kprobe_is_ss() declaration
* 2b5afe25f5 x86/kprobes: Fix to identify indirect jmp and others using range case
* ba7d1dae9f x86/kprobes: Use int3 instead of debug trap for single-step
* 2c57553a77 x86/kprobes: Identify far indirect JMP correctly
* 41db23bad9 x86/kprobes: Retrieve correct opcode for group instruction
* ff97a14c8a x86/kprobes: Do not decode opcode in resume_execution()
* 5601d812c8 kprobes/x86: Fix fall-through warnings for Clang
* 7a413fa047 ASoC: cs42l51: fix driver to properly autoload with automatic module loading
* 4d360a8194 io_uring: treat -EAGAIN for REQ_F_NOWAIT as final for io-wq
* 9164e27c5a selftests: mptcp: depend on SYN_COOKIES
* f0acd6c3a2 cpufreq: intel_pstate: Drop ACPI _PSS states table patching
* a241fc02f1 ACPI: processor: perflib: Avoid updating frequency QoS unnecessarily
* ad938dd2af ACPI: processor: perflib: Use the "no limit" frequency QoS
* 4148f28f98 drm/ttm: make ttm_bo_unpin more defensive
* c0f2b2b020 dm cache policy smq: ensure IO doesn't prevent cleaner policy progress
* aae65b1793 ceph: never send metrics if disable_send_metrics is set
* 4f669618c9 ASoC: wm8904: Fill the cache for WM8904_ADC_TEST_0 register
* c837f121bc s390/dasd: fix hanging device after quiesce/resume
* 276738b382 virtio-net: fix race between set queues and probe
* 3d10481a90 btrfs: check if the transaction was aborted at btrfs_wait_for_commit()
* fc511ae405 staging: r8712: Fix memory leak in _r8712_init_xmit_priv()
* 223ecf871b staging: rtl8712: Use constants from <linux/ieee80211.h>
* 836b131683 KVM: VMX: Don't fudge CR0 and CR4 for restricted L2 guest
* c710ff0612 KVM: nVMX: Do not clear CR3 load/store exiting bits if L1 wants 'em
* 7fc51da40b KVM: VMX: Fold ept_update_paging_mode_cr0() back into vmx_set_cr0()
* 96c73bc9ef KVM: VMX: Invert handling of CR0.WP for EPT without unrestricted guest
* 90cd5ab951 irqchip/gic-v4.1: Properly lock VPEs when doing a directLPI invalidation
* 57b8db5800 irq-bcm6345-l1: Do not assume a fixed block to cpu mapping
* b1867cddd7 tpm_tis: Explicitly check for error code
* 5be81139d2 nfsd: Remove incorrect check in nfsd4_validate_stateid
* 4a871fcebc file: always lock position for FMODE_ATOMIC_POS
* c5c797ccc3 btrfs: check for commit error at btrfs_attach_transaction_barrier()
* 5e0e4e72ca hwmon: (nct7802) Fix for temp6 (PECI1) processed even if PECI1 disabled
* 7c6df7f0fc ALSA: hda/relatek: Enable Mute LED on HP 250 G8
* 8fc0eabaa7 tty: n_gsm: fix UAF in gsm_cleanup_mux
* caac4b6c15 staging: ks7010: potential buffer overflow in ks_wlan_set_encode_ext()
* baef414b1c Documentation: security-bugs.rst: clarify CVE handling
* 0d5b23743b Documentation: security-bugs.rst: update preferences when dealing with the linux-distros group
* 65cd02e3c3 Revert "usb: xhci: tegra: Fix error check"
* b0fd110578 usb: xhci-mtk: set the dma max_seg_size
* d0b588bbe4 USB: quirks: add quirk for Focusrite Scarlett
* 66a622275a usb: ohci-at91: Fix the unhandle interrupt when resume
* 96c433aff5 usb: dwc3: don't reset device side if dwc3 was configured as host-only
* 05b201de44 usb: dwc3: pci: skip BYT GPIO lookup table for hardwired phy
* 75ad45cef6 Revert "usb: dwc3: core: Enable AutoRetry feature in the controller"
* bf468806b6 can: gs_usb: gs_can_close(): add missing set of CAN state to CAN_STATE_STOPPED
* d5db33a667 USB: serial: simple: sort driver entries
* 81c54eef1d USB: serial: simple: add Kaufmann RKS+CAN VCP
* fca2a74eee USB: serial: option: add Quectel EC200A module support
* c704cb2113 USB: serial: option: support Quectel EM060K_128
* 1037ee1dbf serial: sifive: Fix sifive_serial_console_setup() section
* 6209a7383d serial: 8250_dw: Preserve original value of DLF register
* 9e671a6116 serial: qcom-geni: drop bogus runtime pm state update
* 68e6287ac6 USB: gadget: Fix the memory leak in raw_gadget driver
* da1b105dc6 Revert "usb: gadget: tegra-xudc: Fix error check in tegra_xudc_powerdomain_init()"
* a6d2fd1703 tracing: Fix warning in trace_buffered_event_disable()
* 0efbdbc453 ring-buffer: Fix wrong stat of cpu_buffer->read
* e410839c0c ata: pata_ns87415: mark ns87560_tf_read static
* 82ce0ae87a dm raid: protect md_stop() with 'reconfig_mutex'
* d6a1cf4ee5 dm raid: clean up four equivalent goto tags in raid_ctr()
* a43c761a7e dm raid: fix missing reconfig_mutex unlock in raid_ctr() error paths
* d82bfe9686 block: Fix a source code comment in include/uapi/linux/blkzoned.h
* ab6d14bc40 ASoC: fsl_spdif: Silence output on stop
* 94bac776cd drm/msm: Fix IS_ERR_OR_NULL() vs NULL check in a5xx_submit_in_rb()
* b0100bdb9d RDMA/mthca: Fix crash when polling CQ for shared QPs
* 62a8a4cafa drm/msm/adreno: Fix snapshot BINDLESS_DATA size
* 5c9e03b867 drm/msm/dpu: drop enum dpu_core_perf_data_bus_id
* 08aa5a5297 RDMA/mlx4: Make check for invalid flags stricter
* 9d1fd118bc tipc: stop tipc crypto on failure in tipc_node_create
* d03de93776 tipc: check return value of pskb_trim()
* 3661bab5af benet: fix return value check in be_lancer_xmit_workarounds()
* f40f7a858b net/sched: mqprio: Add length check for TCA_MQPRIO_{MAX/MIN}_RATE64
* 3ed3729a6a net/sched: mqprio: add extack to mqprio_parse_nlattr()
* 6227b46154 net/sched: mqprio: refactor nlattr parsing to a separate function
* 308a43f152 netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID
* ab5a97a94b netfilter: nf_tables: skip immediate deactivate in _PREPARE_ERROR
* 7782ce022f netfilter: nftables: add helper function to validate set element data
* 893cb3c351 netfilter: nft_set_rbtree: fix overlap expiration walk
* 89060b831c platform/x86: msi-laptop: Fix rfkill out-of-sync on MSI Wind U100
* 75f57acda3 team: reset team's flags when down link is P2P device
* de982f46be bonding: reset bond's flags when down link is P2P device
* b2712c4bfc ice: Fix memory management in ice_ethtool_fdir.c
* 0cd74fbd3b tcp: Reduce chance of collisions in inet6_hashfn().
* b55a2b34b1 ipv6 addrconf: fix bug where deleting a mngtmpaddr can create a new temporary address
* 5a3c929682 ethernet: atheros: fix return value check in atl1e_tso_csum()
* ad249aa3c3 phy: hisilicon: Fix an out of bounds check in hisi_inno_phy_probe()
* 6f26f14573 vxlan: calculate correct header length for GPE
* d2741769d5 vxlan: move to its own directory
* 076f786f04 net: hns3: fix wrong bw weight of disabled tc issue
* 344b7c0003 net: hns3: reconstruct function hclge_ets_validate()
* 111b699300 net: phy: marvell10g: fix 88x3310 power up
* 8a6cc852f6 i40e: Fix an NULL vs IS_ERR() bug for debugfs_create_dir()
* 39c789c957 media: staging: atomisp: select V4L2_FWNODE
* fb1db97904 phy: qcom-snps-femto-v2: properly enable ref clock
* ffebc22bdd phy: qcom-snps-femto-v2: keep cfg_ahb_clk enabled during runtime suspend
* f34090579a phy: qcom-snps: correct struct qcom_snps_hsphy kerneldoc
* ceba255a79 phy: qcom-snps: Use dev_err_probe() to simplify code
* ed3d841f2f ext4: fix to check return value of freeze_bdev() in ext4_shutdown()
* e3454b438c pwm: meson: fix handling of period/duty if greater than UINT_MAX
* b306d09967 pwm: meson: Simplify duplicated per-channel tracking
* 840ce9cfc8 tracing: Show real address for trace event arguments
* 8996b13051 drm/ttm: never consider pinned BOs for eviction&swap
* 5f6d5b58c5 drm/ttm: add ttm_bo_pin()/ttm_bo_unpin() v2
* 1815d9bf02 fs: dlm: interrupt posix locks only when process is killed
* 0f6741acfd dlm: rearrange async condition return
* 7931233310 dlm: cleanup plock_op vs plock_xop
* 838d6e86ec PCI/ASPM: Avoid link retraining race
* 9f283ca643 PCI/ASPM: Factor out pcie_wait_for_retrain()
* ffc0ee491f PCI/ASPM: Return 0 or -ETIMEDOUT from pcie_retrain_link()
* 9fd349c885 i2c: nomadik: Remove a useless call in the remove function
* a7ab5d7943 i2c: nomadik: Use devm_clk_get_enabled()
* ec954a4ab0 i2c: nomadik: Remove unnecessary goto label
* 04b1140678 i2c: Improve size determinations
* 41e90f0e50 i2c: Delete error messages for failed memory allocations
* 52df40a5c7 btrfs: fix extent buffer leak after tree mod log failure at split_node()
* 52403c3dad btrfs: fix race between quota disable and relocation
* 3069fc0326 gpio: tps68470: Make tps68470_gpio_output() always set the initial value
* 22786d5381 io_uring: don't audit the capability check in io_uring_create()
* 8e635da0e0 KVM: s390: pv: fix index value of replaced ASCE

Change-Id: I0a0bef19a2542dd337e01594e091619a1e35698a
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

Documentation/admin-guide/hw-vuln/srso.rst

@@ -124,8 +124,8 @@ sequence.
 To ensure the safety of this mitigation, the kernel must ensure that the
 safe return sequence is itself free from attacker interference.  In Zen3
 and Zen4, this is accomplished by creating a BTB alias between the
-untraining function srso_untrain_ret_alias() and the safe return
-function srso_safe_ret_alias() which results in evicting a potentially
+untraining function srso_alias_untrain_ret() and the safe return
+function srso_alias_safe_ret() which results in evicting a potentially
 poisoned BTB entry and using that safe one for all function returns.
 
 In older Zen1 and Zen2, this is accomplished using a reinterpretation

Documentation/admin-guide/security-bugs.rst

@@ -63,31 +63,28 @@ information submitted to the security list and any followup discussions
 of the report are treated confidentially even after the embargo has been
 lifted, in perpetuity.
 
-Coordination
-------------
+Coordination with other groups
+------------------------------
 
-Fixes for sensitive bugs, such as those that might lead to privilege
-escalations, may need to be coordinated with the private
-<linux-distros@vs.openwall.org> mailing list so that distribution vendors
-are well prepared to issue a fixed kernel upon public disclosure of the
-upstream fix. Distros will need some time to test the proposed patch and
-will generally request at least a few days of embargo, and vendor update
-publication prefers to happen Tuesday through Thursday. When appropriate,
-the security team can assist with this coordination, or the reporter can
-include linux-distros from the start. In this case, remember to prefix
-the email Subject line with "[vs]" as described in the linux-distros wiki:
-<http://oss-security.openwall.org/wiki/mailing-lists/distros#how-to-use-the-lists>
+The kernel security team strongly recommends that reporters of potential
+security issues NEVER contact the "linux-distros" mailing list until
+AFTER discussing it with the kernel security team.  Do not Cc: both
+lists at once.  You may contact the linux-distros mailing list after a
+fix has been agreed on and you fully understand the requirements that
+doing so will impose on you and the kernel community.
+
+The different lists have different goals and the linux-distros rules do
+not contribute to actually fixing any potential security problems.
 
 CVE assignment
 --------------
 
-The security team does not normally assign CVEs, nor do we require them
-for reports or fixes, as this can needlessly complicate the process and
-may delay the bug handling. If a reporter wishes to have a CVE identifier
-assigned ahead of public disclosure, they will need to contact the private
-linux-distros list, described above. When such a CVE identifier is known
-before a patch is provided, it is desirable to mention it in the commit
-message if the reporter agrees.
+The security team does not assign CVEs, nor do we require them for
+reports or fixes, as this can needlessly complicate the process and may
+delay the bug handling.  If a reporter wishes to have a CVE identifier
+assigned, they should find one by themselves, for example by contacting
+MITRE directly.  However under no circumstances will a patch inclusion
+be delayed to wait for a CVE identifier to arrive.
 
 Non-disclosure agreements
 -------------------------

Documentation/arm64/silicon-errata.rst

@@ -158,6 +158,9 @@ stable kernels.
 +----------------+-----------------+-----------------+-----------------------------+
 | Hisilicon      | Hip08 SMMU PMCG | #162001800      | N/A                         |
 +----------------+-----------------+-----------------+-----------------------------+
+| Hisilicon      | Hip08 SMMU PMCG | #162001900      | N/A                         |
+|                | Hip09 SMMU PMCG |                 |                             |
++----------------+-----------------+-----------------+-----------------------------+
 +----------------+-----------------+-----------------+-----------------------------+
 | Qualcomm Tech. | Kryo/Falkor v1  | E1003           | QCOM_FALKOR_ERRATUM_1003    |
 +----------------+-----------------+-----------------+-----------------------------+

Documentation/devicetree/bindings/clock/xlnx,versal-clk.yaml

@@ -16,8 +16,6 @@ description: |
   reads required input clock frequencies from the devicetree and acts as clock
   provider for all clock consumers of PS clocks.
 
-select: false
-
 properties:
   compatible:
     const: xlnx,versal-clk

Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml

@@ -0,0 +1,158 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/iio/addac/adi,ad74413r.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Analog Devices AD74412R/AD74413R device
+
+maintainers:
+  - Cosmin Tanislav <cosmin.tanislav@analog.com>
+
+description: |
+  The AD74412R and AD74413R are quad-channel software configurable input/output
+  solutions for building and process control applications. They contain
+  functionality for analog output, analog input, digital input, resistance
+  temperature detector, and thermocouple measurements integrated
+  into a single chip solution with an SPI interface.
+  The devices feature a 16-bit ADC and four configurable 13-bit DACs to provide
+  four configurable input/output channels and a suite of diagnostic functions.
+  The AD74413R differentiates itself from the AD74412R by being HART-compatible.
+    https://www.analog.com/en/products/ad74412r.html
+    https://www.analog.com/en/products/ad74413r.html
+
+properties:
+  compatible:
+    enum:
+      - adi,ad74412r
+      - adi,ad74413r
+
+  reg:
+    maxItems: 1
+
+  '#address-cells':
+    const: 1
+
+  '#size-cells':
+    const: 0
+
+  spi-max-frequency:
+    maximum: 1000000
+
+  spi-cpol: true
+
+  interrupts:
+    maxItems: 1
+
+  refin-supply: true
+
+  shunt-resistor-micro-ohms:
+    description:
+      Shunt (sense) resistor value in micro-Ohms.
+    default: 100000000
+
+required:
+  - compatible
+  - reg
+  - spi-max-frequency
+  - spi-cpol
+  - refin-supply
+
+additionalProperties: false
+
+patternProperties:
+  "^channel@[0-3]$":
+    type: object
+    description: Represents the external channels which are connected to the device.
+
+    properties:
+      reg:
+        description: |
+          The channel number. It can have up to 4 channels numbered from 0 to 3.
+        minimum: 0
+        maximum: 3
+
+      adi,ch-func:
+        $ref: /schemas/types.yaml#/definitions/uint32
+        description: |
+          Channel function.
+          HART functions are not supported on AD74412R.
+          0 - CH_FUNC_HIGH_IMPEDANCE
+          1 - CH_FUNC_VOLTAGE_OUTPUT
+          2 - CH_FUNC_CURRENT_OUTPUT
+          3 - CH_FUNC_VOLTAGE_INPUT
+          4 - CH_FUNC_CURRENT_INPUT_EXT_POWER
+          5 - CH_FUNC_CURRENT_INPUT_LOOP_POWER
+          6 - CH_FUNC_RESISTANCE_INPUT
+          7 - CH_FUNC_DIGITAL_INPUT_LOGIC
+          8 - CH_FUNC_DIGITAL_INPUT_LOOP_POWER
+          9 - CH_FUNC_CURRENT_INPUT_EXT_POWER_HART
+          10 - CH_FUNC_CURRENT_INPUT_LOOP_POWER_HART
+        minimum: 0
+        maximum: 10
+        default: 0
+
+      adi,gpo-comparator:
+        type: boolean
+        description: |
+          Whether to configure GPO as a comparator or not.
+          When not configured as a comparator, the GPO will be treated as an
+          output-only GPIO.
+
+    required:
+      - reg
+
+examples:
+  - |
+    #include <dt-bindings/gpio/gpio.h>
+    #include <dt-bindings/interrupt-controller/irq.h>
+    #include <dt-bindings/iio/addac/adi,ad74413r.h>
+
+    spi {
+      #address-cells = <1>;
+      #size-cells = <0>;
+
+      cs-gpios = <&gpio 17 GPIO_ACTIVE_LOW>;
+      status = "okay";
+
+      ad74413r@0 {
+        compatible = "adi,ad74413r";
+        reg = <0>;
+        spi-max-frequency = <1000000>;
+        spi-cpol;
+
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        interrupt-parent = <&gpio>;
+        interrupts = <26 IRQ_TYPE_EDGE_FALLING>;
+
+        refin-supply = <&ad74413r_refin>;
+
+        channel@0 {
+          reg = <0>;
+
+          adi,ch-func = <CH_FUNC_VOLTAGE_OUTPUT>;
+        };
+
+        channel@1 {
+          reg = <1>;
+
+          adi,ch-func = <CH_FUNC_CURRENT_OUTPUT>;
+        };
+
+        channel@2 {
+          reg = <2>;
+
+          adi,ch-func = <CH_FUNC_DIGITAL_INPUT_LOGIC>;
+          adi,gpo-comparator;
+        };
+
+        channel@3 {
+          reg = <3>;
+
+          adi,ch-func = <CH_FUNC_CURRENT_INPUT_EXT_POWER>;
+        };
+      };
+    };
+...

Documentation/scsi/scsi_mid_low_api.rst

@@ -1195,11 +1195,11 @@ Members of interest:
 		 - pointer to scsi_device object that this command is
                    associated with.
     resid
-		 - an LLD should set this signed integer to the requested
+		 - an LLD should set this unsigned integer to the requested
                    transfer length (i.e. 'request_bufflen') less the number
                    of bytes that are actually transferred. 'resid' is
                    preset to 0 so an LLD can ignore it if it cannot detect
-                   underruns (overruns should be rare). If possible an LLD
+                   underruns (overruns should not be reported). An LLD
                    should set 'resid' prior to invoking 'done'. The most
                    interesting case is data transfers from a SCSI target
                    device (e.g. READs) that underrun.

Makefile

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 VERSION = 5
 PATCHLEVEL = 10
-SUBLEVEL = 189
+SUBLEVEL = 198
 EXTRAVERSION =
 NAME = Dare mighty things
 

arch/alpha/kernel/setup.c

@@ -394,8 +394,7 @@ setup_memory(void *kernel_end)
 extern void setup_memory(void *);
 #endif /* !CONFIG_DISCONTIGMEM */
 
-int __init
-page_is_ram(unsigned long pfn)
+int page_is_ram(unsigned long pfn)
 {
 	struct memclust_struct * cluster;
 	struct memdesc_struct * memdesc;

arch/arm/boot/dts/am335x-guardian.dts

@@ -100,11 +100,12 @@ panel-info {
 
 	};
 
-	pwm7: dmtimer-pwm {
+	guardian_beeper: pwm-7 {
 		compatible = "ti,omap-dmtimer-pwm";
+		#pwm-cells = <3>;
 		ti,timers = <&timer7>;
 		pinctrl-names = "default";
-		pinctrl-0 = <&dmtimer7_pins>;
+		pinctrl-0 = <&guardian_beeper_pins>;
 		ti,clock-source = <0x01>;
 	};
 
@@ -343,9 +344,9 @@ AM33XX_IOPAD(0x9b4, PIN_OUTPUT_PULLDOWN | MUX_MODE3)
 		>;
 	};
 
-	dmtimer7_pins: pinmux_dmtimer7_pins {
+	guardian_beeper_pins: pinmux_dmtimer7_pins {
 		pinctrl-single,pins = <
-			AM33XX_IOPAD(0x968, PIN_OUTPUT | MUX_MODE5)
+			AM33XX_IOPAD(0x968, PIN_OUTPUT | MUX_MODE5) /* (E18) timer7 */
 		>;
 	};
 

arch/arm/boot/dts/am3517-evm.dts

@@ -150,7 +150,7 @@ bl: backlight {
 		enable-gpios = <&gpio6 22 GPIO_ACTIVE_HIGH>; /* gpio_182 */
 	};
 
-	pwm11: dmtimer-pwm@11 {
+	pwm11: pwm-11 {
 		compatible = "ti,omap-dmtimer-pwm";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pwm_pins>;

arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts

@@ -19,7 +19,8 @@ chosen {
 
 	memory@0 {
 		device_type = "memory";
-		reg = <0x00000000 0x08000000>;
+		reg = <0x00000000 0x08000000>,
+		      <0x88000000 0x08000000>;
 	};
 
 	gpio-keys {

arch/arm/boot/dts/bcm47189-luxul-xap-1440.dts

@@ -46,3 +46,16 @@ restart {
 		};
 	};
 };
+
+&gmac0 {
+	phy-mode = "rgmii";
+	phy-handle = <&bcm54210e>;
+
+	mdio {
+		/delete-node/ switch@1e;
+
+		bcm54210e: ethernet-phy@0 {
+			reg = <0>;
+		};
+	};
+};

arch/arm/boot/dts/bcm47189-luxul-xap-810.dts

@@ -83,3 +83,16 @@ pcie0_chipcommon: chipcommon@0 {
 		};
 	};
 };
+
+&gmac0 {
+	phy-mode = "rgmii";
+	phy-handle = <&bcm54210e>;
+
+	mdio {
+		/delete-node/ switch@1e;
+
+		bcm54210e: ethernet-phy@0 {
+			reg = <0>;
+		};
+	};
+};

arch/arm/boot/dts/bcm5301x.dtsi

@@ -267,7 +267,7 @@ usb2: usb2@21000 {
 
 			interrupt-parent = <&gic>;
 
-			ehci: ehci@21000 {
+			ehci: usb@21000 {
 				#usb-cells = <0>;
 
 				compatible = "generic-ehci";
@@ -289,7 +289,7 @@ ehci_port2: port@2 {
 				};
 			};
 
-			ohci: ohci@22000 {
+			ohci: usb@22000 {
 				#usb-cells = <0>;
 
 				compatible = "generic-ohci";

arch/arm/boot/dts/bcm53573.dtsi

@@ -127,6 +127,9 @@ uart0: serial@300 {
 
 		pcie0: pcie@2000 {
 			reg = <0x00002000 0x1000>;
+
+			#address-cells = <3>;
+			#size-cells = <2>;
 		};
 
 		usb2: usb2@4000 {
@@ -135,7 +138,7 @@ usb2: usb2@4000 {
 			#address-cells = <1>;
 			#size-cells = <1>;
 
-			ehci: ehci@4000 {
+			ehci: usb@4000 {
 				compatible = "generic-ehci";
 				reg = <0x4000 0x1000>;
 				interrupt-parent = <&gic>;
@@ -155,9 +158,7 @@ ehci_port2: port@2 {
 				};
 			};
 
-			ohci: ohci@d000 {
-				#usb-cells = <0>;
-
+			ohci: usb@d000 {
 				compatible = "generic-ohci";
 				reg = <0xd000 0x1000>;
 				interrupt-parent = <&gic>;
@@ -180,6 +181,24 @@ ohci_port2: port@2 {
 
 		gmac0: ethernet@5000 {
 			reg = <0x5000 0x1000>;
+
+			mdio {
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				switch: switch@1e {
+					compatible = "brcm,bcm53125";
+					reg = <0x1e>;
+
+					status = "disabled";
+
+					/* ports are defined in board DTS */
+					ports {
+						#address-cells = <1>;
+						#size-cells = <0>;
+					};
+				};
+			};
 		};
 
 		gmac1: ethernet@b000 {

arch/arm/boot/dts/bcm947189acdbmr.dts

@@ -60,9 +60,9 @@ wps {
 	spi {
 		compatible = "spi-gpio";
 		num-chipselects = <1>;
-		gpio-sck = <&chipcommon 21 0>;
-		gpio-miso = <&chipcommon 22 0>;
-		gpio-mosi = <&chipcommon 23 0>;
+		sck-gpios = <&chipcommon 21 0>;
+		miso-gpios = <&chipcommon 22 0>;
+		mosi-gpios = <&chipcommon 23 0>;
 		cs-gpios = <&chipcommon 24 0>;
 		#address-cells = <1>;
 		#size-cells = <0>;

arch/arm/boot/dts/exynos4210-i9100.dts

@@ -170,8 +170,8 @@ lcd@0 {
 			power-on-delay = <10>;
 			reset-delay = <10>;
 
-			panel-width-mm = <90>;
-			panel-height-mm = <154>;
+			panel-width-mm = <56>;
+			panel-height-mm = <93>;
 
 			display-timings {
 				timing {

arch/arm/boot/dts/imx23.dtsi

@@ -59,7 +59,7 @@ icoll: interrupt-controller@80000000 {
 				reg = <0x80000000 0x2000>;
 			};
 
-			dma_apbh: dma-apbh@80004000 {
+			dma_apbh: dma-controller@80004000 {
 				compatible = "fsl,imx23-dma-apbh";
 				reg = <0x80004000 0x2000>;
 				interrupts = <0 14 20 0

arch/arm/boot/dts/imx25.dtsi

@@ -515,7 +515,7 @@ gpio2: gpio@53fd0000 {
 				#interrupt-cells = <2>;
 			};
 
-			sdma: sdma@53fd4000 {
+			sdma: dma-controller@53fd4000 {
 				compatible = "fsl,imx25-sdma";
 				reg = <0x53fd4000 0x4000>;
 				clocks = <&clks 112>, <&clks 68>;

arch/arm/boot/dts/imx28.dtsi

@@ -78,7 +78,7 @@ hsadc: hsadc@80002000 {
 				status = "disabled";
 			};
 
-			dma_apbh: dma-apbh@80004000 {
+			dma_apbh: dma-controller@80004000 {
 				compatible = "fsl,imx28-dma-apbh";
 				reg = <0x80004000 0x2000>;
 				interrupts = <82 83 84 85

arch/arm/boot/dts/imx31.dtsi

@@ -297,7 +297,7 @@ gpio2: gpio@53fd0000 {
 				#interrupt-cells = <2>;
 			};
 
-			sdma: sdma@53fd4000 {
+			sdma: dma-controller@53fd4000 {
 				compatible = "fsl,imx31-sdma";
 				reg = <0x53fd4000 0x4000>;
 				interrupts = <34>;

arch/arm/boot/dts/imx35.dtsi

@@ -284,7 +284,7 @@ gpio2: gpio@53fd0000 {
 				#interrupt-cells = <2>;
 			};
 
-			sdma: sdma@53fd4000 {
+			sdma: dma-controller@53fd4000 {
 				compatible = "fsl,imx35-sdma";
 				reg = <0x53fd4000 0x4000>;
 				clocks = <&clks 9>, <&clks 65>;

arch/arm/boot/dts/imx50.dtsi

@@ -421,7 +421,7 @@ ecspi2: spi@63fac000 {
 				status = "disabled";
 			};
 
-			sdma: sdma@63fb0000 {
+			sdma: dma-controller@63fb0000 {
 				compatible = "fsl,imx50-sdma", "fsl,imx35-sdma";
 				reg = <0x63fb0000 0x4000>;
 				interrupts = <6>;

arch/arm/boot/dts/imx51.dtsi

@@ -498,7 +498,7 @@ ecspi2: spi@83fac000 {
 				status = "disabled";
 			};
 
-			sdma: sdma@83fb0000 {
+			sdma: dma-controller@83fb0000 {
 				compatible = "fsl,imx51-sdma", "fsl,imx35-sdma";
 				reg = <0x83fb0000 0x4000>;
 				interrupts = <6>;

arch/arm/boot/dts/imx53.dtsi

@@ -710,7 +710,7 @@ ecspi2: spi@63fac000 {
 				status = "disabled";
 			};
 
-			sdma: sdma@63fb0000 {
+			sdma: dma-controller@63fb0000 {
 				compatible = "fsl,imx53-sdma", "fsl,imx35-sdma";
 				reg = <0x63fb0000 0x4000>;
 				interrupts = <6>;

arch/arm/boot/dts/imx6dl-prtrvt.dts

@@ -126,6 +126,10 @@ &usbh1 {
 	status = "disabled";
 };
 
+&usbotg {
+	disable-over-current;
+};
+
 &vpu {
 	status = "disabled";
 };

arch/arm/boot/dts/imx6qdl-prti6q.dtsi

@@ -69,6 +69,7 @@ &usbh1 {
 	vbus-supply = <&reg_usb_h1_vbus>;
 	phy_type = "utmi";
 	dr_mode = "host";
+	disable-over-current;
 	status = "okay";
 };
 
@@ -78,10 +79,18 @@ &usbotg {
 	pinctrl-0 = <&pinctrl_usbotg>;
 	phy_type = "utmi";
 	dr_mode = "host";
-	disable-over-current;
+	over-current-active-low;
 	status = "okay";
 };
 
+&usbphynop1 {
+	status = "disabled";
+};
+
+&usbphynop2 {
+	status = "disabled";
+};
+
 &usdhc1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_usdhc1>;

arch/arm/boot/dts/imx6qdl.dtsi

@@ -45,6 +45,10 @@ aliases {
 		spi1 = &ecspi2;
 		spi2 = &ecspi3;
 		spi3 = &ecspi4;
+		usb0 = &usbotg;
+		usb1 = &usbh1;
+		usb2 = &usbh2;
+		usb3 = &usbh3;
 		usbphy0 = &usbphy1;
 		usbphy1 = &usbphy2;
 	};
@@ -146,7 +150,7 @@ soc {
 		interrupt-parent = <&gpc>;
 		ranges;
 
-		dma_apbh: dma-apbh@110000 {
+		dma_apbh: dma-controller@110000 {
 			compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
 			reg = <0x00110000 0x2000>;
 			interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,
@@ -923,7 +927,7 @@ dcic2: dcic@20e8000 {
 				interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>;
 			};
 
-			sdma: sdma@20ec000 {
+			sdma: dma-controller@20ec000 {
 				compatible = "fsl,imx6q-sdma", "fsl,imx35-sdma";
 				reg = <0x020ec000 0x4000>;
 				interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx6sl.dtsi

@@ -39,6 +39,9 @@ aliases {
 		spi1 = &ecspi2;
 		spi2 = &ecspi3;
 		spi3 = &ecspi4;
+		usb0 = &usbotg1;
+		usb1 = &usbotg2;
+		usb2 = &usbh;
 		usbphy0 = &usbphy1;
 		usbphy1 = &usbphy2;
 	};
@@ -749,7 +752,7 @@ spdc: spdc@20e8000 {
 				interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
 			};
 
-			sdma: sdma@20ec000 {
+			sdma: dma-controller@20ec000 {
 				compatible = "fsl,imx6sl-sdma", "fsl,imx6q-sdma";
 				reg = <0x020ec000 0x4000>;
 				interrupts = <0 2 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx6sll.dtsi

@@ -36,6 +36,8 @@ aliases {
 		spi1 = &ecspi2;
 		spi3 = &ecspi3;
 		spi4 = &ecspi4;
+		usb0 = &usbotg1;
+		usb1 = &usbotg2;
 		usbphy0 = &usbphy1;
 		usbphy1 = &usbphy2;
 	};
@@ -49,20 +51,18 @@ cpu0: cpu@0 {
 			device_type = "cpu";
 			reg = <0>;
 			next-level-cache = <&L2>;
-			operating-points = <
+			operating-points =
 				/* kHz    uV */
-				996000  1275000
-				792000  1175000
-				396000  1075000
-				198000	975000
-			>;
-			fsl,soc-operating-points = <
+				<996000  1275000>,
+				<792000  1175000>,
+				<396000  1075000>,
+				<198000	  975000>;
+			fsl,soc-operating-points =
 				/* ARM kHz      SOC-PU uV */
-				996000          1175000
-				792000          1175000
-				396000          1175000
-				198000		1175000
-			>;
+				<996000         1175000>,
+				<792000         1175000>,
+				<396000         1175000>,
+				<198000		1175000>;
 			clock-latency = <61036>; /* two CLK32 periods */
 			#cooling-cells = <2>;
 			clocks = <&clks IMX6SLL_CLK_ARM>,
@@ -552,7 +552,7 @@ usbphy2: usb-phy@20ca000 {
 				reg = <0x020ca000 0x1000>;
 				interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&clks IMX6SLL_CLK_USBPHY2>;
-				phy-reg_3p0-supply = <&reg_3p0>;
+				phy-3p0-supply = <&reg_3p0>;
 				fsl,anatop = <&anatop>;
 			};
 

arch/arm/boot/dts/imx6sx.dtsi

@@ -49,6 +49,9 @@ aliases {
 		spi2 = &ecspi3;
 		spi3 = &ecspi4;
 		spi4 = &ecspi5;
+		usb0 = &usbotg1;
+		usb1 = &usbotg2;
+		usb2 = &usbh;
 		usbphy0 = &usbphy1;
 		usbphy1 = &usbphy2;
 	};
@@ -206,7 +209,7 @@ gpu: gpu@1800000 {
 			power-domains = <&pd_pu>;
 		};
 
-		dma_apbh: dma-apbh@1804000 {
+		dma_apbh: dma-controller@1804000 {
 			compatible = "fsl,imx6sx-dma-apbh", "fsl,imx28-dma-apbh";
 			reg = <0x01804000 0x2000>;
 			interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,
@@ -845,7 +848,7 @@ gpr: iomuxc-gpr@20e4000 {
 				reg = <0x020e4000 0x4000>;
 			};
 
-			sdma: sdma@20ec000 {
+			sdma: dma-controller@20ec000 {
 				compatible = "fsl,imx6sx-sdma", "fsl,imx6q-sdma";
 				reg = <0x020ec000 0x4000>;
 				interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/imx6ul.dtsi

@@ -47,6 +47,8 @@ aliases {
 		spi1 = &ecspi2;
 		spi2 = &ecspi3;
 		spi3 = &ecspi4;
+		usb0 = &usbotg1;
+		usb1 = &usbotg2;
 		usbphy0 = &usbphy1;
 		usbphy1 = &usbphy2;
 	};
@@ -162,7 +164,7 @@ intc: interrupt-controller@a01000 {
 			      <0x00a06000 0x2000>;
 		};
 
-		dma_apbh: dma-apbh@1804000 {
+		dma_apbh: dma-controller@1804000 {
 			compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
 			reg = <0x01804000 0x2000>;
 			interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,
@@ -741,7 +743,7 @@ gpt2: timer@20e8000 {
 				status = "disabled";
 			};
 
-			sdma: sdma@20ec000 {
+			sdma: dma-controller@20ec000 {
 				compatible = "fsl,imx6ul-sdma", "fsl,imx6q-sdma",
 					     "fsl,imx35-sdma";
 				reg = <0x020ec000 0x4000>;

arch/arm/boot/dts/imx7d.dtsi

@@ -7,6 +7,12 @@
 #include <dt-bindings/reset/imx7-reset.h>
 
 / {
+	aliases {
+		usb0 = &usbotg1;
+		usb1 = &usbotg2;
+		usb2 = &usbh;
+	};
+
 	cpus {
 		cpu0: cpu@0 {
 			clock-frequency = <996000000>;

arch/arm/boot/dts/imx7s.dtsi

@@ -47,6 +47,8 @@ aliases {
 		spi1 = &ecspi2;
 		spi2 = &ecspi3;
 		spi3 = &ecspi4;
+		usb0 = &usbotg1;
+		usb1 = &usbh;
 	};
 
 	cpus {
@@ -1135,6 +1137,8 @@ usdhc1: mmc@30b40000 {
 					<&clks IMX7D_USDHC1_ROOT_CLK>;
 				clock-names = "ipg", "ahb", "per";
 				bus-width = <4>;
+				fsl,tuning-step = <2>;
+				fsl,tuning-start-tap = <20>;
 				status = "disabled";
 			};
 
@@ -1147,6 +1151,8 @@ usdhc2: mmc@30b50000 {
 					<&clks IMX7D_USDHC2_ROOT_CLK>;
 				clock-names = "ipg", "ahb", "per";
 				bus-width = <4>;
+				fsl,tuning-step = <2>;
+				fsl,tuning-start-tap = <20>;
 				status = "disabled";
 			};
 
@@ -1159,6 +1165,8 @@ usdhc3: mmc@30b60000 {
 					<&clks IMX7D_USDHC3_ROOT_CLK>;
 				clock-names = "ipg", "ahb", "per";
 				bus-width = <4>;
+				fsl,tuning-step = <2>;
+				fsl,tuning-start-tap = <20>;
 				status = "disabled";
 			};
 
@@ -1175,7 +1183,7 @@ qspi: spi@30bb0000 {
 				status = "disabled";
 			};
 
-			sdma: sdma@30bd0000 {
+			sdma: dma-controller@30bd0000 {
 				compatible = "fsl,imx7d-sdma", "fsl,imx35-sdma";
 				reg = <0x30bd0000 0x10000>;
 				interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>;
@@ -1208,14 +1216,13 @@ fec1: ethernet@30be0000 {
 			};
 		};
 
-		dma_apbh: dma-apbh@33000000 {
+		dma_apbh: dma-controller@33000000 {
 			compatible = "fsl,imx7d-dma-apbh", "fsl,imx28-dma-apbh";
 			reg = <0x33000000 0x2000>;
 			interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
-			interrupt-names = "gpmi0", "gpmi1", "gpmi2", "gpmi3";
 			#dma-cells = <1>;
 			dma-channels = <4>;
 			clocks = <&clks IMX7D_NAND_USDHC_BUS_RAWNAND_CLK>;

arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi

@@ -59,7 +59,7 @@ led2 {
 		};
 	};
 
-	pwm10: dmtimer-pwm {
+	pwm10: pwm-10 {
 		compatible = "ti,omap-dmtimer-pwm";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pwm_pins>;

arch/arm/boot/dts/motorola-mapphone-common.dtsi

@@ -156,7 +156,7 @@ soundcard {
 		dais = <&mcbsp2_port>, <&mcbsp3_port>;
 	};
 
-	pwm8: dmtimer-pwm-8 {
+	pwm8: pwm-8 {
 		pinctrl-names = "default";
 		pinctrl-0 = <&vibrator_direction_pin>;
 
@@ -166,7 +166,7 @@ pwm8: dmtimer-pwm-8 {
 		ti,clock-source = <0x01>;
 	};
 
-	pwm9: dmtimer-pwm-9 {
+	pwm9: pwm-9 {
 		pinctrl-names = "default";
 		pinctrl-0 = <&vibrator_enable_pin>;
 
@@ -192,6 +192,29 @@ backlight: backlight {
 	};
 };
 
+&cpu_thermal {
+	polling-delay = <10000>; /* milliseconds */
+};
+
+&cpu_alert0 {
+        temperature = <80000>; /* millicelsius */
+};
+
+&cpu0 {
+        /*
+	 * Note that the 1.2GiHz mode is enabled for all SoC variants for
+	 * the Motorola Android Linux v3.0.8 based kernel.
+	 */
+        operating-points = <
+	        /* kHz    uV */
+	        300000  1025000
+	        600000  1200000
+	        800000  1313000
+	        1008000 1375000
+		1200000 1375000
+        >;
+};
+
 &dss {
 	status = "okay";
 };
@@ -384,7 +407,7 @@ &mmc3 {
 	#address-cells = <1>;
 	#size-cells = <0>;
 	wlcore: wlcore@2 {
-		compatible = "ti,wl1285", "ti,wl1283";
+		compatible = "ti,wl1285";
 		reg = <2>;
 		/* gpio_100 with gpmc_wait2 pad as wakeirq */
 		interrupts-extended = <&gpio4 4 IRQ_TYPE_LEVEL_HIGH>,
@@ -716,12 +739,12 @@ &rng_target {
 /* Configure pwm clock source for timers 8 & 9 */
 &timer8 {
 	assigned-clocks = <&abe_clkctrl OMAP4_TIMER8_CLKCTRL 24>;
-	assigned-clock-parents = <&sys_clkin_ck>;
+	assigned-clock-parents = <&sys_32k_ck>;
 };
 
 &timer9 {
 	assigned-clocks = <&l4_per_clkctrl OMAP4_TIMER9_CLKCTRL 24>;
-	assigned-clock-parents = <&sys_clkin_ck>;
+	assigned-clock-parents = <&sys_32k_ck>;
 };
 
 /*

arch/arm/boot/dts/omap-gpmc-smsc911x.dtsi

@@ -8,9 +8,9 @@
 
 / {
 	vddvario: regulator-vddvario {
-		  compatible = "regulator-fixed";
-		  regulator-name = "vddvario";
-		  regulator-always-on;
+		compatible = "regulator-fixed";
+		regulator-name = "vddvario";
+		regulator-always-on;
 	};
 
 	vdd33a: regulator-vdd33a {

arch/arm/boot/dts/omap-gpmc-smsc9221.dtsi

@@ -12,9 +12,9 @@
 
 / {
 	vddvario: regulator-vddvario {
-		  compatible = "regulator-fixed";
-		  regulator-name = "vddvario";
-		  regulator-always-on;
+		compatible = "regulator-fixed";
+		regulator-name = "vddvario";
+		regulator-always-on;
 	};
 
 	vdd33a: regulator-vdd33a {

arch/arm/boot/dts/omap3-cm-t3517.dts

@@ -11,12 +11,12 @@ / {
 	model = "CompuLab CM-T3517";
 	compatible = "compulab,omap3-cm-t3517", "ti,am3517", "ti,omap3";
 
-	vmmc:  regulator-vmmc {
-                compatible = "regulator-fixed";
-                regulator-name = "vmmc";
-                regulator-min-microvolt = <3300000>;
-                regulator-max-microvolt = <3300000>;
-        };
+	vmmc: regulator-vmmc {
+		compatible = "regulator-fixed";
+		regulator-name = "vmmc";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+	};
 
 	wl12xx_vmmc2: wl12xx_vmmc2 {
 		compatible = "regulator-fixed";

arch/arm/boot/dts/omap3-cpu-thermal.dtsi

@@ -15,8 +15,7 @@ cpu_thermal: cpu_thermal {
 	polling-delay = <1000>; /* milliseconds */
 	coefficients = <0 20000>;
 
-			/* sensor       ID */
-	thermal-sensors = <&bandgap     0>;
+	thermal-sensors = <&bandgap>;
 
 	cpu_trips: trips {
 		cpu_alert0: cpu_alert {

arch/arm/boot/dts/omap3-gta04.dtsi

@@ -147,7 +147,7 @@ backlight: backlight {
 		pinctrl-0 = <&backlight_pins>;
 	};
 
-	pwm11: dmtimer-pwm {
+	pwm11: pwm-11 {
 		compatible = "ti,omap-dmtimer-pwm";
 		ti,timers = <&timer11>;
 		#pwm-cells = <3>;
@@ -332,7 +332,7 @@ OMAP3_CORE1_IOPAD(0x2106, PIN_OUTPUT | MUX_MODE0)   /* dss_data21.dss_data21 */
 			OMAP3_CORE1_IOPAD(0x2108, PIN_OUTPUT | MUX_MODE0)   /* dss_data22.dss_data22 */
 			OMAP3_CORE1_IOPAD(0x210a, PIN_OUTPUT | MUX_MODE0)   /* dss_data23.dss_data23 */
 		>;
-       };
+	};
 
 	gps_pins: pinmux_gps_pins {
 		pinctrl-single,pins = <
@@ -866,8 +866,8 @@ &mcbsp4 { /* GSM voice PCM */
 };
 
 &hdqw1w {
-        pinctrl-names = "default";
-        pinctrl-0 = <&hdq_pins>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&hdq_pins>;
 };
 
 /* image signal processor within OMAP3 SoC */

arch/arm/boot/dts/omap3-ldp.dts

@@ -301,5 +301,5 @@ &usb_otg_hs {
 
 &vaux1 {
 	/* Needed for ads7846 */
-        regulator-name = "vcc";
+	regulator-name = "vcc";
 };

arch/arm/boot/dts/omap3-n900.dts

@@ -156,7 +156,7 @@ battery: n900-battery {
 		io-channel-names = "temp", "bsi", "vbat";
 	};
 
-	pwm9: dmtimer-pwm {
+	pwm9: pwm-9 {
 		compatible = "ti,omap-dmtimer-pwm";
 		#pwm-cells = <3>;
 		ti,timers = <&timer9>;
@@ -236,27 +236,27 @@ gpmc_pins: pinmux_gpmc_pins {
 		pinctrl-single,pins = <
 
 			/* address lines */
-                        OMAP3_CORE1_IOPAD(0x207a, PIN_OUTPUT | MUX_MODE0)       /* gpmc_a1.gpmc_a1 */
-                        OMAP3_CORE1_IOPAD(0x207c, PIN_OUTPUT | MUX_MODE0)       /* gpmc_a2.gpmc_a2 */
-                        OMAP3_CORE1_IOPAD(0x207e, PIN_OUTPUT | MUX_MODE0)       /* gpmc_a3.gpmc_a3 */
+			OMAP3_CORE1_IOPAD(0x207a, PIN_OUTPUT | MUX_MODE0)       /* gpmc_a1.gpmc_a1 */
+			OMAP3_CORE1_IOPAD(0x207c, PIN_OUTPUT | MUX_MODE0)       /* gpmc_a2.gpmc_a2 */
+			OMAP3_CORE1_IOPAD(0x207e, PIN_OUTPUT | MUX_MODE0)       /* gpmc_a3.gpmc_a3 */
 
 			/* data lines, gpmc_d0..d7 not muxable according to TRM */
-                        OMAP3_CORE1_IOPAD(0x209e, PIN_INPUT | MUX_MODE0)        /* gpmc_d8.gpmc_d8 */
-                        OMAP3_CORE1_IOPAD(0x20a0, PIN_INPUT | MUX_MODE0)        /* gpmc_d9.gpmc_d9 */
-                        OMAP3_CORE1_IOPAD(0x20a2, PIN_INPUT | MUX_MODE0)        /* gpmc_d10.gpmc_d10 */
-                        OMAP3_CORE1_IOPAD(0x20a4, PIN_INPUT | MUX_MODE0)        /* gpmc_d11.gpmc_d11 */
-                        OMAP3_CORE1_IOPAD(0x20a6, PIN_INPUT | MUX_MODE0)        /* gpmc_d12.gpmc_d12 */
-                        OMAP3_CORE1_IOPAD(0x20a8, PIN_INPUT | MUX_MODE0)        /* gpmc_d13.gpmc_d13 */
-                        OMAP3_CORE1_IOPAD(0x20aa, PIN_INPUT | MUX_MODE0)        /* gpmc_d14.gpmc_d14 */
-                        OMAP3_CORE1_IOPAD(0x20ac, PIN_INPUT | MUX_MODE0)        /* gpmc_d15.gpmc_d15 */
+			OMAP3_CORE1_IOPAD(0x209e, PIN_INPUT | MUX_MODE0)        /* gpmc_d8.gpmc_d8 */
+			OMAP3_CORE1_IOPAD(0x20a0, PIN_INPUT | MUX_MODE0)        /* gpmc_d9.gpmc_d9 */
+			OMAP3_CORE1_IOPAD(0x20a2, PIN_INPUT | MUX_MODE0)        /* gpmc_d10.gpmc_d10 */
+			OMAP3_CORE1_IOPAD(0x20a4, PIN_INPUT | MUX_MODE0)        /* gpmc_d11.gpmc_d11 */
+			OMAP3_CORE1_IOPAD(0x20a6, PIN_INPUT | MUX_MODE0)        /* gpmc_d12.gpmc_d12 */
+			OMAP3_CORE1_IOPAD(0x20a8, PIN_INPUT | MUX_MODE0)        /* gpmc_d13.gpmc_d13 */
+			OMAP3_CORE1_IOPAD(0x20aa, PIN_INPUT | MUX_MODE0)        /* gpmc_d14.gpmc_d14 */
+			OMAP3_CORE1_IOPAD(0x20ac, PIN_INPUT | MUX_MODE0)        /* gpmc_d15.gpmc_d15 */
 
 			/*
 			 * gpmc_ncs0, gpmc_nadv_ale, gpmc_noe, gpmc_nwe, gpmc_wait0 not muxable
 			 * according to TRM. OneNAND seems to require PIN_INPUT on clock.
 			 */
-                        OMAP3_CORE1_IOPAD(0x20b0, PIN_OUTPUT | MUX_MODE0)       /* gpmc_ncs1.gpmc_ncs1 */
-                        OMAP3_CORE1_IOPAD(0x20be, PIN_INPUT | MUX_MODE0)        /* gpmc_clk.gpmc_clk */
-		>;
+			OMAP3_CORE1_IOPAD(0x20b0, PIN_OUTPUT | MUX_MODE0)       /* gpmc_ncs1.gpmc_ncs1 */
+			OMAP3_CORE1_IOPAD(0x20be, PIN_INPUT | MUX_MODE0)        /* gpmc_clk.gpmc_clk */
+			>;
 	};
 
 	i2c1_pins: pinmux_i2c1_pins {
@@ -738,12 +738,12 @@ tpa6130a2: tpa6130a2@60 {
 
 	si4713: si4713@63 {
 		compatible = "silabs,si4713";
-                reg = <0x63>;
+		reg = <0x63>;
 
-                interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_FALLING>; /* 53 */
-                reset-gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>; /* 163 */
-                vio-supply = <&vio>;
-                vdd-supply = <&vaux1>;
+		interrupts-extended = <&gpio2 21 IRQ_TYPE_EDGE_FALLING>; /* 53 */
+		reset-gpios = <&gpio6 3 GPIO_ACTIVE_HIGH>; /* 163 */
+		vio-supply = <&vio>;
+		vdd-supply = <&vaux1>;
 	};
 
 	bq24150a: bq24150a@6b {

arch/arm/boot/dts/omap3-zoom3.dts

@@ -23,9 +23,9 @@ memory@80000000 {
 	};
 
 	vddvario: regulator-vddvario {
-		  compatible = "regulator-fixed";
-		  regulator-name = "vddvario";
-		  regulator-always-on;
+		compatible = "regulator-fixed";
+		regulator-name = "vddvario";
+		regulator-always-on;
 	};
 
 	vdd33a: regulator-vdd33a {
@@ -84,28 +84,28 @@ OMAP3_CORE1_IOPAD(0x21d0, PIN_INPUT_PULLUP | MUX_MODE3)	/* mcspi1_cs1.sdmmc3_cmd
 
 	uart1_pins: pinmux_uart1_pins {
 		pinctrl-single,pins = <
-                        OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT | MUX_MODE0)		/* uart1_cts.uart1_cts */
-                        OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE0)		/* uart1_rts.uart1_rts */
-                        OMAP3_CORE1_IOPAD(0x2182, WAKEUP_EN | PIN_INPUT | MUX_MODE0) /* uart1_rx.uart1_rx */
-                        OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE0)		/* uart1_tx.uart1_tx */
+			OMAP3_CORE1_IOPAD(0x2180, PIN_INPUT | MUX_MODE0)		/* uart1_cts.uart1_cts */
+			OMAP3_CORE1_IOPAD(0x217e, PIN_OUTPUT | MUX_MODE0)		/* uart1_rts.uart1_rts */
+			OMAP3_CORE1_IOPAD(0x2182, WAKEUP_EN | PIN_INPUT | MUX_MODE0) /* uart1_rx.uart1_rx */
+			OMAP3_CORE1_IOPAD(0x217c, PIN_OUTPUT | MUX_MODE0)		/* uart1_tx.uart1_tx */
 		>;
 	};
 
 	uart2_pins: pinmux_uart2_pins {
 		pinctrl-single,pins = <
-                        OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT_PULLUP | MUX_MODE0)	/* uart2_cts.uart2_cts */
-                        OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT | MUX_MODE0)		/* uart2_rts.uart2_rts */
-                        OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0)		/* uart2_rx.uart2_rx */
-                        OMAP3_CORE1_IOPAD(0x2178, PIN_OUTPUT | MUX_MODE0)		/* uart2_tx.uart2_tx */
+			OMAP3_CORE1_IOPAD(0x2174, PIN_INPUT_PULLUP | MUX_MODE0)	/* uart2_cts.uart2_cts */
+			OMAP3_CORE1_IOPAD(0x2176, PIN_OUTPUT | MUX_MODE0)		/* uart2_rts.uart2_rts */
+			OMAP3_CORE1_IOPAD(0x217a, PIN_INPUT | MUX_MODE0)		/* uart2_rx.uart2_rx */
+			OMAP3_CORE1_IOPAD(0x2178, PIN_OUTPUT | MUX_MODE0)		/* uart2_tx.uart2_tx */
 		>;
 	};
 
 	uart3_pins: pinmux_uart3_pins {
 		pinctrl-single,pins = <
-                        OMAP3_CORE1_IOPAD(0x219a, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* uart3_cts_rctx.uart3_cts_rctx */
-                        OMAP3_CORE1_IOPAD(0x219c, PIN_OUTPUT | MUX_MODE0)		/* uart3_rts_sd.uart3_rts_sd */
-                        OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT | MUX_MODE0)		/* uart3_rx_irrx.uart3_rx_irrx */
-                        OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0)		/* uart3_tx_irtx.uart3_tx_irtx */
+			OMAP3_CORE1_IOPAD(0x219a, PIN_INPUT_PULLDOWN | MUX_MODE0)	/* uart3_cts_rctx.uart3_cts_rctx */
+			OMAP3_CORE1_IOPAD(0x219c, PIN_OUTPUT | MUX_MODE0)		/* uart3_rts_sd.uart3_rts_sd */
+			OMAP3_CORE1_IOPAD(0x219e, PIN_INPUT | MUX_MODE0)		/* uart3_rx_irrx.uart3_rx_irrx */
+			OMAP3_CORE1_IOPAD(0x21a0, PIN_OUTPUT | MUX_MODE0)		/* uart3_tx_irtx.uart3_tx_irtx */
 		>;
 	};
 
@@ -205,22 +205,22 @@ wlcore: wlcore@2 {
 };
 
 &uart1 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&uart1_pins>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart1_pins>;
 };
 
 &uart2 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&uart2_pins>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart2_pins>;
 };
 
 &uart3 {
-       pinctrl-names = "default";
-       pinctrl-0 = <&uart3_pins>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart3_pins>;
 };
 
 &uart4 {
-       status = "disabled";
+	status = "disabled";
 };
 
 &usb_otg_hs {

arch/arm/boot/dts/omap4-cpu-thermal.dtsi

@@ -15,21 +15,24 @@ cpu_thermal: cpu_thermal {
 	polling-delay-passive = <250>; /* milliseconds */
 	polling-delay = <1000>; /* milliseconds */
 
-			/* sensor       ID */
-        thermal-sensors = <&bandgap     0>;
+	/*
+	 * See 44xx files for single sensor addressing, omap5 and dra7 need
+	 * also sensor ID for addressing.
+	 */
+	thermal-sensors = <&bandgap     0>;
 
 	cpu_trips: trips {
-                cpu_alert0: cpu_alert {
-                        temperature = <100000>; /* millicelsius */
-                        hysteresis = <2000>; /* millicelsius */
-                        type = "passive";
-                };
-                cpu_crit: cpu_crit {
-                        temperature = <125000>; /* millicelsius */
-                        hysteresis = <2000>; /* millicelsius */
-                        type = "critical";
-                };
-        };
+		cpu_alert0: cpu_alert {
+			temperature = <100000>; /* millicelsius */
+			hysteresis = <2000>; /* millicelsius */
+			type = "passive";
+		};
+		cpu_crit: cpu_crit {
+			temperature = <125000>; /* millicelsius */
+			hysteresis = <2000>; /* millicelsius */
+			type = "critical";
+		};
+	};
 
 	cpu_cooling_maps: cooling-maps {
 		map0 {

arch/arm/boot/dts/omap443x.dtsi

@@ -72,6 +72,7 @@ abb_iva: regulator-abb-iva {
 };
 
 &cpu_thermal {
+	thermal-sensors = <&bandgap>;
 	coefficients = <0 20000>;
 };
 

arch/arm/boot/dts/omap4460.dtsi

@@ -89,6 +89,7 @@ abb_iva: regulator-abb-iva {
 };
 
 &cpu_thermal {
+	thermal-sensors = <&bandgap>;
 	coefficients = <348 (-9301)>;
 };
 

arch/arm/boot/dts/omap5-cm-t54.dts

@@ -84,36 +84,36 @@ led1 {
 	};
 
 	lcd0: display {
-                compatible = "startek,startek-kd050c", "panel-dpi";
-                label = "lcd";
+		compatible = "startek,startek-kd050c", "panel-dpi";
+		label = "lcd";
 
-                pinctrl-names = "default";
-                pinctrl-0 = <&lcd_pins>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&lcd_pins>;
 
-                enable-gpios = <&gpio8 3 GPIO_ACTIVE_HIGH>;
+		enable-gpios = <&gpio8 3 GPIO_ACTIVE_HIGH>;
 
-                panel-timing {
-                        clock-frequency = <33000000>;
-                        hactive = <800>;
-                        vactive = <480>;
-                        hfront-porch = <40>;
-                        hback-porch = <40>;
-                        hsync-len = <43>;
-                        vback-porch = <29>;
-                        vfront-porch = <13>;
-                        vsync-len = <3>;
-                        hsync-active = <0>;
-                        vsync-active = <0>;
-                        de-active = <1>;
-                        pixelclk-active = <1>;
-                };
+		panel-timing {
+			clock-frequency = <33000000>;
+			hactive = <800>;
+			vactive = <480>;
+			hfront-porch = <40>;
+			hback-porch = <40>;
+			hsync-len = <43>;
+			vback-porch = <29>;
+			vfront-porch = <13>;
+			vsync-len = <3>;
+			hsync-active = <0>;
+			vsync-active = <0>;
+			de-active = <1>;
+			pixelclk-active = <1>;
+		};
 
-                port {
-                        lcd_in: endpoint {
-                                remote-endpoint = <&dpi_lcd_out>;
-                        };
-                };
-        };
+		port {
+			lcd_in: endpoint {
+				remote-endpoint = <&dpi_lcd_out>;
+			};
+		};
+	};
 
 	hdmi0: connector0 {
 		compatible = "hdmi-connector";
@@ -644,8 +644,8 @@ &usbhsehci {
 };
 
 &usb3 {
-       extcon = <&extcon_usb3>;
-       vbus-supply = <&smps10_out1_reg>;
+	extcon = <&extcon_usb3>;
+	vbus-supply = <&smps10_out1_reg>;
 };
 
 &cpu0 {

arch/arm/boot/dts/s3c6410-mini6410.dts

@@ -51,7 +51,7 @@ srom-cs1-bus@18000000 {
 
 		ethernet@18000000 {
 			compatible = "davicom,dm9000";
-			reg = <0x18000000 0x2 0x18000004 0x2>;
+			reg = <0x18000000 0x2>, <0x18000004 0x2>;
 			interrupt-parent = <&gpn>;
 			interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
 			davicom,no-eeprom;
@@ -193,12 +193,12 @@ &uart3 {
 };
 
 &pinctrl0 {
-	gpio_leds: gpio-leds {
+	gpio_leds: gpio-leds-pins {
 		samsung,pins = "gpk-4", "gpk-5", "gpk-6", "gpk-7";
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	gpio_keys: gpio-keys {
+	gpio_keys: gpio-keys-pins {
 		samsung,pins = "gpn-0", "gpn-1", "gpn-2", "gpn-3",
 				"gpn-4", "gpn-5", "gpl-11", "gpl-12";
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;

arch/arm/boot/dts/s3c64xx-pinctrl.dtsi

@@ -16,111 +16,111 @@ &pinctrl0 {
 	 * Pin banks
 	 */
 
-	gpa: gpa {
+	gpa: gpa-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 
-	gpb: gpb {
+	gpb: gpb-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 
-	gpc: gpc {
+	gpc: gpc-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 
-	gpd: gpd {
+	gpd: gpd-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 
-	gpe: gpe {
+	gpe: gpe-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 	};
 
-	gpf: gpf {
+	gpf: gpf-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 
-	gpg: gpg {
+	gpg: gpg-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 
-	gph: gph {
+	gph: gph-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 
-	gpi: gpi {
+	gpi: gpi-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 	};
 
-	gpj: gpj {
+	gpj: gpj-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 	};
 
-	gpk: gpk {
+	gpk: gpk-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 	};
 
-	gpl: gpl {
+	gpl: gpl-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 
-	gpm: gpm {
+	gpm: gpm-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 
-	gpn: gpn {
+	gpn: gpn-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 
-	gpo: gpo {
+	gpo: gpo-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 
-	gpp: gpp {
+	gpp: gpp-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 
-	gpq: gpq {
+	gpq: gpq-gpio-bank {
 		gpio-controller;
 		#gpio-cells = <2>;
 		interrupt-controller;
@@ -131,225 +131,225 @@ gpq: gpq {
 	 * Pin groups
 	 */
 
-	uart0_data: uart0-data {
+	uart0_data: uart0-data-pins {
 		samsung,pins = "gpa-0", "gpa-1";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	uart0_fctl: uart0-fctl {
+	uart0_fctl: uart0-fctl-pins {
 		samsung,pins = "gpa-2", "gpa-3";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	uart1_data: uart1-data {
+	uart1_data: uart1-data-pins {
 		samsung,pins = "gpa-4", "gpa-5";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	uart1_fctl: uart1-fctl {
+	uart1_fctl: uart1-fctl-pins {
 		samsung,pins = "gpa-6", "gpa-7";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	uart2_data: uart2-data {
+	uart2_data: uart2-data-pins {
 		samsung,pins = "gpb-0", "gpb-1";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	uart3_data: uart3-data {
+	uart3_data: uart3-data-pins {
 		samsung,pins = "gpb-2", "gpb-3";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	ext_dma_0: ext-dma-0 {
+	ext_dma_0: ext-dma-0-pins {
 		samsung,pins = "gpb-0", "gpb-1";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	ext_dma_1: ext-dma-1 {
+	ext_dma_1: ext-dma-1-pins {
 		samsung,pins = "gpb-2", "gpb-3";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	irda_data_0: irda-data-0 {
+	irda_data_0: irda-data-0-pins {
 		samsung,pins = "gpb-0", "gpb-1";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	irda_data_1: irda-data-1 {
+	irda_data_1: irda-data-1-pins {
 		samsung,pins = "gpb-2", "gpb-3";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	irda_sdbw: irda-sdbw {
+	irda_sdbw: irda-sdbw-pins {
 		samsung,pins = "gpb-4";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	i2c0_bus: i2c0-bus {
+	i2c0_bus: i2c0-bus-pins {
 		samsung,pins = "gpb-5", "gpb-6";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_UP>;
 	};
 
-	i2c1_bus: i2c1-bus {
+	i2c1_bus: i2c1-bus-pins {
 		/* S3C6410-only */
 		samsung,pins = "gpb-2", "gpb-3";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_6>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_UP>;
 	};
 
-	spi0_bus: spi0-bus {
+	spi0_bus: spi0-bus-pins {
 		samsung,pins = "gpc-0", "gpc-1", "gpc-2";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_UP>;
 	};
 
-	spi0_cs: spi0-cs {
+	spi0_cs: spi0-cs-pins {
 		samsung,pins = "gpc-3";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	spi1_bus: spi1-bus {
+	spi1_bus: spi1-bus-pins {
 		samsung,pins = "gpc-4", "gpc-5", "gpc-6";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_UP>;
 	};
 
-	spi1_cs: spi1-cs {
+	spi1_cs: spi1-cs-pins {
 		samsung,pins = "gpc-7";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	sd0_cmd: sd0-cmd {
+	sd0_cmd: sd0-cmd-pins {
 		samsung,pins = "gpg-1";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	sd0_clk: sd0-clk {
+	sd0_clk: sd0-clk-pins {
 		samsung,pins = "gpg-0";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	sd0_bus1: sd0-bus1 {
+	sd0_bus1: sd0-bus1-pins {
 		samsung,pins = "gpg-2";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	sd0_bus4: sd0-bus4 {
+	sd0_bus4: sd0-bus4-pins {
 		samsung,pins = "gpg-2", "gpg-3", "gpg-4", "gpg-5";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	sd0_cd: sd0-cd {
+	sd0_cd: sd0-cd-pins {
 		samsung,pins = "gpg-6";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_UP>;
 	};
 
-	sd1_cmd: sd1-cmd {
+	sd1_cmd: sd1-cmd-pins {
 		samsung,pins = "gph-1";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	sd1_clk: sd1-clk {
+	sd1_clk: sd1-clk-pins {
 		samsung,pins = "gph-0";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	sd1_bus1: sd1-bus1 {
+	sd1_bus1: sd1-bus1-pins {
 		samsung,pins = "gph-2";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	sd1_bus4: sd1-bus4 {
+	sd1_bus4: sd1-bus4-pins {
 		samsung,pins = "gph-2", "gph-3", "gph-4", "gph-5";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	sd1_bus8: sd1-bus8 {
+	sd1_bus8: sd1-bus8-pins {
 		samsung,pins = "gph-2", "gph-3", "gph-4", "gph-5",
 				"gph-6", "gph-7", "gph-8", "gph-9";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	sd1_cd: sd1-cd {
+	sd1_cd: sd1-cd-pins {
 		samsung,pins = "gpg-6";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_UP>;
 	};
 
-	sd2_cmd: sd2-cmd {
+	sd2_cmd: sd2-cmd-pins {
 		samsung,pins = "gpc-4";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	sd2_clk: sd2-clk {
+	sd2_clk: sd2-clk-pins {
 		samsung,pins = "gpc-5";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	sd2_bus1: sd2-bus1 {
+	sd2_bus1: sd2-bus1-pins {
 		samsung,pins = "gph-6";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	sd2_bus4: sd2-bus4 {
+	sd2_bus4: sd2-bus4-pins {
 		samsung,pins = "gph-6", "gph-7", "gph-8", "gph-9";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	i2s0_bus: i2s0-bus {
+	i2s0_bus: i2s0-bus-pins {
 		samsung,pins = "gpd-0", "gpd-2", "gpd-3", "gpd-4";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	i2s0_cdclk: i2s0-cdclk {
+	i2s0_cdclk: i2s0-cdclk-pins {
 		samsung,pins = "gpd-1";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	i2s1_bus: i2s1-bus {
+	i2s1_bus: i2s1-bus-pins {
 		samsung,pins = "gpe-0", "gpe-2", "gpe-3", "gpe-4";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	i2s1_cdclk: i2s1-cdclk {
+	i2s1_cdclk: i2s1-cdclk-pins {
 		samsung,pins = "gpe-1";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	i2s2_bus: i2s2-bus {
+	i2s2_bus: i2s2-bus-pins {
 		/* S3C6410-only */
 		samsung,pins = "gpc-4", "gpc-5", "gpc-6", "gph-6",
 				"gph-8", "gph-9";
@@ -357,50 +357,50 @@ i2s2_bus: i2s2-bus {
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	i2s2_cdclk: i2s2-cdclk {
+	i2s2_cdclk: i2s2-cdclk-pins {
 		/* S3C6410-only */
 		samsung,pins = "gph-7";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_5>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	pcm0_bus: pcm0-bus {
+	pcm0_bus: pcm0-bus-pins {
 		samsung,pins = "gpd-0", "gpd-2", "gpd-3", "gpd-4";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	pcm0_extclk: pcm0-extclk {
+	pcm0_extclk: pcm0-extclk-pins {
 		samsung,pins = "gpd-1";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	pcm1_bus: pcm1-bus {
+	pcm1_bus: pcm1-bus-pins {
 		samsung,pins = "gpe-0", "gpe-2", "gpe-3", "gpe-4";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	pcm1_extclk: pcm1-extclk {
+	pcm1_extclk: pcm1-extclk-pins {
 		samsung,pins = "gpe-1";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	ac97_bus_0: ac97-bus-0 {
+	ac97_bus_0: ac97-bus-0-pins {
 		samsung,pins = "gpd-0", "gpd-1", "gpd-2", "gpd-3", "gpd-4";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	ac97_bus_1: ac97-bus-1 {
+	ac97_bus_1: ac97-bus-1-pins {
 		samsung,pins = "gpe-0", "gpe-1", "gpe-2", "gpe-3", "gpe-4";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	cam_port: cam-port {
+	cam_port: cam-port-pins {
 		samsung,pins = "gpf-0", "gpf-1", "gpf-2", "gpf-4",
 				"gpf-5", "gpf-6", "gpf-7", "gpf-8",
 				"gpf-9", "gpf-10", "gpf-11", "gpf-12";
@@ -408,242 +408,242 @@ cam_port: cam-port {
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	cam_rst: cam-rst {
+	cam_rst: cam-rst-pins {
 		samsung,pins = "gpf-3";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	cam_field: cam-field {
+	cam_field: cam-field-pins {
 		/* S3C6410-only */
 		samsung,pins = "gpb-4";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	pwm_extclk: pwm-extclk {
+	pwm_extclk: pwm-extclk-pins {
 		samsung,pins = "gpf-13";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	pwm0_out: pwm0-out {
+	pwm0_out: pwm0-out-pins {
 		samsung,pins = "gpf-14";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	pwm1_out: pwm1-out {
+	pwm1_out: pwm1-out-pins {
 		samsung,pins = "gpf-15";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	clkout0: clkout-0 {
+	clkout0: clkout-0-pins {
 		samsung,pins = "gpf-14";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col0_0: keypad-col0-0 {
+	keypad_col0_0: keypad-col0-0-pins {
 		samsung,pins = "gph-0";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col1_0: keypad-col1-0 {
+	keypad_col1_0: keypad-col1-0-pins {
 		samsung,pins = "gph-1";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col2_0: keypad-col2-0 {
+	keypad_col2_0: keypad-col2-0-pins {
 		samsung,pins = "gph-2";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col3_0: keypad-col3-0 {
+	keypad_col3_0: keypad-col3-0-pins {
 		samsung,pins = "gph-3";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col4_0: keypad-col4-0 {
+	keypad_col4_0: keypad-col4-0-pins {
 		samsung,pins = "gph-4";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col5_0: keypad-col5-0 {
+	keypad_col5_0: keypad-col5-0-pins {
 		samsung,pins = "gph-5";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col6_0: keypad-col6-0 {
+	keypad_col6_0: keypad-col6-0-pins {
 		samsung,pins = "gph-6";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col7_0: keypad-col7-0 {
+	keypad_col7_0: keypad-col7-0-pins {
 		samsung,pins = "gph-7";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_4>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col0_1: keypad-col0-1 {
+	keypad_col0_1: keypad-col0-1-pins {
 		samsung,pins = "gpl-0";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col1_1: keypad-col1-1 {
+	keypad_col1_1: keypad-col1-1-pins {
 		samsung,pins = "gpl-1";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col2_1: keypad-col2-1 {
+	keypad_col2_1: keypad-col2-1-pins {
 		samsung,pins = "gpl-2";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col3_1: keypad-col3-1 {
+	keypad_col3_1: keypad-col3-1-pins {
 		samsung,pins = "gpl-3";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col4_1: keypad-col4-1 {
+	keypad_col4_1: keypad-col4-1-pins {
 		samsung,pins = "gpl-4";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col5_1: keypad-col5-1 {
+	keypad_col5_1: keypad-col5-1-pins {
 		samsung,pins = "gpl-5";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col6_1: keypad-col6-1 {
+	keypad_col6_1: keypad-col6-1-pins {
 		samsung,pins = "gpl-6";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_col7_1: keypad-col7-1 {
+	keypad_col7_1: keypad-col7-1-pins {
 		samsung,pins = "gpl-7";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row0_0: keypad-row0-0 {
+	keypad_row0_0: keypad-row0-0-pins {
 		samsung,pins = "gpk-8";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row1_0: keypad-row1-0 {
+	keypad_row1_0: keypad-row1-0-pins {
 		samsung,pins = "gpk-9";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row2_0: keypad-row2-0 {
+	keypad_row2_0: keypad-row2-0-pins {
 		samsung,pins = "gpk-10";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row3_0: keypad-row3-0 {
+	keypad_row3_0: keypad-row3-0-pins {
 		samsung,pins = "gpk-11";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row4_0: keypad-row4-0 {
+	keypad_row4_0: keypad-row4-0-pins {
 		samsung,pins = "gpk-12";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row5_0: keypad-row5-0 {
+	keypad_row5_0: keypad-row5-0-pins {
 		samsung,pins = "gpk-13";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row6_0: keypad-row6-0 {
+	keypad_row6_0: keypad-row6-0-pins {
 		samsung,pins = "gpk-14";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row7_0: keypad-row7-0 {
+	keypad_row7_0: keypad-row7-0-pins {
 		samsung,pins = "gpk-15";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row0_1: keypad-row0-1 {
+	keypad_row0_1: keypad-row0-1-pins {
 		samsung,pins = "gpn-0";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row1_1: keypad-row1-1 {
+	keypad_row1_1: keypad-row1-1-pins {
 		samsung,pins = "gpn-1";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row2_1: keypad-row2-1 {
+	keypad_row2_1: keypad-row2-1-pins {
 		samsung,pins = "gpn-2";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row3_1: keypad-row3-1 {
+	keypad_row3_1: keypad-row3-1-pins {
 		samsung,pins = "gpn-3";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row4_1: keypad-row4-1 {
+	keypad_row4_1: keypad-row4-1-pins {
 		samsung,pins = "gpn-4";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row5_1: keypad-row5-1 {
+	keypad_row5_1: keypad-row5-1-pins {
 		samsung,pins = "gpn-5";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row6_1: keypad-row6-1 {
+	keypad_row6_1: keypad-row6-1-pins {
 		samsung,pins = "gpn-6";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	keypad_row7_1: keypad-row7-1 {
+	keypad_row7_1: keypad-row7-1-pins {
 		samsung,pins = "gpn-7";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	lcd_ctrl: lcd-ctrl {
+	lcd_ctrl: lcd-ctrl-pins {
 		samsung,pins = "gpj-8", "gpj-9", "gpj-10", "gpj-11";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_2>;
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	lcd_data16: lcd-data-width16 {
+	lcd_data16: lcd-data-width16-pins {
 		samsung,pins = "gpi-3", "gpi-4", "gpi-5", "gpi-6",
 				"gpi-7", "gpi-10", "gpi-11", "gpi-12",
 				"gpi-13", "gpi-14", "gpi-15", "gpj-3",
@@ -652,7 +652,7 @@ lcd_data16: lcd-data-width16 {
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	lcd_data18: lcd-data-width18 {
+	lcd_data18: lcd-data-width18-pins {
 		samsung,pins = "gpi-2", "gpi-3", "gpi-4", "gpi-5",
 				"gpi-6", "gpi-7", "gpi-10", "gpi-11",
 				"gpi-12", "gpi-13", "gpi-14", "gpi-15",
@@ -662,7 +662,7 @@ lcd_data18: lcd-data-width18 {
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	lcd_data24: lcd-data-width24 {
+	lcd_data24: lcd-data-width24-pins {
 		samsung,pins = "gpi-0", "gpi-1", "gpi-2", "gpi-3",
 				"gpi-4", "gpi-5", "gpi-6", "gpi-7",
 				"gpi-8", "gpi-9", "gpi-10", "gpi-11",
@@ -673,7 +673,7 @@ lcd_data24: lcd-data-width24 {
 		samsung,pin-pud = <S3C64XX_PIN_PULL_NONE>;
 	};
 
-	hsi_bus: hsi-bus {
+	hsi_bus: hsi-bus-pins {
 		samsung,pins = "gpk-0", "gpk-1", "gpk-2", "gpk-3",
 				"gpk-4", "gpk-5", "gpk-6", "gpk-7";
 		samsung,pin-function = <EXYNOS_PIN_FUNC_3>;

arch/arm/boot/dts/s5pv210-aquila.dts

@@ -277,37 +277,37 @@ &keypad {
 			<&keypad_col0>, <&keypad_col1>, <&keypad_col2>;
 	status = "okay";
 
-	key_1 {
+	key-1 {
 		keypad,row = <0>;
 		keypad,column = <1>;
 		linux,code = <KEY_CONNECT>;
 	};
 
-	key_2 {
+	key-2 {
 		keypad,row = <0>;
 		keypad,column = <2>;
 		linux,code = <KEY_BACK>;
 	};
 
-	key_3 {
+	key-3 {
 		keypad,row = <1>;
 		keypad,column = <1>;
 		linux,code = <KEY_CAMERA_FOCUS>;
 	};
 
-	key_4 {
+	key-4 {
 		keypad,row = <1>;
 		keypad,column = <2>;
 		linux,code = <KEY_VOLUMEUP>;
 	};
 
-	key_5 {
+	key-5 {
 		keypad,row = <2>;
 		keypad,column = <1>;
 		linux,code = <KEY_CAMERA>;
 	};
 
-	key_6 {
+	key-6 {
 		keypad,row = <2>;
 		keypad,column = <2>;
 		linux,code = <KEY_VOLUMEDOWN>;

arch/arm/boot/dts/s5pv210-aries.dtsi

@@ -54,7 +54,7 @@ pmic_ap_clk: clock-0 {
 		clock-frequency = <32768>;
 	};
 
-	bt_codec: bt_sco {
+	bt_codec: bt-sco {
 		compatible = "linux,bt-sco";
 		#sound-dai-cells = <0>;
 	};
@@ -113,7 +113,7 @@ i2c_sound: i2c-gpio-0 {
 		pinctrl-names = "default";
 		pinctrl-0 = <&sound_i2c_pins>;
 
-		wm8994: wm8994@1a {
+		wm8994: audio-codec@1a {
 			compatible = "wlf,wm8994";
 			reg = <0x1a>;
 

arch/arm/boot/dts/s5pv210-goni.dts

@@ -259,37 +259,37 @@ &keypad {
 			<&keypad_col0>, <&keypad_col1>, <&keypad_col2>;
 	status = "okay";
 
-	key_1 {
+	key-1 {
 		keypad,row = <0>;
 		keypad,column = <1>;
 		linux,code = <KEY_CONNECT>;
 	};
 
-	key_2 {
+	key-2 {
 		keypad,row = <0>;
 		keypad,column = <2>;
 		linux,code = <KEY_BACK>;
 	};
 
-	key_3 {
+	key-3 {
 		keypad,row = <1>;
 		keypad,column = <1>;
 		linux,code = <KEY_CAMERA_FOCUS>;
 	};
 
-	key_4 {
+	key-4 {
 		keypad,row = <1>;
 		keypad,column = <2>;
 		linux,code = <KEY_VOLUMEUP>;
 	};
 
-	key_5 {
+	key-5 {
 		keypad,row = <2>;
 		keypad,column = <1>;
 		linux,code = <KEY_CAMERA>;
 	};
 
-	key_6 {
+	key-6 {
 		keypad,row = <2>;
 		keypad,column = <2>;
 		linux,code = <KEY_VOLUMEDOWN>;
@@ -353,7 +353,7 @@ &i2c2 {
 	samsung,i2c-slave-addr = <0x10>;
 	status = "okay";
 
-	tsp@4a {
+	touchscreen@4a {
 		compatible = "atmel,maxtouch";
 		reg = <0x4a>;
 		interrupt-parent = <&gpj0>;

arch/arm/boot/dts/s5pv210-smdkv210.dts

@@ -41,7 +41,7 @@ pmic_ap_clk: clock-0 {
 
 	ethernet@a8000000 {
 		compatible = "davicom,dm9000";
-		reg = <0xA8000000 0x2 0xA8000002 0x2>;
+		reg = <0xa8000000 0x2>, <0xa8000002 0x2>;
 		interrupt-parent = <&gph1>;
 		interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
 		local-mac-address = [00 00 de ad be ef];
@@ -55,6 +55,14 @@ backlight {
 		default-brightness-level = <6>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pwm3_out>;
+		power-supply = <&dc5v_reg>;
+	};
+
+	dc5v_reg: regulator-0 {
+		compatible = "regulator-fixed";
+		regulator-name = "DC5V";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
 	};
 };
 
@@ -76,61 +84,61 @@ &keypad {
 			<&keypad_col6>, <&keypad_col7>;
 	status = "okay";
 
-	key_1 {
+	key-1 {
 		keypad,row = <0>;
 		keypad,column = <3>;
 		linux,code = <KEY_1>;
 	};
 
-	key_2 {
+	key-2 {
 		keypad,row = <0>;
 		keypad,column = <4>;
 		linux,code = <KEY_2>;
 	};
 
-	key_3 {
+	key-3 {
 		keypad,row = <0>;
 		keypad,column = <5>;
 		linux,code = <KEY_3>;
 	};
 
-	key_4 {
+	key-4 {
 		keypad,row = <0>;
 		keypad,column = <6>;
 		linux,code = <KEY_4>;
 	};
 
-	key_5 {
+	key-5 {
 		keypad,row = <0
 		>;
 		keypad,column = <7>;
 		linux,code = <KEY_5>;
 	};
 
-	key_6 {
+	key-6 {
 		keypad,row = <1>;
 		keypad,column = <3>;
 		linux,code = <KEY_A>;
 	};
-	key_7 {
+	key-7 {
 		keypad,row = <1>;
 		keypad,column = <4>;
 		linux,code = <KEY_B>;
 	};
 
-	key_8 {
+	key-8 {
 		keypad,row = <1>;
 		keypad,column = <5>;
 		linux,code = <KEY_C>;
 	};
 
-	key_9 {
+	key-9 {
 		keypad,row = <1>;
 		keypad,column = <6>;
 		linux,code = <KEY_D>;
 	};
 
-	key_10 {
+	key-10 {
 		keypad,row = <1>;
 		keypad,column = <7>;
 		linux,code = <KEY_E>;

arch/arm/kernel/hw_breakpoint.c

@@ -626,7 +626,7 @@ int hw_breakpoint_arch_parse(struct perf_event *bp,
 	hw->address &= ~alignment_mask;
 	hw->ctrl.len <<= offset;
 
-	if (is_default_overflow_handler(bp)) {
+	if (uses_default_overflow_handler(bp)) {
 		/*
 		 * Mismatch breakpoints are required for single-stepping
 		 * breakpoints.
@@ -798,7 +798,7 @@ static void watchpoint_handler(unsigned long addr, unsigned int fsr,
 		 * Otherwise, insert a temporary mismatch breakpoint so that
 		 * we can single-step over the watchpoint trigger.
 		 */
-		if (!is_default_overflow_handler(wp))
+		if (!uses_default_overflow_handler(wp))
 			continue;
 step:
 		enable_single_step(wp, instruction_pointer(regs));
@@ -811,7 +811,7 @@ static void watchpoint_handler(unsigned long addr, unsigned int fsr,
 		info->trigger = addr;
 		pr_debug("watchpoint fired: address = 0x%x\n", info->trigger);
 		perf_bp_event(wp, regs);
-		if (is_default_overflow_handler(wp))
+		if (uses_default_overflow_handler(wp))
 			enable_single_step(wp, instruction_pointer(regs));
 	}
 
@@ -886,7 +886,7 @@ static void breakpoint_handler(unsigned long unknown, struct pt_regs *regs)
 			info->trigger = addr;
 			pr_debug("breakpoint fired: address = 0x%x\n", addr);
 			perf_bp_event(bp, regs);
-			if (is_default_overflow_handler(bp))
+			if (uses_default_overflow_handler(bp))
 				enable_single_step(bp, addr);
 			goto unlock;
 		}

arch/arm/kernel/module-plts.c

@@ -256,7 +256,7 @@ int module_frob_arch_sections(Elf_Ehdr *ehdr, Elf_Shdr *sechdrs,
 		/* sort by type and symbol index */
 		sort(rels, numrels, sizeof(Elf32_Rel), cmp_rel, NULL);
 
-		if (strncmp(secstrings + dstsec->sh_name, ".init", 5) != 0)
+		if (!module_init_layout_section(secstrings + dstsec->sh_name))
 			core_plts += count_plts(syms, dstsec->sh_addr, rels,
 						numrels, s->sh_info);
 		else

arch/arm/mach-omap2/powerdomain.c

@@ -174,7 +174,7 @@ static int _pwrdm_state_switch(struct powerdomain *pwrdm, int flag)
 		break;
 	case PWRDM_STATE_PREV:
 		prev = pwrdm_read_prev_pwrst(pwrdm);
-		if (pwrdm->state != prev)
+		if (prev >= 0 && pwrdm->state != prev)
 			pwrdm->state_counter[prev]++;
 		if (prev == PWRDM_POWER_RET)
 			_update_logic_membank_counters(pwrdm);

arch/arm/mach-pxa/sharpsl_pm.c

@@ -220,8 +220,6 @@ void sharpsl_battery_kick(void)
 {
 	schedule_delayed_work(&sharpsl_bat, msecs_to_jiffies(125));
 }
-EXPORT_SYMBOL(sharpsl_battery_kick);
-
 
 static void sharpsl_battery_thread(struct work_struct *private_)
 {

arch/arm/mach-pxa/spitz.c

@@ -9,7 +9,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>	/* symbol_get ; symbol_put */
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/gpio_keys.h>
@@ -514,17 +513,6 @@ static struct pxa2xx_spi_chip spitz_ads7846_chip = {
 	.gpio_cs		= SPITZ_GPIO_ADS7846_CS,
 };
 
-static void spitz_bl_kick_battery(void)
-{
-	void (*kick_batt)(void);
-
-	kick_batt = symbol_get(sharpsl_battery_kick);
-	if (kick_batt) {
-		kick_batt();
-		symbol_put(sharpsl_battery_kick);
-	}
-}
-
 static struct gpiod_lookup_table spitz_lcdcon_gpio_table = {
 	.dev_id = "spi2.1",
 	.table = {
@@ -552,7 +540,7 @@ static struct corgi_lcd_platform_data spitz_lcdcon_info = {
 	.max_intensity		= 0x2f,
 	.default_intensity	= 0x1f,
 	.limit_mask		= 0x0b,
-	.kick_battery		= spitz_bl_kick_battery,
+	.kick_battery		= sharpsl_battery_kick,
 };
 
 static struct pxa2xx_spi_chip spitz_lcdcon_chip = {

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk.dts

@@ -129,7 +129,7 @@ &i2c1 {
 	status = "okay";
 	clock-frequency = <100000>;
 	i2c-sda-falling-time-ns = <890>;  /* hcnt */
-	i2c-sdl-falling-time-ns = <890>;  /* lcnt */
+	i2c-scl-falling-time-ns = <890>;  /* lcnt */
 
 	adc@14 {
 		compatible = "lltc,ltc2497";

arch/arm64/boot/dts/altera/socfpga_stratix10_socdk_nand.dts

@@ -162,7 +162,7 @@ &i2c2 {
 	status = "okay";
 	clock-frequency = <100000>;
 	i2c-sda-falling-time-ns = <890>;  /* hcnt */
-	i2c-sdl-falling-time-ns = <890>;  /* lcnt */
+	i2c-scl-falling-time-ns = <890>;  /* lcnt */
 
 	adc@14 {
 		compatible = "lltc,ltc2497";

arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi

@@ -351,7 +351,7 @@ MX8MN_IOMUXC_ENET_TXC_ENET1_RGMII_TXC		0x1f
 			MX8MN_IOMUXC_ENET_RXC_ENET1_RGMII_RXC		0x91
 			MX8MN_IOMUXC_ENET_RX_CTL_ENET1_RGMII_RX_CTL	0x91
 			MX8MN_IOMUXC_ENET_TX_CTL_ENET1_RGMII_TX_CTL	0x1f
-			MX8MN_IOMUXC_GPIO1_IO09_GPIO1_IO9		0x19
+			MX8MN_IOMUXC_GPIO1_IO09_GPIO1_IO9		0x159
 		>;
 	};
 

arch/arm64/boot/dts/qcom/msm8996.dtsi

@@ -1966,6 +1966,9 @@ usb2: usb@76f8800 {
 			#size-cells = <1>;
 			ranges;
 
+			interrupts = <GIC_SPI 352 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "hs_phy_irq";
+
 			clocks = <&gcc GCC_PERIPH_NOC_USB20_AHB_CLK>,
 				<&gcc GCC_USB20_MASTER_CLK>,
 				<&gcc GCC_USB20_MOCK_UTMI_CLK>,

arch/arm64/boot/dts/qcom/sdm845.dtsi

@@ -1064,6 +1064,7 @@ gcc: clock-controller@100000 {
 			#clock-cells = <1>;
 			#reset-cells = <1>;
 			#power-domain-cells = <1>;
+			power-domains = <&rpmhpd SDM845_CX>;
 		};
 
 		qfprom@784000 {
@@ -2108,7 +2109,7 @@ ufs_mem_hc: ufshc@1d84000 {
 				<0 0>,
 				<0 0>,
 				<0 0>,
-				<0 300000000>;
+				<75000000 300000000>;
 
 			status = "disabled";
 		};

arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi

@@ -31,6 +31,40 @@ sdio_pwrseq: sdio-pwrseq {
 		reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
 	};
 
+	sound {
+		compatible = "audio-graph-card";
+		label = "Analog";
+		dais = <&i2s0_p0>;
+	};
+
+	sound-dit {
+		compatible = "audio-graph-card";
+		label = "SPDIF";
+		dais = <&spdif_p0>;
+	};
+
+	spdif-dit {
+		compatible = "linux,spdif-dit";
+		#sound-dai-cells = <0>;
+
+		port {
+			dit_p0_0: endpoint {
+				remote-endpoint = <&spdif_p0_0>;
+			};
+		};
+	};
+
+	vbus_typec: vbus-typec-regulator {
+		compatible = "regulator-fixed";
+		enable-active-high;
+		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&vcc5v0_typec_en>;
+		regulator-name = "vbus_typec";
+		regulator-always-on;
+		vin-supply = <&vcc5v0_sys>;
+	};
+
 	vcc12v_dcin: dc-12v {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc12v_dcin";
@@ -40,23 +74,13 @@ vcc12v_dcin: dc-12v {
 		regulator-max-microvolt = <12000000>;
 	};
 
-	vcc5v0_sys: vcc-sys {
+	vcc3v3_lan: vcc3v3-lan-regulator {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc5v0_sys";
+		regulator-name = "vcc3v3_lan";
 		regulator-always-on;
 		regulator-boot-on;
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		vin-supply = <&vcc12v_dcin>;
-	};
-
-	vcc_0v9: vcc-0v9 {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_0v9";
-		regulator-always-on;
-		regulator-boot-on;
-		regulator-min-microvolt = <900000>;
-		regulator-max-microvolt = <900000>;
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
 		vin-supply = <&vcc3v3_sys>;
 	};
 
@@ -93,28 +117,24 @@ vcc5v0_host: vcc5v0-host-regulator {
 		vin-supply = <&vcc5v0_sys>;
 	};
 
-	vcc5v0_typec: vcc5v0-typec-regulator {
+	vcc5v0_sys: vcc-sys {
 		compatible = "regulator-fixed";
-		enable-active-high;
-		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&vcc5v0_typec_en>;
-		regulator-name = "vcc5v0_typec";
-		regulator-always-on;
-		vin-supply = <&vcc5v0_sys>;
-	};
-
-	vcc_lan: vcc3v3-phy-regulator {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc_lan";
+		regulator-name = "vcc5v0_sys";
 		regulator-always-on;
 		regulator-boot-on;
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		vin-supply = <&vcc12v_dcin>;
+	};
 
-		regulator-state-mem {
-			regulator-off-in-suspend;
-		};
+	vcc_0v9: vcc-0v9 {
+		compatible = "regulator-fixed";
+		regulator-name = "vcc_0v9";
+		regulator-always-on;
+		regulator-boot-on;
+		regulator-min-microvolt = <900000>;
+		regulator-max-microvolt = <900000>;
+		vin-supply = <&vcc3v3_sys>;
 	};
 
 	vdd_log: vdd-log {
@@ -161,7 +181,7 @@ &gmac {
 	assigned-clocks = <&cru SCLK_RMII_SRC>;
 	assigned-clock-parents = <&clkin_gmac>;
 	clock_in_out = "input";
-	phy-supply = <&vcc_lan>;
+	phy-supply = <&vcc3v3_lan>;
 	phy-mode = "rgmii";
 	pinctrl-names = "default";
 	pinctrl-0 = <&rgmii_pins>;
@@ -266,8 +286,8 @@ regulator-state-mem {
 				};
 			};
 
-			vcc1v8_codec: LDO_REG1 {
-				regulator-name = "vcc1v8_codec";
+			vcca1v8_codec: LDO_REG1 {
+				regulator-name = "vcca1v8_codec";
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1800000>;
@@ -277,8 +297,8 @@ regulator-state-mem {
 				};
 			};
 
-			vcc1v8_hdmi: LDO_REG2 {
-				regulator-name = "vcc1v8_hdmi";
+			vcca1v8_hdmi: LDO_REG2 {
+				regulator-name = "vcca1v8_hdmi";
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <1800000>;
@@ -335,8 +355,8 @@ regulator-state-mem {
 				};
 			};
 
-			vcc0v9_hdmi: LDO_REG7 {
-				regulator-name = "vcc0v9_hdmi";
+			vcca0v9_hdmi: LDO_REG7 {
+				regulator-name = "vcca0v9_hdmi";
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-min-microvolt = <900000>;
@@ -362,8 +382,6 @@ vcc_cam: SWITCH_REG1 {
 				regulator-name = "vcc_cam";
 				regulator-always-on;
 				regulator-boot-on;
-				regulator-min-microvolt = <3300000>;
-				regulator-max-microvolt = <3300000>;
 				regulator-state-mem {
 					regulator-off-in-suspend;
 				};
@@ -373,8 +391,6 @@ vcc_mipi: SWITCH_REG2 {
 				regulator-name = "vcc_mipi";
 				regulator-always-on;
 				regulator-boot-on;
-				regulator-min-microvolt = <3300000>;
-				regulator-max-microvolt = <3300000>;
 				regulator-state-mem {
 					regulator-off-in-suspend;
 				};
@@ -425,6 +441,20 @@ &i2c1 {
 	i2c-scl-rising-time-ns = <300>;
 	i2c-scl-falling-time-ns = <15>;
 	status = "okay";
+
+	es8316: codec@11 {
+		compatible = "everest,es8316";
+		reg = <0x11>;
+		clocks = <&cru SCLK_I2S_8CH_OUT>;
+		clock-names = "mclk";
+		#sound-dai-cells = <0>;
+
+		port {
+			es8316_p0_0: endpoint {
+				remote-endpoint = <&i2s0_p0_0>;
+			};
+		};
+	};
 };
 
 &i2c3 {
@@ -443,6 +473,14 @@ &i2s0 {
 	rockchip,playback-channels = <8>;
 	rockchip,capture-channels = <8>;
 	status = "okay";
+
+	i2s0_p0: port {
+		i2s0_p0_0: endpoint {
+			dai-format = "i2s";
+			mclk-fs = <256>;
+			remote-endpoint = <&es8316_p0_0>;
+		};
+	};
 };
 
 &i2s1 {
@@ -455,21 +493,10 @@ &i2s2 {
 };
 
 &io_domains {
-	status = "okay";
-
+	audio-supply = <&vcca1v8_codec>;
 	bt656-supply = <&vcc_3v0>;
-	audio-supply = <&vcc1v8_codec>;
-	sdmmc-supply = <&vcc_sdio>;
 	gpio1830-supply = <&vcc_3v0>;
-};
-
-&pmu_io_domains {
-	status = "okay";
-
-	pmu1830-supply = <&vcc_3v0>;
-};
-
-&pcie_phy {
+	sdmmc-supply = <&vcc_sdio>;
 	status = "okay";
 };
 
@@ -485,6 +512,10 @@ &pcie0 {
 	status = "okay";
 };
 
+&pcie_phy {
+	status = "okay";
+};
+
 &pinctrl {
 	bt {
 		bt_enable_h: bt-enable-h {
@@ -506,6 +537,20 @@ pcie_pwr_en: pcie-pwr-en {
 		};
 	};
 
+	pmic {
+		pmic_int_l: pmic-int-l {
+			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
+		};
+
+		vsel1_pin: vsel1-pin {
+			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+
+		vsel2_pin: vsel2-pin {
+			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
+		};
+	};
+
 	sdio0 {
 		sdio0_bus4: sdio0-bus4 {
 			rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
@@ -523,20 +568,6 @@ sdio0_clk: sdio0-clk {
 		};
 	};
 
-	pmic {
-		pmic_int_l: pmic-int-l {
-			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
-		};
-
-		vsel1_pin: vsel1-pin {
-			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
-		};
-
-		vsel2_pin: vsel2-pin {
-			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
-		};
-	};
-
 	usb-typec {
 		vcc5v0_typec_en: vcc5v0-typec-en {
 			rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -560,6 +591,11 @@ wifi_host_wake_l: wifi-host-wake-l {
 	};
 };
 
+&pmu_io_domains {
+	pmu1830-supply = <&vcc_3v0>;
+	status = "okay";
+};
+
 &pwm2 {
 	status = "okay";
 };
@@ -570,6 +606,14 @@ &saradc {
 	vref-supply = <&vcc_1v8>;
 };
 
+&sdhci {
+	max-frequency = <150000000>;
+	bus-width = <8>;
+	mmc-hs200-1_8v;
+	non-removable;
+	status = "okay";
+};
+
 &sdio0 {
 	#address-cells = <1>;
 	#size-cells = <0>;
@@ -597,12 +641,13 @@ &sdmmc {
 	status = "okay";
 };
 
-&sdhci {
-	bus-width = <8>;
-	mmc-hs400-1_8v;
-	mmc-hs400-enhanced-strobe;
-	non-removable;
-	status = "okay";
+&spdif {
+
+	spdif_p0: port {
+		spdif_p0_0: endpoint {
+			remote-endpoint = <&dit_p0_0>;
+		};
+	};
 };
 
 &tcphy0 {
@@ -677,15 +722,15 @@ &usbdrd3_0 {
 	status = "okay";
 };
 
-&usbdrd_dwc3_0 {
-	status = "okay";
-	dr_mode = "otg";
-};
-
 &usbdrd3_1 {
 	status = "okay";
 };
 
+&usbdrd_dwc3_0 {
+	status = "okay";
+	dr_mode = "host";
+};
+
 &usbdrd_dwc3_1 {
 	status = "okay";
 	dr_mode = "host";

arch/arm64/include/asm/cputype.h

@@ -79,6 +79,7 @@
 #define ARM_CPU_PART_CORTEX_A78AE	0xD42
 #define ARM_CPU_PART_CORTEX_X1		0xD44
 #define ARM_CPU_PART_CORTEX_A510	0xD46
+#define ARM_CPU_PART_CORTEX_A520	0xD80
 #define ARM_CPU_PART_CORTEX_A710	0xD47
 #define ARM_CPU_PART_CORTEX_X2		0xD48
 #define ARM_CPU_PART_NEOVERSE_N2	0xD49
@@ -130,6 +131,7 @@
 #define MIDR_CORTEX_A78AE	MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A78AE)
 #define MIDR_CORTEX_X1	MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X1)
 #define MIDR_CORTEX_A510 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A510)
+#define MIDR_CORTEX_A520 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A520)
 #define MIDR_CORTEX_A710 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A710)
 #define MIDR_CORTEX_X2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X2)
 #define MIDR_NEOVERSE_N2 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N2)

arch/arm64/include/asm/sdei.h

@@ -17,6 +17,9 @@
 
 #include <asm/virt.h>
 
+DECLARE_PER_CPU(struct sdei_registered_event *, sdei_active_normal_event);
+DECLARE_PER_CPU(struct sdei_registered_event *, sdei_active_critical_event);
+
 extern unsigned long sdei_exit_mode;
 
 /* Software Delegated Exception entry point from firmware*/
@@ -29,6 +32,9 @@ asmlinkage void __sdei_asm_entry_trampoline(unsigned long event_num,
 						   unsigned long pc,
 						   unsigned long pstate);
 
+/* Abort a running handler. Context is discarded. */
+void __sdei_handler_abort(void);
+
 /*
  * The above entry point does the minimum to call C code. This function does
  * anything else, before calling the driver.

arch/arm64/kernel/entry.S

@@ -1238,9 +1238,13 @@ SYM_CODE_START(__sdei_asm_handler)
 
 	mov	x19, x1
 
-#if defined(CONFIG_VMAP_STACK) || defined(CONFIG_SHADOW_CALL_STACK)
+	/* Store the registered-event for crash_smp_send_stop() */
 	ldrb	w4, [x19, #SDEI_EVENT_PRIORITY]
-#endif
+	cbnz	w4, 1f
+	adr_this_cpu dst=x5, sym=sdei_active_normal_event, tmp=x6
+	b	2f
+1:	adr_this_cpu dst=x5, sym=sdei_active_critical_event, tmp=x6
+2:	str	x19, [x5]
 
 #ifdef CONFIG_VMAP_STACK
 	/*
@@ -1305,6 +1309,14 @@ SYM_CODE_START(__sdei_asm_handler)
 
 	ldr_l	x2, sdei_exit_mode
 
+	/* Clear the registered-event seen by crash_smp_send_stop() */
+	ldrb	w3, [x4, #SDEI_EVENT_PRIORITY]
+	cbnz	w3, 1f
+	adr_this_cpu dst=x5, sym=sdei_active_normal_event, tmp=x6
+	b	2f
+1:	adr_this_cpu dst=x5, sym=sdei_active_critical_event, tmp=x6
+2:	str	xzr, [x5]
+
 alternative_if_not ARM64_UNMAP_KERNEL_AT_EL0
 	sdei_handler_exit exit_mode=x2
 alternative_else_nop_endif
@@ -1315,4 +1327,15 @@ alternative_else_nop_endif
 #endif
 SYM_CODE_END(__sdei_asm_handler)
 NOKPROBE(__sdei_asm_handler)
+
+SYM_CODE_START(__sdei_handler_abort)
+	mov_q	x0, SDEI_1_0_FN_SDEI_EVENT_COMPLETE_AND_RESUME
+	adr	x1, 1f
+	ldr_l	x2, sdei_exit_mode
+	sdei_handler_exit exit_mode=x2
+	// exit the handler and jump to the next instruction.
+	// Exit will stomp x0-x17, PSTATE, ELR_ELx, and SPSR_ELx.
+1:	ret
+SYM_CODE_END(__sdei_handler_abort)
+NOKPROBE(__sdei_handler_abort)
 #endif /* CONFIG_ARM_SDE_INTERFACE */

arch/arm64/kernel/hw_breakpoint.c

@@ -654,7 +654,7 @@ static int breakpoint_handler(unsigned long unused, unsigned int esr,
 		perf_bp_event(bp, regs);
 
 		/* Do we need to handle the stepping? */
-		if (is_default_overflow_handler(bp))
+		if (uses_default_overflow_handler(bp))
 			step = 1;
 unlock:
 		rcu_read_unlock();
@@ -733,7 +733,7 @@ static u64 get_distance_from_watchpoint(unsigned long addr, u64 val,
 static int watchpoint_report(struct perf_event *wp, unsigned long addr,
 			     struct pt_regs *regs)
 {
-	int step = is_default_overflow_handler(wp);
+	int step = uses_default_overflow_handler(wp);
 	struct arch_hw_breakpoint *info = counter_arch_bp(wp);
 
 	info->trigger = addr;

arch/arm64/kernel/module-plts.c

@@ -7,6 +7,7 @@
 #include <linux/ftrace.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/moduleloader.h>
 #include <linux/slab.h>
 #include <linux/sort.h>
 
@@ -376,7 +377,7 @@ int module_frob_arch_sections(Elf_Ehdr *ehdr, Elf_Shdr *sechdrs,
 		if (nents)
 			sort(rels, nents, sizeof(Elf64_Rela), cmp_rela, NULL);
 
-		if (!str_has_prefix(secstrings + dstsec->sh_name, ".init"))
+		if (!module_init_layout_section(secstrings + dstsec->sh_name))
 			core_plts += count_plts(syms, rels, numrels,
 						sechdrs[i].sh_info, dstsec);
 		else

arch/arm64/kernel/sdei.c

@@ -39,6 +39,9 @@ DEFINE_PER_CPU(unsigned long *, sdei_stack_normal_ptr);
 DEFINE_PER_CPU(unsigned long *, sdei_stack_critical_ptr);
 #endif
 
+DEFINE_PER_CPU(struct sdei_registered_event *, sdei_active_normal_event);
+DEFINE_PER_CPU(struct sdei_registered_event *, sdei_active_critical_event);
+
 DECLARE_PER_CPU(unsigned long *, sdei_shadow_call_stack_normal_ptr);
 DECLARE_PER_CPU(unsigned long *, sdei_shadow_call_stack_critical_ptr);
 

arch/arm64/kernel/smp.c

@@ -1086,10 +1086,8 @@ void crash_smp_send_stop(void)
 	 * If this cpu is the only one alive at this point in time, online or
 	 * not, there are no stop messages to be sent around, so just back out.
 	 */
-	if (num_other_online_cpus() == 0) {
-		sdei_mask_local_cpu();
-		return;
-	}
+	if (num_other_online_cpus() == 0)
+		goto skip_ipi;
 
 	cpumask_copy(&mask, cpu_online_mask);
 	cpumask_clear_cpu(smp_processor_id(), &mask);
@@ -1108,7 +1106,9 @@ void crash_smp_send_stop(void)
 		pr_warn("SMP: failed to stop secondary CPUs %*pbl\n",
 			cpumask_pr_args(&mask));
 
+skip_ipi:
 	sdei_mask_local_cpu();
+	sdei_handler_abort();
 }
 
 bool smp_crash_stop_failed(void)

arch/arm64/lib/csum.c

@@ -24,7 +24,7 @@ unsigned int __no_sanitize_address do_csum(const unsigned char *buff, int len)
 	const u64 *ptr;
 	u64 data, sum64 = 0;
 
-	if (unlikely(len == 0))
+	if (unlikely(len <= 0))
 		return 0;
 
 	offset = (unsigned long)buff & 7;

arch/m68k/fpsp040/skeleton.S

@@ -499,12 +499,12 @@ in_ea:
 	dbf	%d0,morein
 	rts
 
-	.section .fixup,#alloc,#execinstr
+	.section .fixup,"ax"
 	.even
 1:
 	jbra	fpsp040_die
 
-	.section __ex_table,#alloc
+	.section __ex_table,"a"
 	.align	4
 
 	.long	in_ea,1b

arch/m68k/ifpsp060/os.S

@@ -379,11 +379,11 @@ _060_real_access:
 
 
 | Execption handling for movs access to illegal memory
-	.section .fixup,#alloc,#execinstr
+	.section .fixup,"ax"
 	.even
 1:	moveq		#-1,%d1
 	rts
-.section __ex_table,#alloc
+.section __ex_table,"a"
 	.align 4
 	.long	dmrbuae,1b
 	.long	dmrwuae,1b

arch/m68k/kernel/relocate_kernel.S

@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel)
 	lea %pc@(.Lcopy),%a4
 2:	addl #0x00000000,%a4		/* virt_to_phys() */
 
-	.section ".m68k_fixup","aw"
+	.section .m68k_fixup,"aw"
 	.long M68K_FIXUP_MEMOFFSET, 2b+2
 	.previous
 
@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel)
 	lea %pc@(.Lcont040),%a4
 5:	addl #0x00000000,%a4		/* virt_to_phys() */
 
-	.section ".m68k_fixup","aw"
+	.section .m68k_fixup,"aw"
 	.long M68K_FIXUP_MEMOFFSET, 5b+2
 	.previous
 

arch/mips/alchemy/common/dbdma.c

@@ -30,7 +30,6 @@
  *
  */
 
-#include <linux/dma-map-ops.h> /* for dma_default_coherent */
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/slab.h>
@@ -624,18 +623,17 @@ u32 au1xxx_dbdma_put_source(u32 chanid, dma_addr_t buf, int nbytes, u32 flags)
 		dp->dscr_cmd0 &= ~DSCR_CMD0_IE;
 
 	/*
-	 * There is an erratum on certain Au1200/Au1550 revisions that could
-	 * result in "stale" data being DMA'ed. It has to do with the snoop
-	 * logic on the cache eviction buffer.  dma_default_coherent is set
-	 * to false on these parts.
+	 * There is an errata on the Au1200/Au1550 parts that could result
+	 * in "stale" data being DMA'ed. It has to do with the snoop logic on
+	 * the cache eviction buffer.  DMA_NONCOHERENT is on by default for
+	 * these parts. If it is fixed in the future, these dma_cache_inv will
+	 * just be nothing more than empty macros. See io.h.
 	 */
-	if (!dma_default_coherent)
-		dma_cache_wback_inv(KSEG0ADDR(buf), nbytes);
+	dma_cache_wback_inv((unsigned long)buf, nbytes);
 	dp->dscr_cmd0 |= DSCR_CMD0_V;	/* Let it rip */
 	wmb(); /* drain writebuffer */
 	dma_cache_wback_inv((unsigned long)dp, sizeof(*dp));
 	ctp->chan_ptr->ddma_dbell = 0;
-	wmb(); /* force doorbell write out to dma engine */
 
 	/* Get next descriptor pointer. */
 	ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));
@@ -687,18 +685,17 @@ u32 au1xxx_dbdma_put_dest(u32 chanid, dma_addr_t buf, int nbytes, u32 flags)
 			  dp->dscr_source1, dp->dscr_dest0, dp->dscr_dest1);
 #endif
 	/*
-	 * There is an erratum on certain Au1200/Au1550 revisions that could
-	 * result in "stale" data being DMA'ed. It has to do with the snoop
-	 * logic on the cache eviction buffer.  dma_default_coherent is set
-	 * to false on these parts.
+	 * There is an errata on the Au1200/Au1550 parts that could result in
+	 * "stale" data being DMA'ed. It has to do with the snoop logic on the
+	 * cache eviction buffer.  DMA_NONCOHERENT is on by default for these
+	 * parts. If it is fixed in the future, these dma_cache_inv will just
+	 * be nothing more than empty macros. See io.h.
 	 */
-	if (!dma_default_coherent)
-		dma_cache_inv(KSEG0ADDR(buf), nbytes);
+	dma_cache_inv((unsigned long)buf, nbytes);
 	dp->dscr_cmd0 |= DSCR_CMD0_V;	/* Let it rip */
 	wmb(); /* drain writebuffer */
 	dma_cache_wback_inv((unsigned long)dp, sizeof(*dp));
 	ctp->chan_ptr->ddma_dbell = 0;
-	wmb(); /* force doorbell write out to dma engine */
 
 	/* Get next descriptor pointer. */
 	ctp->put_ptr = phys_to_virt(DSCR_GET_NXTPTR(dp->dscr_nxtptr));

arch/mips/alchemy/devboards/db1000.c

@@ -14,7 +14,6 @@
 #include <linux/interrupt.h>
 #include <linux/leds.h>
 #include <linux/mmc/host.h>
-#include <linux/module.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 #include <linux/spi/spi.h>
@@ -165,14 +164,10 @@ static struct platform_device db1x00_audio_dev = {
 
 /******************************************************************************/
 
+#ifdef CONFIG_MMC_AU1X
 static irqreturn_t db1100_mmc_cd(int irq, void *ptr)
 {
-	void (*mmc_cd)(struct mmc_host *, unsigned long);
-	/* link against CONFIG_MMC=m */
-	mmc_cd = symbol_get(mmc_detect_change);
-	mmc_cd(ptr, msecs_to_jiffies(500));
-	symbol_put(mmc_detect_change);
-
+	mmc_detect_change(ptr, msecs_to_jiffies(500));
 	return IRQ_HANDLED;
 }
 
@@ -375,6 +370,7 @@ static struct platform_device db1100_mmc1_dev = {
 	.num_resources	= ARRAY_SIZE(au1100_mmc1_res),
 	.resource	= au1100_mmc1_res,
 };
+#endif /* CONFIG_MMC_AU1X */
 
 /******************************************************************************/
 
@@ -438,8 +434,10 @@ static struct platform_device *db1x00_devs[] = {
 
 static struct platform_device *db1100_devs[] = {
 	&au1100_lcd_device,
+#ifdef CONFIG_MMC_AU1X
 	&db1100_mmc0_dev,
 	&db1100_mmc1_dev,
+#endif
 };
 
 int __init db1000_dev_setup(void)

arch/mips/alchemy/devboards/db1200.c

@@ -10,7 +10,6 @@
 #include <linux/gpio.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
-#include <linux/module.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/leds.h>
@@ -327,6 +326,7 @@ static struct platform_device db1200_ide_dev = {
 
 /**********************************************************************/
 
+#ifdef CONFIG_MMC_AU1X
 /* SD carddetects:  they're supposed to be edge-triggered, but ack
  * doesn't seem to work (CPLD Rev 2).  Instead, the screaming one
  * is disabled and its counterpart enabled.  The 200ms timeout is
@@ -340,14 +340,7 @@ static irqreturn_t db1200_mmc_cd(int irq, void *ptr)
 
 static irqreturn_t db1200_mmc_cdfn(int irq, void *ptr)
 {
-	void (*mmc_cd)(struct mmc_host *, unsigned long);
-
-	/* link against CONFIG_MMC=m */
-	mmc_cd = symbol_get(mmc_detect_change);
-	if (mmc_cd) {
-		mmc_cd(ptr, msecs_to_jiffies(200));
-		symbol_put(mmc_detect_change);
-	}
+	mmc_detect_change(ptr, msecs_to_jiffies(200));
 
 	msleep(100);	/* debounce */
 	if (irq == DB1200_SD0_INSERT_INT)
@@ -431,14 +424,7 @@ static irqreturn_t pb1200_mmc1_cd(int irq, void *ptr)
 
 static irqreturn_t pb1200_mmc1_cdfn(int irq, void *ptr)
 {
-	void (*mmc_cd)(struct mmc_host *, unsigned long);
-
-	/* link against CONFIG_MMC=m */
-	mmc_cd = symbol_get(mmc_detect_change);
-	if (mmc_cd) {
-		mmc_cd(ptr, msecs_to_jiffies(200));
-		symbol_put(mmc_detect_change);
-	}
+	mmc_detect_change(ptr, msecs_to_jiffies(200));
 
 	msleep(100);	/* debounce */
 	if (irq == PB1200_SD1_INSERT_INT)
@@ -599,6 +585,7 @@ static struct platform_device pb1200_mmc1_dev = {
 	.num_resources	= ARRAY_SIZE(au1200_mmc1_res),
 	.resource	= au1200_mmc1_res,
 };
+#endif /* CONFIG_MMC_AU1X */
 
 /**********************************************************************/
 
@@ -766,7 +753,9 @@ static struct platform_device db1200_audiodma_dev = {
 static struct platform_device *db1200_devs[] __initdata = {
 	NULL,		/* PSC0, selected by S6.8 */
 	&db1200_ide_dev,
+#ifdef CONFIG_MMC_AU1X
 	&db1200_mmc0_dev,
+#endif
 	&au1200_lcd_dev,
 	&db1200_eth_dev,
 	&db1200_nand_dev,
@@ -777,7 +766,9 @@ static struct platform_device *db1200_devs[] __initdata = {
 };
 
 static struct platform_device *pb1200_devs[] __initdata = {
+#ifdef CONFIG_MMC_AU1X
 	&pb1200_mmc1_dev,
+#endif
 };
 
 /* Some peripheral base addresses differ on the PB1200 */

arch/mips/alchemy/devboards/db1300.c

@@ -17,7 +17,6 @@
 #include <linux/interrupt.h>
 #include <linux/ata_platform.h>
 #include <linux/mmc/host.h>
-#include <linux/module.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/platnand.h>
 #include <linux/platform_device.h>
@@ -451,6 +450,7 @@ static struct platform_device db1300_ide_dev = {
 
 /**********************************************************************/
 
+#ifdef CONFIG_MMC_AU1X
 static irqreturn_t db1300_mmc_cd(int irq, void *ptr)
 {
 	disable_irq_nosync(irq);
@@ -459,14 +459,7 @@ static irqreturn_t db1300_mmc_cd(int irq, void *ptr)
 
 static irqreturn_t db1300_mmc_cdfn(int irq, void *ptr)
 {
-	void (*mmc_cd)(struct mmc_host *, unsigned long);
-
-	/* link against CONFIG_MMC=m.  We can only be called once MMC core has
-	 * initialized the controller, so symbol_get() should always succeed.
-	 */
-	mmc_cd = symbol_get(mmc_detect_change);
-	mmc_cd(ptr, msecs_to_jiffies(200));
-	symbol_put(mmc_detect_change);
+	mmc_detect_change(ptr, msecs_to_jiffies(200));
 
 	msleep(100);	/* debounce */
 	if (irq == DB1300_SD1_INSERT_INT)
@@ -640,6 +633,7 @@ static struct platform_device db1300_sd0_dev = {
 	.resource	= au1300_sd0_res,
 	.num_resources	= ARRAY_SIZE(au1300_sd0_res),
 };
+#endif /* CONFIG_MMC_AU1X */
 
 /**********************************************************************/
 
@@ -784,8 +778,10 @@ static struct platform_device *db1300_dev[] __initdata = {
 	&db1300_5waysw_dev,
 	&db1300_nand_dev,
 	&db1300_ide_dev,
+#ifdef CONFIG_MMC_AU1X
 	&db1300_sd0_dev,
 	&db1300_sd1_dev,
+#endif
 	&db1300_lcd_dev,
 	&db1300_ac97_dev,
 	&db1300_i2s_dev,

arch/mips/include/asm/cpu-features.h

@@ -126,7 +126,24 @@
 #define cpu_has_tx39_cache	__opt(MIPS_CPU_TX39_CACHE)
 #endif
 #ifndef cpu_has_octeon_cache
-#define cpu_has_octeon_cache	0
+#define cpu_has_octeon_cache						\
+({									\
+	int __res;							\
+									\
+	switch (boot_cpu_type()) {					\
+	case CPU_CAVIUM_OCTEON:						\
+	case CPU_CAVIUM_OCTEON_PLUS:					\
+	case CPU_CAVIUM_OCTEON2:					\
+	case CPU_CAVIUM_OCTEON3:					\
+		__res = 1;						\
+		break;							\
+									\
+	default:							\
+		__res = 0;						\
+	}								\
+									\
+	__res;								\
+})
 #endif
 /* Don't override `cpu_has_fpu' to 1 or the "nofpu" option won't work.  */
 #ifndef cpu_has_fpu
@@ -353,7 +370,7 @@
 ({									\
 	int __res;							\
 									\
-	switch (current_cpu_type()) {					\
+	switch (boot_cpu_type()) {					\
 	case CPU_M14KC:							\
 	case CPU_74K:							\
 	case CPU_1074K:							\

arch/mips/include/asm/dec/prom.h

@@ -70,7 +70,7 @@ static inline bool prom_is_rex(u32 magic)
  */
 typedef struct {
 	int pagesize;
-	unsigned char bitmap[0];
+	unsigned char bitmap[];
 } memmap;
 
 

arch/parisc/include/asm/ldcw.h

@@ -2,14 +2,28 @@
 #ifndef __PARISC_LDCW_H
 #define __PARISC_LDCW_H
 
-#ifndef CONFIG_PA20
 /* Because kmalloc only guarantees 8-byte alignment for kmalloc'd data,
    and GCC only guarantees 8-byte alignment for stack locals, we can't
    be assured of 16-byte alignment for atomic lock data even if we
    specify "__attribute ((aligned(16)))" in the type declaration.  So,
    we use a struct containing an array of four ints for the atomic lock
    type and dynamically select the 16-byte aligned int from the array
-   for the semaphore.  */
+   for the semaphore. */
+
+/* From: "Jim Hull" <jim.hull of hp.com>
+   I've attached a summary of the change, but basically, for PA 2.0, as
+   long as the ",CO" (coherent operation) completer is implemented, then the
+   16-byte alignment requirement for ldcw and ldcd is relaxed, and instead
+   they only require "natural" alignment (4-byte for ldcw, 8-byte for
+   ldcd).
+
+   Although the cache control hint is accepted by all PA 2.0 processors,
+   it is only implemented on PA8800/PA8900 CPUs. Prior PA8X00 CPUs still
+   require 16-byte alignment. If the address is unaligned, the operation
+   of the instruction is undefined. The ldcw instruction does not generate
+   unaligned data reference traps so misaligned accesses are not detected.
+   This hid the problem for years. So, restore the 16-byte alignment dropped
+   by Kyle McMartin in "Remove __ldcw_align for PA-RISC 2.0 processors". */
 
 #define __PA_LDCW_ALIGNMENT	16
 #define __PA_LDCW_ALIGN_ORDER	4
@@ -19,22 +33,12 @@
 		& ~(__PA_LDCW_ALIGNMENT - 1);			\
 	(volatile unsigned int *) __ret;			\
 })
-#define __LDCW	"ldcw"
 
-#else /*CONFIG_PA20*/
-/* From: "Jim Hull" <jim.hull of hp.com>
-   I've attached a summary of the change, but basically, for PA 2.0, as
-   long as the ",CO" (coherent operation) completer is specified, then the
-   16-byte alignment requirement for ldcw and ldcd is relaxed, and instead
-   they only require "natural" alignment (4-byte for ldcw, 8-byte for
-   ldcd). */
-
-#define __PA_LDCW_ALIGNMENT	4
-#define __PA_LDCW_ALIGN_ORDER	2
-#define __ldcw_align(a) (&(a)->slock)
+#ifdef CONFIG_PA20
 #define __LDCW	"ldcw,co"
-
-#endif /*!CONFIG_PA20*/
+#else
+#define __LDCW	"ldcw"
+#endif
 
 /* LDCW, the only atomic read-write operation PA-RISC has. *sigh*.
    We don't explicitly expose that "*a" may be written as reload

arch/parisc/include/asm/led.h

@@ -11,8 +11,8 @@
 #define	LED1		0x02
 #define	LED0		0x01		/* bottom (or furthest left) LED */
 
-#define	LED_LAN_TX	LED0		/* for LAN transmit activity */
-#define	LED_LAN_RCV	LED1		/* for LAN receive activity */
+#define	LED_LAN_RCV	LED0		/* for LAN receive activity */
+#define	LED_LAN_TX	LED1		/* for LAN transmit activity */
 #define	LED_DISK_IO	LED2		/* for disk activity */
 #define	LED_HEARTBEAT	LED3		/* heartbeat */
 

arch/parisc/include/asm/processor.h

@@ -97,7 +97,6 @@ struct cpuinfo_parisc {
 	unsigned long cpu_loc;      /* CPU location from PAT firmware */
 	unsigned int state;
 	struct parisc_device *dev;
-	unsigned long loops_per_jiffy;
 };
 
 extern struct system_cpuinfo_parisc boot_cpu_data;

arch/parisc/include/asm/ropes.h

@@ -86,6 +86,9 @@ struct sba_device {
 	struct ioc		ioc[MAX_IOC];
 };
 
+/* list of SBA's in system, see drivers/parisc/sba_iommu.c */
+extern struct sba_device *sba_list;
+
 #define ASTRO_RUNWAY_PORT	0x582
 #define IKE_MERCED_PORT		0x803
 #define REO_MERCED_PORT		0x804

arch/parisc/include/asm/spinlock_types.h

@@ -3,13 +3,8 @@
 #define __ASM_SPINLOCK_TYPES_H
 
 typedef struct {
-#ifdef CONFIG_PA20
-	volatile unsigned int slock;
-# define __ARCH_SPIN_LOCK_UNLOCKED { 1 }
-#else
 	volatile unsigned int lock[4];
 # define __ARCH_SPIN_LOCK_UNLOCKED	{ { 1, 1, 1, 1 } }
-#endif
 } arch_spinlock_t;
 
 

arch/parisc/kernel/drivers.c

@@ -925,9 +925,9 @@ static __init void qemu_header(void)
 	pr_info("#define PARISC_MODEL \"%s\"\n\n",
 			boot_cpu_data.pdc.sys_model_name);
 
+	#define p ((unsigned long *)&boot_cpu_data.pdc.model)
 	pr_info("#define PARISC_PDC_MODEL 0x%lx, 0x%lx, 0x%lx, "
 		"0x%lx, 0x%lx, 0x%lx, 0x%lx, 0x%lx, 0x%lx\n\n",
-	#define p ((unsigned long *)&boot_cpu_data.pdc.model)
 		p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7], p[8]);
 	#undef p
 

arch/parisc/kernel/irq.c

@@ -388,7 +388,7 @@ union irq_stack_union {
 	volatile unsigned int lock[1];
 };
 
-DEFINE_PER_CPU(union irq_stack_union, irq_stack_union) = {
+static DEFINE_PER_CPU(union irq_stack_union, irq_stack_union) = {
 		.slock = { 1,1,1,1 },
 	};
 #endif

arch/parisc/kernel/processor.c

@@ -163,7 +163,6 @@ static int __init processor_probe(struct parisc_device *dev)
 	if (cpuid)
 		memset(p, 0, sizeof(struct cpuinfo_parisc));
 
-	p->loops_per_jiffy = loops_per_jiffy;
 	p->dev = dev;		/* Save IODC data in case we need it */
 	p->hpa = dev->hpa.start;	/* save CPU hpa */
 	p->cpuid = cpuid;	/* save CPU id */
@@ -373,10 +372,18 @@ int
 show_cpuinfo (struct seq_file *m, void *v)
 {
 	unsigned long cpu;
+	char cpu_name[60], *p;
+
+	/* strip PA path from CPU name to not confuse lscpu */
+	strlcpy(cpu_name, per_cpu(cpu_data, 0).dev->name, sizeof(cpu_name));
+	p = strrchr(cpu_name, '[');
+	if (p)
+		*(--p) = 0;
 
 	for_each_online_cpu(cpu) {
-		const struct cpuinfo_parisc *cpuinfo = &per_cpu(cpu_data, cpu);
 #ifdef CONFIG_SMP
+		const struct cpuinfo_parisc *cpuinfo = &per_cpu(cpu_data, cpu);
+
 		if (0 == cpuinfo->hpa)
 			continue;
 #endif
@@ -421,8 +428,7 @@ show_cpuinfo (struct seq_file *m, void *v)
 
 		seq_printf(m, "model\t\t: %s - %s\n",
 				 boot_cpu_data.pdc.sys_model_name,
-				 cpuinfo->dev ?
-				 cpuinfo->dev->name : "Unknown");
+				 cpu_name);
 
 		seq_printf(m, "hversion\t: 0x%08x\n"
 			        "sversion\t: 0x%08x\n",
@@ -433,8 +439,8 @@ show_cpuinfo (struct seq_file *m, void *v)
 		show_cache_info(m);
 
 		seq_printf(m, "bogomips\t: %lu.%02lu\n",
-			     cpuinfo->loops_per_jiffy / (500000 / HZ),
-			     (cpuinfo->loops_per_jiffy / (5000 / HZ)) % 100);
+			     loops_per_jiffy / (500000 / HZ),
+			     loops_per_jiffy / (5000 / HZ) % 100);
 
 		seq_printf(m, "software id\t: %ld\n\n",
 				boot_cpu_data.pdc.model.sw_id);

arch/powerpc/include/asm/lppaca.h

@@ -45,6 +45,7 @@
 #include <asm/types.h>
 #include <asm/mmu.h>
 #include <asm/firmware.h>
+#include <asm/paca.h>
 
 /*
  * The lppaca is the "virtual processor area" registered with the hypervisor,
@@ -123,13 +124,23 @@ struct lppaca {
  */
 #define LPPACA_OLD_SHARED_PROC		2
 
-static inline bool lppaca_shared_proc(struct lppaca *l)
+#ifdef CONFIG_PPC_PSERIES
+/*
+ * All CPUs should have the same shared proc value, so directly access the PACA
+ * to avoid false positives from DEBUG_PREEMPT.
+ */
+static inline bool lppaca_shared_proc(void)
 {
+	struct lppaca *l = local_paca->lppaca_ptr;
+
 	if (!firmware_has_feature(FW_FEATURE_SPLPAR))
 		return false;
 	return !!(l->__old_status & LPPACA_OLD_SHARED_PROC);
 }
 
+#define get_lppaca()	(get_paca()->lppaca_ptr)
+#endif
+
 /*
  * SLB shadow buffer structure as defined in the PAPR.  The save_area
  * contains adjacent ESID and VSID pairs for each shadowed SLB.  The

arch/powerpc/include/asm/paca.h

@@ -15,7 +15,6 @@
 #include <linux/cache.h>
 #include <linux/string.h>
 #include <asm/types.h>
-#include <asm/lppaca.h>
 #include <asm/mmu.h>
 #include <asm/page.h>
 #ifdef CONFIG_PPC_BOOK3E
@@ -46,14 +45,11 @@ extern unsigned int debug_smp_processor_id(void); /* from linux/smp.h */
 #define get_paca()	local_paca
 #endif
 
-#ifdef CONFIG_PPC_PSERIES
-#define get_lppaca()	(get_paca()->lppaca_ptr)
-#endif
-
 #define get_slb_shadow()	(get_paca()->slb_shadow_ptr)
 
 struct task_struct;
 struct rtas_args;
+struct lppaca;
 
 /*
  * Defines the layout of the paca.

arch/powerpc/include/asm/paravirt.h

@@ -6,6 +6,7 @@
 #include <asm/smp.h>
 #ifdef CONFIG_PPC64
 #include <asm/paca.h>
+#include <asm/lppaca.h>
 #include <asm/hvcall.h>
 #endif
 

arch/powerpc/include/asm/plpar_wrappers.h

@@ -9,6 +9,7 @@
 
 #include <asm/hvcall.h>
 #include <asm/paca.h>
+#include <asm/lppaca.h>
 #include <asm/page.h>
 
 static inline long poll_pending(void)

arch/powerpc/include/asm/word-at-a-time.h

@@ -34,7 +34,7 @@ static inline long find_zero(unsigned long mask)
 	return leading_zero_bits >> 3;
 }
 
-static inline bool has_zero(unsigned long val, unsigned long *data, const struct word_at_a_time *c)
+static inline unsigned long has_zero(unsigned long val, unsigned long *data, const struct word_at_a_time *c)
 {
 	unsigned long rhs = val | c->low_bits;
 	*data = rhs;

arch/powerpc/kernel/fadump.c

@@ -642,6 +642,7 @@ int __init fadump_reserve_mem(void)
 	return ret;
 error_out:
 	fw_dump.fadump_enabled = 0;
+	fw_dump.reserve_dump_area_size = 0;
 	return 0;
 }
 

arch/powerpc/kernel/hw_breakpoint.c

@@ -479,11 +479,13 @@ void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs)
 	struct arch_hw_breakpoint *info;
 	int i;
 
+	preempt_disable();
+
 	for (i = 0; i < nr_wp_slots(); i++) {
 		if (unlikely(tsk->thread.last_hit_ubp[i]))
 			goto reset;
 	}
-	return;
+	goto out;
 
 reset:
 	regs->msr &= ~MSR_SE;
@@ -492,6 +494,9 @@ void thread_change_pc(struct task_struct *tsk, struct pt_regs *regs)
 		__set_breakpoint(i, info);
 		tsk->thread.last_hit_ubp[i] = NULL;
 	}
+
+out:
+	preempt_enable();
 }
 
 static bool is_larx_stcx_instr(int type)

arch/powerpc/kernel/iommu.c

@@ -133,17 +133,28 @@ static int fail_iommu_bus_notify(struct notifier_block *nb,
 	return 0;
 }
 
-static struct notifier_block fail_iommu_bus_notifier = {
+/*
+ * PCI and VIO buses need separate notifier_block structs, since they're linked
+ * list nodes.  Sharing a notifier_block would mean that any notifiers later
+ * registered for PCI buses would also get called by VIO buses and vice versa.
+ */
+static struct notifier_block fail_iommu_pci_bus_notifier = {
 	.notifier_call = fail_iommu_bus_notify
 };
 
+#ifdef CONFIG_IBMVIO
+static struct notifier_block fail_iommu_vio_bus_notifier = {
+	.notifier_call = fail_iommu_bus_notify
+};
+#endif
+
 static int __init fail_iommu_setup(void)
 {
 #ifdef CONFIG_PCI
-	bus_register_notifier(&pci_bus_type, &fail_iommu_bus_notifier);
+	bus_register_notifier(&pci_bus_type, &fail_iommu_pci_bus_notifier);
 #endif
 #ifdef CONFIG_IBMVIO
-	bus_register_notifier(&vio_bus_type, &fail_iommu_bus_notifier);
+	bus_register_notifier(&vio_bus_type, &fail_iommu_vio_bus_notifier);
 #endif
 
 	return 0;

arch/powerpc/kernel/rtas_flash.c

@@ -710,9 +710,9 @@ static int __init rtas_flash_init(void)
 	if (!rtas_validate_flash_data.buf)
 		return -ENOMEM;
 
-	flash_block_cache = kmem_cache_create("rtas_flash_cache",
-					      RTAS_BLK_SIZE, RTAS_BLK_SIZE, 0,
-					      NULL);
+	flash_block_cache = kmem_cache_create_usercopy("rtas_flash_cache",
+						       RTAS_BLK_SIZE, RTAS_BLK_SIZE,
+						       0, 0, RTAS_BLK_SIZE, NULL);
 	if (!flash_block_cache) {
 		printk(KERN_ERR "%s: failed to create block cache\n",
 				__func__);

arch/powerpc/kvm/book3s_hv_ras.c

@@ -9,6 +9,7 @@
 #include <linux/kvm.h>
 #include <linux/kvm_host.h>
 #include <linux/kernel.h>
+#include <asm/lppaca.h>
 #include <asm/opal.h>
 #include <asm/mce.h>
 #include <asm/machdep.h>