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 [email protected]
>
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
