From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754861AbbENFF3 (ORCPT ); Thu, 14 May 2015 01:05:29 -0400 Received: from mail-wg0-f48.google.com ([74.125.82.48]:35055 "EHLO mail-wg0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751395AbbENFF1 (ORCPT ); Thu, 14 May 2015 01:05:27 -0400 Date: Thu, 14 May 2015 07:05:22 +0200 From: Ingo Molnar To: Stephen Rothwell Cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Shuah Khan , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Lutomirski Subject: Re: linux-next: manual merge of the tip tree with the kselftest-fixes tree Message-ID: <20150514050522.GA29268@gmail.com> References: <20150514143516.3dd92949@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20150514143516.3dd92949@canb.auug.org.au> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Stephen Rothwell 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