Jakub Kicinski 8859a44ea0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: MAINTAINERS - keep Chandrasekar drivers/net/ethernet/mellanox/mlx5/core/en_main.c - simple fix + trust the code re-added to param.c in -next is fine include/linux/bpf.h - trivial include/linux/ethtool.h - trivial, fix kdoc while at it include/linux/skmsg.h - move to relevant place in tcp.c, comment re-wrapped net/core/skmsg.c - add the sk = sk // sk = NULL around calls net/tipc/crypto.c - trivial Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-04-09 20:48:35 -07:00
..
appldata	s390/appldata: use struct_size() helper	2020-06-29 16:32:34 +02:00
boot	s390: uv: Fix sysfs max number of VCPUs reporting	2021-01-27 13:00:04 +01:00
configs	s390: remove IBM_PARTITION and CONFIGFS_FS from zfcpdump defconfig	2021-03-08 10:46:30 +01:00
crypto	Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2021-02-21 17:23:56 -08:00
hypfs	s390/hypfs: use store_tod_clock_ext()	2021-02-13 17:17:55 +01:00
include	s390/unwind: add machine check handler stack	2021-04-05 11:30:07 +02:00
kernel	s390/setup: use memblock_free_late() to free old stack	2021-04-07 14:37:28 +02:00
kvm	s390/time,idle: get rid of unsigned long long	2021-03-08 10:46:27 +01:00
lib	s390: convert to generic entry	2021-01-19 12:29:26 +01:00
mm	s390 updates for the 5.12 merge window #2	2021-02-26 14:12:32 -08:00
net	s390/bpf: Implement new atomic ops	2021-03-16 12:18:49 -07:00
pci	s390/pci: fix leak of PCI device structure	2021-03-15 19:10:56 +01:00
purgatory	- Add support for the hugetlb_cma command line option to allocate gigantic	2020-12-14 16:22:26 -08:00
tools	s390/opcodes: rename selhhhr to selfhr	2021-02-24 00:31:22 +01:00
Kbuild	s390/numa: move code to arch/s390/kernel	2020-08-11 18:16:55 +02:00
Kconfig	Rework of the X86 irq stack handling:	2021-02-24 16:32:23 -08:00
Kconfig.debug	s390: convert to generic entry	2021-01-19 12:29:26 +01:00
Makefile	arch: s390: Remove CONFIG_OPROFILE support	2021-01-29 10:05:51 +05:30