Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp514239pxb; Wed, 20 Jan 2021 12:43:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJxN3M3zs41NGlXKATBUsNPAsge36UhQLmMoe8FLptqRO6goUsW5IAtN7GzHyeRY6Ker+r3b X-Received: by 2002:a17:906:25c4:: with SMTP id n4mr7313896ejb.359.1611175411981; Wed, 20 Jan 2021 12:43:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1611175411; cv=none; d=google.com; s=arc-20160816; b=uj6tqr22rbUO5yTonpWT63r+nysC7aqmpzG9BG1zAEENxOF1WyA5XmY8feNEyxiARo C90tR1bwBIVQfGxWseAjcpPajnBIM31oexHKjFT0htOpcZPWW+3L41P+R+xjc4eNrLS9 Ll4P/oIxeER81MGAZzcH26ph+arCM2v8QjtSSNeKntN0Vrne7wRQv54U9+4uTA8imqN3 13ew7OFXB4K6tFILucf9DhyjuWtoVNj1cDduLzBI9Hc3pEWYF5sta6jgEYz2kmqn3cyC YIT+jauDfnIc87sIIENGjFPpVACDTDA3sDpIcLOH0MI9rSsCXqEVafAtuuGOPXi8LFfX v0zw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=SQ91aLmivl2mwVLPS6cUtaaHv1qmV+d5TjYT2MRgbtk=; b=nNXNl8vgrSpyEyVQIHBwu7V84EspmDtKovV5LwGQu57Wp9FE7E3wAJ6eAIISDuJVnE 0RJIbjcKz7YxfJD3M7LOqivi23gkPugmENekw4nW3m6X6wzrkF2C2BiwBqh9YdrCz3Qp moiE6kwXcRdssZMfimflY6FPj6dJseebJ19M0TuFedS+ryoH48MlfCp54CHTCud4kw3f 4Vs+IhJUPKbupk+LRWyZpC3/5GU7qG5IX/Rz1TyW7H/TjQJDuuvl1wRVhB6dKnUfdRBr rIuifkqIcud7ZwmXql74ap10fI+ioDLhnqFnITf8TEOwBKjynoDjtn/pS4NEU4snEGOj NhqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rCT1jSJh; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t22si1018540ejb.452.2021.01.20.12.43.04; Wed, 20 Jan 2021 12:43:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=rCT1jSJh; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387853AbhATUmE (ORCPT + 99 others); Wed, 20 Jan 2021 15:42:04 -0500 Received: from mail.kernel.org ([198.145.29.99]:45138 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730157AbhATUik (ORCPT ); Wed, 20 Jan 2021 15:38:40 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id B15F1233FC; Wed, 20 Jan 2021 20:37:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611175073; bh=PoEuM5RihGLtvLuo+/upWFzSGJuLQE0GJTiZhs/OkXA=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=rCT1jSJhdukpLq3EZ/Q0CgA+H4LT8Kzm3VMcYVliKfKDHLddigqQvycfBG4o4OPPk 7xrXK6tulPdVWbCclghNnXvG4mlQkyyWAeCU/vTjDMwzY1nRO1XsSKy8LBWAMFWjBz dLc/dmfMkyNEa4wvJwzUj5PpaMbRAmT8vSecjLap+k2o3Ax3uH+Tv+g+MhMZqOc+f6 xn/ItXwe092nCtxNghWu1TDC7gyKUcqM1MFbzToI9Wh0CfZBnDsz/xU8Ie+pPlcrRa DctTZW66eAwGtoxakjipb3vWhXu9RwrR7fGx4TmxCaIjDrjQ2eu8BQL036/O0rHn3J u5Bdb7w5GB5fw== Date: Wed, 20 Jan 2021 12:37:52 -0800 From: Jakub Kicinski To: Johannes Berg Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org Subject: Re: pull-request: mac80211 2021-01-18.2 Message-ID: <20210120123752.636659d1@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com> In-Reply-To: References: <20210118204750.7243-1-johannes@sipsolutions.net> <161101020906.2232.13826999223880000897.git-patchwork-notify@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 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 :) Out of curiosity are you going to rebase mac80211-next or send a PR, fast forward and then apply the conflicting patches?