On Thu, May 12, 2016 at 6:17 AM, Stephen Rothwell wrote:
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging
Hi Linus,
Today's linux-next merge of the gpio tree got a conflict in:
arch/mips/Kconfig
between commit:
cec47c182286 ("MIPS: Loongson: Add Loongson-3A R2 basic support")
from the mips tree and commit:
d30a2b47d4c2 ("MIPS: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB")
from the gp
2 matches
Mail list logo