-----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