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

On Fri, Apr 21, 2017 at 02:45:40PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > drivers/misc/Makefile > > between commit: > > 58c89c8aa0e8 ("misc: Add host side PCI driver for PCI test function device") > > from the pci

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

Hi all, Today's linux-next merge of the char-misc tree got a conflict in: drivers/misc/Makefile between commit: 58c89c8aa0e8 ("misc: Add host side PCI driver for PCI test function device") from the pci tree and commits: 6c4e97678501 ("drivers/misc: Add Aspeed LPC control driver") 51c1