Hi Randy,

On Sun, 29 Mar 2020 09:12:31 -0700 Randy Dunlap <rdunlap@infradead.org> wrote:
>
> On 3/28/20 10:18 PM, akpm@linux-foundation.org wrote:
> > The mm-of-the-moment snapshot 2020-03-28-22-17 has been uploaded to
> > 
> >    http://www.ozlabs.org/~akpm/mmotm/
> > 
> > mmotm-readme.txt says
> > 
> > README for mm-of-the-moment:
> > 
> > http://www.ozlabs.org/~akpm/mmotm/
> > 
> > This is a snapshot of my -mm patch queue.  Uploaded at random hopefully
> > more than once a week.
> > 
> > You will need quilt to apply these patches to the latest Linus release (5.x
> > or 5.x-rcY).  The series file is in broken-out.tar.gz and is duplicated in
> > http://ozlabs.org/~akpm/mmotm/series  
> 
> 
> on i386 or x86_64:
> 
> ../drivers/staging/octeon/ethernet-tx.c: In function ‘cvm_oct_xmit’:
> ../drivers/staging/octeon/ethernet-tx.c:358:2: error: implicit declaration of function ‘skb_reset_tc’; did you mean ‘skb_reserve’? [-Werror=implicit-function-declaration]
>   skb_reset_tc(skb);
>   ^~~~~~~~~~~~
> 
> It looks like this inline function has been removed from
> <net/sch_generic.h>.
> 
> 
> Looks like it should be this change:
> 
> -	skb_reset_tc(skb);
> +	skb_reset_redirect(skb);

I applied the above as a merge resolution patch for the staging tree
merge today, as the inline removal was a late change to Linus' tree.

-- 
Cheers,
Stephen Rothwell