Thread (4 messages) 4 messages, 3 authors, 2017-03-28

Re: [PATCH v3 1/3] clk: meson-gxbb: expose clock CLKID_RNG0

From: Michael Turquette <mturquette@baylibre.com>
Date: 2017-03-28 22:07:24
Also in: linux-amlogic, linux-clk, linux-crypto

Herbert,

On Thu, Mar 23, 2017 at 12:56 AM, Herbert Xu
[off-list ref] wrote:
On Wed, Mar 22, 2017 at 08:24:08AM -0700, Kevin Hilman wrote:
quoted
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 [off-list ref]
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help