mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2026-01-28 02:27:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

kernel: bump 5.15 to 5.15.187
Some checks failed
Build Kernel / Build all affected Kernels (push) Has been cancelled
Details
Build all core packages / Build all core packages for selected target (push) Has been cancelled
Details
Build host tools / Build host tools for linux and macos based systems (push) Has been cancelled
Details

Browse source 
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.187

New Kconfig symbol:
  x86: enable MITIGATION_TSA[1]

All patches are automatically refreshed.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.187&id=f2b75f1368af22bb290f128e29bc64b619a9d54d

Signed-off-by: Shiji Yang <yangshiji66@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/19250
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Shiji Yang 2025-07-11 00:52:06 +08:00 • committed by Hauke Mehrtens
parent d4a2742822
commit 6747179486
9 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/kernel-5.15
View file

@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .186
LINUX_KERNEL_HASH-5.15.186 = 9c4efdd7ee550d524c017b5dae27725374526311e983661850cd880af671cb2a
LINUX_VERSION-5.15 = .187
LINUX_KERNEL_HASH-5.15.187 = 21786ee84981418279fcd60ae6ed98ab2f102b5a4a255bd81b881033f0afff14

8
target/linux/bcm27xx/patches-5.15/950-0070-MMC-added-alternative-MMC-driver.patch
View file

