From: Auke Kok <auke-jan.h.kok@intel.com>
To: akpm@osdl.org, jeff@garzik.org
Cc: linux-kernel@vger.kernel.org, mm-commits@vger.kernel.org,
Arjan van de Ven <arjan@linux.intel.com>
Subject: Re: + git-netdev-all-e1000-fix.patch added to -mm tree
Date: Tue, 09 Jan 2007 14:27:47 -0800 [thread overview]
Message-ID: <45A416E3.4010602@intel.com> (raw)
In-Reply-To: <200701092215.l09MFFu1016878@shell0.pdx.osdl.net>
akpm@osdl.org wrote:
> The patch titled
> git-netdev-all: e1000 fix
> has been added to the -mm tree. Its filename is
> git-netdev-all-e1000-fix.patch
>
> See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
> out what to do about this
>
> ------------------------------------------------------
> Subject: git-netdev-all: e1000 fix
> From: Andrew Morton <akpm@osdl.org>
>
> drivers/net/e1000/e1000_main.c:997:1: error: unterminated #ifdef
>
> Cc: Jeff Garzik <jeff@garzik.org>
> Signed-off-by: Andrew Morton <akpm@osdl.org>
> ---
>
> drivers/net/e1000/e1000_main.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff -puN drivers/net/e1000/e1000_main.c~git-netdev-all-e1000-fix drivers/net/e1000/e1000_main.c
> --- a/drivers/net/e1000/e1000_main.c~git-netdev-all-e1000-fix
> +++ a/drivers/net/e1000/e1000_main.c
> @@ -994,7 +994,6 @@ e1000_probe(struct pci_dev *pdev,
> (adapter->hw.mac_type != e1000_82547))
> netdev->features |= NETIF_F_TSO;
>
> -#ifdef NETIF_F_TSO6
> if (adapter->hw.mac_type > e1000_82547_rev_2)
> netdev->features |= NETIF_F_TSO6;
> if (pci_using_dac)
> _
doh, I wish I had not included that in my updated patch for -mm right now... I knew I
should have posted this to Jeff first when I spotted it myself this morning ;)
Ack, of course.
Cheers,
Auke
prev parent reply other threads:[~2007-01-09 22:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-09 22:14 + git-netdev-all-e1000-fix.patch added to -mm tree akpm
2007-01-09 22:27 ` Auke Kok [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=45A416E3.4010602@intel.com \
--to=auke-jan.h.kok@intel.com \
--cc=akpm@osdl.org \
--cc=arjan@linux.intel.com \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mm-commits@vger.kernel.org \
/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.