From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BAF2A79D6 for ; Tue, 24 Oct 2023 20:52:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="hnZxLEWu" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D617EC433C7; Tue, 24 Oct 2023 20:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698180730; bh=aQp1F2otzR+yr4CFoWGp/MeWGiQzu/fU52OX8xAthKY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=hnZxLEWu1oSLQz0KEFizxiMmvFMiBdppyMayB+hI+LOjq5lHB2UW7DWUnVdJFuTZv NsqcAKhY6xzMdmWgQkkphc2TObmzSzyUtnzDWrwkjjFue/kNzanH+bqmIUx4JZsPiE VrRlmhgBzRKQdcQf3g5CiXnRAt3F19LtoldB7WWiIWBNkeUBNvFok3rRIcr8cw7iOd d90yB/AUWHEJcVhcw/s0wD+J4OCdzcVxzlpHR057Eb0OxVH1ZiGyNwTeliBxbK9ECL SJ7mnBJQHikFoC6Qw0mrKO1Q7mJrPsDriKQLQ2Hti8yJ6tK/DphXC7Auv6wCIXIVBM EztVvyAKGJXqA== Date: Tue, 24 Oct 2023 13:52:08 -0700 From: Jakub Kicinski To: Johannes Berg Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org Subject: Re: pull-request: wireless-2023-10-24 Message-ID: <20231024135208.3e40b69a@kernel.org> In-Reply-To: <1020bbec6fd85d55f0862b1aa147afbd25de3e74.camel@sipsolutions.net> References: <20231024103540.19198-2-johannes@sipsolutions.net> <169817882433.2839.2840092877928784369.git-patchwork-notify@kernel.org> <1020bbec6fd85d55f0862b1aa147afbd25de3e74.camel@sipsolutions.net> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit On Tue, 24 Oct 2023 22:25:18 +0200 Johannes Berg wrote: > Are you planning to merge net into net-next really soon for some reason? Submitting on Wed did cross my mind, but there's no solid plan. Unless that changes, Paolo will submit net on Thursday, EU time. And we'll cross-merge once Linux pulls. > If not, I can resolve this conflict and we'll include it in the next > (and last) wireless-next pull request, which will be going out Thursday > morning (Europe time.) Sounds good! But do you need to do the resolution to put something on top? Otherwise we can deal with the conflict when pulling.