Subject: Re: [PATCH 3/3] e1000e: add support for new 82574L part

From: Ingo Oeser <[email-masked]>
Date: Tue, 12 Aug 2008 18:37:03 +0200

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