@ -303,7 +303,7 @@ bcm2835-mmc: uninitialized_var is no more
}
--- a/drivers/mmc/core/quirks.h
+++ b/drivers/mmc/core/quirks.h
@@ -119,6 +119,14 @@ static const struct mmc_fixup __maybe_un
@@ -21,6 +21,14 @@ static const struct mmc_fixup __maybe_un
MMC_FIXUP(CID_NAME_ANY, CID_MANFID_SANDISK_SD, 0x5344, add_quirk_sd,
MMC_QUIRK_BROKEN_SD_DISCARD),
@ -317,7 +317,7 @@ bcm2835-mmc: uninitialized_var is no more
+
END_FIXUP
};
static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = {
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -5,6 +5,35 @@
@ -1984,7 +1984,7 @@ bcm2835-mmc: uninitialized_var is no more
#define MAX_TUNING_LOOP 40
@@ -3196,7 +3196,7 @@ static void sdhci_timeout_timer(struct t
@@ -3191,7 +3191,7 @@ static void sdhci_timeout_timer(struct t
spin_lock_irqsave(&host->lock, flags);
if (host->cmd && !sdhci_data_line_cmd(host->cmd)) {
@ -1993,7 +1993,7 @@ bcm2835-mmc: uninitialized_var is no more
mmc_hostname(host->mmc));
sdhci_dumpregs(host);
@@ -3218,7 +3218,7 @@ static void sdhci_timeout_data_timer(str
@@ -3213,7 +3213,7 @@ static void sdhci_timeout_data_timer(str
if (host->data || host->data_cmd ||
(host->cmd && sdhci_data_line_cmd(host->cmd))) {

10
target/linux/bcm27xx/patches-5.15/950-0161-drm-v3d-Clock-V3D-down-when-not-in-use.patch
View file

@ -49,7 +49,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
irq_disable:
--- a/drivers/gpu/drm/v3d/v3d_drv.h
+++ b/drivers/gpu/drm/v3d/v3d_drv.h
@@ -85,6 +85,12 @@ struct v3d_dev {
@@ -93,6 +93,12 @@ struct v3d_dev {
void __iomem *bridge_regs;
void __iomem *gca_regs;
struct clk *clk;
@ -120,7 +120,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
v3d_init_core(struct v3d_dev *v3d, int core)
{
/* Set OVRTMUOUT, which means that the texture sampler uniform
@@ -358,6 +400,7 @@ v3d_job_free(struct kref *ref)
@@ -360,6 +402,7 @@ v3d_job_free(struct kref *ref)
struct v3d_job *job = container_of(ref, struct v3d_job, refcount);
unsigned long index;
struct dma_fence *fence;
@ -128,7 +128,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
int i;
for (i = 0; i < job->bo_count; i++) {
@@ -371,11 +414,7 @@ v3d_job_free(struct kref *ref)
@@ -373,11 +416,7 @@ v3d_job_free(struct kref *ref)
}
xa_destroy(&job->deps);
@ -141,7 +141,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
if (job->perfmon)
v3d_perfmon_put(job->perfmon);
@@ -460,6 +499,7 @@ v3d_job_init(struct v3d_dev *v3d, struct
@@ -462,6 +501,7 @@ v3d_job_init(struct v3d_dev *v3d, struct
if (ret)
goto fail;
@ -149,7 +149,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
kref_init(&job->refcount);
return 0;
@@ -914,6 +954,9 @@ v3d_gem_init(struct drm_device *dev)
@@ -916,6 +956,9 @@ v3d_gem_init(struct drm_device *dev)
mutex_init(&v3d->sched_lock);
mutex_init(&v3d->cache_clean_lock);

4
target/linux/bcm27xx/patches-5.15/950-0173-drm-v3d-Delete-pm_runtime-support.patch
View file

@ -14,7 +14,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/gpu/drm/v3d/v3d_gem.c
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
@@ -485,10 +485,6 @@ v3d_job_init(struct v3d_dev *v3d, struct
@@ -487,10 +487,6 @@ v3d_job_init(struct v3d_dev *v3d, struct
job->v3d = v3d;
job->free = free;
@ -25,7 +25,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
xa_init_flags(&job->deps, XA_FLAGS_ALLOC);
ret = drm_syncobj_find_fence(file_priv, in_sync, 0, 0, &in_fence);
@@ -505,7 +501,6 @@ v3d_job_init(struct v3d_dev *v3d, struct
@@ -507,7 +503,6 @@ v3d_job_init(struct v3d_dev *v3d, struct
return 0;
fail:
xa_destroy(&job->deps);

2
target/linux/bcm27xx/patches-5.15/950-0179-drm-v3d-Plug-dma_fence-leak.patch
View file

@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/drivers/gpu/drm/v3d/v3d_gem.c
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
@@ -414,6 +414,9 @@ v3d_job_free(struct kref *ref)
@@ -416,6 +416,9 @@ v3d_job_free(struct kref *ref)
}
xa_destroy(&job->deps);

2
target/linux/bcm27xx/patches-5.15/950-0184-v3d_gem-Kick-the-clock-so-firmware-knows-we-are-usin.patch
View file

@ -14,7 +14,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
--- a/drivers/gpu/drm/v3d/v3d_gem.c
+++ b/drivers/gpu/drm/v3d/v3d_gem.c
@@ -955,6 +955,10 @@ v3d_gem_init(struct drm_device *dev)
@@ -957,6 +957,10 @@ v3d_gem_init(struct drm_device *dev)
mutex_init(&v3d->clk_lock);
INIT_DELAYED_WORK(&v3d->clk_down_work, v3d_clock_down_work);

4
target/linux/generic/hack-5.15/726-net-eth-dpaa2-eth-do-not-hold-rtnl_lock.patch
View file

@ -27,7 +27,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
--- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
+++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -4219,12 +4219,10 @@ static irqreturn_t dpni_irq0_handler_thr
@@ -4299,12 +4299,10 @@ static irqreturn_t dpni_irq0_handler_thr
dpaa2_eth_set_mac_addr(netdev_priv(net_dev));
dpaa2_eth_update_tx_fqids(priv);
@ -40,7 +40,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
}
return IRQ_HANDLED;
@@ -4520,9 +4518,7 @@ static int dpaa2_eth_remove(struct fsl_m
@@ -4612,9 +4610,7 @@ static int dpaa2_eth_remove(struct fsl_m
#endif
unregister_netdev(net_dev);

6
target/linux/mediatek/patches-5.15/330-snand-mtk-bmt-support.patch
View file

@ -8,7 +8,7 @@
static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val)
{
@@ -1343,6 +1344,7 @@ static int spinand_probe(struct spi_mem
@@ -1344,6 +1345,7 @@ static int spinand_probe(struct spi_mem
if (ret)
return ret;
@ -16,7 +16,7 @@
ret = mtd_device_register(mtd, NULL, 0);
if (ret)
goto err_spinand_cleanup;
@@ -1350,6 +1352,7 @@ static int spinand_probe(struct spi_mem
@@ -1351,6 +1353,7 @@ static int spinand_probe(struct spi_mem
return 0;
err_spinand_cleanup:
@ -24,7 +24,7 @@
spinand_cleanup(spinand);
return ret;
@@ -1368,6 +1371,7 @@ static int spinand_remove(struct spi_mem
@@ -1369,6 +1372,7 @@ static int spinand_remove(struct spi_mem
if (ret)
return ret;

1
target/linux/x86/config-5.15
View file

@ -228,6 +228,7 @@ CONFIG_MIGRATION=y
CONFIG_MITIGATION_ITS=y
CONFIG_MITIGATION_RFDS=y
CONFIG_MITIGATION_SPECTRE_BHI=y
CONFIG_MITIGATION_TSA=y
# CONFIG_MK6 is not set
# CONFIG_MK7 is not set
# CONFIG_MK8 is not set