From: Jan Kiszka <jan.kiszka@siemens.com>
To: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>,
Philippe Gerum <rpm@xenomai.org>
Cc: John Morris <john@zultron.com>, Xenomai <xenomai@xenomai.org>
Subject: Re: [Xenomai] [RFC] x86 port to kernel 3.10
Date: Tue, 27 Aug 2013 15:31:52 +0200 [thread overview]
Message-ID: <521CAA48.9070707@siemens.com> (raw)
In-Reply-To: <52164117.5080801@siemens.com>
On 2013-08-22 18:49, Jan Kiszka wrote:
> OK, then I will redo the merge of 3.10 in a single commit, but
> preserving the work of Philippe for 3.9.
Done, result can be found again at
git://git.xenomai.org/ipipe-jki.git next-x86
Gilles, Philippe, you may want to try John's suggestion and install that
patched git version. It allows to amend also merge commits (or reorder
them), thus could enable a workflow where the arch maintainers fixes up
the merges. The downside: it is awfully slow. I had to wait 15 min. or
so for git rebase -ip to give me the todo file and several minutes more
to see the changes applied (I fixed up my own merge with a forgotten hunk).
Jan
--
Siemens AG, Corporate Technology, CT RTC ITP SES-DE
Corporate Competence Center Embedded Linux
next prev parent reply other threads:[~2013-08-27 13:31 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-21 8:39 [Xenomai] [RFC] x86 port to kernel 3.10 Jan Kiszka
2013-08-21 8:44 ` Gilles Chanteperdrix
2013-08-21 8:47 ` Jan Kiszka
2013-08-21 8:54 ` Jan Kiszka
2013-08-21 11:32 ` Gilles Chanteperdrix
2013-08-21 11:46 ` Jan Kiszka
2013-08-21 11:49 ` Gilles Chanteperdrix
2013-08-21 11:53 ` Jan Kiszka
2013-08-21 11:58 ` Gilles Chanteperdrix
2013-08-21 13:39 ` Jan Kiszka
2013-08-21 18:23 ` Gilles Chanteperdrix
2013-08-22 7:46 ` Jan Kiszka
2013-08-22 9:37 ` Gilles Chanteperdrix
2013-08-22 16:49 ` Jan Kiszka
2013-08-27 13:31 ` Jan Kiszka [this message]
2013-08-24 7:29 ` John Morris
2013-08-24 7:43 ` Jan Kiszka
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=521CAA48.9070707@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=gilles.chanteperdrix@xenomai.org \
--cc=john@zultron.com \
--cc=rpm@xenomai.org \
--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.