From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751370AbbJFAQS (ORCPT ); Mon, 5 Oct 2015 20:16:18 -0400 Received: from ozlabs.org ([103.22.144.67]:60511 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750780AbbJFAQQ (ORCPT ); Mon, 5 Oct 2015 20:16:16 -0400 Date: Tue, 6 Oct 2015 11:16:13 +1100 From: Stephen Rothwell To: David Miller , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Eric Dumazet Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20151006111613.5f099b3c@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/inet_connection_sock.c between commit: 2306c704ce28 ("inet: fix race in reqsk_queue_unlink()") from the net tree and commit: 079096f103fa ("tcp/dccp: install syn_recv requests into ehash table") from the net-next tree. I fixed it up (the latter rewrote the function, so I dropped the net tree fix) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au