* linux-next: manual merge of the vfs-scale tree with the hfsplus tree
From: Stephen Rothwell @ 2010-12-17 0:24 UTC (permalink / raw)
To: Nick Piggin
Cc: linux-next, linux-kernel, Anton Salikhmetov, Christoph Hellwig
Hi Nick,
Today's linux-next merge of the vfs-scale tree got a conflict in
fs/hfsplus/hfsplus_fs.h fs/hfsplus/unicode.c between commit
2753cc281c9a0e8a0a45ee2b8110866a9fe63bdd ("hfsplus: over 80 character
lines clean-up") from the hfsplus tree and commits
aafad38382117d0e22b5ae36bc34337fdf20ed74 ("fs: change d_compare for
rcu-walk") and ab7e0cff7d85fd19a0c0740833f947533b851145 ("fs: change
d_hash for rcu-walk") from the vfs-scale tree.
I fixed it up (see below - I used the vfs-scale tree version of the
prototypes in unicode.c) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc fs/hfsplus/hfsplus_fs.h
index f7cbdf8,a5308f4..0000000
--- a/fs/hfsplus/hfsplus_fs.h
+++ b/fs/hfsplus/hfsplus_fs.h
@@@ -418,17 -375,16 +418,20 @@@ extern u16 hfsplus_decompose_table[]
extern u16 hfsplus_compose_table[];
/* unicode.c */
-int hfsplus_strcasecmp(const struct hfsplus_unistr *, const struct hfsplus_unistr *);
-int hfsplus_strcmp(const struct hfsplus_unistr *, const struct hfsplus_unistr *);
-int hfsplus_uni2asc(struct super_block *, const struct hfsplus_unistr *, char *, int *);
-int hfsplus_asc2uni(struct super_block *, struct hfsplus_unistr *, const char *, int);
+int hfsplus_strcasecmp(const struct hfsplus_unistr *,
+ const struct hfsplus_unistr *);
+int hfsplus_strcmp(const struct hfsplus_unistr *,
+ const struct hfsplus_unistr *);
+int hfsplus_uni2asc(struct super_block *,
+ const struct hfsplus_unistr *, char *, int *);
+int hfsplus_asc2uni(struct super_block *,
+ struct hfsplus_unistr *, const char *, int);
- int hfsplus_hash_dentry(struct dentry *dentry, struct qstr *str);
- int hfsplus_compare_dentry(struct dentry *dentry,
- struct qstr *s1, struct qstr *s2);
+ int hfsplus_hash_dentry(const struct dentry *dentry, const struct inode *inode,
+ struct qstr *str);
+ int hfsplus_compare_dentry(const struct dentry *parent,
+ const struct inode *pinode,
+ const struct dentry *dentry, const struct inode *inode,
+ unsigned int len, const char *str, const struct qstr *name);
/* wrapper.c */
int hfsplus_read_wrapper(struct super_block *);
^ permalink raw reply
* linux-next: build warnings after merge of the ia64 tree
From: Stephen Rothwell @ 2010-12-17 0:23 UTC (permalink / raw)
To: Luck, Tony; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1339 bytes --]
Hi Tony,
After merging the ia64 tree, today's linux-next build (x86_64_allmodconfig)
produced these warnings:
drivers/acpi/apei/erst.c: In function 'erst_reader':
drivers/acpi/apei/erst.c:826: warning: passing argument 1 of 'spinlock_check' from incompatible pointer type
include/linux/spinlock.h:272: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
drivers/acpi/apei/erst.c:829: warning: passing argument 1 of 'spin_unlock_irqrestore' from incompatible pointer type
include/linux/spinlock.h:338: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
drivers/acpi/apei/erst.c:834: warning: passing argument 1 of 'spin_unlock_irqrestore' from incompatible pointer type
include/linux/spinlock.h:338: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
drivers/acpi/apei/erst.c:840: warning: passing argument 1 of 'spin_unlock_irqrestore' from incompatible pointer type
include/linux/spinlock.h:338: note: expected 'struct spinlock_t *' but argument is of type 'struct raw_spinlock_t *'
Introduced by commit ae85bdfb6bd024fab5556f9b78668b1c6aab6fb8 ("pstore:
X86 platform interface using ACPI/APEI/ERST").
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with Linus' tree
From: Stephen Rothwell @ 2010-12-16 22:33 UTC (permalink / raw)
To: Greg KH; +Cc: Felipe Balbi, linux-next, linux-kernel, Bob Liu, Mike Frysinger
In-Reply-To: <20101216181429.GA19012@kroah.com>
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
Hi Greg, Felipe,
On Thu, 16 Dec 2010 10:14:29 -0800 Greg KH <greg@kroah.com> wrote:
>
> Ok, now merged and pushed out. Stephen, there shouldn't be any merge
> errors with the next linux-next and the usb-next branches anymore.
Thanks guys.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* [PATCH -next] crypto: fix af_alg memory_allocated data type
From: Randy Dunlap @ 2010-12-16 18:18 UTC (permalink / raw)
To: Stephen Rothwell, Herbert Xu; +Cc: linux-next, LKML, linux-crypto
In-Reply-To: <20101216173745.264eb2ca.sfr@canb.auug.org.au>
From: Randy Dunlap <randy.dunlap@oracle.com>
Change data type to fix warning:
crypto/af_alg.c:35: warning: initialization from incompatible pointer type
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
crypto/af_alg.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20101216.orig/crypto/af_alg.c
+++ linux-next-20101216/crypto/af_alg.c
@@ -27,7 +27,7 @@ struct alg_type_list {
struct list_head list;
};
-static atomic_t alg_memory_allocated;
+static atomic_long_t alg_memory_allocated;
static struct proto alg_proto = {
.name = "ALG",
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with Linus' tree
From: Greg KH @ 2010-12-16 18:14 UTC (permalink / raw)
To: Felipe Balbi
Cc: Stephen Rothwell, linux-next, linux-kernel, Bob Liu,
Mike Frysinger
In-Reply-To: <20101216174418.GA3849@kroah.com>
On Thu, Dec 16, 2010 at 09:44:18AM -0800, Greg KH wrote:
> On Thu, Dec 16, 2010 at 05:55:54PM +0200, Felipe Balbi wrote:
> > Hi,
> >
> > On Thu, Dec 16, 2010 at 07:52:25AM -0800, Greg KH wrote:
> > >On Thu, Dec 16, 2010 at 10:45:52AM +0200, Felipe Balbi wrote:
> > >>Hi,
> > >>
> > >>On Thu, Dec 16, 2010 at 10:05:27AM +0200, Felipe Balbi wrote:
> > >>>On Wed, Dec 15, 2010 at 07:08:57PM -0800, Greg KH wrote:
> > >>>>On Thu, Dec 16, 2010 at 02:01:22PM +1100, Stephen Rothwell wrote:
> > >>>>>Hi Greg,
> > >>>>>
> > >>>>>Today's linux-next merge of the usb tree got a conflict in
> > >>>>>drivers/usb/musb/blackfin.c drivers/usb/musb/musb_core.c
> > >>>>>drivers/usb/musb/musb_core.h between commit
> > >>>>>1e393c6eece048052d4131ec4dad3b98e35a98e2 ("USB: musb: blackfin: pm: make
> > >>>>>it work") from Linus' tree (v2.6.37-rc2) and various commits from the usb
> > >>>>>tree.
> > >>>>>
> > >>>>>It was not immediately obvious how to fix these up, so I just used the
> > >>>>>versions from the usb tree. This may not be correct and it would be good
> > >>>>>if this was fixed properly in the usb tree.
> > >>>>
> > >>>>Hm. Felipe, I'll merge in the -rc4 tree into usb-next if it makes sense
> > >>>>to do so now, can you send me the patch that ends up being the correct
> > >>>>merge?
> > >>>
> > >>>Sure, I'll check it now and send in a patch in a few minutes.
> > >>
> > >>There are two commits you didn't have in your usb-next branch which are
> > >>in mainline. Reverting them will make greg/usb-next apply cleanly on top
> > >>of v2.6.47-rc4. The commits are:
> > >>
> > >>32d5dc9520f0c6f60f691dd478741c774e292406 : USB: musb: pm: don't rely fully on clock support
> > >>1e393c6eece048052d4131ec4dad3b98e35a98e2 : USB: musb: blackfin: pm: make it work
> > >>
> > >>Do you want me to rebase on top of -rc4 or is reverting those two enough
> > >>for you ? As a sidenote, the series I sent you already fixes those two
> > >>cases as we moved PM and clock handling entirely to glue layer, so those
> > >>two cases are taken care of on the series, reverting those patches won't
> > >>pose any regressions.
> > >
> > >So, I should do the following things:
> > > take -rc6
> > > revert the above commits
> > > merge with usb-next
> > > push out
> > >
> > >and all should be good, right? If so, that's fine with me, I'll do it
> >
> > Perfect, I just tried again just to be sure Merges cleanly:
> >
> > commit 6033eb6e16e602f97ac5b6424ef71c8e464ececc
> > Merge: fa05820 0b83ae9
> > Author: Felipe Balbi <balbi@ti.com>
> > Date: Thu Dec 16 17:55:14 2010 +0200
> >
> > Merge remote-tracking branch 'greg/usb-next' into linus
>
> Great, will go do this now...
Ok, now merged and pushed out. Stephen, there shouldn't be any merge
errors with the next linux-next and the usb-next branches anymore.
thanks,
greg k-h
^ permalink raw reply
* Re: [PATCH -next v2] media: fix em28xx build, needs hardirq.h
From: Randy Dunlap @ 2010-12-16 18:03 UTC (permalink / raw)
To: linux-media
Cc: Alexey Dobriyan, Zimny Lech, Mauro Carvalho Chehab,
Stephen Rothwell, linux-next, LKML
In-Reply-To: <20101207105009.7d634c7b.randy.dunlap@oracle.com>
On Tue, 7 Dec 2010 10:50:09 -0800 Randy Dunlap wrote:
ping.
> ---
> From: Randy Dunlap <randy.dunlap@oracle.com>
>
> Fix em28xx build by adding hardirq.h header file:
>
> drivers/media/video/em28xx/em28xx-vbi.c:49: error: implicit declaration of function 'in_interrupt'
>
> Reported-by: Zimny Lech <napohybelskurwysynom2010@gmail.com>
> Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
> ---
> drivers/media/video/em28xx/em28xx-vbi.c | 1 +
> 1 file changed, 1 insertion(+)
>
> --- linux-next-20101207.orig/drivers/media/video/em28xx/em28xx-vbi.c
> +++ linux-next-20101207/drivers/media/video/em28xx/em28xx-vbi.c
> @@ -23,6 +23,7 @@
>
> #include <linux/kernel.h>
> #include <linux/module.h>
> +#include <linux/hardirq.h>
> #include <linux/init.h>
>
> #include "em28xx.h"
> --
> 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/
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with Linus' tree
From: Greg KH @ 2010-12-16 17:44 UTC (permalink / raw)
To: Felipe Balbi
Cc: Stephen Rothwell, linux-next, linux-kernel, Bob Liu,
Mike Frysinger
In-Reply-To: <20101216155554.GA9552@legolas.emea.dhcp.ti.com>
On Thu, Dec 16, 2010 at 05:55:54PM +0200, Felipe Balbi wrote:
> Hi,
>
> On Thu, Dec 16, 2010 at 07:52:25AM -0800, Greg KH wrote:
> >On Thu, Dec 16, 2010 at 10:45:52AM +0200, Felipe Balbi wrote:
> >>Hi,
> >>
> >>On Thu, Dec 16, 2010 at 10:05:27AM +0200, Felipe Balbi wrote:
> >>>On Wed, Dec 15, 2010 at 07:08:57PM -0800, Greg KH wrote:
> >>>>On Thu, Dec 16, 2010 at 02:01:22PM +1100, Stephen Rothwell wrote:
> >>>>>Hi Greg,
> >>>>>
> >>>>>Today's linux-next merge of the usb tree got a conflict in
> >>>>>drivers/usb/musb/blackfin.c drivers/usb/musb/musb_core.c
> >>>>>drivers/usb/musb/musb_core.h between commit
> >>>>>1e393c6eece048052d4131ec4dad3b98e35a98e2 ("USB: musb: blackfin: pm: make
> >>>>>it work") from Linus' tree (v2.6.37-rc2) and various commits from the usb
> >>>>>tree.
> >>>>>
> >>>>>It was not immediately obvious how to fix these up, so I just used the
> >>>>>versions from the usb tree. This may not be correct and it would be good
> >>>>>if this was fixed properly in the usb tree.
> >>>>
> >>>>Hm. Felipe, I'll merge in the -rc4 tree into usb-next if it makes sense
> >>>>to do so now, can you send me the patch that ends up being the correct
> >>>>merge?
> >>>
> >>>Sure, I'll check it now and send in a patch in a few minutes.
> >>
> >>There are two commits you didn't have in your usb-next branch which are
> >>in mainline. Reverting them will make greg/usb-next apply cleanly on top
> >>of v2.6.47-rc4. The commits are:
> >>
> >>32d5dc9520f0c6f60f691dd478741c774e292406 : USB: musb: pm: don't rely fully on clock support
> >>1e393c6eece048052d4131ec4dad3b98e35a98e2 : USB: musb: blackfin: pm: make it work
> >>
> >>Do you want me to rebase on top of -rc4 or is reverting those two enough
> >>for you ? As a sidenote, the series I sent you already fixes those two
> >>cases as we moved PM and clock handling entirely to glue layer, so those
> >>two cases are taken care of on the series, reverting those patches won't
> >>pose any regressions.
> >
> >So, I should do the following things:
> > take -rc6
> > revert the above commits
> > merge with usb-next
> > push out
> >
> >and all should be good, right? If so, that's fine with me, I'll do it
>
> Perfect, I just tried again just to be sure Merges cleanly:
>
> commit 6033eb6e16e602f97ac5b6424ef71c8e464ececc
> Merge: fa05820 0b83ae9
> Author: Felipe Balbi <balbi@ti.com>
> Date: Thu Dec 16 17:55:14 2010 +0200
>
> Merge remote-tracking branch 'greg/usb-next' into linus
Great, will go do this now...
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with Linus' tree
From: Felipe Balbi @ 2010-12-16 15:55 UTC (permalink / raw)
To: Greg KH
Cc: Felipe Balbi, Stephen Rothwell, linux-next, linux-kernel, Bob Liu,
Mike Frysinger
In-Reply-To: <20101216155225.GA31363@kroah.com>
Hi,
On Thu, Dec 16, 2010 at 07:52:25AM -0800, Greg KH wrote:
>On Thu, Dec 16, 2010 at 10:45:52AM +0200, Felipe Balbi wrote:
>> Hi,
>>
>> On Thu, Dec 16, 2010 at 10:05:27AM +0200, Felipe Balbi wrote:
>> >On Wed, Dec 15, 2010 at 07:08:57PM -0800, Greg KH wrote:
>> >>On Thu, Dec 16, 2010 at 02:01:22PM +1100, Stephen Rothwell wrote:
>> >>>Hi Greg,
>> >>>
>> >>>Today's linux-next merge of the usb tree got a conflict in
>> >>>drivers/usb/musb/blackfin.c drivers/usb/musb/musb_core.c
>> >>>drivers/usb/musb/musb_core.h between commit
>> >>>1e393c6eece048052d4131ec4dad3b98e35a98e2 ("USB: musb: blackfin: pm: make
>> >>>it work") from Linus' tree (v2.6.37-rc2) and various commits from the usb
>> >>>tree.
>> >>>
>> >>>It was not immediately obvious how to fix these up, so I just used the
>> >>>versions from the usb tree. This may not be correct and it would be good
>> >>>if this was fixed properly in the usb tree.
>> >>
>> >>Hm. Felipe, I'll merge in the -rc4 tree into usb-next if it makes sense
>> >>to do so now, can you send me the patch that ends up being the correct
>> >>merge?
>> >
>> >Sure, I'll check it now and send in a patch in a few minutes.
>>
>> There are two commits you didn't have in your usb-next branch which are
>> in mainline. Reverting them will make greg/usb-next apply cleanly on top
>> of v2.6.47-rc4. The commits are:
>>
>> 32d5dc9520f0c6f60f691dd478741c774e292406 : USB: musb: pm: don't rely fully on clock support
>> 1e393c6eece048052d4131ec4dad3b98e35a98e2 : USB: musb: blackfin: pm: make it work
>>
>> Do you want me to rebase on top of -rc4 or is reverting those two enough
>> for you ? As a sidenote, the series I sent you already fixes those two
>> cases as we moved PM and clock handling entirely to glue layer, so those
>> two cases are taken care of on the series, reverting those patches won't
>> pose any regressions.
>
>So, I should do the following things:
> take -rc6
> revert the above commits
> merge with usb-next
> push out
>
>and all should be good, right? If so, that's fine with me, I'll do it
Perfect, I just tried again just to be sure Merges cleanly:
commit 6033eb6e16e602f97ac5b6424ef71c8e464ececc
Merge: fa05820 0b83ae9
Author: Felipe Balbi <balbi@ti.com>
Date: Thu Dec 16 17:55:14 2010 +0200
Merge remote-tracking branch 'greg/usb-next' into linus
--
balbi
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with Linus' tree
From: Greg KH @ 2010-12-16 15:52 UTC (permalink / raw)
To: Felipe Balbi
Cc: Stephen Rothwell, linux-next, linux-kernel, Bob Liu,
Mike Frysinger
In-Reply-To: <20101216084552.GD2601@legolas.emea.dhcp.ti.com>
On Thu, Dec 16, 2010 at 10:45:52AM +0200, Felipe Balbi wrote:
> Hi,
>
> On Thu, Dec 16, 2010 at 10:05:27AM +0200, Felipe Balbi wrote:
> >On Wed, Dec 15, 2010 at 07:08:57PM -0800, Greg KH wrote:
> >>On Thu, Dec 16, 2010 at 02:01:22PM +1100, Stephen Rothwell wrote:
> >>>Hi Greg,
> >>>
> >>>Today's linux-next merge of the usb tree got a conflict in
> >>>drivers/usb/musb/blackfin.c drivers/usb/musb/musb_core.c
> >>>drivers/usb/musb/musb_core.h between commit
> >>>1e393c6eece048052d4131ec4dad3b98e35a98e2 ("USB: musb: blackfin: pm: make
> >>>it work") from Linus' tree (v2.6.37-rc2) and various commits from the usb
> >>>tree.
> >>>
> >>>It was not immediately obvious how to fix these up, so I just used the
> >>>versions from the usb tree. This may not be correct and it would be good
> >>>if this was fixed properly in the usb tree.
> >>
> >>Hm. Felipe, I'll merge in the -rc4 tree into usb-next if it makes sense
> >>to do so now, can you send me the patch that ends up being the correct
> >>merge?
> >
> >Sure, I'll check it now and send in a patch in a few minutes.
>
> There are two commits you didn't have in your usb-next branch which are
> in mainline. Reverting them will make greg/usb-next apply cleanly on top
> of v2.6.47-rc4. The commits are:
>
> 32d5dc9520f0c6f60f691dd478741c774e292406 : USB: musb: pm: don't rely fully on clock support
> 1e393c6eece048052d4131ec4dad3b98e35a98e2 : USB: musb: blackfin: pm: make it work
>
> Do you want me to rebase on top of -rc4 or is reverting those two enough
> for you ? As a sidenote, the series I sent you already fixes those two
> cases as we moved PM and clock handling entirely to glue layer, so those
> two cases are taken care of on the series, reverting those patches won't
> pose any regressions.
So, I should do the following things:
take -rc6
revert the above commits
merge with usb-next
push out
and all should be good, right? If so, that's fine with me, I'll do it
today. If not, please let me know.
thanks,
greg k-h
^ permalink raw reply
* Re: linux-next: Tree for November 22 (kvm)
From: Avi Kivity @ 2010-12-16 9:37 UTC (permalink / raw)
To: Zachary Amsden
Cc: Randy Dunlap, Glauber Costa, Stephen Rothwell, kvm, linux-next,
LKML
In-Reply-To: <4D049488.5020105@redhat.com>
On 12/12/2010 11:23 AM, Avi Kivity wrote:
> On 12/10/2010 07:18 PM, Randy Dunlap wrote:
>> > Looks like this is the appropriate fix:
>> >
>> > #ifdef CONFIG_SMP
>> > static void __init kvm_smp_prepare_boot_cpu(void)
>> > {
>> > #ifdef CONFIG_KVM_CLOCK
>> > WARN_ON(kvm_register_clock("primary cpu clock"));
>> > #endif
>> > kvm_guest_cpu_init();
>> > native_smp_prepare_boot_cpu();
>> > }
>>
>>
>> Can we get this fix merged, please?
>>
>> Build error is still happening in linux-next 20101210.
>>
>
> Zach, a proper patch please.
>
Should be fixed for the next spin.
--
error compiling committee.c: too many arguments to function
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with Linus' tree
From: Felipe Balbi @ 2010-12-16 8:45 UTC (permalink / raw)
To: Felipe Balbi
Cc: Greg KH, Stephen Rothwell, linux-next, linux-kernel, Bob Liu,
Mike Frysinger
In-Reply-To: <20101216080527.GA2601@legolas.emea.dhcp.ti.com>
Hi,
On Thu, Dec 16, 2010 at 10:05:27AM +0200, Felipe Balbi wrote:
>On Wed, Dec 15, 2010 at 07:08:57PM -0800, Greg KH wrote:
>>On Thu, Dec 16, 2010 at 02:01:22PM +1100, Stephen Rothwell wrote:
>>>Hi Greg,
>>>
>>>Today's linux-next merge of the usb tree got a conflict in
>>>drivers/usb/musb/blackfin.c drivers/usb/musb/musb_core.c
>>>drivers/usb/musb/musb_core.h between commit
>>>1e393c6eece048052d4131ec4dad3b98e35a98e2 ("USB: musb: blackfin: pm: make
>>>it work") from Linus' tree (v2.6.37-rc2) and various commits from the usb
>>>tree.
>>>
>>>It was not immediately obvious how to fix these up, so I just used the
>>>versions from the usb tree. This may not be correct and it would be good
>>>if this was fixed properly in the usb tree.
>>
>>Hm. Felipe, I'll merge in the -rc4 tree into usb-next if it makes sense
>>to do so now, can you send me the patch that ends up being the correct
>>merge?
>
>Sure, I'll check it now and send in a patch in a few minutes.
There are two commits you didn't have in your usb-next branch which are
in mainline. Reverting them will make greg/usb-next apply cleanly on top
of v2.6.47-rc4. The commits are:
32d5dc9520f0c6f60f691dd478741c774e292406 : USB: musb: pm: don't rely fully on clock support
1e393c6eece048052d4131ec4dad3b98e35a98e2 : USB: musb: blackfin: pm: make it work
Do you want me to rebase on top of -rc4 or is reverting those two enough
for you ? As a sidenote, the series I sent you already fixes those two
cases as we moved PM and clock handling entirely to glue layer, so those
two cases are taken care of on the series, reverting those patches won't
pose any regressions.
--
balbi
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with Linus' tree
From: Felipe Balbi @ 2010-12-16 8:05 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, linux-next, linux-kernel, Bob Liu,
Mike Frysinger, Felipe Balbi
In-Reply-To: <20101216030857.GA12785@kroah.com>
On Wed, Dec 15, 2010 at 07:08:57PM -0800, Greg KH wrote:
>On Thu, Dec 16, 2010 at 02:01:22PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the usb tree got a conflict in
>> drivers/usb/musb/blackfin.c drivers/usb/musb/musb_core.c
>> drivers/usb/musb/musb_core.h between commit
>> 1e393c6eece048052d4131ec4dad3b98e35a98e2 ("USB: musb: blackfin: pm: make
>> it work") from Linus' tree (v2.6.37-rc2) and various commits from the usb
>> tree.
>>
>> It was not immediately obvious how to fix these up, so I just used the
>> versions from the usb tree. This may not be correct and it would be good
>> if this was fixed properly in the usb tree.
>
>Hm. Felipe, I'll merge in the -rc4 tree into usb-next if it makes sense
>to do so now, can you send me the patch that ends up being the correct
>merge?
Sure, I'll check it now and send in a patch in a few minutes.
--
balbi
^ permalink raw reply
* linux-next: Tree for December 16
From: Stephen Rothwell @ 2010-12-16 6:37 UTC (permalink / raw)
To: linux-next; +Cc: LKML
[-- Attachment #1: Type: text/plain, Size: 10218 bytes --]
Hi all,
Changes since 20101215:
The ceph tree lost its conflict.
The wireless tree gained a build failure for which I reverted a commit.
The voltage tree lost its build failure.
Commit(s) added to the rcu tree yesterday seem to have caused boot
failures, so I have reverted those commits for today.
The usb tree gained a conflict against Linus' tree.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 183 trees (counting Linus' and 26 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Randy Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/rc-fixes
Merging driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging gcl-current/merge
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/Kconfig
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig
Applying: rmobile: merge fixup for clkdev changes
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
Merging jfs/next
Merging logfs/master
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging vfs-scale/vfs-scale-working
CONFLICT (content): Merge conflict in fs/fuse/inode.c
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/bnx2x/bnx2x.h
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-1000.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-6000.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h
CONFLICT (content): Merge conflict in drivers/vhost/vhost.c
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-1000.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-6000.c
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h
Merging bluetooth/master
CONFLICT (content): Merge conflict in net/bluetooth/Makefile
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
CONFLICT (content): Merge conflict in include/linux/input.h
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
Merging voltage/for-next
CONFLICT (content): Merge conflict in drivers/regulator/core.c
CONFLICT (content): Merge conflict in drivers/regulator/mc13783-regulator.c
Merging security-testing/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/pm24xx.c
CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen/upstream/xen
Merging swiotlb-xen/master
CONFLICT (content): Merge conflict in drivers/xen/Kconfig
CONFLICT (content): Merge conflict in drivers/xen/Makefile
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
Merging percpu/for-next
CONFLICT (delete/modify): arch/x86/kernel/apic/nmi.c deleted in HEAD and modified in percpu/for-next. Version percpu/for-next of arch/x86/kernel/apic/nmi.c left in tree.
$ git rm -f arch/x86/kernel/apic/nmi.c
Merging workqueues/for-next
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
CONFLICT (content): Merge conflict in arch/sh/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/musb/blackfin.c
CONFLICT (content): Merge conflict in drivers/usb/musb/musb_core.c
CONFLICT (content): Merge conflict in drivers/usb/musb/musb_core.h
Merging staging/staging-next
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c
CONFLICT (content): Merge conflict in include/linux/hardirq.h
CONFLICT (content): Merge conflict in include/linux/smp_lock.h
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in fs/ocfs2/super.c
CONFLICT (content): Merge conflict in fs/super.c
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
$ git rm -f drivers/net/wireless/rtlwifi/rc.c
[master 89789e0] Revert "rtl8192ce: Add new driver"
[master 7323aa5] Revert "rcu: fine-tune grace-period begin/end checks"
[master 76063c1] Revert "rcu: Keep gpnum and completed fields synchronized"
[master 4498a68] Revert "rcu: Stop chasing QS if another CPU did it for us"
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: build failure after merge of the final tree (wireless tree related)
From: Larry Finger @ 2010-12-16 4:49 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: John W. Linville, linux-next, linux-kernel
In-Reply-To: <20101216142958.e4f463ee.sfr@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1568 bytes --]
On 12/15/2010 09:29 PM, Stephen Rothwell wrote:
> Hi John,
>
> After merging the final tree, today's linux-next build (powerpc allyesconfig)
> failed like this:
>
> drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c: In function 'rtl92c_init_sw_vars':
> drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:76: error: implicit declaration of function 'vmalloc'
> drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:76: warning: cast to pointer from integer of different size
> drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c: In function 'rtl92c_deinit_sw_vars':
> drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:91: error: implicit declaration of function 'vfree'
>
> Caused by commit 0c8173385e549f95cd80c3fff5aab87b4f881d8d ("rtl8192ce:
> Add new driver"). Rule 1 from Documentation/SubmitChecklist.
>
> I have reverted that commit for today.
Sorry for the omission. This error arises because my only platforms get the
header included implicitly.
This patch will fix the problem - I will formally submit it through John Linville.
Larry
---
Index: wireless-testing/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c
+++ wireless-testing/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c
@@ -27,6 +27,8 @@
*
*****************************************************************************/
+#include <linux/vmalloc.h>
+
#include "../wifi.h"
#include "../core.h"
#include "../pci.h"
[-- Attachment #2: rtl8192ce_fix_powerpc_build --]
[-- Type: text/plain, Size: 500 bytes --]
Index: wireless-testing/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c
===================================================================
--- wireless-testing.orig/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c
+++ wireless-testing/drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c
@@ -27,6 +27,8 @@
*
*****************************************************************************/
+#include <linux/vmalloc.h>
+
#include "../wifi.h"
#include "../core.h"
#include "../pci.h"
^ permalink raw reply
* linux-next: build failure after merge of the final tree (wireless tree related)
From: Stephen Rothwell @ 2010-12-16 3:29 UTC (permalink / raw)
To: John W. Linville; +Cc: linux-next, linux-kernel, Larry Finger
[-- Attachment #1: Type: text/plain, Size: 908 bytes --]
Hi John,
After merging the final tree, today's linux-next build (powerpc allyesconfig)
failed like this:
drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c: In function 'rtl92c_init_sw_vars':
drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:76: error: implicit declaration of function 'vmalloc'
drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:76: warning: cast to pointer from integer of different size
drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c: In function 'rtl92c_deinit_sw_vars':
drivers/net/wireless/rtlwifi/rtl8192ce/rtl8192c-sw.c:91: error: implicit declaration of function 'vfree'
Caused by commit 0c8173385e549f95cd80c3fff5aab87b4f881d8d ("rtl8192ce:
Add new driver"). Rule 1 from Documentation/SubmitChecklist.
I have reverted that commit for today.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: linux-next: manual merge of the usb tree with Linus' tree
From: Greg KH @ 2010-12-16 3:08 UTC (permalink / raw)
To: Stephen Rothwell
Cc: linux-next, linux-kernel, Bob Liu, Mike Frysinger, Felipe Balbi
In-Reply-To: <20101216140122.ca745f1f.sfr@canb.auug.org.au>
On Thu, Dec 16, 2010 at 02:01:22PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the usb tree got a conflict in
> drivers/usb/musb/blackfin.c drivers/usb/musb/musb_core.c
> drivers/usb/musb/musb_core.h between commit
> 1e393c6eece048052d4131ec4dad3b98e35a98e2 ("USB: musb: blackfin: pm: make
> it work") from Linus' tree (v2.6.37-rc2) and various commits from the usb
> tree.
>
> It was not immediately obvious how to fix these up, so I just used the
> versions from the usb tree. This may not be correct and it would be good
> if this was fixed properly in the usb tree.
Hm. Felipe, I'll merge in the -rc4 tree into usb-next if it makes sense
to do so now, can you send me the patch that ends up being the correct
merge?
thanks,
greg k-h
^ permalink raw reply
* linux-next: manual merge of the usb tree with Linus' tree
From: Stephen Rothwell @ 2010-12-16 3:01 UTC (permalink / raw)
To: Greg KH; +Cc: linux-next, linux-kernel, Bob Liu, Mike Frysinger, Felipe Balbi
[-- Attachment #1: Type: text/plain, Size: 632 bytes --]
Hi Greg,
Today's linux-next merge of the usb tree got a conflict in
drivers/usb/musb/blackfin.c drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_core.h between commit
1e393c6eece048052d4131ec4dad3b98e35a98e2 ("USB: musb: blackfin: pm: make
it work") from Linus' tree (v2.6.37-rc2) and various commits from the usb
tree.
It was not immediately obvious how to fix these up, so I just used the
versions from the usb tree. This may not be correct and it would be good
if this was fixed properly in the usb tree.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply
* Re: [PATCH] regulator: Allow modular build of mc13xxx-core
From: Yong Shen @ 2010-12-16 1:52 UTC (permalink / raw)
To: Liam Girdwood
Cc: Mark Brown, linux-next, linux-kernel, Stephen Rothwell, patches
In-Reply-To: <1292448616.3348.33.camel@odin>
Hi there,
My bad. My test did not cover module-build case.
Thanks for fixing this.
Yong
On Thu, Dec 16, 2010 at 5:30 AM, Liam Girdwood <lrg@slimlogic.co.uk> wrote:
> On Wed, 2010-12-15 at 14:10 +0000, Mark Brown wrote:
>> Since the MFD core for this device and the regulator drivers for these
>> devices can be built modular we should also support modular build of
>> the shared code for the regulator drivers, otherwise we try to link
>> built in code against modular code with unfortunate results.
>>
>> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
>
> Thanks Mark !
>
> It looks like you sent the wrong patch as I had to also add :-
>
> diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c
> index da46b3c..f53d31b 100644
> --- a/drivers/regulator/mc13xxx-regulator-core.c
> +++ b/drivers/regulator/mc13xxx-regulator-core.c
> @@ -89,6 +89,7 @@ int mc13xxx_regulator_list_voltage(struct regulator_dev *rdev,
>
> return mc13xxx_regulators[id].voltages[selector];
> }
> +EXPORT_SYMBOL_GPL(mc13xxx_regulator_list_voltage);
>
> int mc13xxx_get_best_voltage_index(struct regulator_dev *rdev,
> int min_uV, int max_uV)
> @@ -232,6 +233,7 @@ int mc13xxx_sw_regulator_is_enabled(struct regulator_dev *rdev)
> {
> return 1;
> }
> +EXPORT_SYMBOL_GPL(mc13xxx_sw_regulator_is_enabled);
>
> MODULE_LICENSE("GPL v2");
> MODULE_AUTHOR("Yong Shen <yong.shen@linaro.org>");
>
> To get it all building.
>
> Now applied and squashed with above.
>
> Liam
> --
> Freelance Developer, SlimLogic Ltd
> ASoC and Voltage Regulator Maintainer.
> http://www.slimlogic.co.uk
>
>
^ permalink raw reply
* Re: linux-next: Tree for November 18 (netfilter)
From: Patrick McHardy @ 2010-12-15 22:55 UTC (permalink / raw)
To: Randy Dunlap
Cc: KOVACS Krisztian, Stephen Rothwell, netfilter-devel, linux-next,
LKML, netdev, Balazs Scheidler
In-Reply-To: <4CEA97FE.4080006@oracle.com>
Am 22.11.2010 17:19, schrieb Randy Dunlap:
> On 11/22/10 04:28, KOVACS Krisztian wrote:
>> commit ec0ac6f3e7749e25f481c1e0f75766974820fe84
>> Author: KOVACS Krisztian <hidden@balabit.hu>
>> Date: Mon Nov 22 13:07:15 2010 +0100
>>
>> netfilter: fix compilation when conntrack is disabled but tproxy is enabled
>>
>> The IPv6 tproxy patches split IPv6 defragmentation off of conntrack, but
>> failed to update the #ifdef stanzas guarding the defragmentation related
>> fields and code in skbuff and conntrack related code in nf_defrag_ipv6.c.
>>
>> This patch adds the required #ifdefs so that IPv6 tproxy can truly be used
>> without connection tracking.
>>
>> Original report:
>> http://marc.info/?l=linux-netdev&m=129010118516341&w=2
>>
>> Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
>> Signed-off-by: KOVACS Krisztian <hidden@balabit.hu>
>
> That builds. Thanks.
>
> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Applied, thanks everyone.
^ permalink raw reply
* Re: [PATCH] regulator: Allow modular build of mc13xxx-core
From: Liam Girdwood @ 2010-12-15 21:30 UTC (permalink / raw)
To: Mark Brown; +Cc: Yong Shen, linux-next, linux-kernel, Stephen Rothwell, patches
In-Reply-To: <1292422225-27530-1-git-send-email-broonie@opensource.wolfsonmicro.com>
On Wed, 2010-12-15 at 14:10 +0000, Mark Brown wrote:
> Since the MFD core for this device and the regulator drivers for these
> devices can be built modular we should also support modular build of
> the shared code for the regulator drivers, otherwise we try to link
> built in code against modular code with unfortunate results.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Thanks Mark !
It looks like you sent the wrong patch as I had to also add :-
diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c
index da46b3c..f53d31b 100644
--- a/drivers/regulator/mc13xxx-regulator-core.c
+++ b/drivers/regulator/mc13xxx-regulator-core.c
@@ -89,6 +89,7 @@ int mc13xxx_regulator_list_voltage(struct regulator_dev *rdev,
return mc13xxx_regulators[id].voltages[selector];
}
+EXPORT_SYMBOL_GPL(mc13xxx_regulator_list_voltage);
int mc13xxx_get_best_voltage_index(struct regulator_dev *rdev,
int min_uV, int max_uV)
@@ -232,6 +233,7 @@ int mc13xxx_sw_regulator_is_enabled(struct regulator_dev *rdev)
{
return 1;
}
+EXPORT_SYMBOL_GPL(mc13xxx_sw_regulator_is_enabled);
MODULE_LICENSE("GPL v2");
MODULE_AUTHOR("Yong Shen <yong.shen@linaro.org>");
To get it all building.
Now applied and squashed with above.
Liam
--
Freelance Developer, SlimLogic Ltd
ASoC and Voltage Regulator Maintainer.
http://www.slimlogic.co.uk
^ permalink raw reply related
* Re: linux-next: manual merge of the arm tree with the arm-current tree
From: Russell King @ 2010-12-15 16:43 UTC (permalink / raw)
To: Dave Martin; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <AANLkTimdZ3FRs82RzSZR19gDJbkNe2UfEY-kLQOwvd_Q@mail.gmail.com>
On Wed, Dec 15, 2010 at 12:28:39PM +0000, Dave Martin wrote:
> Hi,
>
> On Tue, Dec 14, 2010 at 11:57 PM, Russell King <rmk@arm.linux.org.uk> wrote:
> > On Wed, Dec 15, 2010 at 10:54:35AM +1100, Stephen Rothwell wrote:
> >> Hi Russell,
> >>
> >> Today's linux-next merge of the arm tree got a conflict in
> >> arch/arm/Kconfig between commit 6e6fc998b8c127fe06b9350a1f16e41bfe4f109d
> >> ("ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6")
> >> from the arm-current tree and commit
> >> 4a50bfe365a977f634311504484342fbfffe855c ("ARM: Ensure experimental
> >> options are so marked") from the arm tree.
> >>
> >> Just context changes. I fixed it up (see below) and can carry the fix as
> >> necessary.
> >
> > Yea, rather unfortunate. I'll fix it up locally once arm-current is
> > merged into mainline.
>
> Looks like this was a case of two simple changes on neighbouring lines
> -- I'll try to avoid such conflicts for the future.
It's not a problem.
--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:
^ permalink raw reply
* [PATCH] regulator: Allow modular build of mc13xxx-core
From: Mark Brown @ 2010-12-15 14:10 UTC (permalink / raw)
To: Liam Girdwood, Yong Shen
Cc: linux-next, linux-kernel, Stephen Rothwell, patches, Mark Brown
In-Reply-To: <20101215140344.GF5723@sirena.org.uk>
Since the MFD core for this device and the regulator drivers for these
devices can be built modular we should also support modular build of
the shared code for the regulator drivers, otherwise we try to link
built in code against modular code with unfortunate results.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
drivers/regulator/Kconfig | 2 +-
drivers/regulator/mc13xxx-regulator-core.c | 5 +++++
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 485a9bc..e1d9436 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -187,7 +187,7 @@ config REGULATOR_PCAP
PCAP2 PMIC.
config REGULATOR_MC13XXX_CORE
- bool
+ tristate
config REGULATOR_MC13783
tristate "Support regulators on Freescale MC13783 PMIC"
diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c
index 448e8f4..da46b3c 100644
--- a/drivers/regulator/mc13xxx-regulator-core.c
+++ b/drivers/regulator/mc13xxx-regulator-core.c
@@ -123,6 +123,7 @@ int mc13xxx_get_best_voltage_index(struct regulator_dev *rdev,
}
return bestindex;
}
+EXPORT_SYMBOL_GPL(mc13xxx_get_best_voltage_index);
static int mc13xxx_regulator_set_voltage(struct regulator_dev *rdev, int min_uV,
int max_uV, unsigned *selector)
@@ -185,6 +186,7 @@ struct regulator_ops mc13xxx_regulator_ops = {
.set_voltage = mc13xxx_regulator_set_voltage,
.get_voltage = mc13xxx_regulator_get_voltage,
};
+EXPORT_SYMBOL_GPL(mc13xxx_regulator_ops);
int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev, int min_uV,
int max_uV, unsigned *selector)
@@ -202,6 +204,7 @@ int mc13xxx_fixed_regulator_set_voltage(struct regulator_dev *rdev, int min_uV,
else
return -EINVAL;
}
+EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_set_voltage);
int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev)
{
@@ -213,6 +216,7 @@ int mc13xxx_fixed_regulator_get_voltage(struct regulator_dev *rdev)
return mc13xxx_regulators[id].voltages[0];
}
+EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_get_voltage);
struct regulator_ops mc13xxx_fixed_regulator_ops = {
.enable = mc13xxx_regulator_enable,
@@ -222,6 +226,7 @@ struct regulator_ops mc13xxx_fixed_regulator_ops = {
.set_voltage = mc13xxx_fixed_regulator_set_voltage,
.get_voltage = mc13xxx_fixed_regulator_get_voltage,
};
+EXPORT_SYMBOL_GPL(mc13xxx_fixed_regulator_ops);
int mc13xxx_sw_regulator_is_enabled(struct regulator_dev *rdev)
{
--
1.7.1
^ permalink raw reply related
* Re: linux-next: build failure after merge of the voltage tree
From: Mark Brown @ 2010-12-15 14:03 UTC (permalink / raw)
To: Liam Girdwood; +Cc: Stephen Rothwell, linux-next, linux-kernel, Yong Shen
In-Reply-To: <1292403884.3348.6.camel@odin>
On Wed, Dec 15, 2010 at 09:04:44AM +0000, Liam Girdwood wrote:
> Yong, can you send a patch *today* that fixes the modular build for
> this.
Looks like he's not going to get a chance to do that, I'm cooking up
some patches just now which should deal with the issue.
^ permalink raw reply
* Re: linux-next: Tree for November 18
From: Boaz Harrosh @ 2010-12-15 12:47 UTC (permalink / raw)
To: Randy Dunlap; +Cc: Stephen Rothwell, linux-next, LKML, uml-devel
In-Reply-To: <20101214135917.5b5a73e5.randy.dunlap@oracle.com>
On 12/14/2010 11:59 PM, Randy Dunlap wrote:
> On Sun, 21 Nov 2010 16:41:26 +0200 Boaz Harrosh wrote:
>
>>
>> Meanwhile I have setup a cron job for every-night to checkout linux-next
>> and "make". As a backup for above, until it is fixed.
>>
>> Anything else I can contribute to this cause?
>
>
> From my small testing, it looks like ARCH=um "defconfig" is about the only
> config that comes close to building reliably. allmodconfig/allyesconfig and
> several randconfig attempts all failed with many horrible errors.
>
> Is that about right?
>
> ---
> ~Randy
Hi Randy
Yes you are basically right. One must start with defconfig and add anything
he needs. UM has neglected to play it nice with Kernel, missing some basic
implementations of simple things, just for example ndelay. So some code that
should theoretically work, fails to compile.
I have around an allmodconfig with the minimum of configs turned off, so
to compile a maximum possible coverage. I have this pet project of half
Kconfig "depends on !UM" and half "implement some missing parts". But I
never have time to actually clean it up, patch it and send it upstream.
Thanks
Boaz
^ permalink raw reply
* Re: linux-next: manual merge of the arm tree with the arm-current tree
From: Dave Martin @ 2010-12-15 12:28 UTC (permalink / raw)
To: Russell King; +Cc: Stephen Rothwell, linux-next, linux-kernel
In-Reply-To: <20101214235746.GB21913@flint.arm.linux.org.uk>
Hi,
On Tue, Dec 14, 2010 at 11:57 PM, Russell King <rmk@arm.linux.org.uk> wrote:
> On Wed, Dec 15, 2010 at 10:54:35AM +1100, Stephen Rothwell wrote:
>> Hi Russell,
>>
>> Today's linux-next merge of the arm tree got a conflict in
>> arch/arm/Kconfig between commit 6e6fc998b8c127fe06b9350a1f16e41bfe4f109d
>> ("ARM: 6533/1: Thumb-2: Make CONFIG_THUMB2_KERNEL depend on !CPU_V6")
>> from the arm-current tree and commit
>> 4a50bfe365a977f634311504484342fbfffe855c ("ARM: Ensure experimental
>> options are so marked") from the arm tree.
>>
>> Just context changes. I fixed it up (see below) and can carry the fix as
>> necessary.
>
> Yea, rather unfortunate. I'll fix it up locally once arm-current is
> merged into mainline.
Looks like this was a case of two simple changes on neighbouring lines
-- I'll try to avoid such conflicts for the future.
Cheers
---Dave
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox