From: Al Viro <viro@ZenIV.linux.org.uk>
To: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
David Howells <dhowells@redhat.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: linux-next: manual merge of the vfs tree with the powerpc tree
Date: Wed, 1 May 2013 06:10:14 +0100 [thread overview]
Message-ID: <20130501051014.GA11630@ZenIV.linux.org.uk> (raw)
In-Reply-To: <5180A1AD.4060409@linux.vnet.ibm.com>
On Wed, May 01, 2013 at 10:31:33AM +0530, Vasant Hegde wrote:
> On 05/01/2013 07:36 AM, Stephen Rothwell wrote:
> >Hi Al,
> >
> >Today's linux-next merge of the vfs tree got a conflict in
> >arch/powerpc/kernel/rtas_flash.c between commit fb4696c39573
> >("powerpc/rtas_flash: Fix bad memory access") from the powerpc tree and
> >commits ad18a364f186 ("powerpc/rtas_flash: Free kmem upon module exit")
> >and 2352ad01409d ("ppc: Clean up rtas_flash driver somewhat") from the
> >vfs tree.
> >
>
> Stephen,
>
> As Ben mentioned earlier, there are outstanding comments from me which
> needs to be addressed by Dave, before its merged.
What the hell? Your fixes *are* folded into that commit and according to
Ben it passes testing; is there anything still missing?
WARNING: multiple messages have this Message-ID (diff)
From: Al Viro <viro@ZenIV.linux.org.uk>
To: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com>,
linux-next@vger.kernel.org, linuxppc-dev@lists.ozlabs.org
Subject: Re: linux-next: manual merge of the vfs tree with the powerpc tree
Date: Wed, 1 May 2013 06:10:14 +0100 [thread overview]
Message-ID: <20130501051014.GA11630@ZenIV.linux.org.uk> (raw)
In-Reply-To: <5180A1AD.4060409@linux.vnet.ibm.com>
On Wed, May 01, 2013 at 10:31:33AM +0530, Vasant Hegde wrote:
> On 05/01/2013 07:36 AM, Stephen Rothwell wrote:
> >Hi Al,
> >
> >Today's linux-next merge of the vfs tree got a conflict in
> >arch/powerpc/kernel/rtas_flash.c between commit fb4696c39573
> >("powerpc/rtas_flash: Fix bad memory access") from the powerpc tree and
> >commits ad18a364f186 ("powerpc/rtas_flash: Free kmem upon module exit")
> >and 2352ad01409d ("ppc: Clean up rtas_flash driver somewhat") from the
> >vfs tree.
> >
>
> Stephen,
>
> As Ben mentioned earlier, there are outstanding comments from me which
> needs to be addressed by Dave, before its merged.
What the hell? Your fixes *are* folded into that commit and according to
Ben it passes testing; is there anything still missing?
next prev parent reply other threads:[~2013-05-01 5:10 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-01 2:06 linux-next: manual merge of the vfs tree with the powerpc tree Stephen Rothwell
2013-05-01 2:06 ` Stephen Rothwell
2013-05-01 2:06 ` Stephen Rothwell
2013-05-01 5:01 ` Vasant Hegde
2013-05-01 5:01 ` Vasant Hegde
2013-05-01 5:10 ` Al Viro [this message]
2013-05-01 5:10 ` Al Viro
-- strict thread matches above, loose matches on Subject: below --
2020-07-27 1:32 Stephen Rothwell
2020-07-27 1:32 ` Stephen Rothwell
2013-04-29 1:35 Stephen Rothwell
2013-04-29 1:35 ` Stephen Rothwell
2013-04-29 1:35 ` Stephen Rothwell
2013-04-29 3:40 ` Benjamin Herrenschmidt
2013-04-29 3:40 ` Benjamin Herrenschmidt
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=20130501051014.GA11630@ZenIV.linux.org.uk \
--to=viro@zeniv.linux.org.uk \
--cc=benh@kernel.crashing.org \
--cc=dhowells@redhat.com \
--cc=hegdevasant@linux.vnet.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--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.