Re: [PATCH net-next v2] e1000e: restore call to pci_clear_master()

Jeff Kirsher
2013-06-12T19:49:08Z

[-- Attachment #1: Type: text/plain, Size: 1156 bytes --]

On Wed, 2013-06-12 at 15:44 -0400, Dean Nelson wrote:
> In attempting to resolve a minor merge conflict, commit
> e5f2ef7ab4690d2e8faa
> (Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net)
> accidently
> dropped a call to pci_clear_master() that was intended to remain in
> place.
>
> Commit 4e0855dff094b0d56d6b (e1000e: fix pci-device enable-counter
> balance)
> replaced a call to pci_disable_device() by one to pci_clear_master().
> And then
> commit 66148babe728f3e00e13 (e1000e: fix runtime power management
> transitions)
> deleted a number of lines starting two lines following that call.
>
> This patch restores the call to pci_clear_master() in
> __e1000_shutdown().
>
> v2: added summary lines (enclosed in parens) following commit IDs
>
> Signed-off-by: Dean Nelson <dnelson@redhat.com>
> ---
> Both stable 3.8.y and 3.9.y appear to have the call to
> pci_clear_master() in
> __e1000_shutdown() as desired. I'm not sure how they avoided the
> conflict.
>
> drivers/net/ethernet/intel/e1000e/netdev.c | 2 ++
> 1 file changed, 2 insertions(+)

Thanks Dean, I will add this to my e1000e queue.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]