From: Ingo Oeser <netdev@axxeo•de>
To: Jeff Kirsher <jeffrey.t.kirsher@intel•com>
Cc: jeff@garzik•org, netdev@vger•kernel.org, akpm@linux-foundation•org
Subject: Re: [PATCH 3/3] e1000e: add support for new 82574L part
Date: Tue, 12 Aug 2008 18:37:03 +0200 [thread overview]
Message-ID: <200808121837.03714.netdev@axxeo.de> (raw)
In-Reply-To: <20080811223552.10443.82532.stgit@localhost.localdomain>
Hi Jeff,
you have unresolved merge conflicts in your patch, please resolve them first.
Jeff Kirsher schrieb:
> +<<<<<<< HEAD:drivers/net/e1000e/netdev.c
> +=======
> +>>>>>>> 909d1be8144df3854741a9e3e8cae93d8d88a16c:drivers/net/e1000e/netdev.c
> +<<<<<<< HEAD:drivers/net/e1000e/netdev.c
> +=======
> +>>>>>>> 909d1be8144df3854741a9e3e8cae93d8d88a16c:drivers/net/e1000e/netdev.c
> +<<<<<<< HEAD:drivers/net/e1000e/netdev.c
> +=======
> +>>>>>>> 909d1be8144df3854741a9e3e8cae93d8d88a16c:drivers/net/e1000e/netdev.c
> +<<<<<<< HEAD:drivers/net/e1000e/netdev.c
> +=======
> +>>>>>>> 909d1be8144df3854741a9e3e8cae93d8d88a16c:drivers/net/e1000e/netdev.c
> +<<<<<<< HEAD:drivers/net/e1000e/netdev.c
> +=======
> +>>>>>>> 909d1be8144df3854741a9e3e8cae93d8d88a16c:drivers/net/e1000e/netdev.c
Just search in your editor for these marks in the patch you sent and resolve these
in your repository.
Best Regards
Ingo Oeser
prev parent reply other threads:[~2008-08-12 16:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-11 22:35 [PATCH 1/3] e1000e: add support for the 82567LM-4 device Jeff Kirsher
2008-08-11 22:35 ` [PATCH 2/3] e1000e: add support for 82567LM-3 and 82567LF-3 (ICH10D) parts Jeff Kirsher
2008-08-11 22:35 ` [PATCH 3/3] e1000e: add support for new 82574L part Jeff Kirsher
2008-08-12 16:37 ` Ingo Oeser [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=200808121837.03714.netdev@axxeo.de \
--to=netdev@axxeo$(echo .)de \
--cc=akpm@linux-foundation$(echo .)org \
--cc=jeff@garzik$(echo .)org \
--cc=jeffrey.t.kirsher@intel$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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