github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 22:52:35 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
472cb33488
linux/net
History
Tao Huang 8a8168e343 Merge remote branch 'android12-5.10-2021-08' of https://android.googlesource.com/kernel/common 
* android12-5.10-2021-08: (429 commits)
  ANDROID: Update symbol list for mtk
  ANDROID: scheduler: export task_sched_runtime
  FROMLIST: mm: slub: fix slub_debug disabling for list of slabs
  FROMLIST: mm/madvise: add MADV_WILLNEED to process_madvise()
  ANDROID: Update the exynos symbol list
  FROMGIT: firmware: arm_scmi: Free mailbox channels if probe fails
  ANDROID: GKI: gki_defconfig: Enable CONFIG_NFC
  ANDROID: sched: Make uclamp changes depend on CAP_SYS_NICE
  ANDROID: GKI: update xiaomi symbol list and ABI XML
  ANDROID: ABI: update generic symbol list
  ANDROID: scsi: ufs: Enable CONFIG_SCSI_UFS_HPB
  ANDROID: scsi: ufs: Make CONFIG_SCSI_UFS_HPB compatible with the GKI
  UPSTREAM: arm64: vdso: Avoid ISB after reading from cntvct_el0
  ANDROID: GKI: Disable X86_MCE drivers
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: ABI: update allowed list for exynos
  FROMGIT: sched: Skip priority checks with SCHED_FLAG_KEEP_PARAMS
  FROMGIT: sched: Don't report SCHED_FLAG_SUGOV in sched_getattr()
  FROMGIT: sched/deadline: Fix reset_on_fork reporting of DL tasks
  BACKPORT: FROMGIT: sched: Fix UCLAMP_FLAG_IDLE setting
  ...

Change-Id: I5e0600bb4ccd0333366b016b42332e1e79e56b61

Conflicts:
	drivers/usb/gadget/configfs.c
	include/linux/usb/gadget.h
2021-08-24 20:07:38 +08:00
..
6lowpan rk: revert to v4.19 2021-03-17 18:05:39 +08:00
9p net: 9p: advance iov on empty read 2021-04-07 15:00:08 +02:00
802
8021q rk: revert to v4.19 2021-03-17 18:05:39 +08:00
appletalk appletalk: Fix skb allocation size in loopback case 2021-04-07 15:00:08 +02: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 batman-adv: initialize "struct batadv_tvlv_tt_vlan_data"->reserved field 2021-04-14 08:41:59 +02:00
bluetooth Bluetooth: use correct lock to prevent UAF of hdev object 2021-06-10 13:39:23 +02: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 bridge: Fix possible races between assigning rx_handler_data and setting IFF_BRIDGE_PORT bit 2021-05-22 11:40:54 +02:00
caif net: caif: fix memory leak in cfusbl_device_notify 2021-06-10 13:39:25 +02:00
can can: isotp: fix msg_namelen values depending on CAN_REQUIRED_SIZE 2021-04-14 08:42:07 +02:00
ceph rk: revert to v4.19 2021-03-17 18:05:39 +08:00
core ANDROID: GKI: net: add vendor hooks for 'struct sock' lifecycle 2021-07-14 20:52:04 -07:00
dcb rk: revert to v4.19 2021-03-17 18:05:39 +08:00
dccp ipv6: weaken the v4mapped source check 2021-03-30 14:32:01 +02: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 net: dsa: tag_8021q: fix the VLAN IDs used for encoding sub-VLANs 2021-06-10 13:39:17 +02:00
ethernet rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ethtool ethtool: fix missing NLM_F_MULTI flag when dumping 2021-05-19 10:13:08 +02:00
hsr net: hsr: fix mac_len checks 2021-06-03 09:00:50 +02:00
ieee802154 ieee802154: fix error return code in ieee802154_llsec_getparams() 2021-06-10 13:39:19 +02:00
ife
ipv4 ANDROID: vendor_hooks: Add hooks to tcp/udp send/recv msg functions. 2021-07-28 09:53:04 +08:00
ipv6 ANDROID: ipv6: add vendor hook for gen ipv6 link-local addr 2021-07-13 18:13:57 +00: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 net: l2tp: reduce log level of messages in receive path, add counter instead 2021-03-17 17:06:11 +01: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 mac80211: extend protection against mixed key and fragment cache attacks 2021-06-03 09:00:29 +02:00
mac802154 net: mac802154: Fix general protection fault 2021-04-14 08:42:13 +02:00
mpls net: avoid infinite loop in mpls_gso_segment when mpls_hlen == 0 2021-03-17 17:06:11 +01:00
mptcp mptcp: always parse mptcp options for MPC reqsk 2021-06-10 13:39:16 +02:00
ncsi net/ncsi: Avoid channel_monitor hrtimer deadlock 2021-04-14 08:42:08 +02:00
netfilter ANDROID: GKI: net: add vendor hooks for 'struct nf_conn' lifecycle 2021-07-14 20:52:03 -07:00
netlabel cipso,calipso: resolve a number of problems with the DOI refcounts 2021-03-17 17:06:15 +01: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 nfc: fix NULL ptr dereference in llcp_sock_getname() after failed connect 2021-06-10 13:39:27 +02:00
nsh
openvswitch openvswitch: meter: fix race when getting now_ms. 2021-06-03 09:00:47 +02:00
packet net: packetmmap: fix only tx timestamp on request 2021-06-03 09:00:46 +02: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 net: qrtr: Avoid potential use after free in MHI send 2021-05-07 11:04:31 +02:00
rds net/rds: Fix a use after free in rds_message_map_pages 2021-04-14 08:42:09 +02: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 net/sched: act_ct: Fix ct template allocation for zone 0 2021-06-10 13:39:16 +02:00
sctp Merge 5.10.38 into android12-5.10 2021-05-20 15:35:25 +02:00
smc net/smc: remove device from smcd_dev_list after failed device_add() 2021-06-03 09:00:48 +02:00
strparser rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sunrpc SUNRPC: More fixes for backlog congestion 2021-06-03 09:00:51 +02:00
switchdev net: switchdev: don't set port_obj_info->handled true when -EOPNOTSUPP 2021-02-07 15:37:12 +01:00
tipc tipc: fix unique bearer names sanity check 2021-06-10 13:39:22 +02:00
tls net/tls: Fix use-after-free after the TLS device goes down and up 2021-06-10 13:39:18 +02:00
unix rk: revert to v4.19 2021-03-17 18:05:39 +08:00
vmw_vsock Merge 5.10.37 into android12-5.10 2021-05-15 09:28:55 +02:00
wimax
wireless Merge 5.10.42 into android12-5.10 2021-06-03 18:47:38 +02:00
x25 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
xdp xsk: Fix for xp_aligned_validate_desc() when len == chunk_size 2021-05-19 10:13:06 +02:00
xfrm Revert "xfrm: Use actual socket sk instead of skb socket for xfrm_output_resume" 2021-05-13 20:27:08 +00: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