kernel: bump 5.15 to 5.15.59
Patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
		 John Audia
					John Audia
				
			
				
					committed by
					
						 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
			
				
	
			
			
			 Hauke Mehrtens
						Hauke Mehrtens
					
				
			
						parent
						
							7df6795d4c
						
					
				
				
					commit
					122b625e74
				
			| @@ -1,2 +1,2 @@ | |||||||
| LINUX_VERSION-5.15 = .58 | LINUX_VERSION-5.15 = .59 | ||||||
| LINUX_KERNEL_HASH-5.15.58 = d75bd9579c4b318e6162e21c591878fd37efda0f79c5cdd0dc4eb9ea9dfc4fa8 | LINUX_KERNEL_HASH-5.15.59 = e6ddc642057340db06b3b921c2b31bfed2c611359e8f144c3e5cf9c3ac33bccb | ||||||
|   | |||||||
| @@ -305,7 +305,7 @@ | |||||||
|  	list_for_each_entry(p, head, list) { |  	list_for_each_entry(p, head, list) { | ||||||
| --- a/net/ipv4/tcp_output.c | --- a/net/ipv4/tcp_output.c | ||||||
| +++ b/net/ipv4/tcp_output.c | +++ b/net/ipv4/tcp_output.c | ||||||
| @@ -613,48 +613,53 @@ static void tcp_options_write(__be32 *pt | @@ -610,48 +610,53 @@ static void tcp_options_write(__be32 *pt | ||||||
|  	u16 options = opts->options;	/* mungable copy */ |  	u16 options = opts->options;	/* mungable copy */ | ||||||
|   |   | ||||||
|  	if (unlikely(OPTION_MD5 & options)) { |  	if (unlikely(OPTION_MD5 & options)) { | ||||||
| @@ -382,7 +382,7 @@ | |||||||
|  	} |  	} | ||||||
|   |   | ||||||
|  	if (unlikely(opts->num_sack_blocks)) { |  	if (unlikely(opts->num_sack_blocks)) { | ||||||
| @@ -662,16 +667,17 @@ static void tcp_options_write(__be32 *pt | @@ -659,16 +664,17 @@ static void tcp_options_write(__be32 *pt | ||||||
|  			tp->duplicate_sack : tp->selective_acks; |  			tp->duplicate_sack : tp->selective_acks; | ||||||
|  		int this_sack; |  		int this_sack; | ||||||
|   |   | ||||||
| @@ -406,7 +406,7 @@ | |||||||
|  		} |  		} | ||||||
|   |   | ||||||
|  		tp->rx_opt.dsack = 0; |  		tp->rx_opt.dsack = 0; | ||||||
| @@ -684,13 +690,14 @@ static void tcp_options_write(__be32 *pt | @@ -681,13 +687,14 @@ static void tcp_options_write(__be32 *pt | ||||||
|   |   | ||||||
|  		if (foc->exp) { |  		if (foc->exp) { | ||||||
|  			len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len; |  			len = TCPOLEN_EXP_FASTOPEN_BASE + foc->len; | ||||||
| @@ -706,7 +706,7 @@ | |||||||
|  EXPORT_SYMBOL(xfrm_parse_spi); |  EXPORT_SYMBOL(xfrm_parse_spi); | ||||||
| --- a/net/ipv4/tcp_input.c | --- a/net/ipv4/tcp_input.c | ||||||
| +++ b/net/ipv4/tcp_input.c | +++ b/net/ipv4/tcp_input.c | ||||||
| @@ -4138,14 +4138,16 @@ static bool tcp_parse_aligned_timestamp( | @@ -4140,14 +4140,16 @@ static bool tcp_parse_aligned_timestamp( | ||||||
|  { |  { | ||||||
|  	const __be32 *ptr = (const __be32 *)(th + 1); |  	const __be32 *ptr = (const __be32 *)(th + 1); | ||||||
|   |   | ||||||
|   | |||||||
| @@ -341,7 +341,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|   |   | ||||||
| --- a/net/ipv4/fib_trie.c | --- a/net/ipv4/fib_trie.c | ||||||
| +++ b/net/ipv4/fib_trie.c | +++ b/net/ipv4/fib_trie.c | ||||||
| @@ -3019,11 +3019,13 @@ static const struct seq_operations fib_r | @@ -3022,11 +3022,13 @@ static const struct seq_operations fib_r | ||||||
|   |   | ||||||
|  int __net_init fib_proc_init(struct net *net) |  int __net_init fib_proc_init(struct net *net) | ||||||
|  { |  { | ||||||
| @@ -357,7 +357,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> | |||||||
|  			fib_triestat_seq_show, NULL)) |  			fib_triestat_seq_show, NULL)) | ||||||
|  		goto out2; |  		goto out2; | ||||||
|   |   | ||||||
| @@ -3034,17 +3036,21 @@ int __net_init fib_proc_init(struct net | @@ -3037,17 +3039,21 @@ int __net_init fib_proc_init(struct net | ||||||
|  	return 0; |  	return 0; | ||||||
|   |   | ||||||
|  out3: |  out3: | ||||||
|   | |||||||
| @@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de> | |||||||
|  |  | ||||||
| --- a/mm/page_alloc.c | --- a/mm/page_alloc.c | ||||||
| +++ b/mm/page_alloc.c | +++ b/mm/page_alloc.c | ||||||
| @@ -7552,7 +7552,7 @@ static void __init alloc_node_mem_map(st | @@ -7556,7 +7556,7 @@ static void __init alloc_node_mem_map(st | ||||||
|  	if (pgdat == NODE_DATA(0)) { |  	if (pgdat == NODE_DATA(0)) { | ||||||
|  		mem_map = NODE_DATA(0)->node_mem_map; |  		mem_map = NODE_DATA(0)->node_mem_map; | ||||||
|  		if (page_to_pfn(mem_map) != pgdat->node_start_pfn) |  		if (page_to_pfn(mem_map) != pgdat->node_start_pfn) | ||||||
|   | |||||||
| @@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> | |||||||
|  static void rt_fibinfo_free(struct rtable __rcu **rtp) |  static void rt_fibinfo_free(struct rtable __rcu **rtp) | ||||||
| --- a/net/ipv4/fib_trie.c | --- a/net/ipv4/fib_trie.c | ||||||
| +++ b/net/ipv4/fib_trie.c | +++ b/net/ipv4/fib_trie.c | ||||||
| @@ -2767,6 +2767,7 @@ static const char *const rtn_type_names[ | @@ -2770,6 +2770,7 @@ static const char *const rtn_type_names[ | ||||||
|  	[RTN_THROW] = "THROW", |  	[RTN_THROW] = "THROW", | ||||||
|  	[RTN_NAT] = "NAT", |  	[RTN_NAT] = "NAT", | ||||||
|  	[RTN_XRESOLVE] = "XRESOLVE", |  	[RTN_XRESOLVE] = "XRESOLVE", | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user