linux-kernel - linux-next: manual merge of the edac-amd 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150626170839.7a0945c5@canb.auug.org.au>
Date:	Fri, 26 Jun 2015 17:08:39 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Borislav Petkov <bp@...en8.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the edac-amd tree with Linus' tree

Hi Borislav,

Today's linux-next merge of the edac-amd tree got a conflict in:

  drivers/edac/mce_amd_inj.c

between commits from Linus' tree and the same commits plus more from
the edac-amd tree.

I just dropped the edac-amd tree for today as it seems that it was just
rebased and a few commits dropped before Linus was asked to merge it.

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

Content of type "application/pgp-signature" skipped