[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20141007163118.1cdb9544@canb.auug.org.au>
Date: Tue, 7 Oct 2014 16:31:18 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Tejun Heo <tj@...nel.org>, Rusty Russell <rusty@...tcorp.com.au>,
Christoph Lameter <cl@...ux-foundation.org>,
Ingo Molnar <mingo@...e.hu>,
Martin Schwidefsky <schwidefsky@...ibm.com>,
Heiko Carstens <heiko.carstens@...ibm.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the percpu tree with the s390 tree
Hi all,
Today's linux-next merge of the percpu tree got a conflict in
arch/s390/include/asm/cputime.h between commit 201b275f0459
("s390/nohz: use a per-cpu flag for arch_needs_cpu") from the s390 tree
and commit eb7e7d766326 ("s390: Replace __get_cpu_var uses") from the
percpu tree.
I fixed it up (the former removed the code updated by the latter) 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)
Powered by blists - more mailing lists