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;
Date:   Tue, 20 Sep 2022 21:40:48 -0700
From:   Colin Foster <colin.foster@in-advantage.com>
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     David Miller <davem@davemloft.net>,
        Networking <netdev@vger.kernel.org>,
        Horatiu Vultur <horatiu.vultur@microchip.com>,
        Lee Jones <lee@kernel.org>,
        Linus Walleij <linus.walleij@linaro.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the net-next tree with Linus' tree
Message-ID: <YyqV0IrItyL/70BJ@euler>
References: <20220921110032.7cd28114@canb.auug.org.au>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20220921110032.7cd28114@canb.auug.org.au>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?lyWoIl0uOY0iqtZCdhRizX4NY+MDZ7F0r1P44xQLBusER0fkU7OUqYhZnelN?=
 =?us-ascii?Q?rNWtsTc2yKUDE6ntZIGuHVQMqubSq83t0FvuR0mHAqExidrMAuA7tWYn/XqS?=
 =?us-ascii?Q?swNPPjl3KBzXHivCRekAJD+AwsM8RFAyUQ/14RwhmnbGUiwZrXBx/Wxots3m?=
 =?us-ascii?Q?ZhpaIvJKjpkVqPcBxK+gIlpJNE9+zIQ6dD7r5DW9qi5U2qtB2DnLNs31UPj3?=
 =?us-ascii?Q?OSl/35HXzicCBVeRBAdtdW4hEOfz4bME4VOl0lIODkg0mtOgW5sC2PK0Wag8?=
 =?us-ascii?Q?BgabicsI7ppcUZu0M4Y1W49PuR4AwQyTqE2RrbYvcX9jsQSxgLTOVXUrZva2?=
 =?us-ascii?Q?FQqKmWWZ4VRqnGiRLy4VlGDIswIlP7YkobX0KQQDkzi86+QUMZnc6Gm1+CLU?=
 =?us-ascii?Q?C7IcFs9oyVbI9YV7U8NWadNKBcXASXKrxEhVvjSFLlGznc76I/DSG4JWoLDN?=
 =?us-ascii?Q?RdrS3EvuZr/GFTqh66UJJvhjwebxEJ7E3k6G3wNLBweD1+fKWLwu8wwODtsy?=
 =?us-ascii?Q?IYhVmOViZOwsEymPmNbIIO6n2MvegXuCTqtazvvOZeB5/xErFnI4m7/UkOof?=
 =?us-ascii?Q?FJBPPSnuqLXjk8XOQqViYExDirAUzdw8pjvs2jQQQnGT3kEJg5lZlV/laKXp?=
 =?us-ascii?Q?LewnKfIJtg5G3eo0A91/7t89LeqMUBrL3V1wWb/RG0z77Kw2Pge3pn3knSk2?=
 =?us-ascii?Q?ItQAUnN6WtF+EWUPIqNirpgOxCh9rpWUtDxSFj0EezROrAnS7r4L/cnMfst1?=
 =?us-ascii?Q?Uo6fXH1/lp63WNMu0cbCMF+WNFWHSMHnCreVivonE+yjcLiX5rJdw0iRj4t8?=
 =?us-ascii?Q?pOGneJrxFAWdUG1K7gOAfWh06RbKqLdmtKy8GMnJHkpJFr2xn2rHkjegbUk9?=
 =?us-ascii?Q?cldtJ9O+1IxGevVDvILE0GQM63IOVN73dmq3Cz0oANabxzl0OvJcl4rCSb0s?=
 =?us-ascii?Q?ZrQdzXvWIoY5hP8YlGtZzELQwxw8VgwhjdBWxIReppN1GEbst0jteP02emwz?=
 =?us-ascii?Q?ryhRElj+zE1r3U8ltJrAhM0l96ZOUNFNHpZR2S4NA+//6/1s1Hh2cq8H4te+?=
 =?us-ascii?Q?ubMvSUe74tsGDvmMHp46iZP3mtX+od0AL6EKU/sHI6lJZ5txmOe9+1kECIo4?=
 =?us-ascii?Q?JNO1laPMo4A7or4C4supO8+PtJXHo709ywyryBKAM2MnTAF5n09w4LNQrHGG?=
 =?us-ascii?Q?+VL2q+agMGQfZzXlNv1Sbcl5r5Sb0f4ffrwQyEBell/yYbK4S4lAWM3tNuq0?=
 =?us-ascii?Q?bNwzTuvdi2z4Ylz9NWDTF3VtwWzKci97kXSlYDynO99vOl/++tDyJxpMCOVf?=
 =?us-ascii?Q?+BvF1+m3UJlKb+GMdYcLM4tzCHbyV4jFHUgpHY6KAaZnVo5rcyXBIMlFMjV4?=
 =?us-ascii?Q?KQtolCzpGSh0z4eGSKZbk9CaGLf8wK0D7RQdZyKXJVrGf0606xZJZ+Sv7TGg?=
 =?us-ascii?Q?qphmu/uFFy8B7nVSdLrZWUmDMmewwYnZIqYVk5iwQBygDrgoOV5LnRloNy7u?=
 =?us-ascii?Q?egFKI6908Sah8oAG7Kt4YS++p8t6cRlkPOWtXJ5baJDNibRdW+wsf4qfhGSk?=
 =?us-ascii?Q?UqOQmP6jkWULgvtqPxiE3Q/0+yFHldjK94/ZEc0u/i8f60hul4aMiuyufIvz?=
 =?us-ascii?Q?LA=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6aca105f-08a9-48bd-5fa8-08da9b8b7680
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2022 04:40:51.9417
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: mHj4X/HExbeEik8gfvAxUPW+PQHmJrRvApmZPlNBO/azSvGFiCIk2jqHisrN4x95SfofBs7F9zdBFZ0uSBoJmnpwMciE7cPrQAbrWT3XMs4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR10MB4206
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS
        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

On Wed, Sep 21, 2022 at 11:00:32AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the net-next tree got a conflict in:
> 
>   drivers/pinctrl/pinctrl-ocelot.c
> 
> between commit:
> 
>   c297561bc98a ("pinctrl: ocelot: Fix interrupt controller")
> 
> from Linus' tree and commit:
> 
>   181f604b33cd ("pinctrl: ocelot: add ability to be used in a non-mmio configuration")
> 
> from the net-next 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.

Hi Stephen,

I can see how this conflict came about. If there is anything specific I
can do to try to recognize and avoid these in the future, please let me
know. And other subsystem maintainers, please let me know if there is
anything I have to do / should have done.

Thanks, and apologies.

Colin Foster