* linux-next: manual merge of the kdbus tree with the arm-soc tree
@ 2015-03-16 5:16 Stephen Rothwell
2015-03-16 8:12 ` Greg KH
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2015-03-16 5:16 UTC (permalink / raw)
To: Greg KH, Olof Johansson, Arnd Bergmann, linux-arm-kernel
Cc: linux-next, linux-kernel, Magnus Damm, Simon Horman, Daniel Mack
[-- Attachment #1: Type: text/plain, Size: 934 bytes --]
Hi Greg,
Today's linux-next merge of the kdbus tree got a conflict in
Documentation/Makefile between commit c6535e1e0361 ("Documentation:
Remove ZBOOT MMC/SDHI utility and docs") from the arm-soc tree and
commit 48480f8c402c ("kdbus: add documentation") 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 Documentation/Makefile
index bc0548201755,5e3fde632d03..000000000000
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -1,4 -1,4 +1,4 @@@
-subdir-y := accounting arm auxdisplay blackfin connector \
+subdir-y := accounting auxdisplay blackfin connector \
- filesystems filesystems ia64 laptops mic misc-devices \
+ filesystems filesystems ia64 kdbus laptops mic misc-devices \
networking pcmcia prctl ptp spi timers vDSO video4linux \
watchdog
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the kdbus tree with the arm-soc tree
2015-03-16 5:16 linux-next: manual merge of the kdbus tree with the arm-soc tree Stephen Rothwell
@ 2015-03-16 8:12 ` Greg KH
0 siblings, 0 replies; 2+ messages in thread
From: Greg KH @ 2015-03-16 8:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, Magnus Damm, linux-kernel, linux-next,
Daniel Mack, Olof Johansson, Simon Horman, linux-arm-kernel
On Mon, Mar 16, 2015 at 04:16:26PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the kdbus tree got a conflict in
> Documentation/Makefile between commit c6535e1e0361 ("Documentation:
> Remove ZBOOT MMC/SDHI utility and docs") from the arm-soc tree and
> commit 48480f8c402c ("kdbus: add documentation") 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 Documentation/Makefile
> index bc0548201755,5e3fde632d03..000000000000
> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@@ -1,4 -1,4 +1,4 @@@
> -subdir-y := accounting arm auxdisplay blackfin connector \
> +subdir-y := accounting auxdisplay blackfin connector \
> - filesystems filesystems ia64 laptops mic misc-devices \
> + filesystems filesystems ia64 kdbus laptops mic misc-devices \
> networking pcmcia prctl ptp spi timers vDSO video4linux \
> watchdog
Thanks, the merge looks fine to me.
greg k-h
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-16 8:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-16 5:16 linux-next: manual merge of the kdbus tree with the arm-soc tree Stephen Rothwell
2015-03-16 8:12 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).