Skip to content

Commit

Permalink
kernel: bump to 4.14.149 and 4.19.79
Browse files Browse the repository at this point in the history
  • Loading branch information
coolsnowwolf committed Oct 15, 2019
1 parent 9574c86 commit 1aa668b
Show file tree
Hide file tree
Showing 27 changed files with 163 additions and 1,397 deletions.
1,188 changes: 0 additions & 1,188 deletions be3892284ca77a69615351b106b8dfbadad.patch

This file was deleted.

8 changes: 4 additions & 4 deletions include/kernel-version.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ ifdef CONFIG_TESTING_KERNEL
endif

LINUX_VERSION-4.9 = .196
LINUX_VERSION-4.14 = .148
LINUX_VERSION-4.19 = .78
LINUX_VERSION-4.14 = .149
LINUX_VERSION-4.19 = .79

LINUX_KERNEL_HASH-4.9.196 = e0ab12b04a975630ece2142a1ac15cfe45140b8c3359226b035c15ca7c92c6ef
LINUX_KERNEL_HASH-4.14.148 = 12d2b74003e13a6c1956064754255249fbe5c7af6cbdfb2ddeba45b5ed7c0fad
LINUX_KERNEL_HASH-4.19.78 = df63ea77c6e28566102a33f503513bc6280f79b48c90921b39661d3ce6295049
LINUX_KERNEL_HASH-4.14.149 = e69dabd2368440ce1650cda0cf043e1ba3f3343f940a43b68e761739fcb3f296
LINUX_KERNEL_HASH-4.19.79 = f1143564364f278ba0893a7813afc02da6ecef6d5de147bd5011aa3cc1634b34

remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell <[email protected]>

