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 C5242C636CC for ; Wed, 8 Feb 2023 10:28:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230392AbjBHK20 (ORCPT ); Wed, 8 Feb 2023 05:28:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230242AbjBHK2V (ORCPT ); Wed, 8 Feb 2023 05:28:21 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0F3C046D4E for ; Wed, 8 Feb 2023 02:28:17 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id o36so12985867wms.1 for ; Wed, 08 Feb 2023 02:28:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:from:to:cc:subject:date :message-id:reply-to; bh=BZ1dWC1byNAQOjBdAUAnKEJBqZ0AdL70cH56TWXyx2Y=; b=LzNEhjgJu/8oOcBmBCacbwl/SqMdoG1Zi01G2zAk+NhTQHM7fQ65bnFg1YhpJD8ASv ktrqNSkBo3aimuUU7QRRU/NAebbSJcUQq/pEQhgsPADaF4iQ0DTWATUI1wHsXcR+Xdax hBrKPwyNewAqNbIF5cBLo97qD/eu3thJGnTVV2udZZp/iX1WJpBzVxnneEL6I1xcbR7R 8E6955GCWNIWIcaMIr7WHSoaszeQUTCTAgzKnx9qu5VHfpsWElHtZ/nNmQTenD9pZ0dq 2aM4meCFnv1CoyUWCSDsyd8PpFZ7h087yvlvCR5HWA6g7fXEUeDaBMypyQBsiKIDaP8h 8taA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=BZ1dWC1byNAQOjBdAUAnKEJBqZ0AdL70cH56TWXyx2Y=; b=n4o6InszBc/hGPEUhwF7CJyTpqCrYONrdAQmjpxUh2uYs9t7QvJCVFFl2SLw14Y6qs dX5wEn8NzpBcCrty6t33d8GQbP+eN5W3fdKkpYa13EzUU970oagMM/Hecv3W64heQaQb GZyUg+GZrQMZkl2UBRXxGYsJhtkbIn7sU2rxTE76xSV8verzg2914lb1PmBL++HH54Xh XAn0H2qPHCiTYZPsykkbKIbh5R/5Ap21A+6sTy1+QTfP3bxodklX4/FwnKVWNXORTjcs ybW5U9YkM+9xbNzUTvez99JyXRPWkmovukaS17+G8o3qw8MUNWSZ07/HbeywOQ4tFaYM 9e9g== X-Gm-Message-State: AO0yUKUKUtOOg3xV4aWAKicOQm9ewdVasxgmL5zMcgRwIHiYzqv0tVEO 2aFdxdrROMmjAe5iWksHFyR+zQ== X-Google-Smtp-Source: AK7set/GRn/4bHjkYEzWxRB3qG08sdIy1P5B+57Mx2QgJiO6QX7OpgojPZGQjzDGDTfunc5otA3QPg== X-Received: by 2002:a05:600c:810:b0:3df:f7e7:5f01 with SMTP id k16-20020a05600c081000b003dff7e75f01mr5956834wmp.15.1675852096468; Wed, 08 Feb 2023 02:28:16 -0800 (PST) Received: from ?IPV6:2a02:578:8593:1200:5794:f85b:a7dd:b36? ([2a02:578:8593:1200:5794:f85b:a7dd:b36]) by smtp.gmail.com with ESMTPSA id d5-20020a1c7305000000b003dc4baaedd3sm1423345wmb.37.2023.02.08.02.28.15 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 08 Feb 2023 02:28:16 -0800 (PST) Content-Type: multipart/mixed; boundary="------------am4rv3xJJnsfFj0Y66TcgcCp" Message-ID: Date: Wed, 8 Feb 2023 11:28:15 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: Re: linux-next: manual merge of the net-next tree with the net tree Content-Language: en-GB To: Stephen Rothwell , David Miller , Networking Cc: Jakub Kicinski , Jiri Pirko , Linux Kernel Mailing List , Linux Next Mailing List , Paolo Abeni References: <20230208094657.379f2b1a@canb.auug.org.au> From: Matthieu Baerts In-Reply-To: <20230208094657.379f2b1a@canb.auug.org.au> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org This is a multi-part message in MIME format. --------------am4rv3xJJnsfFj0Y66TcgcCp Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Hi Stephen, On 07/02/2023 23:46, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/devlink/leftover.c (net/core/devlink.c in the net tree) > > between commit: > > 565b4824c39f ("devlink: change port event netdev notifier from per-net to global") > > from the net tree and commits: > > f05bd8ebeb69 ("devlink: move code to a dedicated directory") > 687125b5799c ("devlink: split out core code") > > from the net-next tree. > > I fixed it up (I used the latter version of this file and applied the > following merge fix up) and can carry the fix as necessary. Thank you for the fix! I also had the same conflicts on MPTCP side when merging mptcp-next with -net and I used the same resolution: Tested-by: Matthieu Baerts I was just a bit confused because I didn't see the modifications in net/devlink/leftover.c -- devlink_port_netdevice_event() function -- in the patch you attached but I saw them on linux-next. I guess that's because you used the latter version of this file. Just in case it would help the net maintainers, I attached to this email the modification I had on my side which looks the same as Jiri's original patch but using the new paths. Cheers, Matt -- Tessares | Belgium | Hybrid Access Solutions www.tessares.net --------------am4rv3xJJnsfFj0Y66TcgcCp Content-Type: text/x-patch; charset=UTF-8; name="d5f649fee1672d3d077610dd4878d49be18debaf.patch" Content-Disposition: attachment; filename="d5f649fee1672d3d077610dd4878d49be18debaf.patch" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL25ldC9kZXZsaW5rL2NvcmUuYyBiL25ldC9kZXZsaW5rL2NvcmUuYwpp bmRleCBhZWZmZDFiODIwNmQuLmE0ZjQ3ZGFmYjg2NCAxMDA2NDQKLS0tIGEvbmV0L2Rldmxp bmsvY29yZS5jCisrKyBiL25ldC9kZXZsaW5rL2NvcmUuYwpAQCAtMjA1LDcgKzIwNSw3IEBA IHN0cnVjdCBkZXZsaW5rICpkZXZsaW5rX2FsbG9jX25zKGNvbnN0IHN0cnVjdCBkZXZsaW5r X29wcyAqb3BzLAogCQlnb3RvIGVycl94YV9hbGxvYzsKIAogCWRldmxpbmstPm5ldGRldmlj ZV9uYi5ub3RpZmllcl9jYWxsID0gZGV2bGlua19wb3J0X25ldGRldmljZV9ldmVudDsKLQly ZXQgPSByZWdpc3Rlcl9uZXRkZXZpY2Vfbm90aWZpZXJfbmV0KG5ldCwgJmRldmxpbmstPm5l dGRldmljZV9uYik7CisJcmV0ID0gcmVnaXN0ZXJfbmV0ZGV2aWNlX25vdGlmaWVyKCZkZXZs aW5rLT5uZXRkZXZpY2VfbmIpOwogCWlmIChyZXQpCiAJCWdvdG8gZXJyX3JlZ2lzdGVyX25l dGRldmljZV9ub3RpZmllcjsKIApAQCAtMjY2LDggKzI2Niw3IEBAIHZvaWQgZGV2bGlua19m cmVlKHN0cnVjdCBkZXZsaW5rICpkZXZsaW5rKQogCXhhX2Rlc3Ryb3koJmRldmxpbmstPnNu YXBzaG90X2lkcyk7CiAJeGFfZGVzdHJveSgmZGV2bGluay0+cG9ydHMpOwogCi0JV0FSTl9P Tl9PTkNFKHVucmVnaXN0ZXJfbmV0ZGV2aWNlX25vdGlmaWVyX25ldChkZXZsaW5rX25ldChk ZXZsaW5rKSwKLQkJCQkJCSAgICAgICAmZGV2bGluay0+bmV0ZGV2aWNlX25iKSk7CisJV0FS Tl9PTl9PTkNFKHVucmVnaXN0ZXJfbmV0ZGV2aWNlX25vdGlmaWVyKCZkZXZsaW5rLT5uZXRk ZXZpY2VfbmIpKTsKIAogCXhhX2VyYXNlKCZkZXZsaW5rcywgZGV2bGluay0+aW5kZXgpOwog CmRpZmYgLS1naXQgYS9uZXQvZGV2bGluay9sZWZ0b3Zlci5jIGIvbmV0L2RldmxpbmsvbGVm dG92ZXIuYwppbmRleCA5ZDYzNzM2MDMzNDAuLmYwNWFiMDkzZDIzMSAxMDA2NDQKLS0tIGEv bmV0L2RldmxpbmsvbGVmdG92ZXIuYworKysgYi9uZXQvZGV2bGluay9sZWZ0b3Zlci5jCkBA IC04NDMwLDYgKzg0MzAsOCBAQCBpbnQgZGV2bGlua19wb3J0X25ldGRldmljZV9ldmVudChz dHJ1Y3Qgbm90aWZpZXJfYmxvY2sgKm5iLAogCQlicmVhazsKIAljYXNlIE5FVERFVl9SRUdJ U1RFUjoKIAljYXNlIE5FVERFVl9DSEFOR0VOQU1FOgorCQlpZiAoZGV2bGlua19uZXQoZGV2 bGluaykgIT0gZGV2X25ldChuZXRkZXYpKQorCQkJcmV0dXJuIE5PVElGWV9PSzsKIAkJLyog U2V0IHRoZSBuZXRkZXYgb24gdG9wIG9mIHByZXZpb3VzbHkgc2V0IHR5cGUuIE5vdGUgdGhp cwogCQkgKiBldmVudCBoYXBwZW5zIGFsc28gZHVyaW5nIG5ldCBuYW1lc3BhY2UgY2hhbmdl IHNvIGhlcmUKIAkJICogd2UgdGFrZSBpbnRvIGFjY291bnQgbmV0ZGV2IHBvaW50ZXIgYXBw ZWFyaW5nIGluIHRoaXMKQEAgLTg0MzksNiArODQ0MSw4IEBAIGludCBkZXZsaW5rX3BvcnRf bmV0ZGV2aWNlX2V2ZW50KHN0cnVjdCBub3RpZmllcl9ibG9jayAqbmIsCiAJCQkJCW5ldGRl dik7CiAJCWJyZWFrOwogCWNhc2UgTkVUREVWX1VOUkVHSVNURVI6CisJCWlmIChkZXZsaW5r X25ldChkZXZsaW5rKSAhPSBkZXZfbmV0KG5ldGRldikpCisJCQlyZXR1cm4gTk9USUZZX09L OwogCQkvKiBDbGVhciBuZXRkZXYgcG9pbnRlciwgYnV0IG5vdCB0aGUgdHlwZS4gVGhpcyBl dmVudCBoYXBwZW5zCiAJCSAqIGFsc28gZHVyaW5nIG5ldCBuYW1lc3BhY2UgY2hhbmdlIHNv IHdlIG5lZWQgdG8gY2xlYXIKIAkJICogcG9pbnRlciB0byBuZXRkZXYgdGhhdCBpcyBnb2lu ZyB0byBhbm90aGVyIG5ldCBuYW1lc3BhY2UuCg== --------------am4rv3xJJnsfFj0Y66TcgcCp--