From mboxrd@z Thu Jan 1 00:00:00 1970 From: Benjamin Herrenschmidt Subject: Re: linux-next: manual merge of the vfs tree with the powerpc tree Date: Mon, 29 Apr 2013 13:40:44 +1000 Message-ID: <1367206844.7288.0.camel@pasglop> References: <20130429113540.55b2593d303bc2a9142919fc@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20130429113540.55b2593d303bc2a9142919fc@canb.auug.org.au> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+glppe-linuxppc-embedded-2=m.gmane.org@lists.ozlabs.org Sender: "Linuxppc-dev" To: Stephen Rothwell Cc: Vasant Hegde , linux-kernel@vger.kernel.org, David Howells , linux-next@vger.kernel.org, Al Viro , linuxppc-dev@lists.ozlabs.org List-Id: linux-next.vger.kernel.org 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. Cheers, Ben.