From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750997AbcEIAnM (ORCPT ); Sun, 8 May 2016 20:43:12 -0400 Received: from ozlabs.org ([103.22.144.67]:52122 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750859AbcEIAnK (ORCPT ); Sun, 8 May 2016 20:43:10 -0400 Date: Mon, 9 May 2016 10:43:07 +1000 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jarno Rajahalme , Tom Herbert Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20160509104307.180cee9b@canb.auug.org.au> 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: include/linux/netdevice.h between commit: 229740c63169 ("udp_offload: Set encapsulation before inner completes.") from the net tree and commit: 46aa2f30aa7f ("udp: Remove udp_offloads") from the net-next tree. I fixed it up (the latter removed the struct that was commented in the former) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell 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: Mon, 9 May 2016 10:43:07 +1000 Message-ID: <20160509104307.180cee9b@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]:52122 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750859AbcEIAnK (ORCPT ); Sun, 8 May 2016 20:43:10 -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, Jarno Rajahalme , Tom Herbert Hi all, Today's linux-next merge of the net-next tree got a conflict in: include/linux/netdevice.h between commit: 229740c63169 ("udp_offload: Set encapsulation before inner completes.") from the net tree and commit: 46aa2f30aa7f ("udp: Remove udp_offloads") from the net-next tree. I fixed it up (the latter removed the struct that was commented in the former) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell