Received: by 2002:a05:7412:cfc7:b0:fc:a2b0:25d7 with SMTP id by7csp828028rdb; Sun, 18 Feb 2024 14:08:17 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVKqm5c6a/pYXhARQckbC+XAH63mfe3Nt+GBs/eXiYFd/r/kFJTt1mqKFbuFeNvWIVQlixRNMH0fUhXMRi6pGeTY/IY1iZ3WWRQP92iPg== X-Google-Smtp-Source: AGHT+IFUNGyFOVWkFdUbd1Sz2i2Wdfunr2zwoqd69/dpHT/ca+5W32svXNW8ZRpqeLHt0ubKr3Gj X-Received: by 2002:a17:902:d48e:b0:1db:403c:68b5 with SMTP id c14-20020a170902d48e00b001db403c68b5mr11750159plg.12.1708294097126; Sun, 18 Feb 2024 14:08:17 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708294097; cv=pass; d=google.com; s=arc-20160816; b=zkhrGQc2dRQL63Mf6XOnZsS6Hk1EjZwknaP1mBW4yLppvnFa/tzjToF9zr0H5NDwQG RKGAWoVMjBG34lXc5TAwsLduKNgjKuuZffrOHKddW0EWexkCy+zzo1Q7dSlp91P9ysE9 bnzvLnEXKjR88KgzBoItlpbqsisfvWDO/GBW6TXpPEpxKEibarHguFmyMcnzt75kSJ2M 6VR/jGy7YIGxdMQ3s/Ei6nWdlTvRXxtLWdtrDW2wFyLAsjRglL0RTmys9nzn0vl8tKBs hlle8rd3zNyKJ9RDFz79IaB0AW7aGU76bcwc3oL4wjdOe8oSRlfxwqlwTBXgjEfRMrG5 J1Gg== ARC-Message-Signature: i=2; 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=u3qYSIEt7wSwysWILAwarLcU86NlQvPnZ/iycotOidc=; fh=Ww7GttYaylYL7yb7UhgYUvtyNEluso38e1J09TbN8aU=; b=kUHD87qt1e9TiTFLzS4uAyCKos/y4egia5az7i97h7vHsFsXWldWqDLILyacM/GzLo Ovr4cpkLWDM1m+vEfy3fLEVQoBGkHgHYUMqaaSp+3RkuX/kQnxMpESpaRISaPPvVMHre e4yg8whQ6epicv2mwd6vn+OME9pYkRnE0dYm3hKjTU/plqWzEc+defTOATu16iQSctJn 0z9RKXnHGEveXIYIxcICwOpEzKKe8QyQkawuv6LzpNYJG7BIDH4Lz8Hp8kIL+EuizH5b Ruh5uOFdA5d9s/uCr+/5EoLq/vUWgxq0VjPGsAJLJ7dvKVqa+Asld+xZYb5LPTL6bBOc 5Lrg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="m1YmrSm/"; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-70600-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-70600-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id c8-20020a170902d48800b001d928833f58si3352689plg.220.2024.02.18.14.08.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 14:08:17 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-70600-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="m1YmrSm/"; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-70600-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-70600-linux.lists.archive=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 sv.mirrors.kernel.org (Postfix) with ESMTPS id D33CA28157A for ; Sun, 18 Feb 2024 22:08:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D613574E12; Sun, 18 Feb 2024 22:07:50 +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="m1YmrSm/" 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 225397429B; Sun, 18 Feb 2024 22:07:46 +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=1708294070; cv=none; b=njZNaTJxeuzy8zNovnSVvVckURwNLDskVhyFD0XrC0z42mF/U7uVsKYSQ6OW3TkzsFYX4+REJfc2v0A7ZRfCNThMYvMMrB1s+GI/V95W0vVcKMWZWrAi9TIM7NqEKn9ktO+HEQBERt9Fpwd/T5mo3WSjEf4bHLgrjbGeirIU/QQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708294070; c=relaxed/simple; bh=Ej5nfJ2GT3uRzKUBzWXHQgvfvJ/V18GaIOwBeSOLf38=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=jnsqJ7IkICyPAApzXPYTcdHnG0sp0Nspb65wg+NOdoHPlaSXKkUfb7hnnuMEO4cm339TgtUWMjhD403tsHf3PdnDKsm0yxgJERpo18RSuR838Ja6HGrrJl62hvp8SMdmGNAoH9cdPsHMOuEatdvUhKYlJLVyvOz1W9pW4SysjNQ= 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=m1YmrSm/; 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1708294064; bh=u3qYSIEt7wSwysWILAwarLcU86NlQvPnZ/iycotOidc=; h=Date:From:To:Cc:Subject:From; b=m1YmrSm/gLz1xJVYQXHLHhlNibmcRxgM3Nk8N3F+HGQyxQ/uioG2QPgiHaVNy2p5n 6CCwYmJRDEXRMnzkdsb5H17kbBYzt1XHpACWnYhymc029w5bh5/OzgHOHWROltBp57 IFYSU99V6nsck6inM/n08wcQlOmQTRa59EK2//3qiuxKTmqml/gExFWscvA4jlQ7qE KtChDPCUazO0sy9zWOgo9mPsh6+AEkKtCYkZn8GpE4QDXtqZ2d6V0sIb9xlbdDpEuF ebLEcLIw/2UPzUOtBU/+8qH+vPbx6MfX0ikHA9I+9N3ZAhk6bT8CMobQff2XG6c0YX 9XsIYy2563gAQ== 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 4TdKXw4TfPz4wcV; Mon, 19 Feb 2024 09:07:44 +1100 (AEDT) Date: Mon, 19 Feb 2024 09:07:43 +1100 From: Stephen Rothwell To: Dan Williams Cc: Ard Biesheuvel , Ira Weiny , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the cxl-fixes tree with Linus' tree Message-ID: <20240219090743.1019a5f8@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/QjBePl/iy+7ECcbgyvh7q9i"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/QjBePl/iy+7ECcbgyvh7q9i Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the cxl-fixes tree got a conflict in: drivers/acpi/apei/ghes.c between commit: 54ce1927eb78 ("cxl/cper: Fix errant CPER prints for CXL events") from Linus' tree and commit: 6cb604ed24a1 ("acpi/ghes: Remove CXL CPER notifications") from the cxl-fixes tree. I fixed it up (I reverted the former commit before merging this tree) 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. --=20 Cheers, Stephen Rothwell --Sig_/QjBePl/iy+7ECcbgyvh7q9i Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXSf68ACgkQAVBC80lX 0GxTLwf/TQmUZLa83oXxh6D+R7ZquWjdA7eTV7o780EYTtK3NS3b8dLbwFbH1Yxf jVcuH8ECa8q92c/ob0149gL1UWpTk4cCkXcD9sc3Cifo+bgcBELiiyQUwtp3RN3f PJPPsMsvKNtYNSbapsVChU41lxaymueI8qTnlxTyXZBmnOuaSdTkIxR9Ovulyr0g GaaSMPDLb8PxV2DzQCDRaaTaGU4VH3fCqjwjZsOYaJFuCrbL1RO0lbDvbPnxn5yt QxKKuaIk0W21+2IrbpSqcJr2fMojG36iNJVdAq0D3Se860KUjwa7I1XIfwoTrr2X QkhbvfkWSdPhru7Dk3kSqsVxcsSgOA== =GnwV -----END PGP SIGNATURE----- --Sig_/QjBePl/iy+7ECcbgyvh7q9i--