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

Sync up with android11-5.4 for the following commits:

32ff5fbcab ANDROID: GKI: bring back icmpv6_send
797bd53ae8 UPSTREAM: net: icmp: pass zeroed opts from icmp{,v6}_ndo_send before sending
899bfe24dc UPSTREAM: ipv6: silence compilation warning for non-IPV6 builds
f1c0684934 UPSTREAM: ipv6: icmp6: avoid indirect call for icmpv6_send()
0682eb7280 UPSTREAM: xfrm: interface: use icmp_ndo_send helper
fb836b54d0 UPSTREAM: sunvnet: use icmp_ndo_send helper
17060ca408 UPSTREAM: gtp: use icmp_ndo_send helper
61e9311bf7 UPSTREAM: icmp: allow icmpv6_ndo_send to work with CONFIG_IPV6=n
1188cb33bc UPSTREAM: icmp: introduce helper for nat'd source address in network device context
313f089215 ANDROID: ABI: Update allowed list for QCOM
5024508d0f ANDROID: ABI: Update allowed list for QCOM
cb0830225a ANDROID: Adding kprobes build configs for Cuttlefish

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

android/abi_gki_aarch64_qcom

@@ -1058,13 +1058,20 @@
   hwspin_lock_unregister
   __hwspin_unlock
   hypervisor_kobj
+  i2c_adapter_type
   i2c_add_adapter
   i2c_add_numbered_adapter
   i2c_del_adapter
   i2c_del_driver
+  i2c_get_device_id
   i2c_get_dma_safe_msg_buf
   i2c_put_dma_safe_msg_buf
   i2c_register_driver
+  i2c_smbus_read_byte
+  i2c_smbus_write_byte
+  __i2c_smbus_xfer
+  i2c_smbus_xfer
+  __i2c_transfer
   i2c_transfer
   i2c_transfer_buffer_flags
   icc_get
@@ -1208,6 +1215,7 @@
   irq_domain_remove
   irq_domain_set_hwirq_and_chip
   irq_domain_set_info
+  irq_domain_simple_ops
   irq_domain_update_bus_token
   irq_domain_xlate_onecell
   irq_domain_xlate_twocell
@@ -2011,6 +2019,9 @@
   rtc_tm_to_time64
   rtc_update_irq
   rtc_valid_tm
+  rt_mutex_lock
+  rt_mutex_trylock
+  rt_mutex_unlock
   rtnl_is_locked
   rtnl_link_register
   rtnl_link_unregister
@@ -2860,3 +2871,7 @@
   xdp_rxq_info_reg
   xdp_rxq_info_reg_mem_model
   xdp_rxq_info_unreg
+  pci_get_slot
+  pcie_capability_clear_and_set_word
+  pci_device_is_present
+  pci_find_bus