Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751740Ab3GHM6f (ORCPT ); Mon, 8 Jul 2013 08:58:35 -0400 Received: from bombadil.infradead.org ([198.137.202.9]:50999 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751108Ab3GHM6d (ORCPT ); Mon, 8 Jul 2013 08:58:33 -0400 Date: Mon, 8 Jul 2013 09:58:19 -0300 (BRT) From: Mauro Carvalho Chehab X-X-Sender: mchehab@pato.lan To: Stephen Rothwell cc: Mauro Carvalho Chehab , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Linus Subject: Re: linux-next: build failure after merge of the final tree (v4l-dvb tree related) In-Reply-To: <20130708152658.1d6e24874c3363c5f115a005@canb.auug.org.au> Message-ID: References: <20130708152658.1d6e24874c3363c5f115a005@canb.auug.org.au> User-Agent: Alpine 2.03 (LFD 1266 2009-07-14) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1554 Lines: 44 On Mon, 8 Jul 2013, Stephen Rothwell wrote: > Hi all, > > After merging the final tree, today's linux-next build > (powerpc_ppc44x_defconfig) failed like this: > > arch/powerpc/boot/wrapper: line 314: .../scripts/mkuboot.sh: Permission denied > > Caused by commit cda2bf15f6dc ("Update email to m.chehab@samsung.com") > from the v4l-dvb tree. Sorry. That was due to a bad merge at my -next tree, where I had there both the correct and the wrong patches merged. The correct changeset is this one: http://git.linuxtv.org/mchehab/media-next.git/commit/de58f1a28541fef62f20465dcd1bbcf25b4685c5 It is fixed there already. > I have reverted that commit for today. > > Linus, please don't merge the v4l-dvb tree like it is. I'll wait for tomorrow's next to see if everything is ok, before sending a new pull request. > Mauro, in the case of copyright notices, you should just remove your > email address, not bother changing it. Hmm... then I'll need to re-do the patch, manually reviewing each hunk, instead of replacing via a script, as, on some places, like MAINTAINERS, we need to preserve the email. Let me simplify it: I'll drop that patch, replacing by one that will just change MAINTAINERS. I'll later submit the remaining changes on a separate patch for the next merge window. Regards, Mauro -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/