commit c6f7afaeeda5b3c42ea8d7b27e197d223a04675e Merge: 34e2fde efd124b Author: Linus Torvalds Date: Wed Jan 6 01:41:07 2010 -0800 Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd * 'for-linus' of git://git.open-osd.org/linux-open-osd: exofs: simple_write_end does not mark_inode_dirty exofs: fix pnfs_osd re-definitions in pre-pnfs trees commit 34e2fde8a496cf9d7c184ef12eafd3dd854586f1 Merge: 10b465a dc2f9c5 Author: Linus Torvalds Date: Wed Jan 6 01:16:26 2010 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm * master.kernel.org:/home/rmk/linux-2.6-arm: (22 commits) ARM: 5865/1: nuc900 ethernet driver needs mii ARM: 5864/1: Implement arch_reset() in NUC900 ARM: 5863/1: fix bugs of clock source of NUC900 ARM: 5858/1: Remove unused vma_vm_flags macro from v7wbi_flush_user_tlb_range imx/mx3: depend on USB_ULPI for otg_ulpi_create ARM: MX3: make CPU revision number detection work on all boards mx25: pdk: add platform code for FEC support mx25: add support for FEC on i.MX25 mx25: s/NO_PAD_CTL/NO_PAD_CTRL/ mx31moboard: fix usbh device names mx3: add support for the mt9v022 camera sensor to pcm037 platform mx27: mxt_td60: Remove not used UART pins [ARM] pxa/poodle: fix incorrect 'gpio_card_detect' of MMC [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot [ARM] pxa/ttc_dkb: remove duplicate macro definition [ARM] pxa/zeus: provide power-source information when APM is enabled [ARM] pxa/zeus: relax memory timings on Zeus ethernet ports [ARM] pxa/zeus: make internal zeus_get_pcb_info static [ARM] pxa/littleton: select CPU_PXA300 and CPU_PXA310 [ARM] pxa/littleton: add UART3 GPIO config ... commit 10b465aaf9536ee5a16652fa0700740183d48ec9 Author: Ben Hutchings Date: Sat Dec 19 14:43:01 2009 +0000 modules: Skip empty sections when exporting section notes Commit 35dead4 "modules: don't export section names of empty sections via sysfs" changed the set of sections that have attributes, but did not change the iteration over these attributes in add_notes_attrs(). This can lead to add_notes_attrs() creating attributes with the wrong names or with null name pointers. Introduce a sect_empty() function and use it in both add_sect_attrs() and add_notes_attrs(). Reported-by: Martin Michlmayr Signed-off-by: Ben Hutchings Tested-by: Martin Michlmayr Cc: stable@kernel.org Signed-off-by: Rusty Russell Signed-off-by: Linus Torvalds commit dc2f9c5a13de4f9fd63f49f54add40b2924f66cd Author: Li Jie Date: Thu Dec 31 16:03:16 2009 +0100 ARM: 5865/1: nuc900 ethernet driver needs mii nuc900 ethernet driver uses mii_xx_xx serials api, so mii module should be selected. Signed-off-by: lijie Acked-by: Wan ZongShun Signed-off-by: Russell King commit 58b2e0a2dd8e460d3b7d7f8ec5d3042253b9e08a Author: Li Jie Date: Thu Dec 31 15:50:02 2009 +0100 ARM: 5864/1: Implement arch_reset() in NUC900 Implement arch_reset(), reboot from shell become possible. Signed-off-by: lijie Acked-by: Wan ZongShun Signed-off-by: Russell King commit 1368c51c501978e5c4148322b7c77d4f49549557 Author: Li Jie Date: Thu Dec 31 15:57:53 2009 +0100 ARM: 5863/1: fix bugs of clock source of NUC900 This patch fix following bugs: 1. typo error, CLOCK_EVT_MODE_PERIODIC -> CLOCK_EVT_FEAT_PERIODIC 2. TCSR register of timer1 missed PRESCALE 3. timer1 should be enabled before register it to clock source. Signed-off-by: lijie Acked-by: Wan ZongShun Signed-off-by: Russell King commit 070f1f178c4377c09f72e414513aeacd8403f6d6 Author: Bahadir Balban Date: Fri Dec 25 14:25:48 2009 +0100 ARM: 5858/1: Remove unused vma_vm_flags macro from v7wbi_flush_user_tlb_range Signed-off-by: Bahadir Balban Signed-off-by: Russell King commit efd124b999fb4d426b30675f1684521af0872789 Author: Boaz Harrosh Date: Sun Dec 27 17:01:42 2009 +0200 exofs: simple_write_end does not mark_inode_dirty exofs uses simple_write_end() for it's .write_end handler. But it is not enough because simple_write_end() does not call mark_inode_dirty() when it extends i_size. So even if we do call mark_inode_dirty at beginning of write out, with a very long IO and a saturated system we might get the .write_inode() called while still extend-writing to file and miss out on the last i_size updates. So override .write_end, call simple_write_end(), and afterwords if i_size was changed call mark_inode_dirty(). It stands to logic that since simple_write_end() was the one extending i_size it should also call mark_inode_dirty(). But it looks like all users of simple_write_end() are memory-bound pseudo filesystems, who could careless about mark_inode_dirty(). I might submit a warning-comment patch to simple_write_end() in future. CC: Stable Signed-off-by: Boaz Harrosh commit 89be503021f550575fc896671b569941140b2c2e Author: Boaz Harrosh Date: Mon Dec 21 16:36:23 2009 +0200 exofs: fix pnfs_osd re-definitions in pre-pnfs trees Some on disk exofs constants and types are defined in the pnfs_osd_xdr.h file. Since we needed these types before the pnfs-objects code was accepted to mainline we duplicated the minimal needed definitions into an exofs local header. The definitions where conditionally included depending on !CONFIG_PNFS defined. So if PNFS was present in the tree definitions are taken from there and if not they are defined locally. That was all good but, the CONFIG_PNFS is planed to be included upstream before the pnfs-objects is also included. (The first pnfs batch might be pnfs-files only) So condition exofs local definitions on the absence of pnfs_osd_xdr.h inclusion (__PNFS_OSD_XDR_H__ not defined). User code must make sure that in future pnfs_osd_xdr.h will be included before fs/exofs/pnfs.h, which happens to be so in current code. Once pnfs-objects hits mainline, exofs's local header will be removed. Signed-off-by: Boaz Harrosh commit 3ac584317adcc4be4466db967f3355c3e42cbda3 Merge: 1df4bb4 f9ffaa9 Author: Russell King Date: Mon Jan 4 15:51:38 2010 +0000 Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 commit f9ffaa9ca9889f17ef30b82bc0bf954d141280f8 Author: Uwe Kleine-König Date: Tue Dec 22 17:31:05 2009 +0100 imx/mx3: depend on USB_ULPI for otg_ulpi_create otg_ulpi_create is defined in drivers/usb/otg/ulpi.c which depends on CONFIG_USB_ULPI. So protect its usage by the same symbol. Moreover mxc_ulpi_access_ops needs CONFIG_MXC_ULPI. Signed-off-by: Uwe Kleine-König Cc: Sascha Hauer Cc: Valentin Longchamp Cc: Daniel Mack Signed-off-by: Sascha Hauer commit e94c4c34495e194d778e9ab20044c723280a54e7 Author: Wolfgang Denk Date: Tue Dec 15 00:27:42 2009 +0100 ARM: MX3: make CPU revision number detection work on all boards Commit 52939c03 (ARM: MX3: fix CPU revision number detection) started using the CPU's SREV register for revision number detection. This makes it mandatory to have a valid SPBA0 mapping. Add this to the global map_io code instead of adding multiple copies for each board. Signed-off-by: Wolfgang Denk Cc: Daniel Mack Cc: Sascha Hauer Tested on Qong (EVB-Lite) Tested-by: Wolfgang Denk Signed-off-by: Sascha Hauer commit e71fbaf7660cefb49459e66a12bbb928a86958c9 Author: Baruch Siach Date: Mon Dec 21 13:44:32 2009 +0200 mx25: pdk: add platform code for FEC support Signed-off-by: Sascha Hauer commit a759544ff95c14dac93759e02a84e233da0dc25a Author: Baruch Siach Date: Mon Dec 21 13:44:31 2009 +0200 mx25: add support for FEC on i.MX25 Signed-off-by: Sascha Hauer commit dda71f1612bd6644714ab5c801d2f6d390b5318f Author: Baruch Siach Date: Mon Dec 14 12:19:39 2009 +0200 mx25: s/NO_PAD_CTL/NO_PAD_CTRL/ NO_PAD_CTL is not defined anywhere. Signed-off-by: Baruch Siach Signed-off-by: Sascha Hauer commit 4c21186bd8b1ecf46a7cc20d8ad26476afe14f8c Author: Valentin Longchamp Date: Fri Dec 4 16:50:29 2009 +0100 mx31moboard: fix usbh device names Signed-off-by: Valentin Longchamp Signed-off-by: Sascha Hauer commit 9d00278d481b148fa99222553bb2339bc5f65036 Author: Guennadi Liakhovetski Date: Fri Dec 11 14:29:06 2009 +0100 mx3: add support for the mt9v022 camera sensor to pcm037 platform Signed-off-by: Guennadi Liakhovetski Signed-off-by: Sascha Hauer commit 2243b649aa9e5669bea5413c5b520f333f96be07 Author: Alan Carvalho de Assis Date: Fri Dec 4 15:44:06 2009 -0200 mx27: mxt_td60: Remove not used UART pins Signed-off-by: Alan Carvalho de Assis Signed-off-by: Sascha Hauer commit 1df4bb4af42459a4a10e7b21794a6f44463534e6 Merge: cd6e125 91a86a9 Author: Russell King Date: Sat Jan 2 11:16:20 2010 +0000 Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 commit 91a86a964f0773fdf466fe02577c8494ca8e2083 Author: Eric Miao Date: Fri Dec 25 09:21:34 2009 +0800 [ARM] pxa/poodle: fix incorrect 'gpio_card_detect' of MMC Signed-off-by: Eric Miao commit f91e4906e26c053ab2ea6067c6354e49b71d8fa9 Author: Haojian Zhuang Date: Tue Dec 22 07:29:40 2009 -0500 [ARM] pxa/zylonite: simplify reduntant gpio settings on mmc slot PXA mmc host driver supports card detect, read only and power gpio pin setting already. Zylonite platform driver needn't implement this any more. Signed-off-by: Haojian Zhuang Signed-off-by: Eric Miao commit c57b9343437a801f0a93b272df8eabf1df102034 Author: Uwe Kleine-König Date: Thu Dec 17 14:56:57 2009 +0100 [ARM] pxa/ttc_dkb: remove duplicate macro definition ARRAY_AND_SIZE is already defined arch/arm/mach-mmp/common.h which is already included. Signed-off-by: Uwe Kleine-König Cc: Russell King Cc: Bin Yang Acked-by: Haojian Zhuang Signed-off-by: Eric Miao commit a1916eb0ea142c5ac67289e65a022d5253a8ec92 Author: Marc Zyngier Date: Sat Dec 26 21:24:13 2009 +0100 [ARM] pxa/zeus: provide power-source information when APM is enabled Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit 5f86cebaa56268f1afa2321e6d424530b1a49a12 Author: Marc Zyngier Date: Sat Dec 26 21:24:12 2009 +0100 [ARM] pxa/zeus: relax memory timings on Zeus ethernet ports DM9000s on Zeus sometime fail under heavy load. Relaxing the timings a bit seems to be of a great help. Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit 100627b4bacd0bd669aab5a68f8a0bfd0d28d002 Author: Marc Zyngier Date: Sat Dec 26 21:24:11 2009 +0100 [ARM] pxa/zeus: make internal zeus_get_pcb_info static Signed-off-by: Marc Zyngier Signed-off-by: Eric Miao commit 9a8a0c46de1fac06e9b78d13edd7612a97d0061d Author: Marek Vasut Date: Sun Dec 27 18:14:25 2009 +0100 [ARM] pxa/littleton: select CPU_PXA300 and CPU_PXA310 This has to be selected, otherwise some peripherals don't get initialized. Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 6d26ce68e034fb3dc93e8d56452c85f57b322101 Author: Marek Vasut Date: Sun Dec 27 16:04:35 2009 +0100 [ARM] pxa/littleton: add UART3 GPIO config Signed-off-by: Marek Vasut Signed-off-by: Eric Miao commit 1692231cfda6577d411945ea1dacce548e63a0a4 Author: H Hartley Sweeten Date: Mon Nov 23 12:24:32 2009 -0500 [ARM] pxa: use resource_size() in pwm.c Use resource_size for {request/release}_mem_region and ioremap. Signed-off-by: H Hartley Sweeten Signed-off-by: Eric Miao commit da2c3f0ead336c04b4d1ad36ff42d8d264f44f65 Author: Eric Miao Date: Sat Dec 26 16:25:18 2009 +0800 [ARM] pxafb: fix building issue of incorrect reference Commit "d2a34c1 drivers/video: Move dereference after NULL test" introduced a build error of "fbi->dev->platform_data->smart_update" being unknown type to the compiler, fix this by removing the unnecessary test of 'fbi'. Cc: Julia Lawall Signed-off-by: Eric Miao