All of lore.kernel.org
 help / color / mirror / Atom feed
From: Henning Schild <henning.schild@siemens.com>
To: Xenomai <xenomai@xenomai.org>
Cc: "KISZKA, JAN" <jan.kiszka@siemens.com>
Subject: [Xenomai] 4.x merge
Date: Wed, 9 Sep 2015 11:31:51 +0200	[thread overview]
Message-ID: <20150909113151.0fed6fd7@md1em3qc> (raw)

Hi,

i am about to merge ipipe into a more recent kernel and would like to
discuss the approach with you guys. As far as i have seen and been told
i should merge and not rebase.

My current plan:
1 choose release (4.1 since its LTS)
2 merge it into ipipe
3 resolve obvious conflicts
4 commit broken merge
5 repair common bits and x86
6 publish my tree for others to repair other archs

Steps 2,3 and 4 might become iterations stepping over 3.19 and 4.0. The
merges will not work but the smaller steps will result in less
conflicts at a time.

What do you guys think of the approach? Are my version choices sane or
are there any reasons to consider other releases as well?

Henning


             reply	other threads:[~2015-09-09  9:31 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-09  9:31 Henning Schild [this message]
2015-09-09 13:01 ` [Xenomai] 4.x merge Jorge Ramirez Ortiz
2015-09-15  8:48   ` Henning Schild
2015-09-17 12:39     ` Henning Schild
2015-09-17 12:46       ` [Xenomai] [PATCH xenomai2 1/2] adopt to kernel change c0371da6047abd261bc483c744dbc7d81a116172 Henning Schild
2015-09-17 12:46         ` [Xenomai] [PATCH xenomai2 2/2] scripts: make kernel 4.x ready Henning Schild
2015-09-17 12:46         ` [Xenomai] [PATCH xenomai3 1/2] adopt to kernel change c0371da6047abd261bc483c744dbc7d81a116172 Henning Schild
2015-09-17 12:46         ` [Xenomai] [PATCH xenomai3 2/2] adopt to kernel change 3a161d99c43ce74c76aecff309be4c3ba455e823 Henning Schild
2015-09-17 13:24       ` [Xenomai] 4.x merge Jorge Ramirez Ortiz
2015-10-14 13:11       ` Jorge Ramirez Ortiz
2015-11-09 12:11         ` Henning Schild
2015-10-14 22:16       ` Jorge Ramirez Ortiz
2015-10-20 15:07         ` Jorge Ramirez Ortiz
2015-10-20 15:35           ` Philippe Gerum
2015-10-20 16:01             ` Gilles Chanteperdrix
2015-09-29 18:03 ` Gilles Chanteperdrix
2015-10-02 13:36   ` Henning Schild
2015-10-02 14:09     ` Gilles Chanteperdrix

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=20150909113151.0fed6fd7@md1em3qc \
    --to=henning.schild@siemens.com \
    --cc=jan.kiszka@siemens.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.