linux-kernel - linux-next: manual merge of the xilinx 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: <20130703111030.c0df2a231fc3e4ba6cb566cd@canb.auug.org.au>
Date:	Wed, 3 Jul 2013 11:10:30 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Michal Simek <michal.simek@...inx.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the xilinx tree

Hi Michal,

Today's linux-next merge of the xilinx tree got conflicts in several files.

These conflicts are caused by a set of old patches in the xilinx tree
other copies of which have been merged upstream a while ago.  I fact the
xilinx tree currently adds no changes to linux-next at all.   Could you
please clean up this tree?
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped