From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: <4CA99E42.3030802@domain.hid> Date: Mon, 04 Oct 2010 11:28:34 +0200 From: Jan Kiszka MIME-Version: 1.0 References: <4CA6D3C0.4010900@domain.hid> <4CA6F124.3090006@domain.hid> <4CA6F849.3060301@domain.hid> <4CA7C1AE.1080900@domain.hid> In-Reply-To: <4CA7C1AE.1080900@domain.hid> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Subject: Re: [Xenomai-core] [git pull] Patch queue for 2.5.x List-Id: Xenomai life and development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Gilles Chanteperdrix Cc: Wolfgang Mauerer , xenomai@xenomai.org Am 03.10.2010 01:35, Gilles Chanteperdrix wrote: > Jan Kiszka wrote: >> Am 02.10.2010 10:45, Daniele Nicolodi wrote: >>> On 02/10/10 08:40, Jan Kiszka wrote: >>>> The following changes since commit 5e7cfa5c25672e4478a721eadbd6f6c5b4f88a2f: >>>> >>>> nucleus/sched: fix rescheduling bit test macros (2010-09-30 02:34:27 +0200) >>>> >>>> are available in the git repository at: >>>> git://git.xenomai.org/xenomai-jki.git for-2.5.x >>>> >>>> Jan Kiszka (8): >>>> RTDM: Protect xnshadow_ppd_get via nklock >>>> Fix symbolic status ouput of root threads >>>> Create watchdog as non-blockable timer >>>> native: Improve documentation of rt_task_join and rt_task_delete >>>> x86: Add PCI ID of Series 5/3400 Intel chipset to SMI workaround >>>> x86: Add PCI ID of 631xESB/632xESB/3100 Intel chipset to SMI workaround >>>> x86: Add PCI ID of Intel ICH9M-E chipset to SMI workaround >>> This patch reads: >>> >>> +#ifdef PCI_DEVICE_ID_INTEL_ICH9_1 >>> +#define PCI_DEVICE_ID_INTEL_ICH9_1 0x2917 >>> +#endif >>> >>> shouldn't it be #ifndef ... #define ... #endif instead? >>> >>>> x86: Add PCI ID of Intel ICH9M chipset to SMI workaround >>> Same for this one. >> >> Indeed. Fixed in both branches, and I also cleaned up a typo in some >> patch description. Updates pushed. > > Pulled thanks. So, if I understand correctly, we keep Wolfgang's work on > clocks for 2.6? > Besides the fact that you were originally skeptical to merge this in stable, we have no urgent need (we will require 2.6 for our next update anyway - SCHED_OTHER fix...). I will pull Wolfgang's Xenomai bits [1] into my for-upstream branch now and send out a refreshed pull request. If you would like to see them in 2.5 as well, I could provide them for that tree too, of course. Jan [1] http://thread.gmane.org/gmane.linux.real-time.xenomai.devel/7734 -- Siemens AG, Corporate Technology, CT T DE IT 1 Corporate Competence Center Embedded Linux