From: Jonathan Cameron <jic23@kernel.org>
To: Lee Jones <lee.jones@linaro.org>,
Quentin Schulz <quentin.schulz@free-electrons.com>
Cc: mark.rutland@arm.com, thomas.petazzoni@free-electrons.com,
lars@metafoo.de, linux-pm@vger.kernel.org,
liam@networkimprov.net, linux-kernel@vger.kernel.org,
linux-sunxi@googlegroups.com, sre@kernel.org,
linux@armlinux.org.uk, linux-iio@vger.kernel.org, wens@csie.org,
robh+dt@kernel.org, icenowy@aosc.xyz, pmeerw@pmeerw.net,
knaack.h@gmx.de, maxime.ripard@free-electrons.com,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Subject: Re: [GIT PULL] Immutable branch between MFD and IIO due for the v4.12 merge window
Date: Fri, 14 Apr 2017 15:30:31 +0100 [thread overview]
Message-ID: <0f30afec-ff42-e125-96d6-35893324f7ef@kernel.org> (raw)
In-Reply-To: <20170411100528.2zif3fyi7uoyw33n@dell>
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 ;)
Jonathan
next prev parent reply other threads:[~2017-04-14 14:30 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
[not found] ` <20170404063441.7656-1-quentin.schulz-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2017-04-10 9:18 ` Quentin Schulz
[not found] ` <cf07853a-4382-5172-b24f-5324fb4308d3-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
2017-04-10 14:54 ` Lee Jones
2017-04-11 7:29 ` Quentin Schulz
[not found] ` <1800d928-d804-71db-cd0b-ec79cc504ee6-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
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 [this message]
[not found] ` <0f30afec-ff42-e125-96d6-35893324f7ef-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
2017-04-24 11:02 ` Lee Jones
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=0f30afec-ff42-e125-96d6-35893324f7ef@kernel.org \
--to=jic23@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=icenowy@aosc.xyz \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=lee.jones@linaro.org \
--cc=liam@networkimprov.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-sunxi@googlegroups.com \
--cc=linux@armlinux.org.uk \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@free-electrons.com \
--cc=pmeerw@pmeerw.net \
--cc=quentin.schulz@free-electrons.com \
--cc=robh+dt@kernel.org \
--cc=sre@kernel.org \
--cc=thomas.petazzoni@free-electrons.com \
--cc=wens@csie.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;
as well as URLs for NNTP newsgroup(s).