From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marek Vasut <marex@denx.de>
Date: Mon, 26 May 2014 09:05:47 +0200
Subject: [U-Boot] [RFC, PATCH v2 2/4] lib, rbtree: resync with Linux-3.14
In-Reply-To: <5382D1E6.6040806@denx.de>
References: <1400755388-14922-1-git-send-email-hs@denx.de>
	<201405241230.08808.marex@denx.de> <5382D1E6.6040806@denx.de>
Message-ID: <201405260905.47504.marex@denx.de>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.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