On Thu, Dec 20, 2018 at 05:02:53PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the char-misc tree got a conflict in:
>
> drivers/ptp/ptp_clock.c
>
> between commit:
>
> aea0a897af9e ("ptp: Fix pass zero to ERR_PTR() in ptp_clock_register")
>
> from the net-next
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in:
drivers/ptp/ptp_clock.c
between commit:
aea0a897af9e ("ptp: Fix pass zero to ERR_PTR() in ptp_clock_register")
from the net-next tree and commit:
b9d93594c767 ("ptp: fix an IS_ERR() vs NULL check")
from the char-
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
linux-ne
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
;
> Vitaly Kuznetsov
> Subject: RE: linux-next: manual merge of the char-misc tree with the net-next
> tree
>
>
>
> > -Original Message-
> > From: Greg KH [mailto:g...@kroah.com]
> > Sent: Monday, September 5, 2016 5:04 PM
> > To: Stephen Ro
t; Vitaly Kuznetsov ; KY Srinivasan
> Subject: Re: linux-next: manual merge of the char-misc tree with the net-next
> tree
>
> 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 co
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 commi
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 commit:
bb08d431a914 ("Drivers: hv: ring_buffer: count on wrap around mappings in
get_nex
