Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1223784 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2015-09-14 03:00 +0200 |
| Last post | 2015-09-14 06:30 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the kdbus tree with Linus' tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-09-14 03:00 +0200
Re: linux-next: manual merge of the kdbus tree with Linus' tree Greg KH <greg@kroah.com> - 2015-09-14 06:30 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2015-09-14 03:00 +0200 |
| Subject | linux-next: manual merge of the kdbus tree with Linus' tree |
| Message-ID | <q8qhI-7ka-7@gated-at.bofh.it> |
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@canb.auug.org.au
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@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [next] | [standalone]
| From | Greg KH <greg@kroah.com> |
|---|---|
| Date | 2015-09-14 06:30 +0200 |
| Message-ID | <q8tyW-3NK-7@gated-at.bofh.it> |
| In reply to | #1223784 |
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 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@canb.auug.org.au
>
> 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
Looks good to me, thanks.
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web