On Wed, Apr 16, 2025 at 9:25 PM Taylor R Campbell wrote:
>
> > Module Name:src
> > Committed By: ozaki-r
> > Date: Wed Apr 16 05:29:45 UTC 2025
> >
> > Modified Files:
> > src/sys/net: if_bridge.c
> >
> > Log Message:
> > bridge: avoid a race condition on stopping callout
>
Thanks for pointing this out! I did just that.
christos
> On Apr 16, 2025, at 5:54 PM, Taylor R Campbell wrote:
>
>> Module Name:src
>> Committed By: christos
>> Date: Wed Apr 16 15:23:17 UTC 2025
>>
>> Log Message:
>> Resolve conflicts between 3.0.15 and 3.0.16:
>> - Reverted
> Module Name:src
> Committed By: christos
> Date: Wed Apr 16 15:23:17 UTC 2025
>
> Log Message:
> Resolve conflicts between 3.0.15 and 3.0.16:
> - Reverted 3.0.16 changes to idea, rc2, and rc5 to retain binary compatibility
> The patches to undo the reversion for the next import
> Module Name:src
> Committed By: ozaki-r
> Date: Wed Apr 16 05:29:45 UTC 2025
>
> Modified Files:
> src/sys/net: if_bridge.c
>
> Log Message:
> bridge: avoid a race condition on stopping callout
>
> Without BRIDGE_LOCK, the callout can be scheduled after callout_halt.
O