From: Philippe Gerum <rpm@xenomai.org>
To: Jan Kiszka <jan.kiszka@siemens.com>
Cc: John Morris <john@zultron.com>, Xenomai <xenomai@xenomai.org>
Subject: Re: [Xenomai] 3.5.7 "I-pipe: could not find timer" (Was: Re: Kernel OOPS during regression tests)
Date: Tue, 15 Jan 2013 14:58:12 +0100 [thread overview]
Message-ID: <50F56074.50203@xenomai.org> (raw)
In-Reply-To: <50F55E22.9030308@siemens.com>
On 01/15/2013 02:48 PM, Jan Kiszka wrote:
> On 2013-01-15 14:44, Philippe Gerum wrote:
>> On 01/15/2013 01:21 PM, Jan Kiszka wrote:
>>> On 2013-01-15 13:09, Philippe Gerum wrote:
>>>> On 01/15/2013 01:06 PM, Gilles Chanteperdrix wrote:
>>>>> On 01/15/2013 12:35 PM, Jan Kiszka wrote:
>>>>>
>>>>>> On 2013-01-14 21:39, Gilles Chanteperdrix wrote:
>>>>>>> Done, also note that my current work is the for-core-3.5.7 branch, not
>>>>>>> the for-core-3.5 branch.
>>>>>>
>>>>>> Both branches point to the same commit ATM. I suppose you didn't push
>>>>>> the new for-core-3.5.7 version yet. Once done, I'll rebase my stuff on top.
>>>>>
>>>>>
>>>>> Sorry, pushed.
>>>>>
>>>>
>>>> Please everybody, make sure to eventually resync with my tree, this is
>>>> becoming a mess when merging your stuff here. TIA,
>>>
>>> I'm fetching from you regularly, but your public tree contains no
>>> changes for 3.5, sorry.
>>>
>>
>> You must mean no change for 3.5.3 since the last stable pipeline release
>> I pushed out. I'm seeing several breakages when merging the very latest
>> work, I'm solving this with Gilles.
>
> I mean that I have no clue what I should resolve. My branch was based on
> your core-3.5 branch, the latest publicly available version. I've just
> rebased it on top of Gilles' 3.5.7 queue - without any conflicts. So
> what are you talking about?
>
I'm talking about conflicts in pgtable.h, apic.c with the atomic counter
braindamage and stuff like this. I'm not asking you to fix anything in
your tree, I'm pulling from Gilles' trees almost exclusively, and had
issues with those. I raised an alert about painful merges happening
lately, and a recommendation to avoid these. Gilles fixed the issue on
his end, and the merge now resolves as a fast forward, as expected.
Issue closed.
--
Philippe.
next prev parent reply other threads:[~2013-01-15 13:58 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-12 17:26 [Xenomai] Kernel OOPS during regression tests John Morris
2013-01-12 17:31 ` Gilles Chanteperdrix
2013-01-13 4:36 ` John Morris
2013-01-13 12:16 ` Gilles Chanteperdrix
2013-01-13 19:14 ` [Xenomai] 3.5.7 "I-pipe: could not find timer" (Was: Re: Kernel OOPS during regression tests) John Morris
2013-01-13 19:41 ` Gilles Chanteperdrix
2013-01-14 4:47 ` [Xenomai] 3.5.7 posix/mprotect failure; "I-pipe: could not find timer" fixed! John Morris
2013-01-14 11:57 ` Gilles Chanteperdrix
2013-01-14 12:00 ` Jan Kiszka
2013-01-14 13:36 ` Jan Kiszka
2013-01-14 20:52 ` John Morris
2013-01-14 22:54 ` Gilles Chanteperdrix
2013-01-15 7:16 ` [Xenomai] 3.5.7 posix/mprotect fixed; (Was: posix/mprotect failure) John Morris
2013-01-15 7:31 ` Gilles Chanteperdrix
2013-01-18 3:56 ` John Morris
2013-01-18 4:31 ` Gilles Chanteperdrix
2013-01-14 19:50 ` [Xenomai] 3.5.7 posix/mprotect failure; "I-pipe: could not find timer" fixed! Gilles Chanteperdrix
2013-01-14 20:56 ` John Morris
2013-01-14 22:57 ` Gilles Chanteperdrix
2013-01-14 12:00 ` [Xenomai] 3.5.7 "I-pipe: could not find timer" (Was: Re: Kernel OOPS during regression tests) Jan Kiszka
2013-01-14 18:50 ` Gilles Chanteperdrix
2013-01-14 19:13 ` Jan Kiszka
2013-01-14 19:15 ` Gilles Chanteperdrix
2013-01-14 19:37 ` Jan Kiszka
2013-01-14 20:39 ` Gilles Chanteperdrix
2013-01-15 11:35 ` Jan Kiszka
2013-01-15 12:06 ` Gilles Chanteperdrix
2013-01-15 12:09 ` Philippe Gerum
2013-01-15 12:21 ` Jan Kiszka
2013-01-15 13:44 ` Philippe Gerum
2013-01-15 13:48 ` Jan Kiszka
2013-01-15 13:58 ` Philippe Gerum [this message]
2013-01-15 14:10 ` Jan Kiszka
2013-01-15 19:39 ` Gilles Chanteperdrix
2013-01-16 8:02 ` Jan Kiszka
2013-01-16 8:44 ` Jan Kiszka
2013-01-16 9:41 ` Philippe Gerum
2013-01-16 9:48 ` Jan Kiszka
2013-01-16 10:37 ` Philippe Gerum
2013-01-16 12:03 ` Gilles Chanteperdrix
2013-01-16 12:18 ` Jan Kiszka
2013-01-15 13:59 ` Jan Kiszka
2013-01-12 19:02 ` [Xenomai] Kernel OOPS during regression tests Gilles Chanteperdrix
2013-01-13 6:50 ` John Morris
2013-01-13 11:23 ` Jan Kiszka
2013-01-13 12:18 ` Gilles Chanteperdrix
2013-01-13 19:34 ` [Xenomai] 3.5.3 posix/mprotect fail "sigdebug_handler triggered" (Was: Re: Kernel OOPS during regression tests) John Morris
2013-01-13 19:42 ` Gilles Chanteperdrix
2013-01-12 19:03 ` [Xenomai] Kernel OOPS during regression tests Gilles Chanteperdrix
2013-01-13 4:40 ` John Morris
2013-01-13 13:53 ` Gilles Chanteperdrix
2013-01-13 19:36 ` [Xenomai] SMI workarounds in one-size-fits-all kernel packages (Was: Re: Kernel OOPS during regression tests) John Morris
2013-01-13 19:45 ` Gilles Chanteperdrix
2013-01-14 5:33 ` John Morris
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=50F56074.50203@xenomai.org \
--to=rpm@xenomai.org \
--cc=jan.kiszka@siemens.com \
--cc=john@zultron.com \
--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.