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: Wed, 20 Jul 2016 12:10:18 +1000 Message-ID: <20160720121018.4b84b4cc@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]:41431 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752066AbcGTCKU (ORCPT ); Tue, 19 Jul 2016 22:10:20 -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, Willem de Bruijn , Marcelo Ricardo Leitner Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/sctp/input.c between commit: c74bfbdba0e8 ("sctp: load transport header after sk_filter") from the net tree and commit: 3acb50c18d8d ("sctp: delay as much as possible skb_linearize") from the net-next tree. I fixed it up (I just used the net-next version) 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