linux-kernel - linux-next: manual merge of the tip tree with the mips 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]

Message-ID: <20141009150939.263c6c75@canb.auug.org.au>
Date:	Thu, 9 Oct 2014 15:09:39 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Ralf Baechle <ralf@...ux-mips.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Frederic Weisbecker <fweisbec@...il.com>,
	Zubair Lutfullah Kakakhel <Zubair.Kakakhel@...tec.com>
Subject: linux-next: manual merge of the tip tree with the mips tree

Hi all,

Today's linux-next merge of the tip tree got a conflict in
arch/arm64/include/asm/Kbuild between commit 2f06dbe4e4fc ("arm64: use
generic dma-contiguous.h") from the mips tree and commit c5c38ef3d703
("irq_work: Introduce arch_irq_work_has_interrupt()") from the tip tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc arch/arm64/include/asm/Kbuild
index 55c179b32dd9,c1968475cc4e..000000000000
--- a/arch/arm64/include/asm/Kbuild
+++ b/arch/arm64/include/asm/Kbuild
@@@ -9,9 -9,8 +9,9 @@@ generic-y += current.
  generic-y += delay.h
  generic-y += div64.h
  generic-y += dma.h
 +generic-y += dma-contiguous.h
- generic-y += emergency-restart.h
  generic-y += early_ioremap.h
+ generic-y += emergency-restart.h
  generic-y += errno.h
  generic-y += ftrace.h
  generic-y += hash.h

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