linux-kernel - Re: linux-next: manual merge of the edac-amd tree with the edac 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: <20161201104846.kjvuy5tj475oxzke@pd.tnic>
Date:   Thu, 1 Dec 2016 11:48:46 +0100
From:   Borislav Petkov <bp@...en8.de>
To:     Mauro Carvalho Chehab <mchehab@....samsung.com>
Cc:     Stephen Rothwell <sfr@...b.auug.org.au>,
        linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the edac-amd tree with the edac tree

On Wed, Nov 30, 2016 at 08:50:13AM -0200, Mauro Carvalho Chehab wrote:
> Fixed. If you have a stable branch, I can rebase it on the top
> of your patches, in order to avoid the confict at linux-next.

http://git.kernel.org/cgit/linux/kernel/git/bp/bp.git/log/?h=for-next

but with that fixed, shouldn't the merge work without a conflict?

-- 
Regards/Gruss,
    Boris.

Good mailing practices for 400: avoid top-posting and trim the reply.