Re: Full hostlock pushdown available

Jeff Garzik
2010-11-01T18:42:24Z

On 11/01/2010 01:57 PM, Andi Kleen wrote:
> ssh://master.kernel.org/pub/scm/linux/kernel/git/ak/linux-misc-2.6 hostlock2

FYI there is a merge conflict, when pulling this into current upstream:

From ssh://master.kernel.org/pub/scm/linux/kernel/git/ak/linux-misc-2.6
* branch hostlock2 -> FETCH_HEAD
Auto-merging drivers/scsi/bfa/bfad_im.c
Auto-merging drivers/scsi/gdth.c
Auto-merging drivers/scsi/ipr.c
Auto-merging drivers/scsi/libfc/fc_fcp.c
Auto-merging drivers/scsi/lpfc/lpfc_scsi.c
Auto-merging drivers/scsi/megaraid/megaraid_sas.c
Auto-merging drivers/scsi/pmcraid.c
Auto-merging drivers/scsi/qla2xxx/qla_os.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c
Auto-merging drivers/scsi/qla4xxx/ql4_os.c
Auto-merging drivers/staging/hv/storvsc_drv.c
Auto-merging net/core/sock.c
Automatic merge failed; fix conflicts and then commit the result.