Re: linux-next: manual merge of the staging tree with the phy-next tree

Hi Stephen, On Thu, Dec 10, 2020 at 7:40 AM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the staging tree got conflicts in: > > drivers/staging/Kconfig > drivers/staging/Makefile > > between commit: > > 53e7c92c7fa0 ("staging: mt7621-pci-phy: remove driver from

linux-next: manual merge of the staging tree with the phy-next tree

Hi all, Today's linux-next merge of the staging tree got conflicts in: drivers/staging/Kconfig drivers/staging/Makefile between commit: 53e7c92c7fa0 ("staging: mt7621-pci-phy: remove driver from staging") from the phy-next tree and commit: 518b466a21ad ("pinctrl: ralink: add a