mbox

[GIT,PULL] UBI changes for 3.11-rc1

Message ID 1373036223.2711.62.camel@sauron.fi.intel.com
State Accepted
Headers show

Pull-request

git://git.infradead.org/linux-ubi.git tags/upstream-3.11-rc1

Message

Artem Bityutskiy July 5, 2013, 2:57 p.m. UTC
Hello Linus!

The following changes since commit f722406faae2d073cc1d01063d1123c35425939e:

  Linux 3.10-rc1 (2013-05-11 17:14:08 -0700)

are available in the git repository at:

  git://git.infradead.org/linux-ubi.git tags/upstream-3.11-rc1

for you to fetch changes up to 83ff59a066637a6c28844bbf43009459408240f4:

  UBI: support ubi_num on mtd.ubi command line (2013-07-01 08:32:57 +0300)

----------------------------------------------------------------
A couple of fixes and clean-ups, allow for assigning user-defined
UBI device numbers when attaching MTD devices by using the "mtd="
module parameter.

----------------------------------------------------------------
Brian Pomerantz (1):
      UBI: fastmap break out of used PEB search

Mike Frysinger (4):
      UBI: drop redundant "UBI error" string
      UBI: do not abort init when ubi.mtd devices cannot be found
      UBI: document UBI_IOCVOLUP better in user header
      UBI: support ubi_num on mtd.ubi command line

 drivers/mtd/ubi/build.c     | 59 ++++++++++++++++++++++++++++++++++++++++-------------------
 drivers/mtd/ubi/fastmap.c   |  4 +++-
 include/uapi/mtd/ubi-user.h |  5 ++++-

Comments

Linus Torvalds July 5, 2013, 7:12 p.m. UTC | #1
On Fri, Jul 5, 2013 at 7:57 AM, Artem Bityutskiy <dedekind1@gmail.com> wrote:
>
>  drivers/mtd/ubi/build.c     | 59 ++++++++++++++++++++++++++++++++++++++++-------------------
>  drivers/mtd/ubi/fastmap.c   |  4 +++-
>  include/uapi/mtd/ubi-user.h |  5 ++++-

That's a very strange script you're using. It has somehow cut off the
last line of the diffstat - the one that actually is the primary one
to check the overally statistics:

 3 files changed, 47 insertions(+), 21 deletions(-)

Please double-check your pull script.

Anyway, pulled, so you don't need to re-send, but please fix this for
future pulls.

                Linus