Re: linux-next: manual merge of the edac-amd tree with the edac tree
From: Borislav Petkov <bp@alien8.de>
Date: 2016-12-01 10:48:50
Also in:
lkml
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.