Hi Randy,
Today's linux-next merge of the rd-docs tree got a conflict in
Documentation/networking/timestamping/Makefile between commit
8fe2f761cae9 ("net-timestamp: expand documentation") from the net-next
tree and commits 429cbe7863ad ("Documentation: use subdir-y to avoid
unnecessary built-in.o files") and b07a884ea14d ("Documentation: add
makefiles for more targets") from the rd-docs tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
diff --cc Documentation/networking/timestamping/Makefile
index 95e239c70076,52ac67da9315..000000000000
--- a/Documentation/networking/timestamping/Makefile
+++ b/Documentation/networking/timestamping/Makefile
@@@ -1,20 -1,8 +1,14 @@@
+# To compile, from the source root
+#
+# make headers_install
+# make M=documentation
+
- # kbuild trick to avoid linker error. Can be omitted if a module is built.
- obj- := dummy.o
-
# List of programs to build
- hostprogs-y := timestamping txtimestamp hwtstamp_config
-hostprogs-y := hwtstamp_config timestamping
++hostprogs-y := hwtstamp_config timestamping txtimestamp
# Tell kbuild to always build the programs
always := $(hostprogs-y)
HOSTCFLAGS_timestamping.o += -I$(objtree)/usr/include
+HOSTCFLAGS_txtimestamp.o += -I$(objtree)/usr/include
HOSTCFLAGS_hwtstamp_config.o += -I$(objtree)/usr/include
-
- clean:
- rm -f timestamping txtimestamp hwtstamp_config
Attachment:
signature.asc
Description: PGP signature
