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@xxxxxxxxxxxx> 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. >thanks, > >greg k-h