Re: linux-next: manual merge of the kdbus tree with Linus' tree

2015-09-13 Thread Greg KH
On Mon, Sep 14, 2015 at 10:53:56AM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the kdbus tree got a conflict in: > > tools/testing/selftests/Makefile > > between commit: > > b6d973441675 ("selftests: add membarrier syscall test") > > from Linus' tree and commi

linux-next: manual merge of the kdbus tree with Linus' tree

2015-09-13 Thread Stephen Rothwell
Hi Greg, Today's linux-next merge of the kdbus tree got a conflict in: tools/testing/selftests/Makefile between commit: b6d973441675 ("selftests: add membarrier syscall test") from Linus' tree and commit: b7270dd9f7d4 ("kdbus: add selftests") from the kdbus tree. I fixed it up (see be