Merge tag 'android11-5.4.283_r00' into android11-5.4

This merges up to the 5.4.283 LTS release into android11-5.4.  Included
in here are the following commits:

*   ac0b99d778 Merge 5.4.283 into android11-5.4-lts
|\
| * 4826c62faf Linux 5.4.283
| * 564e1986b0 scsi: aacraid: Fix double-free on probe failure
| * 9a2d4f736c net: dsa: mv8e6xxx: Fix stub function parameters
| * 29957da407 usb: core: sysfs: Unmerge @usb3_hardware_lpm_attr_group in remove_power_attributes()
| * b1069a3765 usb: dwc3: st: add missing depopulate in probe error path
| * f3498650df usb: dwc3: st: fix probed platform device ref count on probe error path
| * d2afc2bffe usb: dwc3: core: Prevent USB core invalid event buffer address access
| * 1d16ac232f usb: dwc3: omap: add missing depopulate in probe error path
| * d035dd9986 USB: serial: option: add MeiG Smart SRM825L
| * aa06cdd280 cdc-acm: Add DISABLE_ECHO quirk for GE HealthCare UI Controller
| * 0ee9594c97 soc: qcom: cmd-db: Map shared memory as WC, not WB
| * c5e0523744 nfc: pn533: Add poll mod list filling check
| * cd0c823b3f nfc: pn533: Add autopoll capability
| * cb829e3352 nfc: pn533: Add dev_up/dev_down hooks to phy_ops
| * e7d364a5c7 net: busy-poll: use ktime_get_ns() instead of local_clock()
| * bdd99e5f0a gtp: fix a potential NULL pointer dereference
| * ec7b4f7f64 ethtool: check device is present when getting link settings
| * c9fe713b1a r8152: Factor out OOB link list waits
| * 902e15c9d4 soundwire: stream: fix programming slave ports for non-continous port maps
| * f1f77b1164 net:rds: Fix possible deadlock in rds_message_put
| * 10aeaa47e4 cgroup/cpuset: Prevent UAF in proc_cpuset_show()
| * 56e62977ea ata: libata-core: Fix null pointer dereference on error
| * 7aa9456288 media: uvcvideo: Fix integer overflow calculating timestamp
| * 9bb1d48f54 filelock: Correct the filelock owner in fcntl_setlk/fcntl_setlk64
| * 009c4d78bc drm/amdkfd: don't allow mapping the MMIO HDP page with large pages
| * 29a132d793 ipc: replace costly bailout check in sysvipc_find_ipc()
| * bf44f0e935 wifi: mwifiex: duplicate static structs used in driver instances
| * 2cea369a5c pinctrl: single: fix potential NULL dereference in pcs_get_function()
| * 3b50575944 drm/amdgpu: Using uninitialized value *size when calling amdgpu_vce_cs_reloc
| * d4bdddda97 tools: move alignment-related macros to new <linux/align.h>
| * 87f610a1a7 Input: MT - limit max slots
| * 7732c54f2b Bluetooth: hci_ldisc: check HCI_UART_PROTO_READY flag in HCIUARTGETPROTO
| * 01e07b0567 ALSA: timer: Relax start tick time check for slave timer elements
| * 931274b0c9 mmc: dw_mmc: allow biu and ciu clocks to defer
| * 11aa40b30b cxgb4: add forgotten u64 ivlan cast before shift
| * 2deb4543e9 HID: microsoft: Add rumble support to latest xbox controllers
| * b2c3dd788a HID: wacom: Defer calculation of resolution until resolution_code is known
| * 90e1ff1c15 Bluetooth: MGMT: Add error handling to pair_device()
| * 2b507b0399 mmc: mmc_test: Fix NULL dereference on allocation failure
| * 6590c49e98 drm/msm/dpu: don't play tricks with debug macros
| * bdb2969754 drm/msm: use drm_debug_enabled() to check for debug categories
| * 1573f51ef1 net: xilinx: axienet: Fix dangling multicast addresses
| * c66ed34257 net: xilinx: axienet: Always disable promiscuous mode
| * ce2f6cfab2 ipv6: prevent UAF in ip6_send_skb()
| * 759e3e8c4a netem: fix return value if duplicate enqueue fails
| * d39f5be62f net: dsa: mv88e6xxx: Fix out-of-bound access
| * 2c0f2a5244 net: dsa: mv88e6xxx: replace ATU violation prints with trace points
| * 0d9e6f3630 net: dsa: mv88e6xxx: read FID when handling ATU violations
| * c86fd1b4ce net: dsa: mv88e6xxx: global1_atu: Add helper for get next
| * 4d63207fa6 net: dsa: mv88e6xxx: global2: Expose ATU stats register
| * 963bfa5763 netfilter: nft_counter: Synchronize nft_counter_reset() against reader.
| * 6633b17840 kcm: Serialise kcm_sendmsg() for the same socket.
| * 0d3702c60f tc-testing: don't access non-existent variable on exception
| * 2b3e49f250 Bluetooth: hci_core: Fix LE quote calculation
| * 960d34e61a Bluetooth: hci_core: Fix not handling link timeouts propertly
| * a5ba18e68c Bluetooth: Make use of __check_timeout on hci_sched_le
| * 06a6aebeb0 dm suspend: return -ERESTARTSYS instead of -EINTR
| * c6e3c341cf dm: do not use waitqueue for request-based DM
| * 6a99ee6b99 dm mpath: pass IO start time to path selector
| * 8adc9ab5bd media: solo6x10: replace max(a, min(b, c)) by clamp(b, a, c)
| * 58f5626d1b block: use "unsigned long" for blk_validate_block_size().
| * f5dda8db38 gtp: pull network headers in gtp_dev_xmit()
| * 9d72b629a9 hrtimer: Prevent queuing of hrtimer without a function callback
| * ee440c8312 nvmet-rdma: fix possible bad dereference when freeing rsps
| * e378b7675d ext4: set the type of max_zeroout to unsigned int to avoid overflow
| * f162e1b7d6 irqchip/gic-v3-its: Remove BUG_ON in its_vpe_irq_domain_alloc
| * 31d59a2a81 usb: dwc3: core: Skip setting event buffers for host only controllers
| * 29fdfe9f2a s390/iucv: fix receive buffer virtual vs physical address confusion
| * b4bde02e00 openrisc: Call setup_memory() earlier in the init sequence
| * d8086fbabd NFS: avoid infinite loop in pnfs_update_layout.
| * 6168df74db nvmet-tcp: do not continue for invalid icreq
| * ea213d57f6 Bluetooth: bnep: Fix out-of-bound access
| * d037a1d1f5 nvme: clear caller pointer on identify failure
| * a98c91a49e usb: gadget: fsl: Increase size of name buffer for endpoints
| * 7026ba0a09 f2fs: fix to do sanity check in update_sit_entry
| * fe3f0f9af4 btrfs: delete pointless BUG_ON check on quota root in btrfs_qgroup_account_extent()
| * ffb87a8829 btrfs: send: handle unexpected data in header buffer in begin_cmd()
| * 76c5fd8dd0 btrfs: handle invalid root reference found in may_destroy_subvol()
| * 36f225da51 btrfs: change BUG_ON to assertion when checking for delayed_node root
| * 3d2598c317 powerpc/boot: Only free if realloc() succeeds
| * d921c88d1b powerpc/boot: Handle allocation failure in simple_realloc()
| * b62f96647b parisc: Use irq_enter_rcu() to fix warning at kernel/context_tracking.c:367
| * 03475167fd x86: Increase brk randomness entropy for 64-bit systems
| * 0f9d267011 md: clean up invalid BUG_ON in md_ioctl
| * 6ca28b54ad virtiofs: forbid newlines in tags
| * 5766a74fe6 drm/lima: set gp bus_stop bit before hard reset
| * 7bdf5df2bf net/sun3_82586: Avoid reading past buffer in debug output
| * 6ef9c38cd0 scsi: lpfc: Initialize status local variable in lpfc_sli4_repost_sgl_list()
| * e1c82f74b6 fs: binfmt_elf_efpic: don't use missing interpreter's properties
| * 199a42fc4c media: pci: cx23885: check cx23885_vdev_init() return
| * 1e3ca3ef9f quota: Remove BUG_ON from dqget()
| * 12f8698a84 ext4: do not trim the group with corrupted block bitmap
| * de71b478b2 nvmet-trace: avoid dereferencing pointer too early
| * 240fcfe119 powerpc/xics: Check return value of kasprintf in icp_native_map_one_cpu
| * 81c479fc35 IB/hfi1: Fix potential deadlock on &irq_src_lock and &dd->uctxt_lock
| * 7b31922f2a wifi: iwlwifi: abort scan when rfkill on but device enabled
| * 0137220b97 gfs2: setattr_chown: Add missing initialization
| * e997548575 scsi: spi: Fix sshdr use
| * 19c348fecf binfmt_misc: cleanup on filesystem umount
| * 11b776e3c9 staging: ks7010: disable bh on tx_dev_lock
| * 8b29a8dc6a media: radio-isa: use dev_name to fill in bus_info
| * 9a732aad7d i2c: riic: avoid potential division by zero
| * 47ff82181e wifi: cw1200: Avoid processing an invalid TIM IE
| * 5b6711094b ssb: Fix division by zero issue in ssb_calc_clock_rate
| * 4e0b0f085f ALSA: hda/realtek: Fix noise from speakers on Lenovo IdeaPad 3 15IAU7
| * 67492d4d10 net: hns3: fix a deadlock problem when config TC during resetting
| * 56bb1b3bf4 net: dsa: vsc73xx: pass value in phy_write operation
| * d7fa0c3582 net: axienet: Fix register defines comment description
| * 8b04b6b7c4 net: axienet: Autodetect 64-bit DMA capability
| * 46a5469f92 net: axienet: Upgrade descriptors to hold 64-bit addresses
| * 67527bcb0f net: axienet: Wrap DMA pointer writes to prepare for 64 bit
| * 2978228525 net: axienet: Drop MDIO interrupt registers from ethtools dump
| * d724554f8f net: axienet: Check for DMA mapping errors
| * 367ca46817 net: axienet: Factor out TX descriptor chain cleanup
| * c6ddc4c57b net: axienet: Improve DMA error handling
| * 8876a2ac1b net: axienet: Fix DMA descriptor cleanup path
| * 09e086a5f7 atm: idt77252: prevent use after free in dequeue_rx()
| * 3b999c528b net/mlx5e: Correctly report errors for ethtool rx flows
| * 37f3dafee1 s390/uv: Panic for set and remove shared access UVC errors
| * cd0aa417b8 btrfs: rename bitmap_set_bits() -> btrfs_bitmap_set_bits()
| * 2d34304bce s390/cio: rename bitmap_size() -> idset_bitmap_size()
| * 1ab137a90e overflow: Implement size_t saturating arithmetic helpers
| * 60f05081e0 overflow.h: Add flex_array_size() helper
| * 1b37ec85ad memcg_write_event_control(): fix a user-triggerable oops
| * a71a6db101 drm/amdgpu: Actually check flags for all context ops.
| * 374a0f8204 selinux: fix potential counting error in avc_add_xperms_decision()
| * e807487a1d fix bitmap corruption on close_range() with CLOSE_RANGE_UNSHARE
| * 463074c081 bitmap: introduce generic optimized bitmap_size()
| * 3525ad2524 vfs: Don't evict inode under the inode lru traversing context
| * 0f94cd0e02 dm persistent data: fix memory allocation failure
| * f75dec8417 dm resume: don't return EINVAL when signalled
| * 0936c758a2 arm64: ACPI: NUMA: initialize all values of acpi_early_node_map to NUMA_NO_NODE
| * 19f60a55b2 s390/dasd: fix error recovery leading to data corruption on ESE devices
| * a57b0ebabe xhci: Fix Panther point NULL pointer deref at full-speed re-enumeration
| * fa69434ecd ALSA: usb-audio: Support Yamaha P-125 quirk entry
| * 33168db352 fuse: Initialize beyond-EOF page contents before setting uptodate
* | f9764dcf97 Revert "genirq: Allow the PM device to originate from irq domain"
* | d131a10522 Revert "genirq: Allow irq_chip registration functions to take a const irq_chip"
* | e11b864e72 Revert "irqchip/imx-irqsteer: Constify irq_chip struct"
* | 8a7102ed4b Revert "irqchip/imx-irqsteer: Add runtime PM support"
* | 31cfc1a256 Revert "irqchip/imx-irqsteer: Handle runtime power management correctly"
* | 147724ba5f Merge 5.4.282 into android11-5.4-lts
|\|
| * 5bb3c84a11 Linux 5.4.282
| * 2f2f3c6a4d media: Revert "media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()"
| * e7765ad4b4 ARM: dts: imx6qdl-kontron-samx6i: fix phy-mode
| * dc1d852277 nvme/pci: Add APST quirk for Lenovo N60z laptop
| * 368f6985d4 exec: Fix ToCToU between perm check and set-uid/gid usage
| * fdf2b10baf media: uvcvideo: Use entity get_cur in uvc_ctrl_set
| * f6a745c558 arm64: cpufeature: Fix the visibility of compat hwcaps
| * a256d019ea drm/i915/gem: Fix Virtual Memory mapping boundaries calculation
| * cd4348e0a5 netfilter: nf_tables: prefer nft_chain_validate
| * eaf1a29ea5 netfilter: nf_tables: use timestamp to check for set element timeout
| * cb56f8f06a netfilter: nf_tables: set element extended ACK reporting support
| * 53174ce02d kbuild: Fix '-S -c' in x86 stack protector scripts
| * af3948929b Fix gcc 4.9 build issue in 5.4.y
| * c7a28cb079 drm/mgag200: Set DDC timeout in milliseconds
| * ca75fa4ff8 drm/bridge: analogix_dp: properly handle zero sized AUX transactions
| * 06c1de44d3 x86/mtrr: Check if fixed MTRRs exist before saving them
| * d3e4dbc285 tracing: Fix overflow in get_free_elt()
| * f8fe71c649 power: supply: axp288_charger: Round constant_charge_voltage writes down
| * 1031a0e7c2 power: supply: axp288_charger: Fix constant_charge_voltage writes
| * da18145e7d genirq/irqdesc: Honor caller provided affinity in alloc_desc()
| * 55b2a5d331 serial: core: check uartclk for zero to avoid divide by zero
| * 881058e07b scsi: mpt3sas: Avoid IOMMU page faults on REPORT ZONES
| * 12608528f5 scsi: mpt3sas: Remove scsi_dma_map() error messages
| * 3f16bc776b ntp: Safeguard against time_constant overflow
| * dd98c9630b driver core: Fix uevent_show() vs driver detach race
| * 5cd98f82ec ntp: Clamp maxerror and esterror to operating range
| * f91fb47eca tick/broadcast: Move per CPU pointer access into the atomic section
| * 8f783731e3 scsi: ufs: core: Fix hba->last_dme_cmd_tstamp timestamp updating logic
| * df8e734ae5 usb: gadget: core: Check for unset descriptor
| * 55bb086ce9 USB: serial: debug: do not echo input by default
| * 9c3746ce8d usb: vhci-hcd: Do not drop references before new references are gained
| * 85f06d9634 ALSA: hda/hdmi: Yet more pin fix for HP EliteDesk 800 G4
| * 3c540f4200 ALSA: hda: Add HP MP9 G4 Retail System AMS to force connect list
| * 40f3d5cb0e ALSA: line6: Fix racy access to midibuf
| * 24ddda932c drm/client: fix null pointer dereference in drm_client_modeset_probe
| * 2c99fd5762 spi: spi-fsl-lpspi: Fix scldiv calculation
| * 3a5e84e6e4 spi: fsl-lpspi: remove unneeded array
| * abc71a9915 bpf: kprobe: remove unused declaring of bpf_kprobe_override
| * 6082250cca i2c: smbus: Send alert notifications to all devices if source not found
| * 54abe030df i2c: smbus: Improve handling of stuck alerts
| * 9bd5abd9d3 i2c: smbus: Don't filter out duplicate alerts
| * ba9a332d1e arm64: errata: Expand speculative SSBS workaround (again)
| * 76b4fbb661 arm64: cputype: Add Cortex-A725 definitions
| * 90f49639d4 arm64: cputype: Add Cortex-X1C definitions
| * d19a135ca2 arm64: errata: Expand speculative SSBS workaround
| * 31c04d3f68 arm64: errata: Unify speculative SSBS errata logic
| * 32480850c6 arm64: cputype: Add Cortex-X925 definitions
| * e890465ebf arm64: cputype: Add Cortex-A720 definitions
| * d58774b5f1 arm64: cputype: Add Cortex-X3 definitions
| * 60bb454974 arm64: errata: Add workaround for Arm errata 3194386 and 3312417
| * c4d3c615cf arm64: cputype: Add Neoverse-V3 definitions
| * 7e13067758 arm64: cputype: Add Cortex-X4 definitions
| * 4fecc9ed90 arm64: Add Neoverse-V2 part
| * 762dd597c7 arm64: cpufeature: Force HWCAP to be based on the sysreg visible to user-space
| * a61144525f ext4: fix wrong unit use in ext4_mb_find_by_goal
| * 0860bad4a4 SUNRPC: Fix a race to wake a sync task
| * 1ec5ea9e25 s390/sclp: Prevent release of buffer in I/O
| * 969d683bfe jbd2: avoid memleak in jbd2_journal_write_metadata_buffer
| * 87c2a57fdb media: uvcvideo: Fix the bandwdith quirk on USB 3.x
| * 0463702743 media: uvcvideo: Ignore empty TS packets
| * ff5c4eb71e drm/amdgpu: Fix the null pointer dereference to ras_manager
| * a8ca88d3d9 btrfs: fix bitmap leak when loading free space cache on duplicate entry
| * 4dd406a308 wifi: nl80211: don't give key data to userspace
| * 5def895b42 udf: prevent integer overflow in udf_bitmap_free_blocks()
| * 9d9e96dc56 PCI: Add Edimax Vendor ID to pci_ids.h
| * 0f82fcdc8e selftests/bpf: Fix send_signal test with nested CONFIG_PARAVIRT
| * d3eaa7fe11 ACPI: SBS: manage alarm sysfs attribute through psy core
| * 79b7f33d46 ACPI: battery: create alarm sysfs attribute atomically
| * 4c8f911560 clocksource/drivers/sh_cmt: Address race condition for clock events
| * 6b33c468d5 md/raid5: avoid BUG_ON() while continue reshape after reassembling
| * 6fdd36fba3 net: fec: Stop PPS on driver remove
| * d89b1a9387 Bluetooth: l2cap: always unlock channel in l2cap_conless_channel()
| * 96cc343c3f net: linkwatch: use system_unbound_wq
| * 37c0934497 net: usb: qmi_wwan: fix memory leak for not ip packets
| * c9b3fc4f15 sctp: Fix null-ptr-deref in reuseport_add_sock().
| * c2237ce58a sctp: move hlist_node and hashent out of sctp_ep_common
| * 25a727233a x86/mm: Fix pti_clone_pgtable() alignment assumption
| * 8243f41375 irqchip/mbigen: Fix mbigen node address layout
| * f19bf41e73 genirq: Allow irq_chip registration functions to take a const irq_chip
| * 922b824bb7 netfilter: ipset: Add list flush to cancel_gc
| * 869f240a5b net: usb: sr9700: fix uninitialized variable use in sr_mdio_read
| * 479335789d ALSA: usb-audio: Correct surround channels in UAC1 channel map
| * 41a6c31df7 protect the fetch of ->fd[fd] in do_dup2() from mispredictions
| * 04dcab03e6 HID: wacom: Modify pen IDs
| * ba35ce6480 ipv6: fix ndisc_is_useropt() handling for PIO
| * 9f96828b94 net/mlx5e: Add a check for the return value from mlx5_port_set_eth_ptys
| * 37652fbef9 net/iucv: fix use after free in iucv_sock_close()
| * e8e1c9b282 drm/vmwgfx: Fix overlay when using Screen Targets
| * 3bcb8bba72 drm/nouveau: prime: fix refcount underflow
| * 84beb77384 remoteproc: imx_rproc: Skip over memory region when node value is NULL
| * 66b47133bf remoteproc: imx_rproc: Fix ignoring mapping vdev regions
| * 8d1eca34ac remoteproc: imx_rproc: ignore mapping vdev regions
| * a590e8dea3 irqchip/imx-irqsteer: Handle runtime power management correctly
| * 294aa15e79 irqchip/imx-irqsteer: Add runtime PM support
| * ee1e002d17 irqchip/imx-irqsteer: Constify irq_chip struct
| * 9951e76f39 genirq: Allow the PM device to originate from irq domain
| * b044588a16 devres: Fix memory leakage caused by driver API devm_free_percpu()
| * 00d780681e driver core: Cast to (void *) with __force for __percpu pointer
| * 47b3dce100 dev/parport: fix the array out-of-bounds risk
| * fca2fe1670 parport: Standardize use of printmode
| * 92f405a7f1 parport: Convert printk(KERN_<LEVEL> to pr_<level>(
| * bbfcb2a4bc PCI: rockchip: Use GPIOD_OUT_LOW flag while requesting ep_gpio
| * c72ddaebcd PCI: rockchip: Make 'ep-gpios' DT property optional
| * 4d3817b64e mm: avoid overflows in dirty throttling logic
| * 3f8ec1d6b0 nvme-pci: add missing condition check for existence of mapped data
| * 035333dddd ASoC: Intel: use soc_intel_is_byt_cr() only when IOSF_MBI is reachable
| * 41aa8b71b5 ASoC: Intel: Move soc_intel_is_foo() helpers to a generic header
| * 9dff804bd8 ASoC: Intel: Convert to new X86 CPU match macros
| * d4001bd3b4 powerpc: fix a file leak in kvm_vcpu_ioctl_enable_cap()
| * 0abe35bc48 apparmor: Fix null pointer deref when receiving skb during sock creation
| * d3e4d4a98c mISDN: Fix a use after free in hfcmulti_tx()
| * a689f5eb13 bpf: Fix a segment issue when downgrading gso_size
| * fd06cb4a5f net: nexthop: Initialize all fields in dumped nexthops
| * 253405541b tipc: Return non-zero value from tipc_udp_addr2str() on error
| * 507bf56d42 net: bonding: correctly annotate RCU in bond_should_notify_peers()
| * 8ea16df99d ipv4: Fix incorrect source address in Record Route option
| * f19db930ae MIPS: SMP-CPS: Fix address for GCR_ACCESS register for CM3 and later
| * 2f7bbdc744 dma: fix call order in dmam_free_coherent
| * 6a8a0da4d8 libbpf: Fix no-args func prototype BTF dumping syntax
| * f4eee36072 um: time-travel: fix time-travel-start option
| * 9b3a434595 jfs: Fix array-index-out-of-bounds in diFree
| * c06023caca kdb: Use the passed prompt in kdb_position_cursor()
| * 1280375411 kdb: address -Wformat-security warnings
| * 02b87e6334 nilfs2: handle inconsistent state in nilfs_btnode_create_block()
| * 1729040114 Bluetooth: btusb: Add Realtek RTL8852BE support ID 0x13d3:0x3591
| * 3b5bcca858 Bluetooth: btusb: Add RTL8852BE device 0489:e125 to device tables
| * 46c0fa486b rbd: don't assume RBD_LOCK_STATE_LOCKED for exclusive mappings
| * 0a99aa6ca3 rbd: rename RBD_LOCK_STATE_RELEASING and releasing_wait
| * 7d8e5712f3 drm/panfrost: Mark simple_ondemand governor as softdep
| * f54a096195 rbd: don't assume rbd_is_lock_owner() for exclusive mappings
| * 796bdd9a9b selftests/sigaltstack: Fix ppc64 GCC build
| * 7f25f296fc RDMA/iwcm: Fix a use-after-free related to destroying CM IDs
| * 8e9e1b4b9d platform: mips: cpu_hwmon: Disable driver on unsupported hardware
| * 6e70fff02f watchdog/perf: properly initialize the turbo mode timestamp and rearm counter
| * 89b7c3d509 rtc: isl1208: Fix return value of nvmem callbacks
| * f6fe92535e perf/x86/intel/pt: Fix a topa_entry base address calculation
| * 8922d66df1 perf/x86/intel/pt: Fix topa_entry base length
| * e1f0108444 scsi: qla2xxx: validate nvme_local_port correctly
| * af46649304 scsi: qla2xxx: Complete command early within lock
| * dae67169cb scsi: qla2xxx: Fix for possible memory corruption
| * 171ac4b495 scsi: qla2xxx: During vport delete send async logout explicitly
| * 67b6d03dca rtc: cmos: Fix return value of nvmem callbacks
| * b59a5e86a3 kobject_uevent: Fix OOB access within zap_modalias_env()
| * 362ded08cc decompress_bunzip2: fix rare decompression failure
| * 8d4fc803ff ubi: eba: properly rollback inside self_check_eba
| * 02a29f6e3b clk: davinci: da8xx-cfgchip: Initialize clk_init_data before use
| * 54162974ae f2fs: fix to don't dirty inode for readonly filesystem
| * 5e5801888d scsi: qla2xxx: Return ENOBUFS if sg_cnt is more than one for ELS cmds
| * 46f1dea17b binder: fix hang of unregistered readers
| * 48b5730852 PCI: hv: Return zero, not garbage, when reading PCI_INTERRUPT_PIN
| * 2828b6fd83 hwrng: amd - Convert PCIBIOS_* return codes to errnos
| * 1ca78a7c47 tools/memory-model: Fix bug in lock.cat
| * 13d79c6489 leds: ss4200: Convert PCIBIOS_* return codes to errnos
| * 34293b8c12 wifi: mwifiex: Fix interface type change
| * e02f9941e8 ext4: make sure the first directory block is not a hole
| * 19e13b4d7f ext4: check dot and dotdot of dx_root before making dir indexed
| * ecc258fbdd m68k: amiga: Turn off Warp1260 interrupts during boot
| * cae9e59cc4 udf: Avoid using corrupted block bitmap buffer
| * 71dbf95359 drm/amd/display: Check for NULL pointer
| * d6ad202f73 drm/gma500: fix null pointer dereference in psb_intel_lvds_get_modes
| * a658ae2173 drm/gma500: fix null pointer dereference in cdv_intel_lvds_get_modes
| * 4a52861cd7 hfs: fix to initialize fields of hfs_inode_info after hfs_alloc_inode()
| * 72aff31119 media: venus: fix use after free in vdec_close
| * 375ff2a273 char: tpm: Fix possible memory leak in tpm_bios_measurements_open()
| * 2194b6a9bb ipv6: take care of scope when choosing the src addr
| * c77064e76c af_packet: Handle outgoing VLAN packets without hardware offloading
| * 5d7cea681d net: netconsole: Disable target before netpoll cleanup
| * 457a1c87d4 tick/broadcast: Make takeover of broadcast hrtimer reliable
| * 84033790be rtc: interface: Add RTC offset to alarm after fix-up
| * 680c7faee4 nilfs2: avoid undefined behavior in nilfs_cnt32_ge macro
| * a4b0c9fd15 fs/nilfs2: remove some unused macros to tame gcc
| * 10ba89c213 pinctrl: freescale: mxs: Fix refcount of child
| * b45432ce84 pinctrl: ti: ti-iodelay: fix possible memory leak when pinctrl_enable() fails
| * 932813248d pinctrl: ti: ti-iodelay: Drop if block with always false condition
| * 1a8e19cbc3 pinctrl: single: fix possible memory leak when pinctrl_enable() fails
| * 24d78662f1 pinctrl: core: fix possible memory leak when pinctrl_enable() fails
| * 64c0b8e64b netfilter: ctnetlink: use helper function to calculate expect ID
| * 55fa4883aa bnxt_re: Fix imm_data endianness
| * b8f7d8f4d5 macintosh/therm_windtunnel: fix module unload.
| * 38378074fa powerpc/xmon: Fix disassembly CPU feature checks
| * 28c5198369 MIPS: Octeron: remove source file executable bit
| * 8761992069 Input: elan_i2c - do not leave interrupt disabled on suspend failure
| * 6e1d3873ea RDMA/device: Return error earlier if port in not valid
| * 729109a0d5 mtd: make mtd_test.c a separate module
| * 638b75a19a ASoC: max98088: Check for clk_prepare_enable() error
| * 6e17530f5b RDMA/rxe: Don't set BTH_ACK_MASK for UC or UD QPs
| * 6607140c18 RDMA/mlx4: Fix truncated output warning in alias_GUID.c
| * 409ca91035 RDMA/mlx4: Fix truncated output warning in mad.c
| * 5e3f7847e6 Input: qt1050 - handle CHIP_ID reading error
| * 3881d0622c PCI: Fix resource double counting on remove & rescan
| * df5a9723b6 SUNRPC: Fixup gss_status tracepoint error output
| * 6922e03463 sparc64: Fix incorrect function signature and add prototype for prom_cif_init
| * 5f20a407ed ext4: avoid writing unitialized memory to disk in EA inodes
| * feed3fcb6f SUNRPC: avoid soft lockup when transmitting UDP to reachable server.
| * 72e06bedd5 mfd: omap-usb-tll: Use struct_size to allocate tll
| * 62ef8d7816 drm/qxl: Add check for drm_cvt_mode
| * 024e357a6f drm/etnaviv: fix DMA direction handling for cached RW buffers
| * 9e43e7212f perf report: Fix condition in sort__sym_cmp()
| * d1415125b7 leds: trigger: Unregister sysfs attributes before calling deactivate()
| * 3a2a9cc47d media: renesas: vsp1: Store RPF partition configuration per RPF instance
| * 4f33ef74ec media: renesas: vsp1: Fix _irqsave and _irq mix
| * 0063a2822d media: uvcvideo: Override default flags
| * c65fe17a49 media: uvcvideo: Allow entity-defined get_info and get_cur
| * f8bcdad286 saa7134: Unchecked i2c_transfer function result fixed
| * 031eda178e media: imon: Fix race getting ictx->lock
| * fce50a628e media: dvb-usb: Fix unexpected infinite loop in dvb_usb_read_remote_control()
| * 5f6aeae1e7 USB: move snd_usb_pipe_sanity_check into the USB core
| * db071a63d7 selftests: forwarding: devlink_lib: Wait for udev events after reloading
| * c90b1cd775 bna: adjust 'name' buf size of bna_tcb and bna_ccb structures
| * f071190ec3 wifi: virt_wifi: don't use strlen() in const context
| * 79957e626d gss_krb5: Fix the error handling path for crypto_sync_skcipher_setkey
| * 994fc2164a wifi: virt_wifi: avoid reporting connection success with wrong SSID
| * 94637e9927 qed: Improve the stack space of filter_config()
| * b54962dc4e perf: Prevent passing zero nr_pages to rb_alloc_aux()
| * 7d87d26bd1 perf: Fix perf_aux_size() for greater-than 32-bit size
| * 818c1f5ff3 perf/x86/intel/pt: Fix pt_topa_entry_for_page() address calculation
| * 4443bd2032 netfilter: nf_tables: rise cap on SELinux secmark context
| * 576d12ba53 ipvs: Avoid unnecessary calls to skb_is_gso_sctp
| * 8541b8ac35 net: fec: Fix FEC_ECR_EN1588 being cleared on link-down
| * c1df19258a net: fec: Refactor: #define magic constants
| * b289ebb051 wifi: cfg80211: handle 2x996 RU allocation in cfg80211_calculate_bitrate_he()
| * f0e93132c0 wifi: cfg80211: fix typo in cfg80211_calculate_bitrate_he()
| * 4dc09f6f26 mlxsw: spectrum_acl_erp: Fix object nesting warning
| * 8161263362 lib: objagg: Fix general protection fault
| * 32e4baeaae selftests/bpf: Check length of recv in test_sockmap
| * 130a1a9acb net/smc: set rmb's SG_MAX_SINGLE_ALLOC limitation only when CONFIG_ARCH_NO_SG_CHAIN is defined
| * 33749ad4da net/smc: Allow SMC-D 1MB DMB allocations
| * de9f06b37d wifi: brcmsmac: LCN PHY code is used for BCM4313 2G-only device
| * 5510183266 firmware: turris-mox-rwtm: Initialize completion before mailbox
| * 8ed886fbfb firmware: turris-mox-rwtm: Fix checking return value of wait_for_completion_timeout()
| * 65f083996e m68k: cmpxchg: Fix return value for default case in __arch_xchg()
| * 1b55044749 x86/xen: Convert comma to semicolon
| * c1588a2e51 m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
| * 5bded5a131 arm64: dts: amlogic: gx: correct hdmi clocks
| * 5c6820c5a7 arm64: dts: mediatek: mt7622: fix "emmc" pinctrl mux
| * b42123aa11 ARM: dts: imx6qdl-kontron-samx6i: fix PCIe reset polarity
| * 2623585eb5 ARM: dts: imx6qdl-kontron-samx6i: fix board reset
| * 748ee683ae ARM: dts: imx6qdl-kontron-samx6i: fix PHY reset
| * a64cd46cc2 ARM: dts: imx6qdl-kontron-samx6i: move phy reset into phy-node
| * 3ba50d9233 arm64: dts: rockchip: Increase VOP clk rate on RK3328
| * 3edf65be1f arm64: dts: qcom: msm8996: specify UFS core_clk frequencies
| * ad8c347732 arm64: dts: qcom: sdm845: add power-domain to UFS PHY
| * 5cd6721d78 hwmon: (max6697) Fix swapped temp{1,8} critical alarms
| * 9fe2069a95 hwmon: (max6697) Fix underflow when writing limit attributes
| * 47f4d2600f pwm: stm32: Always do lazy disabling
| * 894e544ba5 hwmon: (adt7475) Fix default duty on fan is disabled
| * 1df94156d9 x86/platform/iosf_mbi: Convert PCIBIOS_* return codes to errnos
| * 2ffb9d2d6f x86/pci/xen: Fix PCIBIOS_* return code handling
| * eb8baf546f x86/pci/intel_mid_pci: Fix PCIBIOS_* return code handling
| * 55942933a2 x86/of: Return consistent error type from x86_of_pci_irq_enable()
| * 2103341aef hfsplus: fix to avoid false alarm of circular locking
| * e4f2b5e6c4 platform/chrome: cros_ec_debugfs: fix wrong EC message version
| * c68d1dbfe3 EDAC, i10nm: make skx_common.o a separate module
| * 5dad7906e7 EDAC/skx_common: Add new ADXL components for 2-level memory
| * 87594d6d0e EDAC, skx: Retrieve and print retry_rd_err_log registers
| * 202f909495 EDAC, skx_common: Refactor so that we initialize "dev" in result of adxl decode.
* d82959916b Merge branch 'android11-5.4' into branch 'android11-5.4-lts'

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

include/uapi/linux/netfilter/nf_tables.h

@@ -1213,7 +1213,7 @@ enum nft_secmark_attributes {
 #define NFTA_SECMARK_MAX	(__NFTA_SECMARK_MAX - 1)
 
 /* Max security context length */
-#define NFT_SECMARK_CTX_MAXLEN		256
+#define NFT_SECMARK_CTX_MAXLEN		4096
 
 /**
  * enum nft_reject_types - nf_tables reject expression reject types

include/uapi/linux/zorro_ids.h

@@ -449,6 +449,9 @@
 #define  ZORRO_PROD_VMC_ISDN_BLASTER_Z2				ZORRO_ID(VMC, 0x01, 0)
 #define  ZORRO_PROD_VMC_HYPERCOM_4				ZORRO_ID(VMC, 0x02, 0)
 
+#define ZORRO_MANUF_CSLAB					0x1400
+#define  ZORRO_PROD_CSLAB_WARP_1260				ZORRO_ID(CSLAB, 0x65, 0)
+
 #define ZORRO_MANUF_INFORMATION					0x157C
 #define  ZORRO_PROD_INFORMATION_ISDN_ENGINE_I			ZORRO_ID(INFORMATION, 0x64, 0)