Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755424AbcLAKsu (ORCPT ); Thu, 1 Dec 2016 05:48:50 -0500 Received: from mail.skyhub.de ([78.46.96.112]:38402 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753815AbcLAKss (ORCPT ); Thu, 1 Dec 2016 05:48:48 -0500 Date: Thu, 1 Dec 2016 11:48:46 +0100 From: Borislav Petkov To: Mauro Carvalho Chehab Cc: Stephen Rothwell , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the edac-amd tree with the edac tree Message-ID: <20161201104846.kjvuy5tj475oxzke@pd.tnic> References: <20161128143726.7fda1849@canb.auug.org.au> <20161128082734.bdl4dhothemm7ja5@pd.tnic> <20161130085013.4798b4a7@vento.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20161130085013.4798b4a7@vento.lan> User-Agent: NeoMutt/20161014 (1.7.1) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 440 Lines: 13 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.