kernel: bump 5.15 to 5.15.63 (#9999)

All patches automatically rebased.

Signed-off-by: John Audia <therealgraysky@proton.me>

Signed-off-by: John Audia <therealgraysky@proton.me>
Co-authored-by: John Audia <therealgraysky@proton.me>
This commit is contained in:
lovehackintosh 2022-08-26 13:11:25 +08:00 committed by GitHub
parent c48c51cc37
commit ec3a9bd8ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 13 additions and 9 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.15 = .62
LINUX_KERNEL_HASH-5.15.62 = 06817cde8e57cdb6dbf20eaa5122fee110024f6e8b783799c98cb65dc753f141
LINUX_VERSION-5.15 = .63
LINUX_KERNEL_HASH-5.15.63 = 6dd3cd1e5a629d0002bc6c6ec7e8ea96710104f38664122dd56c83dfd4eb7341

View File

@ -16,7 +16,7 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com>
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -61,19 +61,6 @@ machine-$(CONFIG_PPC64) += 64
@@ -44,19 +44,6 @@ machine-$(CONFIG_PPC64) += 64
machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le
UTS_MACHINE := $(subst $(space),,$(machine-y))

View File

@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1738,6 +1738,9 @@ void phy_detach(struct phy_device *phyde
@@ -1744,6 +1744,9 @@ void phy_detach(struct phy_device *phyde
struct module *ndev_owner = NULL;
struct mii_bus *bus;

View File

@ -33,7 +33,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
@@ -274,7 +274,6 @@ struct advk_pcie {
@@ -275,7 +275,6 @@ struct advk_pcie {
u8 wins_count;
struct irq_domain *rp_irq_domain;
struct irq_domain *irq_domain;
@ -41,7 +41,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
raw_spinlock_t irq_lock;
struct irq_domain *msi_domain;
struct irq_domain *msi_inner_domain;
@@ -1330,14 +1329,19 @@ static void advk_pcie_irq_unmask(struct
@@ -1345,14 +1344,19 @@ static void advk_pcie_irq_unmask(struct
raw_spin_unlock_irqrestore(&pcie->irq_lock, flags);
}
@ -63,7 +63,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
irq_set_chip_data(virq, pcie);
return 0;
@@ -1396,7 +1400,6 @@ static int advk_pcie_init_irq_domain(str
@@ -1411,7 +1415,6 @@ static int advk_pcie_init_irq_domain(str
struct device *dev = &pcie->pdev->dev;
struct device_node *node = dev->of_node;
struct device_node *pcie_intc_node;
@ -71,7 +71,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
int ret = 0;
raw_spin_lock_init(&pcie->irq_lock);
@@ -1407,28 +1410,14 @@ static int advk_pcie_init_irq_domain(str
@@ -1422,28 +1425,14 @@ static int advk_pcie_init_irq_domain(str
return -ENODEV;
}

View File

@ -23,7 +23,11 @@ Acked-by: Miquel Raynal <miquel.raynal@bootlin.com>
--- a/drivers/pci/controller/pci-aardvark.c
+++ b/drivers/pci/controller/pci-aardvark.c
<<<<<<< HEAD
@@ -1632,9 +1632,7 @@ static int advk_pcie_enable_phy(struct a
=======
@@ -1631,9 +1631,7 @@ static int advk_pcie_enable_phy(struct a
>>>>>>> edeae512c0 (kernel: bump 5.15 to 5.15.63)
}
ret = phy_power_on(pcie->phy);

View File

@ -71,7 +71,7 @@ still required by target/linux/ramips/files/drivers/net/ethernet/ralink/mdio.c
break;
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1023,14 +1023,16 @@ struct phy_device *phy_find_first(struct
@@ -1029,14 +1029,16 @@ struct phy_device *phy_find_first(struct
}
EXPORT_SYMBOL(phy_find_first);