linux-kernel - Re: linux-next: manual merge of the battery 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220912073455.rlqf6q4rsgydk46h@pengutronix.de>
Date:   Mon, 12 Sep 2022 09:34:55 +0200
From:   Uwe Kleine-König <u.kleine-koenig@...gutronix.de>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Sebastian Reichel <sre@...nel.org>,
        Wolfram Sang <wsa@...-dreams.de>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        Wolfram Sang <wsa@...nel.org>
Subject: Re: linux-next: manual merge of the battery tree with the i2c tree

Hello,

On Mon, Sep 12, 2022 at 01:03:44PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the battery tree got a conflict in:
> 
>   drivers/power/supply/cw2015_battery.c
> 
> between commit:
> 
>   ed5c2f5fd10d ("i2c: Make remove callback return void")
> 
> from the i2c tree and commit:
> 
>   ed5c2f5fd10d ("i2c: Make remove callback return void")
> 
> from the battery tree.

The commit from the battery tree is

	0cb172a4918e ("power: supply: cw2015: Use device managed API to simplify the code")

> I fixed it up (the latter removed the code modified by the former, so
> I just did that)

I don't see today's tag in git yet, but removing the code sounds right.

> 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.

@Sebastian: You might want to pull

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

into your tree to prepare a smooth merging experience for Linus.

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)