From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 439EDC77B73 for ; Tue, 30 May 2023 09:50:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231233AbjE3JuR (ORCPT ); Tue, 30 May 2023 05:50:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59428 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231230AbjE3JuK (ORCPT ); Tue, 30 May 2023 05:50:10 -0400 Received: from mail-yb1-xb36.google.com (mail-yb1-xb36.google.com [IPv6:2607:f8b0:4864:20::b36]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67321CD for ; Tue, 30 May 2023 02:50:09 -0700 (PDT) Received: by mail-yb1-xb36.google.com with SMTP id 3f1490d57ef6-ba86ec8047bso5986699276.3 for ; Tue, 30 May 2023 02:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685440208; x=1688032208; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=mY8EOyPk9m+Ti4ct23oUFQXpV/JvMzGqMlfNe1g256c=; b=GaJVIlA+adxAdqMq+T5cdDZpReTWNDrvP5cvfBA8pPtz91rKqLRqUqQKlOlCgNrMvm U8sKwnIiyu5SETXQHS3UC5iTfqhjFN/BVUoSclrF9NhMUyukD/JgywZZyUbcwuS4MC2E /A127qQQ3i24P2x8I4+FLPjAzRrKKSi8w+Veuqgli9VNCrM0VlvuoTnI27fK9JDkl4QN gDlI/NYcuJ1K1btyiU9CjMhncg5RXig87/iZxcAwbDTlxv920ZbpP19c3AzedMDjJpNT sXlL0xw4/UCq5er3uaXPGnsJxKI3CWwOPUe8j4Lt9+f3u5ZQMhUfSxiDiO577JV3YO4t Vqow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685440208; x=1688032208; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mY8EOyPk9m+Ti4ct23oUFQXpV/JvMzGqMlfNe1g256c=; b=gLuC5RzR3hb26Afu5CZmY4YdnI20Zj8m/bkM6vtsrJMT8jqS1hJV9sIigiF+IY8cqW EWN2SYFtYyLixbWpmViudMJYW3mH9IYAv4Zwjl8Vykcz31zowo+Kk/uDsxcIw0DnMceO fM+yPFCKwJ3O86jBx86zBFRI0wJd79pztz4kbcCYmvd3j1VnTiC2Ih7dgpB0yR7qcivf vs/5oQ4JVrtXjKpF7K/d5XcPJWxMs2OyR2gEqnoxWaYrQv+nQ9LLcGFQ60ZRfe7nE5x5 BQGipoaAqNsG6wVLANX1+aabPmu/RmW/Ngw1xnqC7RioK1zD191F3TtJGeFhiwm54ywT +zZw== X-Gm-Message-State: AC+VfDzR7TbWrYNL95O28gvZVMqPz42qsKuCgjOHWvAEKUbFT5v18Lpk 6jUDIuQnf5DuQY+3vlsCq36b+PKzVJ+q7fgPzucUGg== X-Google-Smtp-Source: ACHHUZ6YbgVeepX0NXhKYfOQl1mZjMr+b/ldYK1S0FACduOM4Cp7h1OMahvVMANhpqE3tmkfBDhU24Fs4VgMR8DGr+k= X-Received: by 2002:a81:4993:0:b0:561:e7bb:1b27 with SMTP id w141-20020a814993000000b00561e7bb1b27mr1478937ywa.52.1685440208547; Tue, 30 May 2023 02:50:08 -0700 (PDT) MIME-Version: 1.0 References: <20230530141914.672a8e59@canb.auug.org.au> In-Reply-To: From: Linus Walleij Date: Tue, 30 May 2023 11:49:57 +0200 Message-ID: Subject: Re: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree To: Bartosz Golaszewski Cc: Arnd Bergmann , Stephen Rothwell , Bartosz Golaszewski , Olof Johansson , ARM , Andrew Davis , Linux Kernel Mailing List , linux-next Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 30, 2023 at 11:35=E2=80=AFAM Bartosz Golaszewski wrote: > On Tue, 30 May 2023 at 11:29, Arnd Bergmann wrote: > > > > On Tue, May 30, 2023, at 06:19, Stephen Rothwell wrote: > > > 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 t= ree > > > is submitted for merging. You may also want to consider cooperating > > > with the maintainer of the conflicting tree to minimise any particula= rly > > > complex conflicts. > > > > Maybe Bartosz wants to merge Linus' gpio-omap-descriptors-v6.5 series > > into the gpio/for-next branch as well? It touches both the > > arch/arm/mach-omap and a lot of the drivers using the gpios, so we > > could treat this as a shared immutable branch. > > > > Arnd > > I was about to ask for an immutable tag. :) > > Linus, is this the right tag to pull from your tree? Yups go ahead, it's totally immutable! Sorry for not thinking about it before. Yours, Linus Walleij From mboxrd@z Thu Jan 1 00:00:00 1970 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 ABED1C77B73 for ; Tue, 30 May 2023 09:50:37 +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-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Gl+W1v0aKT3rtDrmYn4gicA8yv7zGZuO+srjtqjJ8J8=; b=29i0W2nKar78k6 Frqzzk3fvF04x5i/BcUuZBJ06UrtTzV9kEl7b6QcTwFe22E3of9uXNN8v9rgsm/i8X/dXLfDvT/08 Tcow37kXvv+xuvqdpTAbhoyOvl1pvPL4w5kyvqHrj9tu4vbzss7X0UJ5qCqYLW3474R/L+sGI3IJn H+UaaA8/9W+Nb6zphw3xRqRiKj39b8tMUaT7C7QZmk4liEAj+6Ek3KoDnBiouy+mASldB+qeDYmVO HMk+XCCG+SEK4DZwlHvzDIlk0Nclm4px1P3Pzjv8tU5G3zhHSxrTr5A1utHOToHNFiBAAFjO5WP8s MVDm9ZSC+r6Z7o/brwqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1q3vza-00DFi5-1R; Tue, 30 May 2023 09:50:14 +0000 Received: from mail-yb1-xb36.google.com ([2607:f8b0:4864:20::b36]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1q3vzX-00DFgU-1z for linux-arm-kernel@lists.infradead.org; Tue, 30 May 2023 09:50:12 +0000 Received: by mail-yb1-xb36.google.com with SMTP id 3f1490d57ef6-ba71cd7ce7fso6002224276.1 for ; Tue, 30 May 2023 02:50:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1685440208; x=1688032208; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=mY8EOyPk9m+Ti4ct23oUFQXpV/JvMzGqMlfNe1g256c=; b=GaJVIlA+adxAdqMq+T5cdDZpReTWNDrvP5cvfBA8pPtz91rKqLRqUqQKlOlCgNrMvm U8sKwnIiyu5SETXQHS3UC5iTfqhjFN/BVUoSclrF9NhMUyukD/JgywZZyUbcwuS4MC2E /A127qQQ3i24P2x8I4+FLPjAzRrKKSi8w+Veuqgli9VNCrM0VlvuoTnI27fK9JDkl4QN gDlI/NYcuJ1K1btyiU9CjMhncg5RXig87/iZxcAwbDTlxv920ZbpP19c3AzedMDjJpNT sXlL0xw4/UCq5er3uaXPGnsJxKI3CWwOPUe8j4Lt9+f3u5ZQMhUfSxiDiO577JV3YO4t Vqow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685440208; x=1688032208; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mY8EOyPk9m+Ti4ct23oUFQXpV/JvMzGqMlfNe1g256c=; b=AH7hY75dcR4m5QKlcVVtDoDml+z47ZtCqEUJ3g19oSRGLVDVqlq/RQ10WYzgLZHM0Y +s6pA237T6IKMxHKqBgRYr7hfVfZGrGsEa+Y15NSYIsyr1h7RQiGR/9uPk/Zytd5Z5hd KYmzrmhrPaC10MefZBslCGYAnJ9bxanqbkHZvpY10BbnLXZRFVWLX+7VkUnJNh38jKMW x+wBX+8ghcev1kGJ/G8YVJMw4gE/wlTmxzNf0+TCPV+WL2DneKv1Ko0dBiW14E4hnRql Hfw0FzZRWehZHPyD8eKXtsZkreCbGtf/wAZks09rhcLJUERFDrw9RBOirHygZFhYEuDh MFvA== X-Gm-Message-State: AC+VfDwvJezwPBYVDscpdfWGXv2sCuuAvpFjiW+ZGSlyrS+/KfiS0bXk 85+KIGeUYQIyz3JRUSvEXCjLzBPs98wfYllOUE4wTRTYg3iLD4LV X-Google-Smtp-Source: ACHHUZ6YbgVeepX0NXhKYfOQl1mZjMr+b/ldYK1S0FACduOM4Cp7h1OMahvVMANhpqE3tmkfBDhU24Fs4VgMR8DGr+k= X-Received: by 2002:a81:4993:0:b0:561:e7bb:1b27 with SMTP id w141-20020a814993000000b00561e7bb1b27mr1478937ywa.52.1685440208547; Tue, 30 May 2023 02:50:08 -0700 (PDT) MIME-Version: 1.0 References: <20230530141914.672a8e59@canb.auug.org.au> In-Reply-To: From: Linus Walleij Date: Tue, 30 May 2023 11:49:57 +0200 Message-ID: Subject: Re: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree To: Bartosz Golaszewski Cc: Arnd Bergmann , Stephen Rothwell , Bartosz Golaszewski , Olof Johansson , ARM , Andrew Davis , Linux Kernel Mailing List , linux-next X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230530_025011_688501_23D1B5E6 X-CRM114-Status: GOOD ( 26.78 ) 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gVHVlLCBNYXkgMzAsIDIwMjMgYXQgMTE6MzXigK9BTSBCYXJ0b3N6IEdvbGFzemV3c2tpCjxi YXJ0b3N6LmdvbGFzemV3c2tpQGxpbmFyby5vcmc+IHdyb3RlOgo+IE9uIFR1ZSwgMzAgTWF5IDIw MjMgYXQgMTE6MjksIEFybmQgQmVyZ21hbm4gPGFybmRAYXJuZGIuZGU+IHdyb3RlOgo+ID4KPiA+ IE9uIFR1ZSwgTWF5IDMwLCAyMDIzLCBhdCAwNjoxOSwgU3RlcGhlbiBSb3Rod2VsbCB3cm90ZToK PiA+ID4gSGkgYWxsLAo+ID4gPgo+ID4gPiBUb2RheSdzIGxpbnV4LW5leHQgbWVyZ2Ugb2YgdGhl IGdwaW8tYnJnbCB0cmVlIGdvdCBhIGNvbmZsaWN0IGluOgo+ID4gPgo+ID4gPiAgIGRyaXZlcnMv Z3Bpby9ncGlvLXR3bDQwMzAuYwo+ID4gPgo+ID4gPiBiZXR3ZWVuIGNvbW1pdDoKPiA+ID4KPiA+ ID4gICBkNWY0ZmE2MGQ2M2EgKCJBUk0vZ3BpbzogUHVzaCBPTUFQMiBxdWlyayBkb3duIGludG8g VFdMNDAzMCBkcml2ZXIiKQo+ID4gPgo+ID4gPiBmcm9tIHRoZSBhcm0tc29jIHRyZWUgYW5kIGNv bW1pdDoKPiA+ID4KPiA+ID4gICBmYmM4YWIyY2NkODUgKCJncGlvOiB0d2w0MDMwOiBVc2UgZGV2 bV9ncGlvY2hpcF9hZGRfZGF0YSgpIHRvCj4gPiA+IHNpbXBsaWZ5IHJlbW92ZSBwYXRoIikKPiA+ ID4KPiA+ID4gZnJvbSB0aGUgZ3Bpby1icmdsIHRyZWUuCj4gPiA+Cj4gPiA+IEkgZml4ZWQgaXQg dXAgKHNlZSBiZWxvdykgYW5kIGNhbiBjYXJyeSB0aGUgZml4IGFzIG5lY2Vzc2FyeS4gVGhpcwo+ ID4gPiBpcyBub3cgZml4ZWQgYXMgZmFyIGFzIGxpbnV4LW5leHQgaXMgY29uY2VybmVkLCBidXQg YW55IG5vbiB0cml2aWFsCj4gPiA+IGNvbmZsaWN0cyBzaG91bGQgYmUgbWVudGlvbmVkIHRvIHlv dXIgdXBzdHJlYW0gbWFpbnRhaW5lciB3aGVuIHlvdXIgdHJlZQo+ID4gPiBpcyBzdWJtaXR0ZWQg Zm9yIG1lcmdpbmcuICBZb3UgbWF5IGFsc28gd2FudCB0byBjb25zaWRlciBjb29wZXJhdGluZwo+ ID4gPiB3aXRoIHRoZSBtYWludGFpbmVyIG9mIHRoZSBjb25mbGljdGluZyB0cmVlIHRvIG1pbmlt aXNlIGFueSBwYXJ0aWN1bGFybHkKPiA+ID4gY29tcGxleCBjb25mbGljdHMuCj4gPgo+ID4gTWF5 YmUgQmFydG9zeiB3YW50cyB0byBtZXJnZSBMaW51cycgZ3Bpby1vbWFwLWRlc2NyaXB0b3JzLXY2 LjUgc2VyaWVzCj4gPiBpbnRvIHRoZSBncGlvL2Zvci1uZXh0IGJyYW5jaCBhcyB3ZWxsPyBJdCB0 b3VjaGVzIGJvdGggdGhlCj4gPiBhcmNoL2FybS9tYWNoLW9tYXAgYW5kIGEgbG90IG9mIHRoZSBk cml2ZXJzIHVzaW5nIHRoZSBncGlvcywgc28gd2UKPiA+IGNvdWxkIHRyZWF0IHRoaXMgYXMgYSBz aGFyZWQgaW1tdXRhYmxlIGJyYW5jaC4KPiA+Cj4gPiAgICAgQXJuZAo+Cj4gSSB3YXMgYWJvdXQg dG8gYXNrIGZvciBhbiBpbW11dGFibGUgdGFnLiA6KQo+Cj4gTGludXMsIGlzIHRoaXMgdGhlIHJp Z2h0IHRhZyB0byBwdWxsIGZyb20geW91ciB0cmVlPwoKWXVwcyBnbyBhaGVhZCwgaXQncyB0b3Rh bGx5IGltbXV0YWJsZSEKClNvcnJ5IGZvciBub3QgdGhpbmtpbmcgYWJvdXQgaXQgYmVmb3JlLgoK WW91cnMsCkxpbnVzIFdhbGxlaWoKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFybS1rZXJu ZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9tYWlsbWFu L2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK