Merge branch 'android-4.9-q' of https://android.googlesource.com/kernel/common into sos-3.x
-----
Merge list:
38c37c4337f9 Merge 4.9.319 into android-4.9-q
5697207f95e4 Linux 4.9.319
71078b82164e x86/speculation/mmio: Print SMT warning
da06c60d1dfe KVM: x86/speculation: Disable Fill buffer clear within guests
b7efb3a62fff x86/speculation/mmio: Reuse SRBDS mitigation for SBDS
48e40e2cccb3 x86/speculation/srbds: Update SRBDS mitigation selection
8acd4bf9427e x86/speculation/mmio: Add sysfs reporting for Processor MMIO Stale Data
6ecdbc9dc777 x86/speculation/mmio: Enable CPU Fill buffer clearing on idle
5da4d16872d3 x86/bugs: Group MDS, TAA & Processor MMIO Stale Data mitigations
a11f2f05f5c6 x86/speculation/mmio: Add mitigation for Processor MMIO Stale Data
91ab1073814a x86/speculation: Add a common function for MD_CLEAR mitigation update
19aa53c9eb2c x86/speculation/mmio: Enumerate Processor MMIO Stale Data bug
63c10e92b86a Documentation: Add documentation for Processor MMIO Stale Data
caa0dd5c0782 x86/cpu: Add another Alder Lake CPU to the Intel family
0180c2272146 x86/cpu: Add Lakefield, Alder Lake and Rocket Lake models to the to Intel CPU family
64d90b7226dc x86/cpu: Add Comet Lake to the Intel CPU models header
1574d3df3bfa x86/CPU: Add more Icelake model numbers
26b367f8fdb2 x86/CPU: Add Icelake model number
d14cee8b6c2f x86/cpu: Add Cannonlake to Intel family
761fd846a24a x86/cpu: Add Jasper Lake to Intel family
3b68328c004e cpu/speculation: Add prototype for cpu_show_srbds()
f397f5c53780 x86/cpu: Add Elkhart Lake to Intel family
ed3eafebbda6 ANDROID: arch: fix backported syscall numbers
b6d1c4dd9799 Merge 4.9.318 into android-4.9-q
a9756bf91f2d Linux 4.9.318
29e13f6b38f0 tcp: fix tcp_mtup_probe_success vs wrong snd_cwnd
faebc1a27027 PCI: qcom: Fix unbalanced PHY init on probe errors
6630c79930c3 mtd: cfi_cmdset_0002: Use chip_ready() for write on S29GL064N
8b238288a8ed mtd: cfi_cmdset_0002: Move and rename chip_check/chip_ready/chip_good_for_write
89dda10b73b7 powerpc/32: Fix overread/overwrite of thread_struct via ptrace
057b12ffd831 Input: bcm5974 - set missing URB_NO_TRANSFER_DMA_MAP urb flag
593773088d61 nfc: st21nfca: fix memory leaks in EVT_TRANSACTION handling
e290f91d21ac nfc: st21nfca: fix incorrect validating logic in EVT_TRANSACTION
94ac2a94b72b ata: libata-transport: fix {dma|pio|xfer}_mode sysfs files
43d709352562 cifs: return errors during session setup during reconnects
aeac3fd61922 ALSA: hda/conexant - Fix loopback issue with CX20632
45984b3ae9d6 vringh: Fix loop descriptors check in the indirect cases
2811cda7d2ec nodemask: Fix return values to be unsigned
7aa910df07ae modpost: fix undefined behavior of is_arm_mapping_symbol()
b33f7d99c922 drm/radeon: fix a possible null pointer dereference
f048349930a1 Revert "net: af_key: add check for pfkey_broadcast in function pfkey_process"
ac8fd53fa022 md: protect md_unregister_thread from reentrancy
6ae96e638739 serial: msm_serial: disable interrupts in __msm_console_write()
0b7371a22489 staging: rtl8712: fix uninit-value in r871xu_drv_init()
0fa78ad392bb clocksource/drivers/sp804: Avoid error on multiple instances
eeb7777f4771 misc: rtsx: set NULL intfdata when probe fails
5127c0f36526 usb: dwc2: gadget: don't reset gadget's driver->bus
6cade0a0b76f USB: hcd-pci: Fully suspend across freeze/thaw cycle
9b58d255f27b drivers: usb: host: Fix deadlock in oxu_bus_suspend()
0976808d0d17 drivers: tty: serial: Fix deadlock in sa1100_set_termios()
804de302ada3 USB: host: isp116x: check return value after calling platform_get_resource()
4681129fda9e drivers: staging: rtl8192e: Fix deadlock in rtllib_beacons_stop()
f4c836d90da1 tty: Fix a possible resource leak in icom_probe
50c341f9a2ad tty: synclink_gt: Fix null-pointer-dereference in slgt_clean()
f23b8a021d66 lkdtm/usercopy: Expand size of "out of frame" object
c8a27ebd1993 iio: dummy: iio_simple_dummy: check the return value of kstrdup()
a013fa884d87 net: altera: Fix refcount leak in altera_tse_mdio_create
c58d82a12648 net: xfrm: unexport __init-annotated xfrm4_protocol_init()
b419808712fc SUNRPC: Fix the calculation of xdr->end in xdr_get_next_encode_buffer()
4d0f47dc7df6 net/mlx4_en: Fix wrong return value on ioctl EEPROM query failure
7bd85c5ba168 ata: pata_octeon_cf: Fix refcount leak in octeon_cf_probe
f482637f73a0 net: fix nla_strcmp to handle more then one trailing null character
235c477d492c video: fbdev: pxa3xx-gcu: release the resources correctly in pxa3xx_gcu_probe/remove()
656d3c82e383 m68knommu: fix undefined reference to `_init_sp'
7a8c4ad74a0c m68knommu: set ZERO_PAGE() to the allocated zeroed page
631d7614792c i2c: cadence: Increase timeout per message if necessary
5b9cdc59475e tracing: Avoid adding tracer option before update_tracer_options
3db889f883e6 tcp: tcp_rtx_synack() can be called from process context
4ba7bbeab800 jffs2: fix memory leak in jffs2_do_fill_super
c6f44c880ab4 modpost: fix removing numeric suffixes
b4f0e57ea0d8 net: ethernet: mtk_eth_soc: out of bounds read in mtk_hwlro_get_fdir_entry()
fb8be6c54f00 clocksource/drivers/oxnas-rps: Fix irq_of_parse_and_map() return value
a9bfb37d6ba7 firmware: dmi-sysfs: Fix memory leak in dmi_sysfs_register_handle
87cdcaa2f2f3 serial: st-asc: Sanitize CSIZE and correct PARENB for CS7
82b57890e82c serial: sh-sci: Don't allow CS5-6
13cbbf6d2e88 serial: txx9: Don't allow CS5-6
566c075bd70e serial: digicolor-usart: Don't allow CS5-6
574c89ce0aae serial: meson: acquire port->lock in startup()
3867f0bbb947 rtc: mt6397: check return value after calling platform_get_resource()
6c493fde4c5b rpmsg: qcom_smd: Fix irq_of_parse_and_map() return value
1999e2c432be pwm: lp3943: Fix duty calculation in case period was clamped
1a46a4a13f3d USB: storage: karma: fix rio_karma_init return
86c1fc0d154c usb: usbip: add missing device lock on tweak configuration cmd
6bafee2f18af usb: usbip: fix a refcount leak in stub_probe()
61ca94fab3a8 staging: greybus: codecs: fix type confusion of list iterator variable
4063e2fecdac pcmcia: db1xxx_ss: restrict to MIPS_DB1XXX boards
94e9b7591961 netfilter: nf_tables: disallow non-stateful expression in sets earlier
0892e19f4b91 MIPS: IP27: Remove incorrect `cpu_has_fpu' override
6b6bd9e1f085 RDMA/rxe: Generate a completion for unsupported/invalid opcode
9af670b08007 dt-bindings: gpio: altera: correct interrupt-cells
7373dd32b096 docs/conf.py: Cope with removal of language=None in Sphinx 5.0.0
b71d97bf744c gma500: fix an incorrect NULL check on list iterator
5786262a4eac carl9170: tx: fix an incorrect use of list iterator
fb1cc5895c29 ASoC: rt5514: Fix event generation for "DSP Voice Wake Up" control
b5dca2cd3f02 rtl818x: Prevent using not initialized queues
25719eba873c hugetlb: fix huge_pmd_unshare address update
c763ba737af5 nodemask.h: fix compilation error with GCC12
5cca15036ff3 iommu/msm: Fix an incorrect NULL check on list iterator
668ca34a428d um: Fix out-of-bounds read in LDT setup
8b28302e8a4b um: chan_user: Fix winch_tramp() return value
796aa10b96b9 mac80211: upgrade passive scan to active scan on DFS channels after beacon rx
6dbd0a54e504 irqchip: irq-xtensa-mx: fix initial IRQ affinity
f8ea3356e4aa irqchip/armada-370-xp: Do not touch Performance Counter Overflow on A375, A38x, A39x
252f4afd4557 RDMA/hfi1: Fix potential integer multiplication overflow errors
61751cdcd33b md: fix an incorrect NULL check in md_reload_sb
30da8cb0e506 md: fix an incorrect NULL check in does_sb_need_changing
29b62b06774c drm/bridge: analogix_dp: Grab runtime PM reference for DP-AUX
8189f44270db drm/amdgpu/cs: make commands with 0 chunks illegal behaviour.
d6531993c638 scsi: ufs: qcom: Add a readl() to make sure ref_clk gets enabled
08295d192ca1 scsi: dc395x: Fix a missing check on list iterator
1434cd71ad9f ocfs2: dlmfs: fix error handling of user_dlm_destroy_lock
5c79f40e6e21 dlm: fix missing lkb refcount handling
2c55155cc365 dlm: fix plock invalid read
93bbf0498ba2 ext4: verify dir block before splitting it
19918ec7717d ext4: fix bug_on in ext4_writepages
1a3a15bf6f99 ext4: fix use-after-free in ext4_rename_dir_prepare
e52a9cc836ba fs-writeback: writeback_sb_inodes：Recalculate 'wrote' according skipped pages
ad22b63583ff iwlwifi: mvm: fix assert 1F04 upon reconfig
88cc8f963feb wifi: mac80211: fix use-after-free in chanctx code
b7d7b1656c7d iommu/amd: Increase timeout waiting for GA log enablement
6c92711db7c9 video: fbdev: clcdfb: Fix refcount leak in clcdfb_of_vram_setup
2f51db16cb74 Input: sparcspkr - fix refcount leak in bbc_beep_probe
4af21b12a60e tty: fix deadlock caused by calling printk() under tty_port->lock
8224b8f30edd powerpc/4xx/cpm: Fix return value of __setup() handler
847e0f9f2dd7 powerpc/idle: Fix return value of __setup() handler
2c7f4549265e powerpc/8xx: export 'cpm_setbrg' for modules
39642b0feddb drivers/base/node.c: fix compaction sysfs file leak
58185fcadb07 scsi: fcoe: Fix Wstringop-overflow warnings in fcoe_wwn_from_mac()
1b30ae7c7952 mfd: ipaq-micro: Fix error check return value of platform_get_irq()
8acfbe523381 soc: qcom: smsm: Fix missing of_node_put() in smsm_parse_ipc
d9999fc918b8 soc: qcom: smp2p: Fix missing of_node_put() in smp2p_parse_ipc
46585a76949c rxrpc: Don't try to resend the request if we're receiving the reply
61fb38cfbb1d rxrpc: Fix listen() setting the bar too high for the prealloc rings
c1e11b2c1c8b ASoC: wm2000: fix missing clk_disable_unprepare() on error in wm2000_anc_transition()
b342a88bbcdd sctp: read sk->sk_bound_dev_if once in sctp_rcv()
34478387514b m68k: math-emu: Fix dependencies of math emulation support
9de3dc09e56f Bluetooth: fix dangling sco_conn and use-after-free in sco_sock_timeout
4351bfe36aba media: pvrusb2: fix array-index-out-of-bounds in pvr2_i2c_core_init
483c126612d0 media: exynos4-is: Change clk_disable to clk_disable_unprepare
b74c0dd9179d regulator: pfuze100: Fix refcount leak in pfuze_parse_regulators_dt
c933829cbf33 ASoC: mxs-saif: Fix refcount leak in mxs_saif_probe
b06ee88cfa41 media: uvcvideo: Fix missing check to determine if element is found in list
e9561fccb62e drm/msm: return an error pointer in msm_gem_prime_get_sg_table()
0110d41971f8 x86/mm: Cleanup the control_va_addr_alignment() __setup handler
452922955df2 drm/rockchip: vop: fix possible null-ptr-deref in vop_bind()
9cb1ee33efcc drm/msm/hdmi: check return value after calling platform_get_resource_byname()
6ebf77be4ce6 drm/msm/dsi: fix error checks and return values for DSI xmit functions
f0e5dce9e2de x86/pm: Fix false positive kmemleak report in msr_build_context()
90dc37503350 inotify: show inotify mask flags in proc fdinfo
0bcb528402cd ath9k_htc: fix potential out of bounds access with invalid rxstatus->rs_keyix
48711a93604a spi: img-spfi: Fix pm_runtime_get_sync() error checking
dce87f324348 HID: hid-led: fix maximum brightness for Dream Cheeky
a8e03bcad52d NFC: NULL out the dev->rfkill to prevent UAF
92373244618d spi: spi-ti-qspi: Fix return value handling of wait_for_completion_timeout
2c19a69ab2ec drm/mediatek: Fix mtk_cec_mask()
55bd0545d279 x86/delay: Fix the wrong asm constraint in delay_loop()
0a1901f34f77 ASoC: mediatek: Fix error handling in mt8173_max98090_dev_probe
4188758b5313 drm: fix EDID struct for old ARM OABI format
9f29a4e6ef8f macintosh/via-pmu: Fix build failure when CONFIG_INPUT is disabled
977dbc81d0f8 powerpc/xics: fix refcount leak in icp_opal_init()
da9792920ab5 PCI: Avoid pci_dev_lock() AB/BA deadlock with sriov_numvfs_store()
46cb7868811d ARM: hisi: Add missing of_node_put after of_find_compatible_node
48a65f958d9c ARM: dts: exynos: add atmel,24c128 fallback to Samsung EEPROM
2d7b23db3525 ARM: versatile: Add missing of_node_put in dcscb_init
6d830edf3dfb fat: add ratelimit to fat*_ent_bread()
232a8059d1e0 ARM: OMAP1: clock: Fix UART rate reporting algorithm
6c4ad94011e2 fs: jfs: fix possible NULL pointer dereference in dbFree()
aaf44c1cbe61 eth: tg3: silence the GCC 12 array-bounds warning
019ed251b532 rxrpc: Return an error to sendmsg if call failed
2aa9343f7815 media: exynos4-is: Fix compile warning
7d801e807536 ASoC: rt5645: Fix errorenous cleanup order
8321b17789f6 nvme-pci: fix a NULL pointer dereference in nvme_alloc_admin_tags
aac03878d956 openrisc: start CPU timer early in boot
d1e960ce5f60 ipmi:ssif: Check for NULL msg when handling events and messages
fb8067f18b1f dma-debug: change allocation mode from GFP_NOWAIT to GFP_ATIOMIC
e476befc1144 ASoC: dapm: Don't fold register value changes into notifications
b0caa4967dd2 ipv6: Don't send rs packets to the interface of ARPHRD_TUNNEL
af30beed9498 drm/amd/pm: fix the compile warning
0e0eafe47fac scsi: megaraid: Fix error check return value of register_chrdev()
4d6295b6d986 media: cx25821: Fix the warning when removing the module
1d57be6b5dee ath9k: fix QCA9561 PA bias level
261546485450 drm/amd/pm: fix double free in si_parse_power_table()
74bab3bcf422 ALSA: jack: Access input_dev under mutex
9da7c9e920a0 ACPICA: Avoid cache flush inside virtual machines
1ff6b0727c89 ipw2x00: Fix potential NULL dereference in libipw_xmit()
cadee8777efb b43: Fix assigning negative value to unsigned variable
a1871f5a9c5f b43legacy: Fix assigning negative value to unsigned variable
c79b41dca00c mwifiex: add mutex lock for call in mwifiex_dfs_chan_sw_work_queue
e0828456578c drm/virtio: fix NULL pointer dereference in virtio_gpu_conn_get_modes
b32304f17aa2 btrfs: add "0x" prefix for unsupported optional features
8d910899b303 ptrace: Reimplement PTRACE_KILL by always sending SIGKILL
74a17e0f9bfe ptrace/xtensa: Replace PT_SINGLESTEP with TIF_SINGLESTEP
f5c5f3671e40 USB: new quirk for Dell Gen 2 devices
91179d0c6f61 BACKPORT: psi: Fix uaf issue when psi trigger is destroyed while being polled
1cbab1d96ad2 ANDROID: android-verity: Prevent double-freeing metadata
d1605fc9c1e9 Merge 4.9.317 into android-4.9-q
a1a1b79c5ddb Linux 4.9.317
8fea6446ef7d bpf: Enlarge offset check value to INT_MAX in bpf_skb_{load,store}_bytes
fea1d0940301 NFSD: Fix possible sleep during nfsd4_release_lockowner()
0b6f6940a2bd tpm: ibmvtpm: Correct the return value in tpm_ibmvtpm_probe()
27798cca4e54 dm verity: set DM_TARGET_IMMUTABLE feature flag
6adce527fe86 dm stats: add cond_resched when looping over entries
49e2a292b3d6 dm crypt: make printing of the key constant-time
41f6ea5b9aaa exec: Force single empty string when argv is empty
d59073bedb7c block-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern
2441cedd2941 drm/i915: Fix -Wstringop-overflow warning in call to intel_read_wm_latency()
54187b6c98a7 assoc_array: Fix BUG_ON during garbage collect
d570f31cc50e drivers: i2c: thunderx: Allow driver to work with ACPI defined TWSI controllers
8c73e7c18e09 net: af_key: check encryption module availability consistency
2a14df07810b Merge 4.9.316 into android-4.9-q
95302ce6d8a0 Linux 4.9.316
26cddc31073a net: stmmac: fix missing pci_disable_device() on error in stmmac_pci_probe()
80b17a26228c ethernet: tulip: fix missing pci_disable_device() on error in tulip_init_one()
e33a0c38d153 mac80211: fix rx reordering with non explicit / psmp ack policy
eb67b7a23d35 scsi: qla2xxx: Fix missed DMA unmap for aborted commands
2332db753ffc perf bench numa: Address compiler error on s390
e80fcc3f04f0 igb: skip phy status check where unavailable
7d7c166ef5c5 ARM: 9197/1: spectre-bhb: fix loop8 sequence for Thumb2
4d2c526c2682 ARM: 9196/1: spectre-bhb: enable for Cortex-A15
4dbefafc086a net: af_key: add check for pfkey_broadcast in function pfkey_process
eccad9d015de NFC: nci: fix sleep in atomic context bugs caused by nci_skb_alloc
c77f58ef61b1 net/qla3xxx: Fix a test in ql_reset_work()
e40ed72f8c8b net: vmxnet3: fix possible NULL pointer dereference in vmxnet3_rq_cleanup()
aae66daa4a89 net: vmxnet3: fix possible use-after-free bugs in vmxnet3_rq_alloc_rx_buf()
acc874b79c43 drm/dp/mst: fix a possible memory leak in fetch_monitor_name()
a1466528d8ae perf: Fix sys_perf_event_open() race against self
2b1c34a2f8e5 ALSA: wavefront: Proper check of get_user() error
64d41e4846a6 mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch()
5925f54a4c46 mmc: block: Use generic_cmd6_time when modifying INAND_CMD38_ARG_EXT_CSD
7bd6715a9006 mmc: core: Specify timeouts for BKOPS and CACHE_FLUSH for eMMC
22948c981625 ARM: 9191/1: arm/stacktrace, kasan: Silence KASAN warnings in unwind_frame()
5d0e7ff8a1a5 drbd: remove usage of list iterator variable after loop
2c337e8be8af MIPS: lantiq: check the return value of kzalloc()
3e6fa9e4a7a8 Input: add bounds checking to input_set_capability()
43554c35258a um: Cleanup syscall_handler_t definition/cast, fix warning
2adafe1c646b floppy: use a statically allocated error counter
-----
Change-Id: I5e3fa1d45963c6422b2f6b5a47dd497ac0f499a2
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>