This was corrected the next day in: https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/net/tipc/subscr.c?id=810813c47a564416f6306ae214e2661366c987a7
<https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tag/?h=v4.6-rc1>The topology server patch series were ready around 1st week of Feb, hence did not make into for v4.5-rc1 but made their way into v4.6-rc1 (targeting 4.6 kernel). On 03/30/2016 12:47 PM, Parthasarathy Bhuvaragan wrote: > Guna, Thanks for pointing this out. > > This is a merge error from net to net-next, which has reverted the > topology server patch series. The net updates were applied instead > of net-next. I will inform netdev about this. > > https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/net/tipc/subscr.c?id=810813c47a564416f6306ae214e2661366c987a7 > > On 03/29/2016 07:10 PM, GUNA wrote: >> // file subscr.c >> I do see tipc_subscrp_subscribe() added on Feb 2nd but the changes are >> reverted on March 7th version of file. Any reason why the >> tipc_subscrp_subscribe() is not on latest version? >> >> // Feb 2nd >> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=7c13c6224123a6424bd3bc60ef982759754501e9 >> >> // March 7th >> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=4de13d7ed6ffdcbb34317acaa9236f121176f5f8 >> >> It seems the March 7th fix may not needed for Feb 2nd version since >> some fixes check the null. Please confirm. >> >> static void tipc_subscrp_subscribe(struct net *net, struct tipc_subscr *s, >> struct >> tipc_subscriber *subscriber, int swap) >> { >> struct tipc_net *tn = net_generic(net, tipc_net_id); >> struct tipc_subscription *sub = NULL; >> u32 timeout; >> >> sub = tipc_subscrp_create(net, s, swap); >> if (!sub) >> <<== NILL check here >> return tipc_conn_terminate(tn->topsrv, subscriber->conid); >> >> spin_lock_bh(&subscriber->lock); >> list_add(&sub->subscrp_list, &subscriber->subscrp_list); >> tipc_subscrb_get(subscriber); >> sub->subscriber = subscriber; >> tipc_nametbl_subscribe(sub); <== At this >> point, "sub" won't be NULL >> spin_unlock_bh(&subscriber->lock); >> >> ... >> >> Thanks, >> Guna >> >> ------------------------------------------------------------------------------ >> Transform Data into Opportunity. >> Accelerate data analysis in your applications with >> Intel Data Analytics Acceleration Library. >> Click to learn more. >> http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140 >> _______________________________________________ >> tipc-discussion mailing list >> tipc-discussion@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/tipc-discussion > > ------------------------------------------------------------------------------ > Transform Data into Opportunity. > Accelerate data analysis in your applications with > Intel Data Analytics Acceleration Library. > Click to learn more. > http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140 > _______________________________________________ > tipc-discussion mailing list > tipc-discussion@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/tipc-discussion ------------------------------------------------------------------------------ Transform Data into Opportunity. Accelerate data analysis in your applications with Intel Data Analytics Acceleration Library. Click to learn more. http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140 _______________________________________________ tipc-discussion mailing list tipc-discussion@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tipc-discussion
