moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge 51e6d17809 ("Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next") into android-mainline

Browse Source 
First steps of the 5.12-rc1 merge, the large networking chunk.

Resolves merge conflicts in:
	net/core/filter.c
	net/ipv6/route.c

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Id1650a4e7ab7104647e85beddddb672f779d4d1f
This commit is contained in:
Greg Kroah-Hartman
2021-02-23 08:01:48 +01:00
parent 42daaf8760 51e6d17809
commit 4d1e11edcc
1581 changed files with 110766 additions and 33362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/ipv6.h
View File

@@ -31,6 +31,7 @@ struct ipv6_devconf {
__s32 max_desync_factor;
__s32 max_addresses;
__s32 accept_ra_defrtr;
__u32 ra_defrtr_metric;
__s32 accept_ra_min_hop_limit;
__s32 accept_ra_pinfo;
__s32 ignore_routes_with_linkdown;