From nobody Wed Dec 17 12:44:13 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6C43FEE4996 for ; Mon, 21 Aug 2023 02:34:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232541AbjHUCeB (ORCPT ); Sun, 20 Aug 2023 22:34:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44042 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229953AbjHUCeA (ORCPT ); Sun, 20 Aug 2023 22:34:00 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5C2F9C; Sun, 20 Aug 2023 19:33:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1692585237; bh=/oSBrquxZQcW7A+RvZq4mtocbjzgqdS40RYhUrN3v/o=; h=Date:From:To:Cc:Subject:From; b=CeS+wTYD9FFtSoChIIGrkiYW+suecVwJJk/JkipQOsXBP2HvNUf4P1Si/Hb2A46d5 BQekMXji2CbYhViEWVklvjYKBvac22rJJElePagRrDyDTR3sm81sFOYlRUzq+8Pge7 6E4dD9m3VYLWtU9cYiLmNMCXhtA1PNIYVQOBtE/EX0R/SKV5ZzTY+IAHCJ3TK9meX/ A5VCVaxqnbXqW8gQfY5gtLhdFDDHf11k4OFoZdsw0qO6KdGAAdg1ajJnxrctNLPrt7 V+wDxdDPhIq6h7SJAmmL03crBhzvUnHCBpwsDKBPAYC3oUZ68gfsxtfYAYl7stqXBA 4t9AaRk9yxQkw== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RTc446Plwz4wxy; Mon, 21 Aug 2023 12:33:56 +1000 (AEST) Date: Mon, 21 Aug 2023 12:33:54 +1000 From: Stephen Rothwell To: Sebastian Reichel , Lee Jones Cc: Jakob Hauser , Linux Kernel Mailing List , Linux Next Mailing List , Rob Herring , Sebastian Reichel Subject: linux-next: manual merge of the battery tree with the mfd tree Message-ID: <20230821123354.4d2684ca@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/Nkahc+Q4.5YAU6na9ej6+Tw"; protocol="application/pgp-signature"; micalg=pgp-sha256 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --Sig_/Nkahc+Q4.5YAU6na9ej6+Tw Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Hi all, Today's linux-next merge of the battery tree got a conflict in: drivers/power/supply/rt5033_charger.c between commit: 12cc585f36b8 ("power: supply: rt5033_charger: Add cable detection and USB= OTG supply") from the mfd tree and commit: 2ce8284c3115 ("power: Explicitly include correct DT includes") from the battery tree. I fixed it up (see below) 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. --=20 Cheers, Stephen Rothwell diff --cc drivers/power/supply/rt5033_charger.c index e0303ca5a8db,c0c516f22c66..000000000000 --- a/drivers/power/supply/rt5033_charger.c +++ b/drivers/power/supply/rt5033_charger.c @@@ -6,11 -6,8 +6,11 @@@ * Author: Beomho Seo */ =20 + #include +#include +#include #include +#include - #include #include #include #include --Sig_/Nkahc+Q4.5YAU6na9ej6+Tw Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmTizRIACgkQAVBC80lX 0Gz6YQf/YUUVV7LP+8uW16ElnzJufoSV7OfgThC55ZCxIajymp6hRSdfjmqZlOG1 ra2sutXWxIC+gx+HLVPb6eKTQriBaYCRRzy3cyNlyLWKvusrJKE2wqLNICjYtxrG HGm4tsTO4sSKKTrFSwfUSlI+nfDYgTw48E8rnOGjjYTsdkwpoPm+pUlB6GvAoFys JXB20Pn4vLgpyX20mktvCo6A0aUjFstPsLA4l5eGZDOW1bS40nE3RmUXsA+OsbIx f3/RwA3djcA1doR8IAZofxEPbe9SF/eHJ14xgGwApOrV363ymJ9Pesn8SVw8lZza tsIz631K4BflUMCqu2BJJfnhS6mxDA== =sNfb -----END PGP SIGNATURE----- --Sig_/Nkahc+Q4.5YAU6na9ej6+Tw--