From: Greg KH <gregkh@linuxfoundation.org>
To: Nicolas Ferre <nicolas.ferre@microchip.com>
Cc: Lee Jones <lee.jones@linaro.org>,
Radu Pirea <radu.pirea@microchip.com>,
broonie@kernel.org, alexandre.belloni@bootlin.com,
richard.genoud@gmail.com, robh+dt@kernel.org,
mark.rutland@arm.com, linux-spi@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-serial@vger.kernel.org
Subject: Re: [GIT PULL] Immutable branch between MFD, SPI and TTY due for the v4.20 merge window
Date: Tue, 11 Sep 2018 12:03:36 +0200 [thread overview]
Message-ID: <20180911100336.GA3822@kroah.com> (raw)
In-Reply-To: <743b5545-e942-b6f4-4ce6-8e10950a05fc@microchip.com>
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
next prev parent reply other threads:[~2018-09-11 10:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-13 16:47 [PATCH v11 0/6] Driver for at91 usart in spi mode Radu Pirea
2018-07-13 16:47 ` [PATCH v11 1/6] MAINTAINERS: add at91 usart mfd driver Radu Pirea
2018-07-13 16:47 ` [PATCH v11 2/6] dt-bindings: add binding for atmel-usart in SPI mode Radu Pirea
2018-07-13 16:47 ` [PATCH v11 3/6] mfd: at91-usart: added mfd driver for usart Radu Pirea
2018-07-13 16:47 ` [PATCH v11 4/6] MAINTAINERS: add at91 usart spi driver Radu Pirea
2018-07-13 16:47 ` [PATCH v11 5/6] spi: at91-usart: add driver for at91-usart as spi Radu Pirea
2018-07-13 16:47 ` [PATCH v11 6/6] tty/serial: atmel: change the driver to work under at91-usart mfd Radu Pirea
2018-08-02 8:11 ` Greg KH
2018-08-22 12:55 ` [PATCH v11 0/6] Driver for at91 usart in spi mode Radu Pirea
2018-08-23 11:23 ` Lee Jones
2018-09-10 15:18 ` [GIT PULL] Immutable branch between MFD, SPI and TTY due for the v4.20 merge window Lee Jones
2018-09-10 15:59 ` Greg KH
2018-09-11 8:14 ` Radu Nicolae Pirea
2018-09-11 8:51 ` Lee Jones
2018-09-11 8:45 ` Lee Jones
2018-09-11 9:01 ` Greg KH
2018-09-11 9:44 ` Lee Jones
2018-09-11 9:56 ` Nicolas Ferre
2018-09-11 10:03 ` Greg KH [this message]
2018-09-11 10:13 ` Lee Jones
2018-09-11 10:56 ` [GIT PULL v2] " Lee Jones
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=20180911100336.GA3822@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=alexandre.belloni@bootlin.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-spi@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=nicolas.ferre@microchip.com \
--cc=radu.pirea@microchip.com \
--cc=richard.genoud@gmail.com \
--cc=robh+dt@kernel.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).