linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ingo Molnar <mingo@kernel.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Shuah Khan <shuahkh@osg.samsung.com>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Andy Lutomirski <luto@kernel.org>
Subject: Re: linux-next: manual merge of the tip tree with the kselftest-fixes tree
Date: Thu, 14 May 2015 07:05:22 +0200	[thread overview]
Message-ID: <20150514050522.GA29268@gmail.com> (raw)
In-Reply-To: <20150514143516.3dd92949@canb.auug.org.au>


* Stephen Rothwell <sfr@canb.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

  reply	other threads:[~2015-05-14  5:05 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-14  4:35 linux-next: manual merge of the tip tree with the kselftest-fixes tree Stephen Rothwell
2015-05-14  5:05 ` Ingo Molnar [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-05-14  4:32 Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150514050522.GA29268@gmail.com \
    --to=mingo@kernel.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mingo@elte.hu \
    --cc=peterz@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --cc=shuahkh@osg.samsung.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).