From patchwork Mon Dec 18 06:05:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 180142 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp1053094dyi; Sun, 17 Dec 2023 22:06:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IHWfkpnXvawR65t9H7oScVNCCOTtEPYtPSdJEVT/IR2TntDR9pXziNA3inQwQkRvMmHjX7w X-Received: by 2002:a17:906:20d0:b0:a1f:b493:f725 with SMTP id c16-20020a17090620d000b00a1fb493f725mr4982552ejc.106.1702879568418; Sun, 17 Dec 2023 22:06:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702879568; cv=none; d=google.com; s=arc-20160816; b=Wjr6Z5Gc7gTX+ID4W1PYEC4X9Pkv2bKw76IFspAoDApGfEkR9MDWwvnUMoK5/pywuC lx0QQkXSeU5x60wAb1gAEravp0kX3QihjytawBLKk/ieMDD5jKiDo5Ht3cMd33YBbjaQ LPJi4BpGJLotlr45K6hLHwqMt1ApD2cFIcJPR5/YCfVWuOdc3sr1MRm7ATWIYB3+5RYA tp4xgAcbpxxcTnWVlAuq2XFKwoPlktgDZDw9VfbapsHgPDB+ev/yKawwFjl+aZOIdiUq +C7bS4MwIWqDa3Dcbo6lhXhgM6K4kL8VJAlmJYaUBvsl8vRE4i5zrObLxw/e+stf0v3w 6Fdw== 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=W7xWmD1tcGQMNSwevlCe/BjI7YoyVi+BvIN4gvkDBhY=; fh=F/42H6lhZGFATpkufG8Bg1YWllSH58ZzKoD+iLdK/j8=; b=Of0VgrqneTKwMqxmG5Za8F0/SlYGxG0kb1ccMrB5ZZpBgDaHYsLltFp9JqWvOvlRwH EKGXnp6oHaALllTzoRRpKYOHsG6j+ckr5ARabTwag93LjOr7aDTq5UYMKT9RcUIp6hR5 3YYmuxzYWmTh0OBmWU/a/BcIby8xCzS9y0eMGcX87a7fJYTBe+i0uIia4We9PDjCwqML o3ul1OGMPcXd8bPK9kYzwhrqUY9M3bml/HInCM/6vWSAD9bNOCVmLiKA4Pjs4ywhvVqp 68eHppTc+lzkboyiyVR5Z6mmJ2KJxqmbHvATNDe/mlCA4+PMm6+lhZEOLtkItQp+07Tf QfQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=TDD714Fv; spf=pass (google.com: domain of linux-kernel+bounces-3022-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3022-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id q25-20020a170906389900b00a230f5549dcsi3670733ejd.947.2023.12.17.22.06.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 22:06:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-3022-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=TDD714Fv; spf=pass (google.com: domain of linux-kernel+bounces-3022-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3022-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 am.mirrors.kernel.org (Postfix) with ESMTPS id F31281F2276D for ; Mon, 18 Dec 2023 06:06:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 47EE579D7; Mon, 18 Dec 2023 06:05:55 +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="TDD714Fv" 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 131477460; Mon, 18 Dec 2023 06:05:49 +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=1702879548; bh=W7xWmD1tcGQMNSwevlCe/BjI7YoyVi+BvIN4gvkDBhY=; h=Date:From:To:Cc:Subject:From; b=TDD714FvOiCOwW2iJgvxwaHaGLLgDQcQ6Fiwdci0ojp80LZfhvTwObOd2XesL/b+E cPnFNvkxatWDNhOEOZlG6QXA9z+fIl0X13ebSlXchVodYPaNRXAia9VfHN7ghtsjQj m76IYG+HsLPChHyiJ52eYOu6NdynawfASYK8wpuz0z3uQH7Oh4ixvytrFJ9GvHzYOO Ub+0zWHFGJBNjmbuUOtYPPI3bJrPUjmScjU3FxlULMMzr/dRYt8UGQY5Ki4t+cuQgB MtNkrkmq3KGsjN0LKXy6783+DR2EeNrYp7sHjt0qi6TNsulTeF6bzisgmC19K52Jcm 72i6cCPvdEa/g== 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 4Stq7c2hRQz4xSY; Mon, 18 Dec 2023 17:05:48 +1100 (AEDT) Date: Mon, 18 Dec 2023 17:05:47 +1100 From: Stephen Rothwell To: Kent Overstreet , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Ingo Molnar , Linux Kernel Mailing List , Linux Next Mailing List , Uros Bizjak Subject: linux-next: manual merge of the header_cleanup tree with the tip tree Message-ID: <20231218170547.5714468f@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: 1785598646394951168 Hi all, Today's linux-next merge of the header_cleanup tree got a conflict in: arch/x86/include/asm/percpu.h between commit: 0e3703630bd3 ("x86/percpu: Fix "const_pcpu_hot" version generation failure") from the tip tree and commit: 863cc83ddcf8 ("Kill unnecessary kernel.h include") from the header_cleanup 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/x86/include/asm/percpu.h index e56a37886143,5e01883eb51e..000000000000 --- a/arch/x86/include/asm/percpu.h