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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20190701171524.774dfc75@canb.auug.org.au>
Date:   Mon, 1 Jul 2019 17:15:24 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
        "H. Peter Anvin" <hpa@...or.com>,
        Peter Zijlstra <peterz@...radead.org>,
        Guenter Roeck <linux@...ck-us.net>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Fabian Schindlatz <fabian.schindlatz@....de>,
        Len Brown <len.brown@...el.com>
Subject: linux-next: manual merge of the tip tree with the hwmon-staging
 tree

Hi all,

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.

-- 
Cheers,
Stephen Rothwell

Content of type "application/pgp-signature" skipped