On Mon, Feb 01, 2016 at 05:11:29PM -0500, Mike Tancsa wrote:
> On 1/30/2016 12:26 PM, Marius Strobl wrote:
> > 
> > Ah, okay, that at least makes sense. Can you please verify that with
> > the attached patch applied, you have a setup that works out of the
> > box?
> > 
> Hi,
> The patch does not apply cleanly

Hrm, it does here on stable/10. If your checkout is unaltered, the
only thing I can think of is that the patch got corrupted when sent
by e-mail. I've put it online:
https://people.freebsd.org/~marius/em_tso_gig_only_10.diff

marius@alchemy:/home/marius/co/10/src/sys/dev/e1000 > svn info                  
Path: .
Working Copy Root Path: /usr/home/marius/co/10/src
URL: svn+ssh://svn.freebsd.org/base/stable/10/sys/dev/e1000
Relative URL: ^/stable/10/sys/dev/e1000
Repository Root: svn+ssh://svn.freebsd.org/base
Repository UUID: ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
Revision: 295130
Node Kind: directory
Schedule: normal
Last Changed Author: marius
Last Changed Rev: 294958
Last Changed Date: 2016-01-27 23:31:08 +0100 (Wed, 27 Jan 2016)

marius@alchemy:/home/marius/co/10/src/sys/dev/e1000 > patch < 
~/em_tso_gig_only_10.diff
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: sys/dev/e1000/if_em.c
|===================================================================
|--- sys/dev/e1000/if_em.c      (revision 294962)
|+++ sys/dev/e1000/if_em.c      (working copy)
--------------------------
Patching file if_em.c using Plan A...
Hunk #1 succeeded at 1377.
done
_______________________________________________
freebsd-stable@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "freebsd-stable-unsubscr...@freebsd.org"

Reply via email to