Re: linux-next: Tree for Jul 4 -> conflict between s390 and driver-core tree

2019-07-08 Thread Stephen Rothwell
Hi Christian, On Fri, 5 Jul 2019 10:59:01 +0200 Christian Borntraeger wrote: > > Linus, Vasily, for your attention in the next merge window. (I would suggest > to apply > belows fixup during the merge of whatever tree is merged 2nd). > > > There is now a build conflict between the s390/featur

Re: linux-next: Tree for Jul 4 -> conflict between s390 and driver-core tree

2019-07-05 Thread Christian Borntraeger
Linus, Vasily, for your attention in the next merge window. (I would suggest to apply belows fixup during the merge of whatever tree is merged 2nd). There is now a build conflict between the s390/features branch and the driver-core/driver-core-next especially between commit 92ce7e83b4e5 ("driv