From patchwork Mon Feb 6 00:21:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13129180 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 2CB1EC636CC for ; Mon, 6 Feb 2023 00:22:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: MIME-Version:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To: References:List-Owner; bh=PugOf/zmhukLmIt8WRmI64sYUJSbu1uRhTti1DorKB8=; b=l2f z2xsrFzFnP1AsHCyhqxeJE5p0lAFOCr8zLOxPKRNE/ySzZAEwgDn3r0B3rR9Dj0uZooXkjHJ0EML8 bWY3DM+m2alZFyMCNqxzSmtnL0xymMkwBcbZgeSOdvssTjPaT9Eub7pdgp8avvacTYLiGMcFzjDxT nYq7eh/sQwzqefkWuFPKtigpoJ07A4VlHp0ik3uve6ZzHyInu3RuxEg8dXa8LRjlncjyBuPFjei9X Epg2PDn1lcsl/v0l0BHKKZ0xcP+ouRSee/xgVeCyLeL44chY8BL8xXGACoaPqVSI665jD6OZwTy18 nZ+/ejrSbvIMsncs8JGiHvXh/qp+6Eg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1pOpGe-0073Jq-ME; Mon, 06 Feb 2023 00:21:56 +0000 Received: from mail.ozlabs.org ([2404:9400:2221:ea00::3] helo=gandalf.ozlabs.org) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1pOpGZ-0073IW-0H for linux-arm-kernel@lists.infradead.org; Mon, 06 Feb 2023 00:21:54 +0000 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 (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4P96Q008SWz4x1f; Mon, 6 Feb 2023 11:21:43 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1675642905; bh=kdSBUm1XzmULWwCbz+MsNw6BwD9DMZRj+DEeYUGV4II=; h=Date:From:To:Cc:Subject:From; b=DN8Ju3eQ0NRl/0/u6o+i5RCg68VN6SMS76jrEXkCYcvY8tcvLxrKs9DeSJxDRmWmo OKuFAHpiHhs0fbnbKsVTT8W4m8Lm3KHG/qG66UB6dDQQ9+FGrOvXmBgEI81ciNhTAR CLd25zQnVB+WPf9hhTlAY+7+b0bHDKugWpeIC8ZyFpLN5+5poN9Dzpq/WLED54qMTG HBmRAB5BfqDWHrsh+VANdUZCgBJb50WxSWYwgy2EHvp/9yTdQXzHJ2ZnMWMiSWzdDd Rer+HibenBRBI+ZppWucyXl/5etHE+3lQ8oTA+4G0XpL9w8tW3VBbjSwn/XE1zBgVe u6j+Pa9HKymfw== Date: Mon, 6 Feb 2023 11:21:43 +1100 From: Stephen Rothwell To: Sebastian Reichel , Olof Johansson , Arnd Bergmann Cc: ARM , Alina Yu , ChiYuan Huang , ChiaEn Wu , Linux Kernel Mailing List , Linux Next Mailing List , Sebastian Reichel Subject: linux-next: manual merge of the battery tree with the arm-soc tree Message-ID: <20230206112143.71d626bd@canb.auug.org.au> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230205_162151_477021_C472F38E X-CRM114-Status: GOOD ( 14.71 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi all, Today's linux-next merge of the battery tree got a conflict in: drivers/power/supply/Makefile between commit: a0f831756b26 ("power: remove s3c adc battery driver") from the arm-soc tree and commits: 4a1a5f6781d8 ("power: supply: rt9471: Add Richtek RT9471 charger driver") 6f7f70e3a8dd ("power: supply: rt9467: Add Richtek RT9467 charger driver") 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. diff --cc drivers/power/supply/Makefile index 8cb3c7f5c111,f8f9716d3ba4..000000000000 --- a/drivers/power/supply/Makefile