From: Richard Purdie <richard.purdie@linuxfoundation.org>
To: Bruce Ashfield <bruce.ashfield@windriver.com>
Cc: openembedded-core@lists.openembedded.org
Subject: Re: [PATCH 2/3] linux-yocto/3.10: update to 3.10.25
Date: Wed, 15 Jan 2014 15:46:49 +0000 [thread overview]
Message-ID: <1389800809.14987.82.camel@ted> (raw)
In-Reply-To: <52D6A528.5020909@windriver.com>
On Wed, 2014-01-15 at 10:11 -0500, Bruce Ashfield wrote:
> On 14-01-15 10:06 AM, Richard Purdie wrote:
> > On Wed, 2014-01-15 at 00:57 -0500, Bruce Ashfield wrote:
> >> Updating the 3.10 tree to the 3.10.25 korg -stable release.
> >>
> >> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> >> ---
> >> meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb | 10 ++++------
> >> meta/recipes-kernel/linux/linux-yocto-tiny_3.10.bb | 6 +++---
> >> meta/recipes-kernel/linux/linux-yocto_3.10.bb | 18 +++++++++---------
> >> 3 files changed, 16 insertions(+), 18 deletions(-)
> >>
> >> diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
> >> index e81a77ba4ea5..d301c06eae37 100644
> >> --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
> >> +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.10.bb
> >> @@ -3,13 +3,11 @@ require recipes-kernel/linux/linux-yocto.inc
> >> KBRANCH = "standard/preempt-rt/base"
> >> KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
> >>
> >> -SRCREV_machine ?= "ee9480cd91b2b46325a2da9aa6ae779d8e4163c0"
> >> -SRCREV_machine_qemuppc ?= "5c126504c0a2f72d80bae9d96cea7eb9d7854290"
> >> -SRCREV_meta ?= "d9cd83c0292bd4e2a6754a96761027252e726a42"
> >> +SRCREV_machine ?= "957ba6ae6c1d81b57da6a36b93f1b2a0ced2f45d"
> >> +SRCREV_machine_qemuppc ?= "37e40b7017a9c78d676b19716011494dc7cb6369"
> >> +SRCREV_meta ?= "778d5f6259f0b8e28a46d8a764979e20e5a8ffc4"
> >>
> >> -SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.10.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
> >> -
> >
> > I'm guessing this shouldn't remove the above line? It triggers parse
> > failures...
>
> urk. He who rebases patch series late at night, shouldn't hit send until
> the morning.
>
> That was aggressive trailing whitespace cleanup gone bad. If you can
> restore it, I'll be eternally grateful. Or I can resend, but that
> seems like excessive overhead for an obvious mess up.
I've tweaked it in master-next.
Cheers,
Richard
next prev parent reply other threads:[~2014-01-15 15:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-15 5:57 [PATCH 0/3] linux-yocto/3.10: consolidated update pull request Bruce Ashfield
2014-01-15 5:57 ` [PATCH 1/3] linux-yocto/3.10: update meta data for media fragments Bruce Ashfield
2014-01-15 5:57 ` [PATCH 2/3] linux-yocto/3.10: update to 3.10.25 Bruce Ashfield
2014-01-15 15:06 ` Richard Purdie
2014-01-15 15:11 ` Bruce Ashfield
2014-01-15 15:46 ` Richard Purdie [this message]
2014-01-15 5:57 ` [PATCH 3/3] linux-yocto/3.10: mohonpeak bsp config and scc files Bruce Ashfield
2014-01-15 11:27 ` Otavio Salvador
2014-01-15 12:26 ` Richard Purdie
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=1389800809.14987.82.camel@ted \
--to=richard.purdie@linuxfoundation.org \
--cc=bruce.ashfield@windriver.com \
--cc=openembedded-core@lists.openembedded.org \
/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.