mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
kernel: bump 5.10 to 5.10.204 (#11721)
This commit is contained in:
Beginner
GitHub
parent
b36db4e355
commit
ba3c8ab2f3
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.10 = .201
|
||||
LINUX_KERNEL_HASH-5.10.201 = 6afc06598fa8e3bc907cff75f995f372df51d40a284e260de78a3421b1f18218
|
||||
LINUX_VERSION-5.10 = .204
|
||||
LINUX_KERNEL_HASH-5.10.204 = ff950750b1060f65c0dde7d4d89238937d80faddf3bcf9ba28189d917daccaee
|
||||
|
||||
@ -740,7 +740,7 @@ SVN-Revision: 35130
|
||||
EXPORT_SYMBOL(xfrm_parse_spi);
|
||||
--- a/net/ipv4/tcp_input.c
|
||||
+++ b/net/ipv4/tcp_input.c
|
||||
@@ -4147,14 +4147,16 @@ static bool tcp_parse_aligned_timestamp(
|
||||
@@ -4151,14 +4151,16 @@ static bool tcp_parse_aligned_timestamp(
|
||||
{
|
||||
const __be32 *ptr = (const __be32 *)(th + 1);
|
||||
|
||||
|
||||
@ -25,7 +25,7 @@ Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
|
||||
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -2089,7 +2089,7 @@ config CPU_MIPS32
|
||||
@@ -2091,7 +2091,7 @@ config CPU_MIPS32
|
||||
config CPU_MIPS64
|
||||
bool
|
||||
default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R5 || \
|
||||
|
||||
@ -1,103 +0,0 @@
|
||||
From: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
Date: Tue, 23 Mar 2021 00:56:28 +0100
|
||||
Subject: [PATCH] netfilter: nftables: update table flags from the commit
|
||||
phase
|
||||
|
||||
Do not update table flags from the preparation phase. Store the flags
|
||||
update into the transaction, then update the flags from the commit
|
||||
phase.
|
||||
|
||||
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||||
---
|
||||
|
||||
--- a/include/net/netfilter/nf_tables.h
|
||||
+++ b/include/net/netfilter/nf_tables.h
|
||||
@@ -1479,13 +1479,16 @@ struct nft_trans_chain {
|
||||
|
||||
struct nft_trans_table {
|
||||
bool update;
|
||||
- bool enable;
|
||||
+ u8 state;
|
||||
+ u32 flags;
|
||||
};
|
||||
|
||||
#define nft_trans_table_update(trans) \
|
||||
(((struct nft_trans_table *)trans->data)->update)
|
||||
-#define nft_trans_table_enable(trans) \
|
||||
- (((struct nft_trans_table *)trans->data)->enable)
|
||||
+#define nft_trans_table_state(trans) \
|
||||
+ (((struct nft_trans_table *)trans->data)->state)
|
||||
+#define nft_trans_table_flags(trans) \
|
||||
+ (((struct nft_trans_table *)trans->data)->flags)
|
||||
|
||||
struct nft_trans_elem {
|
||||
struct nft_set *set;
|
||||
--- a/net/netfilter/nf_tables_api.c
|
||||
+++ b/net/netfilter/nf_tables_api.c
|
||||
@@ -1074,6 +1074,12 @@ static void nf_tables_table_disable(stru
|
||||
nft_table_disable(net, table, 0);
|
||||
}
|
||||
|
||||
+enum {
|
||||
+ NFT_TABLE_STATE_UNCHANGED = 0,
|
||||
+ NFT_TABLE_STATE_DORMANT,
|
||||
+ NFT_TABLE_STATE_WAKEUP
|
||||
+};
|
||||
+
|
||||
static int nf_tables_updtable(struct nft_ctx *ctx)
|
||||
{
|
||||
struct nft_trans *trans;
|
||||
@@ -1097,19 +1103,17 @@ static int nf_tables_updtable(struct nft
|
||||
|
||||
if ((flags & NFT_TABLE_F_DORMANT) &&
|
||||
!(ctx->table->flags & NFT_TABLE_F_DORMANT)) {
|
||||
- nft_trans_table_enable(trans) = false;
|
||||
+ nft_trans_table_state(trans) = NFT_TABLE_STATE_DORMANT;
|
||||
} else if (!(flags & NFT_TABLE_F_DORMANT) &&
|
||||
ctx->table->flags & NFT_TABLE_F_DORMANT) {
|
||||
- ctx->table->flags &= ~NFT_TABLE_F_DORMANT;
|
||||
ret = nf_tables_table_enable(ctx->net, ctx->table);
|
||||
if (ret >= 0)
|
||||
- nft_trans_table_enable(trans) = true;
|
||||
- else
|
||||
- ctx->table->flags |= NFT_TABLE_F_DORMANT;
|
||||
+ nft_trans_table_state(trans) = NFT_TABLE_STATE_WAKEUP;
|
||||
}
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
|
||||
+ nft_trans_table_flags(trans) = flags;
|
||||
nft_trans_table_update(trans) = true;
|
||||
nft_trans_commit_list_add_tail(ctx->net, trans);
|
||||
return 0;
|
||||
@@ -8475,11 +8479,10 @@ static int nf_tables_commit(struct net *
|
||||
switch (trans->msg_type) {
|
||||
case NFT_MSG_NEWTABLE:
|
||||
if (nft_trans_table_update(trans)) {
|
||||
- if (!nft_trans_table_enable(trans)) {
|
||||
- nf_tables_table_disable(net,
|
||||
- trans->ctx.table);
|
||||
- trans->ctx.table->flags |= NFT_TABLE_F_DORMANT;
|
||||
- }
|
||||
+ if (nft_trans_table_state(trans) == NFT_TABLE_STATE_DORMANT)
|
||||
+ nf_tables_table_disable(net, trans->ctx.table);
|
||||
+
|
||||
+ trans->ctx.table->flags = nft_trans_table_flags(trans);
|
||||
} else {
|
||||
nft_clear(net, trans->ctx.table);
|
||||
}
|
||||
@@ -8728,11 +8731,9 @@ static int __nf_tables_abort(struct net
|
||||
switch (trans->msg_type) {
|
||||
case NFT_MSG_NEWTABLE:
|
||||
if (nft_trans_table_update(trans)) {
|
||||
- if (nft_trans_table_enable(trans)) {
|
||||
- nf_tables_table_disable(net,
|
||||
- trans->ctx.table);
|
||||
- trans->ctx.table->flags |= NFT_TABLE_F_DORMANT;
|
||||
- }
|
||||
+ if (nft_trans_table_state(trans) == NFT_TABLE_STATE_WAKEUP)
|
||||
+ nf_tables_table_disable(net, trans->ctx.table);
|
||||
+
|
||||
nft_trans_destroy(trans);
|
||||
} else {
|
||||
list_del_rcu(&trans->ctx.table->list);
|
||||
@ -1036,7 +1036,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
u32 mahr = ravb_read(ndev, MAHR);
|
||||
u32 malr = ravb_read(ndev, MALR);
|
||||
|
||||
@@ -2191,7 +2193,7 @@ static int ravb_probe(struct platform_de
|
||||
@@ -2202,7 +2204,7 @@ static int ravb_probe(struct platform_de
|
||||
priv->msg_enable = RAVB_DEF_MSG_ENABLE;
|
||||
|
||||
/* Read and set MAC address */
|
||||
|
||||
@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
||||
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -1171,6 +1171,10 @@ config MIPS_MSC
|
||||
@@ -1172,6 +1172,10 @@ config MIPS_MSC
|
||||
config SYNC_R4K
|
||||
bool
|
||||
|
||||
|
||||
@ -129,7 +129,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
{
|
||||
--- a/drivers/gpio/gpiolib-sysfs.c
|
||||
+++ b/drivers/gpio/gpiolib-sysfs.c
|
||||
@@ -572,7 +572,7 @@ static struct class gpio_class = {
|
||||
@@ -575,7 +575,7 @@ static struct class gpio_class = {
|
||||
*
|
||||
* Returns zero on success, else an error.
|
||||
*/
|
||||
@ -138,7 +138,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
{
|
||||
struct gpio_chip *chip;
|
||||
struct gpio_device *gdev;
|
||||
@@ -634,6 +634,8 @@ int gpiod_export(struct gpio_desc *desc,
|
||||
@@ -637,6 +637,8 @@ int gpiod_export(struct gpio_desc *desc,
|
||||
offset = gpio_chip_hwgpio(desc);
|
||||
if (chip->names && chip->names[offset])
|
||||
ioname = chip->names[offset];
|
||||
@ -147,7 +147,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
|
||||
|
||||
dev = device_create_with_groups(&gpio_class, &gdev->dev,
|
||||
MKDEV(0, 0), data, gpio_groups,
|
||||
@@ -655,6 +657,12 @@ err_unlock:
|
||||
@@ -658,6 +660,12 @@ err_unlock:
|
||||
gpiod_dbg(desc, "%s: status %d\n", __func__, status);
|
||||
return status;
|
||||
}
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/drivers/of/fdt.c
|
||||
+++ b/drivers/of/fdt.c
|
||||
@@ -1055,6 +1055,9 @@ int __init early_init_dt_scan_chosen(uns
|
||||
@@ -1054,6 +1054,9 @@ int __init early_init_dt_scan_chosen(uns
|
||||
p = of_get_flat_dt_prop(node, "bootargs", &l);
|
||||
if (p != NULL && l > 0)
|
||||
strlcpy(data, p, min(l, COMMAND_LINE_SIZE));
|
||||
|
||||
@ -9,7 +9,7 @@ Acked-by: Rob Landley <rob@landley.net>
|
||||
---
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -1086,9 +1086,6 @@ config FW_ARC
|
||||
@@ -1087,9 +1087,6 @@ config FW_ARC
|
||||
config ARCH_MAY_HAVE_PC_FDC
|
||||
bool
|
||||
|
||||
@ -19,7 +19,7 @@ Acked-by: Rob Landley <rob@landley.net>
|
||||
config CEVT_BCM1480
|
||||
bool
|
||||
|
||||
@@ -3183,6 +3180,18 @@ choice
|
||||
@@ -3185,6 +3182,18 @@ choice
|
||||
bool "Extend builtin kernel arguments with bootloader arguments"
|
||||
endchoice
|
||||
|
||||
|
||||
@ -90,7 +90,7 @@ Cc: linux-tegra@vger.kernel.org
|
||||
|
||||
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
|
||||
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
|
||||
@@ -997,11 +997,6 @@ static int tegra_pcie_dw_link_up(struct
|
||||
@@ -996,11 +996,6 @@ static int tegra_pcie_dw_link_up(struct
|
||||
return !!(val & PCI_EXP_LNKSTA_DLLLA);
|
||||
}
|
||||
|
||||
@ -102,7 +102,7 @@ Cc: linux-tegra@vger.kernel.org
|
||||
static int tegra_pcie_dw_start_link(struct dw_pcie *pci)
|
||||
{
|
||||
struct tegra_pcie_dw *pcie = to_tegra_pcie(pci);
|
||||
@@ -1026,7 +1021,6 @@ static const struct dw_pcie_ops tegra_dw
|
||||
@@ -1025,7 +1020,6 @@ static const struct dw_pcie_ops tegra_dw
|
||||
|
||||
static struct dw_pcie_host_ops tegra_pcie_dw_host_ops = {
|
||||
.host_init = tegra_pcie_dw_host_init,
|
||||
@ -110,7 +110,7 @@ Cc: linux-tegra@vger.kernel.org
|
||||
};
|
||||
|
||||
static void tegra_pcie_disable_phy(struct tegra_pcie_dw *pcie)
|
||||
@@ -2011,6 +2005,7 @@ static int tegra_pcie_dw_probe(struct pl
|
||||
@@ -2010,6 +2004,7 @@ static int tegra_pcie_dw_probe(struct pl
|
||||
pci->n_fts[1] = FTS_VAL;
|
||||
|
||||
pp = &pci->pp;
|
||||
|
||||
@ -256,7 +256,7 @@ Cc: linux-tegra@vger.kernel.org
|
||||
if (ret) {
|
||||
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
|
||||
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
|
||||
@@ -1561,14 +1561,6 @@ static int tegra_pcie_config_rp(struct t
|
||||
@@ -1560,14 +1560,6 @@ static int tegra_pcie_config_rp(struct t
|
||||
char *name;
|
||||
int ret;
|
||||
|
||||
|
||||
@ -552,7 +552,7 @@ Cc: linux-tegra@vger.kernel.org
|
||||
static int qcom_pcie_probe(struct platform_device *pdev)
|
||||
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
|
||||
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
|
||||
@@ -1556,7 +1556,6 @@ static int tegra_pcie_deinit_controller(
|
||||
@@ -1555,7 +1555,6 @@ static int tegra_pcie_deinit_controller(
|
||||
|
||||
static int tegra_pcie_config_rp(struct tegra_pcie_dw *pcie)
|
||||
{
|
||||
|
||||
@ -251,7 +251,7 @@ Cc: linux-tegra@vger.kernel.org
|
||||
static int spear13xx_pcie_link_up(struct dw_pcie *pci)
|
||||
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
|
||||
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
|
||||
@@ -768,8 +768,6 @@ static void tegra_pcie_enable_msi_interr
|
||||
@@ -767,8 +767,6 @@ static void tegra_pcie_enable_msi_interr
|
||||
struct tegra_pcie_dw *pcie = to_tegra_pcie(pci);
|
||||
u32 val;
|
||||
|
||||
|
||||
@ -15,7 +15,7 @@ Acked-by: Stephen Boyd <sboyd@kernel.org>
|
||||
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -4790,6 +4790,7 @@ static const struct qcom_reset_map gcc_i
|
||||
@@ -4784,6 +4784,7 @@ static const struct qcom_reset_map gcc_i
|
||||
[GCC_PCIE1_AXI_SLAVE_ARES] = { 0x76040, 4 },
|
||||
[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
|
||||
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
|
||||
|
||||
@ -29,7 +29,7 @@ Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
|
||||
--- a/drivers/pci/controller/dwc/pcie-tegra194.c
|
||||
+++ b/drivers/pci/controller/dwc/pcie-tegra194.c
|
||||
@@ -193,12 +193,6 @@
|
||||
@@ -194,12 +194,6 @@
|
||||
#define GEN3_EQ_CONTROL_OFF_PSET_REQ_VEC_MASK GENMASK(23, 8)
|
||||
#define GEN3_EQ_CONTROL_OFF_FB_MODE_MASK GENMASK(3, 0)
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
|
||||
};
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -3183,6 +3183,24 @@ static struct clk_branch gcc_nss_ptp_ref
|
||||
@@ -3177,6 +3177,24 @@ static struct clk_branch gcc_nss_ptp_ref
|
||||
},
|
||||
};
|
||||
|
||||
@ -59,7 +59,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
|
||||
static struct clk_branch gcc_nssnoc_ce_apb_clk = {
|
||||
.halt_reg = 0x6830c,
|
||||
.clkr = {
|
||||
@@ -4608,6 +4626,7 @@ static struct clk_regmap *gcc_ipq8074_cl
|
||||
@@ -4602,6 +4620,7 @@ static struct clk_regmap *gcc_ipq8074_cl
|
||||
[GCC_CMN_12GPLL_AHB_CLK] = &gcc_cmn_12gpll_ahb_clk.clkr,
|
||||
[GCC_CMN_12GPLL_SYS_CLK] = &gcc_cmn_12gpll_sys_clk.clkr,
|
||||
[GCC_MDIO_AHB_CLK] = &gcc_mdio_ahb_clk.clkr,
|
||||
|
||||
@ -37,7 +37,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
|
||||
static struct clk_alpha_pll gpll0_main = {
|
||||
.offset = 0x21000,
|
||||
.regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT],
|
||||
@@ -963,6 +979,12 @@ static const struct freq_tbl ftbl_pcie_a
|
||||
@@ -957,6 +973,12 @@ static const struct freq_tbl ftbl_pcie_a
|
||||
{ }
|
||||
};
|
||||
|
||||
@ -50,7 +50,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
|
||||
static struct clk_rcg2 pcie0_axi_clk_src = {
|
||||
.cmd_rcgr = 0x75054,
|
||||
.freq_tbl = ftbl_pcie_axi_clk_src,
|
||||
@@ -2022,6 +2044,78 @@ static struct clk_rcg2 gp3_clk_src = {
|
||||
@@ -2016,6 +2038,78 @@ static struct clk_rcg2 gp3_clk_src = {
|
||||
},
|
||||
};
|
||||
|
||||
@ -129,7 +129,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
|
||||
static struct clk_branch gcc_blsp1_ahb_clk = {
|
||||
.halt_reg = 0x01008,
|
||||
.clkr = {
|
||||
@@ -4353,13 +4447,7 @@ static struct clk_branch gcc_gp3_clk = {
|
||||
@@ -4347,13 +4441,7 @@ static struct clk_branch gcc_gp3_clk = {
|
||||
},
|
||||
};
|
||||
|
||||
@ -144,7 +144,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
|
||||
.cmd_rcgr = 0x75070,
|
||||
.freq_tbl = ftbl_pcie_rchng_clk_src,
|
||||
.hid_width = 5,
|
||||
@@ -4435,6 +4523,114 @@ static const struct alpha_pll_config nss
|
||||
@@ -4429,6 +4517,114 @@ static const struct alpha_pll_config nss
|
||||
.alpha_en_mask = BIT(24),
|
||||
};
|
||||
|
||||
@ -259,7 +259,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
|
||||
static struct clk_hw *gcc_ipq8074_hws[] = {
|
||||
&gpll0_out_main_div2.hw,
|
||||
&gpll6_out_main_div2.hw,
|
||||
@@ -4443,6 +4639,7 @@ static struct clk_hw *gcc_ipq8074_hws[]
|
||||
@@ -4437,6 +4633,7 @@ static struct clk_hw *gcc_ipq8074_hws[]
|
||||
&gcc_xo_div4_clk_src.hw,
|
||||
&nss_noc_clk_src.hw,
|
||||
&nss_ppe_cdiv_clk_src.hw,
|
||||
@ -267,7 +267,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
|
||||
};
|
||||
|
||||
static struct clk_regmap *gcc_ipq8074_clks[] = {
|
||||
@@ -4674,6 +4871,15 @@ static struct clk_regmap *gcc_ipq8074_cl
|
||||
@@ -4668,6 +4865,15 @@ static struct clk_regmap *gcc_ipq8074_cl
|
||||
[GCC_PCIE0_RCHNG_CLK_SRC] = &pcie0_rchng_clk_src.clkr,
|
||||
[GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr,
|
||||
[GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr,
|
||||
@ -283,7 +283,7 @@ Signed-off-by: Rajkumar Ayyasamy <arajkuma@codeaurora.org>
|
||||
};
|
||||
|
||||
static const struct qcom_reset_map gcc_ipq8074_resets[] = {
|
||||
@@ -4810,6 +5016,20 @@ static const struct qcom_reset_map gcc_i
|
||||
@@ -4804,6 +5010,20 @@ static const struct qcom_reset_map gcc_i
|
||||
[GCC_PCIE1_AHB_ARES] = { 0x76040, 5 },
|
||||
[GCC_PCIE1_AXI_MASTER_STICKY_ARES] = { 0x76040, 6 },
|
||||
[GCC_WCSSAON_RESET] = { 0x59010, 0 },
|
||||
|
||||
@ -16,7 +16,7 @@ Signed-off-by: Selvam Sathappan Periakaruppan <speriaka@codeaurora.org>
|
||||
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -4524,10 +4524,10 @@ static const struct alpha_pll_config nss
|
||||
@@ -4518,10 +4518,10 @@ static const struct alpha_pll_config nss
|
||||
};
|
||||
|
||||
static struct clk_branch gcc_snoc_bus_timeout2_ahb_clk = {
|
||||
@ -29,7 +29,7 @@ Signed-off-by: Selvam Sathappan Periakaruppan <speriaka@codeaurora.org>
|
||||
.enable_mask = BIT(0),
|
||||
.hw.init = &(struct clk_init_data){
|
||||
.name = "gcc_snoc_bus_timeout2_ahb_clk",
|
||||
@@ -4542,10 +4542,10 @@ static struct clk_branch gcc_snoc_bus_ti
|
||||
@@ -4536,10 +4536,10 @@ static struct clk_branch gcc_snoc_bus_ti
|
||||
};
|
||||
|
||||
static struct clk_branch gcc_snoc_bus_timeout3_ahb_clk = {
|
||||
|
||||
@ -15,7 +15,7 @@ Change-Id: I17beca334be79d738a35587860847aa0b1f96fa9
|
||||
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -5067,6 +5067,11 @@ static int gcc_ipq8074_probe(struct plat
|
||||
@@ -5061,6 +5061,11 @@ static int gcc_ipq8074_probe(struct plat
|
||||
/* SW Workaround for UBI32 Huayra PLL */
|
||||
regmap_update_bits(regmap, 0x2501c, BIT(26), BIT(26));
|
||||
|
||||
|
||||
@ -34,7 +34,7 @@ Signed-off-by: Abhishek Sahu <absahu@codeaurora.org>
|
||||
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -5072,6 +5072,9 @@ static int gcc_ipq8074_probe(struct plat
|
||||
@@ -5066,6 +5066,9 @@ static int gcc_ipq8074_probe(struct plat
|
||||
/* Disable SW_COLLAPSE for USB1 GDSCR */
|
||||
regmap_update_bits(regmap, 0x3f078, BIT(0), 0x0);
|
||||
|
||||
|
||||
@ -26,7 +26,7 @@ Change-Id: I505cb560b31ad27a02c165fbe13bb33a2fc7d230
|
||||
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -2118,9 +2118,10 @@ struct clk_rcg2 adss_pwm_clk_src = {
|
||||
@@ -2112,9 +2112,10 @@ struct clk_rcg2 adss_pwm_clk_src = {
|
||||
|
||||
static struct clk_branch gcc_blsp1_ahb_clk = {
|
||||
.halt_reg = 0x01008,
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
/*---------------------------------- VLAN -----------------------------------*/
|
||||
|
||||
/* In the following 2 functions, bond_vlan_rx_add_vid and bond_vlan_rx_kill_vid,
|
||||
@@ -4870,6 +4885,9 @@ static void bond_destructor(struct net_d
|
||||
@@ -4876,6 +4891,9 @@ static void bond_destructor(struct net_d
|
||||
struct bonding *bond = netdev_priv(bond_dev);
|
||||
if (bond->wq)
|
||||
destroy_workqueue(bond->wq);
|
||||
@ -39,7 +39,7 @@
|
||||
}
|
||||
|
||||
void bond_setup(struct net_device *bond_dev)
|
||||
@@ -5442,6 +5460,14 @@ int bond_create(struct net *net, const c
|
||||
@@ -5448,6 +5466,14 @@ int bond_create(struct net *net, const c
|
||||
bond_work_init_all(bond);
|
||||
|
||||
rtnl_unlock();
|
||||
|
||||
@ -20,7 +20,7 @@ Change-Id: Ic5da1551bf46921890955312026b9175a42fe14e
|
||||
|
||||
--- a/drivers/clk/qcom/gcc-ipq8074.c
|
||||
+++ b/drivers/clk/qcom/gcc-ipq8074.c
|
||||
@@ -643,6 +643,7 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_s
|
||||
@@ -637,6 +637,7 @@ static struct clk_rcg2 pcnoc_bfdcd_clk_s
|
||||
.freq_tbl = ftbl_pcnoc_bfdcd_clk_src,
|
||||
.hid_width = 5,
|
||||
.parent_map = gcc_xo_gpll0_gpll0_out_main_div2_map,
|
||||
@ -28,7 +28,7 @@ Change-Id: Ic5da1551bf46921890955312026b9175a42fe14e
|
||||
.clkr.hw.init = &(struct clk_init_data){
|
||||
.name = "pcnoc_bfdcd_clk_src",
|
||||
.parent_names = gcc_xo_gpll0_gpll0_out_main_div2,
|
||||
@@ -1317,6 +1318,7 @@ static struct clk_rcg2 system_noc_bfdcd_
|
||||
@@ -1311,6 +1312,7 @@ static struct clk_rcg2 system_noc_bfdcd_
|
||||
.freq_tbl = ftbl_system_noc_bfdcd_clk_src,
|
||||
.hid_width = 5,
|
||||
.parent_map = gcc_xo_gpll0_gpll6_gpll0_out_main_div2_map,
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/arch/mips/Kconfig
|
||||
+++ b/arch/mips/Kconfig
|
||||
@@ -2439,6 +2439,12 @@ config MIPS_VPE_LOADER
|
||||
@@ -2441,6 +2441,12 @@ config MIPS_VPE_LOADER
|
||||
Includes a loader for loading an elf relocatable object
|
||||
onto another VPE and running it.
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
help
|
||||
--- a/drivers/of/fdt.c
|
||||
+++ b/drivers/of/fdt.c
|
||||
@@ -1059,6 +1059,17 @@ int __init early_init_dt_scan_chosen(uns
|
||||
@@ -1058,6 +1058,17 @@ int __init early_init_dt_scan_chosen(uns
|
||||
if (p != NULL && l > 0)
|
||||
strlcat(data, p, min_t(int, strlen(data) + (int)l, COMMAND_LINE_SIZE));
|
||||
|
||||
|
||||
@ -95,7 +95,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
|
||||
phydev->mii_ts->link_state(phydev->mii_ts, phydev);
|
||||
--- a/drivers/net/phy/phylink.c
|
||||
+++ b/drivers/net/phy/phylink.c
|
||||
@@ -931,7 +931,8 @@ void phylink_destroy(struct phylink *pl)
|
||||
@@ -932,7 +932,8 @@ void phylink_destroy(struct phylink *pl)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(phylink_destroy);
|
||||
|
||||
|
||||
@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
|
||||
|
||||
--- a/drivers/mmc/core/core.c
|
||||
+++ b/drivers/mmc/core/core.c
|
||||
@@ -1360,6 +1360,8 @@ void mmc_power_off(struct mmc_host *host
|
||||
@@ -1365,6 +1365,8 @@ void mmc_power_off(struct mmc_host *host
|
||||
|
||||
mmc_pwrseq_power_off(host);
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@ Signed-off-by: wevsty <ty@wevs.org>
|
||||
reg = <0x0 0xff100000 0x0 0x1000>;
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
|
||||
@@ -1905,6 +1905,16 @@
|
||||
@@ -1907,6 +1907,16 @@
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user