mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
kernel: bump 5.15 to 5.15.142 (#11709)
This commit is contained in:
parent
1cd3b4e4d0
commit
3358c91e43
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.15 = .138
|
LINUX_VERSION-5.15 = .142
|
||||||
LINUX_KERNEL_HASH-5.15.138 = af84e54164e1c01f59764ba528448ed36b377d22aafbd81b4b0cf47792ef4aaa
|
LINUX_KERNEL_HASH-5.15.142 = 8d76c95277dc5ab0a6cd0069432af2ceb759d0ac2b6f5401330d390196095676
|
||||||
|
@ -27,7 +27,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
|
|||||||
|
|
||||||
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
|
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
|
||||||
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
|
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
|
||||||
@@ -4217,12 +4217,10 @@ static irqreturn_t dpni_irq0_handler_thr
|
@@ -4215,12 +4215,10 @@ static irqreturn_t dpni_irq0_handler_thr
|
||||||
dpaa2_eth_set_mac_addr(netdev_priv(net_dev));
|
dpaa2_eth_set_mac_addr(netdev_priv(net_dev));
|
||||||
dpaa2_eth_update_tx_fqids(priv);
|
dpaa2_eth_update_tx_fqids(priv);
|
||||||
|
|
||||||
|
@ -594,7 +594,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|||||||
VM_BUG_ON_PAGE(tail > 2 && page_tail->mapping != TAIL_MAPPING,
|
VM_BUG_ON_PAGE(tail > 2 && page_tail->mapping != TAIL_MAPPING,
|
||||||
--- a/mm/memcontrol.c
|
--- a/mm/memcontrol.c
|
||||||
+++ b/mm/memcontrol.c
|
+++ b/mm/memcontrol.c
|
||||||
@@ -5178,6 +5178,7 @@ static void __mem_cgroup_free(struct mem
|
@@ -5179,6 +5179,7 @@ static void __mem_cgroup_free(struct mem
|
||||||
|
|
||||||
static void mem_cgroup_free(struct mem_cgroup *memcg)
|
static void mem_cgroup_free(struct mem_cgroup *memcg)
|
||||||
{
|
{
|
||||||
@ -602,7 +602,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|||||||
memcg_wb_domain_exit(memcg);
|
memcg_wb_domain_exit(memcg);
|
||||||
__mem_cgroup_free(memcg);
|
__mem_cgroup_free(memcg);
|
||||||
}
|
}
|
||||||
@@ -5241,6 +5242,7 @@ static struct mem_cgroup *mem_cgroup_all
|
@@ -5242,6 +5243,7 @@ static struct mem_cgroup *mem_cgroup_all
|
||||||
memcg->deferred_split_queue.split_queue_len = 0;
|
memcg->deferred_split_queue.split_queue_len = 0;
|
||||||
#endif
|
#endif
|
||||||
idr_replace(&mem_cgroup_idr, memcg, memcg->id.id);
|
idr_replace(&mem_cgroup_idr, memcg, memcg->id.id);
|
||||||
|
@ -414,7 +414,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|||||||
/* forking complete and child started to run, tell ptracer */
|
/* forking complete and child started to run, tell ptracer */
|
||||||
--- a/kernel/sched/core.c
|
--- a/kernel/sched/core.c
|
||||||
+++ b/kernel/sched/core.c
|
+++ b/kernel/sched/core.c
|
||||||
@@ -5010,6 +5010,7 @@ context_switch(struct rq *rq, struct tas
|
@@ -5014,6 +5014,7 @@ context_switch(struct rq *rq, struct tas
|
||||||
* finish_task_switch()'s mmdrop().
|
* finish_task_switch()'s mmdrop().
|
||||||
*/
|
*/
|
||||||
switch_mm_irqs_off(prev->active_mm, next->mm, next);
|
switch_mm_irqs_off(prev->active_mm, next->mm, next);
|
||||||
@ -424,7 +424,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|||||||
/* will mmdrop() in finish_task_switch(). */
|
/* will mmdrop() in finish_task_switch(). */
|
||||||
--- a/mm/memcontrol.c
|
--- a/mm/memcontrol.c
|
||||||
+++ b/mm/memcontrol.c
|
+++ b/mm/memcontrol.c
|
||||||
@@ -6212,6 +6212,30 @@ static void mem_cgroup_move_task(void)
|
@@ -6213,6 +6213,30 @@ static void mem_cgroup_move_task(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -455,7 +455,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|||||||
static int seq_puts_memcg_tunable(struct seq_file *m, unsigned long value)
|
static int seq_puts_memcg_tunable(struct seq_file *m, unsigned long value)
|
||||||
{
|
{
|
||||||
if (value == PAGE_COUNTER_MAX)
|
if (value == PAGE_COUNTER_MAX)
|
||||||
@@ -6555,6 +6579,7 @@ struct cgroup_subsys memory_cgrp_subsys
|
@@ -6556,6 +6580,7 @@ struct cgroup_subsys memory_cgrp_subsys
|
||||||
.css_reset = mem_cgroup_css_reset,
|
.css_reset = mem_cgroup_css_reset,
|
||||||
.css_rstat_flush = mem_cgroup_css_rstat_flush,
|
.css_rstat_flush = mem_cgroup_css_rstat_flush,
|
||||||
.can_attach = mem_cgroup_can_attach,
|
.can_attach = mem_cgroup_can_attach,
|
||||||
|
@ -318,7 +318,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|||||||
mctz = soft_limit_tree_from_page(page);
|
mctz = soft_limit_tree_from_page(page);
|
||||||
if (!mctz)
|
if (!mctz)
|
||||||
return;
|
return;
|
||||||
@@ -3433,6 +3443,9 @@ unsigned long mem_cgroup_soft_limit_recl
|
@@ -3434,6 +3444,9 @@ unsigned long mem_cgroup_soft_limit_recl
|
||||||
unsigned long excess;
|
unsigned long excess;
|
||||||
unsigned long nr_scanned;
|
unsigned long nr_scanned;
|
||||||
|
|
||||||
@ -328,7 +328,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|||||||
if (order > 0)
|
if (order > 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
@@ -5321,6 +5334,7 @@ static int mem_cgroup_css_online(struct
|
@@ -5322,6 +5335,7 @@ static int mem_cgroup_css_online(struct
|
||||||
if (unlikely(mem_cgroup_is_root(memcg)))
|
if (unlikely(mem_cgroup_is_root(memcg)))
|
||||||
queue_delayed_work(system_unbound_wq, &stats_flush_dwork,
|
queue_delayed_work(system_unbound_wq, &stats_flush_dwork,
|
||||||
2UL*HZ);
|
2UL*HZ);
|
||||||
@ -336,7 +336,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5347,6 +5361,7 @@ static void mem_cgroup_css_offline(struc
|
@@ -5348,6 +5362,7 @@ static void mem_cgroup_css_offline(struc
|
||||||
memcg_offline_kmem(memcg);
|
memcg_offline_kmem(memcg);
|
||||||
reparent_shrinker_deferred(memcg);
|
reparent_shrinker_deferred(memcg);
|
||||||
wb_memcg_offline(memcg);
|
wb_memcg_offline(memcg);
|
||||||
@ -344,7 +344,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
|
|||||||
|
|
||||||
drain_all_stock(memcg);
|
drain_all_stock(memcg);
|
||||||
|
|
||||||
@@ -5358,6 +5373,7 @@ static void mem_cgroup_css_released(stru
|
@@ -5359,6 +5374,7 @@ static void mem_cgroup_css_released(stru
|
||||||
struct mem_cgroup *memcg = mem_cgroup_from_css(css);
|
struct mem_cgroup *memcg = mem_cgroup_from_css(css);
|
||||||
|
|
||||||
invalidate_reclaim_iterators(memcg);
|
invalidate_reclaim_iterators(memcg);
|
||||||
|
@ -37,7 +37,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
|||||||
map->format.val_bytes = DIV_ROUND_UP(config->val_bits, 8);
|
map->format.val_bytes = DIV_ROUND_UP(config->val_bits, 8);
|
||||||
map->format.buf_size = DIV_ROUND_UP(config->reg_bits +
|
map->format.buf_size = DIV_ROUND_UP(config->reg_bits +
|
||||||
config->val_bits + config->pad_bits, 8);
|
config->val_bits + config->pad_bits, 8);
|
||||||
@@ -1735,6 +1736,7 @@ static int _regmap_raw_write_impl(struct
|
@@ -1737,6 +1738,7 @@ static int _regmap_raw_write_impl(struct
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -45,7 +45,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
|||||||
map->format.format_reg(map->work_buf, reg, map->reg_shift);
|
map->format.format_reg(map->work_buf, reg, map->reg_shift);
|
||||||
regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
|
regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
|
||||||
map->write_flag_mask);
|
map->write_flag_mask);
|
||||||
@@ -1905,6 +1907,7 @@ static int _regmap_bus_formatted_write(v
|
@@ -1907,6 +1909,7 @@ static int _regmap_bus_formatted_write(v
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -53,7 +53,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
|||||||
map->format.format_write(map, reg, val);
|
map->format.format_write(map, reg, val);
|
||||||
|
|
||||||
trace_regmap_hw_write_start(map, reg, 1);
|
trace_regmap_hw_write_start(map, reg, 1);
|
||||||
@@ -2346,6 +2349,7 @@ static int _regmap_raw_multi_reg_write(s
|
@@ -2348,6 +2351,7 @@ static int _regmap_raw_multi_reg_write(s
|
||||||
unsigned int reg = regs[i].reg;
|
unsigned int reg = regs[i].reg;
|
||||||
unsigned int val = regs[i].def;
|
unsigned int val = regs[i].def;
|
||||||
trace_regmap_hw_write_start(map, reg, 1);
|
trace_regmap_hw_write_start(map, reg, 1);
|
||||||
@ -61,7 +61,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
|||||||
map->format.format_reg(u8, reg, map->reg_shift);
|
map->format.format_reg(u8, reg, map->reg_shift);
|
||||||
u8 += reg_bytes + pad_bytes;
|
u8 += reg_bytes + pad_bytes;
|
||||||
map->format.format_val(u8, val, 0);
|
map->format.format_val(u8, val, 0);
|
||||||
@@ -2673,6 +2677,7 @@ static int _regmap_raw_read(struct regma
|
@@ -2675,6 +2679,7 @@ static int _regmap_raw_read(struct regma
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
|||||||
map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
|
map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
|
||||||
map->format.pad_bytes = config->pad_bits / 8;
|
map->format.pad_bytes = config->pad_bits / 8;
|
||||||
map->format.reg_downshift = config->reg_downshift;
|
map->format.reg_downshift = config->reg_downshift;
|
||||||
@@ -1736,6 +1738,7 @@ static int _regmap_raw_write_impl(struct
|
@@ -1738,6 +1740,7 @@ static int _regmap_raw_write_impl(struct
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -50,7 +50,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
|||||||
reg >>= map->format.reg_downshift;
|
reg >>= map->format.reg_downshift;
|
||||||
map->format.format_reg(map->work_buf, reg, map->reg_shift);
|
map->format.format_reg(map->work_buf, reg, map->reg_shift);
|
||||||
regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
|
regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
|
||||||
@@ -1907,6 +1910,7 @@ static int _regmap_bus_formatted_write(v
|
@@ -1909,6 +1912,7 @@ static int _regmap_bus_formatted_write(v
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -58,7 +58,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
|||||||
reg >>= map->format.reg_downshift;
|
reg >>= map->format.reg_downshift;
|
||||||
map->format.format_write(map, reg, val);
|
map->format.format_write(map, reg, val);
|
||||||
|
|
||||||
@@ -2349,6 +2353,7 @@ static int _regmap_raw_multi_reg_write(s
|
@@ -2351,6 +2355,7 @@ static int _regmap_raw_multi_reg_write(s
|
||||||
unsigned int reg = regs[i].reg;
|
unsigned int reg = regs[i].reg;
|
||||||
unsigned int val = regs[i].def;
|
unsigned int val = regs[i].def;
|
||||||
trace_regmap_hw_write_start(map, reg, 1);
|
trace_regmap_hw_write_start(map, reg, 1);
|
||||||
@ -66,7 +66,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
|||||||
reg >>= map->format.reg_downshift;
|
reg >>= map->format.reg_downshift;
|
||||||
map->format.format_reg(u8, reg, map->reg_shift);
|
map->format.format_reg(u8, reg, map->reg_shift);
|
||||||
u8 += reg_bytes + pad_bytes;
|
u8 += reg_bytes + pad_bytes;
|
||||||
@@ -2677,6 +2682,7 @@ static int _regmap_raw_read(struct regma
|
@@ -2679,6 +2684,7 @@ static int _regmap_raw_read(struct regma
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -28,7 +28,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
|||||||
|
|
||||||
--- a/drivers/base/regmap/regmap.c
|
--- a/drivers/base/regmap/regmap.c
|
||||||
+++ b/drivers/base/regmap/regmap.c
|
+++ b/drivers/base/regmap/regmap.c
|
||||||
@@ -1929,6 +1929,8 @@ static int _regmap_bus_reg_write(void *c
|
@@ -1931,6 +1931,8 @@ static int _regmap_bus_reg_write(void *c
|
||||||
{
|
{
|
||||||
struct regmap *map = context;
|
struct regmap *map = context;
|
||||||
|
|
||||||
@ -37,7 +37,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
|||||||
return map->bus->reg_write(map->bus_context, reg, val);
|
return map->bus->reg_write(map->bus_context, reg, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2703,6 +2705,8 @@ static int _regmap_bus_reg_read(void *co
|
@@ -2705,6 +2707,8 @@ static int _regmap_bus_reg_read(void *co
|
||||||
{
|
{
|
||||||
struct regmap *map = context;
|
struct regmap *map = context;
|
||||||
|
|
||||||
@ -46,7 +46,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
|||||||
return map->bus->reg_read(map->bus_context, reg, val);
|
return map->bus->reg_read(map->bus_context, reg, val);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3078,6 +3082,8 @@ static int _regmap_update_bits(struct re
|
@@ -3080,6 +3084,8 @@ static int _regmap_update_bits(struct re
|
||||||
*change = false;
|
*change = false;
|
||||||
|
|
||||||
if (regmap_volatile(map, reg) && map->reg_update_bits) {
|
if (regmap_volatile(map, reg) && map->reg_update_bits) {
|
||||||
|
@ -554,7 +554,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||||||
static void xrs700x_mac_link_up(struct dsa_switch *ds, int port,
|
static void xrs700x_mac_link_up(struct dsa_switch *ds, int port,
|
||||||
--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
|
--- a/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
|
||||||
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
|
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c
|
||||||
@@ -369,9 +369,8 @@ static int xgbe_set_link_ksettings(struc
|
@@ -374,9 +374,8 @@ static int xgbe_set_link_ksettings(struc
|
||||||
__ETHTOOL_LINK_MODE_MASK_NBITS, cmd->link_modes.advertising,
|
__ETHTOOL_LINK_MODE_MASK_NBITS, cmd->link_modes.advertising,
|
||||||
__ETHTOOL_LINK_MODE_MASK_NBITS, lks->link_modes.supported);
|
__ETHTOOL_LINK_MODE_MASK_NBITS, lks->link_modes.supported);
|
||||||
|
|
||||||
@ -566,7 +566,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||||||
|
|
||||||
if ((cmd->base.autoneg == AUTONEG_ENABLE) &&
|
if ((cmd->base.autoneg == AUTONEG_ENABLE) &&
|
||||||
bitmap_empty(advertising, __ETHTOOL_LINK_MODE_MASK_NBITS)) {
|
bitmap_empty(advertising, __ETHTOOL_LINK_MODE_MASK_NBITS)) {
|
||||||
@@ -384,8 +383,7 @@ static int xgbe_set_link_ksettings(struc
|
@@ -389,8 +388,7 @@ static int xgbe_set_link_ksettings(struc
|
||||||
pdata->phy.autoneg = cmd->base.autoneg;
|
pdata->phy.autoneg = cmd->base.autoneg;
|
||||||
pdata->phy.speed = speed;
|
pdata->phy.speed = speed;
|
||||||
pdata->phy.duplex = cmd->base.duplex;
|
pdata->phy.duplex = cmd->base.duplex;
|
||||||
|
@ -125,7 +125,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||||||
pl = kzalloc(sizeof(*pl), GFP_KERNEL);
|
pl = kzalloc(sizeof(*pl), GFP_KERNEL);
|
||||||
if (!pl)
|
if (!pl)
|
||||||
return ERR_PTR(-ENOMEM);
|
return ERR_PTR(-ENOMEM);
|
||||||
@@ -946,9 +987,10 @@ EXPORT_SYMBOL_GPL(phylink_create);
|
@@ -947,9 +988,10 @@ EXPORT_SYMBOL_GPL(phylink_create);
|
||||||
* @pl: a pointer to a &struct phylink returned from phylink_create()
|
* @pl: a pointer to a &struct phylink returned from phylink_create()
|
||||||
* @pcs: a pointer to the &struct phylink_pcs
|
* @pcs: a pointer to the &struct phylink_pcs
|
||||||
*
|
*
|
||||||
@ -139,7 +139,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||||||
*
|
*
|
||||||
* Please note that there are behavioural changes with the mac_config()
|
* Please note that there are behavioural changes with the mac_config()
|
||||||
* callback if a PCS is present (denoting a newer setup) so removing a PCS
|
* callback if a PCS is present (denoting a newer setup) so removing a PCS
|
||||||
@@ -959,6 +1001,14 @@ void phylink_set_pcs(struct phylink *pl,
|
@@ -960,6 +1002,14 @@ void phylink_set_pcs(struct phylink *pl,
|
||||||
{
|
{
|
||||||
pl->pcs = pcs;
|
pl->pcs = pcs;
|
||||||
pl->pcs_ops = pcs->ops;
|
pl->pcs_ops = pcs->ops;
|
||||||
|
@ -66,7 +66,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|||||||
phy_interface_empty(config->supported_interfaces)) {
|
phy_interface_empty(config->supported_interfaces)) {
|
||||||
dev_err(config->dev,
|
dev_err(config->dev,
|
||||||
"phylink: error: empty supported_interfaces but mac_select_pcs() method present\n");
|
"phylink: error: empty supported_interfaces but mac_select_pcs() method present\n");
|
||||||
@@ -1220,6 +1227,7 @@ struct phylink *phylink_create(struct ph
|
@@ -1221,6 +1228,7 @@ struct phylink *phylink_create(struct ph
|
||||||
return ERR_PTR(-EINVAL);
|
return ERR_PTR(-EINVAL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -17,7 +17,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
|||||||
|
|
||||||
--- a/drivers/bluetooth/btusb.c
|
--- a/drivers/bluetooth/btusb.c
|
||||||
+++ b/drivers/bluetooth/btusb.c
|
+++ b/drivers/bluetooth/btusb.c
|
||||||
@@ -2275,6 +2275,23 @@ struct btmtk_section_map {
|
@@ -2287,6 +2287,23 @@ struct btmtk_section_map {
|
||||||
};
|
};
|
||||||
} __packed;
|
} __packed;
|
||||||
|
|
||||||
@ -41,7 +41,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
|||||||
static void btusb_mtk_wmt_recv(struct urb *urb)
|
static void btusb_mtk_wmt_recv(struct urb *urb)
|
||||||
{
|
{
|
||||||
struct hci_dev *hdev = urb->context;
|
struct hci_dev *hdev = urb->context;
|
||||||
@@ -3926,6 +3943,7 @@ static int btusb_probe(struct usb_interf
|
@@ -3941,6 +3958,7 @@ static int btusb_probe(struct usb_interf
|
||||||
hdev->shutdown = btusb_mtk_shutdown;
|
hdev->shutdown = btusb_mtk_shutdown;
|
||||||
hdev->manufacturer = 70;
|
hdev->manufacturer = 70;
|
||||||
hdev->cmd_timeout = btusb_mtk_cmd_timeout;
|
hdev->cmd_timeout = btusb_mtk_cmd_timeout;
|
||||||
|
@ -18,7 +18,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
|||||||
|
|
||||||
--- a/drivers/bluetooth/btusb.c
|
--- a/drivers/bluetooth/btusb.c
|
||||||
+++ b/drivers/bluetooth/btusb.c
|
+++ b/drivers/bluetooth/btusb.c
|
||||||
@@ -2280,7 +2280,7 @@ static int btusb_set_bdaddr_mtk(struct h
|
@@ -2292,7 +2292,7 @@ static int btusb_set_bdaddr_mtk(struct h
|
||||||
struct sk_buff *skb;
|
struct sk_buff *skb;
|
||||||
long ret;
|
long ret;
|
||||||
|
|
||||||
|
@ -58,7 +58,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
|||||||
|
|
||||||
--- a/drivers/bluetooth/btusb.c
|
--- a/drivers/bluetooth/btusb.c
|
||||||
+++ b/drivers/bluetooth/btusb.c
|
+++ b/drivers/bluetooth/btusb.c
|
||||||
@@ -464,6 +464,9 @@ static const struct usb_device_id blackl
|
@@ -476,6 +476,9 @@ static const struct usb_device_id blackl
|
||||||
{ USB_DEVICE(0x13d3, 0x3564), .driver_info = BTUSB_MEDIATEK |
|
{ USB_DEVICE(0x13d3, 0x3564), .driver_info = BTUSB_MEDIATEK |
|
||||||
BTUSB_WIDEBAND_SPEECH |
|
BTUSB_WIDEBAND_SPEECH |
|
||||||
BTUSB_VALID_LE_STATES },
|
BTUSB_VALID_LE_STATES },
|
||||||
|
@ -56,7 +56,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
|
|||||||
|
|
||||||
--- a/drivers/bluetooth/btusb.c
|
--- a/drivers/bluetooth/btusb.c
|
||||||
+++ b/drivers/bluetooth/btusb.c
|
+++ b/drivers/bluetooth/btusb.c
|
||||||
@@ -455,6 +455,9 @@ static const struct usb_device_id blackl
|
@@ -467,6 +467,9 @@ static const struct usb_device_id blackl
|
||||||
BTUSB_VALID_LE_STATES },
|
BTUSB_VALID_LE_STATES },
|
||||||
|
|
||||||
/* Additional MediaTek MT7921 Bluetooth devices */
|
/* Additional MediaTek MT7921 Bluetooth devices */
|
||||||
|
@ -54,7 +54,7 @@ Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
|||||||
|
|
||||||
--- a/drivers/bluetooth/btusb.c
|
--- a/drivers/bluetooth/btusb.c
|
||||||
+++ b/drivers/bluetooth/btusb.c
|
+++ b/drivers/bluetooth/btusb.c
|
||||||
@@ -473,6 +473,9 @@ static const struct usb_device_id blackl
|
@@ -485,6 +485,9 @@ static const struct usb_device_id blackl
|
||||||
{ USB_DEVICE(0x0489, 0xe0cd), .driver_info = BTUSB_MEDIATEK |
|
{ USB_DEVICE(0x0489, 0xe0cd), .driver_info = BTUSB_MEDIATEK |
|
||||||
BTUSB_WIDEBAND_SPEECH |
|
BTUSB_WIDEBAND_SPEECH |
|
||||||
BTUSB_VALID_LE_STATES },
|
BTUSB_VALID_LE_STATES },
|
||||||
|
@ -125,7 +125,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
#include <linux/mutex.h>
|
#include <linux/mutex.h>
|
||||||
#include <linux/err.h>
|
#include <linux/err.h>
|
||||||
#include <linux/property.h>
|
#include <linux/property.h>
|
||||||
@@ -3358,3 +3359,5 @@ static int __init regmap_initcall(void)
|
@@ -3360,3 +3361,5 @@ static int __init regmap_initcall(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
postcore_initcall(regmap_initcall);
|
postcore_initcall(regmap_initcall);
|
||||||
|
@ -43,7 +43,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
|||||||
|
|
||||||
#define QUECTEL_VENDOR_ID 0x2c7c
|
#define QUECTEL_VENDOR_ID 0x2c7c
|
||||||
/* These Quectel products use Quectel's vendor ID */
|
/* These Quectel products use Quectel's vendor ID */
|
||||||
@@ -1144,6 +1149,11 @@ static const struct usb_device_id option
|
@@ -1146,6 +1151,11 @@ static const struct usb_device_id option
|
||||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
|
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
|
||||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
|
{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
|
||||||
.driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
|
.driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
|
||||||
@ -55,7 +55,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
|||||||
/* Quectel products using Qualcomm vendor ID */
|
/* Quectel products using Qualcomm vendor ID */
|
||||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
|
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
|
||||||
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
|
{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
|
||||||
@@ -1185,6 +1195,11 @@ static const struct usb_device_id option
|
@@ -1187,6 +1197,11 @@ static const struct usb_device_id option
|
||||||
.driver_info = ZLP },
|
.driver_info = ZLP },
|
||||||
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
||||||
.driver_info = RSVD(4) },
|
.driver_info = RSVD(4) },
|
||||||
|
@ -48,7 +48,7 @@
|
|||||||
static void phylink_mac_pcs_get_state(struct phylink *pl,
|
static void phylink_mac_pcs_get_state(struct phylink *pl,
|
||||||
struct phylink_link_state *state)
|
struct phylink_link_state *state)
|
||||||
{
|
{
|
||||||
@@ -2977,6 +2976,52 @@ void phylink_mii_c22_pcs_get_state(struc
|
@@ -3015,6 +3014,52 @@ void phylink_mii_c22_pcs_get_state(struc
|
||||||
EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_get_state);
|
EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_get_state);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -101,7 +101,7 @@
|
|||||||
* phylink_mii_c22_pcs_set_advertisement() - configure the clause 37 PCS
|
* phylink_mii_c22_pcs_set_advertisement() - configure the clause 37 PCS
|
||||||
* advertisement
|
* advertisement
|
||||||
* @pcs: a pointer to a &struct mdio_device.
|
* @pcs: a pointer to a &struct mdio_device.
|
||||||
@@ -3048,6 +3093,46 @@ int phylink_mii_c22_pcs_set_advertisemen
|
@@ -3086,6 +3131,46 @@ int phylink_mii_c22_pcs_set_advertisemen
|
||||||
EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_set_advertisement);
|
EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_set_advertisement);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
+MODULE_LICENSE("GPL");
|
+MODULE_LICENSE("GPL");
|
||||||
--- a/kernel/sched/core.c
|
--- a/kernel/sched/core.c
|
||||||
+++ b/kernel/sched/core.c
|
+++ b/kernel/sched/core.c
|
||||||
@@ -4216,6 +4216,7 @@ int wake_up_state(struct task_struct *p,
|
@@ -4220,6 +4220,7 @@ int wake_up_state(struct task_struct *p,
|
||||||
{
|
{
|
||||||
return try_to_wake_up(p, state, 0);
|
return try_to_wake_up(p, state, 0);
|
||||||
}
|
}
|
||||||
|
@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|||||||
help
|
help
|
||||||
--- a/init/main.c
|
--- a/init/main.c
|
||||||
+++ b/init/main.c
|
+++ b/init/main.c
|
||||||
@@ -614,6 +614,29 @@ static inline void setup_nr_cpu_ids(void
|
@@ -618,6 +618,29 @@ static inline void setup_nr_cpu_ids(void
|
||||||
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
|
static inline void smp_prepare_cpus(unsigned int maxcpus) { }
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
|
|||||||
/*
|
/*
|
||||||
* We need to store the untouched command line for future reference.
|
* We need to store the untouched command line for future reference.
|
||||||
* We also need to store the touched command line since the parameter
|
* We also need to store the touched command line since the parameter
|
||||||
@@ -953,6 +976,7 @@ asmlinkage __visible void __init __no_sa
|
@@ -957,6 +980,7 @@ asmlinkage __visible void __init __no_sa
|
||||||
pr_notice("%s", linux_banner);
|
pr_notice("%s", linux_banner);
|
||||||
early_security_init();
|
early_security_init();
|
||||||
setup_arch(&command_line);
|
setup_arch(&command_line);
|
||||||
|
@ -237,7 +237,7 @@ Signed-off-by: Wolfram Sang <wsa@kernel.org>
|
|||||||
priv->adap.algo = &hix5hd2_i2c_algorithm;
|
priv->adap.algo = &hix5hd2_i2c_algorithm;
|
||||||
--- a/drivers/i2c/busses/i2c-i801.c
|
--- a/drivers/i2c/busses/i2c-i801.c
|
||||||
+++ b/drivers/i2c/busses/i2c-i801.c
|
+++ b/drivers/i2c/busses/i2c-i801.c
|
||||||
@@ -1111,7 +1111,7 @@ static void dmi_check_onboard_device(u8
|
@@ -1110,7 +1110,7 @@ static void dmi_check_onboard_device(u8
|
||||||
|
|
||||||
memset(&info, 0, sizeof(struct i2c_board_info));
|
memset(&info, 0, sizeof(struct i2c_board_info));
|
||||||
info.addr = dmi_devices[i].i2c_addr;
|
info.addr = dmi_devices[i].i2c_addr;
|
||||||
@ -246,7 +246,7 @@ Signed-off-by: Wolfram Sang <wsa@kernel.org>
|
|||||||
i2c_new_client_device(adap, &info);
|
i2c_new_client_device(adap, &info);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -1267,7 +1267,7 @@ static void register_dell_lis3lv02d_i2c_
|
@@ -1266,7 +1266,7 @@ static void register_dell_lis3lv02d_i2c_
|
||||||
|
|
||||||
memset(&info, 0, sizeof(struct i2c_board_info));
|
memset(&info, 0, sizeof(struct i2c_board_info));
|
||||||
info.addr = dell_lis3lv02d_devices[i].i2c_addr;
|
info.addr = dell_lis3lv02d_devices[i].i2c_addr;
|
||||||
@ -403,7 +403,7 @@ Signed-off-by: Wolfram Sang <wsa@kernel.org>
|
|||||||
/* Slow down if we can't sense SCL */
|
/* Slow down if we can't sense SCL */
|
||||||
--- a/drivers/i2c/busses/i2c-pxa.c
|
--- a/drivers/i2c/busses/i2c-pxa.c
|
||||||
+++ b/drivers/i2c/busses/i2c-pxa.c
|
+++ b/drivers/i2c/busses/i2c-pxa.c
|
||||||
@@ -1403,7 +1403,7 @@ static int i2c_pxa_probe(struct platform
|
@@ -1463,7 +1463,7 @@ static int i2c_pxa_probe(struct platform
|
||||||
spin_lock_init(&i2c->lock);
|
spin_lock_init(&i2c->lock);
|
||||||
init_waitqueue_head(&i2c->wait);
|
init_waitqueue_head(&i2c->wait);
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
* managed to set the command line, unless CONFIG_CMDLINE_FORCE
|
* managed to set the command line, unless CONFIG_CMDLINE_FORCE
|
||||||
--- a/arch/arm64/Kconfig
|
--- a/arch/arm64/Kconfig
|
||||||
+++ b/arch/arm64/Kconfig
|
+++ b/arch/arm64/Kconfig
|
||||||
@@ -2058,6 +2058,14 @@ config CMDLINE_FORCE
|
@@ -2059,6 +2059,14 @@ config CMDLINE_FORCE
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
|
@ -187,7 +187,7 @@ Signed-off-by: Michael Gray <michael.gray@lantisproject.com>
|
|||||||
static int kernel_init(void *);
|
static int kernel_init(void *);
|
||||||
|
|
||||||
extern void init_IRQ(void);
|
extern void init_IRQ(void);
|
||||||
@@ -988,6 +992,18 @@ asmlinkage __visible void __init __no_sa
|
@@ -992,6 +996,18 @@ asmlinkage __visible void __init __no_sa
|
||||||
page_alloc_init();
|
page_alloc_init();
|
||||||
|
|
||||||
pr_notice("Kernel command line: %s\n", saved_command_line);
|
pr_notice("Kernel command line: %s\n", saved_command_line);
|
||||||
|
@ -22,7 +22,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
|
|||||||
#include <linux/platform_data/x86/apple.h>
|
#include <linux/platform_data/x86/apple.h>
|
||||||
#include <linux/pm_runtime.h>
|
#include <linux/pm_runtime.h>
|
||||||
#include <linux/suspend.h>
|
#include <linux/suspend.h>
|
||||||
@@ -5823,3 +5824,34 @@ static void nvidia_ion_ahci_fixup(struct
|
@@ -5879,3 +5880,34 @@ static void nvidia_ion_ahci_fixup(struct
|
||||||
pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
|
pdev->dev_flags |= PCI_DEV_FLAGS_HAS_MSI_MASKING;
|
||||||
}
|
}
|
||||||
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);
|
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, 0x0ab8, nvidia_ion_ahci_fixup);
|
||||||
|
@ -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);
|
phydev->mii_ts->link_state(phydev->mii_ts, phydev);
|
||||||
--- a/drivers/net/phy/phylink.c
|
--- a/drivers/net/phy/phylink.c
|
||||||
+++ b/drivers/net/phy/phylink.c
|
+++ b/drivers/net/phy/phylink.c
|
||||||
@@ -1333,7 +1333,8 @@ void phylink_destroy(struct phylink *pl)
|
@@ -1370,7 +1370,8 @@ void phylink_destroy(struct phylink *pl)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(phylink_destroy);
|
EXPORT_SYMBOL_GPL(phylink_destroy);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user