Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ https://git.shady.money/linux/atom?h=v2.6.37 2010-12-15T01:36:35Z 2010-12-15T01:36:35Z Linus Torvalds torvalds@linux-foundation.org 2010-12-15T01:36:35Z urn:sha1:ec5d043f2809b9aaf14e6676ddb0dc8c3a6dc8de * 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: OMAP2: PRCM: fix some SHIFT macros that were actually bitmasks OMAP2+: PM/serial: fix console semaphore acquire during suspend OMAP1: SRAM: fix size for OMAP1611 SoCs arm: omap2: io: fix clk_get() error check arm: plat-omap: counter_32k: use IS_ERR() instead of NULL check omap: nand: remove hardware ECC as default omap: zoom: wl1271 slot is MMC_CAP_POWER_OFF_CARD omap: PM debug: fix wake-on-timer debugfs dependency 2010-12-12T23:45:39Z Russell King rmk+kernel@arm.linux.org.uk 2010-12-12T23:45:39Z urn:sha1:819c1a651fec6b370211609ce6eceefd20cf31e4 2010-12-07T00:00:08Z Sukumar Ghorai s-ghorai@ti.com 2010-11-19T14:45:26Z urn:sha1:859158bfab7e72af440622fb9731bcaef4e7d6dc Commit 2c01946c6b9ebaa5a89710bc42ca224a7f52f227 (omap3 nand: cleanup virtual address usages) wrongly enabled CONFIG_MTD_NAND_OMAP_HWECC which breaks boards like beagle and pandora that use software ECC for write. Boards like beagle and pandora uses sw ecc for write (e.g. binary flushed from u-boot) and read from kernel. Signed-off-by: Sukumar Ghorai <s-ghorai@ti.com> Acked-by: David Woodhouse <David.Woodhouse@intel.com> [tony@atomide.com: updated comments] Signed-off-by: Tony Lindgren <tony@atomide.com> 2010-12-03T13:49:21Z Artem Bityutskiy Artem.Bityutskiy@nokia.com 2010-12-02T04:34:01Z urn:sha1:7ac760c2f78ddd8e1bd633767b01becfbbf96720 My new shiny code for corrupted PEB detection has NOR specific bug. We tread PEB as corrupted and preserve it, if 1. EC header is OK. 2. VID header is corrupted. 3. data area is not "all 0xFFs" In case of NOR we have 'nor_erase_prepare()' quirk, which invalidates the headers before erasing the PEB. And we invalidate first the VID header, and then the EC header. So if a power cut happens after we have invalidated the VID header, but before we have invalidated the EC header, we end up with a PEB which satisfies the above 3 conditions, and the scanning code will treat it as corrupted, and will print scary warnings, wrongly. This patch fixes the issue by firt invalidating the EC header, then invalidating the VID header. In case of power cut inbetween, we still just lose the EC header, and UBI can deal with this situation gracefully. Thanks to Anatolij Gustschin <agust@denx.de> for tracking this down. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Reported-by: Anatolij Gustschin <agust@denx.de> Tested-by: Anatolij Gustschin <agust@denx.de> 2010-11-30T12:14:04Z Marek Vasut marek.vasut@gmail.com 2010-10-09T22:34:28Z urn:sha1:f9d1bf755315a66353a7f42319cff471b36fffb3 Signed-off-by: Marek Vasut <marek.vasut@gmail.com> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com> 2010-11-19T13:19:40Z Dan Carpenter error27@gmail.com 2010-11-18T03:58:04Z urn:sha1:1b1d76e2df2a0aa965d6a227db7061d3fff029b1 Commit 45aafd32996e27 "UBI: tighten the corrupted PEB criteria" introduced some return paths that didn't release the ubi->buf_mutex Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> 2010-10-30T15:31:35Z Linus Torvalds torvalds@linux-foundation.org 2010-10-30T15:31:35Z urn:sha1:79346507ad48895f41b438fa562b1965721f36b9 * git://git.infradead.org/mtd-2.6: (82 commits) mtd: fix build error in m25p80.c mtd: Remove redundant mutex from mtd_blkdevs.c MTD: Fix wrong check register_blkdev return value Revert "mtd: cleanup Kconfig dependencies" mtd: cfi_cmdset_0002: make sector erase command variable mtd: cfi_cmdset_0002: add CFI detection for SST 38VF640x chips mtd: cfi_util: add support for switching SST 39VF640xB chips into QRY mode mtd: cfi_cmdset_0001: use defined value of P_ID_INTEL_PERFORMANCE instead of hardcoded one block2mtd: dubious assignment P4080/mtd: Fix the freescale lbc issue with 36bit mode P4080/eLBC: Make Freescale elbc interrupt common to elbc devices mtd: phram: use KBUILD_MODNAME mtd: OneNAND: S5PC110: Fix double call suspend & resume function mtd: nand: fix MTD_MODE_RAW writes jffs2: use kmemdup mtd: sm_ftl: cosmetic, use bool when possible mtd: r852: remove useless pci powerup/down from suspend/resume routines mtd: blktrans: fix a race vs kthread_stop mtd: blktrans: kill BKL mtd: allow to unload the mtdtrans module if its block devices aren't open ... Fix up trivial whitespace-introduced conflict in drivers/mtd/mtdchar.c 2010-10-30T11:46:08Z Andres Salomon dilinger@queued.net 2010-10-30T04:04:19Z urn:sha1:40847437f15221b5822ba70550e8b9fcccfb9bb3 While building an x86 distro kernel, I hit the following: Kernel: arch/x86/boot/bzImage is ready (#7) ERROR: "of_mtd_parse_partitions" [drivers/mtd/devices/m25p80.ko] undefined! of_mtd_parse_partitions is defined with MTD_OF_PARTS, and that's only built on PPC and microblaze. The code in question should be wrapped w/ a stricter #ifdef. Signed-off-by: Andres Salomon <dilinger@queued.net> Acked-by: Grant Likely <grant.likely@secretlab.ca> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> 2010-10-30T11:39:21Z David Woodhouse David.Woodhouse@intel.com 2010-10-30T11:39:21Z urn:sha1:8cc9de3ebdf654601db51a516267dff89c49acc3 In commit 2a48fc0ab24241755dc93bfd4f01d68efab47f5a ('block: autoconvert trivial BKL users to private mutex'), Arnd replaced the BKL usage with a mutex. However, Maxim has already provided a better fix in commit 480792b7bf188c29b8d4b10fee65c3a06ec5dbf7 ('mtd: blktrans: kill BKL'), which was simply to remove the BKL without replacing it — since he'd already made it do all necessary locking for itself. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> 2010-10-30T11:35:11Z David Woodhouse David.Woodhouse@intel.com 2010-10-30T11:35:11Z urn:sha1:67577927e8d7a1f4b09b4992df640eadc6aacb36 Conflicts: drivers/mtd/mtd_blkdevs.c Merge Grant's device-tree bits so that we can apply the subsequent fixes. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>