From patchwork Tue Feb 27 01:55:22 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 207006 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2441565dyb; Mon, 26 Feb 2024 17:58:09 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWPqAXW+r7kHz8CDdeRD/2FqUPF5ylesl8aDDvbb3f9iBSiNfurFlXRwbiav/L3c6lBQTffopXtB7Dcvhkg630NkYVkgw== X-Google-Smtp-Source: AGHT+IHAW9DsJ39gBf4g7cnkTxaMGuFrqywQU6xAeF23U56Exozqk1D1fN5bKXsvNMxomAy4XYXj X-Received: by 2002:a05:690c:714:b0:607:7f99:5927 with SMTP id bs20-20020a05690c071400b006077f995927mr784234ywb.2.1708999089127; Mon, 26 Feb 2024 17:58:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708999089; cv=pass; d=google.com; s=arc-20160816; b=WyivQKVAJbh4yoTFT92LNYfbdGyQlO5vs3l4WjPr1fFUX5pIKPKWMqxKnh4V//TJM0 yrsF//oOtjGLYcbvk1lcgwxDoPnKHeMeLKN8liAq/N2NOdTIsqP6EKCEPAyfXiiaWtRl i6ldmlpUervY6ADt/K8PzHDCrVPBqr+kk/cNxZg/ScRcRRHQKk/R4PsbIrbM5LBHqM4m MaRu3tBJ9X4AxZzzWUVhR0gE8x47uZlKn3xJKE5gP5thUngGRlpAHt8LxpomgCbyG4Ra H2sVoTU4LmfFf2WlWj0R3F/wom+aHI2PEdLKuzM/5bE82tnkTsUIO9fV/ZT+N/4UQOlv T9kQ== 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=tqyLFCX2gqO9vfzTyThgx3dUIOjnJmNJJQN1IhNoSs4=; fh=flWawao1YWrULSpfradzYcljmXdsrsHRVr8OJsj0vZs=; b=x0flp4Z26ICnDuVyRnnUTV7S1S3ngPkqV+IZMWD/ShGWAo8CX0eU47u7lGv2e52BX7 j3CvQxvm+2Q59RocgTUARa72gPmHbWObn3FbFbMJp6BcPyfouhbzBj4SEMB43T2M//ln IikGYBchn65Xf7KuiKJhxhcN8sfydIvR9sBW46F9r7lMS0pZ/mVJPk/uJR4l5lgH6PmF XR95OzvNc5k/6vcreDAdN6alXFJX00lzLMH4XeBEDapVUTdA53qk7z/EcTnOqFaeiGXW 1V56jOggj+uBS7RqVb9TYOk+zoXbKJLtHhH47zndMyKSZQoBBt6h7GJhRtiz1On2JW41 CChQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=BdjqxmC+; 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-82570-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82570-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 iv13-20020ad45ced000000b0068fbf29117asi6297873qvb.225.2024.02.26.17.58.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 17:58:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-82570-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=BdjqxmC+; 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-82570-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82570-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 D5D1E1C274AF for ; Tue, 27 Feb 2024 01:55:48 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A05791170F; Tue, 27 Feb 2024 01:55:36 +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="BdjqxmC+" 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 481644C61; Tue, 27 Feb 2024 01:55:31 +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=1708998933; cv=none; b=MPevJixgwCQ8CKCDseCSNvc9XYlcPMiS+TKMCpTNDyQ0KOYDhChV/iURY+eGXuhOZRHhmjEzGvkpN7Z1zcGo6HEU48bKfcNtunsPxTp0PNGSxJ8p/B53Fo7qWJA9eqxkHrteD0tZWZeWsW9qyYNn0bx9o59nbT74HE0sDNwR0yY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708998933; c=relaxed/simple; bh=BWrd9Qh+hL+ZeFRguFEk0ZiDbHwsQAQcAlomtJ8uW1c=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=WzRm8wocgc70NJ1M739r9cUsl/AZsaqmJblExdMrkw1C63Grv1R5gkqleRCVhdIXMB81v2fNVHfk0lRK651axH6tdzNOzEZ+cpBHIwqJd7MEBPHtdw7HnmHehSijftkqqzw3FNVdWhX5ymf8lkAAixHlP3X8gKdY2hoHkUjuDBA= 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=BdjqxmC+; 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=1708998923; bh=tqyLFCX2gqO9vfzTyThgx3dUIOjnJmNJJQN1IhNoSs4=; h=Date:From:To:Cc:Subject:From; b=BdjqxmC+yaLrov2u1aw8maOKLM5zNmQR/lOUWWi3BgXtRZYKG9J/9TLo3jxH2eE5J sLYJIMHlnFfzNkQUXP9OzNM/sTNSZByErvlHWcAbZuKNqU+2ilKqLcesiTw5KsPJ5p PiCFXWUhCm5/V5eQSFIc1XiC3sjxEqNQyWna6kw9jNP1DvHATxCYkZ290b2IjcIQPQ bO/cncwg/ifmgH+7rB21ynVN/Kip50KxloRFmViez6uEZqZfYXKgCwnMoqa9v8XxA5 L8AsXIGbbXgoFrw8HwV1rtdy+yRzBcyyBswPr5n/S8IQjR09GyA2TaoFncpllY5zMU HU/0+KnpTqYwQ== 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 4TkLCv1ysqz4wb1; Tue, 27 Feb 2024 12:55:23 +1100 (AEDT) Date: Tue, 27 Feb 2024 12:55:22 +1100 From: Stephen Rothwell To: "Paul E. McKenney" , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Boqun Feng , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the rcu tree with the tip tree Message-ID: <20240227125522.2bdbe6be@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: 1792015428837019089 X-GMAIL-MSGID: 1792015428837019089 Hi all, Today's linux-next merge of the rcu tree got a conflict in: Documentation/admin-guide/kernel-parameters.txt between commit: 5c5682b9f87a ("x86/cpu: Detect real BSP on crash kernels") from the tip tree and commit: 600716592a3a ("doc: Add EARLY flag to early-parsed kernel boot parameters") from the rcu 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 Documentation/admin-guide/kernel-parameters.txt index fd1519ee44a0,3f894fbb4916..000000000000 --- a/Documentation/admin-guide/kernel-parameters.txt