Re: linux-next: manual merge of the tip tree with the hwmon-staging tree

[Stephen Rothwell <sfr@canb.auug.org.au>]

[-- Attachment #1: Type: text/plain, Size: 1060 bytes --]

Hi all,

On Mon, 1 Jul 2019 17:15:24 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the tip tree got a conflict in:
> 
>   drivers/hwmon/coretemp.c
> 
> between commit:
> 
>   601fdf7e6635 ("hwmon: Correct struct allocation style")
> 
> from the hwmon-staging tree and commit:
> 
>   835896a59b95 ("hwmon/coretemp: Cosmetic: Rename internal variables to zones from packages")
> 
> from the tip tree.
> 
> I fixed it up (the comment fixed in the latter was also fixed in the
> former) 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.

I am still getting this conflict (the commit ids may have changed).
Just a reminder in case you think Linus may need to know.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]