netdev - Re: [PATCH wpan-next v5] mac802154: Ensure proper scan-level filtering

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <154ea7ad-333e-cecd-517b-0a9cf9d1b390@datenfreihafen.org>
Date:   Wed, 19 Oct 2022 10:06:05 +0200
From:   Stefan Schmidt <stefan@...enfreihafen.org>
To:     Miquel Raynal <miquel.raynal@...tlin.com>,
        Alexander Aring <aahringo@...hat.com>
Cc:     Alexander Aring <alex.aring@...il.com>, linux-wpan@...r.kernel.org,
        "David S. Miller" <davem@...emloft.net>,
        Jakub Kicinski <kuba@...nel.org>,
        Paolo Abeni <pabeni@...hat.com>,
        Eric Dumazet <edumazet@...gle.com>, netdev@...r.kernel.org,
        David Girault <david.girault@...vo.com>,
        Romuald Despres <romuald.despres@...vo.com>,
        Frederic Blain <frederic.blain@...vo.com>,
        Nicolas Schodet <nico@...fr.eu.org>,
        Guilhem Imberton <guilhem.imberton@...vo.com>,
        Thomas Petazzoni <thomas.petazzoni@...tlin.com>
Subject: Re: [PATCH wpan-next v5] mac802154: Ensure proper scan-level
 filtering

Hello.

On 19.10.22 00:03, Miquel Raynal wrote:
> Hi Alexander,
> 
> aahringo@...hat.com wrote on Tue, 18 Oct 2022 16:54:13 -0400:
> 
>> Hi,
>>
>> On Tue, Oct 18, 2022 at 2:35 PM Miquel Raynal <miquel.raynal@...tlin.com> wrote:
>>>
>>> We now have a fine grained filtering information so let's ensure proper
>>> filtering in scan mode, which means that only beacons are processed.
>>>   
>>
>> Is this a fixup? Can you resend the whole series please?
> 
> Hmm no? Unless I understood things the wrong way, Stefan applied
> patches 1 to 7 of my v4, and asked me to make a change on the 8th
> patch.
> 
> This is v5 just for patch 8/8 of the previous series, I just changed
> a debug string actually...
> 
> There was a conflict when he applied it but I believe this is because
> wpan-next did not contain one of the fixes which made it to Linus' tree
> a month ago. So in my branch I still have this fix prior to this patch,
> because otherwise there will be a conflict when merging v6.1-rc1 (which
> I believe was not done yet).

You believe correctly. :-) In my workflow I normally do not merge in 
changes from net-next until after my latest pull-request was pulled in. 
I do this to avoid extra merge commits.

In case I see a merge conflict in my testing before sending the pull 
request I add merge guidance to the pull. Which is my plan this time 
around as well.

regards
Stefan Schmidt