From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751866AbdECBHR (ORCPT ); Tue, 2 May 2017 21:07:17 -0400 Received: from ozlabs.org ([103.22.144.67]:44741 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751805AbdECBHH (ORCPT ); Tue, 2 May 2017 21:07:07 -0400 Date: Wed, 3 May 2017 11:07:03 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Hans-Christian Noren Egtvedt , =?UTF-8?B?SMOldmFyZA==?= Skinnemoen , Nicolas Ferre , Josh Hunt , Sridhar Samudrala , Alexander Duyck Subject: linux-next: manual merge of the net-next tree with Linus' tree Message-ID: <20170503110703.0945929d@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: arch/avr32/include/uapi/asm/socket.h between commit: 26202873bb51 ("avr32: remove support for AVR32 architecture") from Linus' tree and commits: a2d133b1d465 ("sock: introduce SO_MEMINFO getsockopt") 6d4339028b35 ("net: Introduce SO_INCOMING_NAPI_ID" 5daab9db7b65 ("New getsockopt option to get socket cookie") from the net-next tree. I fixed it up (I removed the file) 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