public inbox for linux-arm-kernel@lists.infradead.org
 help / color / mirror / Atom feed
From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Immutable branch between MFD and IIO due for the v4.12 merge window
Date: Mon, 24 Apr 2017 12:02:39 +0100	[thread overview]
Message-ID: <20170424110239.cv5nylgvymhwvg4w@dell> (raw)
In-Reply-To: <0f30afec-ff42-e125-96d6-35893324f7ef@kernel.org>

On Fri, 14 Apr 2017, Jonathan Cameron wrote:

> On 11/04/17 11:05, Lee Jones wrote:
> > Enjoy!
> > 
> > The following changes since commit c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201:
> > 
> >   Linux 4.11-rc1 (2017-03-05 12:59:56 -0800)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git ib-mfd-iio-v4.12
> > 
> > for you to fetch changes up to f2499ab450d3052097ba53a7d763f767935c0c59:
> > 
> >   iio: adc: add support for X-Powers AXP20X and AXP22X PMICs ADCs (2017-04-11 11:02:33 +0100)
> > 
> > ----------------------------------------------------------------
> > Immutable branch between MFD and IIO due for the v4.12 merge window
> > 
> > ----------------------------------------------------------------
> > Quentin Schulz (1):
> >       iio: adc: add support for X-Powers AXP20X and AXP22X PMICs ADCs
> > 
> >  drivers/iio/adc/Kconfig      |  10 +
> >  drivers/iio/adc/Makefile     |   1 +
> >  drivers/iio/adc/axp20x_adc.c | 617 +++++++++++++++++++++++++++++++++++++++++++
> >  3 files changed, 628 insertions(+)
> >  create mode 100644 drivers/iio/adc/axp20x_adc.c
> > 
> Hi Lee, 
> 
> Thanks for doing this, but the reason it was going to go through your
> tree in the first place was a dependency on
> commit 4707274714ef ("mfd: axp20x: Correct name of temperature data ADC registers")
> 
> Not present in the immutable branch.
> 
> There isn't much time for anything else going on around this driver though
> so other than a possible merge conflict on the Kconfig and Makefile shouldn't
> matter if this just goes through mfd. (famous last words ;)

It's not as though you committed it to text and sent it out to a
public mailing list for us all to reference though is it?  Doh!

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org ? Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

  reply	other threads:[~2017-04-24 11:02 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-04  6:34 [RESEND PATCH v4] iio: adc: add support for X-Powers AXP20X and AXP22X PMICs ADCs Quentin Schulz
2017-04-10  9:18 ` Quentin Schulz
2017-04-10 14:54   ` Lee Jones
2017-04-11  7:29     ` Quentin Schulz
2017-04-11  8:01       ` Lee Jones
2017-04-11 10:00 ` Lee Jones
2017-04-11 10:01   ` Lee Jones
2017-04-11 10:05 ` [GIT PULL] Immutable branch between MFD and IIO due for the v4.12 merge window Lee Jones
2017-04-14 14:30   ` Jonathan Cameron
2017-04-24 11:02     ` Lee Jones [this message]
2017-04-26  5:51       ` Jonathan Cameron

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=20170424110239.cv5nylgvymhwvg4w@dell \
    --to=lee.jones@linaro.org \
    --cc=linux-arm-kernel@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