Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758800Ab3D3ARW (ORCPT ); Mon, 29 Apr 2013 20:17:22 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:17686 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758565Ab3D3ARU (ORCPT ); Mon, 29 Apr 2013 20:17:20 -0400 X-Authority-Analysis: v=2.0 cv=GtrACzJC c=1 sm=0 a=rXTBtCOcEpjy1lPqhTCpEQ==:17 a=mNMOxpOpBa8A:10 a=KBd73aRfIukA:10 a=5SG0PmZfjMsA:10 a=IkcTkHD0fZMA:10 a=meVymXHHAAAA:8 a=bsvyib-zOJsA:10 a=Z4Rwk6OoAAAA:8 a=ODALAlx79TesetsP7QEA:9 a=QEXdDO2ut3YA:10 a=jbrJJM5MRmoA:10 a=rXTBtCOcEpjy1lPqhTCpEQ==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 74.67.115.198 Message-ID: <1367281038.30667.43.camel@gandalf.local.home> Subject: Re: [PATCH 0/2] [GIT PULL] localmodconfig: Fix missing depends of config files included in if statements From: Steven Rostedt To: Linus Torvalds Cc: Linux Kernel Mailing List , Linux Kbuild mailing list Date: Mon, 29 Apr 2013 20:17:18 -0400 In-Reply-To: <1367280494.30667.38.camel@gandalf.local.home> References: <20130429195100.202681236@goodmis.org> <1367280494.30667.38.camel@gandalf.local.home> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.4.4-2 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1357 Lines: 36 On Mon, 2013-04-29 at 20:08 -0400, Steven Rostedt wrote: > On Mon, 2013-04-29 at 14:42 -0700, Linus Torvalds wrote: > > On Mon, Apr 29, 2013 at 2:01 PM, Linus Torvalds > > wrote: > > > > > > There's just too much confusion here for me to touch anything at all, > > > so please fix things up. > > > > Oh, and you might as well check that I resolved the conflicts in the > > trace pull correctly while you're at it. They looked pretty obvious, > > and it compiles for me, but .. > > Almost. > BTW, what's the preferred method for this. I already posted a lot of work to linux-next when I found bugs that required going into your tree. I backported the fixes knowing that it will cause conflicts when you merge. IIRC, you stated that you don't mind doing conflict resolutions yourself, so I did not try to fix it a head of time, as the conflicts were rather minor. Should I have merged your tree and done the conflict resolutions myself, or was it OK to do what I did, and let you do the conflict resolution and send you any fixes that needed to be done afterward? -- Steve -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/