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

2018-12-12 Thread Greg KH
On Wed, Dec 12, 2018 at 12:02:52PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > MAINTAINERS > > between commit: > > cb4f131e1f2c ("MAINTAINERS: Patch monkey for the Hyper-V code") > > from the char-misc.current tree and c

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

2018-12-11 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: MAINTAINERS between commit: cb4f131e1f2c ("MAINTAINERS: Patch monkey for the Hyper-V code") from the char-misc.current tree and commit: b255e500c8dc ("net: documentation: build a directory structure for drivers")

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

2017-01-31 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/hyperv/netvsc.c between commit: 433e19cf33d3 ("Drivers: hv: vmbus: finally fix hv_need_to_signal_on_read()") from the char-misc.current tree and commits: 0b307ebd6834 ("netvsc: remove no longer needed r