lkml.org 
[lkml]   [2020]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v2 04/20] unify generic instances of csum_partial_copy_nocheck()
    On Fri, Jul 24, 2020 at 01:30:40PM +0100, Al Viro wrote:
    > > 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...

    What about just rebasing your branch on the net-next tree?

    \
     
     \ /
      Last update: 2020-07-26 09:12    [W:4.242 / U:0.104 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site