linux-kernel - Re: [PATCH] iwlwifi: Move each system tracepoints to their own header

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]

Message-ID: <20150413110546.32214082@gandalf.local.home>
Date:	Mon, 13 Apr 2015 11:05:46 -0400
From:	Steven Rostedt <rostedt@...dmis.org>
To:	Emmanuel Grumbach <egrumbach@...il.com>
Cc:	Johannes Berg <johannes@...solutions.net>,
	LKML <linux-kernel@...r.kernel.org>,
	linux-wireless <linux-wireless@...r.kernel.org>,
	Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: [PATCH] iwlwifi: Move each system tracepoints to their own
 header

On Mon, 13 Apr 2015 11:17:17 +0300
Emmanuel Grumbach <egrumbach@...il.com> wrote:

> I overthought it. Stephen fixed the conflict correctly.
> 

Good, because I needed that change in my tree as other patches depended
on it.

Linus should be able to figure this out. I'll have to write up a bit
for him when I do my pull request, as my own branches have minor
conflicts.

Linus doesn't mind conflicts, but if you are aware of them, and already
did the merge fix, he likes to know about it, and pointers to the
conflict resolution is helpful, as he can compare what he did to what
we did.

I'll make note of the merge conflict resolution commit that Stephen did
in my pull request.

-- 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/