Re: linux-next: manual merge of the scsi tree with the tip tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the scsi tree with the tip tree
Date	2017-01-20 14:30 +0100
Message-ID	<t1Hqq-7M4-15@gated-at.bofh.it> (permalink)
References	<t1y3L-1Vd-5@gated-at.bofh.it> <t1Bbk-3QV-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the scsi tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-20 04:30 +0100
  Re: linux-next: manual merge of the scsi tree with the tip tree Ingo Molnar <mingo@kernel.org> - 2017-01-20 07:50 +0100
    Re: linux-next: manual merge of the scsi tree with the tip tree James Bottomley <James.Bottomley@HansenPartnership.com> - 2017-01-20 14:00 +0100
    Re: linux-next: manual merge of the scsi tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-01-20 14:30 +0100

csiph-web