Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kernel: bump 6.0 to 6.0.7 #10364

Merged
merged 1 commit into from
Nov 4, 2022
Merged

kernel: bump 6.0 to 6.0.7 #10364

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions include/kernel-6.0
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.0 = .6
LINUX_KERNEL_HASH-6.0.6 = 864b05af2d869ba73d61a9c5959e4531a141ab2bd7b217483671f625f9747faa
LINUX_VERSION-6.0 = .7
LINUX_KERNEL_HASH-6.0.7 = 67dacc2b78605a56e997f4c08d009be87c98ec66f1870220226c8b3cc676590f
2 changes: 1 addition & 1 deletion target/linux/generic/pending-6.0/120-Fix-alloc_node_mem_map-with-ARCH_PFN_OFFSET-calcu.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Signed-off-by: Tobias Wolf <dev-NTEO@vplace.de>

--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7837,7 +7837,7 @@ static void __init alloc_node_mem_map(st
@@ -7838,7 +7838,7 @@ static void __init alloc_node_mem_map(st
if (pgdat == NODE_DATA(0)) {
mem_map = NODE_DATA(0)->node_mem_map;
if (page_to_pfn(mem_map) != pgdat->node_start_pfn)
Expand Down
18 changes: 9 additions & 9 deletions target/linux/generic/pending-6.0/666-Add-support-for-MAP-E-FMRs-mesh-mode.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6))
return -1;

@@ -1529,6 +1690,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
@@ -1530,6 +1691,14 @@ ip6_tnl_change(struct ip6_tnl *t, const
t->parms.link = p->link;
t->parms.proto = p->proto;
t->parms.fwmark = p->fwmark;
Expand All @@ -353,15 +353,15 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
dst_cache_reset(&t->dst_cache);
ip6_tnl_link_config(t);
}
@@ -1563,6 +1732,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
@@ -1564,6 +1733,7 @@ ip6_tnl_parm_from_user(struct __ip6_tnl_
p->flowinfo = u->flowinfo;
p->link = u->link;
p->proto = u->proto;
+ p->fmrs = NULL;
memcpy(p->name, u->name, sizeof(u->name));
}

@@ -1949,6 +2119,15 @@ static int ip6_tnl_validate(struct nlatt
@@ -1950,6 +2120,15 @@ static int ip6_tnl_validate(struct nlatt
return 0;
}

Expand All @@ -377,7 +377,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
static void ip6_tnl_netlink_parms(struct nlattr *data[],
struct __ip6_tnl_parm *parms)
{
@@ -1986,6 +2165,46 @@ static void ip6_tnl_netlink_parms(struct
@@ -1987,6 +2166,46 @@ static void ip6_tnl_netlink_parms(struct

if (data[IFLA_IPTUN_FWMARK])
parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]);
Expand Down Expand Up @@ -424,7 +424,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
}

static bool ip6_tnl_netlink_encap_parms(struct nlattr *data[],
@@ -2102,6 +2321,12 @@ static void ip6_tnl_dellink(struct net_d
@@ -2103,6 +2322,12 @@ static void ip6_tnl_dellink(struct net_d

static size_t ip6_tnl_get_size(const struct net_device *dev)
{
Expand All @@ -437,7 +437,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
return
/* IFLA_IPTUN_LINK */
nla_total_size(4) +
@@ -2131,6 +2356,24 @@ static size_t ip6_tnl_get_size(const str
@@ -2132,6 +2357,24 @@ static size_t ip6_tnl_get_size(const str
nla_total_size(0) +
/* IFLA_IPTUN_FWMARK */
nla_total_size(4) +
Expand All @@ -462,7 +462,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
0;
}

@@ -2138,6 +2381,9 @@ static int ip6_tnl_fill_info(struct sk_b
@@ -2139,6 +2382,9 @@ static int ip6_tnl_fill_info(struct sk_b
{
struct ip6_tnl *tunnel = netdev_priv(dev);
struct __ip6_tnl_parm *parm = &tunnel->parms;
Expand All @@ -472,7 +472,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>

if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) ||
nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) ||
@@ -2147,9 +2393,27 @@ static int ip6_tnl_fill_info(struct sk_b
@@ -2148,9 +2394,27 @@ static int ip6_tnl_fill_info(struct sk_b
nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) ||
nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) ||
Expand Down Expand Up @@ -501,7 +501,7 @@ Signed-off-by: Steven Barth <cyrus@openwrt.org>
if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) ||
nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) ||
@@ -2189,6 +2453,7 @@ static const struct nla_policy ip6_tnl_p
@@ -2190,6 +2454,7 @@ static const struct nla_policy ip6_tnl_p
[IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 },
[IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG },
[IFLA_IPTUN_FWMARK] = { .type = NLA_U32 },
Expand Down