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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 235C1C433EF for ; Thu, 28 Oct 2021 16:15:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0BDB9610CA for ; Thu, 28 Oct 2021 16:15:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229846AbhJ1QR1 (ORCPT ); Thu, 28 Oct 2021 12:17:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229565AbhJ1QR0 (ORCPT ); Thu, 28 Oct 2021 12:17:26 -0400 Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E1552C061745 for ; Thu, 28 Oct 2021 09:14:59 -0700 (PDT) Received: by mail-pg1-x52d.google.com with SMTP id t7so6846774pgl.9 for ; Thu, 28 Oct 2021 09:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=RIRl/cX9bRAdZ2iE+RztTT8DUmuRWcio5MFjZ21K1SU=; b=nZQ+/sqMzlDgKS5zdUiX4/1c2J50t2MBLiIi87+ZBwv2fDdhvgpM5rjvZ58uYYr7xP 6KB3YlG1RKTNIPUVynbJR5EASynlM6Bdk+d7mt5bp7JEgSEYFUlSUJ37ptcZvAkYDEy4 rEymG9WyGFP/L+JQw8xnn9HVzrqXW8627L8Uc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=RIRl/cX9bRAdZ2iE+RztTT8DUmuRWcio5MFjZ21K1SU=; b=WJbKmHTe+Gw874i7OOss9ssNiajvH8r3OFyUAQkRdhCySWTJmXrwXfyTaZwicZcZIZ /DEXvJeruRQpRuKJpjvfQzpzNlLxvfmVs9mSH4E6dO9vCFpc8ZYDuoww1C+4Se6hwmHc h6pKXoauYjdScAcolvERlFxPIlGSoWwFL7JTHsoGLBZTtYkRnouK1pzdp91RhqZhu0G9 MtPaJMDy3/ACwNhSrEWMTo/9Ur5oaL28FHQivWQfZ43JeFe3XtG4afjMQbiO9Ec/yPAn VG60ussjQT/BX2+25jGF4nFhyWlOSJoJlll2WHIklP4z9Jn9BviiBu7DlXKeUkHHfyZn EU+A== X-Gm-Message-State: AOAM532JuGAjHfMh5O0tuVErF7uSXkCyvZC8MQ4tF456Cqtn2VWWUT4+ 4dUBSNnytHTlRvLBJ8ssPI56vQ== X-Google-Smtp-Source: ABdhPJxE6O1c95Dnzr+CmiuzlG+RTD1Y7zdAwochLmVPTlvdhZQM1NIDVXTIExAraNX+vTUmR7ciOQ== X-Received: by 2002:a63:6e8f:: with SMTP id j137mr3854160pgc.381.1635437699460; Thu, 28 Oct 2021 09:14:59 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id oj5sm8520291pjb.45.2021.10.28.09.14.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 09:14:58 -0700 (PDT) Date: Thu, 28 Oct 2021 09:14:58 -0700 From: Kees Cook To: Kalle Valo Cc: Stephen Rothwell , Wireless , Linux Kernel Mailing List , Linux Next Mailing List , Luca Coelho , Miri Korenblit , Jakub Kicinski , David Miller Subject: Re: linux-next: manual merge of the kspp tree with the wireless-drivers-next tree Message-ID: <202110280913.B8D76EF@keescook> References: <20211028192934.01520d7e@canb.auug.org.au> <87ilxh5yph.fsf@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87ilxh5yph.fsf@codeaurora.org> Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org On Thu, Oct 28, 2021 at 11:40:42AM +0300, Kalle Valo wrote: > (adding Jakub and Dave so that they are aware of this) > > Stephen Rothwell writes: > > > Hi all, > > > > Today's linux-next merge of the kspp tree got a conflict in: > > > > drivers/net/wireless/intel/iwlwifi/fw/api/tx.h > > > > between commit: > > > > dc52fac37c87 ("iwlwifi: mvm: Support new TX_RSP and COMPRESSED_BA_RES versions") > > > > from the wireless-drivers-next tree and commit: > > > > fa7845cfd53f ("treewide: Replace open-coded flex arrays in unions") > > > > from the kspp 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. > > I don't know what kspp tree is and either I don't know why they didn't > submit the patch to wireless-drivers-next, so I assume they will handle > the conflict as well. But I really prefer that they would submit patches > to wireless-drivers-next instead to avoid unnecessary conflicts like > this. This was a treewide replacement with a dependent macro that was supposed to be merged last cycle at rc1, but $shenanigans. Sorry for the conflict; I'll make sure it is adjusted or called out for Linus when I send my tree. -- Kees Cook