From 3e87e5f41d76a6feee496d518b8c1f79505bec92 Mon Sep 17 00:00:00 2001 From: benihi <88561480+benihi@users.noreply.github.com> Date: Fri, 26 Aug 2022 09:09:32 -0400 Subject: [PATCH] kernel: 5.15: fix bug in patch format (#10006) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: José Hwong Signed-off-by: José Hwong --- ...Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch | 4 ---- 1 file changed, 4 deletions(-) diff --git a/target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch b/target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch index 8dacab7bd..76b39452a 100644 --- a/target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch +++ b/target/linux/generic/pending-5.15/851-0006-Revert-PCI-aardvark-Fix-initialization-with-old-Marv.patch @@ -23,11 +23,7 @@ Acked-by: Miquel Raynal --- 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);