linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: James Bottomley <James.Bottomley@HansenPartnership.com>
To: Minh Tran <minhduc.tran@avagotech.com>
Cc: linux-scsi@vger.kernel.org, michaelc@cs.wisc.edu,
	Minh Tran <minh.tran@avagotech.com>,
	Jayamohan Kallickal <jayamohan.kallickal@avagotech.com>
Subject: Re: [PATCH] be2iscsi change of ownership from Emulex to Avago Technologies recently.  We like to get the following updates in:   changed "Emulex" to "Avago Technologies",   changed email addresses from "emulex.com" to "avagotech.com",   updated MAINTAINER list for be2iscsi driver.
Date: Mon, 25 May 2015 09:12:20 -0700	[thread overview]
Message-ID: <1432570340.2195.3.camel@HansenPartnership.com> (raw)
In-Reply-To: <1431670577-4125-1-git-send-email-minh.tran@avagotech.com>

On Thu, 2015-05-14 at 23:16 -0700, Minh Tran wrote:
> Signed-off-by: Minh Tran <minh.tran@avagotech.com>
> Signed-off-by: Jayamohan Kallickal <jayamohan.kallickal@avagotech.com>
> ---
>  MAINTAINERS                      |  6 ++++--
>  drivers/scsi/be2iscsi/be.h       |  6 +++---
>  drivers/scsi/be2iscsi/be_cmds.c  |  6 +++---
>  drivers/scsi/be2iscsi/be_cmds.h  |  6 +++---
>  drivers/scsi/be2iscsi/be_iscsi.c |  8 ++++----
>  drivers/scsi/be2iscsi/be_iscsi.h |  8 ++++----
>  drivers/scsi/be2iscsi/be_main.c  | 12 ++++++------
>  drivers/scsi/be2iscsi/be_main.h  | 10 +++++-----
>  drivers/scsi/be2iscsi/be_mgmt.c  |  8 ++++----
>  drivers/scsi/be2iscsi/be_mgmt.h  |  8 ++++----
>  10 files changed, 40 insertions(+), 38 deletions(-)

This patch conflicts horribly with [PATCH V2 0/7] be2iscsi driver update
to 10.6.0.0.  I fixed it up this time, but next time, just update
MAINTAINERS on its own and sort out the rest during the usual merge
window process.

James



      reply	other threads:[~2015-05-25 16:12 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-15  6:16 [PATCH] be2iscsi change of ownership from Emulex to Avago Technologies recently. We like to get the following updates in: changed "Emulex" to "Avago Technologies", changed email addresses from "emulex.com" to "avagotech.com", updated MAINTAINER list for be2iscsi driver Minh Tran
2015-05-25 16:12 ` James Bottomley [this message]

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=1432570340.2195.3.camel@HansenPartnership.com \
    --to=james.bottomley@hansenpartnership.com \
    --cc=jayamohan.kallickal@avagotech.com \
    --cc=linux-scsi@vger.kernel.org \
    --cc=michaelc@cs.wisc.edu \
    --cc=minh.tran@avagotech.com \
    --cc=minhduc.tran@avagotech.com \
    /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 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).