From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Al Viro <viro@ZenIV.linux.org.uk>,
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, 01 May 2013 10:31:33 +0530 [thread overview]
Message-ID: <5180A1AD.4060409@linux.vnet.ibm.com> (raw)
In-Reply-To: <20130501120636.0e54681b2dfb7ebe6aeb27c4@canb.auug.org.au>
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.
-Vasant
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
WARNING: multiple messages have this Message-ID (diff)
From: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-kernel@vger.kernel.org, David Howells <dhowells@redhat.com>,
linux-next@vger.kernel.org, Al Viro <viro@ZenIV.linux.org.uk>,
linuxppc-dev@lists.ozlabs.org
Subject: Re: linux-next: manual merge of the vfs tree with the powerpc tree
Date: Wed, 01 May 2013 10:31:33 +0530 [thread overview]
Message-ID: <5180A1AD.4060409@linux.vnet.ibm.com> (raw)
In-Reply-To: <20130501120636.0e54681b2dfb7ebe6aeb27c4@canb.auug.org.au>
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.
-Vasant
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
next prev parent reply other threads:[~2013-05-01 5:02 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 [this message]
2013-05-01 5:01 ` Vasant Hegde
2013-05-01 5:10 ` Al Viro
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=5180A1AD.4060409@linux.vnet.ibm.com \
--to=hegdevasant@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=dhowells@redhat.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 \
--cc=viro@ZenIV.linux.org.uk \
/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.