tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'linux-next' of git://git.infradead.org/ubi-2.6

* 'linux-next' of git://git.infradead.org/ubi-2.6:
UBI: fix bug in image sequence number handling
UBI: gluebi: initialize ubi_num field

Linus Torvalds 61fe0870 71c4c8b7

+2 -1
+1
drivers/mtd/ubi/gluebi.c
··· 332 332 } 333 333 334 334 gluebi->vol_id = vi->vol_id; 335 + gluebi->ubi_num = vi->ubi_num; 335 336 mtd->type = MTD_UBIVOLUME; 336 337 if (!di->ro_mode) 337 338 mtd->flags = MTD_WRITEABLE;
+1 -1
drivers/mtd/ubi/scan.c
··· 781 781 return -EINVAL; 782 782 } 783 783 784 - image_seq = be32_to_cpu(ech->ec); 784 + image_seq = be32_to_cpu(ech->image_seq); 785 785 if (!si->image_seq_set) { 786 786 ubi->image_seq = image_seq; 787 787 si->image_seq_set = 1;