From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752199AbcESEIa (ORCPT ); Thu, 19 May 2016 00:08:30 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:34385 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750764AbcESEI3 (ORCPT ); Thu, 19 May 2016 00:08:29 -0400 Date: Wed, 18 May 2016 21:08:27 -0700 (PDT) Message-Id: <20160518.210827.2298957890402906546.davem@davemloft.net> To: torvalds@linux-foundation.org Cc: luciano.coelho@intel.com, reinoudkoornstra@gmail.com, linux-kernel@vger.kernel.org, linuxwifi@intel.com, johannes.berg@intel.com, akpm@linux-foundation.org, kvalo@codeaurora.org, egrumbach@gmail.com, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, emmanuel.grumbach@intel.com Subject: Re: [GIT] Networking From: David Miller In-Reply-To: References: <1463581411.29999.1.camel@intel.com> X-Mailer: Mew version 6.7 on Emacs 24.5 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Wed, 18 May 2016 21:08:28 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Linus Torvalds Date: Wed, 18 May 2016 11:45:06 -0700 > David, do you happen to recall that merge conflict? I think you must > have removed that "skb_info" variable declaration and initialization > manually (due to the "unused variable" warning, which in turn was due > to the incorrect merge of the actual conflict), because I think git > would have merged that line into the result. Yes, I know I buggered this merge conflict and Kalle said he'd have a fix coming my way ASAP. Sorry, I was travelling today, so I'll catch up with this tomorrow.