linux-next: manual merge of the kdbus tree with the arm-soc tree
From: Greg KH <hidden>
Date: 2015-03-16 08:17:36
Also in:
linux-next, lkml
On Mon, Mar 16, 2015 at 04:16:26PM +1100, Stephen Rothwell wrote:
quoted hunk ↗ jump to hunk
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 at 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