From: Stephen Rothwell <redacted>
Date: Mon, 22 May 2017 13:43:00 +1000

Hi Dave,

On Sun, 21 May 2017 23:14:10 -0400 (EDT) David Miller [off-list ref] wrote:

quoted

From: Stephen Rothwell <redacted>
Date: Mon, 22 May 2017 11:16:05 +1000

quoted

After merging the net-next tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

net/socket.c: In function 'put_ts_pktinfo':
net/socket.c:695:28: error: 'SCM_TIMESTAMPING_PKTINFO' undeclared (first use in this function)
  put_cmsg(msg, SOL_SOCKET, SCM_TIMESTAMPING_PKTINFO,
                            ^
Caused by commit

  aad9c8c470f2 ("net: add new control message for incoming HW-timestamped packets")

This probably broke every architecture that has its own
arch/<arch>/include/uapi/asm/socket.h that does not include
include/uapi/asm-generic/socket.h :-(

I have used the net-next tree from next-20170519 for today.  

I've just pushed the following, thanks for the report:

Looks good except:

quoted

diff --git a/arch/parisc/include/uapi/asm/socket.h b/arch/parisc/include/uapi/asm/socket.h
index 5147018..784b871 100644
--- a/arch/parisc/include/uapi/asm/socket.h
+++ b/arch/parisc/include/uapi/asm/socket.h

@@ -97,4 +97,6 @@
 
 #define SO_COOKIE		0x4032
 
+#define SCM_TIMESTAMPING_PKTINFO	58

Does this need to be 0x4033 (or something)?

Good catch, I'll fix this up!