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
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 tree and commit:
fcb418cd567f ("pvpanic: move pvpanic to misc as common driver")
fro
2 matches
Mail list logo