From: Greg KH <greg@kroah•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Arnd Bergmann <arnd@arndb•de>,
Magnus Damm <damm+renesas@opensource•se>,
linux-kernel@vger•kernel.org, linux-next@vger•kernel.org,
Daniel Mack <daniel@zonque•org>, Olof Johansson <olof@lixom•net>,
Simon Horman <horms+renesas@verge•net.au>,
linux-arm-kernel@lists•infradead.org
Subject: Re: linux-next: manual merge of the kdbus tree with the arm-soc tree
Date: Mon, 16 Mar 2015 09:12:24 +0100 [thread overview]
Message-ID: <20150316081224.GA12392@kroah.com> (raw)
In-Reply-To: <20150316161626.32e838f5@canb.auug.org.au>
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
prev parent reply other threads:[~2015-03-16 8:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150316081224.GA12392@kroah.com \
--to=greg@kroah$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=damm+renesas@opensource$(echo .)se \
--cc=daniel@zonque$(echo .)org \
--cc=horms+renesas@verge$(echo .)net.au \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox