Received: by 2002:ab2:6a05:0:b0:1f8:1780:a4ed with SMTP id w5csp318272lqo; Fri, 10 May 2024 00:09:39 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWc/hJyro+iwyQidbfKF/eKNqMmrlY+NQGnVtQ1IdK6uU3ZMZpR+EhwZro6qfN5q+RNCSOfEcW8ivrom1cQ1RSlUFW4Jt/Dj6A8wKe5vQ== X-Google-Smtp-Source: AGHT+IGDOAq4E1s5AaqvwpmDbxgvvUof+nugiK/Xc+/Oq/1YOrhPPM98gERX2R3xxx7E5whEBMKk X-Received: by 2002:a05:6a21:3991:b0:1a3:dc61:926a with SMTP id adf61e73a8af0-1afde234e8bmr2096438637.54.1715324979124; Fri, 10 May 2024 00:09:39 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1715324979; cv=pass; d=google.com; s=arc-20160816; b=B9cDu9gMlGR78JZdL3M9vJpU34W1Y3LbDBjRrgkgP2dpDipFnYrgZ3IsH6dSkScjAJ rNv1jh9DY8QF3JPFm2KI8HUyCtk12+VBgtriiBXu6u53T42AqTAVK71XLCmqWxM/tsx7 QqCBtRVtHRRbARG3stwiQ7fYCj5JKSg6rOS2SLyLTQqA3f/guSbhs9aszc9xnny0rp6l TrNzxQ9IAjz5Kz32hSUXz5hRqCGaM9jjpR+Rw/FVL5xYyBERwEF7zr9O7UMRFcXf8R2u FXhi6QL0oYItnKf9m+sybaWvtbAF5wjj+l98H+o2Wyo/zhyjhCNGcZvkz9laWdBu0+oX atuA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=3MrBVyxp1+vrcSn+LlVGY7ra+MZGFnx/12p7qpY0AKI=; fh=Ua2NJj4AIye8HzYOyYRtw4DiUgmgtZagUbv400q4jgw=; b=HK6SADwVpyfYUFX5N6ZaLUT8OmujB/wXd8nr52lNOMZoSLflM6A78XsL9v57VgWuJ8 iDo275MTaBktBafXXGSWBKXZQ3KnRGX5XdBBj788QkFNq8twB+UKeDizkTIEn2JVLRq1 004ZbqiYZ8u1p3W+6ANGAYkAf13CxGFKmwNoEVt6RcyXxaAvi7mQJKtgyASxx6vqTFhr ljsTXZQ5AxyI/Gym+zpC0CBI0NZMyTXZFe/qQj4y0kQsDulclijWtjkSzkyB77749UIY XWEYhVMWale4fqcAddJ6umDNA1dPpvpt0e0J3cS5HIVcc7/fR0lyoypm3ndlpZ6a8emZ SuIA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=jbLIvdc+; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-175376-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-175376-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id d2e1a72fcca58-6f4d2aeee4bsi3023372b3a.164.2024.05.10.00.09.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 May 2024 00:09:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-175376-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=jbLIvdc+; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-175376-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-175376-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 7BF0CB2206A for ; Fri, 10 May 2024 07:08:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 83F4915EFB8; Fri, 10 May 2024 07:08:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="jbLIvdc+" Received: from mail.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5A74E15217A; Fri, 10 May 2024 07:08:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715324912; cv=none; b=G1EC5UWHPn7/FZi6MQQjGvnXTt9u3Utg2hpJ7oqE8Z/V5TXyrxgQf5gpZLEYAglrh++tTknfxubUMgGkTXuXl5tLlxvmitcOfgzL5R5AOLvvCIohToCETY+UDxFRXp1hMFaMf3Og/m20m/8Y3BtBh8BjD2qcURkmUD2KEqJz1+s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715324912; c=relaxed/simple; bh=3MrBVyxp1+vrcSn+LlVGY7ra+MZGFnx/12p7qpY0AKI=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ZLjeAZ5UaYMYOz+yg+F7glHpWhJwt7qy2E+A4l00xumLtEsYdoZjNvLPG6W+6vwq+/geWHhBuZrxAMTFLgjRLDtIpmOU10nYXLHHAwq7M9EmB5ieUzyCnTUvByu/GB05pELSQF0OCwEy6l/Rk5tduEc0NzjO2ZMnscZnOoHz/9M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=jbLIvdc+; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1715324908; bh=3MrBVyxp1+vrcSn+LlVGY7ra+MZGFnx/12p7qpY0AKI=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=jbLIvdc+VhxhQWH1nvaMiVGvpIRa5vJ8rzGW8X5HVi7Fsu6RzQsmx2BSWqAOMz3CX V03bVB2NvdapuNuHirnp4X8Z9vdXyOCmZQzkIok8rcw3YL1F4IwnUqMbVJf2FHRPCB ggSXJ4DU/B2vqqpTx3/iw2hxKz1nEaZRhq6TYR7VTA+MzQCjA2c8onyhxjwPsGPRDC OifDqLp4X/lF0jcKmP1Y6hozdsUfMpqED8PnQUuH0ssXWS92/Bx9pCifA70rjuEGCM LY8MBgNGn0A96EU8Qla8tn+VhWkzG8zA6gCIAXh6nsX04iA0CtepUC7CSWriebB/KX rkN1+nNgfnpqw== 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 4VbKjR53kyz4wd3; Fri, 10 May 2024 17:08:27 +1000 (AEST) Date: Fri, 10 May 2024 17:08:27 +1000 From: Stephen Rothwell To: Bartosz Golaszewski Cc: Bartosz Golaszewski , Andy Shevchenko , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the gpio-brgl tree with the gpio-brgl-fixes tree Message-ID: <20240510170827.2b655636@canb.auug.org.au> In-Reply-To: References: <20240510153212.246fbf31@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/If2HvKBjlQgYGda+h0=Ozeu"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/If2HvKBjlQgYGda+h0=Ozeu Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Bartosz, On Fri, 10 May 2024 08:33:37 +0200 Bartosz Golaszewski wrote: > > Thanks! I will send the fixes upstream today and then pull v6.9 into > my tree before the merge window PR to fix this conflict. Or you could just merge your for-current branch into your for-next branch and avoid possible issues with all the rest of v6.9 ... --=20 Cheers, Stephen Rothwell --Sig_/If2HvKBjlQgYGda+h0=Ozeu Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmY9x+sACgkQAVBC80lX 0Gy8ZQf9FAnF+zrtqEl5VDDNEEgG3oO86YrcCHI7IiTakoztkUR0QEGONjqySWNo WFe+9IH9RPtY9u47/gX8qlFN4r9NQaD1G+Gmvvog/A7vASCpWdMqlyXi44NlZtp9 UfAwU4t8kiKG+bLAk4Pc3sKvKmhcQOXiVIkYLRvu3HwhzxlxC1KXtDfAMC8dimts W6oFbsDuAtXJCRqtuz5XePwYUPNJQuzD+mUe4x/e6franP6VbrnPD3Ud/3zNPTrO 8YCyfo/OBaSzH4BbWcd5kIA/mUnDx7qMQQHOYXi9162lKGJVhYSLwhBDapkkTsCu s4FGvi7gpwCiQchM1b5MNkPYddACFA== =moAU -----END PGP SIGNATURE----- --Sig_/If2HvKBjlQgYGda+h0=Ozeu--