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

Catch the lts branch up with changes made in android12-5.4.  Commits in
here are the following:

* cd8e74fa Merge tag 'android12-5.4.292_r00' into android12-5.4
* 986c3881 UPSTREAM: net_sched: Prevent creation of classes with TC_H_ROOT
* 41adfeb3 UPSTREAM: net: sched: Disallow replacing of child qdisc from one parent to another
* c1d3c939 UPSTREAM: pfifo_tail_enqueue: Drop new packet when sch->limit == 0
* 6b07fcd9 Merge tag 'android12-5.4.290_r00' into android12-5.4
* 39762b7a UPSTREAM: dma-buf: heaps: Fix off-by-one in CMA heap fault handler
* 13d87d0d UPSTREAM: wireguard: send: annotate intentional data race in checking empty queue
* 83f23532 UPSTREAM: wireguard: queueing: annotate intentional data race in cpu round robin
* 211ced29 UPSTREAM: wireguard: allowedips: avoid unaligned 64-bit memory accesses
* 276e526e UPSTREAM: net: core: reject skb_copy(_expand) for fraglist GSO skbs
* 20abece1 UPSTREAM: udp: prevent local UDP tunnel packets from being GROed
* cdd21a48 UPSTREAM: udp: do not transition UDP GRO fraglist partial checksums to unnecessary
* db98d66e UPSTREAM: udp: do not accept non-tunnel GSO skbs landing in a tunnel
* 67e2c939 UPSTREAM: wireguard: netlink: access device through ctx instead of peer
* bd85fc93 UPSTREAM: wireguard: netlink: check for dangling peer via is_dead instead of empty list
* cfb0f643 UPSTREAM: wireguard: receive: annotate data-race around receiving_counter.counter
* cb850525 UPSTREAM: f2fs: Introduce linear search for dentries
* 6e2cfdd6 ANDROID: gki - change networking configuration
* 3f2c17e7 ANDROID: kernelci build-break for 64-bit riscv clang builds (5.4 only)
* af0dea1a Revert "BACKPORT: RISC-V: Stop relying on GCC's register allocator's hueristics"
* e860d369 Revert "ANDROID: declare sp_in_global outside of CONFIG_FRAME_POINTER"

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