All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org>
To: Charles Steinkuehler <charles@steinkuehler.net>
Cc: xenomai@xenomai.org
Subject: Re: [Xenomai] [PATCH] BeagleBone 3.8.13 pre/post patches
Date: Tue, 10 Sep 2013 20:48:14 +0200	[thread overview]
Message-ID: <522F696E.4090703@xenomai.org> (raw)
In-Reply-To: <521D053B.7010005@steinkuehler.net>

On 08/27/2013 09:59 PM, Charles Steinkuehler wrote:
> On 8/21/2013 1:25 PM, Gilles Chanteperdrix wrote:
>> On 08/21/2013 03:16 PM, Charles Steinkuehler wrote:
>>> [1] There was one hunk I could not get to apply automatically.  The code
>>> in gpmc.c has changed extensively enough that git apply doesn't work
>>> with this file.  To work around this, I skip this file when applying the
>>> ipipe patch, and use a manual fix-up of the trivial 2-line change:
>>>
>>> https://github.com/cdsteinkuehler/linux-dev/blob/am33x-v3.8-bone26-xenomai/patches/xenomai/0001-ipipe-core-3.8.13-arm-1.gpmc.patch
>>>
>>> There's probably a better way to work around this problem, but this
>>> should do until the next official xenomai release comes out...any day
>>> now, right?!?  :)  Anyway, it doesn't look like it will be that hard to
>>> roll forward with updated ipipe or xenomai patches.
>>
>> The general way to handle the non-mainline kernels is with a pre and
>> post patch. The pre patch removes the changes which conflicts, and the
>> post patch adds the merge.
> 
> I made a pre/post patch set for the BeagleBone 3.8.13 kernel and added
> the files to my xenomai 2.6 repository (patch attached).
> 
> Note that I just added the files...I didn't do anything to try and
> integrate these with the prepare_kernel.sh script (since I'm applying
> the ipipe patch from git manually) or add documentation.  With this, the
> patch generated from the current git ipipe-3.8 branch applies cleanly.
> 
> Anyway, the patch turned out to be quite simple and will hopefully roll
> forward fairly well.

Hi Charles,

The final version of the I-pipe patch for 3.8.13 is available, could you
check the patches you posted need rebasing?

Thanks in advance.
Regards.


-- 
                                                                Gilles.


  parent reply	other threads:[~2013-09-10 18:48 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-20 14:58 [Xenomai] Building BeagleBone kernel from git Charles Steinkuehler
2013-08-20 18:39 ` Gilles Chanteperdrix
2013-08-20 18:45   ` Sagar Behere
2013-08-21  5:53     ` Michael Haberler
2013-08-21  8:45       ` Jan Kiszka
2013-08-20 19:49   ` Charles Steinkuehler
2013-08-20 19:55     ` Gilles Chanteperdrix
2013-08-20 20:25       ` Charles Steinkuehler
2013-08-20 22:37         ` Charles Steinkuehler
2013-08-20 23:12           ` Gilles Chanteperdrix
2013-08-21 22:15             ` [Xenomai] [PATCH] Fix for awk vs. gawk Charles Steinkuehler
2013-08-25 23:54               ` Gilles Chanteperdrix
2013-08-21 13:16         ` [Xenomai] Building BeagleBone kernel from git Charles Steinkuehler
2013-08-21 18:25           ` Gilles Chanteperdrix
2013-08-24 17:10             ` Ralf Roesch
2013-08-24 17:54               ` Michael Haberler
2013-08-25  0:59               ` Charles Steinkuehler
2013-08-25  7:24                 ` Ralf Roesch
2013-08-27 19:59             ` [Xenomai] [PATCH] BeagleBone 3.8.13 pre/post patches Charles Steinkuehler
2013-08-27 21:12               ` Gilles Chanteperdrix
2013-08-27 21:13                 ` Gilles Chanteperdrix
2013-08-27 21:57                   ` Charles Steinkuehler
2013-09-10 18:48               ` Gilles Chanteperdrix [this message]
2013-09-10 21:20                 ` Charles Steinkuehler

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=522F696E.4090703@xenomai.org \
    --to=gilles.chanteperdrix@xenomai.org \
    --cc=charles@steinkuehler.net \
    --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.