Re: linux-next: manual merge of the char-misc tree with the net-next tree

2016-09-08 Thread Greg KH
On Wed, Sep 07, 2016 at 04:51:12PM +, Stephen Hemminger wrote: > It isn't so much about the Pull Request, more about having a single pre-merged > location and making sure that everyone is on the same page for testing. I don't understand. If you want to have a git tree, for testing in

Re: linux-next: manual merge of the char-misc tree with the net-next tree

2016-09-07 Thread Greg KH
On Tue, Sep 06, 2016 at 04:07:17PM +, Stephen Hemminger wrote: > How about I setup a git tree (hyperv-next) to premerge these. > > We are getting changes from multiple submitters through multiple trees now. That's because there are multiple drivers in different subsystems, so having a single

RE: linux-next: manual merge of the char-misc tree with the net-next tree

2016-09-06 Thread KY Srinivasan
tworking <netdev@vger.kernel.org>; linux-n...@vger.kernel.org; linux- > ker...@vger.kernel.org; Stephen Hemminger <sthem...@microsoft.com>; > Vitaly Kuznetsov <vkuzn...@redhat.com> > Subject: RE: linux-next: manual merge of the char-misc tree with the net-next > tree > &g

RE: linux-next: manual merge of the char-misc tree with the net-next tree

2016-09-06 Thread KY Srinivasan
kernel.org>; linux-n...@vger.kernel.org; linux- > ker...@vger.kernel.org; Stephen Hemminger <sthem...@microsoft.com>; > Vitaly Kuznetsov <vkuzn...@redhat.com>; KY Srinivasan <k...@microsoft.com> > Subject: Re: linux-next: manual merge of the char-misc tree with the n

Re: linux-next: manual merge of the char-misc tree with the net-next tree

2016-09-05 Thread Greg KH
On Mon, Sep 05, 2016 at 04:56:50PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > include/linux/hyperv.h > > between commit: > > 30d1de08c87d ("hv_netvsc: make inline functions static") > > from the net-next tree and