Merge tag 'v3.17-rc5' into usb-next

USB fixes in Linux 3.17-rc5 are needed to build on top of for 3.18.

Signed-off-by: Johan Hovold <johan@kernel.org>

1 files changed, 2 insertions, 3 deletions

diff --git a/net/socket.c b/net/socket.c
index 95ee7d8682e7..2e2586e2dee1 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -734,8 +734,7 @@ void __sock_recv_timestamp(struct msghdr *msg, struct sock *sk,
         }
 
         memset(&tss, 0, sizeof(tss));
-        if ((sk->sk_tsflags & SOF_TIMESTAMPING_SOFTWARE ||
-             skb_shinfo(skb)->tx_flags & SKBTX_ANY_SW_TSTAMP) &&
+        if ((sk->sk_tsflags & SOF_TIMESTAMPING_SOFTWARE) &&
             ktime_to_timespec_cond(skb->tstamp, tss.ts + 0))
                 empty = 0;
         if (shhwtstamps &&
@@ -2602,7 +2601,7 @@ SYSCALL_DEFINE2(socketcall, int, call, unsigned long __user *, args)
  *
  *      This function is called by a protocol handler that wants to
  *      advertise its address family, and have it linked into the
- *      socket interface. The value ops->family coresponds to the
+ *      socket interface. The value ops->family corresponds to the
  *      socket system call protocol family.
  */
 int sock_register(const struct net_proto_family *ops)