kernel: bump 5.10 to 5.10.143

All patches automatically rebased.

Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
John Audia 2022-09-15 09:56:36 -04:00 committed by Hauke Mehrtens
parent fe209fa47d
commit b77217d916
6 changed files with 11 additions and 11 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .142 LINUX_VERSION-5.10 = .143
LINUX_KERNEL_HASH-5.10.142 = 3f47ebdb9afe152a0c32c1157336ef13fa5cc08ac6d884dfc1f6ddc2b7dba268 LINUX_KERNEL_HASH-5.10.143 = fa2c9edef272d39dca52e057e1d41433cf1b6ab6a00d24a00333c0b735054e91

View File

@ -20,7 +20,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
--- a/drivers/regulator/core.c --- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c +++ b/drivers/regulator/core.c
@@ -2987,7 +2987,8 @@ static int _regulator_list_voltage(struc @@ -2992,7 +2992,8 @@ static int _regulator_list_voltage(struc
return rdev->desc->fixed_uV; return rdev->desc->fixed_uV;
if (ops->list_voltage) { if (ops->list_voltage) {
@ -30,7 +30,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
return -EINVAL; return -EINVAL;
if (lock) if (lock)
regulator_lock(rdev); regulator_lock(rdev);
@@ -3138,7 +3139,8 @@ int regulator_list_hardware_vsel(struct @@ -3143,7 +3144,8 @@ int regulator_list_hardware_vsel(struct
struct regulator_dev *rdev = regulator->rdev; struct regulator_dev *rdev = regulator->rdev;
const struct regulator_ops *ops = rdev->desc->ops; const struct regulator_ops *ops = rdev->desc->ops;
@ -40,7 +40,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
return -EINVAL; return -EINVAL;
if (ops->set_voltage_sel != regulator_set_voltage_sel_regmap) if (ops->set_voltage_sel != regulator_set_voltage_sel_regmap)
return -EOPNOTSUPP; return -EOPNOTSUPP;
@@ -4061,6 +4063,9 @@ int regulator_set_voltage_time(struct re @@ -4066,6 +4068,9 @@ int regulator_set_voltage_time(struct re
for (i = 0; i < rdev->desc->n_voltages; i++) { for (i = 0; i < rdev->desc->n_voltages; i++) {
/* We only look for exact voltage matches here */ /* We only look for exact voltage matches here */

View File

@ -14,7 +14,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
--- a/drivers/regulator/core.c --- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c +++ b/drivers/regulator/core.c
@@ -4066,6 +4066,9 @@ int regulator_set_voltage_time(struct re @@ -4071,6 +4071,9 @@ int regulator_set_voltage_time(struct re
if (i < rdev->desc->linear_min_sel) if (i < rdev->desc->linear_min_sel)
continue; continue;

View File

@ -21,7 +21,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
--- a/drivers/regulator/core.c --- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c +++ b/drivers/regulator/core.c
@@ -2987,9 +2987,10 @@ static int _regulator_list_voltage(struc @@ -2992,9 +2992,10 @@ static int _regulator_list_voltage(struc
return rdev->desc->fixed_uV; return rdev->desc->fixed_uV;
if (ops->list_voltage) { if (ops->list_voltage) {
@ -34,7 +34,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
if (lock) if (lock)
regulator_lock(rdev); regulator_lock(rdev);
ret = ops->list_voltage(rdev, selector); ret = ops->list_voltage(rdev, selector);
@@ -3139,9 +3140,10 @@ int regulator_list_hardware_vsel(struct @@ -3144,9 +3145,10 @@ int regulator_list_hardware_vsel(struct
struct regulator_dev *rdev = regulator->rdev; struct regulator_dev *rdev = regulator->rdev;
const struct regulator_ops *ops = rdev->desc->ops; const struct regulator_ops *ops = rdev->desc->ops;

View File

@ -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
@@ -4116,14 +4116,16 @@ static bool tcp_parse_aligned_timestamp( @@ -4127,14 +4127,16 @@ static bool tcp_parse_aligned_timestamp(
{ {
const __be32 *ptr = (const __be32 *)(th + 1); const __be32 *ptr = (const __be32 *)(th + 1);

View File

@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
nft_trans_table_update(trans) = true; nft_trans_table_update(trans) = true;
list_add_tail(&trans->list, &ctx->net->nft.commit_list); list_add_tail(&trans->list, &ctx->net->nft.commit_list);
return 0; return 0;
@@ -7919,11 +7923,10 @@ static int nf_tables_commit(struct net * @@ -7921,11 +7925,10 @@ static int nf_tables_commit(struct net *
switch (trans->msg_type) { switch (trans->msg_type) {
case NFT_MSG_NEWTABLE: case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) { if (nft_trans_table_update(trans)) {
@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
} else { } else {
nft_clear(net, trans->ctx.table); nft_clear(net, trans->ctx.table);
} }
@@ -8137,11 +8140,9 @@ static int __nf_tables_abort(struct net @@ -8139,11 +8142,9 @@ static int __nf_tables_abort(struct net
switch (trans->msg_type) { switch (trans->msg_type) {
case NFT_MSG_NEWTABLE: case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) { if (nft_trans_table_update(trans)) {