From patchwork Fri Feb 23 03:03:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 205187 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp353484dyb; Thu, 22 Feb 2024 19:03:51 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWljRIeJan21tGPXm7oZ5tGHLyrcqbdTf8cdD6eLaFatxp4zpxVfK/NHIT8asgd5s0gGur9IJ4dqb7M0wuYzmP0QDMuQg== X-Google-Smtp-Source: AGHT+IHpl32NkF8ghkjtEQoDCWVNlMoo0grcWXwMttWFcnOE5SuzTxjwSlv9nxh2TxWxKr0qgMuv X-Received: by 2002:a2e:8ec6:0:b0:2d2:3214:e43 with SMTP id e6-20020a2e8ec6000000b002d232140e43mr463087ljl.34.1708657431121; Thu, 22 Feb 2024 19:03:51 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708657431; cv=pass; d=google.com; s=arc-20160816; b=Ihjry5X1VGdzS1yTd4CY8LREINBnLDAyE6cT0OKrIzjALpXvK/Ip2x/p+7V7kpeZbw 8r8K45sgZwDsdATCr675A9US078s+JHxXHL5XASdP50MOaxuR/8OD+Fac41ydwP8XsRb ved9qGkqmPcOPeIF91ChkIx+fTGS1BrAjId0v74g60dTQ5weU8GbqRqHKvaEsS01tjBe qzowVkiDaVHwN7jYlBa0pMSsnxBM2vKljRrbpihWZDheZ2LINWx9QR+hK2c8pkvjYfmf AX2Od8fGWVzoJA5gizr8ah5fjfRHsbm885f+Z2/Rl58RkCNag/Vsh3L+b22xiw7J2/2w Q3nA== 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=aHXZ7hyWfBWjkcFvg5uVCooNUuzR8bqzQTO/wjmanjc=; fh=lCup6ERysKNMBE++FSSh5SN38zZ7PJcMes8buTdc1cc=; b=GUYG7wdrD8p2/eQviwsc/77Cwi/UMQGflB9f5E4r6l5OYZSTWq6r4JHwvcJ+wSc3xI CzSsBtSXMHqX/GwlizN+IjYjlZe2atAQ2L/3TvTZBE7Tdt1HChg37MpLWiqnY9K4txEl rWhpGgJMlzVsfZQgU9jpJCp46ySXtPTdquJnx6Vq/iEGJAu6ZHu3AWbGrjG5GfukYNZ/ tUETd7a5KC2lyNWBvuOa3PCfVQF4UZ6GsnsaIAmIFCrD3sZXlM24vZPXSeWUcq9Qoxe1 jhnZP9HFB4HHnS3zyzN5meglA9v9iI+2rczWiQkdVl0t5icuiX45G2il8jIWGVVvkiVG oGLA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=IGVhEWfj; 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-77697-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-77697-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 z12-20020a50eb4c000000b00560a161d4e2si2062469edp.232.2024.02.22.19.03.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 19:03:51 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-77697-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=IGVhEWfj; 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-77697-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-77697-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 B0F9E1F24DAB for ; Fri, 23 Feb 2024 03:03:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EFBD6D2FF; Fri, 23 Feb 2024 03:03:38 +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="IGVhEWfj" 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 68B08BE66; Fri, 23 Feb 2024 03:03:31 +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=1708657416; cv=none; b=AtUn0NwtWkImqZanzsXbw9c5jZXN3kQbKzB78SMXxYkVs3cX/xeafxP8s1LgWzBw+HXaclMJgSZhovRRKuEiO+FFpAOdEq7BZWtDsDtu2Lz5TeVW5ipQl1/4BeBkc6PRaflcpGo7BCV/t/D6ANMwGw3yfTeBqwz9IZUkQQ4rKcs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708657416; c=relaxed/simple; bh=+u2q9LTg8q2yQwkOYebvqRkTz5ifi/E94qTDt8gE0js=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=lSRi0vzrfYHasRRI/19iA991QO3ZzVRkVThAe45RYvtx/ChOY7rtM533OA3XKXe5/rNLWwhvoX6KaDwWz1wS1E0wXV7yJ9Q/46Lnq6LtBtVuNcwnP9UXwx53b0RkVK4w/s1c0u1HYnNWuFKDShUSYAIff/Y9gN6ksq/I/drS/N8= 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=IGVhEWfj; 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=1708657410; bh=aHXZ7hyWfBWjkcFvg5uVCooNUuzR8bqzQTO/wjmanjc=; h=Date:From:To:Cc:Subject:From; b=IGVhEWfjPc30DoWk5F5+009u7bo2c7A/LNkMuiQZi8DYWhr0RhakiXleTGbVYjmEe Vz5fZCGT0N9/CKQk2/RC8G+OfS79F138NBMnAOGLUGR/E0ddOubiTmGgjhIaTMvgqI 3CIWFVxbC47BHC90qzX1ds08HYbEgxnB6uqW/yLPxeeq1sedtyNR5Tb0PCEHIBgsO2 873jouXPbagXWSKujQsx70i46Es3JreQIiMfp/v0O0jvuEqEDl4Edo5pXrjGQbKIwA 6s4vxbgT+boXCvPVnYaNiJH/gVCvbCrlKTPE7VxNsdShWJgtQim9C0Df1moLV5LCWd 1YBsoS8mzOVTQ== 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 4TgvwJ1jlSz4wc4; Fri, 23 Feb 2024 14:03:28 +1100 (AEDT) Date: Fri, 23 Feb 2024 14:03:25 +1100 From: Stephen Rothwell To: Alex Williamson , Jonathan Corbet Cc: Konstantin Ryabitsev , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the vfio tree with the jc_docs tree Message-ID: <20240223140325.345a9cdb@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: 1791657174691716285 X-GMAIL-MSGID: 1791657174691716285 Hi all, Today's linux-next merge of the vfio tree got a conflict in: MAINTAINERS between commit: 27103dddc2da ("Documentation: update mailing list addresses") from the jc_docs tree and commit: 05f3a0bd094c ("MAINTAINERS: Re-alphabetize VFIO") from the vfio 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 MAINTAINERS index 818041f70659,7625911ec2f1..000000000000 --- a/MAINTAINERS