From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ingo Molnar <mingo@kernel•org>
Cc: James Bottomley <James.Bottomley@HansenPartnership•com>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Peter Zijlstra <peterz@infradead•org>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
"Martin K. Petersen" <martin.petersen@oracle•com>
Subject: Re: linux-next: manual merge of the scsi tree with the tip tree
Date: Sat, 21 Jan 2017 00:12:33 +1100 [thread overview]
Message-ID: <20170121001233.6699f1b3@canb.auug.org.au> (raw)
In-Reply-To: <20170120063552.GA14142@gmail.com>
Hi Ingo,
On Fri, 20 Jan 2017 07:35:52 +0100 Ingo Molnar <mingo@kernel•org> wrote:
>
> I only had that patch for testing and it went into the -next branch by accident -
> I have removed it so the conflict should be gone next time -next is integrated.
Thanks, these things happen.
--
Cheers,
Stephen Rothwell
prev parent reply other threads:[~2017-01-20 13:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-20 3:23 linux-next: manual merge of the scsi tree with the tip tree Stephen Rothwell
2017-01-20 6:35 ` Ingo Molnar
2017-01-20 12:52 ` James Bottomley
2017-01-20 13:12 ` Stephen Rothwell [this message]
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=20170121001233.6699f1b3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=James.Bottomley@HansenPartnership$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=martin.petersen@oracle$(echo .)com \
--cc=mingo@elte$(echo .)hu \
--cc=mingo@kernel$(echo .)org \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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