Merge tag 'android12-5.4.293_r00' into android12-5.4 This merges the android12-5.4.293_r00 tag into the android12-5.4 branch, catching it up with the latest LTS releases. It contains the following commits: * 59719917c597 Merge 5.4.293 into android12-5.4-lts |\ | * 2c8115e47578 Linux 5.4.293 | * 9be010279d16 MIPS: cm: Fix warning if MIPS_CM is disabled | * ea3ee9994300 crypto: atmel-sha204a - Set hwrng quality to lowest possible | * 348adceb91b2 comedi: jr3_pci: Fix synchronous deletion of timer | * 6ac5fdd8ec0e md/raid1: Add check for missing source disk in process_checks() | * 05b512879eab scsi: pm80xx: Set phy_attached to zero when device is gone | * 2eebce58d467 x86/bugs: Don't fill RSB on VMEXIT with eIBRS+retpoline | * dcd76f5b6cb8 ACPI PPTT: Fix coding mistakes in a couple of sizeof() calls | * 3e7f0febf962 selftests: ublk: fix test_stripe_04 | * e84a08fc7e25 udmabuf: fix a buf size overflow issue during udmabuf creation | * 1249ee3538f0 KVM: s390: Don't use %pK through tracepoints | * 97d8b168cf94 sched/isolation: Make CONFIG_CPU_ISOLATION depend on CONFIG_SMP | * 302af84525f1 ntb: reduce stack usage in idt_scan_mws | * 5e280cce3a29 qibfs: fix _another_ leak | * a777ccfb9ba8 usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev() | * a33bcea3ab96 dmaengine: dmatest: Fix dmatest waiting less when interrupted | * f34551a48742 usb: host: max3421-hcd: Add missing spi_device_id table | * 729fd4d55324 parisc: PDT: Fix missing prototype warning | * e31c2569c814 clk: check for disabled clock-provider in of_clk_get_hw_from_clkspec() | * f7a5a5c8e1ec crypto: null - Use spin lock instead of mutex | * 15e468c54e48 MIPS: cm: Detect CM quirks from device tree | * 79af6c0fa861 USB: VLI disk crashes if LPM is used | * 919025be9a6b usb: quirks: Add delay init quirk for SanDisk 3.2Gen1 Flash Drive | * ab0ffd23f312 usb: quirks: add DELAY_INIT quirk for Silicon Motion Flash Drive | * 015c39f38e69 usb: dwc3: gadget: check that event count does not exceed event buffer length | * 7109b8db9cdd USB: OHCI: Add quirk for LS7A OHCI controller (rev 0x02) | * eebfb64c624f usb: cdns3: Fix deadlock when using NCM gadget | * ec0f123f4d1a USB: serial: simple: add OWON HDS200 series oscilloscope support | * d75e4f33e713 USB: serial: option: add Sierra Wireless EM9291 | * 244455a70c8a USB: serial: ftdi_sio: add support for Abacus Electrics Optical Probe | * 1985ca87bf78 serial: sifive: lock port in startup()/shutdown() callbacks | * 5d53a1329c80 USB: storage: quirk for ADATA Portable HDD CH94 | * d70184958b0e mcb: fix a double free bug in chameleon_parse_gdd() | * bfe45a5cf593 virtio_console: fix missing byte order handling for cols and rows | * 68f256305ceb net_sched: hfsc: Fix a potential UAF in hfsc_dequeue() too | * 28b09a067831 net_sched: hfsc: Fix a UAF vulnerability in class handling | * a3df56010403 tipc: fix NULL pointer dereference in tipc_mon_reinit_self() | * 966d6494e2ed net: phy: leds: fix memory leak | * ad4796f2da49 cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate() | * 6b9f9b998b10 drm/amd/pm: Prevent division by zero | * ce5af106a019 misc: pci_endpoint_test: Fix displaying 'irq_type' after 'request_irq' error | * 74a0c5bbed17 misc: pci_endpoint_test: Use INTX instead of LEGACY | * f4a9f4dd9946 PCI: Rename PCI_IRQ_LEGACY to PCI_IRQ_INTX | * 546ce870eaf4 iio: adc: ad7768-1: Fix conversion result sign | * dcf1a808abc0 iio: adc: ad7768-1: Move setting of val a bit later to avoid unnecessary return value check | * a813f35a75c4 net: dsa: mv88e6xxx: fix VTU methods for 6320 family | * 90f9068d3fb6 media: vim2m: print device name after registering device | * 14da7dbecb43 ext4: fix OOB read when checking dotdot dir | * 890684675d8e ext4: optimize __ext4_check_dir_entry() | * abf164b4a788 ext4: don't over-report free space or inodes in statvfs | * f1da8176d340 ext4: code cleanup for ext4_statfs_project() | * 4d49bd1b751d ext4: simplify checking quota limits in ext4_statfs() | * ca898f02fe0a platform/x86: ISST: Correct command storage data length | * 6fa53ec60ffa MIPS: ds1287: Match ds1287_set_base_clock() function types | * 7b4585c93bd2 MIPS: cevt-ds1287: Add missing ds1287.h include | * 9d5401493e10 MIPS: dec: Declare which_prom() as static | * c1b40d195951 virtio-net: Add validation for used length | * e0055d6461b3 RDMA/srpt: Support specifying the srpt_service_guid parameter | * b5c73fc92f8d openvswitch: fix lockup on tx to unregistering netdev with carrier | * 9b0dd09c1ceb net: openvswitch: fix race on port output | * 65f7f7915320 mmc: cqhci: Fix checking of CQHCI_HALT state | * 8593cd968fb7 nvmet-fc: Remove unused functions | * bd4c12b86cfe usb: dwc3: support continuous runtime PM with dual role | * b325546ed642 misc: pci_endpoint_test: Fix 'irq_type' to convey the correct type | * 705be9650477 misc: pci_endpoint_test: Avoid issue of interrupts remaining after request_irq error | * 106e45795331 tcp/dccp: Don't use timer_pending() in reqsk_queue_unlink(). | * 4b12272c5701 powerpc/prom_init: Use -ffreestanding to avoid a reference to bcmp | * ff55c867b656 kbuild: Add '-fno-builtin-wcslen' | * 66e30ca3c60c cpufreq: Reference count policy in cpufreq_update_limits() | * 1f59fc66dfaa drm/sti: remove duplicate object names | * 706868a1a107 drm/nouveau: prime: fix ttm_bo_delayed_delete oops | * b65769bc2e73 drm/repaper: fix integer overflows in repeat functions | * 24f8c991ad35 module: sign with sha512 instead of sha1 by default | * e142b4a15d67 perf/x86/intel/uncore: Fix the scale of IIO free running counters on SNR | * a356aca31730 perf/x86/intel: Allow to update user space GPRs from PEBS records | * b84f13fdad10 virtiofs: add filesystem context source name check | * 801246895f91 riscv: Avoid fortify warning in syscall_get_arguments() | * ee01a309ebf5 isofs: Prevent the use of too small fid | * 092de5ac8cb2 i2c: cros-ec-tunnel: defer probe if parent EC is not present | * 8060afd77761 hfs/hfsplus: fix slab-out-of-bounds in hfs_bnode_read_key | * 56f6e554a21f btrfs: correctly escape subvol in btrfs_show_options() | * beca6a8f197e nfs: add missing selections of CONFIG_CRC32 | * 1ff1cd28d941 nfs: move nfs_fhandle_hash to common include file | * 052549f912a4 NFSD: Constify @fh argument of knfsd_fh_hash() | * 8a7f46c1cb10 asus-laptop: Fix an uninitialized variable | * b3611185b168 writeback: fix false warning in inode_to_wb() | * 43ebe532f42c net: b53: enable BPDU reception for management port | * 54c6957d1123 net: openvswitch: fix nested key length validation in the set() action | * d00e4cf33aa7 Revert "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()" | * c3e9717276af Bluetooth: btrtl: Prevent potential NULL dereference | * 4db9080b8958 Bluetooth: hci_event: Fix sending MGMT_EV_DEVICE_FOUND for invalid address | * a37488a0b295 RDMA/usnic: Fix passing zero to PTR_ERR in usnic_ib_pci_probe() | * 68558f83a3e9 scsi: iscsi: Fix missing scsi_host_put() in error path | * 13c9744c1bcd wifi: wl1251: fix memory leak in wl1251_tx_work | * 929ec2c9ad34 wifi: mac80211: Purge vif txq in ieee80211_do_stop() | * bb5c4347d504 wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue() | * c731cdfddcf1 wifi: at76c50x: fix use after free access in at76_disconnect | * d03abc1c2b21 HSI: ssi_protocol: Fix use after free vulnerability in ssi_protocol Driver Due to Race Condition | * b09ed99b0dbb pwm: mediatek: always use bus clock for PWM on MT7622 | * 1dcf08fcff5c Bluetooth: hci_uart: Fix another race during initialization | * 05718ff7463b x86/e820: Fix handling of subpage regions when calculating nosave ranges in e820__register_nosave_regions() | * 7b4487b8c672 PCI: Fix reference leak in pci_alloc_child_bus() | * 4ddd8e34c5f6 of/irq: Fix device node refcount leakages in of_irq_init() | * 45a6c3ffd1cb of/irq: Fix device node refcount leakage in API irq_of_parse_and_map() | * 80a8ad35e275 of/irq: Fix device node refcount leakages in of_irq_count() | * 60584ba9c104 ntb: use 64-bit arithmetic for the MSI doorbell mask | * 34c4feb0d201 gpio: zynq: Fix wakeup source leaks on device unbind | * e5b4ae6f01d4 ftrace: Add cond_resched() to ftrace_graph_set_hash() | * 5a349c098f05 dm-integrity: set ti->error on memory allocation failure | * 9d18fcd0abc5 crypto: ccp - Fix check for the primary ASP device | * 2f39c1bc6727 thermal/drivers/rockchip: Add missing rk3328 mapping entry | * 547762250220 sctp: detect and prevent references to a freed transport in sendmsg | * 65af70aa567e mm: add missing release barrier on PGDAT_RECLAIM_LOCKED unlock | * dc076ef13a3a sparc/mm: disable preemption in lazy mmu mode | * 36ddb3b7675f arm64: dts: mediatek: mt8173: Fix disp-pwm compatible string | * b7c45dd0b14f mtd: rawnand: Add status chack in r852_ready() | * b828d394308e mtd: inftlcore: Add error check for inftl_read_oob() | * 4435d12392c9 lib: scatterlist: fix sg_split_phys to preserve original scatterlist offsets | * 1c5b5125acfe locking/lockdep: Decrease nr_unused_locks if lock unused in zap_class() | * cf30432f5b30 jbd2: remove wrong sb->s_sequence check | * 1b54faa5f47f i3c: Add NULL pointer check in i3c_master_queue_ibi() | * b96bd2c3db26 ext4: fix off-by-one error in do_split | * 563917cbae6e wifi: mac80211: fix integer overflow in hwmp_route_info_get() | * 03ece0640e8f net: dsa: mv88e6xxx: workaround RGMII transmit delay erratum for 6320 family | * e5133a0b2546 media: venus: hfi_parser: add check to avoid out of bound access | * 4397512185c1 media: i2c: ov7251: Introduce 1 ms delay between regulators and en GPIO | * 998642d6c62b media: i2c: ov7251: Set enable GPIO low in probe | * 00b363790baa media: v4l2-dv-timings: prevent possible overflow in v4l2_detect_gtf() | * 30b46f95f819 media: streamzap: prevent processing IR data on URB failure | * 6f567c6a5250 mtd: rawnand: brcmnand: fix PM resume warning | * c9f9b216ed6a arm64: cputype: Add MIDR_CORTEX_A76AE | * dc5d08b6fdad xenfs/xensyms: respect hypervisor's "next" indication | * 8069810d8cc8 media: siano: Fix error handling in smsdvb_module_init() | * 1b86c1917e16 media: venus: hfi: add check to handle incorrect queue size | * 4dd109038d51 media: venus: hfi: add a check to handle OOB in sfr region | * 68b37e31ce04 media: i2c: adv748x: Fix test pattern selection mask | * 5871166a1c70 ext4: don't treat fhandle lookup of ea_inode as FS corruption | * 84554e9848f4 ext4: reject casefold inode flag without casefold feature | * 8ed702674d76 bpf: support SKF_NET_OFF and SKF_LL_OFF on skb frags | * a74e04deb5c8 bpf: Add endian modifiers to fix endian warnings | * ecfbbd8381b1 pwm: fsl-ftm: Handle clk_get_rate() returning 0 | * 8b9f60725d74 pwm: mediatek: Prevent divide-by-zero in pwm_mediatek_config() | * a41edf64a0d1 pwm: mediatek: Always use bus clock | * a570efb4d877 fbdev: omapfb: Add 'plane' value check | * 67988473eaeb drm/mediatek: mtk_dpi: Explicitly manage TVD clock in power on/off | * f2fac9a701eb drm/amdkfd: Fix pqm_destroy_queue race with GPU reset | * ed42a47bb371 drm/amdkfd: clamp queue size to minimum | * 65d36a02129a drm: panel-orientation-quirks: Add new quirk for GPD Win 2 | * 402553135971 drm: panel-orientation-quirks: Add support for AYANEO 2S | * a3477a2872ec drm: allow encoder mode_set even when connectors change for crtc | * 48effdb7a798 Bluetooth: hci_uart: fix race during initialization | * 5d16d833cfa1 tracing: fix return value in __ftrace_event_enable_disable for TRACE_REG_UNREGISTER | * a32f1d4f1f4c net: vlan: don't propagate flags on open | * f64bc50c28b1 wifi: mt76: mt76x2u: add TP-Link TL-WDN6200 ID to device table | * 736ae988bfb5 scsi: st: Fix array overflow in st_setup() | * 6aff941cb0f7 ext4: ignore xattrs past end | * 446d7281bfcc ext4: protect ext4_release_dquot against freezing | * 68d8dcd8cd20 ahci: add PCI ID for Marvell 88SE9215 SATA Controller | * 57e3bb459d12 ata: libata-eh: Do not use ATAPI DMA for a device limited to PIO mode | * a065cec230aa jfs: add sanity check for agwidth in dbMount | * 5b2f26d3fba4 jfs: Prevent copying of nlink with value 0 from disk inode | * dd07a985e2de fs/jfs: Prevent integer overflow in AG size calculation | * 6ec5f343f5d1 fs/jfs: cast inactags to s64 to prevent potential overflow | * c3c7c57017ce page_pool: avoid infinite loop to schedule delayed worker | * d806fbac0cf7 ALSA: usb-audio: Fix CME quirk for UF series keyboards | * d4bac556feda ALSA: hda: intel: Fix Optimus when GPU has no sound | * 44a1b8b2027a HID: pidff: Fix null pointer dereference in pidff_find_fields | * 634b15ad561f HID: pidff: Do not send effect envelope if it's empty | * 85123a581f1f HID: pidff: Convert infinite length from Linux API to PID standard | * 5d6569da0326 xen/mcelog: Add __nonstring annotations for unterminated strings | * de2b636094a6 perf: arm_pmu: Don't disable counter in armpmu_add() | * 863af3877b9e x86/cpu: Don't clear X86_FEATURE_LAHF_LM flag in init_amd_k8() on AMD when running in a virtual machine | * 34a9394794b0 pm: cpupower: bench: Prevent NULL dereference on malloc failure | * 529401c8f12e net: ppp: Add bound checking for skb data on ppp_sync_txmung | * 19d88d74ecda ata: sata_sx4: Add error handling in pdc20621_i2c_read() | * 49d7e3fe0c49 ata: sata_sx4: Drop pointless VPRINTK() calls and convert the remaining ones | * 84895f5ce382 tipc: fix memory leak in tipc_link_xmit | * a551f7540179 ata: pata_pxa: Fix potential NULL pointer dereference in pxa_ata_probe() * 7757c77d307f Merge branch 'android12-5.4' into android12-5.4-lts Change-Id: I7b75d60003fc6b70371211c98aa2e54e30ca4af8 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.
LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.
script/checkpatch.plUPSTREAM:, BACKPORT:, FROMGIT:, FROMLIST:, or ANDROID:.Change-Id: tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)Bug: tag.Signed-off-by: tag by the author and the submitterAdditional requirements are listed below based on patch type
UPSTREAM:, BACKPORT:UPSTREAM:.(cherry-picked from ...) line important patch from upstream
This is the detailed description of the important patch
Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
UPSTREAM: important patch from upstream
This is the detailed description of the important patch
Signed-off-by: Fred Jones <fred.jones@foo.org>
Bug: 135791357
Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
(cherry-picked from c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
Signed-off-by: Joe Smith <joe.smith@foo.org>
BACKPORT: instead of UPSTREAM:.UPSTREAM:(cherry-picked from ...) line BACKPORT: important patch from upstream
This is the detailed description of the important patch
Signed-off-by: Fred Jones <fred.jones@foo.org>
Bug: 135791357
Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
(cherry-picked from c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
[ Resolved minor conflict in drivers/foo/bar.c ]
Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMGIT:, FROMLIST:,FROMGIT:(cherry picked from commit <sha1> <repo> <branch>). This must be a stable maintainer branch (not rebased, so don't use linux-next for example).BACKPORT: FROMGIT: important patch from upstream
This is the detailed description of the important patch
Signed-off-by: Fred Jones <fred.jones@foo.org>
- then Joe Smith would upload the patch for the common kernel as
FROMGIT: important patch from upstream
This is the detailed description of the important patch
Signed-off-by: Fred Jones <fred.jones@foo.org>
Bug: 135791357
(cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace
https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch)
Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
Signed-off-by: Joe Smith <joe.smith@foo.org>
FROMLIST:Link: tag with a link to the submittal on lore.kernel.orgBACKPORT: FROMLIST: FROMLIST: important patch from upstream
This is the detailed description of the important patch
Signed-off-by: Fred Jones <fred.jones@foo.org>
Bug: 135791357
Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/
Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:ANDROID:Fixes: tag that cites the patch with the bug ANDROID: fix android-specific bug in foobar.c
This is the detailed description of the important fix
Fixes: 1234abcd2468 ("foobar: add cool feature")
Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
Signed-off-by: Joe Smith <joe.smith@foo.org>
ANDROID:Bug: tag with the Android bug (required for android-specific features)