archive mirror
 help / color / mirror / Atom feed
From: Benjamin Herrenschmidt <>
To: Stephen Rothwell <>
Cc: Vasant Hegde <>,, David Howells <>,, Al Viro <>,
Subject: Re: linux-next: manual merge of the vfs tree with the powerpc tree
Date: Mon, 29 Apr 2013 13:40:44 +1000	[thread overview]
Message-ID: <1367206844.7288.0.camel@pasglop> (raw)
In-Reply-To: <>

On Mon, 2013-04-29 at 11:35 +1000, Stephen Rothwell wrote:
> Today's linux-next merge of the vfs tree got a conflict in
> arch/powerpc/kernel/rtas_flash.c between commit ad18a364f186
> ("powerpc/rtas_flash: Free kmem upon module exit"),  from the powerpc
> tree and commit 5c0333c00ff6 ("ppc: Clean up rtas_flash driver
> somewhat")
> from the vfs tree.
> I fixed it up (see below) and can carry the fix as necessary (no
> action
> is required).

Please don't merge Dave's rework until it's been acked & fully tested by
us. AFAIK, there are outstanding comments from my guys who
reviewed/tested the first pass.


  reply	other threads:[~2013-04-29  3:40 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-29  1:35 linux-next: manual merge of the vfs tree with the powerpc tree Stephen Rothwell
2013-04-29  3:40 ` Benjamin Herrenschmidt [this message]
2013-05-01  2:06 Stephen Rothwell
2013-05-01  5:01 ` Vasant Hegde
2013-05-01  5:10   ` Al Viro
2020-07-27  1:32 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:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1367206844.7288.0.camel@pasglop \ \ \ \ \ \ \ \ \

* 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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).