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

[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 below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc tools/testing/selftests/Makefile
index 89b05e2222c9,b57100cefb74..000000000000
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@@ -4,9 -4,8 +4,10 @@@ TARGETS += efivarf
  TARGETS += exec
  TARGETS += firmware
  TARGETS += ftrace
 +TARGETS += futex
  TARGETS += kcmp
+ TARGETS += kdbus
 +TARGETS += membarrier
  TARGETS += memfd
  TARGETS += memory-hotplug
  TARGETS += mount
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/