linux-kernel - linux-next: manual merge of the scsi-post-merge tree with the akpm 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: <20110829151909.d5a9c3897af3830c70ae2d2a@canb.auug.org.au>
Date:	Mon, 29 Aug 2011 15:19:09 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Sergei Trofimovich <slyfox@...too.org>
Subject: linux-next: manual merge of the scsi-post-merge tree with the akpm
 tree

Hi Andrew,

Today's linux-next merge of the akpm tree got a conflict in
arch/alpha/kernel/osf_sys.c between commit 2df7a7d1cd07 ("alpha: unbreak
osf_setsysinfo(SSI_NVPAIRS, [SSIN_UACPROC, UAC_SIGBUS])") from the  tree
and commit db52f8af5ea5 ("The bug was accidentally found by the following
program:") from the akpm tree.

The former appears to be a later version of the latter, so I have dropped
the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped