From mboxrd@z Thu Jan  1 00:00:00 1970
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751009AbeAPH6t (ORCPT <rfc822;ralf@linux-mips.org> + 1 other);
        Tue, 16 Jan 2018 02:58:49 -0500
Received: from s3.sipsolutions.net ([144.76.63.242]:47532 "EHLO
        sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1750725AbeAPH6s (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Tue, 16 Jan 2018 02:58:48 -0500
Message-ID: <1516089522.410.41.camel@sipsolutions.net>
Subject: Re: linux-next: manual merge of the mac80211-next tree with the
 mac80211 tree
From: Johannes Berg <johannes@sipsolutions.net>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Benjamin Beichler <benjamin.beichler@uni-rostock.de>
Date: Tue, 16 Jan 2018 08:58:42 +0100
In-Reply-To: <20180116111342.721301fc@canb.auug.org.au>
References: <20180116111342.721301fc@canb.auug.org.au>
Content-Type: text/plain; charset="UTF-8"
X-Mailer: Evolution 3.26.2-1 
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Return-Path: <linux-kernel-owner@vger.kernel.org>

Hi Stephen,

> between commit:
> 
>   b71d856ab536 ("mac80211_hwsim: add workqueue to wait for deferred radio deletion on mod unload")
> 
> from the mac80211 tree and commit:
> 
>   c6509cc3b3e8 ("mac80211_hwsim: add hashtable with mac address keys for faster lookup")
> 
> from the mac80211-next tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Yeah, thanks. I was pondering whether I should knowingly generate that
conflict, but I'll fix it up before merge anyway - might hold the -next
for later anyway.

Thanks!

johannes