Merge branch 'android11-5.4' into branch 'android11-5.4-lts'

This catches the android11-5.4-lts branch up with the recent changes
that have gone into the android11-5.4 branch.

Included in here are the following commits:

*   0acbae5b Merge "Merge tag 'android11-5.4.259_r00' into android11-5.4" into android11-5.4
|\
| * b40f1a5d Merge tag 'android11-5.4.259_r00' into android11-5.4
* | e8f8c3db ANDROID: fix up rpmsg_device ABI break
* | a1f6648a ANDROID: fix up platform_device ABI break
* | b05d8acf UPSTREAM: rpmsg: Fix possible refcount leak in rpmsg_register_device_override()
* | 9e43c50d UPSTREAM: rpmsg: glink: Release driver_override
* | e172d704 BACKPORT: rpmsg: Fix calling device_lock() on non-initialized device
* | f497d3c5 BACKPORT: rpmsg: Fix kfree() of static memory on setting driver_override
* | d0dadc26 UPSTREAM: rpmsg: Constify local variable in field store macro
* | 2069521c UPSTREAM: driver: platform: Add helper for safer setting of driver_override
* | d43ac48d BACKPORT: firmware_loader: Abort all upcoming firmware load request once reboot triggered
* | 93e172c4 UPSTREAM: firmware_loader: Refactor kill_pending_fw_fallback_reqs()
* | 49de253f UPSTREAM: netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c
* | 756378d5 BACKPORT: ravb: Fix use-after-free issue in ravb_tx_timeout_work()
* | 0d7affc8 UPSTREAM: ravb: Fix up dma_free_coherent() call in ravb_remove()
|/
* fda88618 UPSTREAM: netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
* 44ed16dd UPSTREAM: net: xfrm: Fix xfrm_address_filter OOB read
* d5a866ab UPSTREAM: igb: set max size RX buffer when store bad packet is enabled
* 5e99400d UPSTREAM: netfilter: xt_sctp: validate the flag_info count
* 16645e28 UPSTREAM: netfilter: xt_u32: validate user space input
* 1f18bb11 UPSTREAM: netfilter: nfnetlink_osf: avoid OOB read
* 72e1ceae UPSTREAM: net/sched: Retire rsvp classifier
* df7f160d UPSTREAM: ipv4: fix null-deref in ipv4_link_failure

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