linux-kernel - Re: linux-next: manual merge of the kdbus tree with the arm-soc tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20150316081224.GA12392@kroah.com>
Date:	Mon, 16 Mar 2015 09:12:24 +0100
From:	Greg KH <greg@...ah.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	linux-arm-kernel@...ts.infradead.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Magnus Damm <damm+renesas@...nsource.se>,
	Simon Horman <horms+renesas@...ge.net.au>,
	Daniel Mack <daniel@...que.org>
Subject: Re: linux-next: manual merge of the kdbus tree with the arm-soc tree

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