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]

Date:	Mon, 14 Mar 2016 13:18:52 +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,
	Qais Yousef <qais.yousef@...tec.com>,
	Hauke Mehrtens <hauke@...ke-m.de>
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/mips/Kconfig

between commit:

  7a50e4688dab ("MIPS: Fix build error when SMP is used without GIC")

from the mips tree and commit:

  7eb8c99db26c ("MIPS: Delete smp-gic.c")

from the tip tree.

I fixed it up (I used the tip tree version since that removed the lines
updated by the mips tree patch) and can carry the fix as necessary
(no action is required).

-- 
Cheers,
Stephen Rothwell