mbox series

[GIT,PULL] Immutable branch between MFD, SPI and TTY due for the v4.20 merge window

Message ID 20180910151803.GX28860@dell (mailing list archive)
State New, archived
Headers show
Series [GIT,PULL] Immutable branch between MFD, SPI and TTY due for the v4.20 merge window | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-spi-tty-v4.20

Message

Lee Jones Sept. 10, 2018, 3:18 p.m. UTC
Enjoy!

The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:

  Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-spi-tty-v4.20

for you to fetch changes up to c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b:

  tty/serial: atmel: Change the driver to work under at91-usart MFD (2018-09-10 16:12:43 +0100)

----------------------------------------------------------------
Immutable branch between MFD, SPI and TTY due for the v4.20 merge window

----------------------------------------------------------------
Radu Pirea (6):
      MAINTAINERS: Add AT91 USART MFD entry
      dt-bindings: Add binding for atmel-usart in SPI mode
      mfd: at91-usart: Add MFD driver for USART
      MAINTAINERS: Add AT91 USART SPI entry
      spi: at91-usart: Add driver for at91-usart as SPI
      tty/serial: atmel: Change the driver to work under at91-usart MFD

 .../bindings/{serial => mfd}/atmel-usart.txt       |  25 +-
 MAINTAINERS                                        |  16 +
 drivers/mfd/Kconfig                                |   9 +
 drivers/mfd/Makefile                               |   1 +
 drivers/mfd/at91-usart.c                           |  71 ++++
 drivers/spi/Kconfig                                |   8 +
 drivers/spi/Makefile                               |   1 +
 drivers/spi/spi-at91-usart.c                       | 432 +++++++++++++++++++++
 drivers/tty/serial/Kconfig                         |   1 +
 drivers/tty/serial/atmel_serial.c                  |  42 +-
 include/dt-bindings/mfd/at91-usart.h               |  17 +
 11 files changed, 606 insertions(+), 17 deletions(-)
 rename Documentation/devicetree/bindings/{serial => mfd}/atmel-usart.txt (76%)
 create mode 100644 drivers/mfd/at91-usart.c
 create mode 100644 drivers/spi/spi-at91-usart.c
 create mode 100644 include/dt-bindings/mfd/at91-usart.h

Comments

Greg Kroah-Hartman Sept. 10, 2018, 3:59 p.m. UTC | #1
On Mon, Sep 10, 2018 at 04:18:03PM +0100, Lee Jones wrote:
> Enjoy!
> 
> The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
> 
>   Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-spi-tty-v4.20
> 
> for you to fetch changes up to c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b:
> 
>   tty/serial: atmel: Change the driver to work under at91-usart MFD (2018-09-10 16:12:43 +0100)

thanks for this.  I'll suck it into my tty-next branch to make it easier
for any future at91 serial driver changes to be simpler to merge.

greg k-h
Radu Nicolae Pirea Sept. 11, 2018, 8:14 a.m. UTC | #2
Hi Lee,

Thank you for taking the patch series, but you didn't take the latest
version(v12) :)


On Mon, 2018-09-10 at 16:18 +0100, Lee Jones wrote:
> Enjoy!
> 
> The following changes since commit
> 5b394b2ddf0347bef56e50c69a58773c94343ff3:
> 
>   Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-
> mfd-spi-tty-v4.20
> 
> for you to fetch changes up to
> c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b:
> 
>   tty/serial: atmel: Change the driver to work under at91-usart MFD
> (2018-09-10 16:12:43 +0100)
> 
> ----------------------------------------------------------------
> Immutable branch between MFD, SPI and TTY due for the v4.20 merge
> window
> 
> ----------------------------------------------------------------
> Radu Pirea (6):
>       MAINTAINERS: Add AT91 USART MFD entry
>       dt-bindings: Add binding for atmel-usart in SPI mode
>       mfd: at91-usart: Add MFD driver for USART
>       MAINTAINERS: Add AT91 USART SPI entry
>       spi: at91-usart: Add driver for at91-usart as SPI
>       tty/serial: atmel: Change the driver to work under at91-usart
> MFD
> 
>  .../bindings/{serial => mfd}/atmel-usart.txt       |  25 +-
>  MAINTAINERS                                        |  16 +
>  drivers/mfd/Kconfig                                |   9 +
>  drivers/mfd/Makefile                               |   1 +
>  drivers/mfd/at91-usart.c                           |  71 ++++
>  drivers/spi/Kconfig                                |   8 +
>  drivers/spi/Makefile                               |   1 +
>  drivers/spi/spi-at91-usart.c                       | 432
> +++++++++++++++++++++
>  drivers/tty/serial/Kconfig                         |   1 +
>  drivers/tty/serial/atmel_serial.c                  |  42 +-
>  include/dt-bindings/mfd/at91-usart.h               |  17 +
>  11 files changed, 606 insertions(+), 17 deletions(-)
>  rename Documentation/devicetree/bindings/{serial => mfd}/atmel-
> usart.txt (76%)
>  create mode 100644 drivers/mfd/at91-usart.c
>  create mode 100644 drivers/spi/spi-at91-usart.c
>  create mode 100644 include/dt-bindings/mfd/at91-usart.h
>
Lee Jones Sept. 11, 2018, 8:45 a.m. UTC | #3
On Mon, 10 Sep 2018, Lee Jones wrote:

