mirror of https://lore.kernel.org/linux-amlogic/
 help / color / mirror / Atom feed
From: herbert@gondor.apana.org.au (Herbert Xu)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH v3 1/3] clk: meson-gxbb: expose clock CLKID_RNG0
Date: Thu, 23 Mar 2017 15:56:02 +0800	[thread overview]
Message-ID: <20170323075602.GA6054@gondor.apana.org.au> (raw)
In-Reply-To: <m2lgrxnxlz.fsf@baylibre.com>

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

  parent reply	other threads:[~2017-03-23  7:56 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-22  6:55 Heiner Kallweit
2017-02-22  6:59 ` [PATCH v3 2/4] ARM64: dts: meson-gx: add clock to DT binding documentation for hwrng Heiner Kallweit
2017-02-27 22:34   ` Rob Herring
2017-02-22  7:00 ` [PATCH v3 3/4] ARM64: dts: meson-gx: add clock CLKID_RNG0 to hwrng node Heiner Kallweit
2017-02-22  7:02 ` [PATCH v3 4/4] hwrng: meson: add clock handling to driver Heiner Kallweit
2017-02-27 13:28 ` [PATCH v3 1/3] clk: meson-gxbb: expose clock CLKID_RNG0 Neil Armstrong
2017-03-16 10:07 ` Herbert Xu
2017-03-16 18:24   ` Kevin Hilman
2017-03-17  8:30     ` Herbert Xu
2017-03-17 23:05       ` Kevin Hilman
2017-03-22 15:24       ` Kevin Hilman
2017-03-23  1:43         ` Michael Turquette
2017-03-23  7:56         ` Herbert Xu [this message]
2017-03-28 22:07           ` Michael Turquette

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170323075602.GA6054@gondor.apana.org.au \
    --to=herbert@gondor.apana.org.au \
    --cc=linus-amlogic@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®