--- a/drivers/net/can/spi/mcp251x.c
+++ b/drivers/net/can/spi/mcp251x.c
@@ -939,6 +939,9 @@ static int mcp251x_open(struct net_devic
@@ -948,6 +948,9 @@ static int mcp251x_open(struct net_devic
priv->tx_skb = NULL;
priv->tx_len = 0;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <[email protected]>

--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -2932,6 +2932,10 @@ static irqreturn_t sdhci_irq(int irq, vo
@@ -2937,6 +2937,10 @@ static irqreturn_t sdhci_irq(int irq, vo
result = IRQ_WAKE_THREAD;
}

Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: Phil Elwell <[email protected]>
#include <linux/personality.h>
#include <linux/preempt.h>
#include <linux/printk.h>
@@ -125,6 +126,10 @@ static int c_show(struct seq_file *m, vo
@@ -126,6 +127,10 @@ static int c_show(struct seq_file *m, vo
{
int i, j;
bool compat = personality(current->personality) == PER_LINUX32;
Expand All @@ -29,7 +29,7 @@ Signed-off-by: Phil Elwell <[email protected]>

for_each_online_cpu(i) {
struct cpuinfo_arm64 *cpuinfo = &per_cpu(cpu_data, i);
@@ -176,6 +181,26 @@ static int c_show(struct seq_file *m, vo
@@ -177,6 +182,26 @@ static int c_show(struct seq_file *m, vo
seq_printf(m, "CPU revision\t: %d\n\n", MIDR_REVISION(midr));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
}
nft_chain_release_hook(&hook);
}
@@ -5153,10 +5141,9 @@ static int nf_tables_commit(struct net *
@@ -5156,10 +5144,9 @@ static int nf_tables_commit(struct net *
case NFT_MSG_DELCHAIN:
list_del_rcu(&trans->ctx.chain->list);
nf_tables_chain_notify(&trans->ctx, NFT_MSG_DELCHAIN);
Expand All @@ -278,7 +278,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
break;
case NFT_MSG_NEWRULE:
nft_clear(trans->ctx.net, nft_trans_rule(trans));
@@ -5293,10 +5280,9 @@ static int nf_tables_abort(struct net *n
@@ -5296,10 +5283,9 @@ static int nf_tables_abort(struct net *n
} else {
trans->ctx.table->use--;
list_del_rcu(&trans->ctx.chain->list);
Expand All @@ -292,7 +292,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
}
break;
case NFT_MSG_DELCHAIN:
@@ -5399,7 +5385,7 @@ int nft_chain_validate_hooks(const struc
@@ -5402,7 +5388,7 @@ int nft_chain_validate_hooks(const struc
if (nft_is_base_chain(chain)) {
basechain = nft_base_chain(chain);

Expand All @@ -301,7 +301,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
return 0;

return -EOPNOTSUPP;
@@ -5881,8 +5867,7 @@ int __nft_release_basechain(struct nft_c
@@ -5884,8 +5870,7 @@ int __nft_release_basechain(struct nft_c

BUG_ON(!nft_is_base_chain(ctx->chain));

Expand All @@ -311,7 +311,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
list_for_each_entry_safe(rule, nr, &ctx->chain->rules, list) {
list_del(&rule->list);
ctx->chain->use--;
@@ -5911,8 +5896,7 @@ static void __nft_release_afinfo(struct
@@ -5914,8 +5899,7 @@ static void __nft_release_afinfo(struct

list_for_each_entry_safe(table, nt, &afi->tables, list) {
list_for_each_entry(chain, &table->chains, list)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
list_for_each_entry_safe(obj, ne, &ctx->table->objects, list) {
err = nft_delobj(ctx, obj);
if (err < 0)
@@ -4853,6 +4897,605 @@ static void nf_tables_obj_notify(const s
@@ -4856,6 +4900,605 @@ static void nf_tables_obj_notify(const s
ctx->afi->family, ctx->report, GFP_KERNEL);
}

Expand Down Expand Up @@ -898,7 +898,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
static int nf_tables_fill_gen_info(struct sk_buff *skb, struct net *net,
u32 portid, u32 seq)
{
@@ -4883,6 +5526,49 @@ nla_put_failure:
@@ -4886,6 +5529,49 @@ nla_put_failure:
return -EMSGSIZE;
}

Expand Down Expand Up @@ -948,7 +948,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
static void nf_tables_gen_notify(struct net *net, struct sk_buff *skb,
int event)
{
@@ -5035,6 +5721,21 @@ static const struct nfnl_callback nf_tab
@@ -5038,6 +5724,21 @@ static const struct nfnl_callback nf_tab
.attr_count = NFTA_OBJ_MAX,
.policy = nft_obj_policy,
},
Expand All @@ -970,7 +970,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
};

static void nft_chain_commit_update(struct nft_trans *trans)
@@ -5083,6 +5784,9 @@ static void nf_tables_commit_release(str
@@ -5086,6 +5787,9 @@ static void nf_tables_commit_release(str
case NFT_MSG_DELOBJ:
nft_obj_destroy(nft_trans_obj(trans));
break;
Expand All @@ -980,7 +980,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
}
kfree(trans);
}
@@ -5202,6 +5906,21 @@ static int nf_tables_commit(struct net *
@@ -5205,6 +5909,21 @@ static int nf_tables_commit(struct net *
nf_tables_obj_notify(&trans->ctx, nft_trans_obj(trans),
NFT_MSG_DELOBJ);
break;
Expand All @@ -1002,7 +1002,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
}
}

@@ -5239,6 +5958,9 @@ static void nf_tables_abort_release(stru
@@ -5242,6 +5961,9 @@ static void nf_tables_abort_release(stru
case NFT_MSG_NEWOBJ:
nft_obj_destroy(nft_trans_obj(trans));
break;
Expand All @@ -1012,7 +1012,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
}
kfree(trans);
}
@@ -5330,6 +6052,17 @@ static int nf_tables_abort(struct net *n
@@ -5333,6 +6055,17 @@ static int nf_tables_abort(struct net *n
nft_clear(trans->ctx.net, nft_trans_obj(trans));
nft_trans_destroy(trans);
break;
Expand All @@ -1030,15 +1030,15 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
}
}

@@ -5880,6 +6613,7 @@ EXPORT_SYMBOL_GPL(__nft_release_basechai
@@ -5883,6 +6616,7 @@ EXPORT_SYMBOL_GPL(__nft_release_basechai
/* Called by nft_unregister_afinfo() from __net_exit path, nfnl_lock is held. */
static void __nft_release_afinfo(struct net *net, struct nft_af_info *afi)
{
+ struct nft_flowtable *flowtable, *nf;
struct nft_table *table, *nt;
struct nft_chain *chain, *nc;
struct nft_object *obj, *ne;
@@ -5893,6 +6627,9 @@ static void __nft_release_afinfo(struct
@@ -5896,6 +6630,9 @@ static void __nft_release_afinfo(struct
list_for_each_entry_safe(table, nt, &afi->tables, list) {
list_for_each_entry(chain, &table->chains, list)
nf_tables_unregister_hook(net, table, chain);
Expand All @@ -1048,7 +1048,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
/* No packets are walking on these chains anymore. */
ctx.table = table;
list_for_each_entry(chain, &table->chains, list) {
@@ -5903,6 +6640,11 @@ static void __nft_release_afinfo(struct
@@ -5906,6 +6643,11 @@ static void __nft_release_afinfo(struct
nf_tables_rule_release(&ctx, rule);
}
}
Expand All @@ -1060,7 +1060,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
list_for_each_entry_safe(set, ns, &table->sets, list) {
list_del(&set->list);
table->use--;
@@ -5946,6 +6688,8 @@ static int __init nf_tables_module_init(
@@ -5949,6 +6691,8 @@ static int __init nf_tables_module_init(
if (err < 0)
goto err3;

Expand All @@ -1069,7 +1069,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
pr_info("nf_tables: (c) 2007-2009 Patrick McHardy <[email protected]>\n");
return register_pernet_subsys(&nf_tables_net_ops);
err3:
@@ -5960,6 +6704,7 @@ static void __exit nf_tables_module_exit
@@ -5963,6 +6707,7 @@ static void __exit nf_tables_module_exit
{
unregister_pernet_subsys(&nf_tables_net_ops);
nfnetlink_subsys_unregister(&nf_tables_subsys);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
hook->priority = ntohl(nla_get_be32(ha[NFTA_HOOK_PRIORITY]));

type = chain_type[afi->family][NFT_CHAIN_T_DEFAULT];
@@ -5005,7 +5002,7 @@ static int nf_tables_flowtable_parse_hoo
@@ -5008,7 +5005,7 @@ static int nf_tables_flowtable_parse_hoo
return -EINVAL;

hooknum = ntohl(nla_get_be32(tb[NFTA_FLOWTABLE_HOOK_NUM]));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>

--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -5429,7 +5429,7 @@ static int nf_tables_getflowtable(struct
@@ -5432,7 +5432,7 @@ static int nf_tables_getflowtable(struct

flowtable = nf_tables_flowtable_lookup(table, nla[NFTA_FLOWTABLE_NAME],
genmask);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,15 +62,15 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
if (ret >= 0) {
ctx->table->flags &= ~NFT_TABLE_F_DORMANT;
nft_trans_table_enable(trans) = true;
@@ -5810,7 +5803,6 @@ static int nf_tables_commit(struct net *
@@ -5813,7 +5806,6 @@ static int nf_tables_commit(struct net *
if (nft_trans_table_update(trans)) {
if (!nft_trans_table_enable(trans)) {
nf_tables_table_disable(net,
- trans->ctx.afi,
trans->ctx.table);
trans->ctx.table->flags |= NFT_TABLE_F_DORMANT;
}
@@ -5974,7 +5966,6 @@ static int nf_tables_abort(struct net *n
@@ -5977,7 +5969,6 @@ static int nf_tables_abort(struct net *n
if (nft_trans_table_update(trans)) {
if (nft_trans_table_enable(trans)) {
nf_tables_table_disable(net,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>

--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -5348,8 +5348,10 @@ static int nf_tables_dump_flowtable_done
@@ -5351,8 +5351,10 @@ static int nf_tables_dump_flowtable_done
if (!filter)
return 0;

Expand Down
Loading

0 comments on commit 1aa668b

Please sign in to comment.