On Fri, Oct 31, 2008 at 06:57:52PM +0100, Kay Sievers wrote:
quoted text
> On Fri, Oct 31, 2008 at 18:02, Greg KH <greg@kroah.com> wrote:
> > On Thu, Oct 30, 2008 at 01:36:48AM +0100, Kay Sievers wrote: index 5437ac0..c9c214d 100644
> >> --- a/include/linux/kobject.h
> >> +++ b/include/linux/kobject.h
> >> @@ -72,6 +72,8 @@ struct kobject {
> >>
> >>  extern int kobject_set_name(struct kobject *kobj, const char *name, ...)
> >>                           __attribute__((format(printf, 2, 3)));
> >> +extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
> >> +                               va_list vargs);
> >>
> >>  static inline const char *kobject_name(const struct kobject *kobj)
> >>  {
> >> diff --git a/lib/kobject.c b/lib/kobject.c
> >> index 0487d1f..a6dec32 100644
> >> --- a/lib/kobject.c
> >> +++ b/lib/kobject.c
> >> @@ -212,7 +212,7 @@ static int kobject_add_internal(struct kobject *kobj)
> >>   * @fmt: format string used to build the name
> >>   * @vargs: vargs to format the string.
> >>   */
> >> -static int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
> >> +int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
> >>                                 va_list vargs)
> >>  {
> >>       const char *old_name = kobj->name;
> >>
> >
> > I cut this part out of this patch, as it's not needed here, and applied
> > the rest.
> 
> Ah, yeah, this hunk belongs to "driver core: get rid of bus_id" which
> I sent you, and which should be locally in your tree to catch new
> instances of bus_id in staging. We will push to -next when we got most
> of it converted and want to fix the remaining pieces.

Ok, that makes more sense.

Care to respin that patch with these chunks added to it so that it will
work properly?

thanks,

greg k-h
--
unsubscribe notice
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/