Message ID | 20231019160616.55eac2b8@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2010:b0:403:3b70:6f57 with SMTP id fe16csp165741vqb; Wed, 18 Oct 2023 22:06:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEvAHZoc6dqZPMRBbarNbD99rcyKU3JMYzkGvoc3gXEmhDdnkpsb/yKtEzZK0uAjCyY7+wl X-Received: by 2002:a17:902:c942:b0:1c0:9d6f:9d28 with SMTP id i2-20020a170902c94200b001c09d6f9d28mr1388576pla.11.1697691998543; Wed, 18 Oct 2023 22:06:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697691998; cv=none; d=google.com; s=arc-20160816; b=dAej3QmvBZwwyM9waWB/9wo63F3IIDu/oLwSlg9GxIsIRLw63K2/ZGubgPHUPZ0eWx RC6PwAKPrhiLvCRPex9R5UnnKM58nY020viAiK2ktCpjaYZfGGoOg2wUTySDvsPUNx1Q WWGJPN7rMMjHuGgzE0pg7UF3kE/qMyMqTsiNiNGFaxhL466O6/CA1EMuM139nJUU8s+X CHtfc+zfVtm3fM5+e4JkVNXjB+4F7swOv9loEfI66dYzlxqxErhnGcszXa15lD1ZtyK1 QnVtgYBiBZLS2VOEbYzRVt046s1oOgzU1/t8BHFZ7LbXzl0fHUfCt0izo87sARI04+sD graQ== 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=N8IuZt5BMmOQpNcf4OCrWamIx0I7KgYeX3TNRQ2Tf5s=; fh=frk1Iv7BEU/meXwkU2I5lzJH/Q/TsWiptPn+LBCmqAg=; b=t/8FwcxMJuR2qmzaAEmQrcFWQBgZzPPrEvYONZLC97Aukmw6rcQzGdoW1X1AKwlMRh l7KVX93AMb7ncr76LC4H7uxlBUyOdWuRtUHVYRqEx8mso/LN2iQVePnUBChH0tN2QpJ6 jhJNsBjcP3hsEOwnEG7SNKOhETYMPn3wtHJAVerYSFaxFvK1kuN6A5jfpooW4dygLtv3 siM+GEwkrT28tktNYQapiCx4QyyaRgAsTJs1NCNMrurFSDMfvBseok1ziXC7oV70nmvi Qf0bOPZYSXeFKmhPmrsXrEC7OWr10r7H2J7agAtCiVOhUc1eaNsE9e3q/Or/f6o01R47 odPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=RbAs9QtC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id c1-20020a170902d48100b001b8904eadb8si1522389plg.460.2023.10.18.22.06.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Oct 2023 22:06:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=RbAs9QtC; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id CB84D8181BBB; Wed, 18 Oct 2023 22:06:35 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232587AbjJSFG0 (ORCPT <rfc822;zwp10758@gmail.com> + 24 others); Thu, 19 Oct 2023 01:06:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231421AbjJSFGY (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 19 Oct 2023 01:06:24 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 265BA114; Wed, 18 Oct 2023 22:06:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1697691978; bh=N8IuZt5BMmOQpNcf4OCrWamIx0I7KgYeX3TNRQ2Tf5s=; h=Date:From:To:Cc:Subject:From; b=RbAs9QtCtLGs9RG252YUq2KVlXSlhBRRxIcankrKD9QWCfSJnO4dyNX/oWnFeokwh xt8o3sxeS2+jr334wPhYPOb6pmJh6ksFfJ3SEAlDKXjGN+/FpYXjP+lP1u4exx3Ebu YW9I5uIR/tSm++v9XK8ZaDjcfDocADjKK5aETJX9YCQmBMXeCPr44oCbrWEYHuzV3O z6/QqwMQMl2imOlkPgB1da2Oe6hGc7HeCmL3lvY5G/swcLpD2yOhkEb5Yi5bErUA73 4UCpPBJ2iSw7Hwq/IFyc6Cd03sitgeK2qdEwKXx2ltc2iIN5MsnXJTOJVQxbs4p0DW MRT3QomfyRRAA== 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 X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4S9wff3xNrz4xMC; Thu, 19 Oct 2023 16:06:18 +1100 (AEDT) Date: Thu, 19 Oct 2023 16:06:16 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Bartosz Golaszewski <brgl@bgdev.pl> Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>, Haibo Chen <haibo.chen@nxp.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org>, Peng Fan <peng.fan@nxp.com> Subject: linux-next: manual merge of the gpio-brgl tree with the gpio-brgl-fixes tree Message-ID: <20231019160616.55eac2b8@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/gKMLqWJsE9g7n6NH+h6h7wc"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 18 Oct 2023 22:06:35 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780159084739521313 X-GMAIL-MSGID: 1780159084739521313 |
Series |
linux-next: manual merge of the gpio-brgl tree with the gpio-brgl-fixes tree
|
|
Commit Message
Stephen Rothwell
Oct. 19, 2023, 5:06 a.m. UTC
Hi all, Today's linux-next merge of the gpio-brgl tree got a conflict in: drivers/gpio/gpio-vf610.c between commit: fc363413ef8e ("gpio: vf610: set value before the direction to avoid a glitch") from the gpio-brgl-fixes tree and commit: b57587f11f81 ("gpio: vf610: simplify code by dropping data check") 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.
Comments
On Thu, 19 Oct 2023 at 07:06, Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Hi all, > > Today's linux-next merge of the gpio-brgl tree got a conflict in: > > drivers/gpio/gpio-vf610.c > > between commit: > > fc363413ef8e ("gpio: vf610: set value before the direction to avoid a glitch") > > from the gpio-brgl-fixes tree and commit: > > b57587f11f81 ("gpio: vf610: simplify code by dropping data check") > > 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc drivers/gpio/gpio-vf610.c > index 656d6b1dddb5,a89ae84a1fa0..000000000000 > --- a/drivers/gpio/gpio-vf610.c > +++ b/drivers/gpio/gpio-vf610.c > @@@ -126,9 -140,7 +140,9 @@@ static int vf610_gpio_direction_output( > unsigned long mask = BIT(gpio); > u32 val; > > + vf610_gpio_set(chip, gpio, value); > + > - if (port->sdata && port->sdata->have_paddr) { > + if (port->sdata->have_paddr) { > val = vf610_gpio_readl(port->gpio_base + GPIO_PDDR); > val |= mask; > vf610_gpio_writel(val, port->gpio_base + GPIO_PDDR); Thanks Stephen, this is correct. My for-next tree is currently rebased on top of v6.6-rc1 while the fixes tree tracks Linus' master. Once the fixes are upstream, I may just rebase my for-next tree. Bart
diff --cc drivers/gpio/gpio-vf610.c index 656d6b1dddb5,a89ae84a1fa0..000000000000 --- a/drivers/gpio/gpio-vf610.c