Messages in this thread | | | From | Arnd Bergmann <> | Subject | Re: [PATCH v2] kmap_types: convert most arches to a single header file | Date | Fri, 5 Jun 2009 08:09:07 +0100 |
| |
On Friday 05 June 2009, Randy Dunlap wrote: > > > 1. The patch still conflicts with mine from the asm-generic > > tree. Yours is better in multiple ways (cleans up all the > > archs, adds the necessary types for ppc and arm), so should > > I drop mine now? I guess I can also make my file identical > > to yours so independent of who gets in first, there should be > > a clean merge? > > or you can take my patch into your asm-generic patchset. :)
I've thought about that, but for 2.6.31, I'd like to only do the first half of adding ~50 files to include/asm-generic/, and then work with the arch maintainers on the second half, removing the code from their directories for 2.6.32, so this doesn't fit that well.
Arnd <><
| |