Jan-Benedict Glaw <jbglaw@xxxxxxxxxx> writes: >> git log ORIG_HEAD.. > > That's the point--I don't really expect any conflicts, or only a very > little number of them. Basically, only the Makefiles and the Kconfig > files do have a chance to conflict. It's no more than a new arch/ > directory and some drivers. > > The hard part will be to figure out all the needed changes in arch > code, like the IRQ handling rework etc :) Since you are maintaining your own arch/ and the other in-tree architectures progressed as common core code did, you would want to make matching changes to your arch to adjust to the core changes. [a big warning in red capital letters: I do not hack kernel] I suspect you would want to see what _other_ architecture did to adjust to the changes in the common core code that happened in the meantime. How about... $ git log ORIG_HEAD.. -- arch/$somearch include/asm-$somearch where $somearch is something that has difference from the mainstream that is similar to vax, to figure out what other architectures needed to adjust, perhaps? - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html