From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f193.google.com ([209.85.128.193]:34485 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752135AbeBZQDS (ORCPT ); Mon, 26 Feb 2018 11:03:18 -0500 Date: Mon, 26 Feb 2018 09:03:15 -0700 From: Nathan Chancellor To: Greg Kroah-Hartman Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Paolo Abeni , "David S. Miller" , Manoj Boopathi Raj Subject: Re: [PATCH 4.4 002/193] net: replace dst_cache ip6_tunnel implementation with the generic one Message-ID: <20180226160315.GA9137@flashbox> References: <20180223170325.997716448@linuxfoundation.org> <20180223170326.406395326@linuxfoundation.org> <20180223230008.GA30215@flashbox> <20180226125901.GA13889@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180226125901.GA13889@kroah.com> Sender: stable-owner@vger.kernel.org List-ID: 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