From patchwork Fri Jan 5 02:11:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 185195 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp5980918dyb; Thu, 4 Jan 2024 18:12:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IGnDtIZR/pxSUhZeuZgT3fI5HzFiewJ6KmX7AMFfqUomztciUTtH2MJ2lw3cdi9lgytA6zW X-Received: by 2002:a17:90a:fd96:b0:28c:2616:6eab with SMTP id cx22-20020a17090afd9600b0028c26166eabmr1443736pjb.7.1704420766866; Thu, 04 Jan 2024 18:12:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704420766; cv=none; d=google.com; s=arc-20160816; b=VZh/TD/fxg1nFZXx4IT3Hbvl58ZG62z+nU0xjbsWemalKMR+98BxcHoSdYkr28irNa VB4BLLeV9N19f3F1PcvO1dtKhLUBMI9Jc5AUSN4RK0IxsFOJ4TPStH0cufcDW7a2TCX9 SO0sm7ET/k5iYEwXZ9dBWQCbbShWgrpfHkdGjIDBXZtLN05f4HyApivxskJJrsUEMSjf VhuRLXuKM98Pxdj5W2nL/OaQjnniSiN4sJWGNQNQVq6POeXZ29Z5j23T7L0cqOASYqfJ GtSHpL6kWpNC6IMYXsNh1cI1o8nbThfVN1KLCGhovPyv1NUQayhLCCMRMrO6M0mbbgLx rYjQ== 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=8zHJ31DhC1Lvs+CITjrFIsJWiZrY43yUu1UaoB0v8ZQ=; fh=YAPlm4IKCi55nflw/xsxHEDsK+B1935+hFeapeFLQHg=; b=e3mEkpukMYR3nb2tpDBkXwLE92lcOFR4vIuRmt4009J7VGid68lCy6jvkMNAxgjDnE 8OwEef+SN4XY6ErLrvvj3yJ3PrVByKJs4JvblfWKAly/HfIWKEjd+zXnLv8sTgU0XOxx 6o/PoRhHFRGJfFWwqjzMfeIvv2M2q2AKz/p2kz3nuex0TEnCh6SQMrABhpl0MkRtKoCS Po+p648IngXY4UyHjgKBfiPixQU8i0QMYVideeDwxXqChEzK6v1dNZXrJDsQvJKFcUnb N3H7oJUQJ7fw2rTHyXIw3O43IdAIsku6+HGj40+Tc91ImGEs4aorSuviiF1JFEPc30l9 ykUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=pTgQgJBm; spf=pass (google.com: domain of linux-kernel+bounces-17407-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17407-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id ix18-20020a170902f81200b001d4273c04desi420098plb.459.2024.01.04.18.12.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 18:12:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-17407-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=pTgQgJBm; spf=pass (google.com: domain of linux-kernel+bounces-17407-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17407-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 9A521B22CFF for ; Fri, 5 Jan 2024 02:12:36 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8DBBE1FA3; Fri, 5 Jan 2024 02:11: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="pTgQgJBm" 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 74DDF5255; Fri, 5 Jan 2024 02:11:44 +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=1704420703; bh=8zHJ31DhC1Lvs+CITjrFIsJWiZrY43yUu1UaoB0v8ZQ=; h=Date:From:To:Cc:Subject:From; b=pTgQgJBmYzUzOq6yuE6ow78PxuIEcChbLeEpkNFhAfKtkcx+iNspmUI5ke02qR/IA 28RQGw8cAzpIhjyBP5CkzZy+r6U/iIeo+9IjtsPTL579LWKfe60bWkByUC6YmOGtNk chzoy80hMiEN2p2PdwHSpdai+2Lvaqbx2CNkLyWQOMtjbi15vOWipMLa8JNn5UjyWK 3x4fMUVsNe0rpVWLimhu7eAk4nI8GrHj0If7t72h4zm2WIToENjsK2jMQU7xaVyxTn cgKx/NaC29yJWyZ1iC2sXA4Ht68jUJM+qL0vMPk4hqkogDe5avY4FMzLwkMEPtWJfb j4U6tJPvBn+EQ== 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 4T5n5B2wdgz4x1x; Fri, 5 Jan 2024 13:11:42 +1100 (AEDT) Date: Fri, 5 Jan 2024 13:11:40 +1100 From: Stephen Rothwell To: Paul Moore , Jonathan Corbet Cc: Casey Schaufler , Kees Cook , Linux Kernel Mailing List , Linux Next Mailing List , Vegard Nossum Subject: linux-next: manual merge of the security tree with the jc_docs tree Message-ID: <20240105131140.7afdbbe3@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: 1787214710272647773 X-GMAIL-MSGID: 1787214710272647773 Hi all, Today's linux-next merge of the security tree got a conflict in: Documentation/userspace-api/index.rst between commits: 77e075579e88 ("Documentation: move driver-api/isapnp to userspace-api/") bb67bf1c4a56 ("Documentation: move driver-api/dcdbas to userspace-api/") from the jc_docs tree and commit: f3b8788cde61 ("LSM: Identify modules by more than name") from the security 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/userspace-api/index.rst index 74bc0716432e,8be8b1979194..000000000000 --- a/Documentation/userspace-api/index.rst