]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'upstream-4.3-rc4' of git://git.infradead.org/linux-ubifs
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Oct 2015 11:57:27 +0000 (07:57 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Oct 2015 11:57:27 +0000 (07:57 -0400)
Pull UBI/UBIFS fixes from Richard Weinberger:
 "This contains three bug fixes for both UBI and UBIFS"

* tag 'upstream-4.3-rc4' of git://git.infradead.org/linux-ubifs:
  UBI: return ENOSPC if no enough space available
  UBI: Validate data_size
  UBIFS: Kill unneeded locking in ubifs_init_security


Trivial merge