aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-5.15
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-06-20 10:50:45 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-27 00:57:16 +0200
commitb55efebb1fe99bae953adb8bd7743a61ffc40fb9 (patch)
treeab4b0ed6496aa7c1af5b18508618e67ad4bfa918 /target/linux/bcm27xx/patches-5.15
parent251a382c28854ea68bd46483a58990eafbf671ca (diff)
downloadupstream-b55efebb1fe99bae953adb8bd7743a61ffc40fb9.tar.gz
upstream-b55efebb1fe99bae953adb8bd7743a61ffc40fb9.tar.bz2
upstream-b55efebb1fe99bae953adb8bd7743a61ffc40fb9.zip
kernel: bump 5.15 to 5.15.47
Deleted (upstreamed): generic/backport-5.15/702-v5.19-32-net-ethernet-mtk_eth_soc-out-of-bounds-read-in-mtk_h.patch [01] [01] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.47&id=b24ca1cf846273361d5bd73a35de95a486a54b6d Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> [Removed 702-v5.19-32-net-ethernet-mtk_eth_soc-out-of-bounds-read-in-mtk_h.patch] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm27xx/patches-5.15')
-rw-r--r--target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch6
-rw-r--r--target/linux/bcm27xx/patches-5.15/950-0806-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch4
-rw-r--r--target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch2
3 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
index 55459a5804..42c8cef645 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
@@ -244,7 +244,7 @@ bcm2835-mmc: uninitialized_var is no more
static inline int mmc_blk_part_switch(struct mmc_card *card,
unsigned int part_type);
static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
-@@ -2924,6 +2931,8 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2923,6 +2930,8 @@ static int mmc_blk_probe(struct mmc_card
{
struct mmc_blk_data *md;
int ret = 0;
@@ -253,7 +253,7 @@ bcm2835-mmc: uninitialized_var is no more
/*
* Check that the card supports the command class(es) we need.
-@@ -2931,7 +2940,16 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2930,7 +2939,16 @@ static int mmc_blk_probe(struct mmc_card
if (!(card->csd.cmdclass & CCC_BLOCK_READ))
return -ENODEV;
@@ -271,7 +271,7 @@ bcm2835-mmc: uninitialized_var is no more
card->complete_wq = alloc_workqueue("mmc_complete",
WQ_MEM_RECLAIM | WQ_HIGHPRI, 0);
-@@ -2946,6 +2964,17 @@ static int mmc_blk_probe(struct mmc_card
+@@ -2945,6 +2963,17 @@ static int mmc_blk_probe(struct mmc_card
goto out_free;
}
diff --git a/target/linux/bcm27xx/patches-5.15/950-0806-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch b/target/linux/bcm27xx/patches-5.15/950-0806-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch
index c03e65122b..8f743ce5b3 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0806-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0806-drm-atomic-helpers-remove-legacy_cursor_update-hacks.patch
@@ -59,7 +59,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
-@@ -1488,13 +1488,6 @@ drm_atomic_helper_wait_for_vblanks(struc
+@@ -1498,13 +1498,6 @@ drm_atomic_helper_wait_for_vblanks(struc
int i, ret;
unsigned int crtc_mask = 0;
@@ -73,7 +73,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
for_each_oldnew_crtc_in_state(old_state, crtc, old_crtc_state, new_crtc_state, i) {
if (!new_crtc_state->active)
continue;
-@@ -2122,12 +2115,6 @@ int drm_atomic_helper_setup_commit(struc
+@@ -2132,12 +2125,6 @@ int drm_atomic_helper_setup_commit(struc
complete_all(&commit->flip_done);
continue;
}
diff --git a/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch b/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
index da9c428efb..3f2489df56 100644
--- a/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
+++ b/target/linux/bcm27xx/patches-5.15/950-0914-mmc-block-Don-t-do-single-sector-reads-during-recove.patch
@@ -23,7 +23,7 @@ Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
-@@ -1871,7 +1871,11 @@ static void mmc_blk_mq_rw_recovery(struc
+@@ -1870,7 +1870,11 @@ static void mmc_blk_mq_rw_recovery(struc
}
/* FIXME: Missing single sector read for large sector size */