Jakub Kicinski f4083a752a Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net ... Conflicts: drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h 9e26680733 ("bnxt_en: Update firmware call to retrieve TX PTP timestamp") 9e518f2580 ("bnxt_en: 1PPS functions to configure TSIO pins") 099fdeda65 ("bnxt_en: Event handler for PPS events") kernel/bpf/helpers.c include/linux/bpf-cgroup.h a2baf4e8bb ("bpf: Fix potentially incorrect results with bpf_get_local_storage()") c7603cfa04 ("bpf: Add ambient BPF runtime context stored in current") drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c 5957cc557d ("net/mlx5: Set all field of mlx5_irq before inserting it to the xarray") 2d0b41a376 ("net/mlx5: Refcount mlx5_irq with integer") MAINTAINERS 7b637cd52f ("MAINTAINERS: fix Microchip CAN BUS Analyzer Tool entry typo") 7d901a1e87 ("net: phy: add Maxlinear GPY115/21x/24x driver") Signed-off-by: Jakub Kicinski <kuba@kernel.org>		2021-08-13 06:41:22 -07:00
..
apparmor	apparmor: use get_unaligned() only for multi-byte words	2021-05-17 13:30:29 +02:00
bpf	bpf: Implement task local storage	2020-11-06 08:08:37 -08:00
integrity	evm: Check xattr size discrepancy between kernel and user	2021-06-21 08:34:21 -04:00
keys	trusted-keys: match tpm_get_ops on all return paths	2021-05-12 22:36:37 +03:00
landlock	landlock: Enable user space to infer supported features	2021-04-22 12:22:11 -07:00
loadpin	LSM: Add "contents" flag to kernel_read_file hook	2020-10-05 13:37:03 +02:00
lockdown	Merge branch 'next-general' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2020-06-02 17:36:24 -07:00
safesetid	LSM: SafeSetID: Mark safesetid_initialized as __initdata	2021-06-10 09:52:32 -07:00
selinux	Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net	2021-08-05 15:08:47 -07:00
smack	Smack: fix doc warning	2021-06-08 10:23:08 -07:00
tomoyo	tomoyo: fix doc warnings	2021-06-16 00:01:28 +09:00
yama	task_work: cleanup notification modes	2020-10-17 15:05:30 -06:00
commoncap.c	Miscellaneous minor fixes for v5.13.	2021-04-27 19:32:55 -07:00
device_cgroup.c	device_cgroup: Fix RCU list debugging warning	2020-08-20 11:25:03 -07:00
inode.c
Kconfig	landlock: Set up the security framework and manage credentials	2021-04-22 12:22:10 -07:00
Kconfig.hardening	kasan: remove redundant config option	2021-04-16 16:10:36 -07:00
lsm_audit.c	audit: remove unnecessary 'ret' initialization	2021-06-11 13:21:28 -04:00
Makefile	landlock: Add object management	2021-04-22 12:22:10 -07:00
min_addr.c
security.c	bpf: Add lockdown check for probe_write_user helper	2021-08-10 10:10:10 +02:00