merge net into net-next ?

merge net into net-next ?

[Antonio Quartulli]

[-- 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 --]

Re: merge net into net-next ?

[David Miller]

From: Antonio Quartulli <antonio@meshcoding.com>
Date: Sun, 05 Jan 2014 12:09:33 +0100

> 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.

I plan to do this some time on Monday.

Re: merge net into net-next ?

[David Miller]

From: Antonio Quartulli <antonio@meshcoding.com>
Date: Sun, 05 Jan 2014 12:09:33 +0100

> Do you have any plan about merging net into net-next?

This is now done.

Re: merge net into net-next?

[David Miller]

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!

Re: merge net into net-next?

[David Miller]

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.

Re: merge net into net-next?

[Johannes Berg]

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

merge net into net-next?

[Johannes Berg]

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