From: Jan Kiszka <jan.kiszka@domain.hid>
To: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
Cc: Wolfgang Mauerer <wolfgang.mauerer@domain.hid>, xenomai@xenomai.org
Subject: Re: [Xenomai-core] [git pull] Patch queue for 2.5.x
Date: Mon, 04 Oct 2010 11:28:34 +0200 [thread overview]
Message-ID: <4CA99E42.3030802@domain.hid> (raw)
In-Reply-To: <4CA7C1AE.1080900@domain.hid>
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
prev parent reply other threads:[~2010-10-04 9:28 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-02 6:40 [Xenomai-core] [git pull] Patch queue for 2.5.x Jan Kiszka
2010-10-02 8:45 ` Daniele Nicolodi
2010-10-02 9:15 ` Jan Kiszka
2010-10-02 23:35 ` Gilles Chanteperdrix
2010-10-04 9:28 ` Jan Kiszka [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4CA99E42.3030802@domain.hid \
--to=jan.kiszka@domain.hid \
--cc=gilles.chanteperdrix@xenomai.org \
--cc=wolfgang.mauerer@domain.hid \
--cc=xenomai@xenomai.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.