From mboxrd@z Thu Jan  1 00:00:00 1970
From: Tom Rini <trini@ti.com>
Date: Thu, 5 Feb 2015 09:00:02 -0500
Subject: [U-Boot] [ubi] Pull request
In-Reply-To: <54CF1708.7020002@denx.de>
References: <54CF1708.7020002@denx.de>
Message-ID: <54D37762.30908@ti.com>
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

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 02/02/2015 01:19 AM, Heiko Schocher wrote:
> Hello Tom,
> 
> please pull from u-boot-ubi.git
> 
> The following changes since commit
> ab92da9f47d51d363c7de42e2a7bd807e2c1bd54:
> 
>   Merge branch 'master' of git://git.denx.de/u-boot-x86 (2015-01-26
> 17:44:49 -0500)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-ubi.git master
> 
> for you to fetch changes up to 040cc7b3beedecd971274a065564e39aac7fc76e:
> 
>   ubifs: Enable journal replay during mount (2015-01-29 09:34:03 +0100)
> 
> ----------------------------------------------------------------
> Anton Habegger (2):
>       ubifs: Import atomic_long operations from Linux
>       ubifs: Enable journal replay during mount
> 
> Heiko Schocher (1):
>       ubi: reset mtd_devs when ubi part fail
> 
>  drivers/mtd/ubi/build.c           |   8 ++
>  fs/ubifs/Makefile                 |   2 +-
>  fs/ubifs/gc.c                     | 976
> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 
>  fs/ubifs/replay.c                 |   4 -
>  fs/ubifs/super.c                  |   8 +-
>  fs/ubifs/tnc.c                    |   2 -
>  fs/ubifs/ubifs.c                  |   6 +
>  fs/ubifs/ubifs.h                  |  12 +-
>  include/asm-generic/atomic-long.h | 260
> +++++++++++++++++++++++++++++++++++++++
>  include/linux/compat.h            |   1 -
>  10 files changed, 1254 insertions(+), 25 deletions(-)
>  create mode 100644 fs/ubifs/gc.c
>  create mode 100644 include/asm-generic/atomic-long.h

Applied to u-boot/master, thanks!

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBAgAGBQJU03diAAoJENk4IS6UOR1WHjoP/Rcyp3J2xzxAjatjbpG6Au0R
DqrECIzk9G5nReBadn83Y7MSzJ3VHWLgNZrTYa/b3B5KIAWCfzNUYWcRPX3CRaSb
v0tfazdAeNNuzvJe2+WKaJvx9vShBRfJiqPeqxhfPdeC1lqQaUzMBBlO7F8nyyi6
z15ALiqsjNwouirw5UJFPWOIA7j3j2BWATTtF+dpX1aPAuxIgdlUqko91PEKaVJX
/XGNmHO6AVVuQR7QV/w3DppPvTvyTnJ7GRJD1BQP2nxgh+q0WVL10AP30Zb7E0MX
6ghNcfl3pp9OHlrKekWwmRuxYUHSd0AujJxtanhK4Wjh9pUT4Mhm04OP/fAb/1Nd
VvKvD37cwVnV6j0plMLu1kDlQu7twjG2CNplj4I5MxekjzkMiwIidVQT3JMWCWRy
iRODOrsztK6ZLdYJ1zpO7FGAQlor62tBH2Au2bkjTun6EMwHU3ezJAacIH/CEXFv
SAtkq4qSoX8hg+dbYEyUYlKDKutaAUrX2iIa7oIMFaXPRRtCNwYMh2AIWikuemtm
KcYcx437N5mUHs87T9a4PaoWQQJXcqYbIgQWwduZHuNNBVsMb8kUWhERPMdRfrmg
d5BmAMNsmLD1q/aBlU9CsbENAAJSRYzmqwmrk7AH4pY9OKeJRMUtE7oH26eynUs0
XHon98hKLUnyuL1/e1sQ
=UH0H
-----END PGP SIGNATURE-----