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.

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 5.10 to 5.10.143 #10138

Merged
merged 2 commits into from
Sep 17, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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-5.10
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .142
LINUX_KERNEL_HASH-5.10.142 = 3f47ebdb9afe152a0c32c1157336ef13fa5cc08ac6d884dfc1f6ddc2b7dba268
LINUX_VERSION-5.10 = .143
LINUX_KERNEL_HASH-5.10.143 = fa2c9edef272d39dca52e057e1d41433cf1b6ab6a00d24a00333c0b735054e91
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ produce a noisy warning.
hcd->msi_enabled = 1;
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1892,6 +1892,7 @@ struct xhci_hcd {
@@ -1895,6 +1895,7 @@ struct xhci_hcd {
struct xhci_hub usb2_rhub;
struct xhci_hub usb3_rhub;
/* support xHCI 1.0 spec USB2 hardware LPM */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ Signed-off-by: John Crispin <[email protected]>

--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -931,6 +931,17 @@ config LEDS_ACER_A500

source "drivers/leds/blink/Kconfig"
@@ -929,6 +929,17 @@ config LEDS_ACER_A500
This option enables support for the Power Button LED of
Acer Iconia Tab A500.

+config LEDS_RESET
+ tristate "LED support for reset-controller API"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Signed-off-by: David Bauer <[email protected]>

--- a/drivers/mtd/spi-nor/macronix.c
+++ b/drivers/mtd/spi-nor/macronix.c
@@ -51,7 +51,8 @@ static const struct flash_info macronix_
@@ -50,7 +50,8 @@ static const struct flash_info macronix_
{ "mx25u4035", INFO(0xc22533, 0, 64 * 1024, 8, SECT_4K) },
{ "mx25u8035", INFO(0xc22534, 0, 64 * 1024, 16, SECT_4K) },
{ "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ Signed-off-by: Abhimanyu Vishwakarma <[email protected]>

--- a/drivers/mtd/spi-nor/core.c
+++ b/drivers/mtd/spi-nor/core.c
@@ -3156,6 +3156,7 @@ int spi_nor_scan(struct spi_nor *nor, co
@@ -3150,6 +3150,7 @@ int spi_nor_scan(struct spi_nor *nor, co
struct device *dev = nor->dev;
struct mtd_info *mtd = &nor->mtd;
struct device_node *np = spi_nor_get_flash_node(nor);
+ const char __maybe_unused *of_mtd_name = NULL;
int ret;
int i;

@@ -3210,7 +3211,12 @@ int spi_nor_scan(struct spi_nor *nor, co
@@ -3204,7 +3205,12 @@ int spi_nor_scan(struct spi_nor *nor, co
if (ret)
return ret;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/drivers/mtd/parsers/redboot.c
+++ b/drivers/mtd/parsers/redboot.c
@@ -90,12 +90,18 @@ static int parse_redboot_partitions(stru
@@ -91,12 +91,18 @@ static int parse_redboot_partitions(stru

parse_redboot_of(master);

Expand All @@ -19,7 +19,7 @@
return -EIO;
}
offset -= master->erasesize;
@@ -108,10 +114,6 @@ static int parse_redboot_partitions(stru
@@ -109,10 +115,6 @@ static int parse_redboot_partitions(stru
goto nogood;
}
}
Expand All @@ -30,7 +30,7 @@

printk(KERN_NOTICE "Searching for RedBoot partition table in %s at offset 0x%lx\n",
master->name, offset);
@@ -184,6 +186,11 @@ static int parse_redboot_partitions(stru
@@ -185,6 +187,11 @@ static int parse_redboot_partitions(stru
}
if (i == numslots) {
/* Didn't find it */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@
struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh)
--- a/net/netfilter/nf_conntrack_proto_tcp.c
+++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -415,7 +415,7 @@ static void tcp_sack(const struct sk_buf
@@ -423,7 +423,7 @@ static void tcp_sack(const struct sk_buf

/* Fast path for timestamp-only option */
if (length == TCPOLEN_TSTAMP_ALIGNED
Expand All @@ -706,7 +706,7 @@
EXPORT_SYMBOL(xfrm_parse_spi);
--- a/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);

Expand Down
2 changes: 1 addition & 1 deletion target/linux/ath79/patches-5.10/920-mikrotik-rb4xx.patch
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
menu "SPI GPIO expanders"
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -121,6 +121,7 @@ obj-$(CONFIG_GPIO_PL061) += gpio-pl061.
@@ -120,6 +120,7 @@ obj-$(CONFIG_GPIO_PL061) += gpio-pl061.
obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio-pmic-eic-sprd.o
obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o
obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o
Expand Down
4 changes: 2 additions & 2 deletions target/linux/ath79/patches-5.10/939-mikrotik-rb91x.patch
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@
depends on MFD_SYSCON
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -73,6 +73,7 @@ obj-$(CONFIG_GPIO_IT87) += gpio-it87.o
@@ -72,6 +72,7 @@ obj-$(CONFIG_GPIO_IT87) += gpio-it87.o
obj-$(CONFIG_GPIO_IXP4XX) += gpio-ixp4xx.o
obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o
obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o
+obj-$(CONFIG_GPIO_LATCH) += gpio-latch.o
obj-$(CONFIG_GPIO_LOGICVC) += gpio-logicvc.o
obj-$(CONFIG_GPIO_LOONGSON1) += gpio-loongson1.o
obj-$(CONFIG_GPIO_LOONGSON) += gpio-loongson.o
@@ -122,6 +123,7 @@ obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio
@@ -121,6 +122,7 @@ obj-$(CONFIG_GPIO_PMIC_EIC_SPRD) += gpio
obj-$(CONFIG_GPIO_PXA) += gpio-pxa.o
obj-$(CONFIG_GPIO_RASPBERRYPI_EXP) += gpio-raspberrypi-exp.o
obj-$(CONFIG_GPIO_RB4XX) += gpio-rb4xx.o
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <[email protected]>

--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -317,6 +317,9 @@ config BCM63XX
@@ -319,6 +319,9 @@ config BCM63XX
select SYNC_R4K
select DMA_NONCOHERENT
select IRQ_MIPS_CPU
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Signed-off-by: Chuck Lever <[email protected]>
source "fs/cifs/Kconfig"
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -422,7 +422,9 @@ static const struct nfs4_ssc_client_ops nfs4_ssc_clnt_ops_tbl = {
@@ -430,7 +430,9 @@ static const struct nfs4_ssc_client_ops
*/
void nfs42_ssc_register_ops(void)
{
Expand All @@ -44,7 +44,7 @@ Signed-off-by: Chuck Lever <[email protected]>
}

/**
@@ -433,7 +435,9 @@ void nfs42_ssc_register_ops(void)
@@ -441,7 +443,9 @@ void nfs42_ssc_register_ops(void)
*/
void nfs42_ssc_unregister_ops(void)
{
Expand All @@ -56,7 +56,7 @@ Signed-off-by: Chuck Lever <[email protected]>

--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -86,9 +86,11 @@ const struct super_operations nfs_sops = {
@@ -86,9 +86,11 @@ const struct super_operations nfs_sops =
};
EXPORT_SYMBOL_GPL(nfs_sops);

Expand Down Expand Up @@ -112,7 +112,7 @@ Signed-off-by: Chuck Lever <[email protected]>

--- a/fs/nfs_common/Makefile
+++ b/fs/nfs_common/Makefile
@@ -7,4 +7,4 @@ obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl.o
@@ -7,4 +7,4 @@ obj-$(CONFIG_NFS_ACL_SUPPORT) += nfs_acl
nfs_acl-objs := nfsacl.o

obj-$(CONFIG_GRACE_PERIOD) += grace.o
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Signed-off-by: Trond Myklebust <[email protected]>
source "fs/ceph/Kconfig"
--- a/fs/nfs/nfs4file.c
+++ b/fs/nfs/nfs4file.c
@@ -422,9 +422,7 @@ static const struct nfs4_ssc_client_ops nfs4_ssc_clnt_ops_tbl = {
@@ -430,9 +430,7 @@ static const struct nfs4_ssc_client_ops
*/
void nfs42_ssc_register_ops(void)
{
Expand All @@ -42,7 +42,7 @@ Signed-off-by: Trond Myklebust <[email protected]>
}

/**
@@ -435,9 +433,7 @@ void nfs42_ssc_register_ops(void)
@@ -443,9 +441,7 @@ void nfs42_ssc_register_ops(void)
*/
void nfs42_ssc_unregister_ops(void)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
nft_trans_table_update(trans) = true;
list_add_tail(&trans->list, &ctx->net->nft.commit_list);
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) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {
Expand All @@ -86,7 +86,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>
} else {
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) {
case NFT_MSG_NEWTABLE:
if (nft_trans_table_update(trans)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ Signed-off-by: Pablo Neira Ayuso <[email protected]>

--- a/net/netfilter/nf_flow_table_core.c
+++ b/net/netfilter/nf_flow_table_core.c
@@ -433,33 +433,12 @@ nf_flow_table_iterate(struct nf_flowtabl
@@ -429,33 +429,12 @@ nf_flow_table_iterate(struct nf_flowtabl
return err;
}

Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/hack-5.10/204-module_strip.patch
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
config MODULES_TREE_LOOKUP
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -3247,9 +3247,11 @@ static int setup_load_info(struct load_i
@@ -3251,9 +3251,11 @@ static int setup_load_info(struct load_i

static int check_modinfo(struct module *mod, struct load_info *info, int flags)
{
Expand All @@ -117,7 +117,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
if (flags & MODULE_INIT_IGNORE_VERMAGIC)
modmagic = NULL;

@@ -3270,6 +3272,7 @@ static int check_modinfo(struct module *
@@ -3274,6 +3276,7 @@ static int check_modinfo(struct module *
mod->name);
add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Signed-off-by: Etienne Champetier <[email protected]>

--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -107,10 +107,14 @@ int br_handle_frame_finish(struct net *n
@@ -114,10 +114,14 @@ int br_handle_frame_finish(struct net *n
}
}

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

--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
@@ -625,12 +625,13 @@ extern struct Qdisc_ops noop_qdisc_ops;
@@ -611,12 +611,13 @@ extern struct Qdisc_ops noop_qdisc_ops;
extern struct Qdisc_ops pfifo_fast_ops;
extern struct Qdisc_ops mq_qdisc_ops;
extern struct Qdisc_ops noqueue_qdisc_ops;
Expand Down Expand Up @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
EXPORT_SYMBOL(default_qdisc_ops);

static void qdisc_maybe_clear_missed(struct Qdisc *q,
@@ -1062,12 +1062,12 @@ static void attach_one_default_qdisc(str
@@ -1077,12 +1077,12 @@ static void attach_one_default_qdisc(str
void *_unused)
{
struct Qdisc *qdisc;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Signed-off-by: Zhi Chen <[email protected]>
#if defined(CONFIG_NF_CONNTRACK_LABELS)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -136,6 +136,14 @@ config NF_CONNTRACK_EVENTS
@@ -135,6 +135,14 @@ config NF_CONNTRACK_EVENTS

If unsure, say `N'.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
struct net_bridge_port *p;
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -3584,9 +3584,17 @@ static int xmit_one(struct sk_buff *skb,
@@ -3650,9 +3650,17 @@ static int xmit_one(struct sk_buff *skb,
{
unsigned int len;
int rc;
Expand All @@ -99,7 +99,7 @@

#ifdef CONFIG_ETHERNET_PACKET_MANGLE
if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
@@ -5214,6 +5222,11 @@ void netdev_rx_handler_unregister(struct
@@ -5204,6 +5212,11 @@ void netdev_rx_handler_unregister(struct
}
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);

Expand All @@ -111,7 +111,7 @@
/*
* Limit the use of PFMEMALLOC reserves to those protocols that implement
* the special handling of PFMEMALLOC skbs.
@@ -5262,6 +5275,10 @@ static int __netif_receive_skb_core(stru
@@ -5252,6 +5265,10 @@ static int __netif_receive_skb_core(stru
int ret = NET_RX_DROP;
__be16 type;

Expand All @@ -122,7 +122,7 @@
net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb);

trace_netif_receive_skb(skb);
@@ -5299,6 +5316,15 @@ another_round:
@@ -5291,6 +5308,15 @@ another_round:
goto out;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6900,6 +6900,7 @@
@@ -6903,6 +6903,7 @@ int dev_set_threaded(struct net_device *

return err;
}
Expand Down
4 changes: 2 additions & 2 deletions target/linux/generic/hack-5.10/994-mhi-use-irq-flags.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/drivers/bus/mhi/core/init.c
+++ b/drivers/bus/mhi/core/init.c
@@ -148,12 +148,17 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl)
@@ -148,12 +148,17 @@ int mhi_init_irq_setup(struct mhi_contro
{
struct mhi_event *mhi_event = mhi_cntrl->mhi_event;
struct device *dev = &mhi_cntrl->mhi_dev->dev;
Expand All @@ -19,7 +19,7 @@
"bhi", mhi_cntrl);
if (ret)
return ret;
@@ -171,7 +176,7 @@ int mhi_init_irq_setup(struct mhi_controller *mhi_cntrl)
@@ -171,7 +176,7 @@ int mhi_init_irq_setup(struct mhi_contro

ret = request_irq(mhi_cntrl->irq[mhi_event->irq],
mhi_irq_handler,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/drivers/bus/mhi/core/pm.c
+++ b/drivers/bus/mhi/core/pm.c
@@ -767,7 +767,7 @@ int mhi_pm_suspend(struct mhi_controller *mhi_cntrl)
@@ -767,7 +767,7 @@ int mhi_pm_suspend(struct mhi_controller
}
EXPORT_SYMBOL_GPL(mhi_pm_suspend);

Expand All @@ -9,7 +9,7 @@
{
struct mhi_chan *itr, *tmp;
struct device *dev = &mhi_cntrl->mhi_dev->dev;
@@ -783,6 +783,13 @@
@@ -783,6 +783,13 @@ int mhi_pm_resume(struct mhi_controller

if (MHI_PM_IN_ERROR_STATE(mhi_cntrl->pm_state))
return -EIO;
Expand All @@ -23,7 +23,7 @@

/* Notify clients about exiting LPM */
list_for_each_entry_safe(itr, tmp, &mhi_cntrl->lpm_chans, node) {
@@ -823,8 +830,19 @@ int mhi_pm_resume(struct mhi_controller *mhi_cntrl)
@@ -823,8 +830,19 @@ int mhi_pm_resume(struct mhi_controller

return 0;
}
Expand All @@ -45,7 +45,7 @@
int ret;
--- a/drivers/net/wireless/ath/ath11k/mhi.c
+++ b/drivers/net/wireless/ath/ath11k/mhi.c
@@ -415,6 +415,11 @@
@@ -415,6 +415,11 @@ static int ath11k_mhi_set_state(struct a
case ATH11K_MHI_SUSPEND:
break;
case ATH11K_MHI_RESUME:
Expand All @@ -59,11 +59,10 @@
ret = mhi_force_rddm_mode(ab_pci->mhi_ctrl);
--- a/include/linux/mhi.h
+++ b/include/linux/mhi.h
@@ -646,6 +646,19 @@ int mhi_pm_suspend(struct mhi_controller *mhi_cntrl);
*/
@@ -647,6 +647,19 @@ int mhi_pm_suspend(struct mhi_controller
int mhi_pm_resume(struct mhi_controller *mhi_cntrl);

+/**
/**
+ * mhi_pm_resume_force - Force resume MHI from suspended state
+ * @mhi_cntrl: MHI controller
+ *
Expand All @@ -76,6 +75,7 @@
+ */
+int mhi_pm_resume_force(struct mhi_controller *mhi_cntrl);
+
/**
+/**
* mhi_download_rddm_img - Download ramdump image from device for
* debugging purpose.
* @mhi_cntrl: MHI controller
Loading