netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Dean Nelson <dnelson@redhat.com>
To: jeffrey.t.kirsher@intel.com
Cc: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
	David Miller <davem@davemloft.net>,
	Konstantin Khlebnikov <khlebnikov@openvz.org>,
	netdev@vger.kernel.org, Bruce Allan <bruce.w.allan@intel.com>
Subject: Re: [PATCH net-next] e1000e: restore call to pci_clear_master()
Date: Wed, 12 Jun 2013 14:45:56 -0500	[thread overview]
Message-ID: <51B8CFF4.80709@redhat.com> (raw)
In-Reply-To: <1371066071.2133.40.camel@jtkirshe-mobl>

On 06/12/2013 02:41 PM, Jeff Kirsher wrote:
> On Wed, 2013-06-12 at 13:53 -0500, Dean Nelson wrote:
>> On 06/12/2013 01:38 PM, Sergei Shtylyov wrote:
>>> Hello.
>>>
>>> On 06/12/2013 09:47 PM, Dean Nelson wrote:
>>>
>>>> In attempting to resolve a minor merge conflict, commit
>>>> e5f2ef7ab4690d2e8faa
>>>> accidently dropped a call to pci_clear_master() that was intended to
>>>> remain
>>>> in place.
>>>
>>>> Commit 4e0855dff094b0d56d6b replaced a call to pci_disable_device() by
>>>> one to
>>>
>>>      Please specify the summary line in parens for both commmits you're
>>> mentioning.
>>
>> Sorry, I'm not understanding fully. Are you asking me to repost the
>> patch with the changelog modified, such that each of the commits
>> mentioned has their summary statement following, enclosed in parens?
>>
>>
>>>> pci_clear_master(). And then commit 66148babe728f3e00e13 deleted a
>>>> number of
>>>> lines starting two lines following that call.
>>>
>>>> This patch restores the call to pci_clear_master() in __e1000_shutdown().
>>>
>>>> Signed-off-by: Dean Nelson <dnelson@redhat.com>
>>>
>>> WBR, Sergei
>>>
>>>
>>
>> Also, I mistyped Jeff Kirsher's email address. It's corrected above.
>> (Sorry, Jeff.)
>
> No problem, will you be sending a v2 based on Sergei's feedback?  Just
> need to know if I add this patch to my queue or wait for v2.

Yes, I just sent it.


>

      reply	other threads:[~2013-06-12 19:46 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-12 17:47 [PATCH net-next] e1000e: restore call to pci_clear_master() Dean Nelson
2013-06-12 18:38 ` Sergei Shtylyov
2013-06-12 18:53   ` Dean Nelson
2013-06-12 19:05     ` Sergei Shtylyov
2013-06-12 19:41     ` Jeff Kirsher
2013-06-12 19:45       ` Dean Nelson [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=51B8CFF4.80709@redhat.com \
    --to=dnelson@redhat.com \
    --cc=bruce.w.allan@intel.com \
    --cc=davem@davemloft.net \
    --cc=jeffrey.t.kirsher@intel.com \
    --cc=khlebnikov@openvz.org \
    --cc=netdev@vger.kernel.org \
    --cc=sergei.shtylyov@cogentembedded.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).