linux-kernel - linux-next: manual merge of the staging tree with the jc

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>] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 9 Jun 2015 21:26:49 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Jonathan Corbet <corbet@....net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Roberta Dobrescu <roberta.dobrescu@...il.com>,
	Jonathan Cameron <jic23@...nel.org>,
	Pali Rohár <pali.rohar@...il.com>
Subject: linux-next: manual merge of the staging tree with the jc_docs tree

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
tools/Makefile between commit b3fd7368f8f6 ("Move freefall program from
Documentation/ to tools/") from the jc_docs tree and commit
53375103eae8 ("tools: iio: Add iio targets in tools Makefile") from the
staging 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 tools/Makefile
index b113078fb7ad,79463b00b81e..000000000000
--- a/tools/Makefile
+++ b/tools/Makefile
@@@ -129,11 -113,8 +130,12 @@@ turbostat_clean x86_energy_perf_policy_
  tmon_clean:
  	$(call descend,thermal/tmon,clean)
  
 +freefall_clean:
 +	$(call descend,laptop/freefall,clean)
 +
  clean: acpi_clean cgroup_clean cpupower_clean hv_clean firewire_clean lguest_clean \
  		perf_clean selftests_clean turbostat_clean usb_clean virtio_clean \
- 		vm_clean net_clean x86_energy_perf_policy_clean tmon_clean freefall_clean
 -		vm_clean net_clean iio_clean x86_energy_perf_policy_clean tmon_clean
++		vm_clean net_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
++		freefall_clean
  
  .PHONY: FORCE

Content of type "application/pgp-signature" skipped