From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751533AbcDRBjE (ORCPT ); Sun, 17 Apr 2016 21:39:04 -0400 Received: from mail-pa0-f45.google.com ([209.85.220.45]:36279 "EHLO mail-pa0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750997AbcDRBjC (ORCPT ); Sun, 17 Apr 2016 21:39:02 -0400 Message-ID: <1460943531.10638.99.camel@edumazet-glaptop3.roam.corp.google.com> Subject: Re: linux-next: manual merge of the net-next tree with the net tree From: Eric Dumazet To: Stephen Rothwell Cc: David Miller , netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Craig Gallek , Eric Dumazet Date: Sun, 17 Apr 2016 18:38:51 -0700 In-Reply-To: <20160418113116.6f7f8740@canb.auug.org.au> References: <20160418113116.6f7f8740@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4-0ubuntu2 Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2016-04-18 at 11:31 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/ipv4/udp.c > > between commit: > > d894ba18d4e4 ("soreuseport: fix ordering for mixed v4/v6 sockets") > > from the net tree and commit: > > ca065d0cf80f ("udp: no longer use SLAB_DESTROY_BY_RCU") > > from the net-next tree. > > I tried to fixed it up (see below). Unfortunately, > hlist_add_tail_rcu() does not exist. So instead I have reverted commit > d894ba18d4e4 ("soreuseport: fix ordering for mixed v4/v6 sockets") for > today. Hi Stephen Craig warned that this would happen indeed, and provided a net-next patch, to help David with this conflict. https://patchwork.ozlabs.org/patch/611093/ Thanks