linux-kernel - linux-next: manual merge of the akpm-current tree with the staging 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: <20121029142126.66314d5d5898d1a9070e3171@canb.auug.org.au>
Date:	Mon, 29 Oct 2012 14:21:26 +1100
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,
	Greg KH <greg@...ah.com>,
	Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Subject: linux-next: manual merge of the akpm-current tree with the staging
 tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got a conflict in
drivers/staging/rts_pstor/trace.h between commit cd2112220b6b ("Staging:
remove rts_pstor driver") from the staging tree and commit 3980a6d4af3e
("staging: rts_pstor: use kbasename()") from the akpm-current tree.

The former removed the file modified by the latter, so I dropped the
latter patch.

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

Content of type "application/pgp-signature" skipped