diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-18 03:55:41 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-18 03:55:41 -0500 |
| commit | 41804420586ab41049a14ab7ef04eaa2280b8647 (patch) | |
| tree | f05b39b0c5f1ed229b073f7a993ef717f9f1a363 /arch/parisc/include | |
| parent | 7b1e46c5a265b142dd05ff3463fa3e0a1f4e4172 (diff) | |
| parent | 7d0d46da750a252371cb747b48ddda27d1047881 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
net/ipv4/tcp_metrics.c
Overlapping changes between the "don't create two tcp metrics objects
with the same key" race fix in net and the addition of the destination
address in the lookup key in net-next.
Minor overlapping changes in bnx2x driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/parisc/include')
| -rw-r--r-- | arch/parisc/include/uapi/asm/socket.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h index f33113a6141e..70b3674dac4e 100644 --- a/arch/parisc/include/uapi/asm/socket.h +++ b/arch/parisc/include/uapi/asm/socket.h | |||
| @@ -75,6 +75,6 @@ | |||
| 75 | 75 | ||
| 76 | #define SO_BUSY_POLL 0x4027 | 76 | #define SO_BUSY_POLL 0x4027 |
| 77 | 77 | ||
| 78 | #define SO_MAX_PACING_RATE 0x4048 | 78 | #define SO_MAX_PACING_RATE 0x4028 |
| 79 | 79 | ||
| 80 | #endif /* _UAPI_ASM_SOCKET_H */ | 80 | #endif /* _UAPI_ASM_SOCKET_H */ |