On Mon, Nov 14, 2011 at 12:24:56AM -0500, David Miller wrote:

From: Josh Boyer <redacted>
Date: Thu, 10 Nov 2011 20:10:23 -0500

quoted

@@ -288,6 +288,8 @@ static struct ip6_tnl *ip6_tnl_create(struct net *net, struct ip6_tnl_parm *p)
 
 	if ((err = register_netdevice(dev)) < 0)
 		goto failed_free;
+	
+	strcpy(t->parms.name, dev->name);

Trailing whitespace on that blank line you're adding.

Ugh.  Forgot to run checkpatch.  Apologies.

I fixed this up, applied, and queued up for -stable, thanks.

Thank you.

josh