From: Steven Rostedt <rostedt@goodmis.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
LKML <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Subject: Re: [GIT PULL] tracing: Updates for 4.4
Date: Fri, 6 Nov 2015 18:07:32 -0500 [thread overview]
Message-ID: <20151106180732.644a9eea@gandalf.local.home> (raw)
In-Reply-To: <20151106175206.2b373ea6@gandalf.local.home>
On Fri, 6 Nov 2015 17:52:06 -0500
Steven Rostedt <rostedt@goodmis.org> 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
prev parent reply other threads:[~2015-11-06 23:07 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-06 14:10 Steven Rostedt
2015-11-06 21:37 ` Linus Torvalds
2015-11-06 22:09 ` Stephen Rothwell
2015-11-06 22:15 ` Linus Torvalds
2015-11-06 22:52 ` Steven Rostedt
2015-11-06 23:07 ` Steven Rostedt [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20151106180732.644a9eea@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=sergey.senozhatsky.work@gmail.com \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®