linux-kernel - linux-next: manual merge of the kvm tree with the ftrace tree

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>] [day] [month] [year] [list]

Date:	Fri, 1 Aug 2014 14:44:20 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Marcelo Tosatti <mtosatti@...hat.com>,
	Gleb Natapov <gleb@...nel.org>,
	Steven Rostedt <rostedt@...dmis.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Mark D Rustad <mark.d.rustad@...el.com>,
	Jeff Kirsher <jeffrey.t.kirsher@...el.com>,
	Paolo Bonzini <pbonzini@...hat.com>
Subject: linux-next: manual merge of the kvm tree with the ftrace tree

Hi all,

Today's linux-next merge of the kvm tree got a conflict in
arch/x86/kvm/mmutrace.h between commit 7b039cb4c5a9 ("tracing: Add
trace_seq_buffer_ptr() helper function") from the ftrace tree and
commit 42cbc04fd3b5 ("x86/kvm: Resolve shadow warnings in macro
expansion") from the kvm tree.

I fixed it up (I dropped the ftrace tree's change to this file) and can
carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)