linux/net
Tao Huang bc69b758ef Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common
* android12-5.10: (176331 commits)
  ANDROID: GKI: Enable bounds sanitizer
  ANDROID: Allow HAS_LTO_CLANG with KASAN_HW_TAGS
  ANDROID: abi_gki_aarch64_qcom: Add cpufreq related symbols
  ANDROID: cpufreq: Add a restricted vendor hook for freq transition
  ANDROID: scsi: ufs: add hooks to track ufs commands
  ANDROID: Fix compilation error when CPU_FREQ is disabled
  BACKPORT: kasan, arm64: allow using KUnit tests with HW_TAGS mode
  Revert "FROMGIT: kasan, arm64: allow using KUnit tests with HW_TAGS mode"
  Revert "BACKPORT: kasan: remove redundant config option"
  UPSTREAM: arm/kasan: fix the array size of kasan_early_shadow_pte[]
  FROMGIT: KVM: arm64: Workaround firmware wrongly advertising GICv2-on-v3 compatibility
  FROMGIT: KVM: arm64: Rename __vgic_v3_get_ich_vtr_el2() to __vgic_v3_get_gic_config()
  FROMGIT: KVM: arm64: Don't access PMSELR_EL0/PMUSERENR_EL0 when no PMU is available
  FROMGIT: KVM: arm64: Turn kvm_arm_support_pmu_v3() into a static key
  FROMGIT: KVM: arm64: Fix nVHE hyp panic host context restore
  FROMGIT: KVM: arm64: Avoid corrupting vCPU context register in guest exit
  FROMLIST: arm64: cpufeatures: Fix handling of CONFIG_CMDLINE for idreg overrides
  ANDROID: sched: Add vendor hook for uclamp_eff_value
  ANDROID: abi_gki_aarch64_qcom: Add CFS scheduler symbols
  ANDROID: GKI: Add mempool APIs to the symbol list
  ...

Change-Id: I4ed13984b97bc531d1dae61920457f31b84190e9

Conflicts:
	Documentation/devicetree/bindings/nvmem/rockchip-otp.txt
	arch/arm64/boot/dts/rockchip/px30.dtsi
	arch/arm64/boot/dts/rockchip/rk3308.dtsi
	arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
	drivers/clk/rockchip/Kconfig
	drivers/clk/rockchip/clk-rk3308.c
	drivers/gpu/drm/rockchip/rk3066_hdmi.c
	drivers/gpu/drm/rockchip/rockchip_rgb.c
	drivers/media/i2c/imx219.c
	drivers/nvmem/rockchip-otp.c
	drivers/power/supply/cw2015_battery.c
	sound/soc/codecs/cx2072x.c
	sound/soc/codecs/cx2072x.h
	sound/soc/codecs/rk3328_codec.c
2021-03-17 18:07:51 +08:00
..
6lowpan rk: revert to v4.19 2021-03-17 18:05:39 +08:00
9p rk: revert to v4.19 2021-03-17 18:05:39 +08:00
802
8021q rk: revert to v4.19 2021-03-17 18:05:39 +08:00
appletalk rk: revert to v4.19 2021-03-17 18:05:39 +08:00
atm rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ax25 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
batman-adv rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bluetooth rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bpf bpf: Reject too big ctx_size_in for raw_tp test run 2021-01-27 11:55:07 +01:00
bpfilter rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bridge rk: revert to v4.19 2021-03-17 18:05:39 +08:00
caif rk: revert to v4.19 2021-03-17 18:05:39 +08:00
can rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ceph rk: revert to v4.19 2021-03-17 18:05:39 +08:00
core rk: revert to v4.19 2021-03-17 18:05:39 +08:00
dcb rk: revert to v4.19 2021-03-17 18:05:39 +08:00
dccp rk: revert to v4.19 2021-03-17 18:05:39 +08:00
decnet rk: revert to v4.19 2021-03-17 18:05:39 +08:00
dns_resolver rk: revert to v4.19 2021-03-17 18:05:39 +08:00
dsa rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ethernet rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ethtool ethtool: fix string set id check 2021-01-06 14:56:48 +01:00
hsr rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ieee802154 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ife
ipv4 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ipv6 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
iucv rk: revert to v4.19 2021-03-17 18:05:39 +08:00
kcm rk: revert to v4.19 2021-03-17 18:05:39 +08:00
key rk: revert to v4.19 2021-03-17 18:05:39 +08:00
l2tp rk: revert to v4.19 2021-03-17 18:05:39 +08:00
l3mdev
lapb rk: revert to v4.19 2021-03-17 18:05:39 +08:00
llc rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mac80211 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mac802154 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mpls rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mptcp mptcp: skip to next candidate if subflow has unacked data 2021-02-23 15:53:23 +01:00
ncsi rk: revert to v4.19 2021-03-17 18:05:39 +08:00
netfilter rk: revert to v4.19 2021-03-17 18:05:39 +08:00
netlabel rk: revert to v4.19 2021-03-17 18:05:39 +08:00
netlink rk: revert to v4.19 2021-03-17 18:05:39 +08:00
netrom rk: revert to v4.19 2021-03-17 18:05:39 +08:00
nfc rk: revert to v4.19 2021-03-17 18:05:39 +08:00
nsh
openvswitch rk: revert to v4.19 2021-03-17 18:05:39 +08:00
packet rk: revert to v4.19 2021-03-17 18:05:39 +08:00
phonet rk: revert to v4.19 2021-03-17 18:05:39 +08:00
psample rk: revert to v4.19 2021-03-17 18:05:39 +08:00
qrtr rk: revert to v4.19 2021-03-17 18:05:39 +08:00
rds rk: revert to v4.19 2021-03-17 18:05:39 +08:00
rfkill Merge remote branch 'android12-5.10' of https://android.googlesource.com/kernel/common 2021-03-17 18:07:51 +08:00
rose rk: revert to v4.19 2021-03-17 18:05:39 +08:00
rxrpc rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sched rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sctp rk: revert to v4.19 2021-03-17 18:05:39 +08:00
smc rk: revert to v4.19 2021-03-17 18:05:39 +08:00
strparser rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sunrpc rk: revert to v4.19 2021-03-17 18:05:39 +08:00
switchdev net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP 2021-02-07 15:37:12 +01:00
tipc rk: revert to v4.19 2021-03-17 18:05:39 +08:00
tls rk: revert to v4.19 2021-03-17 18:05:39 +08:00
unix rk: revert to v4.19 2021-03-17 18:05:39 +08:00
vmw_vsock rk: revert to v4.19 2021-03-17 18:05:39 +08:00
wimax genetlink: move to smaller ops wherever possible 2020-10-02 19:11:11 -07:00
wireless rk: revert to v4.19 2021-03-17 18:05:39 +08:00
x25 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
xdp rk: revert to v4.19 2021-03-17 18:05:39 +08:00
xfrm rk: revert to v4.19 2021-03-17 18:05:39 +08:00
compat.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
devres.c
Kconfig rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Makefile
socket.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sysctl_net.c