linux-kernel - linux-next: Tree for Jan 03

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>] [day] [month] [year] [list]

Message-ID: <20230103183909.dfhjtwsxaedfe3p4@pengutronix.de>
Date:   Tue, 3 Jan 2023 19:39:09 +0100
From:   Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
To:     Linux Next Mailing List <linux-next@...r.kernel.org>
Cc:     Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        kernel@...gutronix.de, Daniel Lezcano <daniel.lezcano@...nel.org>,
        "Rafael J. Wysocki" <rafael.j.wysocki@...el.com>,
        Joel Stanley <joel@....id.au>, Vlastimil Babka <vbabka@...e.cz>
Subject: linux-next: Tree for Jan 03

Hello,

after Vlastimil's report in reply to my next tree from 2022-12-26 I was
curious where the problem was. (My best guess so far is PEBKAC. (i.e. my
keyboard and my chair) So I slightly improved my script and created a
tree for today.

Only the following two conflicts happend:

 - In arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts between

        git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master
        62d127eeac27 ("ARM: dts: nuvoton,wpcm450-supermicro-x9sci-ln4f: Add GPIO line names")

   and

        https://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc for-next
        220a041d4cca ("ARM: dts: nuvoton,wpcm450-supermicro-x9sci-ln4f: Add GPIO line names")

   which is a problem because both commits are the same but not
   identical and the second tree has some more commits touching the
   file. (This one already happend for next-20221226.)

 - In drivers/thermal/intel/int340x_thermal/processor_thermal_device.c
   and drivers/thermal/intel/x86_pkg_temp_thermal.c between

   	git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/linux-next
	58374a3970a0 thermal/x86_pkg_temp_thermal: Add support for handling dynamic tjmax
	983eb370cb87 thermal/x86_pkg_temp_thermal: Use Intel TCC library
	d91a4714e54e thermal/int340x/processor_thermal: Use Intel TCC library

   and

	git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/linux-next
	03b2e86a24aa thermal/drivers/intel: Use generic thermal_zone_get_trip() function
	e503a68ebfe3 thermal/intel/int340x: Replace parameter to simplify

   I looked at the conflict only shortly and failed to find the right
   resolution. So I skipped merging the thermal tree.

The conflicts in mm/ are gone, so still don't know why I failed there
last year.

The resulting tree is available from

	https://git.pengutronix.de/git/ukl/linux tags/next-20230103

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)