[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1501521625.29303.308.camel@linux.intel.com>
Date: Mon, 31 Jul 2017 20:20:25 +0300
From: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
Andy Shevchenko <andy.shevchenko@...il.com>
Cc: devel@...verdev.osuosl.org, linux-efi <linux-efi@...r.kernel.org>,
linux-watchdog@...r.kernel.org, sparmaintainer@...sys.com,
"open list:TI WILINK WIRELES..." <linux-wireless@...r.kernel.org>,
"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
"linux-acpi@...r.kernel.org" <linux-acpi@...r.kernel.org>,
Lukas Wunner <lukas@...ner.de>, devel@...uxdriverproject.org,
Christoph Hellwig <hch@....de>
Subject: Re: [PATCH v1 3/6] staging: unisys: Switch to use new generic UUID
API
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
> > <gregkh@...uxfoundation.org> 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 <andriy.shevchenko@...ux.intel.com>
Intel Finland Oy
Powered by blists - more mailing lists