public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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>
Subject: Re: linux-next: manual merge of the mac80211-next tree with the mac80211 tree
Date: Tue, 16 Jan 2018 08:58:42 +0100	[thread overview]
Message-ID: <1516089522.410.41.camel@sipsolutions.net> (raw)
In-Reply-To: <20180116111342.721301fc@canb.auug.org.au>

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

  reply	other threads:[~2018-01-16  7:58 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-16  0:13 linux-next: manual merge of the mac80211-next tree with the mac80211 tree Stephen Rothwell
2018-01-16  7:58 ` Johannes Berg [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-04-09  1:06 Stephen Rothwell
2019-04-09  7:27 ` Johannes Berg
2019-04-09  8:11   ` Stephen Rothwell
2015-12-03 11:28 Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1516089522.410.41.camel@sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=benjamin.beichler@uni-rostock.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox