)]}' { "log": [ { "commit": "90a5d5af74f6570af063fb6bff33c6b2f8361bbc", "tree": "3165cde652d1c8cf3c8817b34ba880fc35fa6c96", "parents": [ "b413d48aa70605701c0b395b2e350ca15f5d643a" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Tue Jan 10 15:07:10 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:41 2012 -0800" }, "message": "mm-tracepoint: fix documentation and examples\n\nWe renamed the page-free mm tracepoints.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b413d48aa70605701c0b395b2e350ca15f5d643a", "tree": "6aa777c589eedfb9dc498f375d553e561e203506", "parents": [ "da066ad3570b88e7dee82e76a06ee9a7adffcf0d" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Tue Jan 10 15:07:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 10 16:30:41 2012 -0800" }, "message": "mm-tracepoint: rename page-free events\n\nRename mm_page_free_direct into mm_page_free and mm_pagevec_free into\nmm_page_free_batched\n\nSince v2.6.33-5426-gc475dab the kernel triggers mm_page_free_direct for\nall freed pages, not only for directly freed. So, let\u0027s name it properly.\n For pages freed via page-list we also trigger mm_page_free_batched event.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b3c37522928b5452588fc202eaa0f11f6e339256", "tree": "37bfe21d9977b15271903d1a4b304289a232e364", "parents": [ "2ac9d7aaccbd598b5bd19ac40761b723bb675442", "6d0a5636fba5a3f82ec80ab124dd4748344549c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:59 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:59 2012 -0800" }, "message": "Merge tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\npower management changes for omap and imx\n\nA significant part of the changes for these two platforms went into\npower management, so they are split out into a separate branch.\n\n* tag \u0027pm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (65 commits)\n ARM: imx6: remove __CPUINIT annotation from v7_invalidate_l1\n ARM: imx6: fix v7_invalidate_l1 by adding I-Cache invalidation\n ARM: imx6q: resume PL310 only when CACHE_L2X0 defined\n ARM: imx6q: build pm code only when CONFIG_PM selected\n ARM: mx5: use generic irq chip pm interface for pm functions on\n ARM: omap: pass minimal SoC/board data for UART from dt\n arm/dts: Add minimal device tree support for omap2420 and omap2430\n omap-serial: Add minimal device tree support\n omap-serial: Use default clock speed (48Mhz) if not specified\n omap-serial: Get rid of all pdev-\u003eid usage\n ARM: OMAP2+: hwmod: Add a new flag to handle hwmods left enabled at init\n ARM: OMAP4: PRM: use PRCM interrupt handler\n ARM: OMAP3: pm: use prcm chain handler\n ARM: OMAP: hwmod: add support for selecting mpu_irq for each wakeup pad\n ARM: OMAP2+: mux: add support for PAD wakeup interrupts\n ARM: OMAP: PRCM: add suspend prepare / finish support\n ARM: OMAP: PRCM: add support for chain interrupt handler\n ARM: OMAP3/4: PRM: add functions to read pending IRQs, PRM barrier\n ARM: OMAP2+: hwmod: Add API to enable IO ring wakeup\n ARM: OMAP2+: mux: add wakeup-capable hwmod mux entries to dynamic list\n ...\n" }, { "commit": "2ac9d7aaccbd598b5bd19ac40761b723bb675442", "tree": "09132a44e33798aaa5e80f10bf025b510015cab3", "parents": [ "5ede3ceb7b2c2843e153a1803edbdc8c56655950", "dcf7ec5ee62a78123057a1e286c88ca739717409" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:39:22 2012 -0800" }, "message": "Merge tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nDriver specific changes\n\nAgain, a lot of platforms have changes in here: pxa, samsung, omap,\nat91, imx, ...\n\n* tag \u0027drivers\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)\n ARM: sa1100: clean up of the clock support\n ARM: pxa: add dummy clock for sa1100-rtc\n RTC: sa1100: support sa1100, pxa and mmp soc families\n RTC: sa1100: remove redundant code of setting alarm\n RTC: sa1100: Clean out ost register\n Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()\n pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()\n ARM: EXYNOS: Modified files for SPI consolidation work\n ARM: S5P64X0: Enable SDHCI support\n ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names\n ARM: S5P64X0: Add HSMMC setup for host Controller\n ARM: EXYNOS: Add USB OHCI support to ORIGEN board\n USB: Add Samsung Exynos OHCI diver\n ARM: EXYNOS: Add USB OHCI support to SMDKV310 board\n ARM: EXYNOS: Add USB OHCI device\n net: macb: fix build break with !CONFIG_OF\n i2c: tegra: Support DVC controller in device tree\n i2c: tegra: Add __devinit/exit to probe/remove\n net/at91_ether: use gpio_is_valid for phy IRQ line\n ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT\n ...\n" }, { "commit": "6d889d03ab1417645e76e129834f76204bae37c0", "tree": "577e37b5597b27f6de25bbbc634a0f17ccfb15f7", "parents": [ "7400c12eb069df781894a94dfa5c865f3fe3e2d4", "421b759b86eb8a914cbbd11f6d09a74f411762c6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:37:41 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:37:41 2012 -0800" }, "message": "Merge tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nBoard-level changes\n\nThis adds and extends support for specific boards on a number of\nARM platforms: omap, imx, samsung, tegra, ...\n\n* tag \u0027boards\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)\n Enable 32 bit flash support for iMX21ADS board\n ARM: mx31pdk: Add MC13783 RTC support\n iomux-mx25: configuration to support CSPI3 on CSI pins\n MX1:apf9328: Add i2c support\n mioa701: add newly available DoC G3 chip\n arm/tegra: remove __initdata annotation from pinmux tables\n arm/tegra: Use bus notifiers to trigger pinmux setup\n arm/tegra: Refactor board-*-pinmux.c to share code\n arm/tegra: Fix mistake in Trimslice\u0027s pinmux\n arm/tegra: Rework Seaboard-vs-Ventana pinmux table\n arm/tegra: Remove useless entries from ventana_pinmux[]\n arm/tegra: PCIe: Remove include of mach/pinmux.h\n arm/tegra: Harmony PCIe: Don\u0027t touch pinmux\n arm/tegra: Add AUXDATA for tegra-pinmux and tegra-gpio\n arm/tegra: Split Seaboard GPIO table to allow for Ventana\n ARM: imx6q: generate imx6q dtb files\n arm/imx6q: Rename Sabreauto to Armadillo2\n arm/imx6q-sabrelite: add enet phy ksz9021rn fixup\n arm/imx6: add imx6q sabrelite board support\n dts/imx: rename uart labels to consistent with hw spec\n ...\n" }, { "commit": "dfc1ebe76663d582a01c9dc572395cf8086d01de", "tree": "54a5ac91214a90f82c27b6e38099a4470837729e", "parents": [ "acc952c1f373bf3f66cc7a10680eee1762bed40b", "b001befe58691ef3627458cd814e8cee7f845c5f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:28:38 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 14:28:38 2012 -0800" }, "message": "Merge tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nDevice tree conversions for samsung and tegra\n\nBoth platforms had some initial device tree support, but this adds\nmuch more to actually make it usable.\n\n* tag \u0027dt\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)\n ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN\n ARM: EXYNOS: Add Exynos4 device tree enabled board file\n rtc: rtc-s3c: Add device tree support\n input: samsung-keypad: Add device tree support\n ARM: S5PV210: Modify platform data for pl330 driver\n ARM: S5PC100: Modify platform data for pl330 driver\n ARM: S5P64x0: Modify platform data for pl330 driver\n ARM: EXYNOS: Add a alias for pdma clocks\n ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build\n ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers\n DMA: PL330: Add device tree support\n ARM: EXYNOS: Modify platform data for pl330 driver\n DMA: PL330: Infer transfer direction from transfer request instead of platform data\n DMA: PL330: move filter function into driver\n serial: samsung: Fix build for non-Exynos4210 devices\n serial: samsung: add device tree support\n serial: samsung: merge probe() function from all SoC specific extensions\n serial: samsung: merge all SoC specific port reset functions\n ARM: SAMSUNG: register uart clocks to clock lookup list\n serial: samsung: remove all uses of get_clksrc and set_clksrc\n ...\n\nFix up fairly trivial conflicts in arch/arm/mach-s3c2440/clock.c and\ndrivers/tty/serial/Kconfig both due to just adding code close to\nchanges.\n" }, { "commit": "db0c2bf69aa095d4a6de7b1145f29fe9a7c0f6a3", "tree": "8f38957c01b18edddd44d49ecc3beeac08a20b4e", "parents": [ "ac69e0928054ff29a5049902fb477f9c7605c773", "0d19ea866562e46989412a0676412fa0983c9ce7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:59:24 2012 -0800" }, "message": "Merge branch \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\n* \u0027for-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (21 commits)\n cgroup: fix to allow mounting a hierarchy by name\n cgroup: move assignement out of condition in cgroup_attach_proc()\n cgroup: Remove task_lock() from cgroup_post_fork()\n cgroup: add sparse annotation to cgroup_iter_start() and cgroup_iter_end()\n cgroup: mark cgroup_rmdir_waitq and cgroup_attach_proc() as static\n cgroup: only need to check oldcgrp\u003d\u003dnewgrp once\n cgroup: remove redundant get/put of task struct\n cgroup: remove redundant get/put of old css_set from migrate\n cgroup: Remove unnecessary task_lock before fetching css_set on migration\n cgroup: Drop task_lock(parent) on cgroup_fork()\n cgroups: remove redundant get/put of css_set from css_set_check_fetched()\n resource cgroups: remove bogus cast\n cgroup: kill subsys-\u003ecan_attach_task(), pre_attach() and attach_task()\n cgroup, cpuset: don\u0027t use ss-\u003epre_attach()\n cgroup: don\u0027t use subsys-\u003ecan_attach_task() or -\u003eattach_task()\n cgroup: introduce cgroup_taskset and use it in subsys-\u003ecan_attach(), cancel_attach() and attach()\n cgroup: improve old cgroup handling in cgroup_attach_proc()\n cgroup: always lock threadgroup during migration\n threadgroup: extend threadgroup_lock() to cover exit and exec\n threadgroup: rename signal-\u003ethreadgroup_fork_lock to -\u003egroup_rwsem\n ...\n\nFix up conflict in kernel/cgroup.c due to commit e0197aae59e5: \"cgroups:\nfix a css_set not found bug in cgroup_attach_proc\" that already\nmentioned that the bug is fixed (differently) in Tejun\u0027s cgroup\npatchset. This one, in other words.\n" }, { "commit": "12e55508921865aefdd80fd17afe70c191afbd1b", "tree": "476b3226fd9602b36bed0934409959bdd24a7eb5", "parents": [ "55b81e6f2795484ea8edf5805c95c007cacfa736", "4d447c9a6ebc0142d320f075c5bac6d202a79fd4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:18:17 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:18:17 2012 -0800" }, "message": "Merge branch \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\n* \u0027staging-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (466 commits)\n net/hyperv: Add support for jumbo frame up to 64KB\n net/hyperv: Add NETVSP protocol version negotiation\n net/hyperv: Remove unnecessary kmap_atomic in netvsc driver\n staging/rtl8192e: Register against lib80211\n staging/rtl8192e: Convert to lib80211_crypt_info\n staging/rtl8192e: Convert to lib80211_crypt_data and lib80211_crypt_ops\n staging/rtl8192e: Add lib80211.h to rtllib.h\n staging/mei: add watchdog device registration wrappers\n drm/omap: GEM, deal with cache\n staging: vt6656: int.c, int.h: Change return of function to void\n staging: usbip: removed unused definitions from header\n staging: usbip: removed dead code from receive function\n staging:iio: Drop {mark,unmark}_in_use callbacks\n staging:iio: Drop buffer mark_param_change callback\n staging:iio: Drop the unused buffer enable() and is_enabled() callbacks\n staging:iio: Drop buffer busy flag\n staging:iio: Make sure a device is only opened once at a time\n staging:iio: Disallow modifying buffer size when buffer is enabled\n staging:iio: Disallow changing scan elements in all buffered modes\n staging:iio: Use iio_buffer_enabled instead of open coding it\n ...\n\nFix up conflict in drivers/staging/iio/adc/ad799x_core.c (removal of\nmodule_init due to using module_i2c_driver() helper, next to removal of\nMODULE_ALIAS due to using MODULE_DEVICE_TABLE instead).\n" }, { "commit": "55b81e6f2795484ea8edf5805c95c007cacfa736", "tree": "c3724975107857fcc03b5dd649c462e4f72397be", "parents": [ "5983faf942f260023e547f3c5f38c1033c35cc9b", "08e87d0d773dc9ca5faf4c3306e238ed0ea129b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:47 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:47 2012 -0800" }, "message": "Merge branch \u0027usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\n* \u0027usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (232 commits)\n USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c\n xhci: Clean up 32-bit build warnings.\n USB: update documentation for usbmon\n usb: usb-storage doesn\u0027t support dynamic id currently, the patch disables the feature to fix an oops\n drivers/usb/class/cdc-acm.c: clear dangling pointer\n drivers/usb/dwc3/dwc3-pci.c: introduce missing kfree\n drivers/usb/host/isp1760-if.c: introduce missing kfree\n usb: option: add ZD Incorporated HSPA modem\n usb: ch9: fix up MaxStreams helper\n USB: usb-skeleton.c: cleanup open_count\n USB: usb-skeleton.c: fix open/disconnect race\n xhci: Properly handle COMP_2ND_BW_ERR\n USB: remove dead code from suspend/resume path\n USB: add quirk for another camera\n drivers: usb: wusbcore: Fix dependency for USB_WUSB\n xhci: Better debugging for critical host errors.\n xhci: Be less verbose during URB cancellation.\n xhci: Remove debugging about ring structure allocation.\n xhci: Remove debugging about toggling cycle bits.\n xhci: Remove debugging for individual transfers.\n ...\n" }, { "commit": "5983faf942f260023e547f3c5f38c1033c35cc9b", "tree": "f54ce89de5d9f7a05e99948937ac5456df09df30", "parents": [ "21a2cb565a74bf794d343ce22300c5f6c1568ae1", "995234da19b927f42722d796e8270384f33be11c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 12:09:24 2012 -0800" }, "message": "Merge branch \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\n* \u0027tty-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (65 commits)\n tty: serial: imx: move del_timer_sync() to avoid potential deadlock\n imx: add polled io uart methods\n imx: Add save/restore functions for UART control regs\n serial/imx: let probing fail for the dt case without a valid alias\n serial/imx: propagate error from of_alias_get_id instead of using -ENODEV\n tty: serial: imx: Allow UART to be a source for wakeup\n serial: driver for m32 arch should not have DEC alpha errata\n serial/documentation: fix documented name of DCD cpp symbol\n atmel_serial: fix spinlock lockup in RS485 code\n tty: Fix memory leak in virtual console when enable unicode translation\n serial: use DIV_ROUND_CLOSEST instead of open coding it\n serial: add support for 400 and 800 v3 series Titan cards\n serial: bfin-uart: Remove ASYNC_CTS_FLOW flag for hardware automatic CTS.\n serial: bfin-uart: Enable hardware automatic CTS only when CTS pin is available.\n serial: make FSL errata depend on 8250_CONSOLE, not just 8250\n serial: add irq handler for Freescale 16550 errata.\n serial: manually inline serial8250_handle_port\n serial: make 8250 timeout use the specified IRQ handler\n serial: export the key functions for an 8250 IRQ handler\n serial: clean up parameter passing for 8250 Rx IRQ handling\n ...\n" }, { "commit": "421b759b86eb8a914cbbd11f6d09a74f411762c6", "tree": "505ca7f23987d8eaaa519a7e8506b854e2c0d030", "parents": [ "e067096c8d57d191f29d734cd5692695c95cc36e", "a07613a54d700a974f3a4a657da78ef5d097315d" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 17:06:36 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 17:06:36 2012 +0000" }, "message": "Merge branch \u0027samsung/cleanup\u0027 into next/boards\n\nConflicts:\n\tarch/arm/mach-imx/mach-imx6q.c\n\tarch/arm/mach-omap2/board-ti8168evm.c\n\tarch/arm/mach-s3c64xx/Kconfig\n\tarch/arm/mach-tegra/Makefile\n\tarch/arm/mach-tegra/board-dt-tegra20.c\n\tarch/arm/mach-tegra/common.c\n\nLots of relatively simple conflicts between the board\nchanges and stuff from the arm tree. This pulls in\nthe resolution from the samsung/cleanup tree, so we\ndon\u0027t get conflicting merges.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "dcf7ec5ee62a78123057a1e286c88ca739717409", "tree": "fa3f19434638a942ba66d236dde4d9aaadf8b370", "parents": [ "15db3e823c3246e3bd31fe454f5c8927eb85caf2", "142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:16:29 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Jan 09 16:16:29 2012 +0000" }, "message": "Merge branch \u0027samsung/driver\u0027 into next/drivers\n\nConflicts:\n\tarch/arm/mach-mxs/include/mach/common.h\n\nPull in previous samsung conflict merges and do a trivial\nmerge of an mxs double-add conflict.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "72f318897e50c29b91efd1ed24515a93c138a2ba", "tree": "7e7ef8138d5afacd1be4655e4458dc4cee432d1e", "parents": [ "a0e86bd4252519321b0d102dc4ed90557aa7bee9", "2fa1d4fce599809e6bd7d95756709a5faef30710" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 08:11:13 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 09 08:11:13 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (31 commits)\n [S390] disassembler: mark exception causing instructions\n [S390] Enable exception traces by default\n [S390] return address of compat signals\n [S390] sysctl: get rid of dead declaration\n [S390] dasd: fix fixpoint divide exception in define_extent\n [S390] dasd: add sanity check to detect path connection error\n [S390] qdio: fix kernel panic for zfcp 31-bit\n [S390] Add s390x description to Documentation/kdump/kdump.txt\n [S390] Add VMCOREINFO_SYMBOL(high_memory) to vmcoreinfo\n [S390] dasd: fix expiration handling for recovery requests\n [S390] outstanding interrupts vs. smp_send_stop\n [S390] ipc: call generic sys_ipc demultiplexer\n [S390] zcrypt: Fix error return codes.\n [S390] zcrypt: Rework length parameter checking.\n [S390] cleanup trap handling\n [S390] Remove Kerntypes leftovers\n [S390] topology: increase poll frequency if change is anticipated\n [S390] entry[64].S improvements\n [S390] make arch/s390 subdirectories depend on config option\n [S390] kvm: move cmf host id constant out of lowcore\n ...\n\nFix up conflicts in arch/s390/kernel/{smp.c,topology.c} due to the\nsysdev removal clashing with \"topology: get rid of ifdefs\" which moved\nsome of that code around.\n" }, { "commit": "8e369672af8700299ab372bad9397f230b1d591a", "tree": "8676cfdb7f8c1ac5ee124aef050d541d70f876d0", "parents": [ "6950d76c531671ec389e36183311826597951ac6", "a125a3945c950caef001f22055bf201a36568533" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:05:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 14:05:09 2012 -0800" }, "message": "Merge branch \u0027dma-buf-merge\u0027 of git://people.freedesktop.org/~airlied/linux\n\n* \u0027dma-buf-merge\u0027 of git://people.freedesktop.org/~airlied/linux:\n dma-buf: mark EXPERIMENTAL for 1st release.\n dma-buf: Documentation for buffer sharing framework\n dma-buf: Introduce dma buffer sharing mechanism\n" }, { "commit": "6950d76c531671ec389e36183311826597951ac6", "tree": "58294fa8afd16e4bda41a9104f8a4f68f09a61ae", "parents": [ "b7d845f8825b058b80e76320f573505afbf4a1fc", "91c8eabef1b52ef12c49ddea14152aadd9830a35" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:39:24 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:39:24 2012 -0800" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n max1111.c: fix checkpatch warning\n hwmon: (lm75) fix checkpatch warnings\n hwmon: (lm80) fix checkpatch messages\n hwmon: replaced strict_str* with kstr*\n hwmon: (lm75) fix checkpatch warning\n hwmon: (lm75) added error handling\n hwmon: (ltc4261) set data-\u003evalid to 0 if error\n hwmon: (f75375s) Add support for F75387SG/RG\n hwmon: (f75375s) Disable setting DC fan control mode for F75373\n hwmon: (f75375s) Initialize pwmX_mode and pwmX_enable if there is no platform data\n hwmon: (f75375s) Fix value range for PWM modes\n hwmon: (f75375s) Use standard sysfs attribute names\n hwmon: (f75375s) Fix checkpatch errors and warnings\n hwmon: (pmbus/zl6100) Only instantiate external temperature sensor if enabled\n hwmon: (pmbus/zl6100) Add support for Ericsson BMR45[0,1] and BMR46[2,3,4]\n hwmon: (pmbus/zl6100) Add support for ZL2005\n hwmon: (pmbus/adm1275) Validate device ID\n" }, { "commit": "2943c833222ef87c111ee0c6b7b8519ad2983e99", "tree": "0ef8cc4f72a63b325e7ae858ec68822ec4f3c64f", "parents": [ "98793265b429a3f0b3f1750e74d67cd4d740d162", "19d671695e1931ebfd75b2b888778201aefe35ca" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:28:33 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:28:33 2012 -0800" }, "message": "Merge tag \u0027md-3.3\u0027 of git://neil.brown.name/md\n\nmd update for 3.3\n\nBig change is new hot-replacement.\nA slot in an array can hold 2 devices - one that\nwants-replacement and one that is the replacement.\nOnce the replacement is built - either from the\noriginal or (in the case of errors) from elsewhere,\nthe wants-replacement device will be removed.\n\n* tag \u0027md-3.3\u0027 of git://neil.brown.name/md: (36 commits)\n md/raid1: Mark device want_replacement when we see a write error.\n md/raid1: If there is a spare and a want_replacement device, start replacement.\n md/raid1: recognise replacements when assembling arrays.\n md/raid1: handle activation of replacement device when recovery completes.\n md/raid1: Allow a failed replacement device to be removed.\n md/raid1: Allocate spare to store replacement devices and their bios.\n md/raid1: Replace use of mddev-\u003eraid_disks with conf-\u003eraid_disks.\n md/raid10: If there is a spare and a want_replacement device, start replacement.\n md/raid10: recognise replacements when assembling array.\n md/raid10: Allow replacement device to be replace old drive.\n md/raid10: handle recovery of replacement devices.\n md/raid10: Handle replacement devices during resync.\n md/raid10: writes should get directed to replacement as well as original.\n md/raid10: allow removal of failed replacement devices.\n md/raid10: preferentially read from replacement device if possible.\n md/raid10: change read_balance to return an rdev\n md/raid10: prepare data structures for handling replacement.\n md/raid5: Mark device want_replacement when we see a write error.\n md/raid5: If there is a spare and a want_replacement device, start replacement.\n md/raid5: recognise replacements when assembling array.\n ...\n" }, { "commit": "98793265b429a3f0b3f1750e74d67cd4d740d162", "tree": "b0bd717673f0c21845cf053f3fb6b75d42530af5", "parents": [ "b4a133da2eaccb844a7beaef16ffd9c76a0d21d3", "bd1b2a555952d959f47169056fca05acf7eff81f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:21:22 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (53 commits)\n Kconfig: acpi: Fix typo in comment.\n misc latin1 to utf8 conversions\n devres: Fix a typo in devm_kfree comment\n btrfs: free-space-cache.c: remove extra semicolon.\n fat: Spelling s/obsolate/obsolete/g\n SCSI, pmcraid: Fix spelling error in a pmcraid_err() call\n tools/power turbostat: update fields in manpage\n mac80211: drop spelling fix\n types.h: fix comment spelling for \u0027architectures\u0027\n typo fixes: aera -\u003e area, exntension -\u003e extension\n devices.txt: Fix typo of \u0027VMware\u0027.\n sis900: Fix enum typo \u0027sis900_rx_bufer_status\u0027\n decompress_bunzip2: remove invalid vi modeline\n treewide: Fix comment and string typo \u0027bufer\u0027\n hyper-v: Update MAINTAINERS\n treewide: Fix typos in various parts of the kernel, and fix some comments.\n clockevents: drop unknown Kconfig symbol GENERIC_CLOCKEVENTS_MIGR\n gpio: Kconfig: drop unknown symbol \u0027CS5535_GPIO\u0027\n leds: Kconfig: Fix typo \u0027D2NET_V2\u0027\n sound: Kconfig: drop unknown symbol ARCH_CLPS7500\n ...\n\nFix up trivial conflicts in arch/powerpc/platforms/40x/Kconfig (some new\nkconfig additions, close to removed commented-out old ones)\n" }, { "commit": "eb59c505f8a5906ad2e053d14fab50eb8574fd6f", "tree": "c6e875adc12b481b916e847e8f80b8881a0fb02c", "parents": [ "1619ed8f60959829d070d8f39cd2f8ca0e7135ce", "c233523b3d392e530033a7587d7970dc62a02361" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 13:10:57 2012 -0800" }, "message": "Merge branch \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\n* \u0027pm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (76 commits)\n PM / Hibernate: Implement compat_ioctl for /dev/snapshot\n PM / Freezer: fix return value of freezable_schedule_timeout_killable()\n PM / shmobile: Allow the A4R domain to be turned off at run time\n PM / input / touchscreen: Make st1232 use device PM QoS constraints\n PM / QoS: Introduce dev_pm_qos_add_ancestor_request()\n PM / shmobile: Remove the stay_on flag from SH7372\u0027s PM domains\n PM / shmobile: Don\u0027t include SH7372\u0027s INTCS in syscore suspend/resume\n PM / shmobile: Add support for the sh7372 A4S power domain / sleep mode\n PM: Drop generic_subsys_pm_ops\n PM / Sleep: Remove forward-only callbacks from AMBA bus type\n PM / Sleep: Remove forward-only callbacks from platform bus type\n PM: Run the driver callback directly if the subsystem one is not there\n PM / Sleep: Make pm_op() and pm_noirq_op() return callback pointers\n PM/Devfreq: Add Exynos4-bus device DVFS driver for Exynos4210/4212/4412.\n PM / Sleep: Merge internal functions in generic_ops.c\n PM / Sleep: Simplify generic system suspend callbacks\n PM / Hibernate: Remove deprecated hibernation snapshot ioctls\n PM / Sleep: Fix freezer failures due to racy usermodehelper_is_disabled()\n ARM: S3C64XX: Implement basic power domain support\n PM / shmobile: Use common always on power domain governor\n ...\n\nFix up trivial conflict in fs/xfs/xfs_buf.c due to removal of unused\nXBT_FORCE_SLEEP bit\n" }, { "commit": "972b2c719990f91eb3b2310d44ef8a2d38955a14", "tree": "b25a250ec5bec4b7b6355d214642d8b57c5cab32", "parents": [ "02550d61f49266930e674286379d3601006b2893", "c3aa077648e147783a7a53b409578234647db853" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jan 08 12:19:57 2012 -0800" }, "message": "Merge branch \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\n* \u0027for-linus2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (165 commits)\n reiserfs: Properly display mount options in /proc/mounts\n vfs: prevent remount read-only if pending removes\n vfs: count unlinked inodes\n vfs: protect remounting superblock read-only\n vfs: keep list of mounts for each superblock\n vfs: switch -\u003eshow_options() to struct dentry *\n vfs: switch -\u003eshow_path() to struct dentry *\n vfs: switch -\u003eshow_devname() to struct dentry *\n vfs: switch -\u003eshow_stats to struct dentry *\n switch security_path_chmod() to struct path *\n vfs: prefer -\u003edentry-\u003ed_sb to -\u003emnt-\u003emnt_sb\n vfs: trim includes a bit\n switch mnt_namespace -\u003eroot to struct mount\n vfs: take /proc/*/mounts and friends to fs/proc_namespace.c\n vfs: opencode mntget() mnt_set_mountpoint()\n vfs: spread struct mount - remaining argument of next_mnt()\n vfs: move fsnotify junk to struct mount\n vfs: move mnt_devname\n vfs: move mnt_list to struct mount\n vfs: switch pnode.h macros to struct mount *\n ...\n" }, { "commit": "b001befe58691ef3627458cd814e8cee7f845c5f", "tree": "1083f1a1cd3feeceeac4b395534df0ff032fdbc8", "parents": [ "31b2a868451d630bacfdeddc626371b3f9d9a01c", "928a11ba36f999436915ea2b1eadf54301f93059" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 12:44:37 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 20:40:51 2012 +0000" }, "message": "Merge branch \u0027samsung/dt\u0027 into next/dt\n\n* samsung/dt: (3 commit)\n Merge branch \u0027depends/rmk/for-linus\u0027 into samsung/dt\n Merge branch \u0027depends/rmk/restart\u0027 into next/cleanup\n Merge branch \u0027next/cleanup\u0027 into samsung/dt\n\nConflicts:\n\tarch/arm/mach-tegra/board-dt.c\n\tarch/arm/mach-tegra/include/mach/entry-macro.S\n\nThe latest version of the samsung/dt branch resolves\nall sorts of conflicts with the latest upstream, no functional\nchanges that are not already there.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "02550d61f49266930e674286379d3601006b2893", "tree": "2d30df688b7f428908028dd20e83b22bc799dee7", "parents": [ "2d51daaa615e4724f24e43fa01e705c40551080a", "c89810acbcf48c7004e912b2b4b862480b2d00e1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:18:52 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:18:52 2012 -0800" }, "message": "Merge tag \u0027devicetree-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\ndevicetree/next changes queued for v3.3 merge window\n\n* tag \u0027devicetree-for-linus-20120104\u0027 of git://git.secretlab.ca/git/linux-2.6:\n ARM: prom.h: Fix build error by removing unneeded header file\n irq: check domain hwirq range for DT translate\n dt: add empty of_get_node/of_put_node functions\n of/pdt: fix section mismatch warning\n i2c-designware: add OF binding support\n dt/i2c: Enumerate some of the known trivial i2c devices\n dt: reform for_each_property to for_each_property_of_node\n ARM/of: allow *machine_desc.dt_compat to be const\n of/base: Take NULL string into account for property with multiple strings\n OF/device-tree: Add some entries to vendor-prefixes.txt\n\nFix up trivial add-add conflicts in include/linux/of.h\n" }, { "commit": "7affca3537d74365128e477b40c529d6f2fe86c8", "tree": "20be92bd240029182fc89c2c4f25401b7715dcae", "parents": [ "356b95424cfb456e14a59eaa579422ce014c424b", "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jan 07 12:03:30 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\n* \u0027driver-core-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits)\n arm: fix up some samsung merge sysdev conversion problems\n firmware: Fix an oops on reading fw_priv-\u003efw in sysfs loading file\n Drivers:hv: Fix a bug in vmbus_driver_unregister()\n driver core: remove __must_check from device_create_file\n debugfs: add missing #ifdef HAS_IOMEM\n arm: time.h: remove device.h #include\n driver-core: remove sysdev.h usage.\n clockevents: remove sysdev.h\n arm: convert sysdev_class to a regular subsystem\n arm: leds: convert sysdev_class to a regular subsystem\n kobject: remove kset_find_obj_hinted()\n m86k: gpio - convert sysdev_class to a regular subsystem\n mips: txx9_sram - convert sysdev_class to a regular subsystem\n mips: 7segled - convert sysdev_class to a regular subsystem\n sh: dma - convert sysdev_class to a regular subsystem\n sh: intc - convert sysdev_class to a regular subsystem\n power: suspend - convert sysdev_class to a regular subsystem\n power: qe_ic - convert sysdev_class to a regular subsystem\n power: cmm - convert sysdev_class to a regular subsystem\n s390: time - convert sysdev_class to a regular subsystem\n ...\n\nFix up conflicts with \u0027struct sysdev\u0027 removal from various platform\ndrivers that got changed:\n - arch/arm/mach-exynos/cpu.c\n - arch/arm/mach-exynos/irq-eint.c\n - arch/arm/mach-s3c64xx/common.c\n - arch/arm/mach-s3c64xx/cpu.c\n - arch/arm/mach-s5p64x0/cpu.c\n - arch/arm/mach-s5pv210/common.c\n - arch/arm/plat-samsung/include/plat/cpu.h\n - arch/powerpc/kernel/sysfs.c\nand fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h\n" }, { "commit": "237c78beb8a988453bac1993d21f025d070a0d8d", "tree": "9864f0924650770881141359a2d5bac623949789", "parents": [ "4eb821999086417ab42a15174b51497122fc406e", "7b9dd47136c07ffd883aff6926c7b281e4c1eea4" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 12:30:20 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Sat Jan 07 12:42:17 2012 +0000" }, "message": "Merge branch \u0027depends/rmk/for-linus\u0027 into samsung/dt\n\nConflicts:\n\tarch/arm/mach-exynos/Makefile\n\tarch/arm/mach-exynos/cpu.c -\u003e common.c\n\tarch/arm/mach-exynos/include/mach/entry-macro.S\n\tarch/arm/mach-exynos/init.c -\u003e common.c\n\tarch/arm/mach-s5p64x0/init.c -\u003e common.c\n\tarch/arm/mach-s5pv210/init.c -\u003e common.c\n\nMultiple files were moved into common.c files in the rmk/for-linus\nbranch, so this moves over the samsung/dt changes to the new\nfiles.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "34c80b1d93e6e20ca9dea0baf583a5b5510d92d4", "tree": "7dcbf0a4e09464247e6992c8f44fcc872867bd3a", "parents": [ "a6322de67b58a00e3a783ad9c87c2a11b2d67b47" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 08 21:32:45 2011 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Jan 06 23:19:54 2012 -0500" }, "message": "vfs: switch -\u003eshow_options() to struct dentry *\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "770e1b035dcb6ec3f8ee69dda0815dd1e220a683", "tree": "e6d36abfdb053fbc722aea8d7e946d6d1b93c7e1", "parents": [ "d3d0b024348c040f0d6851e2e59fc961677d5169", "7b9dd47136c07ffd883aff6926c7b281e4c1eea4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:15:25 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 18:15:25 2012 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm\n\n* \u0027for-linus\u0027 of git://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm: (207 commits)\n ARM: 7267/1: Remove BUILD_BUG_ON from asm/bug.h\n ARM: 7269/1: mach-sa1100: fix sched_clock breakage\n ARM: 7198/1: arm/imx6: add restart support for imx6q\n ARM: restart: remove the now empty arch_reset()\n ARM: restart: remove comments about adding code to arch_reset()\n ARM: restart: lpc32xx \u0026 u300: remove unnecessary printk\n ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hook\n ARM: restart: w90x900: use new restart hook\n ARM: restart: Versatile Express: use new restart hook\n ARM: restart: versatile: use new restart hook\n ARM: restart: u300: use new restart hook\n ARM: restart: tegra: use new restart hook\n ARM: restart: spear: use new restart hook\n ARM: restart: shark: use new restart hook\n ARM: restart: sa1100: use new restart hook\n ARM: 7252/1: restart: S5PV210: use new restart hook\n ARM: 7251/1: restart: S5PC100: use new restart hook\n ARM: 7250/1: restart: S5P64X0: use new restart hook\n ARM: 7266/1: restart: S3C64XX: use new restart hook\n ARM: 7265/1: restart: S3C24XX: use new restart hook\n ...\n\nFix up trivial conflict in arch/arm/mm/init.c due to removal of\nmemblock_init() clashing with the movement of the sorting of the meminfo\narray.\n" }, { "commit": "e4e88f31bcb5f05f24b9ae518d4ecb44e1a7774d", "tree": "9eef6998f5bbd1a2c999011d9e0151f00c6e7297", "parents": [ "9753dfe19a85e7e45a34a56f4cb2048bb4f50e27", "ef88e3911c0e0301e73fa3b3b2567aabdbe17cc4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:58:22 2012 -0800" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (185 commits)\n powerpc: fix compile error with 85xx/p1010rdb.c\n powerpc: fix compile error with 85xx/p1023_rds.c\n powerpc/fsl: add MSI support for the Freescale hypervisor\n arch/powerpc/sysdev/fsl_rmu.c: introduce missing kfree\n powerpc/fsl: Add support for Integrated Flash Controller\n powerpc/fsl: update compatiable on fsl 16550 uart nodes\n powerpc/85xx: fix PCI and localbus properties in p1022ds.dts\n powerpc/85xx: re-enable ePAPR byte channel driver in corenet32_smp_defconfig\n powerpc/fsl: Update defconfigs to enable some standard FSL HW features\n powerpc: Add TBI PHY node to first MDIO bus\n sbc834x: put full compat string in board match check\n powerpc/fsl-pci: Allow 64-bit PCIe devices to DMA to any memory address\n powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit\n offb: Fix setting of the pseudo-palette for \u003e8bpp\n offb: Add palette hack for qemu \"standard vga\" framebuffer\n offb: Fix bug in calculating requested vram size\n powerpc/boot: Change the WARN to INFO for boot wrapper overlap message\n powerpc/44x: Fix build error on currituck platform\n powerpc/boot: Change the load address for the wrapper to fit the kernel\n powerpc/44x: Enable CRASH_DUMP for 440x\n ...\n\nFix up a trivial conflict in arch/powerpc/include/asm/cputime.h due to\nthe additional sparse-checking code for cputime_t.\n" }, { "commit": "9753dfe19a85e7e45a34a56f4cb2048bb4f50e27", "tree": "c017a1b4a70b8447c71b01d8b320e071546b5c9d", "parents": [ "edf7c8148ec40c0fd27c0ef3f688defcc65e3913", "9f42f126154786e6e76df513004800c8c633f020" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:22:09 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 17:22:09 2012 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1958 commits)\n net: pack skb_shared_info more efficiently\n net_sched: red: split red_parms into parms and vars\n net_sched: sfq: extend limits\n cnic: Improve error recovery on bnx2x devices\n cnic: Re-init dev-\u003estats_addr after chip reset\n net_sched: Bug in netem reordering\n bna: fix sparse warnings/errors\n bna: make ethtool_ops and strings const\n xgmac: cleanups\n net: make ethtool_ops const\n vmxnet3\" make ethtool ops const\n xen-netback: make ops structs const\n virtio_net: Pass gfp flags when allocating rx buffers.\n ixgbe: FCoE: Add support for ndo_get_fcoe_hbainfo() call\n netdev: FCoE: Add new ndo_get_fcoe_hbainfo() call\n igb: reset PHY after recovering from PHY power down\n igb: add basic runtime PM support\n igb: Add support for byte queue limits.\n e1000: cleanup CE4100 MDIO registers access\n e1000: unmap ce4100_gbe_mdio_base_virt in e1000_remove\n ...\n" }, { "commit": "e067096c8d57d191f29d734cd5692695c95cc36e", "tree": "e1c200404c3ed3730d04837113d59ca898eb483a", "parents": [ "1fc3eb81100c3f3cd44e706e54390151b0f1ce74", "e5570bbc9c06634cfac94e06ac1432b53d8595e5" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jan 06 23:09:14 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jan 06 23:09:14 2012 +0000" }, "message": "Merge branch \u0027tegra/soc\u0027 into next/boards\n\nConflicts:\n\tarch/arm/mach-tegra/board-harmony-pcie.c\n\nTo fix an internal merge conflict between the tegra/soc and tegra/boards\nbranches.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "69734b644bf19f20d2989e1a8e5bf59c837ee5c1", "tree": "b1afd22d6e84db04516e466c223d67c1c340e6d9", "parents": [ "67b0243131150391125d8d0beb5359d7aec78b55", "ceb7b40b65539a771d1bfaf47660ac0ee57e0c4f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 13:59:14 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 13:59:14 2012 -0800" }, "message": "Merge branch \u0027x86-asm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027x86-asm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)\n x86: Fix atomic64_xxx_cx8() functions\n x86: Fix and improve cmpxchg_double{,_local}()\n x86_64, asm: Optimise fls(), ffs() and fls64()\n x86, bitops: Move fls64.h inside __KERNEL__\n x86: Fix and improve percpu_cmpxchg{8,16}b_double()\n x86: Report cpb and eff_freq_ro flags correctly\n x86/i386: Use less assembly in strlen(), speed things up a bit\n x86: Use the same node_distance for 32 and 64-bit\n x86: Fix rflags in FAKE_STACK_FRAME\n x86: Clean up and extend do_int3()\n x86: Call do_notify_resume() with interrupts enabled\n x86/div64: Add a micro-optimization shortcut if base is power of two\n x86-64: Cleanup some assembly entry points\n x86-64: Slightly shorten line system call entry and exit paths\n x86-64: Reduce amount of redundant code generated for invalidate_interruptNN\n x86-64: Slightly shorten int_ret_from_sys_call\n x86, efi: Convert efi_phys_get_time() args to physical addresses\n x86: Default to vsyscall\u003demulate\n x86-64: Set siginfo and context on vsyscall emulation faults\n x86: consolidate xchg and xadd macros\n ...\n" }, { "commit": "ff4b8a57f0aaa2882d444ca44b2b9b333d22a4df", "tree": "d851c923f85566572112d4c0f884cff388a3cc05", "parents": [ "805a6af8dba5dfdd35ec35dc52ec0122400b2610", "ea04018e6bc5ddb2f0466c0e5b986bd4901b7e8e" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Jan 06 11:42:52 2012 -0800" }, "message": "Merge branch \u0027driver-core-next\u0027 into Linux 3.2\n\nThis resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,\nand it fixes the build error in the arch/x86/kernel/microcode_core.c\nfile, that the merge did not catch.\n\nThe microcode_core.c patch was provided by Stephen Rothwell\n\u003csfr@canb.auug.org.au\u003e who was invaluable in the merge issues involved\nwith the large sysdev removal process in the driver-core tree.\n\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "35b740e4662ef386f0c60e1b60aaf5b44db9914c", "tree": "502a8f9499bc1b4cb3300d666dab2d01a1921224", "parents": [ "423d091dfe58d3109d84c408810a7cfa82f6f184", "9e183426bfb52bb44bf3c443d6587e4d02478603" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:58 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:58 2012 -0800" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (106 commits)\n perf kvm: Fix copy \u0026 paste error in description\n perf script: Kill script_spec__delete\n perf top: Fix a memory leak\n perf stat: Introduce get_ratio_color() helper\n perf session: Remove impossible condition check\n perf tools: Fix feature-bits rework fallout, remove unused variable\n perf script: Add generic perl handler to process events\n perf tools: Use for_each_set_bit() to iterate over feature flags\n perf tools: Unify handling of features when writing feature section\n perf report: Accept fifos as input file\n perf tools: Moving code in some files\n perf tools: Fix out-of-bound access to struct perf_session\n perf tools: Continue processing header on unknown features\n perf tools: Improve macros for struct feature_ops\n perf: builtin-record: Document and check that mmap_pages must be a power of two.\n perf: builtin-record: Provide advice if mmap\u0027ing fails with EPERM.\n perf tools: Fix truncated annotation\n perf script: look up thread using tid instead of pid\n perf tools: Look up thread names for system wide profiling\n perf tools: Fix comm for processes with named threads\n ...\n" }, { "commit": "423d091dfe58d3109d84c408810a7cfa82f6f184", "tree": "43c4385d1dc7219582f924d42db1f3e203a577bd", "parents": [ "1483b3823542c9721eddf09a077af1e02ac96b50", "919b83452b2e7c1dbced0456015508b4b9585db3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 08:02:40 2012 -0800" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (64 commits)\n cpu: Export cpu_up()\n rcu: Apply ACCESS_ONCE() to rcu_boost() return value\n Revert \"rcu: Permit rt_mutex_unlock() with irqs disabled\"\n docs: Additional LWN links to RCU API\n rcu: Augment rcu_batch_end tracing for idle and callback state\n rcu: Add rcutorture tests for srcu_read_lock_raw()\n rcu: Make rcutorture test for hotpluggability before offlining CPUs\n driver-core/cpu: Expose hotpluggability to the rest of the kernel\n rcu: Remove redundant rcu_cpu_stall_suppress declaration\n rcu: Adaptive dyntick-idle preparation\n rcu: Keep invoking callbacks if CPU otherwise idle\n rcu: Irq nesting is always 0 on rcu_enter_idle_common\n rcu: Don\u0027t check irq nesting from rcu idle entry/exit\n rcu: Permit dyntick-idle with callbacks pending\n rcu: Document same-context read-side constraints\n rcu: Identify dyntick-idle CPUs on first force_quiescent_state() pass\n rcu: Remove dynticks false positives and RCU failures\n rcu: Reduce latency of rcu_prepare_for_idle()\n rcu: Eliminate RCU_FAST_NO_HZ grace-period hang\n rcu: Avoid needlessly IPIing CPUs at GP end\n ...\n" }, { "commit": "8c717b72dec32a50666175b62b41de24e4b39be7", "tree": "e2b4335496cbddb5cded7b1bfd7579ee33f60505", "parents": [ "07d106d0a33d6063d2061305903deb02489eba20", "dc4218bd0fe499fce2896f88101ea42dac1f60fc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:34 2012 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 06 07:53:34 2012 -0800" }, "message": "Merge branch \u0027core-debugobjects-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\n* \u0027core-debugobjects-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n timer: Use debugobjects to catch deletion of uninitialized timers\n timer: Setup uninitialized timer with a stub callback\n debugobjects: Extend to assert that an object is initialized\n debugobjects: Be smarter about static objects\n" }, { "commit": "a7df4719a3ca1c839bf703c5eca3a9c430466696", "tree": "1026f377b2f9051f3a382cdcff901a2ab7434a71", "parents": [ "d15bd7ee445d0702ad801fdaece348fdb79e6581" ], "author": { "name": "Sumit Semwal", "email": "sumit.semwal@ti.com", "time": "Mon Dec 26 14:53:16 2011 +0530" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 06 10:20:24 2012 +0000" }, "message": "dma-buf: Documentation for buffer sharing framework\n\nAdd documentation for dma buffer sharing framework, explaining the\nvarious operations, members and API of the dma buffer sharing\nframework.\n\nSigned-off-by: Sumit Semwal \u003csumit.semwal@linaro.org\u003e\nSigned-off-by: Sumit Semwal \u003csumit.semwal@ti.com\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "443830f6fd986b894da2ea7403163a64c0925f54", "tree": "7bfee6449602e401538bd88f419907d1a661abca", "parents": [ "bc581e6fcc3bd901d20765638422ef957559a8d1" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sat Oct 01 17:35:44 2011 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Thu Jan 05 08:19:28 2012 -0800" }, "message": "hwmon: (pmbus/zl6100) Add support for Ericsson BMR45[0,1] and BMR46[2,3,4]\n\nAdd support for Ericsson BMR450, BMR451, BMR462, BMR463, and BMR464, which are\nbased on ZL2005 and ZL2008, to zl6100 driver. Remove BMR450 and BMR451 device\nIDs from generic PMBus driver.\n\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nReviewed-by: Robert Coulson \u003crobert.coulson@ericsson.com\u003e\n" }, { "commit": "bc581e6fcc3bd901d20765638422ef957559a8d1", "tree": "6109bd949447be039d4dd4630b9456ec2281d27e", "parents": [ "87102808d03948c825c3bdc48316e48f6422fd7e" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sat Oct 01 16:50:36 2011 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Thu Jan 05 08:19:27 2012 -0800" }, "message": "hwmon: (pmbus/zl6100) Add support for ZL2005\n\nAdd explicit support for ZL2005. Functionality is almost the same as with other\nZilker Labs / Intersil chips, but limit register detection does not work reliably.\n\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nReviewed-by: Robert Coulson \u003crobert.coulson@ericsson.com\u003e\n" }, { "commit": "2e0e943436912ffe0848ece58167edfe754edb96", "tree": "b91919095c74742fa06e2105db6d859bee39b2b4", "parents": [ "a32737e1ca650504f172292dd344eb64c02311f3", "ef3a0bf5bfadbace156fa2a3b9c753df2de41df2" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:24:33 2012 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Jan 05 13:24:33 2012 +0000" }, "message": "Merge branch \u0027devel-stable\u0027 into for-linus\n\nConflicts:\n\tarch/arm/kernel/setup.c\n\tarch/arm/mach-shmobile/board-kota2.c\n" }, { "commit": "343fe4074bf8a1551831f6505e738e99777f739d", "tree": "395a131a5deaacca3677142aa7f29318d6c8f5a1", "parents": [ "dbf1115d3f8c7052788aa4e6e46abd27f3b3eeba" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Wed Jan 04 15:27:32 2012 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 04 16:26:32 2012 -0800" }, "message": "serial/documentation: fix documented name of DCD cpp symbol\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nAcked-by: Alan Cox \u003calan@linux.intel.com\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "d8cae98cddd286e38db1724dda1b0e7b467f9237", "tree": "83de956f0281814254ec22119de6ed6a6d3f2b66", "parents": [ "1a3a026ba1b6bbfe0b7f79ab38cf991d691e7c9a" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Wed Jan 04 16:36:35 2012 -0500" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Wed Jan 04 16:04:30 2012 -0800" }, "message": "USB: update documentation for usbmon\n\nThe documentation for usbmon is out of date; the usbfs \"devices\" file\nnow exists in /sys/kernel/debug/usb rather than /proc/bus/usb. This\npatch (as1505) updates the documentation accordingly, and also\nmentions that the necessary information can be found by running lsusb.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCC: Pete Zaitcev \u003czaitcev@redhat.com\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "adaf4ed2abbd285c93808060924eeec3af483aee", "tree": "425c6c37c08af0b69efaa7457c9b428eda347c36", "parents": [ "ca3d30cc02f780f68771087040ce935add6ba2b7", "5f0a6e2d503896062f641639dacfe5055c2f593b" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 04 15:00:43 2012 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 04 15:01:28 2012 +0100" }, "message": "Merge commit \u0027v3.2-rc7\u0027 into x86/asm\n\nMerge reason: Update from -rc4 to -rc7.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "faef2b6c9960b5ae288899f461a2218ec6bb7928", "tree": "af61427bb0984315800617263dbc4d8c42b7d7e7", "parents": [ "5b91aca0bd462c80cf509cbc1014f803eabdc205" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jul 24 23:44:53 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:55:03 2012 -0500" }, "message": "sysfs: propagate umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "439475140bed762c04567c325d48409862341ae4", "tree": "a4023e4536d39e8e5c4b8abd7747aa43f0338ef2", "parents": [ "fbd48a69a0b576dd8cba01b2b4fc24fad76f1b68" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jul 25 00:05:26 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:57 2012 -0500" }, "message": "configfs: convert to umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f4ae40a6a50a98ac23d4b285f739455e926a473e", "tree": "c84d7393700bd85e5285a194f8c22d4d00e36b28", "parents": [ "48176a973d65572e61d0ce95495e5072887e6fb6" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Jul 24 04:33:43 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:56 2012 -0500" }, "message": "switch debugfs to umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "1a67aafb5f72a436ca044293309fa7e6351d6a35", "tree": "d9e58600148de9d41b478cf815773b746647d15b", "parents": [ "4acdaf27ebe2034c342f3be57ef49aed1ad885ef" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jul 26 01:52:52 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:54 2012 -0500" }, "message": "switch -\u003emknod() to umode_t\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "4acdaf27ebe2034c342f3be57ef49aed1ad885ef", "tree": "d89a876ee19cd88609a587f8aa6c464a52ee6d98", "parents": [ "18bb1db3e7607e4a997d50991a6f9fa5b0f8722c" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jul 26 01:42:34 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:53 2012 -0500" }, "message": "switch -\u003ecreate() to umode_t\n\nvfs_create() ignores everything outside of 16bit subset of its\nmode argument; switching it to umode_t is obviously equivalent\nand it\u0027s the only caller of the method\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "18bb1db3e7607e4a997d50991a6f9fa5b0f8722c", "tree": "4ee4e584bc9a67f3ec14ce159d2d7d4a27e68d4a", "parents": [ "8208a22bb8bd3c52ef634b4ff194f14892ab1713" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jul 26 01:41:39 2011 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 03 22:54:53 2012 -0500" }, "message": "switch vfs_mkdir() and -\u003emkdir() to umode_t\n\nvfs_mkdir() gets int, but immediately drops everything that might not\nfit into umode_t and that\u0027s the only caller of -\u003emkdir()...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "1fc3eb81100c3f3cd44e706e54390151b0f1ce74", "tree": "922f64310caa55a3b417958a1c256a96f47c4b66", "parents": [ "e006d6563bca989aeae1bc5ebc03dacdf5e15b32", "ee9ba0f2fd5819e377cdec974a2022a7af02a385" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jan 03 21:22:31 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jan 03 21:22:46 2012 +0000" }, "message": "Merge branch \u0027imx/board\u0027 into next/boards\n\n* imx/board: (4 commits)\n Enable 32 bit flash support for iMX21ADS board\n ARM: mx31pdk: Add MC13783 RTC support\n iomux-mx25: configuration to support CSPI3 on CSI pins\n MX1:apf9328: Add i2c support\n\nUpdated to v3.2-rc6, conflicts:\n\tarch/arm/kernel/setup.c\n" }, { "commit": "5d3cb0ffdd0c8987dc17a2ef4529b246198ceb72", "tree": "c60bdca0529cbd44d32b3918b78d14e182ef57cd", "parents": [ "3b0d597139efddfd8960b44249b4a4c977d172f1", "5f0a6e2d503896062f641639dacfe5055c2f593b" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jan 03 20:27:45 2012 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Jan 03 20:27:45 2012 +0000" }, "message": "Merge branch \u0027v3.2-rc7\u0027 into next/pm\n\nConflicts:\n\tarch/arm/kernel/setup.c\n\tarch/arm/mach-shmobile/board-kota2.c\n" }, { "commit": "d36b691077dc59c74efec0d54ed21b86f7a2a21a", "tree": "4f4a82eab16f403f531a860a428ebbec4c0d0db3", "parents": [ "92f1b8518708c085ed7d07d8e7ed36411c92fa4f" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Dec 29 17:09:01 2011 -0500" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jan 02 13:04:55 2012 +0100" }, "message": "misc latin1 to utf8 conversions\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "7f8e3234c5f7fbdb06be050c8a1907e9c36d7c61", "tree": "d6e9edb2087fa4a97b2cc3d585a0189672a14cf4", "parents": [ "8ade06c616b34b4237c0ed77d1ff0ce04ad7d056", "89307babf966165171547f105e2253dec261cfa5" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 13:04:14 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 30 13:04:14 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n" }, { "commit": "bd4b9ba4cf9338932a065cd752fb5f28b26e4e39", "tree": "88725708d3f2696f1c2373cf62d0b997c207e861", "parents": [ "e814fb635cd269532a6a95a921c05841ababa7ae", "8a44930a11de8d66f92145fd2d2464ab4fba696b" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Dec 28 00:18:10 2011 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Dec 28 00:18:10 2011 +0000" }, "message": "Merge branch \u0027samsung/cleanup\u0027 into next/drivers\n\nDependency for the samsung/drivers branch\n\nConflicts:\n\tarch/arm/mach-exynos/Makefile\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "4551ae0a24bba06972247a80f721fc21f6b2b758", "tree": "7e17b819ba34f73988d384161335ebe5729897ad", "parents": [ "e2c236f0a42fbb9e6a9528f8436f348218ffee96", "384703b8e6cd4c8ef08512e596024e028c91c339" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Dec 27 23:41:33 2011 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Dec 27 23:41:33 2011 +0000" }, "message": "Merge branch \u0027v3.2-rc6\u0027 into next/drivers\n" }, { "commit": "31b2a868451d630bacfdeddc626371b3f9d9a01c", "tree": "b8823382f687c34dd8c180abcfb85eed34d701e6", "parents": [ "9cad9a5ff61abeddc2acb22aace9245f39b98f72", "4eb821999086417ab42a15174b51497122fc406e" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Dec 27 23:21:28 2011 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Dec 27 23:21:28 2011 +0000" }, "message": "Merge branch \u0027samsung/dt\u0027 into next/dt\n\n* samsung/dt: (27 commits)\n ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN\n ARM: EXYNOS: Add Exynos4 device tree enabled board file\n rtc: rtc-s3c: Add device tree support\n input: samsung-keypad: Add device tree support\n ARM: S5PV210: Modify platform data for pl330 driver\n ARM: S5PC100: Modify platform data for pl330 driver\n ARM: S5P64x0: Modify platform data for pl330 driver\n ARM: EXYNOS: Add a alias for pdma clocks\n ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build\n ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers\n DMA: PL330: Add device tree support\n ARM: EXYNOS: Modify platform data for pl330 driver\n DMA: PL330: Infer transfer direction from transfer request instead of platform data\n DMA: PL330: move filter function into driver\n serial: samsung: Fix build for non-Exynos4210 devices\n serial: samsung: add device tree support\n serial: samsung: merge probe() function from all SoC specific extensions\n serial: samsung: merge all SoC specific port reset functions\n ARM: SAMSUNG: register uart clocks to clock lookup list\n serial: samsung: remove all uses of get_clksrc and set_clksrc\n ...\n" }, { "commit": "9cad9a5ff61abeddc2acb22aace9245f39b98f72", "tree": "802d6da614bc5fdeb2e21d7f86587368cb8ae9d5", "parents": [ "e817e49f400b3fd5a7dd68f8f10b31451c4beef0", "bad134090385d577e9ecabef83f8fa737eb7a1af" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Dec 27 23:21:16 2011 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Dec 27 23:21:16 2011 +0000" }, "message": "Merge branch \u0027tegra/dt\u0027 into next/dt\n\n* tegra/dt:\n arm/tegra: Seaboard: Add GPIO key device tree nodes\n arm/dt: Add ADT7461 to Seaboard\n arm/dt: tegra: Use new compatible value for DVC I2C controller\n arm/tegra: initial device tree for tegra30\n arm/tegra: convert tegra20 to GIC devicetree binding\n arm/dt: tegra: Fix SDHCI nodes to match board files\n arm/dt: tegra: Fix serial nodes to match board files\n arm/dt: tegra: Fix I2C nodes to match board files\n arm/dt: tegra: Remove /chosen node\n arm/dt: tegra: Remove /memreserve/ from device-tree files\n arm/tegra: board-dt: Enable audio-related clocks\n arm/tegra: board-dt: Fix AUXDATA typo\n arm/dt: tegra: add dts file for paz00\n arm/tegra: Add device-tree support for TrimSlice board\n arm/dt: tegra: Clean up I2S and DAS nodes\n USB: ehci-tegra: add probing through device tree\n arm/dt: add basic usb nodes to tegra device trees\n arm/tegra: fix variable formatting in makefile\n\nConflicts:\n\tarch/arm/mach-tegra/Makefile\n" }, { "commit": "07b98403ee67838bbaded43bd687875b9d7f74e0", "tree": "0b1f155ae4628a2be4dc4dd4c7fbeeaf1d8016dc", "parents": [ "b17471f5d121a53be1ccf6e0b0599441e56b468c", "f4ebf1d1f8d10b703493e76300605e8be2f21bf5" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Dec 27 22:04:51 2011 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Tue Dec 27 22:05:06 2011 +0000" }, "message": "Merge branch \u0027omap/hwmod\u0027 into next/drivers\n\nThis is needed as a dependency for omap/ehci.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "af71100c7acf3ccaf95044cd5e9e866178e5f8a1", "tree": "c32418dff60d957bd44ecc20cf91d4c2ff088e38", "parents": [ "02bca5ff270774d4b4929de8b62ab96708065386" ], "author": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Nov 08 14:43:47 2011 -0600" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Dec 27 15:52:44 2011 -0600" }, "message": "i2c-designware: add OF binding support\n\nAdd of_match_table and DT style i2c registration to designware i2c\ndriver.\n\nRefactored for pci/plat split by Dirk Brandewie.\n\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Dirk Brandewie \u003cdirk.brandewie@gmail.com\u003e\n" }, { "commit": "02bca5ff270774d4b4929de8b62ab96708065386", "tree": "34c5b17d9fb91fcab45b78ea9b8090a33aa84ec1", "parents": [ "8af0da93da7c40526959ab5291964581c678d3e7" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Tue Dec 27 11:18:46 2011 -0800" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Tue Dec 27 15:42:26 2011 -0600" }, "message": "dt/i2c: Enumerate some of the known trivial i2c devices\n\nBased on recent discussions, we apparently want to do bindings even for\ntrivial i2c devices, even though they have for years just been added. So\nstart a table of the currently known ones for others to be added to\nover time.\n\n(I am intentionally letting lines go over 80 characters to make it easier\nto sort the file).\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\n" }, { "commit": "913021433997936822e33a62decfb1914de9bc51", "tree": "640201ebb840ed9d88ca4eb50693c93c3f1060d0", "parents": [ "7fe7a18cddf35f0d50d681ae6252241303b0cfc5" ], "author": { "name": "Michael Holzheu", "email": "holzheu@linux.vnet.ibm.com", "time": "Tue Dec 27 11:27:25 2011 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Tue Dec 27 11:27:13 2011 +0100" }, "message": "[S390] Add s390x description to Documentation/kdump/kdump.txt\n\nAdd s390x specific parts to kdump kernel documentation.\n\nSigned-off-by: Michael Holzheu \u003cholzheu@linux.vnet.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "679e2ea73366cac81ede4104e6d3048cb806df2c", "tree": "bc287f1b04be62e998094b653bad040289f9a5ca", "parents": [ "d68bddb7329a4d47d950d6b0745a7e274d230ed4" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Tue Dec 27 11:27:17 2011 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Tue Dec 27 11:27:12 2011 +0100" }, "message": "[S390] Remove Kerntypes leftovers\n\nRemove last traces of our kerntypes patch which was always an addon\npatch which never got upstream. Somehow a few bits got upstream\nanyway.\nSince kerntypes aren\u0027t used anymore and lcrash isn\u0027t maintained (for\ns390 at least) remove the last traces of kerntypes that somehow went\nupstream. Also remove the documentation that mentions lcrash.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "1ba9ac7c35b30d6b958a30240e21ddaea8d21b35", "tree": "942143e924ea4d11d120b614691b90ee540ba15f", "parents": [ "c159d30c59dc84934f8ef46f934ce1232c558ecd" ], "author": { "name": "Nicolas de Pesloüan", "email": "nicolas.2p.debian@free.fr", "time": "Mon Dec 26 13:35:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 26 20:09:35 2011 -0500" }, "message": "bonding: document undocumented active_slave sysfs entry.\n\nv2, based on Jay\u0027s review.\n\nI kept the \u0027link must be up\u0027 part, because this is enforced in the code.\n\nSigned-off-by: Nicolas de Pesloüan \u003cnicolas.2p.debian@free.fr\u003e\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\ncc: Andy Gospodarek \u003candy@greyhouse.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4d25a066b69fb749a39d0d4c610689dd765a0b0e", "tree": "34f644f5a0f734a815225cade757088a9862318b", "parents": [ "3d27e23b17010c668db311140b17bbbb70c78fb9" ], "author": { "name": "Jan Kiszka", "email": "jan.kiszka@siemens.com", "time": "Wed Dec 21 12:28:29 2011 +0100" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Mon Dec 26 13:27:44 2011 +0200" }, "message": "KVM: Don\u0027t automatically expose the TSC deadline timer in cpuid\n\nUnlike all of the other cpuid bits, the TSC deadline timer bit is set\nunconditionally, regardless of what userspace wants.\n\nThis is broken in several ways:\n - if userspace doesn\u0027t use KVM_CREATE_IRQCHIP, and doesn\u0027t emulate the TSC\n deadline timer feature, a guest that uses the feature will break\n - live migration to older host kernels that don\u0027t support the TSC deadline\n timer will cause the feature to be pulled from under the guest\u0027s feet;\n breaking it\n - guests that are broken wrt the feature will fail.\n\nFix by not enabling the feature automatically; instead report it to userspace.\nBecause the feature depends on KVM_CREATE_IRQCHIP, which we cannot guarantee\nwill be called, we expose it via a KVM_CAP_TSC_DEADLINE_TIMER and not\nKVM_GET_SUPPORTED_CPUID.\n\nFixes the Illumos guest kernel, which uses the TSC deadline timer feature.\n\n[avi: add the KVM_CAP + documentation]\n\nReported-by: Alexey Zaytsev \u003calexey.zaytsev@gmail.com\u003e\nTested-by: Alexey Zaytsev \u003calexey.zaytsev@gmail.com\u003e\nSigned-off-by: Jan Kiszka \u003cjan.kiszka@siemens.com\u003e\nSigned-off-by: Avi Kivity \u003cavi@redhat.com\u003e\n" }, { "commit": "3d27e23b17010c668db311140b17bbbb70c78fb9", "tree": "d3d87399212b2dda0bbf6616e4a580b35e7d7760", "parents": [ "423873736b78f549fbfa2f715f2e4de7e6c5e1e9" ], "author": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Tue Dec 20 21:59:09 2011 -0700" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Sun Dec 25 19:03:54 2011 +0200" }, "message": "KVM: Device assignment permission checks\n\nOnly allow KVM device assignment to attach to devices which:\n\n - Are not bridges\n - Have BAR resources (assume others are special devices)\n - The user has permissions to use\n\nAssigning a bridge is a configuration error, it\u0027s not supported, and\ntypically doesn\u0027t result in the behavior the user is expecting anyway.\nDevices without BAR resources are typically chipset components that\nalso don\u0027t have host drivers. We don\u0027t want users to hold such devices\ncaptive or cause system problems by fencing them off into an iommu\ndomain. We determine \"permission to use\" by testing whether the user\nhas access to the PCI sysfs resource files. By default a normal user\nwill not have access to these files, so it provides a good indication\nthat an administration agent has granted the user access to the device.\n\n[Yang Bai: add missing #include]\n[avi: fix comment style]\n\nSigned-off-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\nSigned-off-by: Yang Bai \u003chamo.by@gmail.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "423873736b78f549fbfa2f715f2e4de7e6c5e1e9", "tree": "62526563ccca81957a4c100aa0bc359dcd10af08", "parents": [ "0924ab2cfa98b1ece26c033d696651fd62896c69" ], "author": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Tue Dec 20 21:59:03 2011 -0700" }, "committer": { "name": "Avi Kivity", "email": "avi@redhat.com", "time": "Sun Dec 25 17:13:31 2011 +0200" }, "message": "KVM: Remove ability to assign a device without iommu support\n\nThis option has no users and it exposes a security hole that we\ncan allow devices to be assigned without iommu protection. Make\nKVM_DEV_ASSIGN_ENABLE_IOMMU a mandatory option.\n\nSigned-off-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "abb434cb0539fb355c1c921f8fd761efbbac3462", "tree": "24a7d99ec161f8fd4dc9ff03c9c4cc93be883ce6", "parents": [ "2494654d4890316e7340fb8b3458daad0474a1b9", "6350323ad8def2ac00d77cdee3b79c9b9fba75c4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 23 17:13:56 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 23 17:13:56 2011 -0500" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net\n\nConflicts:\n\tnet/bluetooth/l2cap_core.c\n\nJust two overlapping changes, one added an initialization of\na local variable, and another change added a new local variable.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "30e7dfe76e3e9a3f2b72be38c48562317d7795ab", "tree": "f6d682d02774d571bcfe0d5ad1715c50c2262c3f", "parents": [ "7afc5dbde09104b023ce04465ba71aaba0fc4346" ], "author": { "name": "Wei Yongjun", "email": "yongjun_wei@trendmicro.com.cn", "time": "Thu Dec 22 17:47:54 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Dec 23 16:50:58 2011 -0500" }, "message": "packet: fix typo in packet_mmap.txt\n\nJust fixed typo of sample code in packet_mmap.txt\n\nSigned-off-by: Wei Yongjun \u003cyongjun_wei@trendmicro.com.cn\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "65c64ce8ee642eb330a4c4d94b664725f2902b44", "tree": "c4ad98c2a7f839f3b968fae6eddeec8b5752ce49", "parents": [ "7d6c429b263c2f735f3df8c282cc77a8659e5d74" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Thu Dec 22 01:02:27 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Dec 22 22:37:18 2011 -0500" }, "message": "Partial revert \"Basic kernel memory functionality for the Memory Controller\"\n\nThis reverts commit e5671dfae59b165e2adfd4dfbdeab11ac8db5bda.\n\nAfter a follow up discussion with Michal, it was agreed it would\nbe better to leave the kmem controller with just the tcp files,\ndeferring the behavior of the other general memory.kmem.* files\nfor a later time, when more caches are controlled. This is because\ngeneric kmem files are not used by tcp accounting and it is\nnot clear how other slab caches would fit into the scheme.\n\nWe are reverting the original commit so we can track the reference.\nPart of the patch is kept, because it was used by the later tcp\ncode. Conflicts are shown in the bottom. init/Kconfig is removed from\nthe revert entirely.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nCC: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nCC: Paul Menage \u003cpaul@paulmenage.org\u003e\nCC: Greg Thelen \u003cgthelen@google.com\u003e\nCC: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\n\nConflicts:\n\n\tDocumentation/cgroups/memory.txt\n\tmm/memcontrol.c\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6b5ab4f442e32f248b6fad29aafd1d5153f4dbd3", "tree": "861907fb4f375867118f5f38acbf13fed97d59c9", "parents": [ "39ce4084a604a3ef0e2836e074c02bbbcc7c1509" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Sun Nov 06 21:54:27 2011 +0530" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:07:11 2011 +0900" }, "message": "ARM: EXYNOS: Add Exynos4 device tree enabled board file\n\nAdd a new EXYNOS4 compatible device tree enabled board file. Boards\nbased on the EXYNOS4 family of SoC\u0027s can use this as the machine/board\nfile. When using this machine fike, a corresponding device tree blob\nwhich describes the board\u0027s properties should be supplied at boot time\nto the kernel.\n\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "39ce4084a604a3ef0e2836e074c02bbbcc7c1509", "tree": "bb66668c9b87406fa248bf7ff26a08368634dad5", "parents": [ "b3d6ac3e5f937440a362c0fa187257fa1197f5b9" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Mon Oct 24 14:49:04 2011 +0200" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:07:10 2011 +0900" }, "message": "rtc: rtc-s3c: Add device tree support\n\nAdd device tree based discovery support for Samsung\u0027s rtc controller.\n\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "b3d6ac3e5f937440a362c0fa187257fa1197f5b9", "tree": "f9d535987acc864a3948174e893077b5f6543138", "parents": [ "8742e0441d6530d40d85d65a6bcc5a6c0c4eab13" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Wed Nov 02 19:37:22 2011 +0900" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:07:10 2011 +0900" }, "message": "input: samsung-keypad: Add device tree support\n\nAdd device tree based discovery support for Samsung\u0027s keypad controller.\n\nCc: Joonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nCc: Donghwa Lee \u003cdh09.lee@samsung.com\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "93ed55441245a39e3935f5cf1af3e22febcce905", "tree": "5e238c5e269274fd47c1d03cb0a1c6172feef8fc", "parents": [ "e1cd8454dac99473c2349efce1346264c494f28d" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Mon Oct 24 11:43:31 2011 +0200" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:07:04 2011 +0900" }, "message": "DMA: PL330: Add device tree support\n\nFor PL330 dma controllers instantiated from device tree, the channel\nlookup is based on phandle of the dma controller and dma request id\nspecified by the client node. During probe, the private data of each\nchannel of the controller is set to point to the device node of the\ndma controller. The \u0027chan_id\u0027 of the each channel is used as the\ndma request id.\n\nClient driver requesting dma channels specify the phandle of the\ndma controller and the request id. The pl330 filter function\nconverts the phandle to the device node pointer and matches that\nwith channel\u0027s private data. If a match is found, the request id\nfrom the client node and the \u0027chan_id\u0027 of the channel is matched.\nA channel is found if both the values match.\n\nAcked-by: Jassi Brar \u003cjassisinghbrar@gmail.com\u003e\nAcked-by: Boojin Kim \u003cboojin.kim@samsung.com\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nReviewed-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "26c919e1d3f4dff87ad50e104670f048cbc69b17", "tree": "7ad7222cb616409257e414b403e9b5ea2c488a07", "parents": [ "da121506eb03ee5daea55404709110b798bd61d9" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Sun Nov 06 22:10:44 2011 +0530" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:07:01 2011 +0900" }, "message": "serial: samsung: add device tree support\n\nAdd device tree based discovery support for Samsung\u0027s uart controller.\n\nCc: Ben Dooks \u003cben-linux@fluff.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "659d73ada5d6869dc18838c9125731a750389019", "tree": "1c46b7ee38c09391942f8ded59a16614e166499c", "parents": [ "f983575aa90ceeb2cc7923223882dcf1debf5aa2" ], "author": { "name": "Thomas Abraham", "email": "thomas.abraham@linaro.org", "time": "Mon Nov 07 01:02:21 2011 +0530" }, "committer": { "name": "Kukjin Kim", "email": "kgene.kim@samsung.com", "time": "Fri Dec 23 10:06:54 2011 +0900" }, "message": "gpio/samsung: Add device tree support for EXYNOS4\n\nAs gpio chips get registered, a device tree node which represents the\ngpio chip is searched and attached to it. A translate function is also\nprovided to convert the gpio specifier into actual platform settings\nfor pin function selection, pull up/down and driver strength settings.\n\nSigned-off-by: Thomas Abraham \u003cthomas.abraham@linaro.org\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n[kgene.kim@samsung.com: fixed build error]\nSigned-off-by: Kukjin Kim \u003ckgene.kim@samsung.com\u003e\n" }, { "commit": "2d78f8c451785f030ac1676a18691896b59c69d8", "tree": "4dfe69115b2ca2fb8be2a671e7c8399c3925fcb9", "parents": [ "b8321b68d1445f308324517e45fb0a5c2b48e271" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Fri Dec 23 10:17:51 2011 +1100" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Fri Dec 23 10:17:51 2011 +1100" }, "message": "md: create externally visible flags for supporting hot-replace.\n\nhot-replace is a feature being added to md which will allow a\ndevice to be replaced without removing it from the array first.\n\nWith hot-replace a spare can be activated and recovery can start while\nthe original device is still in place, thus allowing a transition from\nan unreliable device to a reliable device without leaving the array\ndegraded during the transition. It can also be use when the original\ndevice is still reliable but it not wanted for some reason.\n\nThis will eventually be supported in RAID4/5/6 and RAID10.\n\nThis patch adds a super-block flag to distinguish the replacement\ndevice. If an old kernel sees this flag it will reject the device.\n\nIt also adds two per-device flags which are viewable and settable via\nsysfs.\n \"want_replacement\" can be set to request that a device be replaced.\n \"replacement\" is set to show that this device is replacing another\n device.\n\nThe \"rd%d\" links in /sys/block/mdXx/md only apply to the original\ndevice, not the replacement. We currently don\u0027t make links for the\nreplacement - there doesn\u0027t seem to be a need.\n\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "35cd133c6130c1eb52806808abee9d62e6854a27", "tree": "2f06e7f0288b9d4a3785a202f6480928113d8d5c", "parents": [ "9cf519d1c15fa05a538c2b3963c5f3903daf765a" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Dec 18 00:34:13 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Dec 21 22:01:05 2011 +0100" }, "message": "PM: Run the driver callback directly if the subsystem one is not there\n\nMake the PM core execute driver PM callbacks directly if the\ncorresponding subsystem callbacks are not present.\n\nThere are three reasons for doing that. First, it reflects the\nbehavior of drivers/base/dd.c:really_probe() that runs the driver\u0027s\n.probe() callback directly if the bus type\u0027s one is not defined, so\nthis change will remove one arbitrary difference between the PM core\nand the remaining parts of the driver core. Second, it will allow\nsome subsystems, whose PM callbacks don\u0027t do anything except for\nexecuting driver callbacks, to be simplified quite a bit by removing\nthose \"forward-only\" callbacks. Finally, it will allow us to remove\none level of indirection in the system suspend and resume code paths\nwhere it is not necessary, which is going to lead to less debug noise\nwith initcall_debug passed in the kernel command line (messages won\u0027t\nbe printed for driverless devices whose subsystems don\u0027t provide\nPM callbacks among other things).\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "b00f4dc5ff022cb9cbaffd376d9454d7fa1e496f", "tree": "40f1b232e2f1e8ac365317a14fdcbcb331722b46", "parents": [ "1eac8111e0763853266a171ce11214da3a347a0a", "b9e26dfdad5a4f9cbdaacafac6998614cc9c41bc" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Dec 21 21:59:45 2011 +0100" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Wed Dec 21 21:59:45 2011 +0100" }, "message": "Merge branch \u0027master\u0027 into pm-sleep\n\n* master: (848 commits)\n SELinux: Fix RCU deref check warning in sel_netport_insert()\n binary_sysctl(): fix memory leak\n mm/vmalloc.c: remove static declaration of va from __get_vm_area_node\n ipmi_watchdog: restore settings when BMC reset\n oom: fix integer overflow of points in oom_badness\n memcg: keep root group unchanged if creation fails\n nilfs2: potential integer overflow in nilfs_ioctl_clean_segments()\n nilfs2: unbreak compat ioctl\n cpusets: stall when updating mems_allowed for mempolicy or disjoint nodemask\n evm: prevent racing during tfm allocation\n evm: key must be set once during initialization\n mmc: vub300: fix type of firmware_rom_wait_states module parameter\n Revert \"mmc: enable runtime PM by default\"\n mmc: sdhci: remove \"state\" argument from sdhci_suspend_host\n x86, dumpstack: Fix code bytes breakage due to missing KERN_CONT\n IB/qib: Correct sense on freectxts increment and decrement\n RDMA/cma: Verify private data length\n cgroups: fix a css_set not found bug in cgroup_attach_proc\n oprofile: Fix uninitialized memory access when writing to writing to oprofilefs\n Revert \"xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel\"\n ...\n\nConflicts:\n\tkernel/cgroup_freezer.c\n" }, { "commit": "5b9932685fa40088e989be0d56f7e41e362e9450", "tree": "392181a13ff6fdef6890d62cf43d06ecbca50a07", "parents": [ "bfab27a146ed4d722c6d399f844f955f29cd2b81" ], "author": { "name": "Giuseppe CAVALLARO", "email": "peppe.cavallaro@st.com", "time": "Wed Dec 21 03:58:20 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Dec 21 15:44:34 2011 -0500" }, "message": "stmmac: update the driver\u0027s documentation (Dec-2011)\n\nSigned-off-by: Giuseppe Cavallaro \u003cpeppe.cavallaro@st.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d87f69a16eb2cb96459117b06949a560679002e4", "tree": "bbb55b2bd2b6c9e8bd4067aa3279783cb6bd9028", "parents": [ "124ba9403318d834ef21bcd899c22c870708d2c4", "384703b8e6cd4c8ef08512e596024e028c91c339" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 20 20:32:03 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 20 20:32:11 2011 +0100" }, "message": "Merge commit \u0027v3.2-rc6\u0027 into perf/core\n\nMerge reason: Update with the latest fixes.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "08f4fc9da9a04d59f5c937e06e375158abb68206", "tree": "06821b1672a34a75dbb8f78e193b6fa8bbb8a548", "parents": [ "72861ae792c2263bd1058dd3b034e0bf84a676c1" ], "author": { "name": "Shan Wei", "email": "shanwei88@gmail.com", "time": "Mon Dec 19 16:34:15 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Dec 20 14:11:46 2011 -0500" }, "message": "net: doc: fix many typos in scaling.txt\n\nFix some trivial typos.\n\nSigned-off-by: Shan Wei \u003cshanwei88@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "124ba9403318d834ef21bcd899c22c870708d2c4", "tree": "2ac84214085de8780dfa565be7e3ef0d675f6a68", "parents": [ "74eec26facadbe6dbc0621bc862892c915c4534f", "dd3c4670d7fafeb18bf7542fbcfd2606fb06a4a1" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 20 12:10:29 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Dec 20 12:10:29 2011 +0100" }, "message": "Merge branch \u0027for-tip\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rric/oprofile into perf/core\n" }, { "commit": "44ad56b7df54cbc8063b46883d183e4e2f09f831", "tree": "565a44f209f702330688e636157e91ed5c71a396", "parents": [ "384703b8e6cd4c8ef08512e596024e028c91c339" ], "author": { "name": "David Daney", "email": "david.daney@cavium.com", "time": "Wed Dec 14 15:26:19 2011 -0800" }, "committer": { "name": "Rob Herring", "email": "rob.herring@calxeda.com", "time": "Mon Dec 19 15:39:46 2011 -0600" }, "message": "OF/device-tree: Add some entries to vendor-prefixes.txt\n\nWe are currently using \u0027cavium\u0027, \u0027cortina\u0027 and \u0027st\u0027, add them to the\nlist of known prefixes.\n\nSigned-off-by: David Daney \u003cdavid.daney@cavium.com\u003e\nSigned-off-by: Rob Herring \u003crob.herring@calxeda.com\u003e\n" }, { "commit": "d695cfa54e9ec48aeb149cadc8dab1240751572a", "tree": "503d342f303181c4a8e4fb89e070117d5760c513", "parents": [ "c3e00a0eff4c05717915ac7a8e4646db3882aebf", "3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Dec 17 20:05:50 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Dec 17 20:05:50 2011 -0800" }, "message": "Merge remote-tracking branch \u0027rmk/devel-stable\u0027 into for-3.3/soc\n\nConflicts:\n\tarch/arm/mach-tegra/board-dt.c\n\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "c3e00a0eff4c05717915ac7a8e4646db3882aebf", "tree": "f988462b879fb5e83849a1df4827d2d0740e256a", "parents": [ "0d4f74792e2946cb2ef40a1673851eda1041358c" ], "author": { "name": "Peter De Schrijver", "email": "pdeschrijver@nvidia.com", "time": "Wed Dec 14 17:03:13 2011 +0200" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Dec 17 16:14:49 2011 -0800" }, "message": "arm/tegra: initial device tree for tegra30\n\nThis patch adds the initial device tree for tegra30\n\nSigned-off-by: Peter De Schrijver \u003cpdeschrijver@nvidia.com\u003e\nAcked-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nAcked-by: Colin Cross \u003cccross@android.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "578bd83d7e2bbf533c6968291abb36850c6eaff8", "tree": "ed9643d02f34d28036f4fc07d2211ad0b91219cb", "parents": [ "58c017750dc00793cf9ee292a5ce4df1748e852f", "1bccc8077f4ddbd64d7d085501baa2543182f29e" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Dec 16 14:51:24 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Dec 16 14:51:24 2011 -0800" }, "message": "Merge branch \u0027imx6/boards\u0027 into next/boards\n\n* imx6/boards:\n ARM: imx6q: generate imx6q dtb files\n arm/imx6q: Rename Sabreauto to Armadillo2\n arm/imx6q-sabrelite: add enet phy ksz9021rn fixup\n arm/imx6: add imx6q sabrelite board support\n dts/imx: rename uart labels to consistent with hw spec\n dts/imx: rename gpio labels to consistent with hw spec\n" }, { "commit": "b94ee062b5b41c7fc0e44309e8546d4694e75007", "tree": "2ba08003be8d25a573c17a00a627b424de4bb2e4", "parents": [ "dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50", "3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Dec 16 14:50:01 2011 -0800" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Dec 16 14:50:01 2011 -0800" }, "message": "Merge branch \u0027depends/rmk/devel-stable\u0027 into next/boards\n" }, { "commit": "d92b0dfc5078aeec869d58372dbda5e16739b8de", "tree": "2f8d3c57855e0c567e533286ad7653e873ec2af9", "parents": [ "8fe789dc375a1929bf64a9b982140cf394c8bce5" ], "author": { "name": "Rajendra Nayak", "email": "rnayak@ti.com", "time": "Wed Dec 14 17:25:45 2011 +0530" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Fri Dec 16 14:11:06 2011 -0800" }, "message": "omap-serial: Add minimal device tree support\n\nAdapt the driver to device tree and pass minimal platform\ndata from device tree needed for console boot.\nNo power management features will be suppported for now\nsince it requires more tweaks around OCP settings\nto toggle forceidle/noidle/smartidle bits and handling\nremote wakeup and dynamic muxing.\n\nSigned-off-by: Rajendra Nayak \u003crnayak@ti.com\u003e\nReviewed-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "06d123e0984424505eedd09981f1bafc3c38de78", "tree": "4aa75853378becf583d9514f068045056f45c367", "parents": [ "4966eba037bd0841cdb458907f27b71d4dcfd5d4", "2839038bb1a72ed7ef3c39521e0ca981c9cb1534" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Dec 16 14:32:28 2011 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Dec 16 14:32:28 2011 +0000" }, "message": "Merge branch \u0027at91/macb\u0027 into next/drivers\n" }, { "commit": "fb97a8466522f8f35ab886f7af8eefefa0a4905e", "tree": "a209f86f003cf9aeec88cecb9f1bf8e8a79b19e6", "parents": [ "0116da4fcc1ae8a80d9002441e98768f2a6fa2fe" ], "author": { "name": "Jean-Christophe PLAGNIOL-VILLARD", "email": "plagnioj@jcrosoft.com", "time": "Fri Nov 18 15:29:25 2011 +0100" }, "committer": { "name": "Nicolas Ferre", "email": "nicolas.ferre@atmel.com", "time": "Fri Dec 16 13:11:00 2011 +0100" }, "message": "net/macb: add DT support for Cadence macb/gem driver\n\nAllow the device tree to provide the mac address and the phy mode.\n\nSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD \u003cplagnioj@jcrosoft.com\u003e\n[nicolas.ferre@atmel.com: change \"compatible\" node property, doc and DT hwaddr]\nSigned-off-by: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\n[jamie@jamieiles.com: add \"gem\" compatibility strings and doc]\nAcked-by: Jamie Iles\u003cjamie@jamieiles.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "752baf5647d40dc67dc1b74125fa693ac2137563", "tree": "6cbd3f3018e305344f2a101f8be2b6ad1db1093c", "parents": [ "477fce49aef4096639ca169556435c1f9068ce33" ], "author": { "name": "Dirk Behme", "email": "dirk.behme@de.bosch.com", "time": "Thu Dec 08 08:22:01 2011 +0100" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Wed Dec 14 21:25:46 2011 +0800" }, "message": "arm/imx6q: Rename Sabreauto to Armadillo2\n\nThe Sabreauto board was renamed to Armadillo2 recently. To avoid\nconfusion, rename Sabreauto to Armadillo2/arm2.\n\nSigned-off-by: Dirk Behme \u003cdirk.behme@de.bosch.com\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "3c8276c6bc912025db50ff7e93af6bc7c3de0c8c", "tree": "f3604c8204787e2cc8cd1fba2f743f8d40d27388", "parents": [ "8f9ffecfa9c6d4d813e6fa9f20f549b01f8d070e" ], "author": { "name": "Richard Zhao", "email": "richard.zhao@linaro.org", "time": "Wed Dec 14 09:26:46 2011 +0800" }, "committer": { "name": "Shawn Guo", "email": "shawn.guo@linaro.org", "time": "Wed Dec 14 21:25:45 2011 +0800" }, "message": "arm/imx6: add imx6q sabrelite board support\n\n- Add basic board dts file\n- Add board compatible string to mach-imx6q.\n- Update fsl DT board doc.\n\nSigned-off-by: Richard Zhao \u003crichard.zhao@linaro.org\u003e\nSigned-off-by: Shawn Guo \u003cshawn.guo@linaro.org\u003e\n" }, { "commit": "919b83452b2e7c1dbced0456015508b4b9585db3", "tree": "836d0c32b814f7bd5fed83e19b6a2ab77dcf6987", "parents": [ "373da0a2a33018d560afcb2c77f8842985d79594", "a513f6bab0939800dcf1e7c075e733420cf967c5" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 14 08:16:43 2011 +0100" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Dec 14 08:16:43 2011 +0100" }, "message": "Merge branch \u0027rcu/next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu\n" }, { "commit": "653f42f6b6348652c02737924abd6a5a6426e7ee", "tree": "466d9d722742f8f9c553226ffce200dc62f494ab", "parents": [ "4dde6dedad736b86bcea3722abb7d8031aeeaa16", "9d5a09e659f8414dd3713e2acbfaf8a9e9794aa1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 13 14:59:42 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 13 14:59:42 2011 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n ceph: add missing spin_unlock at ceph_mdsc_build_path()\n ceph: fix SEEK_CUR, SEEK_SET regression\n crush: fix mapping calculation when force argument doesn\u0027t exist\n ceph: use i_ceph_lock instead of i_lock\n rbd: remove buggy rollback functionality\n rbd: return an error when an invalid header is read\n ceph: fix rasize reporting by ceph_show_options\n" }, { "commit": "121a8cdd79e2c68ae78c7633f2a46ee65a177ff6", "tree": "03793bef35f590718ebc6ae6110eb0c507ae60bf", "parents": [ "a1016ce33ce23296ad030e5276fcfdf9cb27cb6a", "15a3838b101b292c2e40824d843a4d8871ac4010" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Dec 13 09:37:40 2011 -0800" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Dec 13 09:37:40 2011 -0800" }, "message": "Merge branch \u0027for-next/gadget\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next\n\n* \u0027for-next/gadget\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: (50 commits)\n usb: renesas_usbhs: show error reason on usbhsh_urb_enqueu()\n usb: renesas_usbhs: add force packet remove method\n usb: renesas_usbhs: care usb_hcd_giveback_urb() status\n usb: renesas_usbhs: add usbhsh_is_running()\n usb: renesas_usbhs: disable attch irq after device attached\n usb: renesas_usbhs: care pipe sequence\n usb: renesas_usbhs: add usbhs_pipe_attach() method\n usb: renesas_usbhs: add usbhsh_endpoint_detach_all() for error case\n usb: renesas_usbhs: modify device attach method\n usb: renesas_usbhs: pop packet when urb dequeued\n usb: renesas_usbhs: add lost error value when enqueue\n usb: gadget: mv_udc: replace some debug info\n usb: gadget: mv_udc: refine suspend/resume function\n usb: gadget: mv_udc: refine the clock relative code\n usb: gadget: mv_udc: disable ISR when stopped\n usb: gadget: mv_udc: add otg relative code\n usb: gadget: Use kcalloc instead of kzalloc to allocate array\n usb: renesas_usbhs: remove the_controller_link\n usb: renesas_usbhs: add test-mode support\n usb: renesas_usbhs: call usbhsg_queue_pop() when pipe disable.\n ...\n" }, { "commit": "494c167cf76d02000adf740c215adc69a824ecc9", "tree": "bf7cdf462b62ebf099b965f7bea503df30918c17", "parents": [ "94196f51c1ee5bbad674de28c682b17d78adb8e6" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Dec 12 18:12:22 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Dec 12 18:12:22 2011 -0800" }, "message": "cgroup: kill subsys-\u003ecan_attach_task(), pre_attach() and attach_task()\n\nThese three methods are no longer used. Kill them.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nAcked-by: Paul Menage \u003cpaul@paulmenage.org\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\n" }, { "commit": "2f7ee5691eecb67c8108b92001a85563ea336ac5", "tree": "18cf60ea8a463f4a6cd59c68926ba4357ae8ff4c", "parents": [ "134d33737f9015761c3832f6b268fae6274aac7f" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Dec 12 18:12:21 2011 -0800" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Mon Dec 12 18:12:21 2011 -0800" }, "message": "cgroup: introduce cgroup_taskset and use it in subsys-\u003ecan_attach(), cancel_attach() and attach()\n\nCurrently, there\u0027s no way to pass multiple tasks to cgroup_subsys\nmethods necessitating the need for separate per-process and per-task\nmethods. This patch introduces cgroup_taskset which can be used to\npass multiple tasks and their associated cgroups to cgroup_subsys\nmethods.\n\nThree methods - can_attach(), cancel_attach() and attach() - are\nconverted to use cgroup_taskset. This unifies passed parameters so\nthat all methods have access to all information. Conversions in this\npatchset are identical and don\u0027t introduce any behavior change.\n\n-v2: documentation updated as per Paul Menage\u0027s suggestion.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nReviewed-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nAcked-by: Paul Menage \u003cpaul@paulmenage.org\u003e\nAcked-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Balbir Singh \u003cbsingharora@gmail.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\n" }, { "commit": "c7c6575f254e5621a8408c29bdab0d704c3fab6e", "tree": "d0b399a480a8633be6373c035f6253e1a40987af", "parents": [ "0850f0f5c54261a6236f013e8bac154bcce424d6", "b5a1eeef04cc7859f34dec9b72ea1b28e4aba07c" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 12 19:26:07 2011 -0500" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 12 19:26:07 2011 -0500" }, "message": "Merge branch \u0027batman-adv/next\u0027 of git://git.open-mesh.org/linux-merge\n" }, { "commit": "5a6dd343770d2ae2c25f7a4b1998c091e6252f42", "tree": "2675741dd0e09d0099502da36cfb06a7b63dc746", "parents": [ "3aaabe2342c36bf48567b88fa78b819eee14bb5e" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Sun Dec 11 21:47:07 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 12 19:04:11 2011 -0500" }, "message": "Display current tcp memory allocation in kmem cgroup\n\nThis patch introduces kmem.tcp.usage_in_bytes file, living in the\nkmem_cgroup filesystem. It is a simple read-only file that displays the\namount of kernel memory currently consumed by the cgroup.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nReviewed-by: Hiroyouki Kamezawa \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nCC: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3aaabe2342c36bf48567b88fa78b819eee14bb5e", "tree": "1364c84c53ba6382f9a9df9d6f42a3bc37427d05", "parents": [ "3dc43e3e4d0b52197d3205214fe8f162f9e0c334" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Sun Dec 11 21:47:06 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 12 19:04:11 2011 -0500" }, "message": "tcp buffer limitation: per-cgroup limit\n\nThis patch uses the \"tcp.limit_in_bytes\" field of the kmem_cgroup to\neffectively control the amount of kernel memory pinned by a cgroup.\n\nThis value is ignored in the root cgroup, and in all others,\ncaps the value specified by the admin in the net namespaces\u0027\nview of tcp_sysctl_mem.\n\nIf namespaces are being used, the admin is allowed to set a\nvalue bigger than cgroup\u0027s maximum, the same way it is allowed\nto set pretty much unlimited values in a real box.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nReviewed-by: Hiroyouki Kamezawa \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nCC: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d1a4c0b37c296e600ffe08edb0db2dc1b8f550d7", "tree": "5c3675582cbbdc99f720aa1dcc1821e26c2be1ab", "parents": [ "e1aab161e0135aafcd439be20b4f35e4b0922d95" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Sun Dec 11 21:47:04 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 12 19:04:10 2011 -0500" }, "message": "tcp memory pressure controls\n\nThis patch introduces memory pressure controls for the tcp\nprotocol. It uses the generic socket memory pressure code\nintroduced in earlier patches, and fills in the\nnecessary data in cg_proto struct.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujtisu.com\u003e\nCC: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e1aab161e0135aafcd439be20b4f35e4b0922d95", "tree": "d0bcdf7a34a34020079238027b431ffc6dece307", "parents": [ "180d8cd942ce336b2c869d324855c40c5db478ad" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Sun Dec 11 21:47:03 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 12 19:04:10 2011 -0500" }, "message": "socket: initial cgroup code.\n\nThe goal of this work is to move the memory pressure tcp\ncontrols to a cgroup, instead of just relying on global\nconditions.\n\nTo avoid excessive overhead in the network fast paths,\nthe code that accounts allocated memory to a cgroup is\nhidden inside a static_branch(). This branch is patched out\nuntil the first non-root cgroup is created. So when nobody\nis using cgroups, even if it is mounted, no significant performance\npenalty should be seen.\n\nThis patch handles the generic part of the code, and has nothing\ntcp-specific.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujtsu.com\u003e\nCC: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nCC: David S. Miller \u003cdavem@davemloft.net\u003e\nCC: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nCC: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e5671dfae59b165e2adfd4dfbdeab11ac8db5bda", "tree": "daf5570e8da71934970daa4b2044c6f13ee98f9d", "parents": [ "08e34eb14fe4cfd934b5c169a7682a969457c4ea" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Sun Dec 11 21:47:01 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Dec 12 19:03:55 2011 -0500" }, "message": "Basic kernel memory functionality for the Memory Controller\n\nThis patch lays down the foundation for the kernel memory component\nof the Memory Controller.\n\nAs of today, I am only laying down the following files:\n\n * memory.independent_kmem_limit\n * memory.kmem.limit_in_bytes (currently ignored)\n * memory.kmem.usage_in_bytes (always zero)\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCC: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nCC: Paul Menage \u003cpaul@paulmenage.org\u003e\nCC: Greg Thelen \u003cgthelen@google.com\u003e\nCC: Johannes Weiner \u003cjweiner@redhat.com\u003e\nCC: Michal Hocko \u003cmhocko@suse.cz\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "007d00d4c11b30b8fd7ff23b9d5aed3743e41f74" }