> Enjoy!
> 
> The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
> 
>   Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-spi-tty-v4.20
> 
> for you to fetch changes up to c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b:
> 
>   tty/serial: atmel: Change the driver to work under at91-usart MFD (2018-09-10 16:12:43 +0100)
> 
> ----------------------------------------------------------------
> Immutable branch between MFD, SPI and TTY due for the v4.20 merge window

Due to a comedy of errors, I'm voiding this pull-request.

Please stand-by for a follow-up.

> Radu Pirea (6):
>       MAINTAINERS: Add AT91 USART MFD entry
>       dt-bindings: Add binding for atmel-usart in SPI mode
>       mfd: at91-usart: Add MFD driver for USART
>       MAINTAINERS: Add AT91 USART SPI entry
>       spi: at91-usart: Add driver for at91-usart as SPI
>       tty/serial: atmel: Change the driver to work under at91-usart MFD
> 
>  .../bindings/{serial => mfd}/atmel-usart.txt       |  25 +-
>  MAINTAINERS                                        |  16 +
>  drivers/mfd/Kconfig                                |   9 +
>  drivers/mfd/Makefile                               |   1 +
>  drivers/mfd/at91-usart.c                           |  71 ++++
>  drivers/spi/Kconfig                                |   8 +
>  drivers/spi/Makefile                               |   1 +
>  drivers/spi/spi-at91-usart.c                       | 432 +++++++++++++++++++++
>  drivers/tty/serial/Kconfig                         |   1 +
>  drivers/tty/serial/atmel_serial.c                  |  42 +-
>  include/dt-bindings/mfd/at91-usart.h               |  17 +
>  11 files changed, 606 insertions(+), 17 deletions(-)
>  rename Documentation/devicetree/bindings/{serial => mfd}/atmel-usart.txt (76%)
>  create mode 100644 drivers/mfd/at91-usart.c
>  create mode 100644 drivers/spi/spi-at91-usart.c
>  create mode 100644 include/dt-bindings/mfd/at91-usart.h
>
Lee Jones Sept. 11, 2018, 8:51 a.m. UTC | #4
On Tue, 11 Sep 2018, Radu Nicolae Pirea wrote:

> Hi Lee,
> 
> Thank you for taking the patch series, but you didn't take the latest
> version(v12) :)

Both were marked for merging in my inbox, and since I am working
though my (300+) post-vacation emails chronologically v11 was handled
first.

It appears as though there is an issue in the way 'struct
of_device_id' was declared too.  The header file in which it was
declared used to be included by proxy, however a separation has
recently been made causing build errors.

I will fix both issues and re-submit the PR.
Greg Kroah-Hartman Sept. 11, 2018, 9:01 a.m. UTC | #5
On Tue, Sep 11, 2018 at 09:45:48AM +0100, Lee Jones wrote:
> On Mon, 10 Sep 2018, Lee Jones wrote:
> 
> > Enjoy!
> > 
> > The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
> > 
> >   Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
> > 
> > are available in the Git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-spi-tty-v4.20
> > 
> > for you to fetch changes up to c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b:
> > 
> >   tty/serial: atmel: Change the driver to work under at91-usart MFD (2018-09-10 16:12:43 +0100)
> > 
> > ----------------------------------------------------------------
> > Immutable branch between MFD, SPI and TTY due for the v4.20 merge window
> 
> Due to a comedy of errors, I'm voiding this pull-request.

Um, I can't do that as my tree can not be rebased :(

I can take follow-on patches, so I will go apply the patch posted so
that my tree builds again.  I recommend you just apply it as well.

thanks,

greg k-h
Lee Jones Sept. 11, 2018, 9:44 a.m. UTC | #6
On Tue, 11 Sep 2018, Greg KH wrote:

