[GIT,PULL] MFD: ARM (IMX & R8): Immutable branch for Dialog Semiconductor - vendor prefix consolidation

Message ID 20140829091359.GF24579@lee--X1
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-arm-v3.18

Message

Lee Jones Aug. 29, 2014, 9:13 a.m.
IMX and R8 sub-arch Maintainers,

The following changes since commit 52addcf9d6669fa439387610bc65c92fa0980cef:

  Linux 3.17-rc2 (2014-08-25 15:36:20 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-arm-v3.18

for you to fetch changes up to bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e:

  devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg' (2014-08-29 09:26:29 +0100)

----------------------------------------------------------------
Immutable branch between MFD and some ARM sub-arch maintainers.
----------------------------------------------------------------
Steve Twiss (1):
      devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'

 .../devicetree/bindings/i2c/trivial-devices.txt    |  2 +-
 .../devicetree/bindings/regulator/da9210.txt       |  4 ++--
 .../devicetree/bindings/vendor-prefixes.txt        |  1 +
 arch/arm/boot/dts/imx53-smd.dts                    |  2 +-
 arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |  2 +-
 arch/arm/boot/dts/r8a7790-lager.dts                |  2 +-
 arch/arm/boot/dts/r8a7791-koelsch.dts              |  2 +-
 drivers/mfd/da9055-core.c                          | 26 +++++++++++-----------
 8 files changed, 21 insertions(+), 20 deletions(-)

Comments

Steve Twiss Aug. 29, 2014, 9:54 a.m. | #1
On 29 August 2014 10:14, Lee Jones wrote

> Subject: [GIT PULL] MFD: ARM (IMX & R8): Immutable branch for Dialog

> Semiconductor - vendor prefix consolidation

> 

> IMX and R8 sub-arch Maintainers,

> 

> The following changes since commit

> 52addcf9d6669fa439387610bc65c92fa0980cef:

> 

>   Linux 3.17-rc2 (2014-08-25 15:36:20 -0700)

> 

> are available in the git repository at:

> 

>   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-arm-

> v3.18

> 

> for you to fetch changes up to bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e:

> 

>   devicetree: Dialog Semiconductor consolidate existing vendor prefixes to

> standardise on 'dlg' (2014-08-29 09:26:29 +0100)

> 


[...]

Thank you for doing this.
Regards,
Steve
Shawn Guo Sept. 1, 2014, 1:27 p.m. | #2
Hi Lee,

On Fri, Aug 29, 2014 at 10:13:59AM +0100, Lee Jones wrote:
> IMX and R8 sub-arch Maintainers,
> 
> The following changes since commit 52addcf9d6669fa439387610bc65c92fa0980cef:
> 
>   Linux 3.17-rc2 (2014-08-25 15:36:20 -0700)
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-arm-v3.18
> 
> for you to fetch changes up to bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e:
> 
>   devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg' (2014-08-29 09:26:29 +0100)
> 
> ----------------------------------------------------------------
> Immutable branch between MFD and some ARM sub-arch maintainers.

I assume that I need to pull it into my tree only when it turns out
there are merge conflicts, but otherwise it can just go through your
tree, right?

Shawn

> ----------------------------------------------------------------
> Steve Twiss (1):
>       devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'
> 
>  .../devicetree/bindings/i2c/trivial-devices.txt    |  2 +-
>  .../devicetree/bindings/regulator/da9210.txt       |  4 ++--
>  .../devicetree/bindings/vendor-prefixes.txt        |  1 +
>  arch/arm/boot/dts/imx53-smd.dts                    |  2 +-
>  arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |  2 +-
>  arch/arm/boot/dts/r8a7790-lager.dts                |  2 +-
>  arch/arm/boot/dts/r8a7791-koelsch.dts              |  2 +-
>  drivers/mfd/da9055-core.c                          | 26 +++++++++++-----------
>  8 files changed, 21 insertions(+), 20 deletions(-)
> 
> -- 
> Lee Jones
> Linaro STMicroelectronics Landing Team Lead
> Linaro.org │ Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Lee Jones Sept. 1, 2014, 1:38 p.m. | #3
On Mon, 01 Sep 2014, Shawn Guo wrote:
> On Fri, Aug 29, 2014 at 10:13:59AM +0100, Lee Jones wrote:
> > IMX and R8 sub-arch Maintainers,
> > 
> > The following changes since commit 52addcf9d6669fa439387610bc65c92fa0980cef:
> > 
> >   Linux 3.17-rc2 (2014-08-25 15:36:20 -0700)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-arm-v3.18
> > 
> > for you to fetch changes up to bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e:
> > 
> >   devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg' (2014-08-29 09:26:29 +0100)
> > 
> > ----------------------------------------------------------------
> > Immutable branch between MFD and some ARM sub-arch maintainers.
> 
> I assume that I need to pull it into my tree only when it turns out
> there are merge conflicts, but otherwise it can just go through your
> tree, right?

If someone realises there's a conflict the chances are we've already
hacked someone off.  If the first person to realise is Linus during
the merge-window, you'd have to go to the effort of re-spinning your
pull-request.  Something else you'd probably like to avoid.

I would suggest for each affected Maintainer to pull this in.

> > ----------------------------------------------------------------
> > Steve Twiss (1):
> >       devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg'
> > 
> >  .../devicetree/bindings/i2c/trivial-devices.txt    |  2 +-
> >  .../devicetree/bindings/regulator/da9210.txt       |  4 ++--
> >  .../devicetree/bindings/vendor-prefixes.txt        |  1 +
> >  arch/arm/boot/dts/imx53-smd.dts                    |  2 +-
> >  arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi       |  2 +-
> >  arch/arm/boot/dts/r8a7790-lager.dts                |  2 +-
> >  arch/arm/boot/dts/r8a7791-koelsch.dts              |  2 +-
> >  drivers/mfd/da9055-core.c                          | 26 +++++++++++-----------
> >  8 files changed, 21 insertions(+), 20 deletions(-)
> >
Shawn Guo Sept. 1, 2014, 2:35 p.m. | #4
On Mon, Sep 01, 2014 at 02:38:54PM +0100, Lee Jones wrote:
> On Mon, 01 Sep 2014, Shawn Guo wrote:
> > On Fri, Aug 29, 2014 at 10:13:59AM +0100, Lee Jones wrote:
> > > IMX and R8 sub-arch Maintainers,
> > > 
> > > The following changes since commit 52addcf9d6669fa439387610bc65c92fa0980cef:
> > > 
> > >   Linux 3.17-rc2 (2014-08-25 15:36:20 -0700)
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-arm-v3.18
> > > 
> > > for you to fetch changes up to bd597f47ca4bf7a522a0298a95c7f9b2f0a75b9e:
> > > 
> > >   devicetree: Dialog Semiconductor consolidate existing vendor prefixes to standardise on 'dlg' (2014-08-29 09:26:29 +0100)
> > > 
> > > ----------------------------------------------------------------
> > > Immutable branch between MFD and some ARM sub-arch maintainers.
> > 
> > I assume that I need to pull it into my tree only when it turns out
> > there are merge conflicts, but otherwise it can just go through your
> > tree, right?
> 
> If someone realises there's a conflict the chances are we've already
> hacked someone off.  If the first person to realise is Linus during
> the merge-window, you'd have to go to the effort of re-spinning your
> pull-request.  Something else you'd probably like to avoid.

I think if there is a conflict, linux-next will firstly report.  But,
yes, pulling it in is the safest.
> 
> I would suggest for each affected Maintainer to pull this in.

Pulled it into imx/dt branch, thanks.

Shawn
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html