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. Cheers, -- Email: Herbert Xu <herb...@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
