[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20200727035814.GA794331@ZenIV.linux.org.uk>
Date: Mon, 27 Jul 2020 04:58:14 +0100
From: Al Viro <viro@...iv.linux.org.uk>
To: Christoph Hellwig <hch@...radead.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
linux-kernel@...r.kernel.org, linux-arch@...r.kernel.org
Subject: Re: [PATCH v2 04/20] unify generic instances of
csum_partial_copy_nocheck()
On Sun, Jul 26, 2020 at 08:11:32AM +0100, Christoph Hellwig wrote:
> 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?
For now I've just cherry-picked your commit in there. net-next interaction
there is minimal; most of the PITA (and potential breakage) is in arch/*...
Powered by blists - more mailing lists