public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed
From: Marek Vasut <marex@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [RFC, PATCH v2 2/4] lib, rbtree: resync with Linux-3.14
Date: Mon, 26 May 2014 09:05:47 +0200	[thread overview]
Message-ID: <201405260905.47504.marex@denx.de> (raw)
In-Reply-To: <5382D1E6.6040806@denx.de>

On Monday, May 26, 2014 at 07:32:22 AM, Heiko Schocher wrote:
> Hello Marek,
> 
> Am 24.05.2014 12:30, schrieb Marek Vasut:
> > On Thursday, May 22, 2014 at 12:43:06 PM, Heiko Schocher wrote:
> >> resync with linux:
> >> 
> >> commit 455c6fdbd219161bd09b1165f11699d6d73de11c
> >> Author: Linus Torvalds<torvalds@linux-foundation.org>
> >> Date:   Sun Mar 30 20:40:15 2014 -0700
> >> 
> >>      Linux 3.14
> >> 
> >> Needed for the MTD/UBI/UBIFS resync
> >> 
> >> Signed-off-by: Heiko Schocher<hs@denx.de>
> >> Cc: Marek Vasut<marex@denx.de>
> >> Cc: Sergey Lapin<slapin@ossfans.org>
> >> Cc: Scott Wood<scottwood@freescale.com>
> > 
> > Did you just copy the files over or did you change anything in them? If
> > you changed anything, I'd say that should go into some compat header so
> > there's a minimum amount of changes compared to the mainline linux code.
> 
> Just copied the file from Linux, changed the license file header,
> and add:
> 
> +#define __UBOOT__
>   #include <linux/rbtree_augmented.h>
> +#ifndef __UBOOT__
>   #include <linux/export.h>
> +#else
> +#include <ubi_uboot.h>
> +#endif
> 
> so, that should be ok.

Thanks for clarifying, I suppose that might need to be in the commit message 
though , so once we decide to do resync again, we'd know what the code looked 
like compared to 3.14 .

Best regards,
Marek Vasut

  reply	other threads:[~2014-05-26  7:05 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-22 10:43 [U-Boot] [RFC, PATCH v2 0/4] mtd, ubi, ubifs: resync with Linux-3.14 Heiko Schocher
2014-05-22 10:43 ` [U-Boot] [RFC,PATCH v2 1/4] dm: rename device struct to udevice Heiko Schocher
2014-05-22 20:34   ` [U-Boot] [RFC, PATCH " Simon Glass
2014-05-22 21:22     ` Jon Loeliger
2014-05-23  0:43     ` Tom Rini
2014-05-23  0:50       ` Simon Glass
2014-05-23  3:56     ` Heiko Schocher
2014-05-23 22:36       ` Simon Glass
2014-05-27 14:22   ` Tom Rini
2014-05-22 10:43 ` [U-Boot] [RFC,PATCH v2 2/4] lib, rbtree: resync with Linux-3.14 Heiko Schocher
2014-05-24 10:30   ` [U-Boot] [RFC, PATCH " Marek Vasut
2014-05-26  5:32     ` Heiko Schocher
2014-05-26  7:05       ` Marek Vasut [this message]
2014-05-27 14:21         ` Tom Rini
2014-05-28  5:24           ` Heiko Schocher
2014-05-22 10:43 ` [U-Boot] [RFC, PATCH v2 3/4] lib, list_sort: add list_sort from linux 3.14 Heiko Schocher
2014-05-22 10:43 ` [U-Boot] [RFC, PATCH v2 4/4] mtd, ubi, ubifs: resync with Linux-3.14 Heiko Schocher
2014-06-02 21:06 ` [U-Boot] [RFC, PATCH v2 0/4] " Jörg Krause
2014-06-03  5:14   ` Heiko Schocher

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=201405260905.47504.marex@denx.de \
    --to=marex@denx.de \
    --cc=u-boot@lists.denx.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox