Re: [GIT PULL] tracing: Updates for 4.4

From: Steven Rostedt
Date: Fri Nov 06 2015 - 18:07:41 EST

On Fri, 6 Nov 2015 17:52:06 -0500
Steven Rostedt <rostedt@xxxxxxxxxxx> 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
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at