linux-kernel - linux-next: manual merge of the arm-mpidr tree with the arm 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>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130626110411.d1fe3913769385fa056010be@canb.auug.org.au>
Date:	Wed, 26 Jun 2013 11:04:11 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Lorenzo Pieralisi <lorenzo.pieralisi@....com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>
Subject: linux-next: manual merge of the arm-mpidr tree with the arm tree

Hi Lorenzo,

Today's linux-next merge of the arm-mpidr tree got a conflict in
arch/arm/kernel/suspend.c between commit 7604537bbb57 ("ARM: kernel:
implement stack pointer save array through MPIDR hashing") from the arm
tree and commit 3fed6a1e3bf0 ("ARM: kernel: implement stack pointer save
array through MPIDR hashing") from the arm-mpidr tree.

The former is just a rebase of the latter, so I used it.  It then turns
out that the arm-mpidr contains nothing that is not already included in
the arm tree, so is it needed any more i.e. is there further work coming?

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

Content of type "application/pgp-signature" skipped