Patch Merging Path - RMK or Arnd?
will.deacon at arm.com
Fri Aug 19 08:49:33 EDT 2011
In general, I merge my patches via Russell as they tend to be core ARM changes.
This works very well since other (potentially conflicting) changes follow
the same route and any conflicts would be noticed almost immediately.
However, I currently have two patchsets that I'm developing which alter both
core ARM code *and* touch a number of platforms to use the new core
Ideally, I would also merge these via Russell, but there is now scope for
conflict with your arm-soc branch given that I'm changing files under mach-*
and plat-*. How would you recommend that I proceed? I can think of three
(1) [preferred] Merge via Russell, conflicts show up in -next and are
(2) Split the patches up so that the core changes go via Russell. When they
are in a suitable tree (-next?) then send you the remainder on top of
(3) Merge the whole lot via you. This really just inverts the problem rather
than solving anything.
I expect this will become a fairly common pattern with single zImage work,
so it would be great to clarify the intended path upstream.
More information about the linux-arm-kernel