From patchwork Wed Dec 6 02:57:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 174281 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp3849078vqy; Tue, 5 Dec 2023 18:58:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IHArTnsZdlqpEEQEXgeDwfKEA3T2mr7CjcRN1SLH8eyxNeKonR8mIUSAs0pNdBFLqr6+auV X-Received: by 2002:a17:903:1104:b0:1cf:51f9:197b with SMTP id n4-20020a170903110400b001cf51f9197bmr163761plh.23.1701831508352; Tue, 05 Dec 2023 18:58:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701831508; cv=none; d=google.com; s=arc-20160816; b=IzqBsrs4HYSC9dv+CQFGe4Tr1S23100yzQfQ0qZDKFiC9os6hFqxTAmuE7Kbl72SW2 YjsHLmTXjxmUeMBgiyQ4irjmVKOc2ORjuPvgLQVHXdtlnyTzQ4vBYl5OqhiV7exZjdR6 lr4Zu+atJdozBC2bInRdf1ZZALY3LiO+ffoQJrqPE2lGX/Pkr0edKZTh/euhMCnMH7PT L+PLEpFUT+I8k3RvPR+AH9R8dG3HouIXFr88XUUEFP075U0d6raZmWYOVI4LqmaW5NZJ Ak8yQgs6DMAQnjg3RBP2qqOYHJX8tAhVAK3RET7QIOWk/sWHNdPF7oBOjuTtPqpRocr2 9mZA== 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=Xew00TzhJeX9h8OoFc9MuWr95HLDQ8hDCzCA6kpkblA=; fh=bWzpxpfwzLLhKrB10sQQU9LDW2ErFvGr7pfKR18Z554=; b=a0+yF2O5JHeiqxPi1xFifAabXN5lBkooNzLS3EQKvDlYqXU9IUzRMRzC0EMbhZ16iM b4ZViBU0Pi+MOP1WyZGMk63L+0So0RY+bf/sPVa/Me6uhxniWwZkk2FbQ2nhnhOR5o7P xVMod8ui8LvhpBySO+dOn4bERKAqXoPc396cOAF1JuCCEV2p3Iq1M/4HGYz8MCI80Yub mtolqNI7mcU7Jaat/CzUGBZ50EOE+xED5cEEfK1VutfVmLFcGPCiC9uDr+BxaU0im2ll 42FREtsmjvb2S9WuokTCKzWAHlyqGYctWuJJYcrwGlo1uG6VwoaGJtcTHZnCFJil5kiF ZxDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=tfJoT5Uc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id h8-20020a170902f54800b001c9c967e77esi5457126plf.207.2023.12.05.18.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Dec 2023 18:58:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=tfJoT5Uc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id B782880B6328; Tue, 5 Dec 2023 18:58:25 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229902AbjLFC5a (ORCPT + 99 others); Tue, 5 Dec 2023 21:57:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229493AbjLFC53 (ORCPT ); Tue, 5 Dec 2023 21:57:29 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80D961A5; Tue, 5 Dec 2023 18:57:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701831454; bh=Xew00TzhJeX9h8OoFc9MuWr95HLDQ8hDCzCA6kpkblA=; h=Date:From:To:Cc:Subject:From; b=tfJoT5UcFg9R+rGCLulA+8B5wHpmvHkdEfDK6zaJ2qIWAd1l1lVWztrvL/299aLOv wMxfh/t7qWjsPR/X1UN/7v/3fS4ORS+i/LASkm+PgkLSBZm+D8b0K6mbFLAmkmYWXn jee/spt99D7Wu8Mpcynd275SdevIJ+WwqzLRy85eAM4l21oKShFTF4AmCsoLxGyV67 Mg0MtYHIHKAzTu/1Sx8KAbgmk5f2jZnX8o31Az6jbTsBU0JVYjXq0X09YxugeRxmJE U0bLAQTqhCta+JlYQGyn7udaiCSKaveGBv+yigRJ3vhabGMLj4sKMRLpso3FIoUhgO 9YdQNHM5aYzbw== 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 4SlMWx498Qz4wd7; Wed, 6 Dec 2023 13:57:33 +1100 (AEDT) Date: Wed, 6 Dec 2023 13:57:32 +1100 From: Stephen Rothwell To: Luis Chamberlain , "Eric W. Biederman" Cc: Alexey Gladkov , Linux Kernel Mailing List , Linux Next Mailing List , Thomas =?utf-8?q?Wei?= =?utf-8?q?=C3=9Fschuh?= Subject: linux-next: manual merge of the sysctl tree with the userns tree Message-ID: <20231206135732.46d1b2b9@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 05 Dec 2023 18:58:25 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784499675585678943 X-GMAIL-MSGID: 1784499675585678943 Hi all, Today's linux-next merge of the sysctl tree got a conflict in: ipc/ipc_sysctl.c between commit: 54e1011bd95a ("sysctl: Allow change system v ipc sysctls inside ipc namespace") from the userns tree and commit: a6dd7f5a787b ("sysctl: treewide: constify ctl_table_root::permissions") from the sysctl 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 ipc/ipc_sysctl.c index 01c4a50d22b2,d876f96f5992..000000000000 --- a/ipc/ipc_sysctl.c