Skip to content

Commit

Permalink
kernel: bump 6.1 to 6.1.119 (#13185)
Browse files Browse the repository at this point in the history
  • Loading branch information
Beginner-Go authored Dec 8, 2024
1 parent fd9b9cc commit e66ffaf
Show file tree
Hide file tree
Showing 48 changed files with 133 additions and 133 deletions.
4 changes: 2 additions & 2 deletions include/kernel-6.1
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .118
LINUX_KERNEL_HASH-6.1.118 = 010784bd7161c32c4cd68a423d4dcb14e4587677d238b2825a31fe012869224c
LINUX_VERSION-6.1 = .119
LINUX_KERNEL_HASH-6.1.119 = aecdaf39d0a844a81ce4c67d9daff8979e938bb690df4f679fbbb494fe423278
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ Signed-off-by: T.J. Mercier <[email protected]>
static void mem_cgroup_css_free(struct cgroup_subsys_state *css)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7956,6 +7956,7 @@ static void __init free_area_init_node(i
@@ -7988,6 +7988,7 @@ static void __init free_area_init_node(i
pgdat_set_deferred_range(pgdat);

free_area_init_core(pgdat);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
.mac_link_up = am65_cpsw_nuss_mac_link_up,
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1741,7 +1741,6 @@ static void axienet_mac_link_up(struct p
@@ -1750,7 +1750,6 @@ static void axienet_mac_link_up(struct p
}

static const struct phylink_mac_ops axienet_phylink_ops = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
supported = mac_dev->phylink_config.supported_interfaces;
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
@@ -1636,7 +1636,7 @@ static void axienet_pcs_an_restart(struc
@@ -1645,7 +1645,7 @@ static void axienet_pcs_an_restart(struc
phylink_mii_c22_pcs_an_restart(pcs_phy);
}

Expand All @@ -62,7 +62,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
phy_interface_t interface,
const unsigned long *advertising,
bool permit_pause_to_mac)
@@ -1658,7 +1658,8 @@ static int axienet_pcs_config(struct phy
@@ -1667,7 +1667,8 @@ static int axienet_pcs_config(struct phy
}
}

Expand All @@ -72,7 +72,7 @@ Signed-off-by: Jakub Kicinski <[email protected]>
if (ret < 0)
netdev_warn(ndev, "Failed to configure PCS: %d\n", ret);

@@ -2138,6 +2139,7 @@ static int axienet_probe(struct platform
@@ -2147,6 +2148,7 @@ static int axienet_probe(struct platform
}
of_node_put(np);
lp->pcs.ops = &axienet_pcs_ops;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
/**
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -6533,7 +6533,7 @@ static int __napi_poll(struct napi_struc
@@ -6541,7 +6541,7 @@ static int __napi_poll(struct napi_struc
* accidentally calling ->poll() when NAPI is not scheduled.
*/
work = 0;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Signed-off-by: Paolo Abeni <[email protected]>

__netif_tx_unlock_bh(netdev_get_tx_queue(priv->dev, queue));

@@ -5490,12 +5494,13 @@ static int stmmac_napi_poll_tx(struct na
@@ -5503,12 +5507,13 @@ static int stmmac_napi_poll_tx(struct na
struct stmmac_channel *ch =
container_of(napi, struct stmmac_channel, tx_napi);
struct stmmac_priv *priv = ch->priv_data;
Expand All @@ -57,7 +57,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
work_done = min(work_done, budget);

if (work_done < budget && napi_complete_done(napi, work_done)) {
@@ -5506,6 +5511,10 @@ static int stmmac_napi_poll_tx(struct na
@@ -5519,6 +5524,10 @@ static int stmmac_napi_poll_tx(struct na
spin_unlock_irqrestore(&ch->lock, flags);
}

Expand All @@ -68,7 +68,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
return work_done;
}

@@ -5514,12 +5523,13 @@ static int stmmac_napi_poll_rxtx(struct
@@ -5527,12 +5536,13 @@ static int stmmac_napi_poll_rxtx(struct
struct stmmac_channel *ch =
container_of(napi, struct stmmac_channel, rxtx_napi);
struct stmmac_priv *priv = ch->priv_data;
Expand All @@ -83,7 +83,7 @@ Signed-off-by: Paolo Abeni <[email protected]>
tx_done = min(tx_done, budget);

rx_done = stmmac_rx_zc(priv, budget, chan);
@@ -5544,6 +5554,10 @@ static int stmmac_napi_poll_rxtx(struct
@@ -5557,6 +5567,10 @@ static int stmmac_napi_poll_rxtx(struct
spin_unlock_irqrestore(&ch->lock, flags);
}

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

--- a/drivers/bus/mhi/host/pci_generic.c
+++ b/drivers/bus/mhi/host/pci_generic.c
@@ -542,6 +542,8 @@ static const struct mhi_pci_dev_info mhi
@@ -551,6 +551,8 @@ static const struct mhi_pci_dev_info mhi
static const struct pci_device_id mhi_pci_id_table[] = {
{ PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0304),
.driver_data = (kernel_ulong_t) &mhi_qcom_sdx24_info },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>

--- a/drivers/bus/mhi/host/pci_generic.c
+++ b/drivers/bus/mhi/host/pci_generic.c
@@ -599,6 +599,9 @@ static const struct pci_device_id mhi_pc
@@ -608,6 +608,9 @@ static const struct pci_device_id mhi_pc
/* MV32-WB (Cinterion) */
{ PCI_DEVICE(0x1269, 0x00bb),
.driver_data = (kernel_ulong_t) &mhi_mv32_info },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
/**
* struct mhi_pci_dev_info - MHI PCI device specific information
* @config: MHI controller configuration
@@ -560,11 +564,11 @@ static const struct pci_device_id mhi_pc
.driver_data = (kernel_ulong_t) &mhi_telit_fn990_info },
@@ -569,11 +573,11 @@ static const struct pci_device_id mhi_pc
.driver_data = (kernel_ulong_t) &mhi_telit_fe990a_info },
{ PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0308),
.driver_data = (kernel_ulong_t) &mhi_qcom_sdx65_info },
- { PCI_DEVICE(0x1eac, 0x1001), /* EM120R-GL (sdx24) */
Expand All @@ -43,7 +43,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
/* T99W175 (sdx55), Both for eSIM and Non-eSIM */
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0ab),
@@ -588,16 +592,16 @@ static const struct pci_device_id mhi_pc
@@ -597,16 +601,16 @@ static const struct pci_device_id mhi_pc
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0d9),
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info },
/* MV31-W (Cinterion) */
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
#include <linux/delay.h>
#include <linux/device.h>
#include <linux/mhi.h>
@@ -904,11 +903,9 @@ static int mhi_pci_probe(struct pci_dev
@@ -913,11 +912,9 @@ static int mhi_pci_probe(struct pci_dev
mhi_pdev->pci_state = pci_store_saved_state(pdev);
pci_load_saved_state(pdev, NULL);

Expand All @@ -49,7 +49,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>

/* MHI bus does not power up the controller by default */
err = mhi_prepare_for_power_up(mhi_cntrl);
@@ -942,8 +939,6 @@ err_unprepare:
@@ -951,8 +948,6 @@ err_unprepare:
mhi_unprepare_after_power_down(mhi_cntrl);
err_unregister:
mhi_unregister_controller(mhi_cntrl);
Expand All @@ -58,7 +58,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>

return err;
}
@@ -966,7 +961,6 @@ static void mhi_pci_remove(struct pci_de
@@ -975,7 +970,6 @@ static void mhi_pci_remove(struct pci_de
pm_runtime_get_noresume(&pdev->dev);

mhi_unregister_controller(mhi_cntrl);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
static const struct mhi_pci_dev_info mhi_foxconn_sdx55_info = {
.name = "foxconn-sdx55",
.fw = "qcom/sdx55m/sbl1.mbn",
@@ -590,6 +599,15 @@ static const struct pci_device_id mhi_pc
@@ -599,6 +608,15 @@ static const struct pci_device_id mhi_pc
/* T99W373 (sdx62) */
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0d9),
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx65_info },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>

--- a/drivers/bus/mhi/host/pci_generic.c
+++ b/drivers/bus/mhi/host/pci_generic.c
@@ -594,6 +594,8 @@ static const struct pci_device_id mhi_pc
@@ -603,6 +603,8 @@ static const struct pci_device_id mhi_pc
.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
{ PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1002), /* EM160R-GL (sdx24) */
.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
static const struct mhi_channel_config mhi_foxconn_sdx55_channels[] = {
MHI_CHANNEL_CONFIG_UL(0, "LOOPBACK", 32, 0),
MHI_CHANNEL_CONFIG_DL(1, "LOOPBACK", 32, 0),
@@ -594,6 +604,9 @@ static const struct pci_device_id mhi_pc
@@ -603,6 +613,9 @@ static const struct pci_device_id mhi_pc
.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
{ PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1002), /* EM160R-GL (sdx24) */
.driver_data = (kernel_ulong_t) &mhi_quectel_em1xx_info },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>

--- a/drivers/bus/mhi/host/pci_generic.c
+++ b/drivers/bus/mhi/host/pci_generic.c
@@ -641,6 +641,12 @@ static const struct pci_device_id mhi_pc
@@ -650,6 +650,12 @@ static const struct pci_device_id mhi_pc
/* T99W510 (sdx24), variant 3 */
{ PCI_DEVICE(PCI_VENDOR_ID_FOXCONN, 0xe0f2),
.driver_data = (kernel_ulong_t) &mhi_foxconn_sdx24_info },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>

--- a/drivers/bus/mhi/host/pci_generic.c
+++ b/drivers/bus/mhi/host/pci_generic.c
@@ -607,6 +607,9 @@ static const struct pci_device_id mhi_pc
@@ -616,6 +616,9 @@ static const struct pci_device_id mhi_pc
/* RM520N-GL (sdx6x), eSIM */
{ PCI_DEVICE(PCI_VENDOR_ID_QUECTEL, 0x1004),
.driver_data = (kernel_ulong_t) &mhi_quectel_rm5xx_info },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ Signed-off-by: Manivannan Sadhasivam <[email protected]>
static const struct mhi_pci_dev_info mhi_qcom_sdx65_info = {
.name = "qcom-sdx65m",
.fw = "qcom/sdx65m/xbl.elf",
@@ -600,6 +620,8 @@ static const struct pci_device_id mhi_pc
.driver_data = (kernel_ulong_t) &mhi_telit_fn990_info },
@@ -609,6 +629,8 @@ static const struct pci_device_id mhi_pc
.driver_data = (kernel_ulong_t) &mhi_telit_fe990a_info },
{ PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0308),
.driver_data = (kernel_ulong_t) &mhi_qcom_sdx65_info },
+ { PCI_DEVICE(PCI_VENDOR_ID_QCOM, 0x0309),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support

#define QUECTEL_VENDOR_ID 0x2c7c
/* These Quectel products use Quectel's vendor ID */
@@ -1158,6 +1163,11 @@ static const struct usb_device_id option
@@ -1160,6 +1165,11 @@ static const struct usb_device_id option
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
.driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
Expand All @@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
/* Quectel products using Qualcomm vendor ID */
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
@@ -1199,6 +1209,11 @@ static const struct usb_device_id option
@@ -1201,6 +1211,11 @@ static const struct usb_device_id option
.driver_info = ZLP },
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
.driver_info = RSVD(4) },
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-6.1/902-debloat_proc.patch
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -553,5 +553,8 @@ static __net_initdata struct pernet_oper
@@ -555,5 +555,8 @@ static __net_initdata struct pernet_oper

int __init ip_misc_proc_init(void)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>

--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1718,7 +1718,7 @@ static void device_links_purge(struct de
@@ -1717,7 +1717,7 @@ static void device_links_purge(struct de
#define FW_DEVLINK_FLAGS_RPM (FW_DEVLINK_FLAGS_ON | \
DL_FLAG_PM_RUNTIME)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ Signed-off-by: Zhi Chen <[email protected]>
void nf_conntrack_ecache_work(struct net *net, enum nf_ct_ecache_state state)
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
@@ -723,12 +723,19 @@ static size_t ctnetlink_nlmsg_size(const
@@ -720,12 +720,19 @@ static size_t ctnetlink_nlmsg_size(const
}

static int
Expand All @@ -319,7 +319,7 @@ Signed-off-by: Zhi Chen <[email protected]>
struct nf_conn *ct = item->ct;
struct sk_buff *skb;
unsigned int type;
@@ -3755,11 +3762,17 @@ static int ctnetlink_stat_exp_cpu(struct
@@ -3752,11 +3759,17 @@ static int ctnetlink_stat_exp_cpu(struct
}

#ifdef CONFIG_NF_CONNTRACK_EVENTS
Expand All @@ -337,7 +337,7 @@ Signed-off-by: Zhi Chen <[email protected]>

static const struct nfnl_callback ctnl_cb[IPCTNL_MSG_MAX] = {
[IPCTNL_MSG_CT_NEW] = {
@@ -3858,8 +3871,12 @@ static int __net_init ctnetlink_net_init
@@ -3855,8 +3868,12 @@ static int __net_init ctnetlink_net_init
static void ctnetlink_net_pre_exit(struct net *net)
{
#ifdef CONFIG_NF_CONNTRACK_EVENTS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@

#ifdef CONFIG_ETHERNET_PACKET_MANGLE
if (dev->eth_mangle_tx && !(skb = dev->eth_mangle_tx(dev, skb)))
@@ -5266,6 +5274,11 @@ void netdev_rx_handler_unregister(struct
@@ -5274,6 +5282,11 @@ void netdev_rx_handler_unregister(struct
}
EXPORT_SYMBOL_GPL(netdev_rx_handler_unregister);

Expand All @@ -123,7 +123,7 @@
/*
* Limit the use of PFMEMALLOC reserves to those protocols that implement
* the special handling of PFMEMALLOC skbs.
@@ -5314,6 +5327,10 @@ static int __netif_receive_skb_core(stru
@@ -5322,6 +5335,10 @@ static int __netif_receive_skb_core(stru
int ret = NET_RX_DROP;
__be16 type;

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

trace_netif_receive_skb(skb);
@@ -5351,6 +5368,15 @@ another_round:
@@ -5359,6 +5376,15 @@ another_round:
goto out;
}

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

--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -7910,7 +7910,7 @@ static void __init alloc_node_mem_map(st
@@ -7942,7 +7942,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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Signed-off-by: Pawel Dembicki <[email protected]>

--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -229,7 +229,7 @@ config PPC
@@ -235,7 +235,7 @@ config PPC
select HAVE_KERNEL_GZIP
select HAVE_KERNEL_LZMA if DEFAULT_UIMAGE
select HAVE_KERNEL_LZO if DEFAULT_UIMAGE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -8017,7 +8017,7 @@ static int nft_register_flowtable_net_ho
@@ -8023,7 +8023,7 @@ static int nft_register_flowtable_net_ho
err = flowtable->data.type->setup(&flowtable->data,
hook->ops.dev,
FLOW_BLOCK_BIND);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ Signed-off-by: Felix Fietkau <[email protected]>

struct rtnl_link {
rtnl_doit_func doit;
@@ -4840,7 +4840,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
@@ -4869,7 +4869,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
brport_nla_put_flag(skb, flags, mask,
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
brport_nla_put_flag(skb, flags, mask,
Expand Down
Loading

0 comments on commit e66ffaf

Please sign in to comment.