linux-kernel - linux-next: manual merge of the blackfin tree with Linus' 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, 24 Apr 2015 10:16:19 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Steven Miao <realmz6@...il.com>,
	Mike Frysinger <vapier.adi@...il.com>,
	Bob Liu <lliubbo@...il.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>,
	Nicholas Mc Guire <hofrat@...dl.org>
Subject: linux-next: manual merge of the blackfin tree with Linus' tree

Hi all,

Today's linux-next merge of the blackfin tree got a conflict in
arch/blackfin/mach-common/smp.c between commit a17b4b7487eb ("blackfin:
Use common outgoing-CPU-notification code") from Linus' tree and commit
ca2b83264d99 ("blackfin: make timeout HZ independent") from the
blackfin tree.

I fixed it up (the former supercedes the latter, I think) and can carry
the fix as necessary (no action is required).

P.S. Steven, you committed that blackfin tree patch, but did not add you
Signed-off-by ...

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

Content of type "application/pgp-signature" skipped