From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Zhang Rui <rui.zhang@intel•com>,
Masahiro Yamada <yamada.masahiro@socionext•com>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Amit Kucheria <amit.kucheria@linaro•org>
Subject: Re: linux-next: manual merge of the thermal tree with the kbuild tree
Date: Thu, 3 Jan 2019 09:19:55 +1100 [thread overview]
Message-ID: <20190103091912.4fe2b2da@canb.auug.org.au> (raw)
In-Reply-To: <20181217105715.5da0b389@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1976 bytes --]
Hi all,
On Mon, 17 Dec 2018 10:57:15 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the thermal tree got a conflict in:
>
> drivers/thermal/Kconfig
>
> between commit:
>
> 17815cc6622c ("treewide: surround Kconfig file paths with double quotes")
>
> from the kbuild tree and commit:
>
> 3e8c4d31f8ed ("drivers: thermal: Move various drivers for intel platforms into a subdir")
>
> from the thermal tree.
>
> I fixed it up (I used the thermal tree version of this file and added
> the following merge fix patch) 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.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Mon, 17 Dec 2018 10:54:07 +1100
> Subject: [PATCH] drivers: thermal: fixup for Kconfig string parsing tightening up
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/thermal/intel/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/intel/Kconfig b/drivers/thermal/intel/Kconfig
> index 9c06d4ad7c97..2e013eeb4a1d 100644
> --- a/drivers/thermal/intel/Kconfig
> +++ b/drivers/thermal/intel/Kconfig
> @@ -55,7 +55,7 @@ config INTEL_QUARK_DTS_THERMAL
> underlying BIOS/Firmware.
>
> menu "ACPI INT340X thermal drivers"
> -source drivers/thermal/intel/int340x_thermal/Kconfig
> +source "drivers/thermal/intel/int340x_thermal/Kconfig"
> endmenu
>
> config INTEL_BXT_PMIC_THERMAL
> --
> 2.19.1
I am still applying that patch every day. It could be applied directly
to the thermal tree as it does not depend on the kbuild tree change.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2019-01-02 22:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-16 23:57 linux-next: manual merge of the thermal tree with the kbuild tree Stephen Rothwell
2019-01-02 22:19 ` Stephen Rothwell [this message]
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=20190103091912.4fe2b2da@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=amit.kucheria@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rui.zhang@intel$(echo .)com \
--cc=yamada.masahiro@socionext$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox