From patchwork Tue Feb 27 03:09:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13573225 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 A096D18B09; Tue, 27 Feb 2024 03:09:30 +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=1709003374; cv=none; b=bDCUXxU4Fc2QoD92LYxsE3UR3qcc7RfRG3rUyq06Rb2G6NcttJmUn/zMfPVFddpHsQSdYUchLrI2P5ecdcnTA0kQjf7rUnJotofPjumjG5xHzjKX54Ijs5m8P2U1md54IR/XCpHj0FMQlLsQBqAAyJG2b4ufzUOrHwbr6ujP1Ec= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709003374; c=relaxed/simple; bh=9jeqtYVQD/ayeSM+BVKdEcASzw1aabQVZ1LWjohg9xA=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=r7pxRQrUj4Jroj2Li8tgcrRDRW1hVY/rY7D+MU3lt5njw8E66B947pCfsEegJ7AopXNjSvo6i3IXns4Qvf9suEZMhfe0w7ixwW6i1d/JkL7aqabgb3Wab60LaMH8SmNvIuUHPj8ZaSBVGfKkblT3UopXI1XLGObzcsrBl2kbT/Q= 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=U/DRxxGU; 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="U/DRxxGU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1709003369; bh=hz++nsI/MDcuIMfz08ba0k9/02i8g12awFKAWnONEMs=; h=Date:From:To:Cc:Subject:From; b=U/DRxxGUHlM7tzfISR41/+Uimv5pRzoiwdmeWuJM3JsOWvuM2jlQmc5wPsASpZC5B F4We6TS87wIlgqBTnKQmlXTIULhiQfLofmugtWGgYeIjhxQUoCh/XtSPvPkd4A9oEG zyXvaWQDANQrlS925YT19xtW+f+F7G/MMSnDyLXunPBB5SyIuM3op8jkCwvFpHMwe9 4IgYjgE05CRgSWv3+/siRTFRR4OvDIc2xNP+qfeq46F/2eh4O3MKS09ySEyqTgImR8 y+mretLLJTGliivMIHjISgHqLr2OEcixtt7R6GXOyu1uNO4Ykj8PP+4LFuh8VeOZXi 0hNJ5w4KuCbjw== 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 4TkMsN2F18z4wby; Tue, 27 Feb 2024 14:09:28 +1100 (AEDT) Date: Tue, 27 Feb 2024 14:09:27 +1100 From: Stephen Rothwell To: Paolo Bonzini , KVM , Huacai Chen Cc: Huacai Chen , Jinyang He , Linux Kernel Mailing List , Linux Next Mailing List , Tiezhu Yang Subject: linux-next: manual merge of the kvm tree with the loongarch tree Message-ID: <20240227140927.463df093@canb.auug.org.au> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, Today's linux-next merge of the kvm tree got a conflict in: arch/loongarch/Kconfig between commit: 853f96367535 ("LoongArch: Add kernel livepatching support") from the loongarch tree and commit: f48212ee8e78 ("treewide: remove CONFIG_HAVE_KVM") from the kvm 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 arch/loongarch/Kconfig index 99a0a15ce5f7,eb2139387a54..000000000000 --- a/arch/loongarch/Kconfig