From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753047AbdFUBrf (ORCPT ); Tue, 20 Jun 2017 21:47:35 -0400 Received: from ozlabs.org ([103.22.144.67]:34389 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752969AbdFUBrd (ORCPT ); Tue, 20 Jun 2017 21:47:33 -0400 Date: Wed, 21 Jun 2017 11:47:30 +1000 From: Stephen Rothwell To: David Miller , Networking Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Serhey Popovych , Vlad Yasevich Subject: linux-next: manual merge of the net-next tree with the net tree Message-ID: <20170621114730.4e8724fd@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: net/core/rtnetlink.c between commit: db833d40ad32 ("rtnetlink: add IFLA_GROUP to ifla_policy") from the net tree and commit: 3d3ea5af5c0b ("rtnl: Add support for netdev event to link messages") 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. -- Cheers, Stephen Rothwell diff --cc net/core/rtnetlink.c index 467a2f4510a7,3aa57848a895..000000000000 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@@ -1469,7 -1519,7 +1520,8 @@@ static const struct nla_policy ifla_pol [IFLA_LINK_NETNSID] = { .type = NLA_S32 }, [IFLA_PROTO_DOWN] = { .type = NLA_U8 }, [IFLA_XDP] = { .type = NLA_NESTED }, + [IFLA_GROUP] = { .type = NLA_U32 }, + [IFLA_EVENT] = { .type = NLA_U32 }, }; static const struct nla_policy ifla_info_policy[IFLA_INFO_MAX+1] = {