From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031939AbbKEDU3 (ORCPT ); Wed, 4 Nov 2015 22:20:29 -0500 Received: from smtprelay0047.hostedemail.com ([216.40.44.47]:46079 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1031670AbbKEDU1 (ORCPT ); Wed, 4 Nov 2015 22:20:27 -0500 X-Session-Marker: 726F737465647440676F6F646D69732E6F7267 X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,rostedt@goodmis.org,:::::,RULES_HIT:41:355:379:541:599:800:960:973:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1538:1593:1594:1711:1714:1730:1747:1777:1792:2393:2553:2559:2562:3138:3139:3140:3141:3142:3350:3622:3865:3866:3867:3868:3870:3871:3872:4250:4321:4362:5007:6261:7875:9038:10004:10400:10848:10967:11026:11232:11658:11914:12050:12295:12438:12517:12519:12555:12740:13069:13141:13230:13311:13357:14659:21060:21080:30054:30090:30091,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:1,LUA_SUMMARY:none X-HE-Tag: wind97_5b2b6f5f85513 X-Filterd-Recvd-Size: 1412 Date: Wed, 4 Nov 2015 22:20:25 -0500 From: Steven Rostedt To: Stephen Rothwell Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: linux-next: manual merge of the ftrace tree with Linus' tree Message-ID: <20151104222025.0da837f6@grimm.local.home> In-Reply-To: <20151105135140.2399976f@canb.auug.org.au> References: <20151105135140.2399976f@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 5 Nov 2015 13:51:40 +1100 Stephen Rothwell wrote: > Hi Steven, > > Today's linux-next merge of the ftrace tree got a conflict in: > > kernel/trace/trace_stack.c > > between commit: > > a2d762904832 ("tracing: Have stack tracer force RCU to be watching") > > from Linus' tree and commit: > > d332736df0c2 ("tracing: Rename max_stack_lock to stack_trace_max_lock") > > from the ftrace tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > Thanks, the fix looks good. -- Steve