From: Johannes Berg <johannes@sipsolutions.net>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: Re: pull-request: mac80211-next 2018-01-22
Date: Mon, 22 Jan 2018 16:31:18 +0100 [thread overview]
Message-ID: <1516635078.2508.38.camel@sipsolutions.net> (raw)
In-Reply-To: <20180122.101728.704853095626932714.davem@davemloft.net>
On Mon, 2018-01-22 at 10:17 -0500, David Miller wrote:
> From: Johannes Berg <johannes@sipsolutions.net>
> Date: Mon, 22 Jan 2018 14:15:00 +0100
>
> > A few more (only four, really) changes have come in, so I figured
> > since the merge window hasn't opened yesterday, I'd still send them
> > to you.
> >
> > Please pull and let me know if there's any problem.
>
> I had to resolve a conflict in mac80211_hwsim.c, please check my
> resolution and send me any fixes which are necessary.
Sorry, my bad, I apologize. I knew about this and didn't think of it
when writing the pull request.
Resolution looks good - I was worried about the destruction order for a
second there, but it doesn't actually matter.
Thanks!
johannes
WARNING: multiple messages have this Message-ID (diff)
From: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
To: David Miller <davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-wireless-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: Re: pull-request: mac80211-next 2018-01-22
Date: Mon, 22 Jan 2018 16:31:18 +0100 [thread overview]
Message-ID: <1516635078.2508.38.camel@sipsolutions.net> (raw)
In-Reply-To: <20180122.101728.704853095626932714.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
On Mon, 2018-01-22 at 10:17 -0500, David Miller wrote:
> From: Johannes Berg <johannes-cdvu00un1VgdHxzADdlk8Q@public.gmane.org>
> Date: Mon, 22 Jan 2018 14:15:00 +0100
>
> > A few more (only four, really) changes have come in, so I figured
> > since the merge window hasn't opened yesterday, I'd still send them
> > to you.
> >
> > Please pull and let me know if there's any problem.
>
> I had to resolve a conflict in mac80211_hwsim.c, please check my
> resolution and send me any fixes which are necessary.
Sorry, my bad, I apologize. I knew about this and didn't think of it
when writing the pull request.
Resolution looks good - I was worried about the destruction order for a
second there, but it doesn't actually matter.
Thanks!
johannes
next prev parent reply other threads:[~2018-01-22 15:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-22 13:15 pull-request: mac80211-next 2018-01-22 Johannes Berg
2018-01-22 13:15 ` Johannes Berg
2018-01-22 15:17 ` David Miller
2018-01-22 15:31 ` Johannes Berg [this message]
2018-01-22 15:31 ` Johannes Berg
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=1516635078.2508.38.camel@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=davem@davemloft.net \
--cc=linux-wireless@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.