2010-07-16 07:11:33

by Stephen Rothwell

[permalink] [raw]
Subject: linux-next: build failure after merge of the final tree

Hi Russell,

After merging the final tree, today's linux-next build (most, if not all
arm configs) failed (not unexpectedly) due to the lmb -> memblock rename
(commit 95f72d1ed41a66f1c1c29c24d479de81a0bea36f "lmb: rename to
memblock").

See http://kisskb.ellerman.id.au/kisskb/branch/9/
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/


Attachments:
(No filename) (390.00 B)
(No filename) (490.00 B)
Download all attachments

2010-07-16 18:43:01

by Yinghai Lu

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the final tree

On 07/16/2010 12:11 AM, Stephen Rothwell wrote:
> Hi Russell,
>
> After merging the final tree, today's linux-next build (most, if not all
> arm configs) failed (not unexpectedly) due to the lmb -> memblock rename
> (commit 95f72d1ed41a66f1c1c29c24d479de81a0bea36f "lmb: rename to
> memblock").
>
> See http://kisskb.ellerman.id.au/kisskb/branch/9/

You or Russell may need to run the scripts in that patch

FILES=$(find * -type f | grep -vE 'oprofile|[^K]config')

sed -i \
-e 's/lmb/memblock/g' \
-e 's/LMB/MEMBLOCK/g' \
$FILES

for N in $(find . -name lmb.[ch]); do
M=$(echo $N | sed 's/lmb/memblock/g')
mv $N $M
done


Thanks

Yinghai

2010-07-16 20:58:33

by Russell King

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the final tree

On Fri, Jul 16, 2010 at 11:39:34AM -0700, Yinghai Lu wrote:
> On 07/16/2010 12:11 AM, Stephen Rothwell wrote:
> > Hi Russell,
> >
> > After merging the final tree, today's linux-next build (most, if not all
> > arm configs) failed (not unexpectedly) due to the lmb -> memblock rename
> > (commit 95f72d1ed41a66f1c1c29c24d479de81a0bea36f "lmb: rename to
> > memblock").
> >
> > See http://kisskb.ellerman.id.au/kisskb/branch/9/
>
> You or Russell may need to run the scripts in that patch

I've already fixed it up. I'm guessing that we'll see the results
sometime on Monday.

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:

2010-07-16 23:08:11

by Stephen Rothwell

[permalink] [raw]
Subject: Re: linux-next: build failure after merge of the final tree

Hi Russell,

On Fri, 16 Jul 2010 21:58:13 +0100 Russell King <[email protected]> wrote:
>
> On Fri, Jul 16, 2010 at 11:39:34AM -0700, Yinghai Lu wrote:
> > On 07/16/2010 12:11 AM, Stephen Rothwell wrote:
> > > Hi Russell,
> > >
> > > After merging the final tree, today's linux-next build (most, if not all
> > > arm configs) failed (not unexpectedly) due to the lmb -> memblock rename
> > > (commit 95f72d1ed41a66f1c1c29c24d479de81a0bea36f "lmb: rename to
> > > memblock").
> > >
> > > See http://kisskb.ellerman.id.au/kisskb/branch/9/
> >
> > You or Russell may need to run the scripts in that patch
>
> I've already fixed it up. I'm guessing that we'll see the results
> sometime on Monday.

I figured that you would have. And, yes, I will pick it up in Monday.

Thanks.

--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/


Attachments:
(No filename) (887.00 B)
(No filename) (490.00 B)
Download all attachments