tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi

Browse Source 
Pull ubi fixes from Artem Bityutskiy:
 "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"

* tag 'upstream-3.11-rc1' of git://git.infradead.org/linux-ubi:
  UBI: support ubi_num on mtd.ubi command line
  UBI: fastmap break out of used PEB search
  UBI: document UBI_IOCVOLUP better in user header
  UBI: do not abort init when ubi.mtd devices cannot be found
  UBI: drop redundant "UBI error" string
This commit is contained in:
Linus Torvalds
2013-07-05 12:09:48 -07:00
parent 2dd1cb5a7e 83ff59a066
commit 45175476ae
3 changed files with 47 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/uapi/mtd/ubi-user.h
+4 -1
View File
@@ -173,7 +173,10 @@
#define UBI_VOL_IOC_MAGIC 'O'
/* Start UBI volume update */
/* Start UBI volume update
* Note: This actually takes a pointer (__s64*), but we can't change
* that without breaking the ABI on 32bit systems
*/
#define UBI_IOCVOLUP _IOW(UBI_VOL_IOC_MAGIC, 0, __s64)
/* LEB erasure command, used for debugging, disabled by default */
#define UBI_IOCEBER _IOW(UBI_VOL_IOC_MAGIC, 1, __s32)