Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1610146 > unrolled thread
| Started by | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| First post | 2017-03-28 01:00 +0200 |
| Last post | 2017-03-28 03:00 +0200 |
| Articles | 2 — 2 participants |
Back to article view | Back to linux.kernel
linux-next: manual merge of the kbuild tree with the input-current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-03-28 01:00 +0200
Re: linux-next: manual merge of the kbuild tree with the input-current tree Masahiro Yamada <yamada.masahiro@socionext.com> - 2017-03-28 03:00 +0200
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Date | 2017-03-28 01:00 +0200 |
| Subject | linux-next: manual merge of the kbuild tree with the input-current tree |
| Message-ID | <tpLMe-6Ms-13@gated-at.bofh.it> |
Hi Masahiro,
Today's linux-next merge of the kbuild tree got a conflict in:
include/uapi/linux/Kbuild
between commit:
5659495a7a14 ("uapi: add missing install of userio.h")
from the input-current tree and commit:
65017bab8a9e ("uapi: export all headers under uapi directories")
from the kbuild tree.
I fixed it up (the latter supercedes the former, so I just used it) 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. You may
also want to consider cooperating with the maintainer of the conflicting
tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[toc] | [next] | [standalone]
| From | Masahiro Yamada <yamada.masahiro@socionext.com> |
|---|---|
| Date | 2017-03-28 03:00 +0200 |
| Subject | Re: linux-next: manual merge of the kbuild tree with the input-current tree |
| Message-ID | <tpNEm-82k-9@gated-at.bofh.it> |
| In reply to | #1610146 |
Hi Stephen,
2017-03-28 7:55 GMT+09:00 Stephen Rothwell <sfr@canb.auug.org.au>:
> Hi Masahiro,
>
> Today's linux-next merge of the kbuild tree got a conflict in:
>
> include/uapi/linux/Kbuild
>
> between commit:
>
> 5659495a7a14 ("uapi: add missing install of userio.h")
>
> from the input-current tree and commit:
>
> 65017bab8a9e ("uapi: export all headers under uapi directories")
>
> from the kbuild tree.
>
> I fixed it up (the latter supercedes the former, so I just used it) and
> can carry the fix as necessary.
Right. header-y is no longer needed to export headers.
Thanks!
--
Best Regards
Masahiro Yamada
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web