On Tue, Apr 11, 2017 at 05:27:59PM -0400, Sinan Kaya wrote: > On 4/11/2017 5:19 PM, Bjorn Helgaas wrote: > > Hi Sinan, > > > > What are these patches based on? I normally apply things to my "master" > > branch, which is typically -rc1 or -rc2. Right now it's v4.11-rc1, and > > these don't apply cleanly: > > > > 04:17:59 ~/linux (master)$ stg branch --create pci/aspm-sk-v8 v4.11-rc1 > > Checking for changes in the working directory ... done > > Don't know how to determine parent branch from "v4.11-rc1" > > Branch "pci/aspm-sk-v8" created > > 04:18:18 ~/linux (pci/aspm-sk-v8)$ stg import -M --sign m/sk-v8 > > Checking for changes in the working directory ... done > > Importing patch "pci-aspm-introduce" ... done > > Importing patch "pci-aspm-split-pci_aspm_init" ... done > > Importing patch "pci-aspm-add-init-hook-to" ... error: patch failed: drivers/pci/pcie/aspm.c:798 > > error: drivers/pci/pcie/aspm.c: patch does not apply > > stg import: Diff does not apply cleanly > > This is what I have. > > 41a7175 PCI/ASPM: move link_state cleanup to bridge remove > 3b646e2 PCI/ASPM: save power on values during bridge init > 181510d PCI/ASPM: add init hook to device_add > 282d008 PCI/ASPM: split pci_aspm_init() into two > 8e89fc2 PCI/ASPM: introduce pci_aspm_init() and add to pci_init_capabilities() > 97da385 Linux 4.11-rc3 Thanks, I guess I should have figured that out since my for-linus branch includes an ASPM patch.
