From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751731AbbFXIyo (ORCPT ); Wed, 24 Jun 2015 04:54:44 -0400 Received: from cantor2.suse.de ([195.135.220.15]:47199 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750884AbbFXIyh (ORCPT ); Wed, 24 Jun 2015 04:54:37 -0400 Date: Wed, 24 Jun 2015 10:54:25 +0200 From: Borislav Petkov To: Thomas Gleixner Cc: Ingo Molnar , Linus Torvalds , linux-edac , x86-ml , lkml Subject: Re: [GIT PULL] EDAC updates for 4.2 Message-ID: <20150624085425.GC32642@pd.tnic> References: <20150622091140.GA20244@pd.tnic> <20150624074029.GA32642@pd.tnic> <20150624082306.GB23842@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 24, 2015 at 10:50:38AM +0200, Thomas Gleixner wrote: > One of the solution I use for cross tree dependencies is: > > - Apply the commits which create a dependency to a seperate branch > > - Let the depending tree pull that branch > > - Merge the branch into the proper tip/ branch Yeah, in hindsight, we probably should've simply routed all the changes to amd_mce_inj (the error injection module which depends on the tip changes) straight through tip/x86/ras and wouldn't have any issues. Oh well, I'll know that now for the future. So I'll wait out to hear what Linus prefers and do that. Thanks guys. -- Regards/Gruss, Boris. ECO tip #101: Trim your mails when you reply. --