From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261962AbVASXFh (ORCPT ); Wed, 19 Jan 2005 18:05:37 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261965AbVASXFh (ORCPT ); Wed, 19 Jan 2005 18:05:37 -0500 Received: from e34.co.us.ibm.com ([32.97.110.132]:28611 "EHLO e34.co.us.ibm.com") by vger.kernel.org with ESMTP id S261962AbVASXFa (ORCPT ); Wed, 19 Jan 2005 18:05:30 -0500 Date: Wed, 19 Jan 2005 15:05:18 -0800 From: Greg KH To: Evgeniy Polyakov Cc: linux-hotplug-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: Re: kobject_uevent.c moved to kernel connector. Message-ID: <20050119230518.GA5569@kroah.com> References: <1101286481.18807.66.camel@uganda> <1101287606.18807.75.camel@uganda> <20041124222857.GG3584@kroah.com> <1102504677.3363.55.camel@uganda> <20041221204101.GA9831@kroah.com> <1103707272.3432.6.camel@uganda> <20041225180241.38ffb9d8@zanzibar.2ka.mipt.ru> <20050104060211.50c2bf47@zanzibar.2ka.mipt.ru> <20050112190615.GC10885@kroah.com> <20050113011519.6e087fb4@zanzibar.2ka.mipt.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20050113011519.6e087fb4@zanzibar.2ka.mipt.ru> User-Agent: Mutt/1.5.6i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jan 13, 2005 at 01:15:19AM +0300, Evgeniy Polyakov wrote: > --- include/linux/connector.h~ 2005-01-13 00:21:55.000000000 +0300 > +++ include/linux/connector.h 2005-01-13 00:53:21.000000000 +0300 > @@ -24,6 +24,9 @@ > > #include > > +#define CONN_IDX_KOBJECT_UEVENT 0xabcd > +#define CONN_VAL_KOBJECT_UEVENT 0x0000 > + > #define CONNECTOR_MAX_MSG_SIZE 1024 > > struct cb_id > --- linux-2.6/drivers/connector/connector.c.orig 2005-01-13 00:21:23.000000000 +0300 > +++ linux-2.6/drivers/connector/connector.c 2005-01-13 00:32:48.000000000 +0300 > @@ -46,6 +46,8 @@ > > static struct cn_dev cdev; > > +int cn_already_initialized = 0; Hm, this patch needs to be rediffed, now that I've accepted the connector code, right? The connector.c change seems to already be in your last connector patch, and the .h change is there with a different #define spelling, causing the uevent code to need to be changed. Care to redo it? thanks, greg k-h