linux-kernel - Re: linux-next: manual merge of the mfd tree with the i2c 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-prev] [day] [month] [year] [list]

Message-ID: <20220817044839.u6vdsyqf34njbu56@pengutronix.de>
Date:   Wed, 17 Aug 2022 06:48:39 +0200
From:   Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
To:     Lee Jones <lee@...nel.org>, Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Wolfram Sang <wsa@...-dreams.de>,
        Andy Shevchenko <andriy.shevchenko@...ux.intel.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the mfd tree with the i2c tree

On Wed, Aug 17, 2022 at 11:08:45AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the mfd tree got a conflict in:
> 
>   drivers/mfd/intel_soc_pmic_core.c
> 
> between commit:
> 
>   ed5c2f5fd10d ("i2c: Make remove callback return void")
> 
> from the i2c tree and commit:
> 
>   8a8cf3dc6419 ("mfd: intel_soc_pmic_crc: Merge Intel PMIC core to crc")
> 
> from the mfd tree.
> 
> I fixed it up (I removed the 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.

The fixup looks right.

@Lee: There is an immutable tag that can be merged into your tree to
resolve the conflict before you send your changes to Linux at

	https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/make_remove_callback_void-immutable

@Stephen: Thanks for your fixes, here and in the input tree.

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)