From patchwork Thu May 4 13:42:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 90092 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp339679vqo; Thu, 4 May 2023 07:02:14 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4scK4LROeHxf0YnrPkFAWr+I180CdVua3o2AtSk4vr9LYGjPsSzlMB9sBHXmBdpW3ooWxm X-Received: by 2002:a05:6a20:4292:b0:f2:b01b:af93 with SMTP id o18-20020a056a20429200b000f2b01baf93mr3097388pzj.27.1683208934171; Thu, 04 May 2023 07:02:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683208934; cv=none; d=google.com; s=arc-20160816; b=GihZUd2o9aSJiuO2bCobwTE0C4+2e7veCd6MHZMWbWxbcWrQYMEca014FMJSDjbsbQ y7I2U2sVj/iA7B4OiLpYdtWhBkRt1ReEktbz6vRv6hVFMrHUnjHvG80UQRt2s20MKsW6 9YvsBcm1TFFlM2C9ymgfCER7qasKhxefVYn4UWC1aeBLR0/LwscmQt3LCDYeaRbodR+f k73DZ8wYx/rZldM1+Lc4jWCzkvM/svOfbQg9820NI8kHZ9fV+olh15eFFVUWQUcEFFGE T1PiwfEymDcfFKJ0P2WNWx86UIqTuMYYKRtiiThzFwZzGcIkJYvb2DxC7Pr5Ts5CSML8 +vsQ== 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=H3bSV5rk5b1iD3MIRwByPqNu+LyaDu04tneZEYflKmRo7jlMRYv7AJwgeAuUHJhIdk dsFT4g/sIbQFXInGfhjXJplXakbW4SKVPqg8qu1lkGvGGpqJtrxaW3+10pJj5r8qURoV ugUplMrweZpoazUTzNtAjs1WrifVixUVE9fLmGry2v9/CoY2866yXA+tctW8C6VC76QX Xe1uO4CJT5sU4xBk6aKLwlmx5B+RNp368BzZXW9cmbDonUtro8UpbWJNCP1MGDliXk6E MVXbfye5Wq/K3cuzxAhRFkDCg+h/fGsRbdgrpAYj9CIn7b1gI7DT2paPiOQ2zu9HKBWH o7JQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=K7WCZbk0; 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 n7-20020a6543c7000000b00528948f640bsi18643189pgp.12.2023.05.04.07.01.59; Thu, 04 May 2023 07:02:14 -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=K7WCZbk0; 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 S230309AbjEDNmO (ORCPT + 99 others); Thu, 4 May 2023 09:42:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229620AbjEDNmM (ORCPT ); Thu, 4 May 2023 09:42:12 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D98E768B; Thu, 4 May 2023 06:42:09 -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 43FC2633EA; Thu, 4 May 2023 13:42:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4FD42C433EF; Thu, 4 May 2023 13:42:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683207728; bh=DJDo6blJUyZ26jvRtQx9meMVm9Jm3+X/4QmZCdg0Ekg=; h=From:To:Cc:Subject:Date:From; b=K7WCZbk05LdBU7Mm8SvHu9/VME46qPKNTwgovgONGZSUIAPjcohAxAF1ddbyQ/wnF QQ26ZGWF6i5GWVVi+VB98mI/XoEpD2uDAeGlzKrVLyaop8T0slwn6cU9RPR0chFLZC W6eI+a1BubMO+EJeU1JtOOj9rxceBWFDXLXmbLvIYr8cnkFkJwQtk1iYyOyPfga40d 1XZHsx9SLa87I7ACime5MCUcNvc+QYXfPEs5QNIZC8CncpzUBCq0BPce/nDB9E37D8 H1yK7zLQhjvJYV5ISwWza4Y817iugdx2ULX6mhbyAUwrGY+KAex013x6/9Fawm5aQn zMSioXc/9cYGQ== From: Mark Brown To: Linus Walleij Cc: Hans Verkuil , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the pinctrl tree with the origin tree Date: Thu, 4 May 2023 22:42:04 +0900 Message-Id: <20230504134204.186076-1-broonie@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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: 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?1764972491493218523?= 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