All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michal Simek <monstr@monstr.eu>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Jiang Liu <liuj97@gmail.com>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: Re: linux-next: manual merge of the microblaze tree with Linus' tree
Date: Thu, 09 May 2013 08:55:49 +0200	[thread overview]
Message-ID: <518B4875.9000303@monstr.eu> (raw)
In-Reply-To: <20130509103513.8432fb1f7834a57de404f2a7@canb.auug.org.au>

[-- Attachment #1: Type: text/plain, Size: 1000 bytes --]

Hi Stephen

On 05/09/2013 02:35 AM, Stephen Rothwell wrote:
> Hi Michal,
> 
> Today's linux-next merge of the microblaze tree got a conflict in
> arch/microblaze/mm/init.c between commit 7beb5987875b ("mm/microblaze:
> use common help functions to free reserved pages") from Linus' tree and
> commits 17408c87ba9e ("microblaze: Fix free_init_pages function") and
> c5c09c08718b ("microblaze: Fix initrd support") from the microblaze tree.
> 
> I just used the version from Linus' tree (I am not sure if that is the
> correct solution) and can carry the fix as necessary (no action is
> required).

Thanks for reporting this. I will look at it and fix it.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]

  reply	other threads:[~2013-05-09  6:55 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-09  0:35 linux-next: manual merge of the microblaze tree with Linus' tree Stephen Rothwell
2013-05-09  6:55 ` Michal Simek [this message]
  -- strict thread matches above, loose matches on Subject: below --
2011-07-26  1:46 Stephen Rothwell
2010-02-09  0:07 Stephen Rothwell
2010-02-09  8:18 ` Michal Simek
2010-02-09 10:46   ` Stephen Rothwell

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=518B4875.9000303@monstr.eu \
    --to=monstr@monstr.eu \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=liuj97@gmail.com \
    --cc=sfr@canb.auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.