From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sinan Kaya Subject: Re: [PATCH V8 0/5] PCI/ASPM: reconfigure ASPM following hotplug for POLICY_DEFAULT Date: Tue, 11 Apr 2017 17:27:59 -0400 Message-ID: <7b94bfbb-b3e6-cbc3-06a1-4490f4142ffe@codeaurora.org> References: <1491627351-1111-1-git-send-email-okaya@codeaurora.org> <20170411211924.GC14778@bhelgaas-glaptop.roam.corp.google.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20170411211924.GC14778@bhelgaas-glaptop.roam.corp.google.com> Sender: linux-pci-owner@vger.kernel.org To: Bjorn Helgaas Cc: linux-pci@vger.kernel.org, timur@codeaurora.org, linux-arm-msm@vger.kernel.org, mayurkumar.patel@intel.com, linux-arm-kernel@lists.infradead.org List-Id: linux-arm-msm@vger.kernel.org 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 -- Sinan Kaya Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project. From mboxrd@z Thu Jan 1 00:00:00 1970 From: okaya@codeaurora.org (Sinan Kaya) Date: Tue, 11 Apr 2017 17:27:59 -0400 Subject: [PATCH V8 0/5] PCI/ASPM: reconfigure ASPM following hotplug for POLICY_DEFAULT In-Reply-To: <20170411211924.GC14778@bhelgaas-glaptop.roam.corp.google.com> References: <1491627351-1111-1-git-send-email-okaya@codeaurora.org> <20170411211924.GC14778@bhelgaas-glaptop.roam.corp.google.com> Message-ID: <7b94bfbb-b3e6-cbc3-06a1-4490f4142ffe@codeaurora.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 -- Sinan Kaya Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc. Qualcomm Technologies, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project.