lkml.org 
[lkml]   [2018]   [Feb]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH 4.4 002/193] net: replace dst_cache ip6_tunnel implementation with the generic one
On Mon, Feb 26, 2018 at 01:59:01PM +0100, Greg Kroah-Hartman wrote:
> On Fri, Feb 23, 2018 at 04:00:08PM -0700, Nathan Chancellor wrote:
> > It may also be wise to take these two commits from mainline, as they
> > are along the same lines as this one:
> >
> > 09acddf873b ("ip_tunnel: replace dst_cache with generic implementation")
>
> Your SHA1s are odd, this should be e09acddf873b
>
> > 27337e16f2d ("ip_tunnel: fix preempt warning in ip tunnel creation/updating")
>
> And this is f27337e16f2d0e52a8d05ea599ed13cd266ac291, you lost the first
> digit for both :(
>
> > There is a minor conflict with the first one due to stable commit
> > 6f99825e7632 ("sit: fix a double free on error path").
>
> Thanks, now fixed that up and queued both of these.
>
> greg k-h

Gah, sorry :( I'll double check next time!

Thanks!
Nathan

\
 
 \ /
  Last update: 2018-02-26 17:04    [W:0.160 / U:4.656 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site