From patchwork Mon Feb 24 06:03:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13987435 Received: from mail.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 E010F28DB3; Mon, 24 Feb 2025 06:03:14 +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=1740377001; cv=none; b=lkyTxmQ6OZXQVUCCSd5Bwq7yEdyvnHLjDkMs5sshV4M3oAC9PdDC1QC6MoIpekswVRf0T8dHOonXodzQALt+NTkPCgrzDbSA6AzG2KsoS8Rl3CDN3S3ECAZ6qPuyi0d46Dr8KkQd+gkrLI9Boa8bCDSZn3hg5b0iZ8omJlzGNbo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740377001; c=relaxed/simple; bh=5+f8JFhiY/TtUUlBxUJ2f5DkAXVcMkGuOoIMx/FBoNQ=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=kyy3paSsAPafQdRWx+EA65uLw7SVIgcDwR5oIx5gUYiSpn9ZjOnJr+eKyLY+zDwt8njJFfO2u3wdee5XKOlsPeLzJrzOf9W2V1qIcWMWk0LwKOZssGiS+09/MBZfhE9mqh1f2u58FV+ZiOUP0UXeRZjXlgeMtWYxfBVEJU1xoR4= 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=bW/w7SfJ; 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 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="bW/w7SfJ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1740376992; bh=CgbvIYfETXCLvT1jN25C9Jk8bESL6MluUcI3wxQbZ+U=; h=Date:From:To:Cc:Subject:From; b=bW/w7SfJ/FFr+pYmKBcqcxrmRfKWED9/a70Yj7z/3GzAxgzCmyobaQmpOsyqLK5e5 Xx15d6WVNQutoYSv7VdWf4uZzMBz4DIoNN9M3N9HZIFJS16ZpTbSZQoNs/ST0gESrU O6yoRURfZDO0xYbcYUb4c8NYpu5w+a4sN6oJy5UYy14RpxJAJ4/8PU1DUsCbRcd/rh xNKx+k2/WzYBQxvjbNiZ7lFctTE5rfMkNBGWDoZ9O2TNIbUtVyp4T2CFfNllzl9ohf 85ca4sA1YPOqaPMdryRQy7cxAcGDResXoYmy2pg0kgjPwcXToObopCPU0BQG7MB86/ ql1eRDyTMcACA== 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) (Client did not present a certificate) by mail.ozlabs.org (Postfix) with ESMTPSA id 4Z1VXH3Pvlz4wbR; Mon, 24 Feb 2025 17:03:11 +1100 (AEDT) Date: Mon, 24 Feb 2025 17:03:10 +1100 From: Stephen Rothwell To: Luis Chamberlain , Kees Cook , Joel Granados , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Kaixiong Yu , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the sysctl tree with the tip tree Message-ID: <20250224170310.41c8611d@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the sysctl tree got a conflict in: kernel/sysctl.c between commit: 8aeacf257070 ("perf/core: Move perf_event sysctls into kernel/events") from the tip tree and commit: dccf3c99febf ("sysctl: remove unneeded include") 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 kernel/sysctl.c index 635f5e829fe8,eeb4cba12190..000000000000 --- a/kernel/sysctl.c