Merge branch 'android12-5.4' into branch 'android12-5.4-lts'

This catches the android12-5.4-lts branch up with the latest changes in
the android12-5.4 branch.  Included in here are the following commits:

*   36a88108 Merge "Merge tag 'android12-5.4.259_r00' into android12-5.4" into android12-5.4
|\
| * e90a9e0f Merge tag 'android12-5.4.259_r00' into android12-5.4
* | 2ac128c0 UPSTREAM: netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
|/
* 6710c955 BACKPORT: ravb: Fix use-after-free issue in ravb_tx_timeout_work()
* 2b7d5853 UPSTREAM: ravb: Fix up dma_free_coherent() call in ravb_remove()
* 65fc90b6 UPSTREAM: netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
* 47610a04 UPSTREAM: net: xfrm: Fix xfrm_address_filter OOB read
* 9e316e5d UPSTREAM: igb: set max size RX buffer when store bad packet is enabled
* 0b12fe01 UPSTREAM: net/sched: Retire rsvp classifier
* 8e02ba97 UPSTREAM: netfilter: xt_sctp: validate the flag_info count
* c8eebb1a UPSTREAM: netfilter: xt_u32: validate user space input
* e18af9de UPSTREAM: netfilter: nfnetlink_osf: avoid OOB read
* 149358c1 UPSTREAM: ipv4: fix null-deref in ipv4_link_failure
* 5f1cbd78 Merge tag 'android12-5.4.254_r00' into android12-5.4
* a1b9dbe5 UPSTREAM: kfence: avoid passing -g for test
* 0e84ff33 UPSTREAM: arm64: efi: Make efi_rt_lock a raw_spinlock
* 274df3fe UPSTREAM: blk-mq: fix kernel panic during iterating over flush request
* c911dfbf UPSTREAM: net: sched: sch_qfq: Fix UAF in qfq_dequeue()
* 3c6bf87a UPSTREAM: net/sched: sch_hfsc: Ensure inner classes have fsc curve
* 9329d7fc UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue
* 19cff29f UPSTREAM: netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
* a349c790 UPSTREAM: af_unix: Fix null-ptr-deref in unix_stream_sendpage().
* 50533a8b BACKPORT: net: nfc: Fix use-after-free caused by nfc_llcp_find_local

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