On 01/12/2018 04:16 AM, David Miller wrote:
>
> Daniel please look at how I resolved the BPF conflicts and build
> failures.
>
> The test_align.c one was pretty simple, but the one that fixes the
> build failure due to overlap of the BPF call vs. JIT always on changes
> is bit less trivial.
Yeah
From: Johannes Berg
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 b
From: Johannes Berg
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.
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,
