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

2018-12-05 Thread Greg KH
On Thu, Dec 06, 2018 at 03:48:00PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > drivers/misc/Makefile > > between commit: > > 4eb78924bf0e ("misc: cardreader: add new Alcor Micro Cardreader PCI driver") > > from the mmc

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

2018-12-05 Thread Greg KH
On Thu, Dec 06, 2018 at 03:48:00PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in: > > drivers/misc/Makefile > > between commit: > > 4eb78924bf0e ("misc: cardreader: add new Alcor Micro Cardreader PCI driver") > > from the mmc