On Sun, May 21, 2017 at 9:16 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > Hi all, > > 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 :-( Indeed. I added the architecture specific versions in patch http://patchwork.ozlabs.org/patch/765238/ That fixes the powerpc build for me. The new option is now defined in every file that also defines the last added such option SCM_TIMESTAMPING_OPT_STATS. Apologies for missing this earlier. -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html