From patchwork Thu Feb 22 03:20:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 204545 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:aa16:b0:108:e6aa:91d0 with SMTP id by22csp6280dyb; Wed, 21 Feb 2024 19:21:09 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUDr8eAIDYbtBq0d82coVJQX2WHjcek/0rnEhJ/1kGd7zjKX6MjmayR+/F2YvRcRfvIb6hbzTdlq8D8GI1HX4zjZVpAiA== X-Google-Smtp-Source: AGHT+IGRe0DtNMLlcMDdumsY2bIlntSPgQMDWVZgnDFUdWxRGu0CinDX2bfqZe1hQ7a6iA9m25uj X-Received: by 2002:a17:906:4c42:b0:a3e:6aef:bf2a with SMTP id d2-20020a1709064c4200b00a3e6aefbf2amr7227171ejw.22.1708572069225; Wed, 21 Feb 2024 19:21:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708572069; cv=pass; d=google.com; s=arc-20160816; b=DFjPf9tZ31xMlOE6l5kp/PiMeeRFLGrGiN15m7to/Jk9CdB3+FQ3HLMeO4O6nI0EK/ +4c3+03Qq+ENnD1CpWIFsoCE15g8WuuGtEiLxPjgFQHkXu4i4m6DZ16JlmLurf+DmfmU 8p5T1eRgq+ILe325bh5H1YuFyo813aLXDFMmtBGWy4Y79UqtBJzWyvwkVVLL6lXD5Rob 3/AVGSJAQFUEkuHzgQIZpt423tLPJr8jaEJtmq6/L/V594V+OLNyW8QA1UFkhER2DPe4 ikFWCCzLE3LAgZui3NXRAVnwjFRv/IGpzBh2gEE4ax21G2Q+7I+fNLSbmit47f1TcKt/ TxGw== 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=oBSO6ysOSxxXiUfgyhcUecXa9K+EP0YyTafSTYmTvms=; fh=+o+QL4aDpAxQ5wvql9xYdVzLS/qcugim7T3lgrxXngE=; b=rhbV/H6+fB8rGR4iyo6xV6JIejOhvKkRSMH8k0tzYGb0gg0zpZBn5BkWyeZ2IDVB6N w9qwBYwdXnVtsrhczBbNR+2JgIhKa1whGrvuTPqAfWqniVk5N8tlwUWX+AfgBBlvGtUR y6Aw3TeUr9AyuBqw/sRCDQl5eglxrcRTj1WFq5Wvw4TdRMcp511ijPR9fzbed9iWoFgN T0bQm3BEYpiJL4mR1GPJREKYWw/be3MH0TIHtA9BZt2GJWEouBbekHQTyJpgRmutXNbd AiypmGEtkRFBQK2PF29YVI0JgkzRr9bVHmBGk/OpinBVmJY4Gs5dJ2uuyigvfmAY4chU D5OQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=ZGHPD41W; 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-75843-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75843-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. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id ha10-20020a170906a88a00b00a3f21ca2030si1362124ejb.907.2024.02.21.19.21.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Feb 2024 19:21:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-75843-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=ZGHPD41W; 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-75843-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-75843-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 985E81F23B30 for ; Thu, 22 Feb 2024 03:21:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1D9681757B; Thu, 22 Feb 2024 03:20:52 +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="ZGHPD41W" 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 2B788111A1; Thu, 22 Feb 2024 03:20:45 +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=1708572049; cv=none; b=WfrWfugEKH6ZsVv99KVZjxPg7KuYmpog6mmMpcjmeO+CFqzyJQ96y2kT/bepNj8uCDy39gcHsY5jU65Kb/RWTUF0Ni9WUqn6AXuWIG23ovMkjI9dXrPSZK4q+mtTFs2oj9s5VCg8J2wSTYwZFZaNSsLfvuQbbBWInCxXV0ouQys= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708572049; c=relaxed/simple; bh=IQ0ZMvLgOUxRopPeocg673eNhzfHGAiic6IZwBbhKNc=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=dctj9v+2AV++60vmUtmUnUDuImnAbQOtid0qPxZSgIvPDQsXIGFWJTBg3kV3cxWJ2mxAG0/ll8DnTGHZ23ySFtFoWiQ2fDvR05og3xWUuxq15zF16VSGEUk1zRE03g3at2jXiWwqqlKe+F+G6qq+rTOspiXwBFikorH4lzP0L7g= 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=ZGHPD41W; 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=1708572044; bh=oBSO6ysOSxxXiUfgyhcUecXa9K+EP0YyTafSTYmTvms=; h=Date:From:To:Cc:Subject:From; b=ZGHPD41W5HAuQ1qTji3ozalkxA7m1nYjnp4h5MbhyTlW/4vPB/qROt0ff0KFaK4XR 4ss8+0hxY5m6ydRx9za3jtX8H4a/WiCH40EeKm3S6Rpqmro35bPmv2Pj0QeMEqYfNx hsWhy/PXZecq12ItXsrQ+hOhv71dE+F2Hs9mE9DveJ4aZ8LGMXGaf/zfaHqJbGPKwd sIXs1NO0SJ27Q852bjasftcRr6h6eNNCHX1BqqDdGie3uMxYlb5VhVDZhVOCYky2e1 GjMRSd4j/9FeOnYyrRpvicr9W/ClgYLN1LiygAGIwc71MAT4+2sCAv0RQ/4uXn7AVc 01+mCVQxp6G2g== 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 4TgJLf3xQDz4wxY; Thu, 22 Feb 2024 14:20:42 +1100 (AEDT) Date: Thu, 22 Feb 2024 14:20:41 +1100 From: Stephen Rothwell To: Mauro Carvalho Chehab , Borislav Petkov , Tony Luck , Jonathan Corbet Cc: Carlos Bilbao , Linux Kernel Mailing List , Linux Next Mailing List , Yazen Ghannam Subject: linux-next: manual merge of the edac tree with the jc_docs tree Message-ID: <20240222142041.34342553@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: 1791567665885302322 X-GMAIL-MSGID: 1791567665885302322 Hi all, Today's linux-next merge of the edac tree got a conflict in: Documentation/index.rst between commit: 9ee367809c67 ("docs: Include simplified link titles in main index") from the jc_docs tree and commits: 1289c431641f ("Documentation: RAS: Add index and address translation section") 0e4fd816b08e ("Documentation: Move RAS section to admin-guide") from the edac 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 Documentation/index.rst index 429a407470c8,9dfdc826618c..000000000000 --- a/Documentation/index.rst