Herbert, On Thu, Mar 23, 2017 at 12:56 AM, Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> wrote: > On Wed, Mar 22, 2017 at 08:24:08AM -0700, Kevin Hilman wrote: >> >> Because this will be causing conflicts with both the platform (amlogic) >> tree and the clk tree, could provide an immutable branch where these are >> applied to help us handle these conflicts? > > If you apply the same patches to your tree there should be no > conflicts at all. git is able to resolve this automatically. The commits will have different SHA1 hashes (commit id's). Having multiple "copies" of the same patch with separate id's is undesirable and completely avoidable. Immutable, shared branches resolve this issue. Best regards, Mike > > Cheers, > -- > Email: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx> > Home Page: http://gondor.apana.org.au/~herbert/ > PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
