On Fri, Jul 24, 2020 at 01:23:37PM +0100, Christoph Hellwig wrote: > On Fri, Jul 24, 2020 at 01:19:18PM +0100, Al Viro wrote: > > > net-next has a patch from me killing off csum_and_copy_from_user > > > already: > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=f1bfd71c8662f20d53e71ef4e18bfb0e5677c27f > > > > Nothing in that patch of yours touches csum_and_copy_from_user(). what > > are you talking about? > > Sorry, I meant csum_and_copy_from_nocheck, just as in this patch. > > Merging your branch into the net-next tree thus will conflict in > the nios2 and asm-geneeric/checksum.h as well as lib/checksum.c.
Noted, but that asm-generic/checksum.h conflict will be "massage in net-next/outright removal in this branch"; the same goes for lib/checksum.c and nios2. It's c6x that is unpleasant in that respect...
