From patchwork Sun Nov 13 22:50:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 19470 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp1859926wru; Sun, 13 Nov 2022 14:50:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf79TWz551ttmOCR0mYqqECI3rfyUau/DxzloTiTYZ6n1OBWr2TzL2M6vomGfOrusVrnwq37 X-Received: by 2002:a17:906:24cb:b0:78d:4167:cf08 with SMTP id f11-20020a17090624cb00b0078d4167cf08mr8818608ejb.337.1668379851736; Sun, 13 Nov 2022 14:50:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668379851; cv=none; d=google.com; s=arc-20160816; b=mMqHSx/aEuCzQuW9WGlqacS7HspFfhHwIbG1hJDWMa1ToJ6TrmNn1s/Ko4AiyTQ4Dd 0P0MAFqTnzIAFnoOayu52/9kWLs5S9UPRp8AyiZZbiEEDzb9xkF+UXhJnFZoeIYgXEnI O79AcBJdMuVsJnAQFjUiY5Uzy8kCc0gUe4F8OZQC02izqfjrVfypxp+5s/UQe8xL8d/g 6wb9seotHyToUGu/njrrAUZ+EbwtL53FC2ZW2dJEAokdemCm2g6gfJD5Rr7Oh3eqnGsM qRItMVP+DJcw/lKinFsTIfz8/HKbIB/pIWx0Lwy6gvUOf+2/g9i0OHFK4JqogR+pwk4H TSow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=zDOsngkfXlRy4ZJSgGeBHh2499G+gL1UNyWeAO9sNtc=; b=QaLliGs22Koe9nZy6mzMPPeluK3Q79daK5RpVxz9P6w8N2TOVlR0e0bKlljpd7VTyA wMWbQGxT56Lfj20xLVxUQHPoq8DwHJkBh/NiyxuqeCk/J7vBsQjE8ZU9JS9XrM/qvdCS AwuoFcKrdxR/jMGdH62Z5A/VXGFtK2U/QnC5WeOJ4NsSyhOale0BTMr0OV8uw5UDZqkj rppyOViTwjN7JPqOq9yybB2P8IOTcoHKFkHzJXzVLCEyZcTQcTLUi1N8zVUzhoxJ0lKj l52b24dOb3HH+pAuZ0XeYHBnAdBBvaU59rQBdsVhgiFj9GsTs2j7DDEonSUxXh5YiRYF VYhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=IldIgoii; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bw10-20020a170906c1ca00b007309a570223si6226152ejb.609.2022.11.13.14.50.25; Sun, 13 Nov 2022 14:50:51 -0800 (PST) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=IldIgoii; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235014AbiKMWuR (ORCPT + 99 others); Sun, 13 Nov 2022 17:50:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230525AbiKMWuM (ORCPT ); Sun, 13 Nov 2022 17:50:12 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9163FD1F; Sun, 13 Nov 2022 14:50:09 -0800 (PST) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4N9SLz2SKLz4xYV; Mon, 14 Nov 2022 09:50:02 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668379804; bh=zDOsngkfXlRy4ZJSgGeBHh2499G+gL1UNyWeAO9sNtc=; h=Date:From:To:Cc:Subject:From; b=IldIgoii4uuNzU0TqRsRMRO03FJWsO4khqkOLOqW4B5J6PNY77ERVKrFrpUFFdL+6 hqKfU+8bY89Dx8tPiXmQOx0NjgwNtvzkrdDuTbOv6qlpiTnAvBVEQ/3s7DVMZB8LpB bFpN87Gwud6Cpznk27e2dsk3aWzxSU/ic41T5V06bOd5ItIwTt8RSfbV4QyRMy+DFP Uqh3hxrd9fiuCj9NPGnxCaeCIESH3n+EZr4ZmEOj55nEEo+RFXytDAD+mmvQalKFyH 3hBPcN7bh77PMvPxSI8Bg8NjzwcoL/x0mAkRfpzs29bPLk5ESD/FY/AVmuMLx9xFC7 P/hzJZa4QuUeQ== Date: Mon, 14 Nov 2022 09:50:00 +1100 From: Stephen Rothwell To: David Miller , Networking Cc: Alexei Starovoitov , Andrii Nakryiko , Kumar Kartikeya Dwivedi , Linux Kernel Mailing List , Linux Next Mailing List , Xu Kuohai Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20221114095000.67a73239@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749423071133415305?= X-GMAIL-MSGID: =?utf-8?q?1749423071133415305?= Hi all, Today's linux-next merge of the net-next tree got a conflict in: include/linux/bpf.h between commit: 1f6e04a1c7b8 ("bpf: Fix offset calculation error in __copy_map_value and zero_map_value") from the net tree and commits: aa3496accc41 ("bpf: Refactor kptr_off_tab into btf_record") f71b2f64177a ("bpf: Refactor map->off_arr handling") from the net-next tree. I fixed it up (I think - 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. diff --cc include/linux/bpf.h index c1bd1bd10506,798aec816970..000000000000 --- a/include/linux/bpf.h