From: Mauro Carvalho Chehab <mchehab@infradead•org>
To: Stephen Rothwell <sfr@canb•auug.org.au>
Cc: Mauro Carvalho Chehab <mchehab@redhat•com>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Linus <torvalds@linux-foundation•org>
Subject: Re: linux-next: build failure after merge of the final tree (v4l-dvb tree related)
Date: Mon, 8 Jul 2013 09:58:19 -0300 (BRT) [thread overview]
Message-ID: <alpine.LFD.2.03.1307080929510.3984@infradead.org> (raw)
In-Reply-To: <20130708152658.1d6e24874c3363c5f115a005@canb.auug.org.au>
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
next prev parent reply other threads:[~2013-07-08 12:58 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-08 5:26 linux-next: build failure after merge of the final tree (v4l-dvb tree related) Stephen Rothwell
2013-07-08 12:58 ` Mauro Carvalho Chehab [this message]
2013-07-09 7:03 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2013-03-26 6:18 Stephen Rothwell
2013-03-26 12:04 ` Mauro Carvalho Chehab
2013-03-26 23:52 ` Stephen Rothwell
2013-03-27 11:11 ` Stephen Rothwell
2010-11-23 2:38 Stephen Rothwell
2010-12-07 3:18 ` Stephen Rothwell
2010-10-19 7:07 Stephen Rothwell
2010-10-21 10:53 ` Mauro Carvalho Chehab
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=alpine.LFD.2.03.1307080929510.3984@infradead.org \
--to=mchehab@infradead$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mchehab@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=torvalds@linux-foundation$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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