From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752857AbcKHGee (ORCPT ); Tue, 8 Nov 2016 01:34:34 -0500 Received: from mail-it0-f65.google.com ([209.85.214.65]:35600 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751919AbcKHGec (ORCPT ); Tue, 8 Nov 2016 01:34:32 -0500 MIME-Version: 1.0 In-Reply-To: <20161108122537.40fa6e58@canb.auug.org.au> References: <20161108122537.40fa6e58@canb.auug.org.au> From: Cong Wang Date: Mon, 7 Nov 2016 22:34:11 -0800 Message-ID: Subject: Re: linux-next: manual merge of the net-next tree with the net tree To: Stephen Rothwell Cc: David Miller , Networking , linux-next@vger.kernel.org, LKML , Johannes Berg Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Nov 7, 2016 at 5:25 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/netlink/genetlink.c > > between commit: > > 00ffc1ba02d8 ("genetlink: fix a memory leak on error path") > > from the net tree and commit: > > 2ae0f17df1cd ("genetlink: use idr to track families") > > from the net-next tree. > > I fixed it up (see below) 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. Looks good to me. Thanks!