* merge net into net-next ?
@ 2014-01-05 11:09 Antonio Quartulli
2014-01-06 6:16 ` David Miller
2014-01-06 22:39 ` David Miller
0 siblings, 2 replies; 7+ messages in thread
From: Antonio Quartulli @ 2014-01-05 11:09 UTC (permalink / raw)
To: David Miller; +Cc: Netdev
[-- Attachment #1: Type: text/plain, Size: 300 bytes --]
Hello David,
Do you have any plan about merging net into net-next?
I have a pull request for net-next that I'd like to send soon (it looks
like we have not much time before 3.13 is released) but it requires the
changes into net to be applied first.
Regards,
--
Antonio Quartulli
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* merge net into net-next?
@ 2017-06-08 12:10 Johannes Berg
2017-06-08 12:14 ` Johannes Berg
2017-06-08 14:19 ` David Miller
0 siblings, 2 replies; 7+ messages in thread
From: Johannes Berg @ 2017-06-08 12:10 UTC (permalink / raw)
To: David Miller; +Cc: netdev
Hi Dave,
Could you do me a favour and merge net into net-next? I want to merge
that back in order to apply a patch to mac80211-next that otherwise
conflicts fairly badly with a change in mac80211.
Thanks!
johannes
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: merge net into net-next?
2017-06-08 12:10 merge net into net-next? Johannes Berg
@ 2017-06-08 12:14 ` Johannes Berg
2017-06-08 14:19 ` David Miller
2017-06-08 14:19 ` David Miller
1 sibling, 1 reply; 7+ messages in thread
From: Johannes Berg @ 2017-06-08 12:14 UTC (permalink / raw)
To: David Miller; +Cc: netdev
On Thu, 2017-06-08 at 14:10 +0200, Johannes Berg wrote:
> Hi Dave,
>
> Could you do me a favour and merge net into net-next? I want to merge
> that back in order to apply a patch to mac80211-next that otherwise
> conflicts fairly badly with a change in mac80211.
Wait, forget it. You already did, I just managed to somehow miss that -
sorry for the noise!
johannes
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: merge net into net-next?
2017-06-08 12:14 ` Johannes Berg
@ 2017-06-08 14:19 ` David Miller
0 siblings, 0 replies; 7+ messages in thread
From: David Miller @ 2017-06-08 14:19 UTC (permalink / raw)
To: johannes; +Cc: netdev
From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 08 Jun 2017 14:14:15 +0200
> On Thu, 2017-06-08 at 14:10 +0200, Johannes Berg wrote:
>> Hi Dave,
>>
>> Could you do me a favour and merge net into net-next? I want to merge
>> that back in order to apply a patch to mac80211-next that otherwise
>> conflicts fairly badly with a change in mac80211.
>
> Wait, forget it. You already did, I just managed to somehow miss that -
> sorry for the noise!
Great, nothing for me to do!
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: merge net into net-next?
2017-06-08 12:10 merge net into net-next? Johannes Berg
2017-06-08 12:14 ` Johannes Berg
@ 2017-06-08 14:19 ` David Miller
1 sibling, 0 replies; 7+ messages in thread
From: David Miller @ 2017-06-08 14:19 UTC (permalink / raw)
To: johannes; +Cc: netdev
From: Johannes Berg <johannes@sipsolutions.net>
Date: Thu, 08 Jun 2017 14:10:55 +0200
> Could you do me a favour and merge net into net-next? I want to
> merge that back in order to apply a patch to mac80211-next that
> otherwise conflicts fairly badly with a change in mac80211.
I'll try to do that by the end of today.
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2017-06-08 14:19 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-05 11:09 merge net into net-next ? Antonio Quartulli
2014-01-06 6:16 ` David Miller
2014-01-06 22:39 ` David Miller
-- strict thread matches above, loose matches on Subject: below --
2017-06-08 12:10 merge net into net-next? Johannes Berg
2017-06-08 12:14 ` Johannes Berg
2017-06-08 14:19 ` David Miller
2017-06-08 14:19 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).