On Tue, Aug 27, 2013 at 12:03:01PM -0600, Bjorn Helgaas wrote: > On Tue, Aug 27, 2013 at 10:11 AM, Stephen Warren <swarren@xxxxxxxxxxxxx> wrote: > > On 08/27/2013 02:14 AM, Thierry Reding wrote: > >> On Mon, Aug 19, 2013 at 02:49:07PM -0600, Bjorn Helgaas wrote: > >>> On Mon, Aug 19, 2013 at 2:12 PM, Thierry Reding > >>> <thierry.reding@xxxxxxxxx> wrote: > >>>> On Mon, Aug 19, 2013 at 02:04:24PM -0600, Bjorn Helgaas wrote: > >>>>> On Mon, Aug 19, 2013 at 6:02 AM, Thierry Reding > >>>>> <thierry.reding@xxxxxxxxx> wrote: > >>>>> > >>>>>> Bjorn, how do you want to handle patches to the Tegra PCIe > >>>>>> driver in the future? Do you want me to prepare a branch > >>>>>> and pull from that or would you rather just take simple > >>>>>> patches? > >>>>> > >>>>> I'm in the habit of applying patches from email, so that's > >>>>> easy for me. But a branch would be OK, too. > >>>> > >>>> Patches work for me too. Is this cleanup patch something that > >>>> you'd be comfortable with applying after 3.12-rc1 or would you > >>>> rather defer it to 3.13? > >>> > >>> I'm not really sure how we should manage drivers/pci/host/*. > >>> Those files are mostly arch code, and I'm not sure it's useful > >>> for me to be in the middle of managing them. > >>> > >>> I assume Stephen or somebody has a tree with the pci-tegra.c > >>> stuff that's in -next right now; it seems like it'd be simplest > >>> to just add this patch there and merge in during the v3.12 merge > >>> window. > >> > >> If Stephen's fine with it I suppose we could take pci-tegra.c > >> driver changes through the Tegra tree. But I think it'd be good if > >> we could still Cc you on patches so you're aware of what we're > >> doing (that is the same for all drivers drivers/pci/host/*). And > >> we're going to need your Acked-by on the patches as well. > > I think you have my Acked-by for this case already (from Aug 20). And > feel free to copy me on anything you like; my delete key works well :) > > > I can push Tegra PCIe patches through the arm-soc tree before > > 3.12-rc1, but after that point, I think it's best if they go through > > the PCIe tree, unless there's some cross-subsystem dependency for a > > specific patch, and with the new PCIe driver, that's less likely. > > I'm OK with merging things through my tree. It just seemed like there > was a lot of recent Tegra activity that included a few Tegra PCI > changes, and no benefit to trying to split the PCI stuff from the > non-PCI stuff. Hopefully it will calm down, because I don't have time > to be in the middle of major Tegra stuff. Yes, I think it will calm down. The difficulty this time around was that there were various dependencies across multiple trees that needed to be coordinated. As Stephen already mentioned, part of the reason to move the driver out of arch/arm/mach-tegra was to make it stand on its own. Thierry
Attachment:
pgps_dA2XKlYu.pgp
Description: PGP signature
