Home » Mailing list archives » linux-kernel » 2008 » September » 18

Re: mmotm 2008-09-13-03-09 uploaded

Previous thread: change TOS explicitly for egress packets on specified network interface by gshan on Wednesday, September 17, 2008 - 10:41 pm. (1 message)

Next thread: [PATCH] x86: x86_{phys,virt}_bits field also for i386 (v3) by Jan Beulich on Thursday, September 18, 2008 - 12:13 am. (17 messages)
[view original message]
From: KAMEZAWA Hiroyuki
Subject: Re: mmotm 2008-09-13-03-09 uploaded
Date: Wednesday, September 17, 2008 - 11:01 pm

On Sat, 13 Sep 2008 03:11:29 -0700
git-regulator.patch

I'm not so familiar with this HEAD: but is this from git ?

This change

--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -7,6 +7,9 @@ obj-$(CONFIG_REGULATOR) += core.o
 obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o
 obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o

+<<<<<<< HEAD:drivers/regulator/Makefile
 obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o

+=======
+>>>>>>> FETCH_HEAD:drivers/regulator/Makefile
 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG


stops "make clean"
==
[kamezawa@bluextal mmtom-2.6.26-rc6+]$ make clean
/home/kamezawa/mmtom-2.6.26-rc6+/drivers/regulator/Makefile:13: *** empty variable name.  Stop.
make[1]: *** [drivers/regulator] Error 2
make: *** [_clean_drivers] Error 2

Hmm ? (at build, CONFIG_REGULATOR=n allows me to avoid this.)

Thanks,
-Kame

--


[ message continues ]
[view original message]
From: Andrew Morton
Subject: Re: mmotm 2008-09-13-03-09 uploaded
Date: Wednesday, September 17, 2008 - 11:26 pm

argh, sorry.

I pull git-regulator daily, check to see if it got fixed up yet and if
not, comment it out.  I apparently forgot to do the last two steps on
2008-09-13-03-09.

I'll do 2008-09-17-XX-XX right now..
--


[ message continues ]
[view original message]
From: Liam Girdwood
Subject: Re: mmotm 2008-09-13-03-09 uploaded
Date: Thursday, September 18, 2008 - 1:51 am

git-regulator has been upstream since rc2 so I'm surprised we are seeing
this atm.

Can I just confirm the repository & branch you are pulling as I've
recently left Wolfson and now work for myself (I will no longer have
guaranteed access to the Wolfson git repositories). I've also moved
regulator development over to kernel.org:-

git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git #dev

Sorry for any hassle here.

Liam


--


[ message continues ]
[view original message]
From: Andrew Morton
Subject: Re: mmotm 2008-09-13-03-09 uploaded
Date: Thursday, September 18, 2008 - 2:23 am

oic.  I'm pulling some dead old thing from

Please send that off to Stephen for linux-next inclusion.
--


[ message continues ]
[view original message]
From: Liam Girdwood
Subject: Re: mmotm 2008-09-13-03-09 uploaded
Date: Thursday, September 18, 2008 - 2:37 am

It already is :)

Liam

--


[ message continues ]
[view original message]
From: Stephen Rothwell
Subject: Re: mmotm 2008-09-13-03-09 uploaded
Date: Thursday, September 18, 2008 - 10:52 am

Hi Andrew, Liam,


I have this:

Liam Girdwood <lg@opensource.wolfsonmicro.com>
voltage git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#r=
eg-for-linus

in the linux-next list already.  Do I assume that some changes are needed
(email and branch)?

--=20
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[ message continues ]
[view original message]
From: Liam Girdwood
Subject: Re: mmotm 2008-09-13-03-09 uploaded
Date: Thursday, September 18, 2008 - 1:32 pm

Yes, email and branch have changed.

For next it should be :-

Liam Girdwood <lrg@slimlogic.co.uk>
voltage git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6.git#for-linus

Thanks

Liam

--


[ message continues ]
Previous thread: change TOS explicitly for egress packets on specified network interface by gshan on Wednesday, September 17, 2008 - 10:41 pm. (1 message)

Next thread: [PATCH] x86: x86_{phys,virt}_bits field also for i386 (v3) by Jan Beulich on Thursday, September 18, 2008 - 12:13 am. (17 messages)