???
This commit is contained in:
parent
0039b4bed5
commit
c4d98eb916
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-6.1 = .25
|
LINUX_VERSION-6.1 = .26
|
||||||
LINUX_KERNEL_HASH-6.1.25 = cb72436ceb15086ae3df65e590592030692a9237a37d64105478eb5a72493091
|
LINUX_KERNEL_HASH-6.1.26 = dfdcc143a879d64a5ee99213b2b4b05b5dccd566c144df93bca1e204df64c110
|
@ -1886,7 +1886,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||||||
result->xdp_packets += packets;
|
result->xdp_packets += packets;
|
||||||
--- a/drivers/net/virtio_net.c
|
--- a/drivers/net/virtio_net.c
|
||||||
+++ b/drivers/net/virtio_net.c
|
+++ b/drivers/net/virtio_net.c
|
||||||
@@ -2071,18 +2071,18 @@ static void virtnet_stats(struct net_dev
|
@@ -2075,18 +2075,18 @@ static void virtnet_stats(struct net_dev
|
||||||
struct send_queue *sq = &vi->sq[i];
|
struct send_queue *sq = &vi->sq[i];
|
||||||
|
|
||||||
do {
|
do {
|
||||||
@ -1909,7 +1909,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||||||
|
|
||||||
tot->rx_packets += rpackets;
|
tot->rx_packets += rpackets;
|
||||||
tot->tx_packets += tpackets;
|
tot->tx_packets += tpackets;
|
||||||
@@ -2693,12 +2693,12 @@ static void virtnet_get_ethtool_stats(st
|
@@ -2697,12 +2697,12 @@ static void virtnet_get_ethtool_stats(st
|
||||||
|
|
||||||
stats_base = (u8 *)&rq->stats;
|
stats_base = (u8 *)&rq->stats;
|
||||||
do {
|
do {
|
||||||
@ -1924,7 +1924,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||||||
idx += VIRTNET_RQ_STATS_LEN;
|
idx += VIRTNET_RQ_STATS_LEN;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2707,12 +2707,12 @@ static void virtnet_get_ethtool_stats(st
|
@@ -2711,12 +2711,12 @@ static void virtnet_get_ethtool_stats(st
|
||||||
|
|
||||||
stats_base = (u8 *)&sq->stats;
|
stats_base = (u8 *)&sq->stats;
|
||||||
do {
|
do {
|
||||||
|
@ -10,7 +10,7 @@ Subject: [PATCH] Kconfig: add tristate for OID and ASNI string
|
|||||||
|
|
||||||
--- a/init/Kconfig
|
--- a/init/Kconfig
|
||||||
+++ b/init/Kconfig
|
+++ b/init/Kconfig
|
||||||
@@ -2007,7 +2007,7 @@ config PADATA
|
@@ -2003,7 +2003,7 @@ config PADATA
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config ASN1
|
config ASN1
|
||||||
|
@ -60,7 +60,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
*/
|
*/
|
||||||
--- a/include/linux/skbuff.h
|
--- a/include/linux/skbuff.h
|
||||||
+++ b/include/linux/skbuff.h
|
+++ b/include/linux/skbuff.h
|
||||||
@@ -3021,6 +3021,10 @@ static inline int pskb_trim(struct sk_bu
|
@@ -3022,6 +3022,10 @@ static inline int pskb_trim(struct sk_bu
|
||||||
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
|
return (len < skb->len) ? __pskb_trim(skb, len) : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -71,7 +71,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
/**
|
/**
|
||||||
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
|
* pskb_trim_unique - remove end from a paged unique (not cloned) buffer
|
||||||
* @skb: buffer to alter
|
* @skb: buffer to alter
|
||||||
@@ -3170,16 +3174,6 @@ static inline struct sk_buff *dev_alloc_
|
@@ -3171,16 +3175,6 @@ static inline struct sk_buff *dev_alloc_
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -235,7 +235,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
if (!pe)
|
if (!pe)
|
||||||
--- a/mm/vmalloc.c
|
--- a/mm/vmalloc.c
|
||||||
+++ b/mm/vmalloc.c
|
+++ b/mm/vmalloc.c
|
||||||
@@ -4179,6 +4179,8 @@ static const struct seq_operations vmall
|
@@ -4183,6 +4183,8 @@ static const struct seq_operations vmall
|
||||||
|
|
||||||
static int __init proc_vmalloc_init(void)
|
static int __init proc_vmalloc_init(void)
|
||||||
{
|
{
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
struct list_head *br_ip_list);
|
struct list_head *br_ip_list);
|
||||||
--- a/include/linux/skbuff.h
|
--- a/include/linux/skbuff.h
|
||||||
+++ b/include/linux/skbuff.h
|
+++ b/include/linux/skbuff.h
|
||||||
@@ -986,6 +986,10 @@ struct sk_buff {
|
@@ -987,6 +987,10 @@ struct sk_buff {
|
||||||
__u8 csum_not_inet:1;
|
__u8 csum_not_inet:1;
|
||||||
__u8 scm_io_uring:1;
|
__u8 scm_io_uring:1;
|
||||||
|
|
||||||
|
@ -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
|
||||||
@@ -7895,7 +7895,7 @@ static void __init alloc_node_mem_map(st
|
@@ -7911,7 +7911,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)
|
||||||
|
@ -13,7 +13,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/init/Kconfig
|
--- a/init/Kconfig
|
||||||
+++ b/init/Kconfig
|
+++ b/init/Kconfig
|
||||||
@@ -1485,6 +1485,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
|
@@ -1481,6 +1481,17 @@ config SYSCTL_ARCH_UNALIGN_ALLOW
|
||||||
the unaligned access emulation.
|
the unaligned access emulation.
|
||||||
see arch/parisc/kernel/unaligned.c for reference
|
see arch/parisc/kernel/unaligned.c for reference
|
||||||
|
|
||||||
|
@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
--- a/include/linux/skbuff.h
|
--- a/include/linux/skbuff.h
|
||||||
+++ b/include/linux/skbuff.h
|
+++ b/include/linux/skbuff.h
|
||||||
@@ -2987,7 +2987,7 @@ static inline int pskb_network_may_pull(
|
@@ -2988,7 +2988,7 @@ static inline int pskb_network_may_pull(
|
||||||
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
|
* NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
|
||||||
*/
|
*/
|
||||||
#ifndef NET_SKB_PAD
|
#ifndef NET_SKB_PAD
|
||||||
|
@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
#endif
|
#endif
|
||||||
--- a/include/linux/skbuff.h
|
--- a/include/linux/skbuff.h
|
||||||
+++ b/include/linux/skbuff.h
|
+++ b/include/linux/skbuff.h
|
||||||
@@ -963,6 +963,7 @@ struct sk_buff {
|
@@ -964,6 +964,7 @@ struct sk_buff {
|
||||||
#ifdef CONFIG_IPV6_NDISC_NODETYPE
|
#ifdef CONFIG_IPV6_NDISC_NODETYPE
|
||||||
__u8 ndisc_nodetype:2;
|
__u8 ndisc_nodetype:2;
|
||||||
#endif
|
#endif
|
||||||
|
@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|||||||
|
|
||||||
--- a/init/Kconfig
|
--- a/init/Kconfig
|
||||||
+++ b/init/Kconfig
|
+++ b/init/Kconfig
|
||||||
@@ -1830,6 +1830,15 @@ config EMBEDDED
|
@@ -1826,6 +1826,15 @@ config EMBEDDED
|
||||||
an embedded system so certain expert options are available
|
an embedded system so certain expert options are available
|
||||||
for configuration.
|
for configuration.
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user