From: Jeff Garzik <jeff@garzik.org>
To: Andi Kleen <andi@firstfloor.org>
Cc: Stefan Richter <stefanr@s5r6.in-berlin.de>,
Boaz Harrosh <bharrosh@panasas.com>,
James.Bottomley@suse.de, nab@linux-iscsi.org,
linux-scsi@vger.kernel.org
Subject: Re: Full hostlock pushdown available
Date: Mon, 01 Nov 2010 14:42:20 -0400 [thread overview]
Message-ID: <4CCF0A0C.3070209@garzik.org> (raw)
In-Reply-To: <20101101175742.GG25817@basil.fritz.box>
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.
next prev parent reply other threads:[~2010-11-01 18:42 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-28 15:05 Full hostlock pushdown available Andi Kleen
2010-10-28 19:28 ` James Bottomley
2010-10-28 19:32 ` Nicholas A. Bellinger
2010-11-01 14:06 ` Andi Kleen
2010-11-01 14:29 ` James Bottomley
2010-10-28 20:10 ` Andi Kleen
2010-10-28 20:22 ` James Bottomley
2010-10-28 21:50 ` Andi Kleen
2010-10-28 22:37 ` Nicholas A. Bellinger
2010-10-31 12:22 ` Boaz Harrosh
2010-10-31 18:48 ` Stefan Richter
2010-11-01 2:34 ` Jeff Garzik
2010-11-01 13:53 ` Andi Kleen
2010-11-01 15:56 ` Jeff Garzik
2010-11-01 17:57 ` Andi Kleen
2010-11-01 18:42 ` Jeff Garzik [this message]
2010-11-02 15:05 ` Andi Kleen
2010-11-01 18:59 ` Jeff Garzik
2010-11-01 21:06 ` Nicholas A. Bellinger
2010-11-02 9:21 ` Andi Kleen
2010-11-02 15:59 ` Jeff Garzik
2010-11-02 17:53 ` Andi Kleen
2010-11-02 18:13 ` Jeff Garzik
2010-11-02 18:38 ` Nicholas A. Bellinger
2010-11-02 18:50 ` Jeff Garzik
2010-11-01 13:54 ` Andi Kleen
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=4CCF0A0C.3070209@garzik.org \
--to=jeff@garzik.org \
--cc=James.Bottomley@suse.de \
--cc=andi@firstfloor.org \
--cc=bharrosh@panasas.com \
--cc=linux-scsi@vger.kernel.org \
--cc=nab@linux-iscsi.org \
--cc=stefanr@s5r6.in-berlin.de \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.