From patchwork Mon Dec 18 06:00:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 180141 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1050774dyi; Sun, 17 Dec 2023 22:00:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IHzmIsUl80t2gxAKWO1RQ1WcaEinm3f9MjKPaBH50lqpUfXgHc9eR1c+0cYjItT+E3opMRO X-Received: by 2002:a05:620a:22c5:b0:77f:3d4a:6dc1 with SMTP id o5-20020a05620a22c500b0077f3d4a6dc1mr14106009qki.81.1702879241023; Sun, 17 Dec 2023 22:00:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702879241; cv=none; d=google.com; s=arc-20160816; b=MzzOIneLJGKeYSmnhhrUMMcrQ+gs+KQ3sKtjufZ8N+HqXCTAOf3IsSd2B6XcKFWdP0 Tzmz5dH4aTKegR1SkMOWjsjwM+oWr5UUpgEjim/JcTPOR329M7W8Me9zGyWuihh78Ii2 H3PUEBBfA7DoJnbZX9O5wTu9OXlqW8q6RDTep+ISiXtJ1MWy2sR9Kzt+eVzCO+YO6Cdt R1tdmUPKPSCcQNg07AaSOWzyIUr+EjgG1X4kutZ9QLxsOU6v5P15Urb+EZpoyeHhyjDZ 4ycRLB2zJyq8GYxOwxxeIGjLoTTxxPtpiDdCfpBHlhwL0MLm8NHITyLqNmKMjOZ1iGwf 6aLg== 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=S28joTYZtopOn20eOTl3Tj2fGBi4/SWEyMyEYqjDXnc=; fh=K1ZJfjA6quuNkRvQfSt0/lfgiCmoHYc2NNpvNpFG0/g=; b=FGEZ0jWkvKJxTPD+P+Wn0NPUBF/+YzkTfwyozBvJS+HCwcxlNQ1XJqqVcFYVWp6gJL SlhsG49c2vY794NIuj0KBJUYzdDJGW9byiMAbExCotghwEhyjgFLRk0kU/u8/1HvB1d6 BR0YVXz269MmTI0o724CoL6zdLW8if37VVAkdXiS2BK1eJUh+/r/dfQSeUIvKb8MVV+l jVtHSithdfWmXdjXkFgN+6nnC5zXQng98dZLeXYKIyx4eeVugcyDkXUgIg9yILqFkGSA 9YOWBWpLYAf0ivg7N4l0iQ4ZJvHzWcUCeYQSmIOJbGtF3ycY65G+X184wFG4l+oIeFPh 24Aw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Q6lDkcXe; spf=pass (google.com: domain of linux-kernel+bounces-3020-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3020-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. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id v2-20020a05620a440200b007756dfea0ccsi25572470qkp.90.2023.12.17.22.00.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 22:00:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-3020-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=Q6lDkcXe; spf=pass (google.com: domain of linux-kernel+bounces-3020-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3020-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 CAEF31C20A9C for ; Mon, 18 Dec 2023 06:00:40 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B23966FB5; Mon, 18 Dec 2023 06:00:26 +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="Q6lDkcXe" 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 CB44263DA; Mon, 18 Dec 2023 06:00:20 +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=1702879219; bh=S28joTYZtopOn20eOTl3Tj2fGBi4/SWEyMyEYqjDXnc=; h=Date:From:To:Cc:Subject:From; b=Q6lDkcXe7k0zKGOeqCb66OYrxDxqOfV7jIQRgzHQ150OhYsPrleeOfO+vniejcXId EMeaLfKgxbcyvW8WDbTrvkaqk0bjOIOKrgW5kg331/xLTEEAgl9fHAYROZ5NQe6yEh zzPkADkf3aEdvHutqEv5xIriqPpBmwwrE5UQ18gmhphTF0FNN6Vog4Vdkg82vIDp9K ILm3mEXIJuRkxOY2Ke82FZheTGbRid/fp2znIJ2riiyZsIsl+F6/Nb34PcABRXYxvl +uuRyyxUZA/MF3fBYCoFJZngVoVvyYLmgqK9aqQ/DC0jd0PCLToZaSadL6oHVTJmMi x4AGceY6BGmOA== 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 4Stq1D0yCzz4xS0; Mon, 18 Dec 2023 17:00:16 +1100 (AEDT) Date: Mon, 18 Dec 2023 17:00:15 +1100 From: Stephen Rothwell To: Kent Overstreet , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: "Borislav Petkov (AMD)" , Juergen Gross , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the header_cleanup tree with the tip tree Message-ID: <20231218170015.6018162e@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: 1785598302978856319 X-GMAIL-MSGID: 1785598302978856319 Hi all, Today's linux-next merge of the header_cleanup tree got a conflict in: arch/x86/include/asm/paravirt_types.h between commit: f7af6977621a ("x86/paravirt: Remove no longer needed paravirt patching code") from the tip tree and commit: 9483c05522c6 ("arch/x86: fix missing includes/forward declarations") from the header_cleanup tree. I fixed it up (I think, 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/x86/include/asm/paravirt_types.h index d8e85d2cf8d5,3cfcd5db083b..000000000000 --- a/arch/x86/include/asm/paravirt_types.h