From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Jonathan Corbet" <corbet@lwn.net>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
"Roberta Dobrescu" <roberta.dobrescu@gmail.com>,
"Jonathan Cameron" <jic23@kernel.org>,
"Pali Rohár" <pali.rohar@gmail.com>
Subject: Re: linux-next: manual merge of the staging tree with the jc_docs tree
Date: Tue, 9 Jun 2015 08:06:07 -0700 [thread overview]
Message-ID: <20150609150607.GA17805@kroah.com> (raw)
In-Reply-To: <20150609212649.7517567c@canb.auug.org.au>
On Tue, Jun 09, 2015 at 09:26:49PM +1000, Stephen Rothwell wrote:
> 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
Looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2015-06-09 15:06 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-09 11:26 linux-next: manual merge of the staging tree with the jc_docs tree Stephen Rothwell
2015-06-09 15:06 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-09-24 2:50 Stephen Rothwell
2018-09-24 5:17 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150609150607.GA17805@kroah.com \
--to=greg@kroah.com \
--cc=corbet@lwn.net \
--cc=jic23@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=pali.rohar@gmail.com \
--cc=roberta.dobrescu@gmail.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.