linux-kernel - Re: [GIT PULL] tracing: Updates for 4.4

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Fri, 6 Nov 2015 18:07:32 -0500
From:	Steven Rostedt <rostedt@...dmis.org>
To:	Linus Torvalds <torvalds@...ux-foundation.org>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	LKML <linux-kernel@...r.kernel.org>,
	Ingo Molnar <mingo@...nel.org>,
	Sergey Senozhatsky <sergey.senozhatsky.work@...il.com>
Subject: Re: [GIT PULL] tracing: Updates for 4.4

On Fri, 6 Nov 2015 17:52:06 -0500
Steven Rostedt <rostedt@...dmis.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/