linux-kernel - Re: linux-next: manual merge of the tip tree with the kselftest-fixes 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] [day] [month] [year] [list]

Message-ID: <20150514050522.GA29268@gmail.com>
Date:	Thu, 14 May 2015 07:05:22 +0200
From:	Ingo Molnar <mingo@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	Shuah Khan <shuahkh@....samsung.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andy Lutomirski <luto@...nel.org>
Subject: Re: linux-next: manual merge of the tip tree with the
 kselftest-fixes tree


* Stephen Rothwell <sfr@...b.auug.org.au> wrote:

> Hi all,
> 
> Today's linux-next merge of the tip tree got a conflict in 
> tools/testing/selftests/x86/run_x86_tests.sh between commit 
> c1e6e5cb941b ("selftests, x86: Remove useless run_tests rule") from 
> the kselftest-fixes tree and commit e22438f8e997 ("x86, selftests: 
> Add a test for the "sysret_ss_attrs" bug") from the tip tree.
> 
> I fixed it up (I removed the file) and can carry the fix as 
> necessary (no action is required).

Thanks Stephen - I've dropped this and the other conflicting commit 
from -tip, so both conflicts should go away in tomorrow's integration.

Thanks,

	Ingo
--
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/