diff mbox series

linux-next: manual merge of the kvm-riscv tree with the rcu tree

Message ID 20240102130003.09d52290@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the kvm-riscv tree with the rcu tree |

Commit Message

Stephen Rothwell Jan. 2, 2024, 2 a.m. UTC 
  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 mbox series

Patch

diff --cc Documentation/admin-guide/kernel-parameters.txt
index cfeea158a4c6,a0d9259e4857..000000000000
--- a/Documentation/admin-guide/kernel-parameters.txt