Re: linux-next: Tree for May 23

[Nicholas A. Bellinger]

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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/