lkml.org 
[lkml]   [2016]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the edac-amd tree with the edac tree
On Wed, Nov 30, 2016 at 08:50:13AM -0200, Mauro Carvalho Chehab wrote:
> Fixed. If you have a stable branch, I can rebase it on the top
> of your patches, in order to avoid the confict at linux-next.

http://git.kernel.org/cgit/linux/kernel/git/bp/bp.git/log/?h=for-next

but with that fixed, shouldn't the merge work without a conflict?

--
Regards/Gruss,
Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.

\
 
 \ /
  Last update: 2016-12-01 11:49    [W:1.068 / U:0.396 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site