Message ID | 20240122110249.3209c0f6@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-32225-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp2288657dyb; Sun, 21 Jan 2024 16:03:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IGaLnd8Gtt1FYs4a2KthXBkjq8jupEazFbMfiOCN/zmCpmOJ+9gUenbpANavvxsxTL/eKO2 X-Received: by 2002:a37:e208:0:b0:783:40da:323b with SMTP id g8-20020a37e208000000b0078340da323bmr4023419qki.66.1705881795487; Sun, 21 Jan 2024 16:03:15 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705881795; cv=pass; d=google.com; s=arc-20160816; b=qmPjKTc6ioG+msSk7yQGy+ijMWpRozDQVImIlXtKO5G6cABD+lnQHCWGTWdo4Zc3nw OpbeBgnKVPRFZ+q82GtRHtbvXbUdWQ93bxePDaUzC32XM1LeM9zIqDaNX1jjtVzzEj9o oeBYTjyvANuSX9TKN/2pGwM3QFCIhnnqioqGlPGx0Q5JNvBc8JktMLkbg+a1bYVe2oeu WUDJXwG3HqsnKUnqTFrIF9H4FrbLBrM3U0+UH1FOxSJXGThRu0QdSSnFp/RQtMrD8Fuk 1BE4LoZ7Aay9vmRfYZbs+rkgOnmSILjZJyru2MDxOyf3wFRR+Bjff62zxjQ/6sxH15Sw zrBQ== ARC-Message-Signature: i=2; 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=8TtaFKTsOl4DrkcENZnMZL+p4TJ3EKqtyAaSNQOEjpc=; fh=N7ehXjerHa1YC3ZGNTaJ6QjNgO+TQl6eyfcV9cBvdgI=; b=ZxI6YByP9ezKog2Pv6FJd3kgyqnkPU5mYdPp9XZSCxbBHrklAe+bUDm0rJJrD9bO+y lysWLQi1jZSc/Z4H6Ed7qCvnzUs/NO7Z4CiF1X0MI+RhoaH379orNzLUWdyTt7b2k8iM AHQRR/Rn1RRF1bRCNy/yxNGSzmZHyKPwNOir2wUvSfe6zp39+WWDSvrZlAdHOKl87w8J K01fdIL0wxOPnRP/a+UhA/l1tuTDR7fGATP+hjasaBmDdJOPq++XZwPrOtDJf6oc8bI0 jySWsNOdBMyC4NR46raHDWaureOJAe/TNyXwhsq0HF0ZO4PfYfb0+RWelcofBz8DBYiX pCVw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=hNNTIF3V; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-32225-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-32225-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id sq25-20020a05620a4ad900b007812c8e4f2esi4310265qkn.510.2024.01.21.16.03.15 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 16:03:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-32225-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=hNNTIF3V; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-32225-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-32225-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 3F5221C21889 for <ouuuleilei@gmail.com>; Mon, 22 Jan 2024 00:03:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 66B5515BA; Mon, 22 Jan 2024 00:03:02 +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="hNNTIF3V" 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 3754A161; Mon, 22 Jan 2024 00:02:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705881779; cv=none; b=fr1pbGn2LsPGClnEDWbqGPo7IHkzKU336GdwQ6JHS/Iy18yT5Lhh+XEVpW8d4RpJW52Vt+eWyDfbtkebVn9HoIHXdWc0eswo8nWLcg7X9Dd+ixrYCffC7/JBIiBBew+cVUn64LK09HVc6b1THbDtQnWJObeuS1g4jP7teZ7R9sg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705881779; c=relaxed/simple; bh=rqcMKeAgbMhwZ3crHRYkkrlt24nu9M2C3C1cYe1BCX4=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=rE1AWVuNs9nhuKgjAw45yfE9JcBJCEnSGGyTqQTpOG6AX1wEInAzFsRh6JJDsYHO5dRaAbatBFMZq5f1i3stwS/t5QteMUvOX63JGszuXWSVUG1e83PbSxznSRa1Beklt21tPjKyVTOf5NkeTJ9DK9BgEui2degaO+I+G0tuuZY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=hNNTIF3V; arc=none smtp.client-ip=150.107.74.76 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=1705881771; bh=8TtaFKTsOl4DrkcENZnMZL+p4TJ3EKqtyAaSNQOEjpc=; h=Date:From:To:Cc:Subject:From; b=hNNTIF3VNXwT5oQbIsAEjK/RIz+NurVECUt8UVrUU0VXMz2No5BWlzmOJslB3+/cr CpsPlRqsuuhMCqw5gxtkCPZyT8qLCQRJp1C6CsCG1XY7BC1itg8O4WnzG51LDlsEQP L3TVRhbveddsYMA1lk6pSCl6DRowwO5wwjH5jnJVWMf5DqGarw/oNuRHTFMPS6+U9J ocKGDXdbFkP3ws/YInI+pZUurcJJHssriyRhPBfd+LlttiyGuDF3jqxwj6oycN/IUy faAlZkPFBbfn1oC4lusyRCzgdLCpin0jesL9C0RIM/bOLP2Gw7wNbqiv0v1QosMnR3 FAan5IgLQtqvg== 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 4TJ9Qg0nvlz4wqN; Mon, 22 Jan 2024 11:02:51 +1100 (AEDT) Date: Mon, 22 Jan 2024 11:02:49 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: Kees Cook <keescook@chromium.org> Cc: Askar Safin <safinaskar@zohomail.com>, Linus Torvalds <torvalds@linux-foundation.org>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: manual merge of the execve tree with Linus' tree Message-ID: <20240122110249.3209c0f6@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/hZ2aOPGhgsIABaJxhpcwnGd"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788746709161864882 X-GMAIL-MSGID: 1788746709161864882 |
Series |
linux-next: manual merge of the execve tree with Linus' tree
|
|
Commit Message
Stephen Rothwell
Jan. 22, 2024, 12:02 a.m. UTC
Hi all, Today's linux-next merge of the execve tree got a conflict in: fs/exec.c between commit: 978ffcbf00d8 ("execve: open the executable file before doing anything else") from Linus' tree and commit: 38132920f430 ("exec: remove useless comment") 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 fs/exec.c index 8cdd5b2dd09c,d882a6128d4a..000000000000 --- a/fs/exec.c