* linux-next: manual merge of the staging tree with the jc_docs tree
@ 2018-09-24 2:50 Stephen Rothwell
2018-09-24 5:17 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2018-09-24 2:50 UTC (permalink / raw)
To: Greg KH, Jonathan Corbet
Cc: Linux-Next Mailing List, Linux Kernel Mailing List,
Henrik Austad, Vladimir Zapolskiy
[-- Attachment #1: Type: text/plain, Size: 773 bytes --]
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
Documentation/filesystems/00-INDEX
between commit:
a7ddcea58ae2 ("Drop all 00-INDEX files from Documentation/")
from the jc_docs tree and commit:
a779df303b05 ("Documentation: filesystems: remove reminiscences of POHMELFS")
from the staging tree.
I fixed it up (I just removed the file) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging. You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the staging tree with the jc_docs tree
2018-09-24 2:50 linux-next: manual merge of the staging tree with the jc_docs tree Stephen Rothwell
@ 2018-09-24 5:17 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2018-09-24 5:17 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jonathan Corbet, Linux-Next Mailing List,
Linux Kernel Mailing List, Henrik Austad, Vladimir Zapolskiy
On Mon, Sep 24, 2018 at 12:50:16PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> Documentation/filesystems/00-INDEX
>
> between commit:
>
> a7ddcea58ae2 ("Drop all 00-INDEX files from Documentation/")
>
> from the jc_docs tree and commit:
>
> a779df303b05 ("Documentation: filesystems: remove reminiscences of POHMELFS")
>
> from the staging tree.
>
> I fixed it up (I just removed the file) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
Resolution looks good, thanks!
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the staging tree with the jc_docs tree
2015-06-09 11:26 Stephen Rothwell
@ 2015-06-09 15:06 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2015-06-09 15:06 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Jonathan Corbet, linux-next, linux-kernel, Roberta Dobrescu,
Jonathan Cameron, Pali Rohár
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the staging tree with the jc_docs tree
@ 2015-06-09 11:26 Stephen Rothwell
2015-06-09 15:06 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2015-06-09 11:26 UTC (permalink / raw)
To: Greg KH, Jonathan Corbet
Cc: linux-next, linux-kernel, Roberta Dobrescu, Jonathan Cameron,
Pali Rohár
[-- Attachment #1: Type: text/plain, Size: 1207 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-09-24 5:17 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-24 2:50 linux-next: manual merge of the staging tree with the jc_docs tree Stephen Rothwell
2018-09-24 5:17 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2015-06-09 11:26 Stephen Rothwell
2015-06-09 15:06 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).