From patchwork Tue May 30 04:19:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 100534 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp1942659vqr; Mon, 29 May 2023 22:13:50 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6dIXEoUDdYcV/QN+leftWHIm1gahOITwSgjacC8DJ9glBnb5PZV/Qp7/rJZh/2QN27DfNN X-Received: by 2002:a17:902:ce84:b0:1af:cbdb:9772 with SMTP id f4-20020a170902ce8400b001afcbdb9772mr1544573plg.18.1685423630263; Mon, 29 May 2023 22:13:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685423630; cv=none; d=google.com; s=arc-20160816; b=OKblCVOctrpFSGVhXod8/qT0sJmaC6CLSPvNwc+HQ5kqGg0qzC6mEDqdZ5swv0zi7C 9rSNshJ5u7/IOymFop7u2a/rcKszTWEG3Rj+zENceRlS4OywHgBmkDhvjGcOITpJyqIL jrfUH95UMKXlGGDI1jJXKlWMwdDGhl8dvbNt5EjLAzbvEqLkL5HmaZR2hvlCIG+jBNVw aeqrePXv59vOCKQvehzLHMpvzncqcOSPtY6p5frRm9BEjMj5bj4Hf8V7U5qvtjefw8GW UX62ZHEWKapq7mziTWjukOyBMg52djqEmOSK5RiymwvrKFJGH+mhSiIUA/pVNnCf5BlD nMDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=IgPFSWN81Jg+HN5A3WReGjNgtUf7bYaVyzuBPljjy44=; b=SWYyktFfgKtOTPwh/NLIvR+dxfeIhCxoLm/4K7cfIwY8Jm+X9bnfjZSeMgiSclrAVu wrmXu+MnFU076Tiwos1etAnDc/00dq98WmRMlA3McJsOFY77OGsgWMVoZsIL1SbFlwb7 v1+KMgiOTdF1bGQheU3lerocSul+594/DYKi7LuEIfXY61UT3FCQlP7sdBj3CAnQdCt+ aT47IwxscclIkJH32n0EqP3l9ZGXAwQM+KaU2/62NwwvLS7ZNotBTU3UO9KnR7Cw9LDm YzJ3tI8LXoR8yL4sPE/DR773CijydPTrtfjmwI/vz2coXMYelq+oEM017I4WocDESCKR iPVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=s+q4HRV6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x21-20020a170902821500b001aafc97feb0si6607489pln.174.2023.05.29.22.13.38; Mon, 29 May 2023 22:13:50 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=s+q4HRV6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229998AbjE3ET2 (ORCPT + 99 others); Tue, 30 May 2023 00:19:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229486AbjE3ETZ (ORCPT ); Tue, 30 May 2023 00:19:25 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D0954E4; Mon, 29 May 2023 21:19:23 -0700 (PDT) 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 4QVfKw1znBz4x1f; Tue, 30 May 2023 14:19:16 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1685420358; bh=IgPFSWN81Jg+HN5A3WReGjNgtUf7bYaVyzuBPljjy44=; h=Date:From:To:Cc:Subject:From; b=s+q4HRV6NN72WOgKgYWC90pj89yF6JZMkGlK0W1VfDaXw9ovUwOXxfquF3+remO16 5+ISrGJMw6FUisv6Uo5BHR6YVKqzVrYcV+s0/puwwWU3TDRKCsHHBVgHohfoY9LCjp W+bHj1Ab9Gr08KrThcbIHnPr8zwD2STjyd/ND3UZvbHpo8cA7nrUvlMI5PDmQXyxdU 7VqZG6fnvWeOnN7H71jBP0ez1G27Ic4mh6CU344VXFFHxeCipdOWPCJTVqUFbKINTO 4323wmhdh0dKPd9RapX6xEhUraNmqFNOg/k9g3DhI3tyXR9jtr5XApUUotqNFP12gp iropQiUKqLP6g== Date: Tue, 30 May 2023 14:19:14 +1000 From: Stephen Rothwell To: Bartosz Golaszewski , Olof Johansson , Arnd Bergmann Cc: ARM , Andrew Davis , Bartosz Golaszewski , Linus Walleij , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree Message-ID: <20230530141914.672a8e59@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767294768223813905?= X-GMAIL-MSGID: =?utf-8?q?1767294768223813905?= Hi all, Today's linux-next merge of the gpio-brgl tree got a conflict in: drivers/gpio/gpio-twl4030.c between commit: d5f4fa60d63a ("ARM/gpio: Push OMAP2 quirk down into TWL4030 driver") from the arm-soc tree and commit: fbc8ab2ccd85 ("gpio: twl4030: Use devm_gpiochip_add_data() to simplify remove path") from the gpio-brgl 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/gpio/gpio-twl4030.c index 446599ac234a,3708ed2314e8..000000000000 --- a/drivers/gpio/gpio-twl4030.c