Skip to contentSkip to conversation

Pull request

U-Boot Tom Rini 1 participant 1 message Feb 5, 2015 1 message not in the archive

lore
Share & tools
lore

Tom Rini

author
#1 lore raw
In reply to a message not in the archive

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

Quoted 31 lines · Heiko Schocher

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

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Quoted 11 lines
 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-----