LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
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>
Subject: Re: linux-next: Tree for May 23
Date: Wed, 23 May 2012 01:10:57 -0700	[thread overview]
Message-ID: <1337760657.22481.256.camel@haakon2.linux-iscsi.org> (raw)
In-Reply-To: <20120523170740.ae058d8d5468d471eb948c39@canb.auug.org.au>

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






  reply	other threads:[~2012-05-23  8:11 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-23  7:07 Stephen Rothwell
2012-05-23  8:10 ` Nicholas A. Bellinger [this message]
2012-05-23 15:58 ` linux-next: Tree for May 23 (uml) Randy Dunlap
2012-05-23 18:19   ` Al Viro
2012-05-23 19:37     ` Al Viro
2012-05-23 23:13       ` Stephen Rothwell
2012-05-23 23:47         ` Al Viro
2012-05-23 20:51     ` Geert Uytterhoeven
2012-05-23 16:14 ` [PATCH -next] acpi: fix acpi_bus.h warnings when ACPI is not enabled Randy Dunlap
2012-06-04  4:32   ` Len Brown
2012-06-04 14:42     ` Randy Dunlap
  -- strict thread matches above, loose matches on Subject: below --
2022-05-23 11:31 linux-next: Tree for May 23 Stephen Rothwell
2019-05-23  3:43 Stephen Rothwell
2017-05-23  4:39 Stephen Rothwell
2016-05-23  4:47 Stephen Rothwell
2016-05-23 10:47 ` Stephen Rothwell
2014-05-23 10:42 Stephen Rothwell
2013-05-23  5:49 Stephen Rothwell
2011-05-23  5:45 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=1337760657.22481.256.camel@haakon2.linux-iscsi.org \
    --to=nab@linux-iscsi.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    --cc=target-devel@vger.kernel.org \
    --subject='Re: linux-next: Tree for May 23' \
    /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

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).