Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S933195Ab2EWILO (ORCPT <rfc822;w@1wt.eu>);
	Wed, 23 May 2012 04:11:14 -0400
Received: from mail.linux-iscsi.org ([67.23.28.174]:37207 "EHLO
	linux-iscsi.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1757196Ab2EWILD (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 23 May 2012 04:11:03 -0400
Subject: Re: linux-next: Tree for May 23
From: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
        target-devel <target-devel@vger.kernel.org>,
        linux-scsi <linux-scsi@vger.kernel.org>
In-Reply-To: <20120523170740.ae058d8d5468d471eb948c39@canb.auug.org.au>
References: <20120523170740.ae058d8d5468d471eb948c39@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"
Date: Wed, 23 May 2012 01:10:57 -0700
Message-ID: <1337760657.22481.256.camel@haakon2.linux-iscsi.org>
Mime-Version: 1.0
X-Mailer: Evolution 2.30.3 
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1639
Lines: 47

On Wed, 2012-05-23 at 17:07 +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20120522:
> 
> New tree: signal
> 
> With the merge window open, conflicts are moving from tree to tree.
> 

...

> 
> $ git checkout master
> $ git reset --hard stable
> Merging origin/master (fb09baf Merge tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging)

<SNIP>

> Merging scsi/for-next (841f97b [SCSI] qla2xxx: don't free pool that wasn't allocated)
> Merging target-updates/for-next (f80e8ed iscsi-target: Fix iov_count calculation bug in iscsit_allocate_iovecs)
> Merging target-merge/for-next-merge (ef872d2 Merge branch 'qla-target-merge' into for-next-merge)
> CONFLICT (add/add): Merge conflict in drivers/scsi/qla2xxx/tcm_qla2xxx.c
> CONFLICT (add/add): Merge conflict in drivers/scsi/qla2xxx/qla_target.h
> CONFLICT (add/add): Merge conflict in drivers/scsi/qla2xxx/qla_target.c
> CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c
> CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mbx.c
> CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_def.h
> CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_dbg.h

Just wanted to mention that qla-target-merge branch has been dropped
from target-merge/for-next-merge now that these patches have hit James'
scsi/for-next tree.

Thank you Stephen!

--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/