linux-kernel - linux-next: manual merge of the rd-docs tree with the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Mon, 8 Sep 2014 17:59:13 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Randy Dunlap <rdunlap@...radead.org>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>,
	Peter Foley <pefoley2@...oley.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Willem de Bruijn <willemb@...gle.com>
Subject: linux-next: manual merge of the rd-docs tree with the net-next tree

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@...b.auug.org.au

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

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)