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 B670DC433DB for ; Wed, 20 Jan 2021 20:43:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 77C6A233FC for ; Wed, 20 Jan 2021 20:43:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388435AbhATUmI (ORCPT ); Wed, 20 Jan 2021 15:42:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388535AbhATUkO (ORCPT ); Wed, 20 Jan 2021 15:40:14 -0500 Received: from sipsolutions.net (s3.sipsolutions.net [IPv6:2a01:4f8:191:4433::2]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 430CFC0613C1; Wed, 20 Jan 2021 12:39:34 -0800 (PST) Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_SECP256R1__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.94) (envelope-from ) id 1l2KGJ-009HTe-2E; Wed, 20 Jan 2021 21:39:31 +0100 Message-ID: <16d5ca0467273e2d6f3830a161fe84de104447a6.camel@sipsolutions.net> Subject: Re: pull-request: mac80211 2021-01-18.2 From: Johannes Berg To: Jakub Kicinski Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org Date: Wed, 20 Jan 2021 21:39:29 +0100 In-Reply-To: <20210120123752.636659d1@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> References: <20210118204750.7243-1-johannes@sipsolutions.net> <161101020906.2232.13826999223880000897.git-patchwork-notify@kernel.org> <20210120123752.636659d1@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.5 (3.36.5-2.fc32) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-malware-bazaar: not-scanned Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On Wed, 2021-01-20 at 12:37 -0800, Jakub Kicinski wrote: > On Wed, 20 Jan 2021 18:59:21 +0100 Johannes Berg wrote: > > Hi Jakub, > > > > > This pull request was applied to netdev/net.git (refs/heads/master): > > > > Since you pulled this now, question: > > > > I have some pending content for mac80211-next/net-next that either > > conflicts with or requires a fix from here, or such. > > > > Could you pull net into net-next, so I can get it into mac80211-next? Or > > do you prefer another approach here? I could also double-apply the > > single patch, or pull myself but then we'd get a lot of net content into > > net-next only via mac80211-next which seems odd. > > Just merged net -> net-next, you can do your thing :) Ok cool, thanks. > Out of curiosity are you going to rebase mac80211-next or send a PR, > fast forward and then apply the conflicting patches? Normally I'd send a PR for it and then fast-forward. However, it's actually empty at the moment, so I'm just going to fast- forward it to net-next before I apply the next patches :-) johannes