Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp34703180rwd; Sun, 9 Jul 2023 18:40:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlGJU3vZnXn6ARM7fxIlJYYDnjLQEoEUQjacjJRpM/XmLsz/sryorNMDad7IAA9e1/m0zFu3 X-Received: by 2002:a05:6a20:6a07:b0:12e:ec4b:f953 with SMTP id p7-20020a056a206a0700b0012eec4bf953mr10862675pzk.55.1688953247205; Sun, 09 Jul 2023 18:40:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688953247; cv=none; d=google.com; s=arc-20160816; b=RU/AL9pFzrG+U4bXawl107d6H6aVLqx0e6tgnNByF6beA6jpKo1WJ8HXIGDJ2y1A5P 4Pc24Y1ql0WRGEOgM4fFL1NyU83JdibFnPRkV9eGJy1VBlSfoBhA0VNJ0nVBAba/lptt 8Stm7gLRcvx3JNggQB9at1UqC2KF8aBw2NJD/2xaoW9Eq9OYe3+F67pP/sxHQH+Pwu4r QYvKMFBnDDtoFGcxfFZIOjZaK+DZ1qPMGCpW3NG+QkmSn7qfvrmoNCcCwBuwqKXmsUmL ClqC44a/n6VXQ4xd4M6+UqJR6xT9wMPcmKZF+56k11VOO7ht7VLFBUgWItK5eHRQlmFM +qXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to :organization:from:references:cc:to:content-language:subject :user-agent:mime-version:date:message-id:dkim-signature; bh=mK6n+/4iZKOHIOsh2YzYIgnziHiQD/4k5lJoDd1mIi4=; fh=TXLghx8guzFLgUEoqTuaSHATHQhF6bgo/KF1TWcc3QA=; b=Qesp5NSWaMC3af7Oi0xai8azP5NLoUMp52fCp/tLUqBok817H31jSBFC6+q9Gg/LE7 j9u71xkIT8mMZL4VIqVTC1mLdlscXGmuMQ4sZyZ5O7HKW9Nt+BRDV7ZWGFHnre+nj7uO pT5OZ6PvkBA5fHQKM/SjRXWeQ6GVTCR0FdtTEEUgn9s/FzYrQyGwCiHpJN44BknsK6Uc BYlUhB/1K/oz7HXzTZFLm3EYYCuD3JeUQLHXFku9mnk+1iE0+NKtqePXAxODH7SSgBiq Y5oJl7RZCYNw0XlTemTSM56uH5791KsNnq+oiNAq4hcv7Z0vobfp9BBUrBAihGjqfDuc dsjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=OeWpWGIb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b11-20020a170902bd4b00b001aaea258805si7727516plx.134.2023.07.09.18.40.35; Sun, 09 Jul 2023 18:40:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=OeWpWGIb; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230223AbjGJA7Q (ORCPT + 99 others); Sun, 9 Jul 2023 20:59:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229441AbjGJA7P (ORCPT ); Sun, 9 Jul 2023 20:59:15 -0400 Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01B01B1; Sun, 9 Jul 2023 17:59:13 -0700 (PDT) Received: from [192.168.192.83] (unknown [50.47.134.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id 9D3B3413E6; Mon, 10 Jul 2023 00:59:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1688950751; bh=mK6n+/4iZKOHIOsh2YzYIgnziHiQD/4k5lJoDd1mIi4=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=OeWpWGIbl1VDL+PJbpJl37PbeQHB0c0oA+zeO4SM0TVYw1K2tsJeIlyulEq/Avp/6 +hwzRtxdKinLXCbyh6yj2mf7q1nKWjfL0WJdaCnjrCveR5w/t53yZU21YTR1PGDoAm 2axXa8xdo4yPFX4OGuUFuTDJSTXPdKdeI20xXr1oA2hqsiKVRHFSqwE/kwn6O/sNIX 2Ii1O0WEPGdqUBOkJWNewP47D6FuxITe4ap5L8P5KsHX+WbRYwNq4z97IwbkpVge35 zma8K9nEQT2ZPrOAc8MUBb3O6GCbmzz+DE9W0SStAz6lZNGZ5q/ZTA+W97rpMUJz0T wGYJFWAVvzEFw== Message-ID: Date: Sun, 9 Jul 2023 17:59:03 -0700 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.11.0 Subject: Re: linux-next: duplicate patches in the apparmor tree Content-Language: en-US To: Stephen Rothwell Cc: Linux Kernel Mailing List , Linux Next Mailing List References: <20230710082223.7585feb8@canb.auug.org.au> From: John Johansen Organization: Canonical In-Reply-To: <20230710082223.7585feb8@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 7/9/23 15:22, Stephen Rothwell wrote: > Hi all, > > The following commits are also in Linus Torvalds' tree as different > commits (but the same patches): > > 0bb84cff96af ("apparmor: fix missing error check for rhashtable_insert_fast") > 1079ff8963ca ("AppArmor: Fix some kernel-doc comments") > 97a79eea1797 ("apparmor: Fix kernel-doc header for verify_dfa_accept_index") > b45be9bd7cf9 ("apparmor: fix policy_compat permission remap with extended permissions") > c96a8a8c021b ("apparmor: aa_buffer: Convert 1-element array to flexible array") > cb60752f0c37 ("apparmor: fix use of strcpy in policy_unpack_test") > e31dd6e412f7 ("apparmor: fix: kzalloc perms tables for shared dfas") > fd18ddebace4 ("apparmor: Return directly after a failed kzalloc() in two functions") > ff9b84eade6d ("apparmor: add missing failure check in compute_xmatch_perms") > my bad, it should be fixed now