Received: by 2002:a05:7412:8521:b0:e2:908c:2ebd with SMTP id t33csp1831502rdf; Sun, 5 Nov 2023 16:34:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IFt5isFGEzdX3OrcpqVhurVpFXVcxD4zFAEhOXM3U/JQ6Tgb2jPh08Pb2FIFOGca0v8Hx+S X-Received: by 2002:a17:902:f301:b0:1cc:31a8:d733 with SMTP id c1-20020a170902f30100b001cc31a8d733mr18702285ple.44.1699230856419; Sun, 05 Nov 2023 16:34:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699230856; cv=none; d=google.com; s=arc-20160816; b=ZS6xQMDvF9YU1SMUGhMZWk4iEM5nrNOF+RO0TDVw2DFOMeBl1wC7KlHFwhVf0lbu3G 0Dk+zglxJAxnpgtUGsB4LBZiArzg9buQnkJraKGZ7GuSdgPunjxfp6s9zl5/+YeEkeHg GSjRr8NqY43CVGcCzBK/WPsrLdsinoMLOZbFO6Y1MKx883OeOsA+/9BkhcbWr+p4pk4Y VSvaAMHSueuCKnfrw6X+nPR6ypJwdJhVbHwlMGr97kfCsRPWbBmFfoooWrWo7lKUg7Av aOBoqmfAqrFp+3W76t8kUMta+9znB9Oh1J1fKjkzAN+f12jKg5Vr6rz7liZ2Aj0apq3K KR2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :subject:cc:to:from:date:dkim-signature; bh=WBDiGAvOcuom6RXSMC7UAIATNC5vZ3xQhXeA/DL21yk=; fh=zDHdmHRFur+JV1QC/YU/9u5/VDfd02dcVS/IXZdmZYY=; b=z/8laD3N2d47F2rS7Tfa/2gwFbotIs574o9SEKf8dAcQvfetWhv47tXACuFTxG4RTf QcHpP/zjASP+XJqfZqzu57lEcDbP6N/1Hq3ft5ehzyS+ukxaqk761VJV+L3FvTADsmPu mOlCRPizjcJX4tDRh29JJUAUZViuBap17i9bUpWUHwwokuLLCrxn0rEz9wTGCoeSfUx2 9/2taSwUQcnG92u8JS/aSHCw2lXrhgkzOeCyOZtP/T0zGbVte98s0HxuH0P4DT45XjUf +S7h9M0FZK/K/PwZKkAxwXLbXmSK0eBr9G8sYJDMT69rjSGOg7ndeR78px/YqvGDmn/g gxyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DHJs5h7+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id h4-20020a170902f54400b001b9c992945fsi7245410plf.555.2023.11.05.16.34.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 16:34:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DHJs5h7+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 84B9E806C35F; Sun, 5 Nov 2023 16:34:13 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229999AbjKFA25 (ORCPT + 99 others); Sun, 5 Nov 2023 19:28:57 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59098 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229978AbjKFA2z (ORCPT ); Sun, 5 Nov 2023 19:28:55 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 68F98C0; Sun, 5 Nov 2023 16:28:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1699230528; bh=WBDiGAvOcuom6RXSMC7UAIATNC5vZ3xQhXeA/DL21yk=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=DHJs5h7+ep/7dtt2Mtl131Bex2vMyh3QovrsDMXS5R5PY36cA7LFhY63urVYOQ88D 2CWzS2cMoxucCHJU3EGVrqnXHUptKK2U90sdEOjpSXGfGSQAEPd01EnTMdP/kzzKOG 1A4lK6tYM3ikSshJn9pLiLjF4ighBAJyMG0W83HSet4kbZ4GiIF/aF5cRn3S9hhhm8 TPmBsKwWdBs5AX5fgvvXgpUdzMNwRXyVaTNDrGYrx+VOllb8TfOR5EO3ks/T0XYx/h amD0u2QL8F87wWe4/dYquMV9zW0Fuph9N8/psf7GKpMYHbxm+1W5uuES0wz7DW6YeG mjkHpKJsBbrIw== 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 4SNsf75HC7z4xPh; Mon, 6 Nov 2023 11:28:47 +1100 (AEDT) Date: Mon, 6 Nov 2023 11:28:46 +1100 From: Stephen Rothwell To: Paul Moore Cc: John Johansen , Casey Schaufler , Linux Kernel Mailing List , Linux Next Mailing List , linux-security-module@vger.kernel.org Subject: Re: linux-next: manual merge of the apparmor tree with the security tree Message-ID: <20231106112846.4c2a5c64@canb.auug.org.au> In-Reply-To: References: <20231027130320.69469330@canb.auug.org.au> <4b4eb40c-b65a-46e2-9e23-5412a9cdcad0@canonical.com> <20231031074649.3bdbec45@canb.auug.org.au> <20231106101434.70c62773@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/I7r/1MZsaKk4CDvcdNuj3FV"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Sun, 05 Nov 2023 16:34:13 -0800 (PST) --Sig_/I7r/1MZsaKk4CDvcdNuj3FV Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Paul, On Sun, 5 Nov 2023 18:36:49 -0500 Paul Moore wrote: > > The LSM, SELinux, and audit dev-staging branches will no longer flow > into the next branches, and I've reset the current lsm/next branch so > this should not be an issue the next time you pull. Thanks for that. It can all come back after the merge window, of course. --=20 Cheers, Stephen Rothwell --Sig_/I7r/1MZsaKk4CDvcdNuj3FV Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmVIMz4ACgkQAVBC80lX 0Gy9sAf9FNd/8ccln5G1l6Ck9uvjjHpMWwQq35C3MRL4GWfVd9tN1AdEQHjyBWMf AohJ27AqvSd0ibWZUGskzeo9eYY6QfMksJpHFZbmyftfJOfe26Y/ElJZ3l1jAwgj XZcPK8aIP4rREioMi8ToNZNw0ad4j6V6Xo1OBl0hgQCA4btw/29wdoSj3eLXqxDC 6LFm8F9PVpc4QrtLYxHBlqZNGXP7h8JVHotXSgOrW5tkcKtulLuJBsQ9gPvK+UMs +wVvJ63O0FASLuIyF/9sPaOirzbCI6NId2pkI4VsqkB6RgzIhOdHXCd2XFjwdrw2 zQYVzegWupWz8zHzISWW8pza9yHOsQ== =4Hji -----END PGP SIGNATURE----- --Sig_/I7r/1MZsaKk4CDvcdNuj3FV--