netdev - Re: [PATCH net-next v3 13/14] dibs: Move data path to dibs layer: manual merge

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] [day] [month] [year] [list]

Message-ID: <20250925105733.040604ca@kernel.org>
Date: Thu, 25 Sep 2025 10:57:33 -0700
From: Jakub Kicinski <kuba@...nel.org>
To: Matthieu Baerts <matttbe@...nel.org>
Cc: Alexandra Winter <wintera@...ux.ibm.com>, Sidraya Jayagond
 <sidraya@...ux.ibm.com>, Julian Ruess <julianr@...ux.ibm.com>, Aswin
 Karuvally <aswin@...ux.ibm.com>, Halil Pasic <pasic@...ux.ibm.com>, Mahanta
 Jambigi <mjambigi@...ux.ibm.com>, Tony Lu <tonylu@...ux.alibaba.com>, Wen
 Gu <guwen@...ux.alibaba.com>, linux-rdma@...r.kernel.org,
 netdev@...r.kernel.org, linux-s390@...r.kernel.org, Heiko Carstens
 <hca@...ux.ibm.com>, Vasily Gorbik <gor@...ux.ibm.com>, Alexander Gordeev
 <agordeev@...ux.ibm.com>, Christian Borntraeger
 <borntraeger@...ux.ibm.com>, Sven Schnelle <svens@...ux.ibm.com>, Simon
 Horman <horms@...nel.org>, Eric Biggers <ebiggers@...nel.org>, Ard
 Biesheuvel <ardb@...nel.org>, Herbert Xu <herbert@...dor.apana.org.au>,
 Harald Freudenberger <freude@...ux.ibm.com>, Konstantin Shkolnyy
 <kshk@...ux.ibm.com>, Dan Williams <dan.j.williams@...el.com>, Dave Jiang
 <dave.jiang@...el.com>, Jonathan Cameron <Jonathan.Cameron@...wei.com>,
 Shannon Nelson <sln@...main.com>, Geert Uytterhoeven
 <geert@...ux-m68k.org>, Jason Gunthorpe <jgg@...pe.ca>, "D. Wythe"
 <alibuda@...ux.alibaba.com>, Dust Li <dust.li@...ux.alibaba.com>, Wenjia
 Zhang <wenjia@...ux.ibm.com>, David Miller <davem@...emloft.net>, Paolo
 Abeni <pabeni@...hat.com>, Eric Dumazet <edumazet@...gle.com>, Andrew Lunn
 <andrew+netdev@...n.ch>, Stephen Rothwell <sfr@...b.auug.org.au>
Subject: Re: [PATCH net-next v3 13/14] dibs: Move data path to dibs layer:
 manual merge

On Wed, 24 Sep 2025 10:07:35 +0100 Matthieu Baerts wrote:
> Regarding this conflict, I hope the resolution is correct. The patch
> from 'net' was modifying 'net/smc/smc_loopback.c' in
> smc_lo_register_dmb() and __smc_lo_unregister_dmb(). I applied the same
> modifications in 'drivers/dibs/dibs_loopback.c', in
> dibs_lo_register_dmb() and __dibs_lo_unregister_dmb(). In net-next,
> kfree(cpu_addr) was used instead of kvfree(cpu_addr), but this was done
> on purpose. Also, I had to include mm.h to be able to build this driver.
> I also attached a simple diff of the modifications I did.

Thanks a lot for sharing the resolutions!

> Note: no rerere cache is available for this kind of conflicts.

BTW have you figured out how to resolve that automatically?
NIPA does trusts rerere but because it didn't work we were running
without net for the last few days (knowingly) :(