On Thursday 14 May 2009, Stephen Rothwell wrote: > Hi Arnd, > > On Wed, 13 May 2009 22:56:23 +0000 Arnd Bergmann <arnd@xxxxxxxx> wrote: > > > > Stephen, can you add > > git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic next > > to linux-next? > > I will try this tomorrow. It will be interesting to see just how many > conflicts we get. Thanks! I've tried to make this patch set as non-invasive as possible, basically just adding files and making single line changes to existing files where necessary. I've never seen conflicts when I tried merging with linux-next/master. In the beginning, I was thinking about doing one series per file, adding the asm-generic version in one patch and changing the per-arch versions to use it in follow-on patches. Hopefully, the way I'm doing it now turns out to be less time consuming, as I can add all the generic headers once without impacting any of the architectures, and the next patches can easily be done in the arch maintainer tree for all files at once. Arnd <>< -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
