From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757710AbbKFXHh (ORCPT ); Fri, 6 Nov 2015 18:07:37 -0500 Received: from smtprelay0227.hostedemail.com ([216.40.44.227]:47139 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757626AbbKFXHg (ORCPT ); Fri, 6 Nov 2015 18:07:36 -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:982:988:989:1260:1277:1311:1313:1314:1345:1359:1437:1515:1516:1518:1534:1539:1593:1594:1711:1730:1747:1777:1792:2393:2553:2559:2562:2693:2895:3138:3139:3140:3141:3142:3352:3622:3865:3867:3868:3870:3872:3874:5007:6261:7875:7903:10004:10400:10848:10967:11232:11658:11914:12517:12519:12663:12740:13069:13184:13229:13311:13357:14659: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:3,LUA_SUMMARY:none X-HE-Tag: wound54_25141a2909e24 X-Filterd-Recvd-Size: 1822 Date: Fri, 6 Nov 2015 18:07:32 -0500 From: Steven Rostedt To: Linus Torvalds Cc: Stephen Rothwell , LKML , Ingo Molnar , Sergey Senozhatsky Subject: Re: [GIT PULL] tracing: Updates for 4.4 Message-ID: <20151106180732.644a9eea@gandalf.local.home> In-Reply-To: <20151106175206.2b373ea6@gandalf.local.home> References: <20151106091005.647d3bcd@gandalf.local.home> <20151107090927.5d1f4188@canb.auug.org.au> <20151106175206.2b373ea6@gandalf.local.home> X-Mailer: Claws Mail 3.12.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 Fri, 6 Nov 2015 17:52:06 -0500 Steven Rostedt wrote: > I'll have to add something to my scripts that pulls in any merge > breakage, such that when I run the scripts to generate the pull > request, it adds them in automatically. Because obviously, the manual > approach isn't working for me. I updated my scripts such that if I add a 'notes' file in the repo that I'm pushing, it will include that into the pull request. Now if there's a conflict like this again, I can add a comment about it in the notes file and it will be included in my next pull request. I just need to remember to delete it after I'm done ;-) -- Steve