Re: [GIT PULL] commits for Linux 4.14

[Sasha Levin <Alexander.Levin@microsoft.com>]

On Mon, Apr 30, 2018 at 08:06:34AM -0700, Greg KH wrote:
>On Mon, Apr 30, 2018 at 02:39:29PM +0000, Sasha Levin wrote:
>> On Mon, Apr 30, 2018 at 06:02:19AM -0700, Greg KH wrote:
>> >On Fri, Apr 27, 2018 at 02:00:53AM +0000, Sasha Levin wrote:
>> >> Hi Greg,
>> >>
>> >> Pleae pull commits for Linux 4.14 .
>> >>
>> >> I've sent a review request for all commits over a week ago and all
>> >> comments were addressed.
>> >>
>> >>
>> >> Thanks,
>> >> Sasha
>> >>
>> >> =====
>> >>
>> >>
>> >> The following changes since commit d6949f48093c2d862d9bc39a7a89f2825c55edc4:
>> >>
>> >>   Linux 4.14.36 (2018-04-24 09:36:40 +0200)
>> >>
>> >> are available in the Git repository at:
>> >>
>> >>   git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git tags/for-greg-4.14-26042018
>> >
>> >Did you really regenerate this tree?  It has a load of patches that are
>> >already upstream.  I'm getting a bunch of conflicts when first trying to
>> >merge, and then rebase it.
>>
>> Yes, it was based on 4.14.36 which was released two days before I sent
>> this pull request.
>>
>> >Can you verify this is the correct tag?
>>
>> The conflicts seem to happen because you're venturing into the
>> non-stable-tagged land. Are you now looking at non-stable-tagged patches
>> as well?
>>
>> See for example:
>>
>> 	commit 43de32cdf0f4f73519e2df12fb93adc24f9746cb
>> 	Author: Andreas Kemnade <andreas@kemnade.info>
>> 	Date:   Tue Feb 20 07:30:10 2018 -0600
>>
>> 	    usb: musb: fix enumeration after resume
>>
>> If that's the case, we'll need to find a new way to sync up, otherwise
>> this will keep happening.
>
>No, something went wrong here, as the other tags you sent me all look
>fine.
>
>For example, let's look at the first commit in this tree:
>
>---------
>Date: Fri, 3 Nov 2017 20:28:57 +0900
>From: Hector Martin <marcan@marcan.st>
>Subject: [PATCH 001/755] firewire-ohci: work around oversized DMA reads on JMicron controllers
>
>[ Upstream commit 188775181bc05f29372b305ef96485840e351fde ]
>---------
>
>It shows up here in this branch as commit
>62080d9352e274275ccb090af366d339bbad08a7, yet, if you look in my tree,
>it is really commit 4a5d70332d57bd473ffe76d8777a2e9f847c7863
>
>So now I have duplicates in here, which is what I thought I said was
>happening last time I pulled :(
>
>The other 4 requests were all fine, can you redo this one please?

Oh I see, it looks like more commits from my branch were merged after
the last time we had this talk, and I ended up with different commit IDs
because I rebased the whole thing on a newer stable tag.

I've pushed a fixed tag as:

git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git tags/for-greg-4.14-30042018