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 6B120EE4996 for ; Mon, 21 Aug 2023 10:44:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234847AbjHUKo6 (ORCPT ); Mon, 21 Aug 2023 06:44:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232670AbjHUKo5 (ORCPT ); Mon, 21 Aug 2023 06:44:57 -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 3AF46DC for ; Mon, 21 Aug 2023 03:44:55 -0700 (PDT) Received: by mail-yb1-xb36.google.com with SMTP id 3f1490d57ef6-d6b0c2cca0aso3166496276.0 for ; Mon, 21 Aug 2023 03:44:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692614694; x=1693219494; 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=OtxD7adfjwKLhyH6cVNSeAqAWFExTn8fb1CoOUK3l0I=; b=JToSM+gNangjXOEQfoZzHcjr0OHrQlb0WhIoiVHG9n0tKjPCmY8mum8bWOibBvh3TI GoyCVojO8OqVrXgVdeijm6/QORsSRbyq3f6VhccPRDOE5pjWTe3PAggUPishPrcbwq/r HHHPfDRtd79RYH1yzEExDOmNkhAj1YM2ZfDBZHzKsULIxr4+d9kY0rQxt9zCL8NydfNO IY21qmCJdxGkQhC9xu4fg7kssd7JG7YzCiqkW4ct0mCDrY7DiFko7vkGabxMaH2UmIBD i3k8G67dIWFjcusbeDAJEnRKJbb4jllWDMxyWWz32cuAMJx3cQpxda6rD4JUdT07ANVn GRcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692614694; x=1693219494; 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=OtxD7adfjwKLhyH6cVNSeAqAWFExTn8fb1CoOUK3l0I=; b=MfX19zpDRzGLY1UblV3RrFG5TiZsdgztpmgOyX5ndmF46DDcOuRDtFyx0wlmd0og3e QBAxDzYTXrU0kA+n1Jh+XQx++4KcT5HI8JieJ91n1vZSdbBjWORY7SSzSGTmueu38Vt5 j+4s7CrlNsHlpI7MxZkFqT23S3bUv/vynbEhWJKu9kM9K/O0aRLaYTjSzsMcBlLssziX gXuNOvy1vjC/jCU38sUdmOVCM9PzqgrH7ktnEjHHiVNRdjZoOx63XOnF9baUr2YDNc0y oh7utxs06IODynsgaIho6JjkShszcMxVWz4GRJ3dO1O0YvIgr0p7BpNfSrKUeOhxr95d I8qA== X-Gm-Message-State: AOJu0Yz+Dq2SqdM8NGzJnmIYymIaXP1UQHzeqGm9fiyBHupNT0LEWjyZ mx5v3oQ1YuRV10CeiNG7/EyNMYtZFLTmxD/4m1NnAjgg3IOAFM8G X-Google-Smtp-Source: AGHT+IE5KBdM6hLkxoWOxcMZKCWi2iIUOsdw8OimSEx+IgkUvQ1RfGdH1D1BQ8TiHyjmgXBL+gkfSnLJf0iG/Qijp5I= X-Received: by 2002:a25:2e01:0:b0:d04:f936:556 with SMTP id u1-20020a252e01000000b00d04f9360556mr5875458ybu.36.1692614694460; Mon, 21 Aug 2023 03:44:54 -0700 (PDT) MIME-Version: 1.0 References: <20230818160837.147b1e2e@canb.auug.org.au> In-Reply-To: From: Linus Walleij Date: Mon, 21 Aug 2023 12:44:43 +0200 Message-ID: Subject: Re: linux-next: manual merge of the pinctrl-renesas tree with the pinctrl tree To: Geert Uytterhoeven Cc: Stephen Rothwell , Biju Das , Linux Kernel Mailing List , Linux Next Mailing List , Rob Herring 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 Fri, Aug 18, 2023 at 1:26=E2=80=AFPM Geert Uytterhoeven wrote: > > 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 tre= e > > is submitted for merging. You may also want to consider cooperating > > with the maintainer of the conflicting tree to minimise any particularl= y > > complex conflicts. > > The resolution LGTM. Thanks! The conflict is local to the pinctrl tree now, Torvalds will fix this conflict when I send my pull request for v6.6 to him. Yours, Linus Walleij