| Message ID | 20230504134140.186048-1-broonie@kernel.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp345005vqo;
Thu, 4 May 2023 07:07:22 -0700 (PDT)
X-Google-Smtp-Source:
ACHHUZ4gwFSnshZ4Jc5DxRPkuW3Xi88O1Xcv0GS80mCVkxt94kUw+5dnmcd0euCkd+w53XfzHZ+a
X-Received: by 2002:a17:90a:602:b0:24d:d377:d1 with SMTP id
j2-20020a17090a060200b0024dd37700d1mr2275444pjj.45.1683209242230;
Thu, 04 May 2023 07:07:22 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1683209242; cv=none;
d=google.com; s=arc-20160816;
b=J1R/QxFnJdpfCu3mCKdlMDg7mPxB35G0ee8psrXdfG4GIhk8pmv7EE8bj2FWseQpK+
YkFQiCvdxku/o65/tiw2oDkD0kEKjrVN+NooudmB3easp6WwLje7zfm0x58zBmJmC4Ps
U6tSVxYlewhiBKxfWmcdsMdXxqmV5tJOXEvK6JdyZoPaoAFE4BM/S+UPvC3b4Gr8B1tT
CWuZq6R8Oq6Z/IhbBDoa/nd0txRhtm5xUjsFU3lQssQeFrDf3PWGWeDvbDRPGQWCg+tm
K8DVFbQUMGyaqQ4lPZx7kyf5Ms0ZzUvyqp4/9MJUkDm4ebf83OipiD4OwQ8atOQ9Cp07
dMiA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:message-id:date:subject:cc:to:from:dkim-signature;
bh=cXWeTMkIb4Le9ichM6r8K2vDtz9GOAmGBXUXjdomWOw=;
b=R2SQRsHmHjx64W7UWI5am8m2OZBpfE4YvKideMcc3G4iPT3DbwJiEtORh1HE5XaksM
ya5vEQD5qlc0SYVPvxqHE/rztX4oL4muolQCuV5O6l7zOOKZVHFAzbUEMYyqwqbmYkhN
Jn7St9UedWnvglI02Qabuz7HVgvWwezCKixT9MdQymSJqF1P9S8X9WYySh6fIK+DRXNt
u94nYII+DjNRqVt/tHkAVDuX4a6EnhdDgEXLpUojeWWJd2A+/SNyWv6rZq+UYV3xXj1O
hqMpRQy96SjoNj0dLMcV2cwynjBrYA1DkoVl+iixuZmDtFq2txciHUi5HT70U7ySKnX6
QlvQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Exl+J+Ig;
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=kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
w4-20020a656944000000b0050aad8e18a5si35582228pgq.545.2023.05.04.07.06.47;
Thu, 04 May 2023 07:07:22 -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=@kernel.org header.s=k20201202 header.b=Exl+J+Ig;
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=kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S229993AbjEDNly (ORCPT <rfc822;b08248@gmail.com> + 99 others);
Thu, 4 May 2023 09:41:54 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33114 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229620AbjEDNlw (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 4 May 2023 09:41:52 -0400
Received: from dfw.source.kernel.org (dfw.source.kernel.org
[IPv6:2604:1380:4641:c500::1])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 913F5768B;
Thu, 4 May 2023 06:41:51 -0700 (PDT)
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by dfw.source.kernel.org (Postfix) with ESMTPS id 2E91C633EA;
Thu, 4 May 2023 13:41:51 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 312F5C433EF;
Thu, 4 May 2023 13:41:49 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1683207710;
bh=DJDo6blJUyZ26jvRtQx9meMVm9Jm3+X/4QmZCdg0Ekg=;
h=From:To:Cc:Subject:Date:From;
b=Exl+J+Ig2oThnjhMbmVk+ai7bDV2T+mfWcPcfgu08ST3bSqf1UFBeIbIxZ+LE6JLN
jPyVQbkzU5GuiqI8c6ePQbDRWphDyRY1s4B5DcTix367JzPAxNfN5cJmTh1MxCO9ax
0K6vIzf2wSTyPpp5djPE/YtvcjnbLITk02cUIVnzjRhquMcP+sRViH7vz7r8t2pXrG
0QuBIGy9Pt/T7D5g5/rVvsPWRRTClv1GHjbuP+KmTHTxZw83rKF5MV8ndgnS0Dgdo4
AKti65oXK/XDYUgeKfgjyOMjtFsZr7d0VSSGaO/GN7yqKr04Kq6glq08DBdETN4YDx
wv2kp9FR12QPg==
From: Mark Brown <broonie@kernel.org>
To: Linus Walleij <linus.walleij@linaro.org>
Cc: Hans Verkuil <hverkuil-cisco@xs4all.nl>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the pinctrl tree with the origin tree
Date: Thu, 4 May 2023 22:41:40 +0900
Message-Id: <20230504134140.186048-1-broonie@kernel.org>
X-Mailer: git-send-email 2.39.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1764972491493218523?=
X-GMAIL-MSGID: =?utf-8?q?1764972814529420743?=
|
| Series |
linux-next: manual merge of the pinctrl tree with the origin tree
|
|
Commit Message
Mark Brown
May 4, 2023, 1:41 p.m. UTC
Hi all,
Today's linux-next merge of the pinctrl tree got a conflict in:
drivers/pinctrl/pinctrl-at91-pio4.c
between commit:
348551ddaf311 ("Merge tag 'pinctrl-v6.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl")
from the origin tree and commit:
b7badd752de05 ("pinctrl-bcm2835.c: fix race condition when setting gpio dir")
from the pinctrl 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.
+++ b/drivers/pinctrl/pinctrl-at91-pio4.c
diff --cc drivers/pinctrl/pinctrl-at91-pio4.c index 2fe40acb6a3e5,e40487be20386..0000000000000 --- a/drivers/pinctrl/pinctrl-at91-pio4.c