From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751181AbdBBIkd (ORCPT ); Thu, 2 Feb 2017 03:40:33 -0500 Received: from mail-db5eur01on0086.outbound.protection.outlook.com ([104.47.2.86]:25440 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750936AbdBBIka (ORCPT ); Thu, 2 Feb 2017 03:40:30 -0500 From: Yotam Gigi To: Stephen Rothwell , David Miller , Networking CC: "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: RE: linux-next: manual merge of the net-next tree with Linus' tree Thread-Topic: linux-next: manual merge of the net-next tree with Linus' tree Thread-Index: AQHSfPa5Q7wLPIqfrU2fMnyihRwoIqFVZYSw Date: Thu, 2 Feb 2017 08:40:24 +0000 Message-ID: References: <20170202124944.6c3fd4f4@canb.auug.org.au> In-Reply-To: <20170202124944.6c3fd4f4@canb.auug.org.au> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=yotamg@mellanox.com; x-originating-ip: [79.176.15.144] x-ms-office365-filtering-correlation-id: d7582f95-e438-498b-1016-08d44b4721b6 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081);SRVR:DB3PR05MB0763; x-microsoft-exchange-diagnostics: 1;DB3PR05MB0763;7:9imEA8QxvIsT9Hl//mQB9xrPiwi8X/FulrjLkK2UH2NIy0vtSQuohLaUnG5oxtMbpD+y+npvtg0hDV08XdrKQ3C6tQWLVysHSllYz8Ss8RWKw78RbZ3LyOw7qkXgt76sKxVD2UQX+ujTRLVO4gFUafWvBiQRgp0B3Ac7PQ6li8jWvEaXtZH+qp1wjGff4ZTuEGM1ZUjmxuh+eErWAxYguQHYOWdNwbFO/PaYdLqgexvd+Ulwt6/4Vx1DDD0syn/JyHcxtfRiiRbOWGgr8U8gtfJp7U1onfl5TQ9xci7+KNpkR0kblQib8cqyUFZOj6yNLBvC4CjvlZ+90j3gDMxKikMsId8slcJMbCVuuHTYDwyUbnP98sofTvnZyPOWywDh28ayjBVq04bgaSVovZ8CODVR4S0txC8PGWJ1pYDho2XOeryAY1K2DPMD+cqjRixgiemfu/7w8C1T2gGk5awm94jOLtLfr6pMGnyranZcMAraljrLmG6fOXDWlWD7o8NXWscSb2K5x6EakkpEO8fCq92qMwMJA8PBZbcp8jRPCnt6cpmNJgs31ck8B36uM30v x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(9452136761055); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(20161123564025)(20161123558025)(20161123562025)(20161123555025)(20161123560025)(6072148);SRVR:DB3PR05MB0763;BCL:0;PCL:0;RULEID:;SRVR:DB3PR05MB0763; x-forefront-prvs: 02065A9E77 x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(6009001)(7916002)(39410400002)(39860400002)(39840400002)(39450400003)(39850400002)(199003)(377454003)(13464003)(53754006)(189002)(6436002)(6506006)(105586002)(68736007)(8676002)(81166006)(55016002)(8936002)(3280700002)(2906002)(81156014)(25786008)(4326007)(9686003)(99286003)(54906002)(53936002)(86362001)(229853002)(122556002)(3660700001)(38730400001)(77096006)(305945005)(66066001)(7696004)(54356999)(50986999)(101416001)(33656002)(6116002)(92566002)(5660300001)(97736004)(189998001)(3846002)(2950100002)(5001770100001)(102836003)(106116001)(2900100001)(7736002)(76176999)(106356001)(74316002);DIR:OUT;SFP:1101;SCL:1;SRVR:DB3PR05MB0763;H:DB3PR05MB0764.eurprd05.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Feb 2017 08:40:24.0371 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB3PR05MB0763 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id v128ecQb023343 >-----Original Message----- >From: netdev-owner@vger.kernel.org [mailto:netdev-owner@vger.kernel.org] On >Behalf Of Stephen Rothwell >Sent: Thursday, February 02, 2017 3:50 AM >To: David Miller ; Networking >Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Yotam Gigi > >Subject: linux-next: manual merge of the net-next tree with Linus' tree > >Hi all, > >Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/cls_matchall.c > >between commit: > > fd62d9f5c575 ("net/sched: matchall: Fix configuration race") > >from Linus' tree and commit: > > ec2507d2a306 ("net/sched: cls_matchall: Fix error path") > >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. Thanks! > >-- >Cheers, >Stephen Rothwell > >diff --cc net/sched/cls_matchall.c >index b12bc2abea93,fcecf5aac666..000000000000 >--- a/net/sched/cls_matchall.c >+++ b/net/sched/cls_matchall.c >@@@ -118,19 -141,24 +118,24 @@@ static int mall_set_parms(struct net *n > struct tcf_exts e; > int err; > >- tcf_exts_init(&e, TCA_MATCHALL_ACT, 0); >+ err = tcf_exts_init(&e, TCA_MATCHALL_ACT, 0); >+ if (err) >+ return err; > err = tcf_exts_validate(net, tp, tb, est, &e, ovr); > if (err < 0) >- return err; >+ goto errout; > > if (tb[TCA_MATCHALL_CLASSID]) { > - f->res.classid = nla_get_u32(tb[TCA_MATCHALL_CLASSID]); > - tcf_bind_filter(tp, &f->res, base); > + head->res.classid = nla_get_u32(tb[TCA_MATCHALL_CLASSID]); > + tcf_bind_filter(tp, &head->res, base); > } > > - tcf_exts_change(tp, &f->exts, &e); > + tcf_exts_change(tp, &head->exts, &e); > > return 0; >+ errout: >+ tcf_exts_destroy(&e); >+ return err; > } > > static int mall_change(struct net *net, struct sk_buff *in_skb, >@@@ -162,39 -194,43 +167,44 @@@ > return -EINVAL; > } > > - f = kzalloc(sizeof(*f), GFP_KERNEL); > - if (!f) > + new = kzalloc(sizeof(*new), GFP_KERNEL); > + if (!new) > return -ENOBUFS; > >- tcf_exts_init(&new->exts, TCA_MATCHALL_ACT, 0); > - err = tcf_exts_init(&f->exts, TCA_MATCHALL_ACT, 0); >++ err = tcf_exts_init(&new->exts, TCA_MATCHALL_ACT, 0); >+ if (err) >+ goto err_exts_init; > > if (!handle) > handle = 1; > - f->handle = handle; > - f->flags = flags; > + new->handle = handle; > + new->flags = flags; > > - err = mall_set_parms(net, tp, f, base, tb, tca[TCA_RATE], ovr); > + err = mall_set_parms(net, tp, new, base, tb, tca[TCA_RATE], ovr); > if (err) >- goto errout; >+ goto err_set_parms; > > if (tc_should_offload(dev, tp, flags)) { > - err = mall_replace_hw_filter(tp, f, (unsigned long) f); > + err = mall_replace_hw_filter(tp, new, (unsigned long) new); > if (err) { > if (tc_skip_sw(flags)) >- goto errout; >+ goto err_replace_hw_filter; > else > err = 0; > } > } > > - *arg = (unsigned long) f; > - rcu_assign_pointer(head->filter, f); > - > + *arg = (unsigned long) head; > + rcu_assign_pointer(tp->root, new); > + if (head) > + call_rcu(&head->rcu, mall_destroy_rcu); > return 0; > >- errout: >+ err_replace_hw_filter: >+ err_set_parms: > - tcf_exts_destroy(&f->exts); >++ tcf_exts_destroy(&new->exts); >+ err_exts_init: > - kfree(f); > + kfree(new); > return err; > } >