> On Tue, Sep 11, 2018 at 09:45:48AM +0100, Lee Jones wrote:
> > On Mon, 10 Sep 2018, Lee Jones wrote:
> > 
> > > Enjoy!
> > > 
> > > The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
> > > 
> > >   Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
> > > 
> > > are available in the Git repository at:
> > > 
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-spi-tty-v4.20
> > > 
> > > for you to fetch changes up to c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b:
> > > 
> > >   tty/serial: atmel: Change the driver to work under at91-usart MFD (2018-09-10 16:12:43 +0100)
> > > 
> > > ----------------------------------------------------------------
> > > Immutable branch between MFD, SPI and TTY due for the v4.20 merge window
> > 
> > Due to a comedy of errors, I'm voiding this pull-request.
> 
> Um, I can't do that as my tree can not be rebased :(

Oh dear. :(

> I can take follow-on patches, so I will go apply the patch posted so
> that my tree builds again.  I recommend you just apply it as well.

What a pickle.  As per my last email, it looks as though this set was
applied under false pretences.  The MFD patch which was carrying my
Ack was doing so incorrectly.  The author mistakenly applied it to the
wrong patch.  After re-review (actually initial review) I wish to NACK
the implementation.

My suggestion would be to sit tight, rather than do anything rash and
see how this plays out.  After which we can fix your tree.
Nicolas Ferre Sept. 11, 2018, 9:56 a.m. UTC | #7
On 11/09/2018 at 11:44, Lee Jones wrote:
> On Tue, 11 Sep 2018, Greg KH wrote:
> 
>> On Tue, Sep 11, 2018 at 09:45:48AM +0100, Lee Jones wrote:
>>> On Mon, 10 Sep 2018, Lee Jones wrote:
>>>
>>>> Enjoy!
>>>>
>>>> The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
>>>>
>>>>    Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
>>>>
>>>> are available in the Git repository at:
>>>>
>>>>    git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-spi-tty-v4.20
>>>>
>>>> for you to fetch changes up to c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b:
>>>>
>>>>    tty/serial: atmel: Change the driver to work under at91-usart MFD (2018-09-10 16:12:43 +0100)
>>>>
>>>> ----------------------------------------------------------------
>>>> Immutable branch between MFD, SPI and TTY due for the v4.20 merge window
>>>
>>> Due to a comedy of errors, I'm voiding this pull-request.
>>
>> Um, I can't do that as my tree can not be rebased :(
> 
> Oh dear. :(
> 
>> I can take follow-on patches, so I will go apply the patch posted so
>> that my tree builds again.  I recommend you just apply it as well.
> 
> What a pickle.  As per my last email, it looks as though this set was
> applied under false pretences.  The MFD patch which was carrying my
> Ack was doing so incorrectly.  The author mistakenly applied it to the
> wrong patch.  After re-review (actually initial review) I wish to NACK
> the implementation.

What? We discussed this to the bone!

Radu followed all the recommendations, collected all the feedback from 
major subsystems SPI and USART, resent the series again.

It was then forgotten. Wrong series was finally applied (which could 
trigger 0-day reports, I warn you)... and now we are discussing about 
the implementation of *v2* (we're at v12)!

> My suggestion would be to sit tight, rather than do anything rash and
> see how this plays out.  After which we can fix your tree.

Come on, Greg's tree is fixed now. We can catch-up with v11..v12 changes 
with patches and cleanup the mess together.

Just one misalignment with one patch merged for v4.19-rc1, fixed the 
same day, cannot generate such a reaction after months of development.

Best regards,
Greg Kroah-Hartman Sept. 11, 2018, 10:03 a.m. UTC | #8
On Tue, Sep 11, 2018 at 11:56:49AM +0200, Nicolas Ferre wrote:
> On 11/09/2018 at 11:44, Lee Jones wrote:
> > On Tue, 11 Sep 2018, Greg KH wrote:
> > 
> > > On Tue, Sep 11, 2018 at 09:45:48AM +0100, Lee Jones wrote:
> > > > On Mon, 10 Sep 2018, Lee Jones wrote:
> > > > 
> > > > > Enjoy!
> > > > > 
> > > > > The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
> > > > > 
> > > > >    Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
> > > > > 
> > > > > are available in the Git repository at:
> > > > > 
> > > > >    git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-spi-tty-v4.20
> > > > > 
> > > > > for you to fetch changes up to c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b:
> > > > > 
> > > > >    tty/serial: atmel: Change the driver to work under at91-usart MFD (2018-09-10 16:12:43 +0100)
> > > > > 
> > > > > ----------------------------------------------------------------
> > > > > Immutable branch between MFD, SPI and TTY due for the v4.20 merge window
> > > > 
> > > > Due to a comedy of errors, I'm voiding this pull-request.
> > > 
> > > Um, I can't do that as my tree can not be rebased :(
> > 
> > Oh dear. :(
> > 
> > > I can take follow-on patches, so I will go apply the patch posted so
> > > that my tree builds again.  I recommend you just apply it as well.
> > 
> > What a pickle.  As per my last email, it looks as though this set was
> > applied under false pretences.  The MFD patch which was carrying my
> > Ack was doing so incorrectly.  The author mistakenly applied it to the
> > wrong patch.  After re-review (actually initial review) I wish to NACK
> > the implementation.
> 
> What? We discussed this to the bone!
> 
> Radu followed all the recommendations, collected all the feedback from major
> subsystems SPI and USART, resent the series again.
> 
> It was then forgotten. Wrong series was finally applied (which could trigger
> 0-day reports, I warn you)... and now we are discussing about the
> implementation of *v2* (we're at v12)!
> 
> > My suggestion would be to sit tight, rather than do anything rash and
> > see how this plays out.  After which we can fix your tree.
> 
> Come on, Greg's tree is fixed now. We can catch-up with v11..v12 changes
> with patches and cleanup the mess together.
> 
> Just one misalignment with one patch merged for v4.19-rc1, fixed the same
> day, cannot generate such a reaction after months of development.

I agree, my tree is now fixed, no harm done.  Just apply the same patch
to whomever also pulled it into their trees and all is good.

thanks,

greg k-h
Lee Jones Sept. 11, 2018, 10:13 a.m. UTC | #9
On Tue, 11 Sep 2018, Greg KH wrote:

> On Tue, Sep 11, 2018 at 11:56:49AM +0200, Nicolas Ferre wrote:
> > On 11/09/2018 at 11:44, Lee Jones wrote:
> > > On Tue, 11 Sep 2018, Greg KH wrote:
> > > 
> > > > On Tue, Sep 11, 2018 at 09:45:48AM +0100, Lee Jones wrote:
> > > > > On Mon, 10 Sep 2018, Lee Jones wrote:
> > > > > 
> > > > > > Enjoy!
> > > > > > 
> > > > > > The following changes since commit 5b394b2ddf0347bef56e50c69a58773c94343ff3:
> > > > > > 
> > > > > >    Linux 4.19-rc1 (2018-08-26 14:11:59 -0700)
> > > > > > 
> > > > > > are available in the Git repository at:
> > > > > > 
> > > > > >    git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/ib-mfd-spi-tty-v4.20
> > > > > > 
> > > > > > for you to fetch changes up to c24d25317a7c6bb3053d4c193b3cf57d1e9a3e4b:
> > > > > > 
> > > > > >    tty/serial: atmel: Change the driver to work under at91-usart MFD (2018-09-10 16:12:43 +0100)
> > > > > > 
> > > > > > ----------------------------------------------------------------
> > > > > > Immutable branch between MFD, SPI and TTY due for the v4.20 merge window
> > > > > 
> > > > > Due to a comedy of errors, I'm voiding this pull-request.
> > > > 
> > > > Um, I can't do that as my tree can not be rebased :(
> > > 
> > > Oh dear. :(
> > > 
> > > > I can take follow-on patches, so I will go apply the patch posted so
> > > > that my tree builds again.  I recommend you just apply it as well.
> > > 
> > > What a pickle.  As per my last email, it looks as though this set was
> > > applied under false pretences.  The MFD patch which was carrying my
> > > Ack was doing so incorrectly.  The author mistakenly applied it to the
> > > wrong patch.  After re-review (actually initial review) I wish to NACK
> > > the implementation.
> > 
> > What? We discussed this to the bone!
> > 
> > Radu followed all the recommendations, collected all the feedback from major
> > subsystems SPI and USART, resent the series again.
> > 
> > It was then forgotten. Wrong series was finally applied (which could trigger
> > 0-day reports, I warn you)... and now we are discussing about the
> > implementation of *v2* (we're at v12)!

This situation is frustrating.  The reason I was not part of the
discussion can be attributed to an erroneous application of my Ack
earlier in the review process.

Anyway ... since Greg has applied the pull-request I do agree that the
path of least friction would be just to apply the set. :(

> > > My suggestion would be to sit tight, rather than do anything rash and
> > > see how this plays out.  After which we can fix your tree.
> > 
> > Come on, Greg's tree is fixed now. We can catch-up with v11..v12 changes
> > with patches and cleanup the mess together.
> > 
> > Just one misalignment with one patch merged for v4.19-rc1, fixed the same
> > day, cannot generate such a reaction after months of development.
> 
> I agree, my tree is now fixed, no harm done.  Just apply the same patch
> to whomever also pulled it into their trees and all is good.

Have you applied Nicolas' patch already?  Without discussion? :((