From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753590AbbIYAui (ORCPT ); Thu, 24 Sep 2015 20:50:38 -0400 Received: from ozlabs.org ([103.22.144.67]:42770 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752569AbbIYAug (ORCPT ); Thu, 24 Sep 2015 20:50:36 -0400 Date: Fri, 25 Sep 2015 10:50:34 +1000 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Benc , "Eric W. Biederman" Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20150925105034.473739fd@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv4/arp.c between commit: 63d008a4e9ee ("ipv4: send arp replies to the correct tunnel") from the net tree and commit: 0c4b51f0054c ("netfilter: Pass net into okfn") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc net/ipv4/arp.c index f03db8b7abee,61ff5ea31283..000000000000 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@@ -651,8 -654,6 +657,7 @@@ static int arp_process(struct net *net u16 dev_type = dev->type; int addr_type; struct neighbour *n; - struct net *net = dev_net(dev); + struct dst_entry *reply_dst = NULL; bool is_garp = false; /* arp_rcv below verifies the ARP header and verifies the device From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the net-next tree with the net tree Date: Fri, 25 Sep 2015 10:50:34 +1000 Message-ID: <20150925105034.473739fd@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:42770 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752569AbbIYAug (ORCPT ); Thu, 24 Sep 2015 20:50:36 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: David Miller , netdev@vger.kernel.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jiri Benc , "Eric W. Biederman" Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/ipv4/arp.c between commit: 63d008a4e9ee ("ipv4: send arp replies to the correct tunnel") from the net tree and commit: 0c4b51f0054c ("netfilter: Pass net into okfn") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc net/ipv4/arp.c index f03db8b7abee,61ff5ea31283..000000000000 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@@ -651,8 -654,6 +657,7 @@@ static int arp_process(struct net *net u16 dev_type = dev->type; int addr_type; struct neighbour *n; - struct net *net = dev_net(dev); + struct dst_entry *reply_dst = NULL; bool is_garp = false; /* arp_rcv below verifies the ARP header and verifies the device