From patchwork Mon Dec 18 05:17:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 180138 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1038095dyi; Sun, 17 Dec 2023 21:17:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IGmyIShHdOqWLmYUfNAI2AgsWwiXVSbw6FxWTteiuC8Yp8m/LqzyOn1bzRt7YLMejyeQKnX X-Received: by 2002:a19:7512:0:b0:50e:3c2a:fd5e with SMTP id y18-20020a197512000000b0050e3c2afd5emr103120lfe.134.1702876653476; Sun, 17 Dec 2023 21:17:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702876653; cv=none; d=google.com; s=arc-20160816; b=GFyPoctgrBKhQeVOiQuiEYd7rICm2hB9fG8iMXXfUNjk3nIk368DTbdKDk0bEgh00D Yn8Ff1QpwmyiYTFc1Wr5PvhwqqVDdEXbHGvPpJWEn1gJsrcZzhcBBX7h9hyMt2QG/W0b nrPk9gyrO1IKzLhpmbAGHY95oIia8dj8r6EXmfaQwN3xgd0+vINB5eG+h1fh7MMDunxr D+JX5CAYijWSaEftTs8SCbtgSrrsMfYcSe0CZmL5VFzSsCY8QrsAcc51BjragLCtu1ov kS+g9s7mwQkF+7YHHj1DPzZW5ITvltfaqtW+xCCSkFBYuEA9VT6TS73HGxqvPYd9GDZv runQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=LWVOdWD/fLbAF9XWd/EZxP0KqVqq36W6xaUInLOkyI4=; fh=iHOkrGB8rq1xive0kZkg7WktDZ+0WKDl5hpdGIH4gqQ=; b=Z4m6kTJ3iFKToRt6ZewpWNgjhlLaLuBdFB/4ETfPXUJexlHg8Z3jlobsF0u7t/lO// A0luua6WJjfF++TkDwuYwEg9ICkGOThYp4L7UPE2UPSSFUBQVabmbF8x8oXXrsfM+WYm NDxruZKm+G6tyHiw3ehGE189rwmnT3lcLHKmHU25L7oKbXjdA8vlG7kIMnAGyfk7yL4+ 48IMebcRIUSUXFo/QKnM+ry1pgrHK7zAigLaIWdrl2ubWIIAnWFRQigdIGKu67dBj3vi svVn+aqIdADkzxeLWMMItMelpwSpPT+ronDPkoX5Ki8zIVo6ebzTC3rHna+srm/BZdgI 0rcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=i1Gn4axe; spf=pass (google.com: domain of linux-kernel+bounces-3004-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3004-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id v29-20020a50a45d000000b00552fccb8ad0si1893489edb.524.2023.12.17.21.17.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 21:17:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-3004-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=i1Gn4axe; spf=pass (google.com: domain of linux-kernel+bounces-3004-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3004-ouuuleilei=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 am.mirrors.kernel.org (Postfix) with ESMTPS id 16B481F21978 for ; Mon, 18 Dec 2023 05:17:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 745FB6ABD; Mon, 18 Dec 2023 05:17:13 +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="i1Gn4axe" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.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 67AB663A3; Mon, 18 Dec 2023 05:17:07 +0000 (UTC) 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=1702876626; bh=LWVOdWD/fLbAF9XWd/EZxP0KqVqq36W6xaUInLOkyI4=; h=Date:From:To:Cc:Subject:From; b=i1Gn4axeu1xP1TncM7AA8O75dLhftWe69pSXlvBmz8zeAVAM1pfvYyUkSyTA23jPF jqEU4lTDMTJ1eV9z66yLosr2bTAHiCvU4c+hKd1d2liFyVuHZmFHTWxiVloOM4/4so LXkTqH+xLOxopmWP4W6eda3qo/Gsn0QiLlfx/NytEtFggGSq9kae9uHubRy/EdHISj ukS3lzB78tUsAjWa79VHs1Hv0MFUBL/SMOp9RgXWU0kHhNyFwspm8mAS+tLztQbwFh PuEowwiomaAvt8q1WAwozbTUdvkBnvelPmsl89HZF5sW/OB65M76gKSBvWd58PefOv gDmhvABmyZMug== 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 4Stp3P38L7z4xR5; Mon, 18 Dec 2023 16:17:05 +1100 (AEDT) Date: Mon, 18 Dec 2023 16:17:04 +1100 From: Stephen Rothwell To: Kees Cook , David Miller , Jakub Kicinski , Paolo Abeni Cc: Networking , Alexey Dobriyan , FUJITA Tomonori , Linux Kernel Mailing List , Linux Next Mailing List , Trevor Gross Subject: linux-next: manual merge of the execve tree with the net-next tree Message-ID: <20231218161704.05c25766@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785595589753986027 X-GMAIL-MSGID: 1785595589753986027 Hi all, Today's linux-next merge of the execve tree got a conflict in: MAINTAINERS between commit: cbaa28f970a1 ("MAINTAINERS: add Rust PHY abstractions for ETHERNET PHY LIBRARY") from the net-next tree and commit: 0a8a952a75f2 ("ELF, MAINTAINERS: specifically mention ELF") from the execve 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. diff --cc MAINTAINERS index 1f53b4c593dd,08278b9ede48..000000000000 --- a/MAINTAINERS