Re: [GIT PULL v2] updates to soc/fsl drivers for next(v5.3)

[Olof Johansson]

On Mon, Jul 08, 2019 at 06:48:17PM +0000, Leo Li wrote:
> 
> 
> > -----Original Message-----
> > From: Leo Li
> > Sent: Monday, June 17, 2019 8:29 AM
> > To: Olof Johansson <olof@xxxxxxxxx>
> > Cc: arm@xxxxxxxxxx; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; linux-
> > kernel@xxxxxxxxxxxxxxx; shawnguo@xxxxxxxxxx
> > Subject: RE: [GIT PULL v2] updates to soc/fsl drivers for next(v5.3)
> > 
> > 
> > 
> > > -----Original Message-----
> > > From: Olof Johansson <olof@xxxxxxxxx>
> > > Sent: Monday, June 17, 2019 6:50 AM
> > > To: Leo Li <leoyang.li@xxxxxxx>
> > > Cc: arm@xxxxxxxxxx; linux-arm-kernel@xxxxxxxxxxxxxxxxxxx; linux-
> > > kernel@xxxxxxxxxxxxxxx; shawnguo@xxxxxxxxxx
> > > Subject: Re: [GIT PULL v2] updates to soc/fsl drivers for next(v5.3)
> > >
> > > On Wed, Jun 05, 2019 at 02:45:11PM -0500, Li Yang wrote:
> > > > Hi arm-soc maintainers,
> > > >
> > > > This is a rebase of patches that missed 5.2 merge window together
> > > > with some new patches for QE.  Please help to review and merge it.
> > > > We would like this to be merged earlier because there are other
> > > > patches depending on patches in this pull request.  After this is
> > > > merged in arm-soc, we can ask other sub-system maintainers to pull
> > > > from this tag and apply additional patches.  Thanks.
> > >
> > > Li,
> > >
> > > You never followed up with a reply, or removed, the previous tag. So
> > > when we process the pull requests that come in, we've already merged it.
> > 
> > Sorry about that.  Will reply the previous pull request and remove the old tag
> > if update is needed next time.
> > 
> > >
> > > So, I've merged the previous version. Can you send an incremental pull
> > > request on top of that branch/tag instead of a rebase like this was, please?
> > 
> > Actually the new pull request is based on the old pull request this time.  I
> > sent the new one as V2 hoping that you can see this first and avoid merging
> > two times.  Since you have already merged the first one, you can merge the
> > second pull request as an incremental pull request directly.
> 
> Hi Olof,
> 
> I was on vacation for the past two weeks to follow up on this.  Hope this is not too late for this merge window.  Like I mentioned, the new tag is on top of the previous tag (you merged) so that it should be able to be merged incrementally.  The only thing is that the description of the new tag also included patches you merged with old tag.  Do you want me to regenerate the tag before you can merge it?


Hi,

I've now merged v2 into arm/drivers for the 5.4 merge window. If you need to
add more material on top for 5.4, feel free to use it as the base that you send
incremental pull requests on top of.

Next time, it's probably easier if you re-generate a new pull request
like I asked for -- I missed revisiting this since it seemed like a side
follow up and not new material to merge.


-Olof