mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

kernel: bump 6.1 to 6.1.58 

Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.1.58

All patches automatically rebased.

Signed-off-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
John Audia 2023-10-20 03:37:22 -04:00 committed by Nick Hainke
parent e6281720f2
commit 33e72eba5f
3 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-6.1
View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .57
LINUX_KERNEL_HASH-6.1.57 = f9ebfe3ddc5152d87b37e33be30e31875d137433be10a57ce29d2eae7b6e91b1
LINUX_VERSION-6.1 = .58
LINUX_KERNEL_HASH-6.1.58 = ce987ed3d2f640b3a2a62a0a8573d538a36dfd3cc31e2d7a239ce5a16c1c21ad

19
target/linux/layerscape/patches-6.1/703-layerscape-6.1-fix-compilation-warning-for-fsl-ppfe-.patch
View File

@ -149,11 +149,9 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
drivers/staging/fsl_ppfe/pfe_sysfs.c | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/fsl_ppfe/pfe_cdev.c b/drivers/staging/fsl_ppfe/pfe_cdev.c
index f19a1821af42..e0b3af0892ac 100644
--- a/drivers/staging/fsl_ppfe/pfe_cdev.c
+++ b/drivers/staging/fsl_ppfe/pfe_cdev.c
@@ -34,7 +34,7 @@ static ssize_t pfe_cdev_read(struct file *fp, char *buf,
@@ -34,7 +34,7 @@ static ssize_t pfe_cdev_read(struct file
{
int ret = 0;
@ -162,7 +160,7 @@ index f19a1821af42..e0b3af0892ac 100644
sizeof(link_states));
pr_debug("Dump link_state on screen before copy_to_user\n");
@@ -47,14 +47,14 @@ static ssize_t pfe_cdev_read(struct file *fp, char *buf,
@@ -47,14 +47,14 @@ static ssize_t pfe_cdev_read(struct file
/* Copy to user the value in buffer sized len */
ret = copy_to_user(buf, &link_states, sizeof(link_states));
if (ret != 0) {
@ -179,8 +177,6 @@ index f19a1821af42..e0b3af0892ac 100644
return sizeof(link_states);
}
diff --git a/drivers/staging/fsl_ppfe/pfe_hif.c b/drivers/staging/fsl_ppfe/pfe_hif.c
index dcc3f7f1e9ef..5347401f92c0 100644
--- a/drivers/staging/fsl_ppfe/pfe_hif.c
+++ b/drivers/staging/fsl_ppfe/pfe_hif.c
@@ -115,11 +115,11 @@ static void send_dummy_pkt_to_hif(void)
@ -197,7 +193,7 @@ index dcc3f7f1e9ef..5347401f92c0 100644
if (!lmem_ptr)
return;
@@ -186,16 +186,16 @@ static void pfe_hif_free_descr(struct pfe_hif *hif)
@@ -186,16 +186,16 @@ static void pfe_hif_free_descr(struct pf
void pfe_hif_desc_dump(struct pfe_hif *hif)
{
struct hif_desc *desc;
@ -217,7 +213,7 @@ index dcc3f7f1e9ef..5347401f92c0 100644
for (ii = 0; ii < hif->rx_ring_size; ii++) {
pr_info("status: %08x, ctrl: %08x, data: %08x, next: %x\n",
readl(&desc->status), readl(&desc->ctrl),
@@ -204,10 +204,10 @@ void pfe_hif_desc_dump(struct pfe_hif *hif)
@@ -204,10 +204,10 @@ void pfe_hif_desc_dump(struct pfe_hif *h
}
desc = hif->tx_base;
@ -230,11 +226,9 @@ index dcc3f7f1e9ef..5347401f92c0 100644
for (ii = 0; ii < hif->tx_ring_size; ii++) {
pr_info("status: %08x, ctrl: %08x, data: %08x, next: %x\n",
readl(&desc->status), readl(&desc->ctrl),
diff --git a/drivers/staging/fsl_ppfe/pfe_sysfs.c b/drivers/staging/fsl_ppfe/pfe_sysfs.c
index 1792e88140d1..ede651be51bf 100644
--- a/drivers/staging/fsl_ppfe/pfe_sysfs.c
+++ b/drivers/staging/fsl_ppfe/pfe_sysfs.c
@@ -535,7 +535,7 @@ static ssize_t pfe_show_tmu3_queues(struct device *dev, struct device_attribute
@@ -535,7 +535,7 @@ static ssize_t pfe_show_tmu3_queues(stru
static ssize_t pfe_set_util(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count)
{
@ -243,6 +237,3 @@ index 1792e88140d1..ede651be51bf 100644
return count;
}
--
2.25.1

7
target/linux/layerscape/patches-6.1/704-net-phylink-treat-PHY_INTERFACE_MODE_2500SGMII-in-ph.patch
View File

@ -30,11 +30,9 @@ Signed-off-by: Ioana Ciornei <ioana.ciornei@nxp.com>
drivers/net/phy/phylink.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c
index 2805b04d6402..a1e34b127401 100644
--- a/drivers/net/phy/phylink.c
+++ b/drivers/net/phy/phylink.c
@@ -485,6 +485,7 @@ unsigned long phylink_get_capabilities(phy_interface_t interface,
@@ -485,6 +485,7 @@ unsigned long phylink_get_capabilities(p
break;
case PHY_INTERFACE_MODE_2500BASEX:
@ -42,6 +40,3 @@ index 2805b04d6402..a1e34b127401 100644
caps |= MAC_2500FD;
break;
--
2.25.1