Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
	net/ipv4/ip_gre.c

Minor conflicts between tunnel bug fixes in net and
ipv6 tunnel cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/nios2/lib/memset.c b/arch/nios2/lib/memset.c
index c2cfcb121e34..2fcefe720283 100644
--- a/arch/nios2/lib/memset.c
+++ b/arch/nios2/lib/memset.c
@@ -68,7 +68,7 @@ void *memset(void *s, int c, size_t count)
                   "=r" (charcnt),       /* %1  Output */
                   "=r" (dwordcnt),      /* %2  Output */
                   "=r" (fill8reg),      /* %3  Output */
-                  "=r" (wrkrega)        /* %4  Output */
+                  "=&r" (wrkrega)       /* %4  Output only */
                 : "r" (c),              /* %5  Input */
                   "0" (s),              /* %0  Input/Output */
                   "1" (count)           /* %1  Input/Output */