From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-by2nam03on0123.outbound.protection.outlook.com ([104.47.42.123]:27381 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753827AbeD3Ojb (ORCPT ); Mon, 30 Apr 2018 10:39:31 -0400 From: Sasha Levin To: Greg KH CC: "stable@vger.kernel.org" Subject: Re: [GIT PULL] commits for Linux 4.14 Date: Mon, 30 Apr 2018 14:39:29 +0000 Message-ID: <20180430143928.GA226349@sasha-vm> References: <20180430130219.GA10505@kroah.com> In-Reply-To: <20180430130219.GA10505@kroah.com> Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org List-ID: 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 >> >> =3D=3D=3D=3D=3D >> >> >> The following changes since commit d6949f48093c2d862d9bc39a7a89f2825c55e= dc4: >> >> 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 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=