Jakub Kicinski 9fe1155233 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... No conflicts. Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-10-07 15:24:06 -07:00
..
asm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-10-07 15:24:06 -07:00
uapi/asm	fix up for "net: add new socket option SO_RESERVE_MEM"	2021-10-01 15:00:21 +01:00