Messages in this thread | | | Subject | Re: [PATCH v1 3/6] staging: unisys: Switch to use new generic UUID API | From | Andy Shevchenko <> | Date | Mon, 31 Jul 2017 20:20:25 +0300 |
| |
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@linuxfoundation.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@linux.intel.com> Intel Finland Oy
| |