From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2B279C433E6 for ; Thu, 28 Jan 2021 18:03:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 036C664E0E for ; Thu, 28 Jan 2021 18:03:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229748AbhA1SDh (ORCPT ); Thu, 28 Jan 2021 13:03:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60306 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229593AbhA1SBP (ORCPT ); Thu, 28 Jan 2021 13:01:15 -0500 Received: from smtp-190b.mail.infomaniak.ch (smtp-190b.mail.infomaniak.ch [IPv6:2001:1600:3:17::190b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86BA1C061573; Thu, 28 Jan 2021 10:00:29 -0800 (PST) Received: from smtp-3-0000.mail.infomaniak.ch (unknown [10.4.36.107]) by smtp-2-3000.mail.infomaniak.ch (Postfix) with ESMTPS id 4DRSth2VGKzMqm0V; Thu, 28 Jan 2021 19:00:28 +0100 (CET) Received: from ns3096276.ip-94-23-54.eu (unknown [23.97.221.149]) by smtp-3-0000.mail.infomaniak.ch (Postfix) with ESMTPA id 4DRStg1w48zlh8TK; Thu, 28 Jan 2021 19:00:27 +0100 (CET) Subject: Re: [PATCH v4 00/10] Enable root to update the blacklist keyring From: =?UTF-8?Q?Micka=c3=abl_Sala=c3=bcn?= To: David Howells , Jarkko Sakkinen Cc: David Woodhouse , "David S . Miller" , Herbert Xu , James Morris , =?UTF-8?Q?Micka=c3=abl_Sala=c3=bcn?= , Mimi Zohar , "Serge E . Hallyn" , Tyler Hicks , keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linux-integrity@vger.kernel.org, linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org References: <20210121155513.539519-1-mic@digikod.net> <3613306.1611852751@warthog.procyon.org.uk> <03ddd243-db25-a054-489d-e64ead4d6f59@digikod.net> Message-ID: <09376843-a55f-476a-7073-91aacc9ebdc8@digikod.net> Date: Thu, 28 Jan 2021 19:00:33 +0100 User-Agent: MIME-Version: 1.0 In-Reply-To: <03ddd243-db25-a054-489d-e64ead4d6f59@digikod.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: keyrings@vger.kernel.org I noticed that commits in your branch are not up to date with latest Jarkoo reviews on my patches (see changes since v2). There is no conflict if you replace conflicting patches from your branch by patches from this series. Could you replace your duplicate commits with this patch series? On 28/01/2021 18:38, Mickaël Salaün wrote: > > > On 28/01/2021 17:52, David Howells wrote: >> >> Hi Mickaël, > Hi David, > >> >> I could pull your patches (unless Jarkko wants to), but can you please drop >> the patches that are also in my keys-misc branch lest one or other (or both) >> of our branches get dropped in the next merge window due to conflicts? >> >> Ideally, can you base your branch on my keys-misc branch? > > Sure, I'm rebasing and testing a new patch series. > >> >> Thanks, >> David >>