Skip to content

Commit

Permalink
kernel: bump 5.10 to 5.10.201
Browse files Browse the repository at this point in the history
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.10.201

Removed upstreamed:
	x86/patches-5.10/120-hwrng-geode-fix-accessing-registers.patch[1]

All other patches automatically rebased.

1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.201&id=ffb3483c4b0bff1951e4020b9d73e4c13bf7fe93

Signed-off-by: Hauke Mehrtens <[email protected]>
  • Loading branch information
hauke committed Nov 25, 2023
1 parent e7b3414 commit f85a79b
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 55 deletions.
4 changes: 2 additions & 2 deletions include/kernel-5.10
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
LINUX_VERSION-5.10 = .200
LINUX_KERNEL_HASH-5.10.200 = 9d2d961fbf87486e48b0087326ee35cb0af4dec03c770737b098652457205104
LINUX_VERSION-5.10 = .201
LINUX_KERNEL_HASH-5.10.201 = 6afc06598fa8e3bc907cff75f995f372df51d40a284e260de78a3421b1f18218
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/845aa10ef171fc0ea060495efef1
unsigned int var;
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -517,7 +517,7 @@ void mtk_drm_crtc_async_update(struct dr
@@ -520,7 +520,7 @@ void mtk_drm_crtc_async_update(struct dr
}

static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
Expand All @@ -576,7 +576,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/845aa10ef171fc0ea060495efef1
{
struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
@@ -542,7 +542,7 @@ static void mtk_drm_crtc_atomic_enable(s
@@ -545,7 +545,7 @@ static void mtk_drm_crtc_atomic_enable(s
}

static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201028123222.1732139-2-max
if (drm_crtc_vblank_get(crtc) == 0)
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -575,24 +575,24 @@ static void mtk_drm_crtc_atomic_disable(
@@ -578,24 +578,24 @@ static void mtk_drm_crtc_atomic_disable(
}

static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201211114237.213288-2-tomi
static const struct drm_plane_helper_funcs ingenic_drm_plane_helper_funcs = {
--- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
+++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
@@ -614,7 +614,6 @@ static const struct drm_crtc_funcs mtk_c
@@ -617,7 +617,6 @@ static const struct drm_crtc_funcs mtk_c
.reset = mtk_drm_crtc_reset,
.atomic_duplicate_state = mtk_drm_crtc_duplicate_state,
.atomic_destroy_state = mtk_drm_crtc_destroy_state,
Expand Down Expand Up @@ -405,7 +405,7 @@ Link: https://patchwork.freedesktop.org/patch/msgid/20201211114237.213288-2-tomi
/* -----------------------------------------------------------------------------
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1645,7 +1645,6 @@ static const struct drm_crtc_funcs vop_c
@@ -1649,7 +1649,6 @@ static const struct drm_crtc_funcs vop_c
.disable_vblank = vop_crtc_disable_vblank,
.set_crc_source = vop_crtc_set_crc_source,
.verify_crc_source = vop_crtc_verify_crc_source,
Expand Down
2 changes: 1 addition & 1 deletion target/linux/generic/hack-5.10/259-regmap_dynamic.patch
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <[email protected]>
#include <linux/mutex.h>
#include <linux/err.h>
#include <linux/property.h>
@@ -3298,3 +3299,5 @@ static int __init regmap_initcall(void)
@@ -3300,3 +3301,5 @@ static int __init regmap_initcall(void)
return 0;
}
postcore_initcall(regmap_initcall);
Expand Down

This file was deleted.

0 comments on commit f85a79b

Please sign in to comment.