From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: Re: [PATCH v1 3/6] staging: unisys: Switch to use new generic UUID API Date: Mon, 31 Jul 2017 20:20:25 +0300 Message-ID: <1501521625.29303.308.camel@linux.intel.com> References: <20170719182857.73693-1-andriy.shevchenko@linux.intel.com> <20170719182857.73693-4-andriy.shevchenko@linux.intel.com> <1501063301.29303.247.camel@linux.intel.com> <20170730153224.GA31755@kroah.com> <20170730173725.GA20606@kroah.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20170730173725.GA20606@kroah.com> Sender: linux-acpi-owner@vger.kernel.org To: Greg Kroah-Hartman , Andy Shevchenko Cc: devel@driverdev.osuosl.org, linux-efi , linux-watchdog@vger.kernel.org, sparmaintainer@unisys.com, "open list:TI WILINK WIRELES..." , "linux-kernel@vger.kernel.org" , "linux-acpi@vger.kernel.org" , Lukas Wunner , devel@linuxdriverproject.org, Christoph Hellwig List-Id: linux-efi@vger.kernel.org On Sun, 2017-07-30 at 10:37 -0700, Greg Kroah-Hartman wrote: > On Sun, Jul 30, 2017 at 08:26:48PM +0300, Andy Shevchenko wrote: > > On Sun, Jul 30, 2017 at 6:32 PM, Greg Kroah-Hartman > > wrote: > > > Doesn't apply to the staging tree at all :( > > > > No surprises, it was cooked against uuid tree in the first place. > > If you agree to take it through staging tree I will prepare a > > rebased version. > > Does it sound good? > > You can take it through the uuid tree if it's easier for you, but then > someone will have to deal with the merge issues... > > If it's easier, I can take it to prevent the merge problems. Yep! There are so many conflicts that would be better just to push through your tree. I have just sent a v2 of this patch separately. -- Andy Shevchenko Intel Finland Oy