Message-ID: <1433158552.3170.36.camel@haakon3.risingtidesystems.com>
Subject: Re: linux-next: manual merge of the target-updates tree with the 
 tree
From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
        Christoph Hellwig <hch@lst.de>, Andy Grover <agrover@redhat.com>
Date: Mon, 01 Jun 2015 04:35:52 -0700
In-Reply-To: <20150601212220.7374cc23@canb.auug.org.au>
References: <20150601212220.7374cc23@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 684
Lines: 22

On Mon, 2015-06-01 at 21:22 +1000, Stephen Rothwell wrote:
> Hi Nicholas,
> 
> Today's linux-next merge of the target-updates tree got so many
> conflicts against Linus' tree that I just gave up and dropped it
> completely.  Please fix up this mess.
> 

Apologies for the conflicts vs. mainline in today's linux-next

The latest in target-pending/for-next from this morning should address
these conflicts vs. mainline.

Thank you,

--nab

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/