kernel: bump 5.10 to 5.10.134
All patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 7be62b1187bb7e21bcdaadfc3d47713a91f05898)
This commit is contained in:
parent
1db4f5cba3
commit
7ca89e1187
@ -1,2 +1,2 @@
|
|||||||
LINUX_VERSION-5.10 = .133
|
LINUX_VERSION-5.10 = .134
|
||||||
LINUX_KERNEL_HASH-5.10.133 = 3b5c4c7d5bca720c11f1024c9aa00ac04397b6c7de37fd4170444077c723280e
|
LINUX_KERNEL_HASH-5.10.134 = ec3513acdf033dd8f8ac2545cd1bb826b0669e151185e5f70408a5c9fe273269
|
||||||
|
@ -706,7 +706,7 @@
|
|||||||
EXPORT_SYMBOL(xfrm_parse_spi);
|
EXPORT_SYMBOL(xfrm_parse_spi);
|
||||||
--- a/net/ipv4/tcp_input.c
|
--- a/net/ipv4/tcp_input.c
|
||||||
+++ b/net/ipv4/tcp_input.c
|
+++ b/net/ipv4/tcp_input.c
|
||||||
@@ -4087,14 +4087,16 @@ static bool tcp_parse_aligned_timestamp(
|
@@ -4092,14 +4092,16 @@ static bool tcp_parse_aligned_timestamp(
|
||||||
{
|
{
|
||||||
const __be32 *ptr = (const __be32 *)(th + 1);
|
const __be32 *ptr = (const __be32 *)(th + 1);
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@ Signed-off-by: Martin Sperl <kernel@martin.sperl.org>
|
|||||||
/* Read as many bytes as possible from FIFO */
|
/* Read as many bytes as possible from FIFO */
|
||||||
bcm2835_rd_fifo(bs);
|
bcm2835_rd_fifo(bs);
|
||||||
/* Write as many bytes as possible to FIFO */
|
/* Write as many bytes as possible to FIFO */
|
||||||
@@ -1329,7 +1333,8 @@ static int bcm2835_spi_probe(struct plat
|
@@ -1333,7 +1337,8 @@ static int bcm2835_spi_probe(struct plat
|
||||||
bcm2835_wr(bs, BCM2835_SPI_CS,
|
bcm2835_wr(bs, BCM2835_SPI_CS,
|
||||||
BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
|
BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);
|
||||||
|
|
||||||
|
@ -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
|
||||||
@@ -5606,17 +5606,19 @@ static void dm_update_crtc_active_planes
|
@@ -5639,17 +5639,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;
|
||||||
}
|
}
|
||||||
@@ -5627,8 +5629,8 @@ static int dm_crtc_helper_atomic_check(s
|
@@ -5660,8 +5662,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
|
||||||
@@ -6532,9 +6532,7 @@ void amdgpu_dm_connector_init_helper(str
|
@@ -6565,9 +6565,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
|
||||||
@@ -5477,25 +5477,6 @@ static int fill_hdr_info_packet(const st
|
@@ -5510,25 +5510,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)
|
||||||
@@ -5511,7 +5492,7 @@ amdgpu_dm_connector_atomic_check(struct
|
@@ -5544,7 +5525,7 @@ amdgpu_dm_connector_atomic_check(struct
|
||||||
if (!crtc)
|
if (!crtc)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
@ -24,7 +24,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|||||||
#include <linux/of_irq.h>
|
#include <linux/of_irq.h>
|
||||||
#include <linux/spi/spi.h>
|
#include <linux/spi/spi.h>
|
||||||
|
|
||||||
@@ -1299,6 +1300,11 @@ static int bcm2835_spi_probe(struct plat
|
@@ -1303,6 +1304,11 @@ static int bcm2835_spi_probe(struct plat
|
||||||
struct bcm2835_spi *bs;
|
struct bcm2835_spi *bs;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
|
@ -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
|
||||||
@@ -4993,7 +4993,6 @@ static void dm_disable_vblank(struct drm
|
@@ -5026,7 +5026,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
|
||||||
@@ -4988,7 +4988,7 @@ int stmmac_dvr_probe(struct device *devi
|
@@ -4987,7 +4987,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;
|
||||||
|
|
||||||
|
@ -164,7 +164,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
|||||||
|
|
||||||
struct rtnl_link {
|
struct rtnl_link {
|
||||||
rtnl_doit_func doit;
|
rtnl_doit_func doit;
|
||||||
@@ -4695,7 +4695,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
|
@@ -4684,7 +4684,9 @@ int ndo_dflt_bridge_getlink(struct sk_bu
|
||||||
brport_nla_put_flag(skb, flags, mask,
|
brport_nla_put_flag(skb, flags, mask,
|
||||||
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
|
IFLA_BRPORT_MCAST_FLOOD, BR_MCAST_FLOOD) ||
|
||||||
brport_nla_put_flag(skb, flags, mask,
|
brport_nla_put_flag(skb, flags, mask,
|
||||||
|
@ -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
|
||||||
@@ -5021,6 +5021,10 @@ int stmmac_dvr_probe(struct device *devi
|
@@ -5020,6 +5020,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)
|
||||||
@@ -5245,6 +5249,7 @@ int stmmac_dvr_remove(struct device *dev
|
@@ -5244,6 +5248,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);
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
|
--- a/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
|
||||||
+++ b/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
|
+++ b/drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c
|
||||||
@@ -354,7 +354,7 @@ static int rt2880_pinmux_probe(struct pl
|
@@ -356,7 +356,7 @@ static int rt2880_pinmux_probe(struct pl
|
||||||
if (!of_device_is_available(np))
|
if (!of_device_is_available(np))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user