Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1621113 > unrolled thread
| Started by | Lee Jones <lee.jones@linaro.org> |
|---|---|
| First post | 2017-04-11 12:10 +0200 |
| Last post | 2017-04-24 13:10 +0200 |
| Articles | 3 — 2 participants |
Back to article view | Back to linux.kernel
This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by
below is the oldest one visible, not the original post.
[GIT PULL] Immutable branch between MFD and IIO due for the v4.12 merge window Lee Jones <lee.jones@linaro.org> - 2017-04-11 12:10 +0200
Re: [GIT PULL] Immutable branch between MFD and IIO due for the v4.12 merge window Jonathan Cameron <jic23@kernel.org> - 2017-04-14 16:40 +0200
Re: [GIT PULL] Immutable branch between MFD and IIO due for the v4.12 merge window Lee Jones <lee.jones@linaro.org> - 2017-04-24 13:10 +0200
| From | Lee Jones <lee.jones@linaro.org> |
|---|---|
| Date | 2017-04-11 12:10 +0200 |
| Subject | [GIT PULL] Immutable branch between MFD and IIO due for the v4.12 merge window |
| Message-ID | <tv0Uh-5Bt-1@gated-at.bofh.it> |
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
--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog
[toc] | [next] | [standalone]
| From | Jonathan Cameron <jic23@kernel.org> |
|---|---|
| Date | 2017-04-14 16:40 +0200 |
| Message-ID | <twayd-2cI-1@gated-at.bofh.it> |
| In reply to | #1621113 |
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
[toc] | [prev] | [next] | [standalone]
| From | Lee Jones <lee.jones@linaro.org> |
|---|---|
| Date | 2017-04-24 13:10 +0200 |
| Subject | Re: [GIT PULL] Immutable branch between MFD and IIO due for the v4.12 merge window |
| Message-ID | <tzK2u-6io-17@gated-at.bofh.it> |
| In reply to | #1623698 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web