Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933287Ab3D3AIR (ORCPT ); Mon, 29 Apr 2013 20:08:17 -0400 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:30996 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932697Ab3D3AIQ (ORCPT ); Mon, 29 Apr 2013 20:08:16 -0400 X-Authority-Analysis: v=2.0 cv=UY7TuduN 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=8d_5vDQeRDVw5VbexQgA:9 a=QEXdDO2ut3YA:10 a=jbrJJM5MRmoA:10 a=jeBq3FmKZ4MA:10 a=rXTBtCOcEpjy1lPqhTCpEQ==:117 X-Cloudmark-Score: 0 X-Authenticated-User: X-Originating-IP: 74.67.115.198 Message-ID: <1367280494.30667.38.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:08:14 -0400 In-Reply-To: References: <20130429195100.202681236@goodmis.org> 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: 1493 Lines: 46 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. I'll also run my full ftrace test suite on your latest kernel, and see if it finds anything else. Please apply: --- tracing: Fix small merge bug During the 3.10 merge, a conflict happened and the resolution was almost, but not quite, correct. An if statement was reversed. Signed-off-by: Steven Rostedt diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 581630a..ae6fa2d 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -904,7 +904,7 @@ update_max_tr_single(struct trace_array *tr, struct task_struct *tsk, int cpu) return; WARN_ON_ONCE(!irqs_disabled()); - if (tr->allocated_snapshot) { + if (!tr->allocated_snapshot) { /* Only the nop tracer should hit this when disabling */ WARN_ON_ONCE(tr->current_trace != &nop_trace); return; -- 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/