kernel: bump 5.10 to 5.10.158
All patches automatically rebased.
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 6801c460b6)
This commit is contained in:
committed by
Hauke Mehrtens
parent
3a58bda06b
commit
e5cec69484
@@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.10 = .157
|
LINUX_VERSION-5.10 = .158
|
||||||
LINUX_KERNEL_HASH-5.10.157 = fc4cd7c0777ed53f1350e73877e9918df3c40d8e8abe93c6e1a0eb21556d327f
|
LINUX_KERNEL_HASH-5.10.158 = 1e0a24bb5510caa18b3601b25e12cc2a1ce123948de551f4f2cdbb40aea707e7
|
||||||
|
|||||||
@@ -266,7 +266,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
|
|||||||
goto out;
|
goto out;
|
||||||
--- a/drivers/mmc/core/core.c
|
--- a/drivers/mmc/core/core.c
|
||||||
+++ b/drivers/mmc/core/core.c
|
+++ b/drivers/mmc/core/core.c
|
||||||
@@ -1880,7 +1880,8 @@ EXPORT_SYMBOL(mmc_erase);
|
@@ -1885,7 +1885,8 @@ EXPORT_SYMBOL(mmc_erase);
|
||||||
|
|
||||||
int mmc_can_erase(struct mmc_card *card)
|
int mmc_can_erase(struct mmc_card *card)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|||||||
|
|
||||||
#define MAX_TUNING_LOOP 40
|
#define MAX_TUNING_LOOP 40
|
||||||
|
|
||||||
@@ -3145,7 +3145,7 @@ static void sdhci_timeout_timer(struct t
|
@@ -3190,7 +3190,7 @@ static void sdhci_timeout_timer(struct t
|
||||||
spin_lock_irqsave(&host->lock, flags);
|
spin_lock_irqsave(&host->lock, flags);
|
||||||
|
|
||||||
if (host->cmd && !sdhci_data_line_cmd(host->cmd)) {
|
if (host->cmd && !sdhci_data_line_cmd(host->cmd)) {
|
||||||
@@ -31,7 +31,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|||||||
mmc_hostname(host->mmc));
|
mmc_hostname(host->mmc));
|
||||||
sdhci_dumpregs(host);
|
sdhci_dumpregs(host);
|
||||||
|
|
||||||
@@ -3167,7 +3167,7 @@ static void sdhci_timeout_data_timer(str
|
@@ -3212,7 +3212,7 @@ static void sdhci_timeout_data_timer(str
|
||||||
|
|
||||||
if (host->data || host->data_cmd ||
|
if (host->data || host->data_cmd ||
|
||||||
(host->cmd && sdhci_data_line_cmd(host->cmd))) {
|
(host->cmd && sdhci_data_line_cmd(host->cmd))) {
|
||||||
|
|||||||
@@ -201,7 +201,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
|
|||||||
|
|
||||||
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||||
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||||
@@ -5639,17 +5639,19 @@ static void dm_update_crtc_active_planes
|
@@ -5638,17 +5638,19 @@ static void dm_update_crtc_active_planes
|
||||||
}
|
}
|
||||||
|
|
||||||
static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
|
static int dm_crtc_helper_atomic_check(struct drm_crtc *crtc,
|
||||||
@@ -225,7 +225,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-1-max
|
|||||||
WARN_ON(1);
|
WARN_ON(1);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@@ -5660,8 +5662,8 @@ static int dm_crtc_helper_atomic_check(s
|
@@ -5659,8 +5661,8 @@ static int dm_crtc_helper_atomic_check(s
|
||||||
* planes are disabled, which is not supported by the hardware. And there is legacy
|
* planes are disabled, which is not supported by the hardware. And there is legacy
|
||||||
* userspace which stops using the HW cursor altogether in response to the resulting EINVAL.
|
* userspace which stops using the HW cursor altogether in response to the resulting EINVAL.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|||||||
|
|
||||||
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||||
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||||
@@ -6565,9 +6565,7 @@ void amdgpu_dm_connector_init_helper(str
|
@@ -6564,9 +6564,7 @@ void amdgpu_dm_connector_init_helper(str
|
||||||
if (connector_type == DRM_MODE_CONNECTOR_HDMIA ||
|
if (connector_type == DRM_MODE_CONNECTOR_HDMIA ||
|
||||||
connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
|
connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
|
||||||
connector_type == DRM_MODE_CONNECTOR_eDP) {
|
connector_type == DRM_MODE_CONNECTOR_eDP) {
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|||||||
|
|
||||||
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||||
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||||
@@ -5510,25 +5510,6 @@ static int fill_hdr_info_packet(const st
|
@@ -5509,25 +5509,6 @@ static int fill_hdr_info_packet(const st
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|||||||
static int
|
static int
|
||||||
amdgpu_dm_connector_atomic_check(struct drm_connector *conn,
|
amdgpu_dm_connector_atomic_check(struct drm_connector *conn,
|
||||||
struct drm_atomic_state *state)
|
struct drm_atomic_state *state)
|
||||||
@@ -5544,7 +5525,7 @@ amdgpu_dm_connector_atomic_check(struct
|
@@ -5543,7 +5524,7 @@ amdgpu_dm_connector_atomic_check(struct
|
||||||
if (!crtc)
|
if (!crtc)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201211114237.213288-2-tomi
|
|||||||
|
|
||||||
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||||
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
|
||||||
@@ -5026,7 +5026,6 @@ static void dm_disable_vblank(struct drm
|
@@ -5025,7 +5025,6 @@ static void dm_disable_vblank(struct drm
|
||||||
static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = {
|
static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = {
|
||||||
.reset = dm_crtc_reset_state,
|
.reset = dm_crtc_reset_state,
|
||||||
.destroy = amdgpu_dm_crtc_destroy,
|
.destroy = amdgpu_dm_crtc_destroy,
|
||||||
|
|||||||
@@ -1360,7 +1360,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||||||
int irq;
|
int irq;
|
||||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||||
@@ -5000,7 +5000,7 @@ int stmmac_dvr_probe(struct device *devi
|
@@ -5008,7 +5008,7 @@ int stmmac_dvr_probe(struct device *devi
|
||||||
priv->wol_irq = res->wol_irq;
|
priv->wol_irq = res->wol_irq;
|
||||||
priv->lpi_irq = res->lpi_irq;
|
priv->lpi_irq = res->lpi_irq;
|
||||||
|
|
||||||
|
|||||||
@@ -74,7 +74,7 @@
|
|||||||
#ifdef CONFIG_SGI_PARTITION
|
#ifdef CONFIG_SGI_PARTITION
|
||||||
sgi_partition,
|
sgi_partition,
|
||||||
#endif
|
#endif
|
||||||
@@ -694,6 +701,14 @@ static bool blk_add_partition(struct gen
|
@@ -701,6 +708,14 @@ static bool blk_add_partition(struct gen
|
||||||
(state->parts[p].flags & ADDPART_FLAG_RAID))
|
(state->parts[p].flags & ADDPART_FLAG_RAID))
|
||||||
md_autodetect_dev(part_to_dev(part)->devt);
|
md_autodetect_dev(part_to_dev(part)->devt);
|
||||||
|
|
||||||
|
|||||||
@@ -87,7 +87,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
if (!net_eq(dev_net(dev), sock_net(sk)))
|
if (!net_eq(dev_net(dev), sock_net(sk)))
|
||||||
goto drop;
|
goto drop;
|
||||||
|
|
||||||
@@ -3330,6 +3332,7 @@ static int packet_create(struct net *net
|
@@ -3329,6 +3331,7 @@ static int packet_create(struct net *net
|
||||||
mutex_init(&po->pg_vec_lock);
|
mutex_init(&po->pg_vec_lock);
|
||||||
po->rollover = NULL;
|
po->rollover = NULL;
|
||||||
po->prot_hook.func = packet_rcv;
|
po->prot_hook.func = packet_rcv;
|
||||||
@@ -95,7 +95,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
if (sock->type == SOCK_PACKET)
|
if (sock->type == SOCK_PACKET)
|
||||||
po->prot_hook.func = packet_rcv_spkt;
|
po->prot_hook.func = packet_rcv_spkt;
|
||||||
@@ -3974,6 +3977,16 @@ packet_setsockopt(struct socket *sock, i
|
@@ -3972,6 +3975,16 @@ packet_setsockopt(struct socket *sock, i
|
||||||
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
|
po->xmit = val ? packet_direct_xmit : dev_queue_xmit;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -112,7 +112,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
default:
|
default:
|
||||||
return -ENOPROTOOPT;
|
return -ENOPROTOOPT;
|
||||||
}
|
}
|
||||||
@@ -4030,6 +4043,13 @@ static int packet_getsockopt(struct sock
|
@@ -4028,6 +4041,13 @@ static int packet_getsockopt(struct sock
|
||||||
case PACKET_VNET_HDR:
|
case PACKET_VNET_HDR:
|
||||||
val = po->has_vnet_hdr;
|
val = po->has_vnet_hdr;
|
||||||
break;
|
break;
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|||||||
|
|
||||||
--- a/drivers/net/phy/phy_device.c
|
--- a/drivers/net/phy/phy_device.c
|
||||||
+++ b/drivers/net/phy/phy_device.c
|
+++ b/drivers/net/phy/phy_device.c
|
||||||
@@ -1651,6 +1651,9 @@ void phy_detach(struct phy_device *phyde
|
@@ -1652,6 +1652,9 @@ void phy_detach(struct phy_device *phyde
|
||||||
struct module *ndev_owner = NULL;
|
struct module *ndev_owner = NULL;
|
||||||
struct mii_bus *bus;
|
struct mii_bus *bus;
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||||||
|
|
||||||
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||||
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
|
||||||
@@ -5033,6 +5033,10 @@ int stmmac_dvr_probe(struct device *devi
|
@@ -5041,6 +5041,10 @@ int stmmac_dvr_probe(struct device *devi
|
||||||
reset_control_reset(priv->plat->stmmac_rst);
|
reset_control_reset(priv->plat->stmmac_rst);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -40,7 +40,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
|||||||
/* Init MAC and get the capabilities */
|
/* Init MAC and get the capabilities */
|
||||||
ret = stmmac_hw_init(priv);
|
ret = stmmac_hw_init(priv);
|
||||||
if (ret)
|
if (ret)
|
||||||
@@ -5247,6 +5251,7 @@ int stmmac_dvr_remove(struct device *dev
|
@@ -5255,6 +5259,7 @@ int stmmac_dvr_remove(struct device *dev
|
||||||
phylink_destroy(priv->phylink);
|
phylink_destroy(priv->phylink);
|
||||||
if (priv->plat->stmmac_rst)
|
if (priv->plat->stmmac_rst)
|
||||||
reset_control_assert(priv->plat->stmmac_rst);
|
reset_control_assert(priv->plat->stmmac_rst);
|
||||||
|
|||||||
Reference in New Issue
Block a user