linux-kernel - Re: 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-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20150626072723.GB14572@pd.tnic>
Date:	Fri, 26 Jun 2015 09:27:23 +0200
From:	Borislav Petkov <bp@...en8.de>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the edac-amd tree with Linus' tree

Hi Stephen,

On Fri, Jun 26, 2015 at 05:08:39PM +1000, Stephen Rothwell wrote:
> 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.

yes, that's the right thing to do. If there's anything I should do to
let you know when to start merging it again, please let me know.

Thanks.

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/