From patchwork Tue Jan 2 02:00:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 184195 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4228880dyb; Mon, 1 Jan 2024 18:00:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IGX+PZ/ST1tr3mYtRFex3DRfoKr7b3vJFhYZdbVJ3W/sj60mjb/D9CTHodHOvbD7cmI7vNj X-Received: by 2002:a17:902:64c2:b0:1d4:a4ed:999b with SMTP id y2-20020a17090264c200b001d4a4ed999bmr6284119pli.48.1704160841562; Mon, 01 Jan 2024 18:00:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704160841; cv=none; d=google.com; s=arc-20160816; b=JIobutH5xsen5TsxJMEu5MoqrB6nEOtJsxZ79Yv9J42V7EZO4yCDCzFuWpUZDUQhtI lb+/pwJEqpAcU55m2Z2mLeXcRcl5etmlTdnUqfYWn4QIA2gRM6Ok2TOcaqYQaCdNt8uB sd8TQRfZh/TBFTrTKyM7iV6qhuVPCuUtqExkUy9inxYpAxn/vEOuXY4f/wt+UVgsM42M sO593jpA8otdsgwuP0LwGfKWtKMKAyrSZCRr4kN4V+k3QY+wHbwaEK2l8AXBJ4Lio7ne ERngFCiAXAh9KuJD1aU144Kr9h1ShFd543bR/cCas4hX9sy7wutZ3KrukOMxuh+Rb4cS 64Yg== 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=Wr0LixTHtpYPMPZfVd/YrIozZpV85aL/yHY16ImIZ0w=; fh=MSQK6Z0cuQpTnNRJIXLQYeVrDSRP4ZL4YrVb2AAI7qA=; b=hgRe0Rg9I9mXj6KhMg7jf0NwhveSbBPfOFwC1rPwc2jBvGPaPlAc7KPKelj9i1uFyO wu21NnEStT6+5MaKvvpV4q94qwtS1Zb7bJXyunWg24WuCGLFktMn36BZPAv0QJJKwyyP fE9F6EpgC6o+0lHCLsSnJRUQDq6zUd9urB1HqNEQkGAlnwr3sxsxiHTus7Pub3Sr8m4C RchU21xwatIUwx7fJidZZLe+6p4btfmn7lShZW6N2Wk5xy6IeMxolumH+ixjvgUeeoH1 m2sJAiLIVJ4c2oWjjmAhIbDBeYnrc3WWCCe6H1BQt4iThFQjiIcdbGKK4U3dHOyWjsHO LNMw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=XrGzfJQP; spf=pass (google.com: domain of linux-kernel+bounces-13973-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13973-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id m8-20020a170902bb8800b001d3aad7c7cdsi9192828pls.104.2024.01.01.18.00.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Jan 2024 18:00:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-13973-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=XrGzfJQP; spf=pass (google.com: domain of linux-kernel+bounces-13973-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13973-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id B9E4FB21154 for ; Tue, 2 Jan 2024 02:00:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 12F18111C; Tue, 2 Jan 2024 02:00:17 +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="XrGzfJQP" 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 5DB7AA4A; Tue, 2 Jan 2024 02:00: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=1704160806; bh=Wr0LixTHtpYPMPZfVd/YrIozZpV85aL/yHY16ImIZ0w=; h=Date:From:To:Cc:Subject:From; b=XrGzfJQPvWY30qVguv2ZmV1+znofAt5kO/saEeJTuPXcwj6oC/3A/a/p4kFzk6huQ KLZwJiQN5zRBf8hAO+Tb4r19KXX+J+xGOieFI+YPqBmc5WAT+NdDD62pIvyT3b+4ss hn1L0q8NVSlz4Irp+79iTk9Wg3uwcCd5LsOMh1CHVENRr6v4EnDdpb/o9AgR+ZNerE Smh9bRU+8Tp1IgrXBbtmA8MgIqt4H144W3muJB03OLTvPeD76Yd8Z8aj+Z7j1snTrK 4BNfkFeMV5sxQCwLPH+B4elDOLk7SDY2xNoZfzMz70hHU4OM/ZYk25ZHT7xvfflPDz wq5VOlpYXQ6EQ== 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 4T3wz94HjMz4wx8; Tue, 2 Jan 2024 13:00:05 +1100 (AEDT) Date: Tue, 2 Jan 2024 13:00:03 +1100 From: Stephen Rothwell To: Anup Patel Cc: Andrew Jones , Linux Kernel Mailing List , Linux Next Mailing List , "Paul E. McKenney" Subject: linux-next: manual merge of the kvm-riscv tree with the rcu tree Message-ID: <20240102130003.09d52290@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: 1786942158565139232 X-GMAIL-MSGID: 1786942158565139232 Hi all, FIXME: Add owner of second tree to To: Add author(s)/SOB of conflicting commits. Today's linux-next merge of the kvm-riscv tree got a conflict in: Documentation/admin-guide/kernel-parameters.txt between commit: 801f246637ed ("doc: Add EARLY flag to early-parsed kernel boot parameters") from the rcu tree and commit: 323925ed6dbb ("RISC-V: paravirt: Add skeleton for pv-time support") from the kvm-riscv 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 cfeea158a4c6,a0d9259e4857..000000000000 --- a/Documentation/admin-guide/kernel-parameters.txt