lkml.org 
[lkml]   [2015]   [Jun]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-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@canb.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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2015-06-09 13:41    [W:0.041 / U:0.072 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site