Commit fcdc8d9a authored by Matthias Männich's avatar Matthias Männich
Browse files

Merge changes Ia00890ae,I6af8ce54,I4a64dca2,Ib8c4c34c,I9a1fb9e9, ... into android12-5.4-lts

* changes:
  Revert "perf: Disallow mis-matched inherited group reads"
  Revert "xfrm: fix a data-race in xfrm_gen_index()"
  Revert "Bluetooth: hci_core: Fix build warnings"
  Revert "xfrm: interface: use DEV_STATS_INC()"
  Merge 5.4.259 into android12-5.4-lts
  Revert "netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp"
  Revert "net: bridge: use DEV_STATS_INC()"
  Merge 5.4.258 into android12-5.4-lts
parents ca74b49e d77392ef
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment