)]}' { "log": [ { "commit": "642ba5ed7ac7a2369ed2a3c5aa4d76306d06bd03", "tree": "1d169633e0c0045bf1f5d215f68791b36228f146", "parents": [ "80f01ca1fce2d5045b98f01989017767339b8700", "e0ce42e19ce1978a5aee33b2954d7e1a730e88c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 15 14:47:28 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 15 14:47:28 2011 -0200" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n fsl-rio: fix compile error\n" }, { "commit": "e0ce42e19ce1978a5aee33b2954d7e1a730e88c4", "tree": "232677de4d94be60d5494ee8a417de8b6f9cd7b9", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Liu Gang", "email": "Gang.Liu@freescale.com", "time": "Fri Nov 11 21:48:28 2011 +0800" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Mon Nov 14 12:43:17 2011 -0500" }, "message": "fsl-rio: fix compile error\n\nThe \"#include \u003clinux/module.h\u003e\" was replaced by \"#include \u003clinux/export.h\u003e\"\nin the patch \"powerpc: various straight conversions from module.h --\u003e export.h\".\nThis will cause the following compile problem:\narch/powerpc/sysdev/fsl_rio.c: In function \u0027fsl_rio_mcheck_exception\u0027:\narch/powerpc/sysdev/fsl_rio.c:296: error: implicit declaration of function \u0027search_exception_tables\u0027.\n\nThe file fsl_rio.c needs the declaration of function \"search_exception_tables\"\nin the header file \"linux/module.h\".\n\nSigned-off-by: Liu Gang \u003cGang.Liu@freescale.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "905905432868fa513f0f783fb9e5724536f4ee1f", "tree": "e49757a720fdc7e03e5270bc96a2d8aa018bc40a", "parents": [ "edb0a6408a84b4f14647770d8a6796afff3e93a9" ], "author": { "name": "Lars-Peter Clausen", "email": "lars@metafoo.de", "time": "Fri Nov 11 11:06:38 2011 +0100" }, "committer": { "name": "Bob Liu", "email": "lliubbo@gmail.com", "time": "Mon Nov 14 17:15:23 2011 +0800" }, "message": "blackfin: Fixup export.h includes\n\nCommit 8dc7a9c84 (\"blackfin: Add export.h to files using\nEXPORT_SYMBOL/THIS_MODULE\") inserted some of the include statements into\nsections protected by an unrelated #if CONFIG_... statement. This can cause,\ndepending on the configuration used, warnings like this one:\n\n\tarch/blackfin/mach-bf537/boards/stamp.c:2940: warning: data definition has no type or storage class\n\tarch/blackfin/mach-bf537/boards/stamp.c:2940: warning: type defaults to ‘int’ in declaration of ‘EXPORT_SYMBOL’\n\tarch/blackfin/mach-bf537/boards/stamp.c:2940: warning: parameter names (without types) in function declaration\n\nThis patch fixes it by moving the includes out of the #if protected sections.\n\nSigned-off-by: Lars-Peter Clausen \u003clars@metafoo.de\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Bob Liu \u003clliubbo@gmail.com\u003e\n" }, { "commit": "edb0a6408a84b4f14647770d8a6796afff3e93a9", "tree": "9d33ed07c409534ca9709a39dd25b1e60c3724d3", "parents": [ "7f80850d3f9fd8fda23a317044aef3a6bafab06b" ], "author": { "name": "Sonic Zhang", "email": "sonic.zhang@analog.com", "time": "Mon Aug 01 17:53:21 2011 +0800" }, "committer": { "name": "Bob Liu", "email": "lliubbo@gmail.com", "time": "Mon Nov 14 17:11:25 2011 +0800" }, "message": "Blackfin: add serial TX IRQ in individual platform resource\n\nThe serial TX IRQ is not simply (RX IRQ + 1) on some Blackfin chips,\nso move the values to the platform resources.\n\nSigned-off-by: Sonic Zhang \u003csonic.zhang@analog.com\u003e\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Bob Liu \u003clliubbo@gmail.com\u003e\n" }, { "commit": "7f80850d3f9fd8fda23a317044aef3a6bafab06b", "tree": "4b98a9aa01f1479ab5abfbafcb1a3d9b6e332d34", "parents": [ "b93cd6a0c7352b428ba2b8437b44fff6e76d81d2", "b73b5c493ac001870bd9faf565a61908c82f52d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 14 06:47:04 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 14 06:47:04 2011 -0200" }, "message": "Merge branch \u0027rmobile-fixes-for-linus\u0027 of git://github.com/pmundt/linux-sh\n\n* \u0027rmobile-fixes-for-linus\u0027 of git://github.com/pmundt/linux-sh:\n ARM: mach-shmobile: cpuidle single/global and last_state fixes\n ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h\n ARM: mach-shmobile: move helper macro PORT_xx to sh_pfc.h\n ARM: mach-shmobile: move helper macro PORT_DATA_xx to sh_pfc.h\n ARM: mach-shmobile: ap4evb: remove white space from end of line\n ARM: mach-shmobile: clock-sh7372: remove un-necessary index\n ARM: mach-shmobile: kota2: add comment out separator\n ARM: mach-shmobile: sh73a0: add MMC data pin pull-up\n" }, { "commit": "b93cd6a0c7352b428ba2b8437b44fff6e76d81d2", "tree": "9521480c841f978f8299374a649d4c2ef0b2b22b", "parents": [ "d291ffb3cf4f8f74b73bac77478c619251ee8a9f", "ab4f75cd0a9f5ffdcc3d9fc2b29ca14525215b78" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 14 06:45:30 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 14 06:45:30 2011 -0200" }, "message": "Merge branch \u0027sh-fixes-for-linus\u0027 of git://github.com/pmundt/linux-sh\n\n* \u0027sh-fixes-for-linus\u0027 of git://github.com/pmundt/linux-sh:\n mailmap: Fix up some renesas attributions\n sh: clkfwk: Kill off remaining debugfs cruft.\n drivers: sh: Kill off dead pathname for runtime PM stub.\n drivers: sh: Generalize runtime PM platform stub.\n sh: Wire up process_vm syscalls.\n sh: clkfwk: add clk_rate_mult_range_round()\n serial: sh-sci: Fix up SH-2A SCIF support.\n sh: Fix cached/uncaced address calculation in 29bit mode\n" }, { "commit": "5b34b08996decc53a993287282e2cd42b90e02f7", "tree": "75c94ab24082dbe07dfb63a8ec6537d715a3095a", "parents": [ "eb0b38a5d2c063cd8dc9e44415ce08e30d95f571", "ab8fe93b2fb3ccc9ef46f7d6779b2f1813145d5c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 12 13:29:04 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 12 13:29:04 2011 -0200" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n arm/imx: fix imx6q mmc error when mounting rootfs\n arm/imx: fix AUTO_ZRELADDR selection\n arm/imx: fix the references to ARCH_MX3\n ARM: mx51/53: set pwm clock parent to ipg_perclk\n arm/tegra: enable headphone detection gpio on seaboard\n arm/dt: Fix ventana SDHCI power-gpios\n arm/tegra: Don\u0027t create duplicate gpio and pinmux devices\n ARM: at91: Fix USBA gadget registration\n atmel/spi: fix missing probe\n at91/yl-9200: Fix section mismatch\n at91: vmalloc fix missing AT91_VIRT_BASE define\n ARM: at91: usart: drop static map regs for dbgu\n ARM: picoxcell: add extra temp register to addruart\n ARM: msm: fix compilation flags for MSM_SCM\n arm/mxs: fix mmc device adding for mach-mx28evk\n ARM: mxc: Remove test_for_ltirq\n ARM:i.MX: fix build error in clock-mx51-mx53.c\n ARM:i.MX: fix build error in tzic/avic.c\n ARM: mxc: fix local timer interrupt handling\n msm: boards: Fix fallout from removal of machine_desc in fixup\n" }, { "commit": "8f042aa75afccc45c5b60517f51644bce3f52545", "tree": "bfef56445b0f88e809586a38cb42b6ed4511a393", "parents": [ "e6f1227e8bc8a2ea2d76d09e19c89fa66c2f3a4c", "2690e2148b730c53acb8797821468d0ea1673f25" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 12 00:04:51 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 12 00:04:51 2011 -0200" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (29 commits)\n m68k/mac: Remove mac_irq_{en,dis}able() wrappers\n m68k/irq: Remove obsolete support for user vector interrupt fixups\n m68k/irq: Remove obsolete m68k irq framework\n m68k/q40: Convert Q40/Q60 to genirq\n m68k/sun3: Convert Sun3/3x to genirq\n m68k/sun3: Use the kstat_irqs_cpu() wrapper\n m68k/apollo: Convert Apollo to genirq\n m68k/vme: Convert VME to genirq\n m68k/hp300: Convert HP9000/300 and HP9000/400 to genirq\n m68k/mac: Optimize interrupts using chain handlers\n m68k/mac: Convert Mac to genirq\n m68k/amiga: Optimize interrupts using chain handlers\n m68k/amiga: Convert Amiga to genirq\n m68k/amiga: Refactor amiints.c\n m68k/atari: Remove code and comments about different irq types\n m68k/atari: Convert Atari to genirq\n m68k/irq: Add genirq support\n m68k/irq: Remove obsolete IRQ_FLG_* users\n m68k/irq: Rename {,__}m68k_handle_int()\n m68k/irq: Add m68k_setup_irq_controller()\n ...\n" }, { "commit": "3455229fd6a51978439f9c6256d677b745fad06b", "tree": "44f3441d6063649ded4558ad027f3158487fa9ec", "parents": [ "732783fea085e3464c4ea4940dbb540ac8675e79", "5ccf55dd8177295813b68780f0a3c85e47306be1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 12 00:01:51 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Nov 12 00:01:51 2011 -0200" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/kvm: Fix build failure with HV KVM and CBE\n powerpc/ps3: Fix lv1_gpu_attribute hcall\n powerpc/ps3: Fix PS3 repository build warnings\n powerpc/ps3: irq: Remove IRQF_DISABLED\n powerpc/irq: Remove IRQF_DISABLED\n powerpc/numa: NUMA topology support for PowerNV\n powerpc: Add System RAM to /proc/iomem\n powerpc: Add KVM as module to defconfigs\n powerpc/kvm: Fix build with older toolchains\n powerpc, tqm5200: update tqm5200_defconfig to fit for charon board.\n powerpc/5200: add support for charon board\n" }, { "commit": "732783fea085e3464c4ea4940dbb540ac8675e79", "tree": "abdbb577f34c68646bce8f01228ff572966b51bf", "parents": [ "9f80d8b68fb244bbd69c55aced663b91098544fc", "44656fa03926e7363ab41c565619800a4b3b1322" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 11 23:59:40 2011 -0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 11 23:59:40 2011 -0200" }, "message": "Merge branch \u0027rc-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\n* \u0027rc-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n kbuild: Fix missing system calls check on mips.\n" }, { "commit": "9f80d8b68fb244bbd69c55aced663b91098544fc", "tree": "d1d1cc147b6b005e1113f3e8834a2ab9124d686f", "parents": [ "57e6319dd61d5ca10fe8dd57bcce8c0e2c480799" ], "author": { "name": "William Douglas", "email": "william.douglas@intel.com", "time": "Thu Nov 10 13:50:38 2011 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 11 23:58:58 2011 -0200" }, "message": "bma023: Add SFI translation for this device\n\nThis needed the sfi IRQ 0xFF fix to go in first. It simply plumbs in the\nbma023 driver with the firmware naming of it.\n\nSigned-off-by: William Douglas \u003cwilliam.douglas@intel.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "57e6319dd61d5ca10fe8dd57bcce8c0e2c480799", "tree": "906c40cec199f96f657a1e782fdc4dfcfdc81ade", "parents": [ "f2ee442115c9b6219083c019939a9cc0c9abb2f8" ], "author": { "name": "Feng Tang", "email": "feng.tang@intel.com", "time": "Thu Nov 10 13:23:39 2011 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 11 23:58:58 2011 -0200" }, "message": "vrtc: change its year offset from 1960 to 1972\n\nReal world year equals the value in vrtc YEAR register plus an offset.\nWe used 1960 as the offset to make leap year consistent, but for a\ndevice\u0027s first use, its YEAR register is 0 and the system year will\nbe parsed as 1960 which is not a valid UNIX time and will cause many\napplications to fail mysteriously. So we use 1972 instead to fix this\nissue.\n\nUpdated patch which adds a sanity check suggested by Mathias\n\nThis isn\u0027t a change in behaviour for systems, because 1972 is the one we\nactually use. It\u0027s the old version in upstream which is out of sync with\nall devices.\n\nSigned-off-by: Feng Tang \u003cfeng.tang@intel.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f2ee442115c9b6219083c019939a9cc0c9abb2f8", "tree": "9c1abfeb28f309e0722a5ea27341e3ed24873d6d", "parents": [ "87618e0003dbca0f51f1ef52fa4199bd65212f41" ], "author": { "name": "Zhang Rui", "email": "rui.zhang@intel.com", "time": "Thu Nov 10 13:21:10 2011 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Nov 11 23:58:58 2011 -0200" }, "message": "ce4100: fix a build error\n\nFix a build error. CE4100 with no serial errors because the alternate\nfunction is only a prototype not a null function as intended.\n\nSigned-off-by: Zhang Rui \u003crui.zhang@intel.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ab8fe93b2fb3ccc9ef46f7d6779b2f1813145d5c", "tree": "2aa6e9429aee92f8007b34018cfa1a33a118119b", "parents": [ "09d37c4ba9b20d6b694bfd7339850ba9a826fb13", "0836b5cdd23d573bf7ec57f73ff774b3ad660bf4" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Nov 11 10:34:20 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Nov 11 10:34:20 2011 -0800" }, "message": "Merge branch \u0027picoxcell-fixes\u0027 of git://github.com/jamieiles/linux-2.6-ji into fixes\n" }, { "commit": "09d37c4ba9b20d6b694bfd7339850ba9a826fb13", "tree": "2ee2fdf15e72e450bbfccd9733205b265da0538f", "parents": [ "3cdc3acc62527ab9544c2820b5e5da482a105240", "f750ba9b8db2a926c315ccfa9e95d12fe4590a22" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Nov 11 08:53:46 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Nov 11 08:53:46 2011 -0800" }, "message": "Merge branch \u0027imx-fixes-for-arnd\u0027 of git://git.pengutronix.de/git/imx/linux-2.6 into fixes\n" }, { "commit": "f750ba9b8db2a926c315ccfa9e95d12fe4590a22", "tree": "1bdd2ce107b6a39b4797dab955a003e7a9c1e0ba", "parents": [ "1b929995ebc0f00cc56ddc14cf75a875f4d565d6" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Thu Nov 10 16:39:32 2011 +0800" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Fri Nov 11 16:53:35 2011 +0100" }, "message": "arm/imx: fix imx6q mmc error when mounting rootfs\n\nThe following error is seen in some case when mounting rootfs from\nSD/MMC cards.\n\n Waiting for root device /dev/mmcblk0p1...\n mmc1: host does not support reading read-only switch. assuming write-enable.\n mmc1: new high speed SDHC card at address b368\n mmcblk0: mmc1:b368 SDC 3.74 GiB\n mmcblk0: p1\n mmc1: Timeout waiting for hardware interrupt.\n mmcblk0: error -110 transferring data, sector 3678224, nr 40, cmd response 0x900, card status 0xc00\n end_request: I/O error, dev mmcblk0, sector 3678225\n Buffer I/O error on device mmcblk0p1, logical block 458754\n lost page write due to I/O error on mmcblk0p1\n\nThis patch fixes the problem by lowering the usdhc clock and correcting\nwatermark configuration.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nCc: Chris Ball \u003ccjb@laptop.org\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "1b929995ebc0f00cc56ddc14cf75a875f4d565d6", "tree": "74e26f7d0119f7a6cad255cb02cac6740f2d2674", "parents": [ "59198b6cb2e81a6583db8559d6af9d471e3edb2b" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Thu Nov 10 16:39:31 2011 +0800" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Fri Nov 11 16:53:34 2011 +0100" }, "message": "arm/imx: fix AUTO_ZRELADDR selection\n\nThe AUTO_ZRELADDR selection for ARCH_IMX_V4_V5 and ARCH_MX5 should\nreally be mutually exclusive to ZBOOT_ROM just like what ARCH_IMX_V6_V7\ndoes.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "59198b6cb2e81a6583db8559d6af9d471e3edb2b", "tree": "9c606125f58740f9f318ca113472d0c1a8898ed4", "parents": [ "f1dfaef54f4c6b86197ab521c815f2810d08663e" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Fri Nov 11 15:37:14 2011 +0800" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Fri Nov 11 16:53:33 2011 +0100" }, "message": "arm/imx: fix the references to ARCH_MX3\n\nThe config symbol ARCH_MX3 has been removed by commit \u0027a89cf59\narm/imx: merge i.MX3 and i.MX6\u0027, and it should not be referenced\nany more.\n\nThe patch also change ARCH_MX* to SOC_IMX* for other platforms.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "f1dfaef54f4c6b86197ab521c815f2810d08663e", "tree": "bb41c87685106d1c3e5d85346de0d54c7e227f4d", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Richard Zhao", "email": "richard.zhao@linaro.org", "time": "Tue Nov 08 09:59:34 2011 +0800" }, "committer": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Fri Nov 11 16:53:33 2011 +0100" }, "message": "ARM: mx51/53: set pwm clock parent to ipg_perclk\n\nSigned-off-by: Richard Zhao \u003crichard.zhao@linaro.org\u003e\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\n" }, { "commit": "b73b5c493ac001870bd9faf565a61908c82f52d8", "tree": "e3f370c108793f726d3a9b6118baf4979d63f08d", "parents": [ "9b49139b34a66907662e0be8efe79316dc63f8e0" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Fri Nov 11 14:01:30 2011 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:49:28 2011 +0900" }, "message": "ARM: mach-shmobile: cpuidle single/global and last_state fixes\n\nThe following commits break cpuidle on SH-Mobile ARM:\n\n46bcfad cpuidle: Single/Global registration of idle states\ne978aa7 cpuidle: Move dev-\u003elast_residency update to driver enter routine; remove dev-\u003elast_state\n\nThis patch remedies these issues by up-porting the SH-Mobile\ncode to fit with the above introduced framework changes.\n\nIt is worth noting that the new code becomes significantly cleaner,\nso these framework changes are very welcome. At the same time this\nbreakage could probably have been avoided by grepping for \"last_state\"\nand \"cpuidle_register_driver\".\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "9b49139b34a66907662e0be8efe79316dc63f8e0", "tree": "545a6b85d86536e9be40cf80857f9c55de50eef5", "parents": [ "972c3fb69cd1cd8d549b8a06ce42611eab405c20" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Thu Nov 10 18:45:43 2011 -0800" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:45:35 2011 +0900" }, "message": "ARM: mach-shmobile: move helper macro PORTCR to sh_pfc.h\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "972c3fb69cd1cd8d549b8a06ce42611eab405c20", "tree": "958d994516ba847b88f747524a127190d2b9784d", "parents": [ "bd8d0cbaa00883c84741b98264f8318cdade9c71" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Thu Nov 10 18:45:33 2011 -0800" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:45:33 2011 +0900" }, "message": "ARM: mach-shmobile: move helper macro PORT_xx to sh_pfc.h\n\nThis patch moves PORT_xx helper macro to sh_pfc.h,\nand it expects CPU_ALL_PORT() macro for each CPU\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "bd8d0cbaa00883c84741b98264f8318cdade9c71", "tree": "4b603206fa6329779b3b56afe28ecac252f891d9", "parents": [ "8e6a46757ad11a16354b9037e17d6135d9a4bb87" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Thu Nov 10 18:45:23 2011 -0800" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:45:30 2011 +0900" }, "message": "ARM: mach-shmobile: move helper macro PORT_DATA_xx to sh_pfc.h\n\nThis patch move PORT_DATA_xx helper macro to sh_pfc.h.\nand pfc-sh7372.c used it\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "8e6a46757ad11a16354b9037e17d6135d9a4bb87", "tree": "06d8d5815828535bd5c4968660813ff4a61a31c1", "parents": [ "91d19cd8d589c6a25ed502435a575f026f33d09f" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Thu Nov 10 18:45:12 2011 -0800" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:45:28 2011 +0900" }, "message": "ARM: mach-shmobile: ap4evb: remove white space from end of line\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "91d19cd8d589c6a25ed502435a575f026f33d09f", "tree": "a36003405010d83cdb84e2a0301d222d781fa907", "parents": [ "c5e7bcd99dd9926b69f5d6cab5230485169f1ada" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Thu Nov 10 18:45:02 2011 -0800" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:45:25 2011 +0900" }, "message": "ARM: mach-shmobile: clock-sh7372: remove un-necessary index\n\nit is not necessary to have sh7372_xxxx index on static variable\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "c5e7bcd99dd9926b69f5d6cab5230485169f1ada", "tree": "c1fb4639a0881e289b4da55a6cee2588ddcd7882", "parents": [ "052008edf31383f866b2ec1b12604fc411c2d986" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Thu Nov 10 18:44:43 2011 -0800" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:45:23 2011 +0900" }, "message": "ARM: mach-shmobile: kota2: add comment out separator\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "052008edf31383f866b2ec1b12604fc411c2d986", "tree": "262be2ba488fb3e52689f42c313eba390409c191", "parents": [ "5e442a493fc59fa536c76db1fff5b49ca36a88c5" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Thu Nov 10 18:44:24 2011 -0800" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:45:21 2011 +0900" }, "message": "ARM: mach-shmobile: sh73a0: add MMC data pin pull-up\n\nThis patch adds MMC data pin pull-up option for pfc-sh73a0.c,\nand select it on ag5evm board.\nThe MMC read/write will be error without this patch.\n\nCc: Takashi YOSHII \u003ctakashi.yoshii.zj@renesas.com\u003e\nTested-by: Simon Horman \u003chorms@verge.net.au\u003e\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "37bef8f989ed85cdc6cf6fb9c1b1c096179b0708", "tree": "bf90e7eaa25d3fb36a8cb2f88e75f49727e8c04a", "parents": [ "149c370f3e06a6b43bf1d922ccd1f969c59c7c77", "d03299ee6020b0cc64fc4180162fb2e8795394e1", "79e7066415a8b12adbeacc41b3dc44423534b8be" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:16:25 2011 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 16:16:25 2011 +0900" }, "message": "Merge branches \u0027sh/pm-runtime\u0027 and \u0027common/clkfwk\u0027 into sh-fixes-for-linus\n" }, { "commit": "750a7eee7395492960a7aeb3a3a1aa74158ec326", "tree": "d45a73dd3acc59493d8d0fdd8f9e912ad4bb4422", "parents": [ "5e442a493fc59fa536c76db1fff5b49ca36a88c5" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 15:41:50 2011 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 15:41:50 2011 +0900" }, "message": "drivers: sh: Generalize runtime PM platform stub.\n\nThe runtime PM platform support stub in use by ARM-based SH/R-Mobile\nplatforms contains nothing that\u0027s specifically ARM-related and instead of\nwholly generic to anything using the clock framework.\n\nThe recent runtime PM changes interact rather badly with the lazy\ndisabling of clocks late in the boot process through the clock framework,\nleading to situations where the runtime suspend/resume paths are entered\nwithout a clock being actively driven due to having been lazily gated\noff.\n\nIn order to correct this we can trivially tie in the aforementioned stub\nas a general fallback for all SH platforms that don\u0027t presently have\ntheir own runtime PM implementations (the corner case being SH-based\nSH-Mobile platforms, which have their own stub through the hwblk API --\nwhich in turn has bitrotted and will be subsequently adapted to use the\nsame stub as everyone else), regardless of whether the platforms choose\nto define power domains of their own or not.\n\nThis fixes up regressions for clock framework users who also build in\nruntime PM support without any specific power domains of their own, which\nwas previously causing the serial console to be lost when warring with\nlazy clock disabling.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "149c370f3e06a6b43bf1d922ccd1f969c59c7c77", "tree": "cccb240dac1fcd51732af1a761f052dc79e34f49", "parents": [ "78b425faafb1d36d7759a7d799e1c60671670532" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Nov 07 14:40:45 2011 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Nov 11 10:58:16 2011 +0900" }, "message": "sh: Wire up process_vm syscalls.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "3cdc3acc62527ab9544c2820b5e5da482a105240", "tree": "72e204d29562c5233517d5b84cbe72dd3e5d213b", "parents": [ "3c52b2be1804ed553df8df47213b58fedc93c5ab", "eca55f4d9c1d918c2aa95fb8a73a34e2ba8a1b11" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 17:02:13 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 17:02:13 2011 -0800" }, "message": "Merge branch \u0027msm-fix\u0027 of git://codeaurora.org/quic/kernel/davidb/linux-msm into fixes\n" }, { "commit": "3c52b2be1804ed553df8df47213b58fedc93c5ab", "tree": "a0186a1012a49ae81bf6b69f4fdc00fb6a854003", "parents": [ "c30c8f9f167cb9b40ca9e755c0d32087a2d415ff", "686448d7a253f9db836f4f44c6624461570e5026" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 13:38:52 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 13:38:52 2011 -0800" }, "message": "Merge branch \u0027for-3.2/fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra into fixes\n" }, { "commit": "686448d7a253f9db836f4f44c6624461570e5026", "tree": "79647ef6d8ceaf6f9dc8640fc3081ccea64cb971", "parents": [ "c406eeb3aa7007ed252290f2f11c8383ca95a177" ], "author": { "name": "Yufeng Shen", "email": "miletus@chromium.org", "time": "Fri Oct 28 06:27:06 2011 +0000" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 11:31:16 2011 -0800" }, "message": "arm/tegra: enable headphone detection gpio on seaboard\n\nEnable the headphone detection gpio on tegra platform.\n\nSigned-off-by: Yufeng Shen \u003cmiletus@chromium.org\u003e\nAcked-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "c406eeb3aa7007ed252290f2f11c8383ca95a177", "tree": "7546800d552e183198220a8e782d7058f1988e60", "parents": [ "4b91b6fb8646843d96628ae9512d8c4cd33ece2d" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Wed Oct 19 06:53:57 2011 +0000" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 11:24:37 2011 -0800" }, "message": "arm/dt: Fix ventana SDHCI power-gpios\n\nVentana uses the same SDHCI GPIOs as Seaboard; PI6 (70) is the power GPIO\nfor the SD port, and there is no power GPIO for the MMC chip.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "4b91b6fb8646843d96628ae9512d8c4cd33ece2d", "tree": "889a473dffe9c96fcb28c092dca94704746f784d", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Stephen Warren", "email": "swarren@nvidia.com", "time": "Tue Oct 25 02:01:27 2011 +0000" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 10:38:56 2011 -0800" }, "message": "arm/tegra: Don\u0027t create duplicate gpio and pinmux devices\n\n*_pinmux_init() register the GPIO and pinmux devices so that they\u0027re ready\nbefore any other device needs them.\n\n*_pinmux_init() are also called by board-dt.c in order to set up the GPIO\nand pinmux configurations. In this case, if we register the devices, they\nend up being probed once due to this registration, and a second time due\nto a device-tree node (or vice-versa). The second probe fails since the\nmemory regions are already requested. Besides, we don\u0027t actually want the\nduplicated devices.\n\nTo avoid this duplicate registration, modify *_pinmux_init() to check\nwhether it\u0027s running on a DT machine. If not, register the pinmux devices.\nIf so, don\u0027t register them.\n\nFinally, modify board-dt.c to call the *_pinmux_init() after all devices have\nbeen instantiated from device-tree. This allows the GPIO and pinmux devices\nto be instantiated and initialized before calling functions to configure the\nhardware.\n\nThis has one disadvantage: The pinmux and GPIO initialization now happens\nafter /all/ devices are instantiated, rather than after just gpio and\npinmux but before anything else. So the correct HW configuration is not\nin place when e.g. the SD/MMC device is probed. Long-term, this should be\nsolved by doing both:\n\na) Initializing the HW state from DT nodes during GPIO and pinmux device\n probe.\nb) Using the deferred driver probe mechanism, so that drivers can defer\n their probe until after the gpio and pinmux drivers have probed.\n\nv2: s/int is_dt/bool is_dt/\nv3: Use of_machine_is_compatible inside *_pinmux_init() rather than passing\nan explicit parameter into the function from outside.\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "c30c8f9f167cb9b40ca9e755c0d32087a2d415ff", "tree": "d10c7ac7dc73f0325ba4c7a2fc00fe84dbee4596", "parents": [ "45ff6fa1adf81f72e4815f0a993a644467b7b185", "dd0b3825495a2e7a8cd6cf0ec077618c008ac7c4" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 08:59:35 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 08:59:35 2011 -0800" }, "message": "Merge branch \u0027at91-fixes\u0027 of git://github.com/at91linux/linux-at91 into fixes\n" }, { "commit": "45ff6fa1adf81f72e4815f0a993a644467b7b185", "tree": "33832a3f9eb2d03340958578a065561488562f17", "parents": [ "22d3832373e4965f11240dc8d7a0c512bd873437", "15394cad2747ea2d98fc88ccb464973e173cd2f8" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 08:59:30 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 08:59:30 2011 -0800" }, "message": "Merge branch \u0027imx/compile-fixes\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes\n" }, { "commit": "22d3832373e4965f11240dc8d7a0c512bd873437", "tree": "7a5d6707a241b869604d20693486a0e64613bdc9", "parents": [ "19e0bafc36abd84a5b4d7c7745b78a6f4626e944", "e94e05eae9a56e4fad93f18a63ae90e7ff02b576" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 08:59:26 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Nov 09 08:59:26 2011 -0800" }, "message": "Merge branch \u0027mxs/fixes\u0027 of git://git.linaro.org/people/shawnguo/linux-2.6 into fixes\n" }, { "commit": "dd0b3825495a2e7a8cd6cf0ec077618c008ac7c4", "tree": "1e286492d723c3859bda3520da1aaee412383b4c", "parents": [ "1cb201af626eedf0ff78cc1712c731b463994c60" ], "author": { "name": "Jochen Friedrich", "email": "jochen@scram.de", "time": "Tue Oct 25 20:51:06 2011 +0200" }, "committer": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Wed Nov 09 23:02:12 2011 +0800" }, "message": "ARM: at91: Fix USBA gadget registration\n\nSince 193ab2a6070039e7ee2b9b9bebea754a7c52fd1b, various AT91 boards don\u0027t\nregister USBA adapters anymore due to depending on a now non-existing\nsymbol. Fix the symbol name.\n\nSigned-off-by: Jochen Friedrich \u003cjochen@scram.de\u003e\nAcked-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nCC: stable@kernel.org\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\n" }, { "commit": "b2eb5309fbc680406d6bf3b182178f0cfaf951fb", "tree": "b465117d4b0fdc8340308a773ead51c15e9457c9", "parents": [ "30458edf667b77012573e649fced3cf5c01efe82" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Mon Sep 19 19:26:52 2011 +0800" }, "committer": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Wed Nov 09 23:02:11 2011 +0800" }, "message": "at91/yl-9200: Fix section mismatch\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\n" }, { "commit": "30458edf667b77012573e649fced3cf5c01efe82", "tree": "cf1c79d5ab783764f40f35d713d9a6ffb7a060d1", "parents": [ "b3c41f4c18de9aa90315dd0d197f8485b00e3cc5" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Wed Nov 02 15:02:43 2011 +0800" }, "committer": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Wed Nov 09 23:00:58 2011 +0800" }, "message": "at91: vmalloc fix missing AT91_VIRT_BASE define\n\nVMALLOC_END is defined in terms of AT91_VIRT_BASE but this needs\nmach/hardware.h for it\u0027s definition.\n\nIn file included from arch/arm/mach-at91/board-usb-a926x.c:26:0:\ninclude/linux/mm.h: In function \u0027is_vmalloc_addr\u0027:\ninclude/linux/mm.h:305:41: error: \u0027AT91_VIRT_BASE\u0027 undeclared (first use in this function)\ninclude/linux/mm.h:305:41: note: each undeclared identifier is reported only once for each function it appears in\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\n" }, { "commit": "b3c41f4c18de9aa90315dd0d197f8485b00e3cc5", "tree": "423b97895768890e79ceb97808b13f8d2349a11d", "parents": [ "19e0bafc36abd84a5b4d7c7745b78a6f4626e944" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Sun Sep 18 09:56:35 2011 +0800" }, "committer": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Wed Nov 09 22:50:35 2011 +0800" }, "message": "ARM: at91: usart: drop static map regs for dbgu\n\nIn commit fb149f9e28354 we introduce ioremap support for static map_io, we do\nnot need this register entry anymore.\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n" }, { "commit": "44656fa03926e7363ab41c565619800a4b3b1322", "tree": "6254d9842af479a00302dfb9fb1ed9b1e6dc1e7b", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Tue Nov 08 10:20:10 2011 -0800" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Wed Nov 09 14:37:44 2011 +0100" }, "message": "kbuild: Fix missing system calls check on mips.\n\nCommit 5f7efb4 (Kbuild: append missing-syscalls to the default target\nlist) broke MIPS build.\n\nReported-tested-and-acked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "0836b5cdd23d573bf7ec57f73ff774b3ad660bf4", "tree": "516323e7c5e788a69ea342272e14010daac55c0b", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Fri Nov 04 01:13:20 2011 +0000" }, "committer": { "name": "Jamie Iles", "email": "jamie@jamieiles.com", "time": "Wed Nov 09 09:51:42 2011 +0000" }, "message": "ARM: picoxcell: add extra temp register to addruart\n\n639da5ee3 (ARM: add an extra temp register to the low level debugging\naddruart macro) didn\u0027t include picoxcell as it hadn\u0027t been merged at the\ntime. Fix up the compile breakage by adding the extra temp parameter.\n\nSigned-off-by: Jamie Iles \u003cjamie@jamieiles.com\u003e\n" }, { "commit": "2690e2148b730c53acb8797821468d0ea1673f25", "tree": "b6ba2acc8108ab4ecf437392078e44faa9c54b17", "parents": [ "f30a6484f1bcb410d0af0c24f34b8e3d92682a05" ], "author": { "name": "Finn Thain", "email": "fthain@telegraphics.com.au", "time": "Sun Sep 11 23:40:50 2011 +1000" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:52 2011 +0100" }, "message": "m68k/mac: Remove mac_irq_{en,dis}able() wrappers\n\nSigned-off-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "f30a6484f1bcb410d0af0c24f34b8e3d92682a05", "tree": "18c01955ef5260d5f4b0412961e68dd1c7a4938f", "parents": [ "d890d73995257b4e10cdd7d55bad80e34a71ba22" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Sep 11 11:54:50 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:52 2011 +0100" }, "message": "m68k/irq: Remove obsolete support for user vector interrupt fixups\n\nIt was used on Apollo only, before its conversion to genirq.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "d890d73995257b4e10cdd7d55bad80e34a71ba22", "tree": "3e4ee85a2d8d126e1570c7ea47178a2a8a627849", "parents": [ "a03010ed9b399fdbc28ac8836e0a6d4b15403f9f" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Sep 11 11:28:04 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:52 2011 +0100" }, "message": "m68k/irq: Remove obsolete m68k irq framework\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "a03010ed9b399fdbc28ac8836e0a6d4b15403f9f", "tree": "ea82d48efa6e8af9d8f759c77e004da29dd5c558", "parents": [ "dda7535912255015ecf7264c1d6691a09f8ba487" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu Aug 18 14:47:16 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:52 2011 +0100" }, "message": "m68k/q40: Convert Q40/Q60 to genirq\n\nq40_irq_handler() must be kept to translate ISA IRQs to the range 1-15.\nq40_probe_irq_o{ff,n}() become unused.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Richard Zidlicky \u003crz@linux-m68k.org\u003e\n" }, { "commit": "dda7535912255015ecf7264c1d6691a09f8ba487", "tree": "6c7b6aa45b63374bd83793c4082bfddc96258e3e", "parents": [ "4045513286462a3c12140fac0559f09bcb5e7f10" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu Aug 18 14:46:46 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:52 2011 +0100" }, "message": "m68k/sun3: Convert Sun3/3x to genirq\n\nReplace the custom irq handler that masks the irq and calls do_IRQ(), and\nthe unmasking in the individual handlers, by handle_level_irq().\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Sam Creasey \u003csammy@sammy.net\u003e\n" }, { "commit": "4045513286462a3c12140fac0559f09bcb5e7f10", "tree": "97daeaff812562cf7e8314f23fda7d2bbac100d6", "parents": [ "bc7485acd09405d9544783d773ee040af4a5c861" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu Aug 18 22:46:01 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:51 2011 +0100" }, "message": "m68k/sun3: Use the kstat_irqs_cpu() wrapper\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Sam Creasey \u003csammy@sammy.net\u003e\n" }, { "commit": "bc7485acd09405d9544783d773ee040af4a5c861", "tree": "8b5af62f51483e99a79a97c11a48f06b08a93b35", "parents": [ "6c490c4da4642ec9e7569c8b50a98a22c71ad184" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu Aug 18 14:45:57 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:51 2011 +0100" }, "message": "m68k/apollo: Convert Apollo to genirq\n\nReplace the custom user vector interrupt handler that calls do_IRQ() and\ndoes an EOI by handle_fasteoi_irq().\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Peter De Schrijver \u003cp2@debian.org\u003e\n" }, { "commit": "6c490c4da4642ec9e7569c8b50a98a22c71ad184", "tree": "7b0fa954dbfc6c5f00bdd8eda015c3539f08a341", "parents": [ "efaf6d28fc768bfa373f7377c4b0484cbdf9f67e" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Aug 13 21:11:00 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:51 2011 +0100" }, "message": "m68k/vme: Convert VME to genirq\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Richard Hirst \u003crhirst@parisc-linux.org\u003e\n" }, { "commit": "efaf6d28fc768bfa373f7377c4b0484cbdf9f67e", "tree": "0c7c399fc1777b9caef9c840ed578a6d84aa85d4", "parents": [ "9145db564eae98134de8eb8d64b47d7177eccfdd" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Aug 13 21:02:22 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:51 2011 +0100" }, "message": "m68k/hp300: Convert HP9000/300 and HP9000/400 to genirq\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Philip Blundell \u003cphilb@gnu.org\u003e\n" }, { "commit": "9145db564eae98134de8eb8d64b47d7177eccfdd", "tree": "7d0e25514abba33b6082f5a13963442cf390a058", "parents": [ "ddc7fd25d09678f8252c0321ef4b66e8451abe7d" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Aug 10 12:48:29 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:50 2011 +0100" }, "message": "m68k/mac: Optimize interrupts using chain handlers\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "ddc7fd25d09678f8252c0321ef4b66e8451abe7d", "tree": "e95db89cd1801787baa2c0cc1dad2f1de64d0f49", "parents": [ "fb1b646aa3bcae2f8211136a6b40228c7c9d236c" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Jul 13 21:48:30 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:50 2011 +0100" }, "message": "m68k/mac: Convert Mac to genirq\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "fb1b646aa3bcae2f8211136a6b40228c7c9d236c", "tree": "206b07fb3fc5e8a3114258929bebfa7118746536", "parents": [ "978ef7e6d0e02083e4a62ab4411922bdeffa36a4" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Jun 01 11:49:18 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:50 2011 +0100" }, "message": "m68k/amiga: Optimize interrupts using chain handlers\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "978ef7e6d0e02083e4a62ab4411922bdeffa36a4", "tree": "71d6caf424e5e6fc26293673e2c80afbde85732f", "parents": [ "92b1bd5f1aa88ce4760c02814bfcbb58ad521984" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue May 31 22:08:28 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:50 2011 +0100" }, "message": "m68k/amiga: Convert Amiga to genirq\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "92b1bd5f1aa88ce4760c02814bfcbb58ad521984", "tree": "b643113beec42f4b5698959d0f52105d1e52b13a", "parents": [ "34971bad3a1511db7b76eeb2337819967a135075" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue May 31 11:11:01 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:49 2011 +0100" }, "message": "m68k/amiga: Refactor amiints.c\n\n - Remove filename in comments,\n - Reorder functions so we no longer need forward declarations.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "34971bad3a1511db7b76eeb2337819967a135075", "tree": "01968f8edbc78a19e2b75088946da566d5fc1d57", "parents": [ "e59629ddc6eddbd00e81b4afb814583cfcc4706d" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu Aug 18 19:36:30 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:49 2011 +0100" }, "message": "m68k/atari: Remove code and comments about different irq types\n\nThis code was obsoleted during the irq restructuring in 2006.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "e59629ddc6eddbd00e81b4afb814583cfcc4706d", "tree": "e7788f47189f6eaa0964fcb18e74fcf1aed7b5ef", "parents": [ "4936f63cb790e265eb30a1e1630bb90bd6af0e7a" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Fri Apr 29 23:35:21 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:49 2011 +0100" }, "message": "m68k/atari: Convert Atari to genirq\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n[v1] Acked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "4936f63cb790e265eb30a1e1630bb90bd6af0e7a", "tree": "9cd5da60334940b4d6b190a10262f02823b06aa5", "parents": [ "5a2394534b160ce18f9a705cf9de40e77648f8a2" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu Apr 21 22:50:52 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:49 2011 +0100" }, "message": "m68k/irq: Add genirq support\n\nDisabled on all platforms for now\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n[v1] Acked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "5a2394534b160ce18f9a705cf9de40e77648f8a2", "tree": "38d679c3633b4d2154ec68dbcc17ba2c207afb83", "parents": [ "1425df87c25b15400c9f26d57821bcfe01286b2a" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Jul 13 22:33:13 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:48 2011 +0100" }, "message": "m68k/irq: Remove obsolete IRQ_FLG_* users\n\nThe m68k core irq code stopped honoring these flags during the irq\nrestructuring in 2006.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "1425df87c25b15400c9f26d57821bcfe01286b2a", "tree": "845f69013de5ebb1b9ebfe4746c096664a505567", "parents": [ "edb347256c44366888debb4f9e8477ac700a9026" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Fri Jul 01 20:39:19 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:48 2011 +0100" }, "message": "m68k/irq: Rename {,__}m68k_handle_int()\n\n - Rename m68k_handle_int() to generic_handle_irq(), and drop the unneeded\n asmlinkage,\n - Rename __m68k_handle_int() to do_IRQ().\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "edb347256c44366888debb4f9e8477ac700a9026", "tree": "ba8a08d33f17d5679e9cbae45f73cca85c2f61c6", "parents": [ "40a72c8f711bdf8ae3e4f945261ced5432dcac4d" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Jun 01 11:15:21 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:48 2011 +0100" }, "message": "m68k/irq: Add m68k_setup_irq_controller()\n\nThis is a wrapper around m68k_setup_irq_chip() that discards its dummy\nsecond parameter, to ease the future transition to genirq.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "40a72c8f711bdf8ae3e4f945261ced5432dcac4d", "tree": "7db16daf6e9c25b01dcb9b0e20e3588589de969a", "parents": [ "13d6da35813babaa1bc8c6799b2666191911100e" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Fri May 27 22:33:41 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:48 2011 +0100" }, "message": "m68k/irq: Extract irq_set_chip()\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "13d6da35813babaa1bc8c6799b2666191911100e", "tree": "d668b575d852086a2371ba10e73d88d8ca902681", "parents": [ "e8abf5e73cdb6c034d35ccba1f63a4801cd3dec5" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Apr 19 20:10:53 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:47 2011 +0100" }, "message": "m68k/irq: Rename setup_irq() to m68k_setup_irq() and make it static\n\nIt has nothing to do with the standard one in \u003clinux/irq.h\u003e\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "e8abf5e73cdb6c034d35ccba1f63a4801cd3dec5", "tree": "170de6cb1d0048757b2ab55b2a0bfeb87d274fd4", "parents": [ "6549d537922da6a6893e9bc1be9c2b89db663719" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Apr 17 22:53:04 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:47 2011 +0100" }, "message": "m68k/irq: Switch irq_chip methods to \"struct irq_data *data\"\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "6549d537922da6a6893e9bc1be9c2b89db663719", "tree": "1e34fac1634b45a1a7543f6f9246544eef54dc1b", "parents": [ "0dde595be678c06e7de27c98f45403088f1b126a" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Apr 17 21:59:23 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:47 2011 +0100" }, "message": "m68k/irq: Rename irq_node to irq_data\n\nMake it more similar to the genirq version:\n - Add an irq field\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "0dde595be678c06e7de27c98f45403088f1b126a", "tree": "d7e5b4ea2ad47c3a86d401927cdeadb2747c3100", "parents": [ "c288bf2533e57174b90b07860c4391bcd1ea269c" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Apr 17 21:39:08 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:47 2011 +0100" }, "message": "m68k/irq: Kill irq_node_t typedef, always use struct irq_node\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "c288bf2533e57174b90b07860c4391bcd1ea269c", "tree": "91fa6ef91d6653f491f41ff97c4da5e28dfd62fe", "parents": [ "3ec7215e5d1a714ef65069a1d0999a31e4930bb7" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Apr 13 22:31:28 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:47 2011 +0100" }, "message": "m68k/irq: Rename irq_controller to irq_chip\n\nMake it more similar to the genirq version:\n - Remove lock (unused as we don\u0027t do SMP anyway),\n - Prepend methods with irq_,\n - Make irq_startup() return unsigned int.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "59433a59b073b88cb32efd03af8ac9b13d56f4cf", "tree": "53e0708be5f97e7dd408024e445bbd911a857bd4", "parents": [ "24ed6ddd9cbf084f1a2dfa3ef66287e5277002e1" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Fri Oct 28 22:37:21 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:46 2011 +0100" }, "message": "m68k: Revive lost DIO bus config option\n\ncommit 0e152d80507b75c00aac60f2ffc586360687cd52 (\"m68k: reorganize Kconfig\noptions to improve mmu/non-mmu selections\") accidentally dropped the DIO\nbus config option. Re-add it to the \"Bus support\" section.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "24ed6ddd9cbf084f1a2dfa3ef66287e5277002e1", "tree": "2b6c787149fce0a069cb5385f92a13033fda10ae", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Oct 25 21:14:10 2011 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Nov 08 22:35:46 2011 +0100" }, "message": "m68k: Revive lost ARAnyM config options\n\ncommit 0e152d80507b75c00aac60f2ffc586360687cd52 (\"m68k: reorganize Kconfig\noptions to improve mmu/non-mmu selections\") accidentally dropped the ARAnyM\nconfig options. Re-add them to the \"Platform devices\" section.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "6ccce2b32900a8a6f481036e0cbbfe174742352c", "tree": "b7f214d6d72f2b8c51b2f0587736fc0fa9240cb5", "parents": [ "dccefb3729c8c2b17e45c68cdc0d575f2473a5f0", "51ce185af0f71b65c23ed719f72d0241895a61da" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 12:50:02 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Nov 08 12:50:02 2011 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:\n sparc: Hook up process_vm_{readv,writev} syscalls.\n" }, { "commit": "eca55f4d9c1d918c2aa95fb8a73a34e2ba8a1b11", "tree": "72f0aa283270bd13d34a928a75d37a1bcb618f47", "parents": [ "47a6770ac6cd0d28f14dd9e1b17705abe6f05e41" ], "author": { "name": "Marc Zyngier", "email": "marc.zyngier@arm.com", "time": "Tue Nov 08 13:07:36 2011 +0000" }, "committer": { "name": "David Brown", "email": "davidb@codeaurora.org", "time": "Tue Nov 08 08:58:28 2011 -0800" }, "message": "ARM: msm: fix compilation flags for MSM_SCM\n\nCONFIG_MSM_SCM uses the smc instruction, which with some\ntoolchains requires a \".arch_extension\" directive.\n\nCc: David Brown \u003cdavidb@codeaurora.org\u003e\nSigned-off-by: Marc Zyngier \u003cmarc.zyngier@arm.com\u003e\nSigned-off-by: David Brown \u003cdavidb@codeaurora.org\u003e\n" }, { "commit": "e94e05eae9a56e4fad93f18a63ae90e7ff02b576", "tree": "1cfb0612f7b71f3bba92328ba81e916884be125e", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue Nov 08 21:57:59 2011 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Tue Nov 08 21:57:59 2011 +0800" }, "message": "arm/mxs: fix mmc device adding for mach-mx28evk\n\nThe merge commit \"526b264 Merge branch \u0027imx/cleanup\u0027 into imx/devel\"\nleft a duplicated mx28_add_mxs_mmc() call, which causes the problem\nbelow during boot.\n\n kobject_add_internal failed for mxs-mmc.1 with -EEXIST, don\u0027t try\n to register things with the same name in the same directory.\n\nThe patch removes this leftover and also change mmc0 adding to align\nwith mmc1.\n\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "5ccf55dd8177295813b68780f0a3c85e47306be1", "tree": "400a9a8bb2ad79f7697206f4c6a22d263c37a624", "parents": [ "f81f5e14de1203b9389aad383aa3f7b2a221efdd" ], "author": { "name": "Alexander Graf", "email": "agraf@suse.de", "time": "Tue Sep 13 04:15:31 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Nov 08 15:34:04 2011 +1100" }, "message": "powerpc/kvm: Fix build failure with HV KVM and CBE\n\nWhen running with HV KVM and CBE config options enabled, I get\nbuild failures like the following:\n\n arch/powerpc/kernel/head_64.o: In function `cbe_system_error_hv\u0027:\n (.text+0x1228): undefined reference to `do_kvm_0x1202\u0027\n arch/powerpc/kernel/head_64.o: In function `cbe_maintenance_hv\u0027:\n (.text+0x1628): undefined reference to `do_kvm_0x1602\u0027\n arch/powerpc/kernel/head_64.o: In function `cbe_thermal_hv\u0027:\n (.text+0x1828): undefined reference to `do_kvm_0x1802\u0027\n\nThis is because we jump to a KVM handler when HV is enabled, but we\nonly generate the handler with PR KVM mode.\n\nSigned-off-by: Alexander Graf \u003cagraf@suse.de\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "f81f5e14de1203b9389aad383aa3f7b2a221efdd", "tree": "5f5b17f22eb6f1a3be65d16ff2b9f68b9a9e745f", "parents": [ "9fce85f7ff94f1a877c15ad3d6ffbaed4b5cd1a6", "6ecc07b966977bb0855db1fa52d233c39fb3cafb" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Nov 08 14:53:55 2011 +1100" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Nov 08 14:53:55 2011 +1100" }, "message": "Merge remote-tracking branch \u0027agust/next\u0027 into merge\n" }, { "commit": "9fce85f7ff94f1a877c15ad3d6ffbaed4b5cd1a6", "tree": "aa5a394541af2e034bf89f4a1219a7761bc79ca7", "parents": [ "5233e26ebb90242e3691c185ddda02dc83649e7d" ], "author": { "name": "Geoff Levand", "email": "geoff@infradead.org", "time": "Wed Oct 12 08:42:13 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Nov 08 14:51:59 2011 +1100" }, "message": "powerpc/ps3: Fix lv1_gpu_attribute hcall\n\nThe lv1_gpu_attribute hcall takes three, not five input\narguments. Adjust the lv1 hcall table and all calls.\n\nSigned-off-by: Geoff Levand \u003cgeoff@infradead.org\u003e\nCC: Takashi Iwai \u003ctiwai@suse.de\u003e\nAcked-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "5233e26ebb90242e3691c185ddda02dc83649e7d", "tree": "fc6e4c8c23611e7821772f837e6ebef767ab5702", "parents": [ "6ea741a13690da9dbbac76175db8e313b0c4b817" ], "author": { "name": "Geoff Levand", "email": "geoff@infradead.org", "time": "Wed Oct 12 08:39:15 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Nov 08 14:51:58 2011 +1100" }, "message": "powerpc/ps3: Fix PS3 repository build warnings\n\nFix uninitialized variable warnings in build of repository.c\n\nSigned-off-by: Geoff Levand \u003cgeoffrey.levand@am.sony.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "a3a9f3b47d12b5f6dfc9c7ed9d7b193d77812195", "tree": "df6ec9ab1e4a9d28a23b17b1b0b8ce98073f1c29", "parents": [ "1c8ee73395af762726e9eb628636d3b763618c60" ], "author": { "name": "Yong Zhang", "email": "yong.zhang0@gmail.com", "time": "Fri Oct 21 23:56:27 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Nov 08 14:51:46 2011 +1100" }, "message": "powerpc/irq: Remove IRQF_DISABLED\n\nSince commit [e58aa3d2: genirq: Run irq handlers with interrupts disabled],\nWe run all interrupt handlers with interrupts disabled\nand we even check and yell when an interrupt handler\nreturns with interrupts enabled (see commit [b738a50a:\ngenirq: Warn when handler enables interrupts]).\n\nSo now this flag is a NOOP and can be removed.\n\nSigned-off-by: Yong Zhang \u003cyong.zhang0@gmail.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Geoff Levand \u003cgeoff@infradead.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "1c8ee73395af762726e9eb628636d3b763618c60", "tree": "5742e4d091f0d9c479b6d2e14a5fcb5df7d02e00", "parents": [ "c40dd2f76644016ca7677545fc846ec2470d70a1" ], "author": { "name": "Dipankar Sarma", "email": "dipankar@in.ibm.com", "time": "Fri Oct 28 04:25:32 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Nov 08 14:51:46 2011 +1100" }, "message": "powerpc/numa: NUMA topology support for PowerNV\n\nThis patch adds support for numa topology on powernv platforms running\nOPAL formware. It checks for the type of platform at run time and\nsets the affinity form correctly so that NUMA topology can be discovered\ncorrectly.\n\nSigned-off-by: Dipankar Sarma \u003cdipankar@in.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "c40dd2f76644016ca7677545fc846ec2470d70a1", "tree": "0437aff6ea8cc7656c79f8c5391ca1b31a9ca403", "parents": [ "88cf11b4cca8ee0044d0a10ce100d8c0012b2c5e" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Wed Nov 02 14:56:12 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Nov 08 14:51:46 2011 +1100" }, "message": "powerpc: Add System RAM to /proc/iomem\n\nWe\u0027ve resisted adding System RAM to /proc/iomem because it is\nthe wrong place for it. Unfortunately we continue to find tools\nthat rely on this behaviour so give up and add it in.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "88cf11b4cca8ee0044d0a10ce100d8c0012b2c5e", "tree": "3416d354876a354749dabf0591c329f9a3b9dd6f", "parents": [ "ad61d64e263228a418fe25809a23d5107cf778a0" ], "author": { "name": "Michael Neuling", "email": "mikey@neuling.org", "time": "Mon Nov 07 14:49:13 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Nov 08 14:51:03 2011 +1100" }, "message": "powerpc: Add KVM as module to defconfigs\n\nAdd HV mode KVM to Book3 server 64bit defconfigs as a module.\n\nDoesn\u0027t add much to the size:\n text\t data\t bss\t dec\t hex\tfilename\n8244109\t4686767\t 994000\t13924876\t d47a0c\tvmlinux.vanilla\n8256092 4691607 994128 13941827 d4bc43 vmlinux.kvm\n\nThis should enable more testing of this configuration.\n\nSigned-off-by: Michael Neuling \u003cmikey@neuling.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "ad61d64e263228a418fe25809a23d5107cf778a0", "tree": "5a3aba9b333d4f8195d04e316a791fc03e93996f", "parents": [ "1ea6b8f48918282bdca0b32a34095504ee65bab5" ], "author": { "name": "Nishanth Aravamudan", "email": "nacc@us.ibm.com", "time": "Mon Nov 07 13:36:56 2011 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Nov 08 14:51:03 2011 +1100" }, "message": "powerpc/kvm: Fix build with older toolchains\n\nFix KVM build for older toolchains (found with .powerpc64-unknown-linux-gnu-gcc\n(crosstool-NG-1.8.1) 4.3.2):\n\n AS arch/powerpc/kvm/book3s_hv_rmhandlers.o\narch/powerpc/kvm/book3s_hv_rmhandlers.S: Assembler messages:\narch/powerpc/kvm/book3s_hv_rmhandlers.S:1388: Error: Unrecognized opcode: `popcntw\u0027\nmake[1]: *** [arch/powerpc/kvm/book3s_hv_rmhandlers.o] Error 1\nmake: *** [_module_arch/powerpc/kvm] Error 2\n\nSigned-off-by: Nishanth Aravamudan \u003cnacc@us.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "075cb105cb6dcda8a585989ebd4a71f0b3c33f3e", "tree": "288b8ceb07f2f9780c572ca8c15b9d3096928ba0", "parents": [ "a3fbbde70a0cec017f2431e8f8de208708c76acc", "d30cc16c8e48368e0518f4975a78711e53e14a0f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:14:26 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 16:14:26 2011 -0800" }, "message": "Merge branch \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap\n\n* \u0027fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (31 commits)\n ARM: OMAP: Fix export.h or module.h includes\n ARM: OMAP: omap_device: Include linux/export.h\n ARM: OMAP2: Fix H4 matrix keyboard warning\n ARM: OMAP1: Remove unused omap-alsa.h\n ARM: OMAP1: Fix warnings about enabling 32 KiHz timer\n ARM: OMAP2+: timer: Remove omap_device_pm_latency\n ARM: OMAP2+: clock data: Remove redundant timer clkdev\n ARM: OMAP: Devkit8000: Remove double omap_mux_init_gpio\n ARM: OMAP: usb: musb: OMAP: Delete unused function\n MAINTAINERS: Update linux-omap git repository\n ARM: OMAP: change get_context_loss_count ret value to int\n ARM: OMAP4: hsmmc: configure SDMMC1_DR0 properly\n ARM: OMAP4: hsmmc: Fix Pbias configuration on regulator OFF\n ARM: OMAP3: hwmod: fix variant registration and remove SmartReflex from common list\n ARM: OMAP: I2C: Fix omap_register_i2c_bus() return value on success\n ARM: OMAP: dmtimer: Include linux/module.h\n ARM: OMAP2+: l3-noc: Include linux/module.h\n ARM: OMAP2+: devices: Fixes for McPDM\n ARM: OMAP: Fix errors and warnings when building for one board\n ARM: OMAP3: PM: restrict erratum i443 handling to OMAP3430 only\n ...\n" }, { "commit": "d30cc16c8e48368e0518f4975a78711e53e14a0f", "tree": "26b57f7ab5a963cc3d6c57dff6951bd930875583", "parents": [ "41eb2d813f558900884e240c2f723e36c7bd151f", "a1bcc1dcef8451b4291ea2a1b2677cb194102952" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:23 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:23 2011 -0800" }, "message": "Merge branch \u0027fixes-modulesplit\u0027 into fixes\n" }, { "commit": "a1bcc1dcef8451b4291ea2a1b2677cb194102952", "tree": "156edbbee0f46bc89d7fb323673edd2a88ba0c1a", "parents": [ "5558141556d20f2bea7a664d70a867b8f64ca38d" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "message": "ARM: OMAP: Fix export.h or module.h includes\n\nCommit 32aaeffbd4a7457bf2f7448b33b5946ff2a960eb (Merge branch\n\u0027modsplit-Oct31_2011\u0027...) caused some build errors. Fix these\nand make sure we always have export.h or module.h included\nfor MODULE_ and EXPORT_SYMBOL users:\n\n$ grep -rl ^MODULE_ arch/arm/*omap*/*.c | xargs \\\n grep -L linux/module.h\n arch/arm/mach-omap2/dsp.c\n arch/arm/mach-omap2/mailbox.c\n arch/arm/mach-omap2/omap-iommu.c\n arch/arm/mach-omap2/smartreflex.c\n\nAlso check we either have export.h or module.h included\nfor the files exporting symbols:\n\n$ grep -rl EXPORT_SYMBOL arch/arm/*omap*/*.c | xargs \\\n grep -L linux/export.h | xargs grep -L linux/module.h\n\nCc: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "5558141556d20f2bea7a664d70a867b8f64ca38d", "tree": "2d5b5e5c3b2dbfe3471fc172a9e813d178c3fc0f", "parents": [ "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Mon Nov 07 12:27:10 2011 -0800" }, "message": "ARM: OMAP: omap_device: Include linux/export.h\n\nInclude linux/export.h to fix below build warning:\n\n CC arch/arm/plat-omap/omap_device.o\narch/arm/plat-omap/omap_device.c:1055: warning: data definition has no type or storage class\narch/arm/plat-omap/omap_device.c:1055: warning: type defaults to \u0027int\u0027 in declaration of \u0027EXPORT_SYMBOL\u0027\narch/arm/plat-omap/omap_device.c:1055: warning: parameter names (without types) in function declaration\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "0c073e35550879fd133bc3fe509df5b88da51278", "tree": "7fdbfc7d5cb6a8c3c53defc06387dee6785120fc", "parents": [ "3c00303206c3a1ccd86579efdc90bc35f140962e" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Sat Oct 08 23:24:48 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:28:58 2011 -0800" }, "message": "arm: Add export.h to recently added files for EXPORT_SYMBOL\n\nThese files didn\u0027t exist at the time of the module.h split, and\nso were not fixed by the commits on that baseline. Since they use\nthe EXPORT_SYMBOL and/or THIS_MODULE macros, they will need the\nnew export.h file included that provides them.\n\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3c00303206c3a1ccd86579efdc90bc35f140962e", "tree": "66170c84b5ddaeb102aea3530517a26657b6ea29", "parents": [ "83dbb15e9cd78a3619e3db36777e2f81d09b2914", "efb90582c575084723cc14302c1300cb26c7e01f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:13:52 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 10:13:52 2011 -0800" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:\n cpuidle: Single/Global registration of idle states\n cpuidle: Split cpuidle_state structure and move per-cpu statistics fields\n cpuidle: Remove CPUIDLE_FLAG_IGNORE and dev-\u003eprepare()\n cpuidle: Move dev-\u003elast_residency update to driver enter routine; remove dev-\u003elast_state\n ACPI: Fix CONFIG_ACPI_DOCK\u003dn compiler warning\n ACPI: Export FADT pm_profile integer value to userspace\n thermal: Prevent polling from happening during system suspend\n ACPI: Drop ACPI_NO_HARDWARE_INIT\n ACPI atomicio: Convert width in bits to bytes in __acpi_ioremap_fast()\n PNPACPI: Simplify disabled resource registration\n ACPI: Fix possible recursive locking in hwregs.c\n ACPI: use kstrdup()\n mrst pmu: update comment\n tools/power turbostat: less verbose debugging\n" }, { "commit": "e0d65113a70f1dc514e625cc4e7a7485a4bf72df", "tree": "7320a130dc304623f5cf4b5dd8f67fb1776225ca", "parents": [ "cf5e15fbd72c13977720aa15b7b7e00e1d8fd8f2", "48e546b7f281f251893baa40769581fd15f085fb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Nov 07 09:11:16 2011 -0800" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (226 commits)\n mtd: tests: annotate as DANGEROUS in Kconfig\n mtd: tests: don\u0027t use mtd0 as a default\n mtd: clean up usage of MTD_DOCPROBE_ADDRESS\n jffs2: add compr\u003dlzo and compr\u003dzlib options\n jffs2: implement mount option parsing and compression overriding\n mtd: nand: initialize ops.mode\n mtd: provide an alias for the redboot module name\n mtd: m25p80: don\u0027t probe device which has status of \u0027disabled\u0027\n mtd: nand_h1900 never worked\n mtd: Add DiskOnChip G3 support\n mtd: m25p80: add EON flash EN25Q32B into spi flash id table\n mtd: mark block device queue as non-rotational\n mtd: r852: make r852_pm_ops static\n mtd: m25p80: add support for at25df321a spi data flash\n mtd: mxc_nand: preset_v1_v2: unlock all NAND flash blocks\n mtd: nand: switch `check_pattern()\u0027 to standard `memcmp()\u0027\n mtd: nand: invalidate cache on unaligned reads\n mtd: nand: do not scan bad blocks with NAND_BBT_NO_OOB set\n mtd: nand: wait to set BBT version\n mtd: nand: scrub BBT on ECC errors\n ...\n\nFix up trivial conflicts:\n - arch/arm/mach-at91/board-usb-a9260.c\n\tMerged into board-usb-a926x.c\n - drivers/mtd/maps/lantiq-flash.c\n\tadd_mtd_partitions -\u003e mtd_device_register vs changed to use\n\tmtd_device_parse_register.\n" }, { "commit": "b32fc0a0629bf5894b35f33554c118aacfd0d1e2", "tree": "5d6aaa9a35b7fa63681adab91da3b3dec5276f84", "parents": [ "403299a8515c56db58454c57712f4dc96d6c1fde", "97ce2c88f9ad42e3c60a9beb9fca87abf3639faa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:20:46 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:20:46 2011 -0800" }, "message": "Merge branch \u0027upstream/jump-label-noearly\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen\n\n* \u0027upstream/jump-label-noearly\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:\n jump-label: initialize jump-label subsystem much earlier\n x86/jump_label: add arch_jump_label_transform_static()\n s390/jump-label: add arch_jump_label_transform_static()\n jump_label: add arch_jump_label_transform_static() to optimise non-live code updates\n sparc/jump_label: drop arch_jump_label_text_poke_early()\n x86/jump_label: drop arch_jump_label_text_poke_early()\n jump_label: if a key has already been initialized, don\u0027t nop it out\n stop_machine: make stop_machine safe and efficient to call early\n jump_label: use proper atomic_t initializer\n\nConflicts:\n - arch/x86/kernel/jump_label.c\n\tAdded __init_or_module to arch_jump_label_text_poke_early vs\n\tremoval of that function entirely\n - kernel/stop_machine.c\n\tsame patch (\"stop_machine: make stop_machine safe and efficient\n\tto call early\") merged twice, with whitespace fix in one version\n" }, { "commit": "403299a8515c56db58454c57712f4dc96d6c1fde", "tree": "1dbcb33c606b03adc7d7fe128ecb3f0c3404ffef", "parents": [ "daedd8708fe7707ed651bb1c83162f25c48a947c", "fdb9eb9f155bfc0f8dc2fc88f90448b30c78ad97" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:15:05 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 20:15:05 2011 -0800" }, "message": "Merge branch \u0027upstream/xen-settime\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen\n\n* \u0027upstream/xen-settime\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:\n xen/dom0: set wallclock time in Xen\n xen: add dom0_op hypercall\n xen/acpi: Domain0 acpi parser related platform hypercall\n" }, { "commit": "32aaeffbd4a7457bf2f7448b33b5946ff2a960eb", "tree": "faf7ad871d87176423ff9ed1d1ba4d9c688fc23f", "parents": [ "208bca0860406d16398145ddd950036a737c3c9d", "67b84999b1a8b1af5625b1eabe92146c5eb42932" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 19:44:47 2011 -0800" }, "message": "Merge branch \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\n* \u0027modsplit-Oct31_2011\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)\n Revert \"tracing: Include module.h in define_trace.h\"\n irq: don\u0027t put module.h into irq.h for tracking irqgen modules.\n bluetooth: macroize two small inlines to avoid module.h\n ip_vs.h: fix implicit use of module_get/module_put from module.h\n nf_conntrack.h: fix up fallout from implicit moduleparam.h presence\n include: replace linux/module.h with \"struct module\" wherever possible\n include: convert various register fcns to macros to avoid include chaining\n crypto.h: remove unused crypto_tfm_alg_modname() inline\n uwb.h: fix implicit use of asm/page.h for PAGE_SIZE\n pm_runtime.h: explicitly requires notifier.h\n linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h\n miscdevice.h: fix up implicit use of lists and types\n stop_machine.h: fix implicit use of smp.h for smp_processor_id\n of: fix implicit use of errno.h in include/linux/of.h\n of_platform.h: delete needless include \u003clinux/module.h\u003e\n acpi: remove module.h include from platform/aclinux.h\n miscdevice.h: delete unnecessary inclusion of module.h\n device_cgroup.h: delete needless include \u003clinux/module.h\u003e\n net: sch_generic remove redundant use of \u003clinux/module.h\u003e\n net: inet_timewait_sock doesnt need \u003clinux/module.h\u003e\n ...\n\nFix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in\n - drivers/media/dvb/frontends/dibx000_common.c\n - drivers/media/video/{mt9m111.c,ov6650.c}\n - drivers/mfd/ab3550-core.c\n - include/linux/dmaengine.h\n" }, { "commit": "efb90582c575084723cc14302c1300cb26c7e01f", "tree": "25af70a2c40e7e404215acd9aadfa42e71e716ae", "parents": [ "e751b759e82629798c4a5e4a87eb3a30c0510154", "46bcfad7a819bd17ac4e831b04405152d59784ab", "22f4521d664030e417f41953e922f61c65f2e189", "aeae1e92daec5a38b40ad12598b97501b675a381" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:14:50 2011 -0500" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 22:14:50 2011 -0500" }, "message": "Merge branches \u0027acpi\u0027, \u0027idle\u0027, \u0027mrst-pmu\u0027 and \u0027pm-tools\u0027 into next\n" }, { "commit": "02ebbbd481635fd3ce7018e5bb19c18c0f1e4561", "tree": "f07caea3ac9cb50492977a2f7b1d29bbce6e6a3a", "parents": [ "addd8c92cf55bba578b8a56e0f717a0a74b31008", "536ec4f8d13433126f948d6e90821f811a4ebdf8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:54:53 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:54:53 2011 -0800" }, "message": "Merge branch \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild\n\n* \u0027trivial\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:\n scsi: drop unused Kconfig symbol\n pci: drop unused Kconfig symbol\n stmmac: drop unused Kconfig symbol\n x86: drop unused Kconfig symbol\n powerpc: drop unused Kconfig symbols\n powerpc: 40x: drop unused Kconfig symbol\n mips: drop unused Kconfig symbols\n openrisc: drop unused Kconfig symbols\n arm: at91: drop unused Kconfig symbol\n samples: drop unused Kconfig symbol\n m32r: drop unused Kconfig symbol\n score: drop unused Kconfig symbols\n sh: drop unused Kconfig symbol\n um: drop unused Kconfig symbol\n sparc: drop unused Kconfig symbol\n alpha: drop unused Kconfig symbol\n\nFix up trivial conflict in drivers/net/ethernet/stmicro/stmmac/Kconfig\nas per Michal: the STMMAC_DUAL_MAC config variable is still unused and\nshould be deleted.\n" }, { "commit": "06d381484fe8fb1ba2996c22e89595a273e3634c", "tree": "0d39c57cb8c501341ab8ed1d740f076b0b8c0bd0", "parents": [ "5d5a8d2d9d6cca979efe4fe1552d787fdc542603", "c9d6369978411f690513994e6e53e2e6410874a4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:31:36 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Nov 06 18:31:36 2011 -0800" }, "message": "Merge branch \u0027stable/vmalloc-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\n* \u0027stable/vmalloc-3.2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n net: xen-netback: use API provided by xenbus module to map rings\n block: xen-blkback: use API provided by xenbus module to map rings\n xen: use generic functions instead of xen_{alloc, free}_vm_area()\n" }, { "commit": "46bcfad7a819bd17ac4e831b04405152d59784ab", "tree": "20041e788154d103edff2699f88d4a30320e3ee2", "parents": [ "4202735e8ab6ecfb0381631a0d0b58fefe0bd4e2" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Fri Oct 28 16:20:42 2011 +0530" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 21:13:58 2011 -0500" }, "message": "cpuidle: Single/Global registration of idle states\n\nThis patch makes the cpuidle_states structure global (single copy)\ninstead of per-cpu. The statistics needed on per-cpu basis\nby the governor are kept per-cpu. This simplifies the cpuidle\nsubsystem as state registration is done by single cpu only.\nHaving single copy of cpuidle_states saves memory. Rare case\nof asymmetric C-states can be handled within the cpuidle driver\nand architectures such as POWER do not have asymmetric C-states.\n\nHaving single/global registration of all the idle states,\ndynamic C-state transitions on x86 are handled by\nthe boot cpu. Here, the boot cpu would disable all the devices,\nre-populate the states and later enable all the devices,\nirrespective of the cpu that would receive the notification first.\n\nReference:\nhttps://lkml.org/lkml/2011/4/25/83\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Trinabh Gupta \u003cg.trinabh@gmail.com\u003e\nTested-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nAcked-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "4202735e8ab6ecfb0381631a0d0b58fefe0bd4e2", "tree": "189e5aab466995128c5a9d5a2a4075a5db530674", "parents": [ "b25edc42bfb9602f0503474b2c94701d5536ce60" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Fri Oct 28 16:20:33 2011 +0530" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 21:13:49 2011 -0500" }, "message": "cpuidle: Split cpuidle_state structure and move per-cpu statistics fields\n\nThis is the first step towards global registration of cpuidle\nstates. The statistics used primarily by the governor are per-cpu\nand have to be split from rest of the fields inside cpuidle_state,\nwhich would be made global i.e. single copy. The driver_data field\nis also per-cpu and moved.\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Trinabh Gupta \u003cg.trinabh@gmail.com\u003e\nTested-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nAcked-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "e978aa7d7d57d04eb5f88a7507c4fb98577def77", "tree": "d6d6dfe1dba4d4749c7eafe348351aa499c3c5eb", "parents": [ "c3b92c8787367a8bb53d57d9789b558f1295cc96" ], "author": { "name": "Deepthi Dharwar", "email": "deepthi@linux.vnet.ibm.com", "time": "Fri Oct 28 16:20:09 2011 +0530" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun Nov 06 21:13:30 2011 -0500" }, "message": "cpuidle: Move dev-\u003elast_residency update to driver enter routine; remove dev-\u003elast_state\n\nCpuidle governor only suggests the state to enter using the\ngovernor-\u003eselect() interface, but allows the low level driver to\noverride the recommended state. The actual entered state\nmay be different because of software or hardware demotion. Software\ndemotion is done by the back-end cpuidle driver and can be accounted\ncorrectly. Current cpuidle code uses last_state field to capture the\nactual state entered and based on that updates the statistics for the\nstate entered.\n\nIdeally the driver enter routine should update the counters,\nand it should return the state actually entered rather than the time\nspent there. The generic cpuidle code should simply handle where\nthe counters live in the sysfs namespace, not updating the counters.\n\nReference:\nhttps://lkml.org/lkml/2011/3/25/52\n\nSigned-off-by: Deepthi Dharwar \u003cdeepthi@linux.vnet.ibm.com\u003e\nSigned-off-by: Trinabh Gupta \u003cg.trinabh@gmail.com\u003e\nTested-by: Jean Pihet \u003cj-pihet@ti.com\u003e\nReviewed-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nAcked-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" } ], "next": "0e4c9dc2f2e0fb6d3838eba34382fc6d2d1c381c" }