)]}' { "log": [ { "commit": "437538267b672f9320833907f1b5acbb2605f4be", "tree": "d10173b35a5b86bc037bb2ece1b406d5575a2094", "parents": [ "9586c959bfc917695893bef0102433a7d0675691", "6bff98b455cf3e666fd0e3d0d908eba874de0eee" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:43:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:43:40 2012 -0700" }, "message": "Merge tag \u0027fbdev-updates-for-3.4\u0027 of git://github.com/schandinat/linux-2.6\n\nPull fbdev updates for 3.4 from Florian Tobias Schandinat:\n - drivers for Samsung Exynos MIPI DSI and display port\n - i740fb to support those old Intel chips\n - large updates to OMAP, viafb and sh_mobile_lcdcfb\n - some updates to s3c-fb and udlfb, few patches to others\n\nFix up conflicts in drivers/video/udlfb.c due to Key Sievers\u0027 fix making\nit in twice.\n\n* tag \u0027fbdev-updates-for-3.4\u0027 of git://github.com/schandinat/linux-2.6: (156 commits)\n Revert \"video:uvesafb: Fix oops that uvesafb try to execute NX-protected page\"\n OMAPDSS: register dss drivers in module init\n video: pxafb: add clk_prepare/clk_unprepare calls\n fbdev: bfin_adv7393fb: Drop needless include\n fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info\n fbdev: remove dependency of FB_SH_MOBILE_MERAM from FB_SH_MOBILE_LCDC\n Revert \"MAINTAINERS: add entry for exynos mipi display drivers\"\n fbdev: da8xx: add support for SP10Q010 display\n fbdev: da8xx:: fix reporting of the display timing info\n drivers/video/pvr2fb.c: ensure arguments to request_irq and free_irq are compatible\n OMAPDSS: APPLY: fix clearing shadow dirty flag with manual update\n fbdev: sh_mobile_meram: Implement system suspend/resume\n fbdev: sh_mobile_meram: Remove unneeded sanity checks\n fbdev: sh_mobile_meram: Don\u0027t perform update in register operation\n arm: mach-shmobile: Constify sh_mobile_meram_cfg structures\n fbdev: sh_mobile_lcdc: Don\u0027t store copy of platform data\n fbdev: sh_mobile_meram: Remove unused sh_mobile_meram_icb_cfg fields\n arm: mach-shmobile: Don\u0027t set MERAM ICB numbers in platform data\n fbdev: sh_mobile_meram: Allocate ICBs automatically\n fbdev: sh_mobile_meram: Use genalloc to manage MERAM allocation\n ...\n" }, { "commit": "9586c959bfc917695893bef0102433a7d0675691", "tree": "c8b89e40b7a04c3150e50785e7c48b67df360c83", "parents": [ "34699403e9916060af8ae23f5e4705a6c078e79d", "addfd8a09e1f434a73b3d87d36ef050c73511d2b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:33:14 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:33:14 2012 -0700" }, "message": "Merge tag \u0027regmap-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap\n\nPull regmap updates from Mark Brown:\n \"Things are really quieting down with the regmap API, while we\u0027re still\n seeing a trickle of new features coming in they\u0027re getting much\n smaller than they were. It\u0027s also nice to have some features which\n support other subsystems building infrastructure on top of regmap.\n Highlights include:\n\n - Support for padding between the register and the value when\n interacting with the device, sometimes needed for fast interfaces.\n - Support for applying register updates to the device when restoring\n the register state. This is intended to be used to apply updates\n supplied by manufacturers for tuning the performance of the device\n (many of which are to undocumented registers which aren\u0027t otherwise\n covered).\n - Support for multi-register operations on cached registers.\n - Support for syncing only part of the register cache.\n - Stubs and parameter query functions intended to make it easier for\n other subsystems to build infrastructure on top of the regmap API.\n\n plus a few driver updates making use of the new features which it was\n easier to merge via this tree.\"\n\n* tag \u0027regmap-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: (41 commits)\n regmap: Fix future missing prototype of devres_alloc() and friends\n regmap: Rejig struct declarations for stubbed API\n regmap: Fix rbtree block base in sync\n regcache: Make sure we sync register 0 in an rbtree cache\n regmap: delete unused module.h from drivers/base/regmap files\n regmap: Add stub for regcache_sync_region()\n mfd: Improve performance of later WM1811 revisions\n regmap: Fix x86_64 breakage\n regmap: Allow drivers to sync only part of the register cache\n regmap: Supply ranges to the sync operations\n regmap: Add tracepoints for cache only and cache bypass\n regmap: Mark the cache as clean after a successful sync\n regmap: Remove default cache sync implementation\n regmap: Skip hardware defaults for LZO caches\n regmap: Expose the driver name in debugfs\n mfd: wm8400: Convert to devm_regmap_init_i2c()\n mfd: wm831x: Convert to devm_regmap_init()\n mfd: wm8994: Convert to devm_regmap_init()\n mfd/ASoC: Convert WM8994 driver to use regmap patches\n mfd: Add __devinit and __devexit annotations in wm8994\n ...\n" }, { "commit": "34699403e9916060af8ae23f5e4705a6c078e79d", "tree": "e149ca6354171caf61132d80508ad878b00878c9", "parents": [ "7fc86a7908a4e9eb2da4b6498f86193d113842d3", "d1bbd20972936b9b178fda3eb1ec417cb27fdc01" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:31:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:31:15 2012 -0700" }, "message": "Merge tag \u0027firewire-updates\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394\n\nPull IEEE 1394 (FireWire) subsystem updates post v3.3 from Stefan Richter:\n\n - Some SBP-2 initiator fixes, side product from ongoing work on a target.\n\n - Reintroduction of an isochronous I/O feature of the older ieee1394 driver\n stack (flush buffer completions); it was evidently rarely used but not\n actually unused. Matching libraw1394 code is already available.\n\n - Be sure to prefix all kernel log messages with device name or card name,\n and other logging related cleanups.\n\n - Misc other small cleanups, among them a small API change that affects\n sound/firewire/ too. Clemens Ladisch is aware of it.\n\n* tag \u0027firewire-updates\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394: (26 commits)\n firewire: allow explicit flushing of iso packet completions\n firewire: prevent dropping of completed iso packet header data\n firewire: ohci: factor out iso completion flushing code\n firewire: ohci: simplify iso header pointer arithmetic\n firewire: ohci: optimize control bit checks\n firewire: ohci: remove unused excess_bytes field\n firewire: ohci: copy_iso_headers(): make comment match the code\n firewire: cdev: fix IR multichannel event documentation\n firewire: ohci: fix too-early completion of IR multichannel buffers\n firewire: ohci: move runtime debug facility out of #ifdef\n firewire: tone down some diagnostic log messages\n firewire: sbp2: replace a GFP_ATOMIC allocation\n firewire: sbp2: Fix SCSI sense data mangling\n firewire: sbp2: Ignore SBP-2 targets on the local node\n firewire: sbp2: Take into account Unit_Unique_ID\n firewire: nosy: Use the macro DMA_BIT_MASK().\n firewire: core: convert AR-req handler lock from _irqsave to _bh\n firewire: core: fix race at address_handler unregistration\n firewire: core: remove obsolete comment\n firewire: core: prefix log messages with card name\n ...\n" }, { "commit": "7fc86a7908a4e9eb2da4b6498f86193d113842d3", "tree": "c1b2faab48d2a6003c8e8efae5f356a4e792ce0a", "parents": [ "90597b6cfc1fc9926a4d54f09bbf5b3254b1b028", "51dddfe839a0ebcb5ff61a779e3f2768714f9957" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:25:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:25:50 2012 -0700" }, "message": "Merge tag \u0027pinctrl-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl\n\nPull pinctrl updates for v3.4 from Linus Walleij (*):\n - Switches the PXA 168, 910 and MMP over to use pinctrl\n - Locking revamped\n - Massive refactorings...\n - Reform the driver API to use multiple states\n - Support pin config in the mapping tables\n - Pinctrl drivers for the nVidia Tegra series\n - Generic pin config support lib for simple pin controllers\n - Implement pin config for the U300\n\n* tag \u0027pinctrl-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (48 commits)\n ARM: u300: configure some pins as an example\n pinctrl: support pinconfig on the U300\n pinctrl/coh901: use generic pinconf enums and parameters\n pinctrl: introduce generic pin config\n pinctrl: fix error path in pinconf_map_to_setting()\n pinctrl: allow concurrent gpio and mux function ownership of pins\n pinctrl: forward-declare struct device\n pinctrl: split pincontrol states into its own header\n pinctrl: include machine header to core.h\n ARM: tegra: Select PINCTRL Kconfig variables\n pinctrl: add a driver for NVIDIA Tegra\n pinctrl: Show selected function and group in pinmux-pins debugfs\n pinctrl: enhance mapping table to support pin config operations\n pinctrl: API changes to support multiple states per device\n pinctrl: add usecount to pins for muxing\n pinctrl: refactor struct pinctrl handling in core.c vs pinmux.c\n pinctrl: fix and simplify locking\n pinctrl: fix the pin descriptor kerneldoc\n pinctrl: assume map table entries can\u0027t have a NULL name field\n pinctrl: introduce PINCTRL_STATE_DEFAULT, define hogs as that state\n ...\n\n(*) What is it with all these Linuses these days? There\u0027s a Linus at\n google too. Some day I will get myself my own broadsword, and run\n around screaming \"There can be only one\".\n\n I used to be _special_ dammit. Snif.\n" }, { "commit": "7bfe0e66d5da32961f0060fc5d96b739b1ed64b9", "tree": "6d5dcf77248b574bb0c50930bbf9030aafb99fce", "parents": [ "6a76a6992341faab0ef31e7d97000e0cf336d0ba", "10ce3cc919f50c2043b41ca968b43c26a3672600" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:20:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:20:18 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\nPull input subsystem updates from Dmitry Torokhov:\n \"- we finally merged driver for USB version of Synaptics touchpads\n (I guess most commonly found in IBM/Lenovo keyboard/touchpad combo);\n\n - a bunch of new drivers for embedded platforms (Cypress\n touchscreens, DA9052 OnKey, MAX8997-haptic, Ilitek ILI210x\n touchscreens, TI touchscreen);\n\n - input core allows clients to specify desired clock source for\n timestamps on input events (EVIOCSCLOCKID ioctl);\n\n - input core allows querying state of all MT slots for given event\n code via EVIOCGMTSLOTS ioctl;\n\n - various driver fixes and improvements.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (45 commits)\n Input: ili210x - add support for Ilitek ILI210x based touchscreens\n Input: altera_ps2 - use of_match_ptr()\n Input: synaptics_usb - switch to module_usb_driver()\n Input: convert I2C drivers to use module_i2c_driver()\n Input: convert SPI drivers to use module_spi_driver()\n Input: omap4-keypad - move platform_data to \u003clinux/platform_data\u003e\n Input: kxtj9 - who_am_i check value and initial data rate fixes\n Input: add driver support for MAX8997-haptic\n Input: tegra-kbc - revise device tree support\n Input: of_keymap - add device tree bindings for simple key matrices\n Input: wacom - fix physical size calculation for 3rd-gen Bamboo\n Input: twl4030-vibra - really switch from #if to #ifdef\n Input: hp680_ts_input - ensure arguments to request_irq and free_irq are compatible\n Input: max8925_onkey - avoid accessing input device too early\n Input: max8925_onkey - allow to be used as a wakeup source\n Input: atmel-wm97xx - convert to dev_pm_ops\n Input: atmel-wm97xx - set driver owner\n Input: add cyttsp touchscreen maintainer entry\n Input: cyttsp - remove useless checks in cyttsp_probe()\n Input: usbtouchscreen - add support for Data Modul EasyTouch TP 72037\n ...\n" }, { "commit": "d4c6fa73fe984e504d52f3d6bba291fd76fe49f7", "tree": "47842ddebb2a48cc1513b36fba18835678e2b94e", "parents": [ "aab008db8063364dc3c8ccf4981c21124866b395", "4bc25af79ec54b79266148f8c1b84bb1e7ff2621" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 19:59:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 20:16:14 2012 -0700" }, "message": "Merge tag \u0027stable/for-linus-3.4-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\nPull xen updates from Konrad Rzeszutek Wilk:\n \"which has three neat features:\n\n - PV multiconsole support, so that there can be hvc1, hvc2, etc; This\n can be used in HVM and in PV mode.\n\n - P-state and C-state power management driver that uploads said power\n management data to the hypervisor. It also inhibits cpufreq\n scaling drivers to load so that only the hypervisor can make power\n management decisions - fixing a weird perf bug.\n\n There is one thing in the Kconfig that you won\u0027t like: \"default y\n if (X86_ACPI_CPUFREQ \u003d y || X86_POWERNOW_K8 \u003d y)\" (note, that it\n all depends on CONFIG_XEN which depends on CONFIG_PARAVIRT which by\n default is off). I\u0027ve a fix to convert that boolean expression\n into \"default m\" which I am going to post after the cpufreq git\n pull - as the two patches to make this work depend on a fix in Dave\n Jones\u0027s tree.\n\n - Function Level Reset (FLR) support in the Xen PCI backend.\n\n Fixes:\n\n - Kconfig dependencies for Xen PV keyboard and video\n - Compile warnings and constify fixes\n - Change over to use percpu_xxx instead of this_cpu_xxx\"\n\nFix up trivial conflicts in drivers/tty/hvc/hvc_xen.c due to changes to\na removed commit.\n\n* tag \u0027stable/for-linus-3.4-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen kconfig: relax INPUT_XEN_KBDDEV_FRONTEND deps\n xen/acpi-processor: C and P-state driver that uploads said data to hypervisor.\n xen: constify all instances of \"struct attribute_group\"\n xen/xenbus: ignore console/0\n hvc_xen: introduce HVC_XEN_FRONTEND\n hvc_xen: implement multiconsole support\n hvc_xen: support PV on HVM consoles\n xenbus: don\u0027t free other end details too early\n xen/enlighten: Expose MWAIT and MWAIT_LEAF if hypervisor OKs it.\n xen/setup/pm/acpi: Remove the call to boot_option_idle_override.\n xenbus: address compiler warnings\n xen: use this_cpu_xxx replace percpu_xxx funcs\n xen/pciback: Support pci_reset_function, aka FLR or D3 support.\n pci: Introduce __pci_reset_function_locked to be used when holding device_lock.\n xen: Utilize the restore_msi_irqs hook.\n" }, { "commit": "aab008db8063364dc3c8ccf4981c21124866b395", "tree": "72914203f4decb023efdaabd0301a62d742dfa8c", "parents": [ "4f5b1affdda3e0c48cac674182f52004137b0ffc", "16c0cfa425b8e1488f7a1873bd112a7a099325f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 19:52:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 19:52:47 2012 -0700" }, "message": "Merge tag \u0027stable/for-linus-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm\n\nPull cleancache changes from Konrad Rzeszutek Wilk:\n \"This has some patches for the cleancache API that should have been\n submitted a _long_ time ago. They are basically cleanups:\n\n - rename of flush to invalidate\n\n - moving reporting of statistics into debugfs\n\n - use __read_mostly as necessary.\n\n Oh, and also the MAINTAINERS file change. The files (except the\n MAINTAINERS file) have been in #linux-next for months now. The late\n addition of MAINTAINERS file is a brain-fart on my side - didn\u0027t\n realize I needed that just until I was typing this up - and I based\n that patch on v3.3 - so the tree is on top of v3.3.\"\n\n* tag \u0027stable/for-linus-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/mm:\n MAINTAINERS: Adding cleancache API to the list.\n mm: cleancache: Use __read_mostly as appropiate.\n mm: cleancache: report statistics via debugfs instead of sysfs.\n mm: zcache/tmem/cleancache: s/flush/invalidate/\n mm: cleancache: s/flush/invalidate/\n" }, { "commit": "09fa30226130652af75152d9010c603c66d46f6e", "tree": "26dc4ba7fc66dc0c10e442d81595dd319eef4c75", "parents": [ "be53bfdb8088e9d1924199cc1a96e113756b1075", "1b2681ba271c9f5bb66cb0d8ceeaa215fcd218d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:23:46 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:23:46 2012 -0700" }, "message": "Merge branch \u0027drm-radeon-sitn-support\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull radeon southern islands / trinity support from Dave Airlie:\n \"This is support from AMD for their newest GPU and APUs. The products\n called RadeonHD 7xxx, and the Trinity APU series.\n\n This did come in a bit late, due to some over-complicated AMD internal\n review process, which from the outside seems unnecessary once the\n company has decided it wants to support open source. However as I\n said previously I\u0027d rather not put the people who\u0027ve got this hw for 3\n months now being forced to use fglrx on it if there is open code.\n\n Its pretty well self contained and just plugs into the driver in\n various places.\"\n\n* \u0027drm-radeon-sitn-support\u0027 of git://people.freedesktop.org/~airlied/linux: (48 commits)\n drm/radeon/kms: update duallink checks for DCE6\n drm/radeon/kms: add trinity pci ids\n drm/radeon/kms: add radeon_asic struct for trinity\n drm/radeon/kms: add support for ucode loading on trinity (v2)\n drm/radeon/kms/vm: set vram base offset properly for TN\n drm/radeon/kms: Update evergreen functions for trinity\n drm/radeon/kms: cayman gpu init updates for trinity\n drm/radeon/kms: Add checks for TN in the DP bridge code\n drm/radeon/kms/DCE6.1: ss is not supported on the internal pplls\n drm/radeon/kms: disable PPLL0 on DCE6.1 when not in use\n drm/radeon/kms: Adjust pll picker for DCE6.1\n drm/radeon/kms: DCE6.1 disp eng pll updates\n drm/radeon/kms: DCE6.1 watermark updates for TN\n drm/radeon/kms: no support for internal thermal sensor on TN yet\n drm/radeon/kms: add trinity (TN) chip family\n drm/radeon/kms: Add SI pci ids\n drm/radeon: Update radeon_info_ioctl for SI. (v2)\n drm/radeon/kms: add radeon_asic struct for SI\n drm/radeon/kms: add support for compute rings in CS ioctl on SI\n drm/radeon/kms: fill in startup/shutdown callbacks for SI\n ...\n" }, { "commit": "be53bfdb8088e9d1924199cc1a96e113756b1075", "tree": "8c65eb9d82ca4c0f11c17cfdc44d5263820b415b", "parents": [ "b2094ef840697bc8ca5d17a83b7e30fad5f1e9fa", "5466c7b1683a23dbbcfb7ee4a71c4f23886001c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:08:22 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:08:22 2012 -0700" }, "message": "Merge branch \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm main changes from Dave Airlie:\n \"This is the main drm pull request, I\u0027m probably going to send two more\n smaller ones, will explain below.\n\n This contains a patch that is also in the fbdev tree, but it should be\n the same patch, it added an API for hot unplugging framebuffer\n devices, and I need that API for a new driver.\n\n It also contains some changes to the i2c tree which Jean has acked,\n and one change to moorestown platform stuff in x86.\n\n Highlights:\n - new drivers: UDL driver for USB displaylink devices, kms only,\n should support correct hotplug operations.\n - core: i2c speedups + better hotplug support, EDID overriding via\n firmware interface - allows user to load a firmware for a broken\n monitor/kvm from userspace, it even has documentation for it.\n - exynos: new HDMI audio + hdmi 1.4 + virtual output driver\n - gma500: code cleanup\n - radeon: cleanups, CS optimisations, streamout support and pageflip\n fix\n - nouveau: NVD9 displayport support + more reclocking work\n - i915: re-enabling GMBUS, finish gpu patch (might help hibernation\n who knows), missed irq fixes, stencil tiling fixes, interlaced\n support, aliasesd PPGTT support for SNB/IVB, swizzling for SNB/IVB,\n semaphore fixes\n\n As well as the usual bunch of cleanups and fixes all over the place.\n\n I\u0027ve got two things I\u0027d like to merge a bit later:\n\n a) AMD support for all their new radeonhd 7000 series GPU and APUs.\n AMD dropped this a bit late due to insane internal review\n processes, (please AMD just follow Intel and let open source guys\n ship stuff early) however I don\u0027t want to penalise people who own\n this hardware (since its been on sale for 3-4 months and GPU hw\n doesn\u0027t exactly have a lifetime in years) and consign them to\n using closed drivers for longer than necessary. The changes are\n well contained and just plug into the driver new gpu functionality\n so they should be fairly regression proof. I just want to give\n them a bit of a run on the hw AMD kindly sent me.\n\n b) drm prime/dma-buf interface code. This is just infrastructure\n code to expose the dma-buf stuff to drm drivers and to userspace.\n I\u0027m not planning on pushing any driver support in this cycle\n (except maybe exynos), but I\u0027d like to get the infrastructure code\n in so for the next cycle I can start getting the driver support\n into the individual drivers. We have started driver support for\n i915, nouveau and udl along with I think exynos and omap in\n staging. However this code relies on the dma-buf tree being\n pulled into your tree first since it needs the latest interfaces\n from that tree. I\u0027ll push to get that tree sent asap.\n\n (oh and any warnings you see in i915 are gcc\u0027s fault from what anyone\n can see).\"\n\nFix up trivial conflicts in arch/x86/platform/mrst/mrst.c due to the new\nmsic_thermal_platform_data() thermal function being added next to the\ntc35876x_platform_data() i2c device function..\n\n* \u0027drm-next\u0027 of git://people.freedesktop.org/~airlied/linux: (326 commits)\n drm/i915: use DDC_ADDR instead of hard-coding it\n drm/radeon: use DDC_ADDR instead of hard-coding it\n drm: remove unneeded redefinition of DDC_ADDR\n drm/exynos: added virtual display driver.\n drm: allow loading an EDID as firmware to override broken monitor\n drm/exynos: enable hdmi audio feature\n drm/exynos: add default pixel format for plane\n drm/exynos: cleanup exynos_hdmi.h\n drm/exynos: add is_local member in exynos_drm_subdrv struct\n drm/exynos: add subdrv open/close functions\n drm/exynos: remove module of exynos drm subdrv\n drm/exynos: release pending pageflip events when closed\n drm/exynos: added new funtion to get/put dma address.\n drm/exynos: update gem and buffer framework.\n drm/exynos: added mode_fixup feature and code clean.\n drm/exynos: add HDMI version 1.4 support\n drm/exynos: remove exynos_mixer.h\n gma500: Fix mmap frambuffer\n drm/radeon: Drop radeon_gem_object_(un)pin.\n drm/radeon: Restrict offset for legacy display engine.\n ...\n" }, { "commit": "b2094ef840697bc8ca5d17a83b7e30fad5f1e9fa", "tree": "64e5f7253b6a85b6d5d36f95c0d3c67c1798918d", "parents": [ "424a6f6ef990b7e9f56f6627bfc6c46b493faeb4", "6681bc0deba495fad0d6fb349e40524abd1b1732" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:00:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 13:00:13 2012 -0700" }, "message": "Merge tag \u0027sound-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull updates of sound stuff from Takashi Iwai:\n \"Here is the first big update chunk of sound stuff for 3.4-rc1.\n\n In the common sound infrastructure, there are a few changes for\n dynamic PCM support (used in ASoC) and a few clean-ups. Majority of\n changes are found, as usual, in HD-audio and ASoC.\n\n Some highlights of HD-audio changes:\n\n - All the long-standing static quirk codes for Realtek codec were\n finally removed by fixing and extending the Realtek auto-parser.\n\n - The mute-LED control is standardized over all HD-audio codec\n drivers using the extended vmaster hook.\n\n - The vmaster slave mixer elements are initialized to 0dB as default\n so that the user won\u0027t be annoyed by the silent output after\n updates, e.g. due to the additions of new elements.\n\n - Other many fix-ups for the misc HD-audio devices.\n\n In the ASoC side, this is a very active release, including a quite a\n few framework enhancements. Some highlights:\n\n - Support for widgets not associated with a CODEC, an important part\n of the dynamic PCM framework.\n\n - A library factoring out the common code shared by dmaengine based\n DMA drivers contributed by Lars-Peter Clausen. This will save a\n lot of code and make it much easier to deploy enhancements to\n dmaengine.\n\n - Support for binary controls, used for providing runtime\n configuration of algorithm coefficients.\n\n - A new DAPM widget type for regulator supplies allowing drivers for\n devices that can power down unused supplies while active to do\n without any per-driver code.\n\n - DAPM widgets for DAIs, initially giving a speed boost for playback\n startup and shutdown and also the basis for CODEC\u003c-\u003eCODEC DAI link\n support.\n\n - Support for specifying the number of significant bits on audio\n interfaces, useful for allowing applications to know how much\n effort to put into generating data for a larger sample format.\n\n - Conversion of the FSI driver used on some SH processors to\n DMAEngine.\n\n - Conversion of EP93xx drivers to DMAEngine.\n\n - New CODEC drivers for Maxim MAX9768 and Wolfson Microelectronics\n WM2200.\n\n - Move audmux driver from arc/arm to sound/soc\n\n - McBSP move from arch/ to sound/ and updates\n\n Also, a few small updates and fixes for other drivers like au88x0,\n ymfpci, USB 6fire, USB usx2yaudio are included.\"\n\n* tag \u0027sound-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (446 commits)\n ASoC: wm8994: Provide VMID mode control and fix default sequence\n ASoC: wm8994: Add missing break in resume\n ASoC: wm_hubs: Don\u0027t actively manage LINEOUT_VMID_BUF\n ASoC: pxa-ssp: atomically set stream active masks\n ASoC: fsl: p1022ds: tell the WM8776 codec driver that it\u0027s the master\n ASoC: Samsung: Added to support mono recording\n ALSA: hda - Fix build with CONFIG_PM\u003dn\n ALSA: au88x0 - Avoid possible Oops at unbinding\n ALSA: usb-audio - Fix build error by consitification of rate list\n ASoC: core: Fix obscure leak of runtime array\n ALSA: pcm - Avoid GFP_ATOMIC in snd_pcm_link()\n ALSA: pcm: Constify the list in snd_pcm_hw_constraint_list\n ASoC: wm8996: Add 44.1kHz support\n ALSA: hda - Fix build of patch_sigmatel.c without CONFIG_SND_HDA_POWER_SAVE\n ASoC: mx27vis-aic32x4: Convert it to platform driver\n ALSA: hda - fix printing of high HDMI sample rates\n ALSA: ymfpci - Fix legacy registers on S3/S4 resume\n ALSA: control - Fixe a trailing white space error\n ALSA: hda - Add expose_enum_ctl flag to snd_hda_add_vmaster_hook()\n ALSA: hda - Add \"Mute-LED Mode\" enum control\n ...\n" }, { "commit": "424a6f6ef990b7e9f56f6627bfc6c46b493faeb4", "tree": "0028356ed8003495fbbe1f716f359e3c8ebc35b6", "parents": [ "1ab142d499294b844ecc81e8004db4ce029b0b61", "cd8df932d894f3128c884e3ae1b2b484540513db" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 12:55:29 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 12:55:29 2012 -0700" }, "message": "Merge tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\nSCSI updates from James Bottomley:\n \"The update includes the usual assortment of driver updates (lpfc,\n qla2xxx, qla4xxx, bfa, bnx2fc, bnx2i, isci, fcoe, hpsa) plus a huge\n amount of infrastructure work in the SAS library and transport class\n as well as an iSCSI update. There\u0027s also a new SCSI based virtio\n driver.\"\n\n* tag \u0027scsi-misc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (177 commits)\n [SCSI] qla4xxx: Update driver version to 5.02.00-k15\n [SCSI] qla4xxx: trivial cleanup\n [SCSI] qla4xxx: Fix sparse warning\n [SCSI] qla4xxx: Add support for multiple session per host.\n [SCSI] qla4xxx: Export CHAP index as sysfs attribute\n [SCSI] scsi_transport: Export CHAP index as sysfs attribute\n [SCSI] qla4xxx: Add support to display CHAP list and delete CHAP entry\n [SCSI] iscsi_transport: Add support to display CHAP list and delete CHAP entry\n [SCSI] pm8001: fix endian issue with code optimization.\n [SCSI] pm8001: Fix possible racing condition.\n [SCSI] pm8001: Fix bogus interrupt state flag issue.\n [SCSI] ipr: update PCI ID definitions for new adapters\n [SCSI] qla2xxx: handle default case in qla2x00_request_firmware()\n [SCSI] isci: improvements in driver unloading routine\n [SCSI] isci: improve phy event warnings\n [SCSI] isci: debug, provide state-enum-to-string conversions\n [SCSI] scsi_transport_sas: \u0027enable\u0027 phys on reset\n [SCSI] libsas: don\u0027t recover end devices attached to disabled phys\n [SCSI] libsas: fixup target_port_protocols for expanders that don\u0027t report sata\n [SCSI] libsas: set attached device type and target protocols for local phys\n ...\n" }, { "commit": "1ab142d499294b844ecc81e8004db4ce029b0b61", "tree": "9db85a456d0cba3de8b9bd6671b1b52fa939770c", "parents": [ "267d7b23dd62f6ec55e0fba777e456495c308fc7", "187e70a554e0f0717a65998bc9199945cbbd4692" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 12:38:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 12:38:04 2012 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending\n\nPull SCSI target updates from Nicholas Bellinger:\n \"This contains the usual set of updates and bugfixes to target-core +\n existing fabric module code, along with a handful of the patches\n destined for v3.3 stable.\n\n It also contains the necessary target-core infrastructure pieces\n required to run using tcm_qla2xxx.ko WWPNs with the new Qlogic Fibre\n Channel fabric module currently queued in target-pending/for-next-merge,\n and coming for round 2.\n\n The highlights for this series include:\n\n - Add target_submit_tmr() helper function for fabric task management\n (andy)\n - Convert tcm_fc to use target_submit_tmr() (andy)\n - Replace target core various cmd flags with a transport state (hch)\n - Convert loopback to use workqueue submission (hch)\n - Convert target core to use array_zalloc for tpg_lun_list (joern)\n - Convert target core to use array_zalloc for device_list (joern)\n - Add target core support for TMR_ABORT_TASK (nab)\n - Add target core se_sess-\u003esess_kref + get/put helpers (nab)\n - Add target core se_node_acl-\u003eacl_kref for -\u003eacl_free_comp usage\n (nab)\n - Convert iscsi-target to use target_put_session + sess_kref (nab)\n - Fix tcm_fc fc_exch memory leak in ft_send_resp_status (nab)\n - Fix ib_srpt srpt_handle_cmd send_ioctx-\u003eioctx_kref leak on\n exception (nab)\n - Fix target core up handling of short INQUIRY buffers (roland)\n - Untangle target-core front-end and back-end meanings of max_sectors\n attribute (roland)\n - Set loopback residual field for SCSI commands (roland)\n - Fix target-core 16-bit target ports for SET TARGET PORT GROUPS\n emulation (roland)\n\n Thanks again to Andy, Christoph, Joern, Roland, and everyone who has\n contributed this round!\"\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (64 commits)\n ib_srpt: Fix srpt_handle_cmd send_ioctx-\u003eioctx_kref leak on exception\n loopback: Fix transport_generic_allocate_tasks error handling\n iscsi-target: remove improper externs\n iscsi-target: Remove unused variables in iscsi_target_parameters.c\n target: remove obvious warnings\n target: Use array_zalloc for device_list\n target: Use array_zalloc for tpg_lun_list\n target: Fix sense code for unsupported SERVICE ACTION IN\n target: Remove hack to make READ CAPACITY(10) lie if thin provisioning is enabled\n target: Bump core version to v4.1.0-rc2-ml + fabric versions\n tcm_fc: Fix fc_exch memory leak in ft_send_resp_status\n target: Drop unused legacy target_core_fabric_ops API callers\n iscsi-target: Convert to use target_put_session + sess_kref\n target: Convert se_node_acl-\u003eacl_group removal to use -\u003eacl_kref\n target: Add se_node_acl-\u003eacl_kref for -\u003eacl_free_comp usage\n target: Add se_node_acl-\u003eacl_free_comp for NodeACL release path\n target: Add se_sess-\u003esess_kref + get/put helpers\n target: Convert session_lock to irqsave\n target: Fix typo in drivers/target\n iscsi-target: Fix dynamic -\u003e explict NodeACL pointer reference\n ...\n" }, { "commit": "267d7b23dd62f6ec55e0fba777e456495c308fc7", "tree": "5c9fe0f07d5b87029b9c07eb003596c05d161a8f", "parents": [ "28f23d1f3b6a6078312b6e9585e583cc7326fe22", "ecb178bb2b154a40cfae9fa4c42e62ccfa81ac6b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 12:29:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 12:29:50 2012 -0700" }, "message": "Merge tag \u0027md-3.4\u0027 of git://neil.brown.name/md\n\nPull md updates for 3.4 from Neil Brown:\n \"Mostly tidying up code in preparation for some bigger changes next\n time.\n\n A few bug fixes tagged for -stable.\n\n Main functionality change is that some RAID10 arrays can now grow to\n use extra space that may have been made available on the individual\n devices.\"\n\nFixed up trivial conflicts with the k[un]map_atomic() cleanups in\ndrivers/md/bitmap.c.\n\n* tag \u0027md-3.4\u0027 of git://neil.brown.name/md: (22 commits)\n md: Add judgement bb-\u003eunacked_exist in function md_ack_all_badblocks().\n md: fix clearing of the \u0027changed\u0027 flags for the bad blocks list.\n md/bitmap: discard CHUNK_BLOCK_SHIFT macro\n md/bitmap: remove unnecessary indirection when allocating.\n md/bitmap: remove some pointless locking.\n md/bitmap: change a \u0027goto\u0027 to a normal \u0027if\u0027 construct.\n md/bitmap: move printing of bitmap status to bitmap.c\n md/bitmap: remove some unused noise from bitmap.h\n md/raid10 - support resizing some RAID10 arrays.\n md/raid1: handle merge_bvec_fn in member devices.\n md/raid10: handle merge_bvec_fn in member devices.\n md: add proper merge_bvec handling to RAID0 and Linear.\n md: tidy up rdev_for_each usage.\n md/raid1,raid10: avoid deadlock during resync/recovery.\n md/bitmap: ensure to load bitmap when creating via sysfs.\n md: don\u0027t set md arrays to readonly on shutdown.\n md: allow re-add to failed arrays.\n md/raid5: use atomic_dec_return() instead of atomic_dec() and atomic_read().\n md: Use existed macros instead of numbers\n md/raid5: removed unused \u0027added_devices\u0027 variable.\n ...\n" }, { "commit": "23904815461ba223a8baf7490051597fa054299b", "tree": "2d52ce8ff18c4f731183d0b10048eb74489a3391", "parents": [ "754b9800779402924fffe456b49d557e15260cbf", "fa63030e9c79e37b4d4e63b39ffb09cfb7aa0fe4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:42:36 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:43:22 2012 -0700" }, "message": "Merge branch \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 platform changes from Ingo Molnar.\n\nRemoves the Moorestown platform that nobody ever used.\n\n* \u0027x86-platform-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86/platform: Move APIC ID validity check into platform APIC code\n x86/olpc/xo15/sci: Enable lid close wakeup control\n x86/geode/net5501: Add platform driver for Soekris Engineering net5501\n x86/geode/alix2: Supplement driver to include GPIO button support\n x86/mid/powerbtn: Use MSIC read/write instead of ipc_scu\n x86/mid/thermal: Turn off thermistor\n x86/mid/thermal: Add msic_thermal alias\n x86/mid/thermal: Convert to use Intel MSIC API\n x86/mid/scu_ipc: Remove Moorestown support\n x86/mid: Kill off Moorestown\n x86/mrst: Add msic_thermal platform support\n x86/config: Select MSIC MFD driver on Intel Medfield platform\n x86/mid: Remove Intel Moorestown\n x86/mrst: Set ISA bus type for fake MP IRQs\n x86/ioapic: Use legacy_pic to set correct gsi-irq mapping\n" }, { "commit": "754b9800779402924fffe456b49d557e15260cbf", "tree": "0e0441eca766616fccd8fc37a3885397efc6063a", "parents": [ "35cb8d9e18c0bb33b90d7e574abadbe23b65427d", "ea281a9ebaba3287130dbe15bb0aad6f798bb06b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:42:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:42:04 2012 -0700" }, "message": "Merge branch \u0027x86-mce-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull MCE changes from Ingo Molnar.\n\n* \u0027x86-mce-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86/mce: Fix return value of mce_chrdev_read() when erst is disabled\n x86/mce: Convert static array of pointers to per-cpu variables\n x86/mce: Replace hard coded hex constants with symbolic defines\n x86/mce: Recognise machine check bank signature for data path error\n x86/mce: Handle \"action required\" errors\n x86/mce: Add mechanism to safely save information in MCE handler\n x86/mce: Create helper function to save addr/misc when needed\n HWPOISON: Add code to handle \"action required\" errors.\n HWPOISON: Clean up memory_failure() vs. __memory_failure()\n" }, { "commit": "f06fc0c0de0b4f01dbad8ec5552e78192c7abbb8", "tree": "d31b0639244cbcaca2957b1c0c6c05686d4aeffa", "parents": [ "4c64616bb51b399886ded8f4f69bad4da2da1817", "1adbfa3511ee1c1118e16a9a0246870f12fef4e6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:31:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:31:31 2012 -0700" }, "message": "Merge branch \u0027x86-eficross-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86/eficross (booting 32/64-bit kernel from 64/32-bit EFI) from Ingo Molnar\n\n* \u0027x86-eficross-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86, efi: Allow basic init with mixed 32/64-bit efi/kernel\n x86, efi: Add basic error handling\n x86, efi: Cleanup config table walking\n x86, efi: Convert printk to pr_*()\n x86, efi: Refactor efi_init() a bit\n" }, { "commit": "e17fdf5c6778ff77d93dd769910992e4073b9348", "tree": "d1a7ca2b1faf4301b39300fbd82f9b91e605a77e", "parents": [ "95211279c5ad00a317c98221d7e4365e02f20836", "a240ada241dafe290e7532d1ddeb98fdf1419068" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:13:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:13:24 2012 -0700" }, "message": "Merge branch \u0027x86-asm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86/asm changes from Ingo Molnar\n\n* \u0027x86-asm-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86: Include probe_roms.h in probe_roms.c\n x86/32: Print control and debug registers for kerenel context\n x86: Tighten dependencies of CPU_SUP_*_32\n x86/numa: Improve internode cache alignment\n x86: Fix the NMI nesting comments\n x86-64: Improve insn scheduling in SAVE_ARGS_IRQ\n x86-64: Fix CFI annotations for NMI nesting code\n bitops: Add missing parentheses to new get_order macro\n bitops: Optimise get_order()\n bitops: Adjust the comment on get_order() to describe the size\u003d\u003d0 case\n x86/spinlocks: Eliminate TICKET_MASK\n x86-64: Handle byte-wise tail copying in memcpy() without a loop\n x86-64: Fix memcpy() to support sizes of 4Gb and above\n x86-64: Fix memset() to support sizes of 4Gb and above\n x86-64: Slightly shorten copy_page()\n" }, { "commit": "95211279c5ad00a317c98221d7e4365e02f20836", "tree": "2ddc8625378d2915b8c96392f3cf6663b705ed55", "parents": [ "5375871d432ae9fc581014ac117b96aaee3cd0c7", "12724850e8064f64b6223d26d78c0597c742c65a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:04:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Mar 22 09:04:48 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge first batch of patches from Andrew Morton:\n \"A few misc things and all the MM queue\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (92 commits)\n memcg: avoid THP split in task migration\n thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE\n memcg: clean up existing move charge code\n mm/memcontrol.c: remove unnecessary \u0027break\u0027 in mem_cgroup_read()\n mm/memcontrol.c: remove redundant BUG_ON() in mem_cgroup_usage_unregister_event()\n mm/memcontrol.c: s/stealed/stolen/\n memcg: fix performance of mem_cgroup_begin_update_page_stat()\n memcg: remove PCG_FILE_MAPPED\n memcg: use new logic for page stat accounting\n memcg: remove PCG_MOVE_LOCK flag from page_cgroup\n memcg: simplify move_account() check\n memcg: remove EXPORT_SYMBOL(mem_cgroup_update_page_stat)\n memcg: kill dead prev_priority stubs\n memcg: remove PCG_CACHE page_cgroup flag\n memcg: let css_get_next() rely upon rcu_read_lock()\n cgroup: revert ss_id_lock to spinlock\n idr: make idr_get_next() good for rcu_read_lock()\n memcg: remove unnecessary thp check in page stat accounting\n memcg: remove redundant returns\n memcg: enum lru_list lru\n ...\n" }, { "commit": "5375871d432ae9fc581014ac117b96aaee3cd0c7", "tree": "be98e8255b0f927fb920fb532a598b93fa140dbe", "parents": [ "b57cb7231b2ce52d3dda14a7b417ae125fb2eb97", "dfbc2d75c1bd47c3186fa91f1655ea2f3825b0ec" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 18:55:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 18:55:10 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\nPull powerpc merge from Benjamin Herrenschmidt:\n \"Here\u0027s the powerpc batch for this merge window. It is going to be a\n bit more nasty than usual as in touching things outside of\n arch/powerpc mostly due to the big iSeriesectomy :-) We finally got\n rid of the bugger (legacy iSeries support) which was a PITA to\n maintain and that nobody really used anymore.\n\n Here are some of the highlights:\n\n - Legacy iSeries is gone. Thanks Stephen ! There\u0027s still some bits\n and pieces remaining if you do a grep -ir series arch/powerpc but\n they are harmless and will be removed in the next few weeks\n hopefully.\n\n - The \u0027fadump\u0027 functionality (Firmware Assisted Dump) replaces the\n previous (equivalent) \"pHyp assisted dump\"... it\u0027s a rewrite of a\n mechanism to get the hypervisor to do crash dumps on pSeries, the\n new implementation hopefully being much more reliable. Thanks\n Mahesh Salgaonkar.\n\n - The \"EEH\" code (pSeries PCI error handling \u0026 recovery) got a big\n spring cleaning, motivated by the need to be able to implement a\n new backend for it on top of some new different type of firwmare.\n\n The work isn\u0027t complete yet, but a good chunk of the cleanups is\n there. Note that this adds a field to struct device_node which is\n not very nice and which Grant objects to. I will have a patch soon\n that moves that to a powerpc private data structure (hopefully\n before rc1) and we\u0027ll improve things further later on (hopefully\n getting rid of the need for that pointer completely). Thanks Gavin\n Shan.\n\n - I dug into our exception \u0026 interrupt handling code to improve the\n way we do lazy interrupt handling (and make it work properly with\n \"edge\" triggered interrupt sources), and while at it found \u0026 fixed\n a wagon of issues in those areas, including adding support for page\n fault retry \u0026 fatal signals on page faults.\n\n - Your usual random batch of small fixes \u0026 updates, including a bunch\n of new embedded boards, both Freescale and APM based ones, etc...\"\n\nI fixed up some conflicts with the generalized irq-domain changes from\nGrant Likely, hopefully correctly.\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (141 commits)\n powerpc/ps3: Do not adjust the wrapper load address\n powerpc: Remove the rest of the legacy iSeries include files\n powerpc: Remove the remaining CONFIG_PPC_ISERIES pieces\n init: Remove CONFIG_PPC_ISERIES\n powerpc: Remove FW_FEATURE ISERIES from arch code\n tty/hvc_vio: FW_FEATURE_ISERIES is no longer selectable\n powerpc/spufs: Fix double unlocks\n powerpc/5200: convert mpc5200 to use of_platform_populate()\n powerpc/mpc5200: add options to mpc5200_defconfig\n powerpc/mpc52xx: add a4m072 board support\n powerpc/mpc5200: update mpc5200_defconfig to fit for charon board\n Documentation/powerpc/mpc52xx.txt: Checkpatch cleanup\n powerpc/44x: Add additional device support for APM821xx SoC and Bluestone board\n powerpc/44x: Add support PCI-E for APM821xx SoC and Bluestone board\n MAINTAINERS: Update PowerPC 4xx tree\n powerpc/44x: The bug fixed support for APM821xx SoC and Bluestone board\n powerpc: document the FSL MPIC message register binding\n powerpc: add support for MPIC message register API\n powerpc/fsl: Added aliased MSIIR register address to MSI node in dts\n powerpc/85xx: mpc8548cds - add 36-bit dts\n ...\n" }, { "commit": "ad12ab259d9131a53aa11c7c4561d97f7cc900df", "tree": "457e99e4c4b1facf029a6a094428eaef73f5d261", "parents": [ "30d73f375238441d6dc31de0d90bc39f5bb0bfe5", "220cca2a4f5867db595135e0450381032eb54902" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 18:00:03 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 18:00:03 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw\n\nPull gfs2 changes from Steven Whitehouse.\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-nmw:\n GFS2: Change truncate page allocation to be GFP_NOFS\n GFS2: call gfs2_write_alloc_required for each chunk\n GFS2: Clean up log flush header writing\n GFS2: Remove a __GFP_NOFAIL allocation\n GFS2: Flush pending glock work when evicting an inode\n GFS2: make sure rgrps are up to date in func gfs2_blk2rgrpd\n GFS2: Eliminate sd_rindex_mutex\n GFS2: Unlock rindex mutex on glock error\n GFS2: Make bd_cmp() static\n GFS2: Sort the ordered write list\n GFS2: FITRIM ioctl support\n GFS2: Move two functions from log.c to lops.c\n GFS2: glock statistics gathering\n" }, { "commit": "d8c37c480678ebe09bc570f33e085e28049db035", "tree": "c8c53fde803f1a9655f44193c97db76dc4a90fe1", "parents": [ "8d32ff84401f1addb961c7af2c8d9baceb0ab9ba" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Wed Mar 21 16:34:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:55:02 2012 -0700" }, "message": "thp: add HPAGE_PMD_* definitions for !CONFIG_TRANSPARENT_HUGEPAGE\n\nThese macros will be used in a later patch, where all usages are expected\nto be optimized away without #ifdef CONFIG_TRANSPARENT_HUGEPAGE. But to\ndetect unexpected usages, we convert the existing BUG() to BUILD_BUG().\n\n[akpm@linux-foundation.org: fix build in mm/pgtable-generic.c]\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nAcked-by: Hillf Danton \u003cdhillf@gmail.com\u003e\nReviewed-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Daisuke Nishimura \u003cnishimura@mxp.nes.nec.co.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4331f7d339ee0b54603344b9d13662a9c022540c", "tree": "ea67ad19a4dff0f8bf7d335bb7ab148ecfb4d329", "parents": [ "2ff76f1193f8481f7e6c29304eea4006e8e51569" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Mar 21 16:34:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:55:02 2012 -0700" }, "message": "memcg: fix performance of mem_cgroup_begin_update_page_stat()\n\nmem_cgroup_begin_update_page_stat() should be very fast because it\u0027s\ncalled very frequently. Now, it needs to look up page_cgroup and its\nmemcg....this is slow.\n\nThis patch adds a global variable to check \"any memcg is moving or not\".\nWith this, the caller doesn\u0027t need to visit page_cgroup and memcg.\n\nHere is a test result. A test program makes page faults onto a file,\nMAP_SHARED and makes each page\u0027s page_mapcount(page) \u003e 1, and free the\nrange by madvise() and page fault again. This program causes 26214400\ntimes of page fault onto a file(size was 1G.) and shows shows the cost of\nmem_cgroup_begin_update_page_stat().\n\nBefore this patch for mem_cgroup_begin_update_page_stat()\n\n [kamezawa@bluextal test]$ time ./mmap 1G\n\n real 0m21.765s\n user 0m5.999s\n sys 0m15.434s\n\n 27.46% mmap mmap [.] reader\n 21.15% mmap [kernel.kallsyms] [k] page_fault\n 9.17% mmap [kernel.kallsyms] [k] filemap_fault\n 2.96% mmap [kernel.kallsyms] [k] __do_fault\n 2.83% mmap [kernel.kallsyms] [k] __mem_cgroup_begin_update_page_stat\n\nAfter this patch\n\n [root@bluextal test]# time ./mmap 1G\n\n real 0m21.373s\n user 0m6.113s\n sys 0m15.016s\n\nIn usual path, calls to __mem_cgroup_begin_update_page_stat() goes away.\n\nNote: we may be able to remove this optimization in future if\n we can get pointer to memcg directly from struct page.\n\n[akpm@linux-foundation.org: don\u0027t return a void]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Greg Thelen \u003cgthelen@google.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Ying Han \u003cyinghan@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": "2ff76f1193f8481f7e6c29304eea4006e8e51569", "tree": "a263678dc298e29a0c54bb2e6f98bb1d5ee19751", "parents": [ "89c06bd52fb9ffceddf84f7309d2e8c9f1666216" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Mar 21 16:34:25 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:55:01 2012 -0700" }, "message": "memcg: remove PCG_FILE_MAPPED\n\nWith the new lock scheme for updating memcg\u0027s page stat, we don\u0027t need a\nflag PCG_FILE_MAPPED which was duplicated information of page_mapped().\n\n[hughd@google.com: cosmetic fix]\n[hughd@google.com: add comment to MEM_CGROUP_CHARGE_TYPE_MAPPED case in __mem_cgroup_uncharge_common()]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Greg Thelen \u003cgthelen@google.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Ying Han \u003cyinghan@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": "89c06bd52fb9ffceddf84f7309d2e8c9f1666216", "tree": "43ec3d97a89988bc143bed5796bcd7bef64212dc", "parents": [ "312734c04e2fecc58429aec98194e4ff12d8f7d6" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Mar 21 16:34:25 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:55:01 2012 -0700" }, "message": "memcg: use new logic for page stat accounting\n\nNow, page-stat-per-memcg is recorded into per page_cgroup flag by\nduplicating page\u0027s status into the flag. The reason is that memcg has a\nfeature to move a page from a group to another group and we have race\nbetween \"move\" and \"page stat accounting\",\n\nUnder current logic, assume CPU-A and CPU-B. CPU-A does \"move\" and CPU-B\ndoes \"page stat accounting\".\n\nWhen CPU-A goes 1st,\n\n CPU-A CPU-B\n update \"struct page\" info.\n move_lock_mem_cgroup(memcg)\n see pc-\u003eflags\n copy page stat to new group\n overwrite pc-\u003emem_cgroup.\n move_unlock_mem_cgroup(memcg)\n move_lock_mem_cgroup(mem)\n set pc-\u003eflags\n update page stat accounting\n move_unlock_mem_cgroup(mem)\n\nstat accounting is guarded by move_lock_mem_cgroup() and \"move\" logic\n(CPU-A) doesn\u0027t see changes in \"struct page\" information.\n\nBut it\u0027s costly to have the same information both in \u0027struct page\u0027 and\n\u0027struct page_cgroup\u0027. And, there is a potential problem.\n\nFor example, assume we have PG_dirty accounting in memcg.\nPG_..is a flag for struct page.\nPCG_ is a flag for struct page_cgroup.\n(This is just an example. The same problem can be found in any\n kind of page stat accounting.)\n\n\t CPU-A CPU-B\n TestSet PG_dirty\n (delay) TestClear PG_dirty\n if (TestClear(PCG_dirty))\n memcg-\u003enr_dirty--\n if (TestSet(PCG_dirty))\n memcg-\u003enr_dirty++\n\nHere, memcg-\u003enr_dirty \u003d +1, this is wrong. This race was reported by Greg\nThelen \u003cgthelen@google.com\u003e. Now, only FILE_MAPPED is supported but\nfortunately, it\u0027s serialized by page table lock and this is not real bug,\n_now_,\n\nIf this potential problem is caused by having duplicated information in\nstruct page and struct page_cgroup, we may be able to fix this by using\noriginal \u0027struct page\u0027 information. But we\u0027ll have a problem in \"move\naccount\"\n\nAssume we use only PG_dirty.\n\n CPU-A CPU-B\n TestSet PG_dirty\n (delay) move_lock_mem_cgroup()\n if (PageDirty(page))\n new_memcg-\u003enr_dirty++\n pc-\u003emem_cgroup \u003d new_memcg;\n move_unlock_mem_cgroup()\n move_lock_mem_cgroup()\n memcg \u003d pc-\u003emem_cgroup\n new_memcg-\u003enr_dirty++\n\naccounting information may be double-counted. This was original reason to\nhave PCG_xxx flags but it seems PCG_xxx has another problem.\n\nI think we need a bigger lock as\n\n move_lock_mem_cgroup(page)\n TestSetPageDirty(page)\n update page stats (without any checks)\n move_unlock_mem_cgroup(page)\n\nThis fixes both of problems and we don\u0027t have to duplicate page flag into\npage_cgroup. Please note: move_lock_mem_cgroup() is held only when there\nare possibility of \"account move\" under the system. So, in most path,\nstatus update will go without atomic locks.\n\nThis patch introduces mem_cgroup_begin_update_page_stat() and\nmem_cgroup_end_update_page_stat() both should be called at modifying\n\u0027struct page\u0027 information if memcg takes care of it. as\n\n mem_cgroup_begin_update_page_stat()\n modify page information\n mem_cgroup_update_page_stat()\n \u003d\u003e never check any \u0027struct page\u0027 info, just update counters.\n mem_cgroup_end_update_page_stat().\n\nThis patch is slow because we need to call begin_update_page_stat()/\nend_update_page_stat() regardless of accounted will be changed or not. A\nfollowing patch adds an easy optimization and reduces the cost.\n\n[akpm@linux-foundation.org: s/lock/locked/]\n[hughd@google.com: fix deadlock by avoiding stat lock when anon]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Greg Thelen \u003cgthelen@google.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Ying Han \u003cyinghan@google.com\u003e\nSigned-off-by: 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": "312734c04e2fecc58429aec98194e4ff12d8f7d6", "tree": "c1195cd46733b6a3909c11b2b5abcdee4412b99b", "parents": [ "619d094b5872a5af153f1af77a8b7f7326faf0d0" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Mar 21 16:34:24 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:55:01 2012 -0700" }, "message": "memcg: remove PCG_MOVE_LOCK flag from page_cgroup\n\nPCG_MOVE_LOCK is used for bit spinlock to avoid race between overwriting\npc-\u003emem_cgroup and page statistics accounting per memcg. This lock helps\nto avoid the race but the race is very rare because moving tasks between\ncgroup is not a usual job. So, it seems using 1bit per page is too\ncostly.\n\nThis patch changes this lock as per-memcg spinlock and removes\nPCG_MOVE_LOCK.\n\nIf smaller lock is required, we\u0027ll be able to add some hashes but I\u0027d like\nto start from this.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Greg Thelen \u003cgthelen@google.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Ying Han \u003cyinghan@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": "a710920caedfcf56543136bfea300a6c593f9838", "tree": "47546c076b45b8b6b82c4f6b47906a480a00b24f", "parents": [ "b24028572fb69e9dd6de8c359eba2b2c66baa889" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Wed Mar 21 16:34:22 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:55:01 2012 -0700" }, "message": "memcg: kill dead prev_priority stubs\n\nThis code was removed in 25edde033291 (\"vmscan: kill prev_priority\ncompletely\")\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b24028572fb69e9dd6de8c359eba2b2c66baa889", "tree": "563594eba40e5fd0b61c36c09705f128a8dfbe40", "parents": [ "ca464d69b19120a826aa2534de2511a6f542edf5" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Wed Mar 21 16:34:22 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:55:01 2012 -0700" }, "message": "memcg: remove PCG_CACHE page_cgroup flag\n\nWe record \u0027the page is cache\u0027 with the PCG_CACHE bit in page_cgroup.\nHere, \"CACHE\" means anonymous user pages (and SwapCache). This doesn\u0027t\ninclude shmem.\n\nConsidering callers, at charge/uncharge, the caller should know what the\npage is and we don\u0027t need to record it by using one bit per page.\n\nThis patch removes PCG_CACHE bit and make callers of\nmem_cgroup_charge_statistics() to specify what the page is.\n\nAbout page migration: Mapping of the used page is not touched during migra\ntion (see page_remove_rmap) so we can rely on it and push the correct\ncharge type down to __mem_cgroup_uncharge_common from end_migration for\nunused page. The force flag was misleading was abused for skipping the\nneedless page_mapped() / PageCgroupMigration() check, as we know the\nunused page is no longer mapped and cleared the migration flag just a few\nlines up. But doing the checks is no biggie and it\u0027s not worth adding\nanother flag just to skip them.\n\n[akpm@linux-foundation.org: checkpatch fixes]\n[hughd@google.com: fix PageAnon uncharging]\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Ying Han \u003cyinghan@google.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "42aee6c495e07dba7410b863a360db6bb9ec6d66", "tree": "d014b2b5c7aa9d1a1f13686fa06699f9f734ee1c", "parents": [ "9f7de8275b46d9d11b1505adbfe6c2bb48df4741" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Wed Mar 21 16:34:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:55:01 2012 -0700" }, "message": "cgroup: revert ss_id_lock to spinlock\n\nCommit c1e2ee2dc436 (\"memcg: replace ss-\u003eid_lock with a rwlock\") has now\nbeen seen to cause the unfair behavior we should have expected from\nconverting a spinlock to an rwlock: softlockup in cgroup_mkdir(), whose\nget_new_cssid() is waiting for the wlock, while there are 19 tasks using\nthe rlock in css_get_next() to get on with their memcg workload (in an\nartificial test, admittedly). Yet lib/idr.c was made suitable for RCU\nway back: revert that commit, restoring ss-\u003eid_lock to a spinlock.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "31a79235fc75b506e282e43723107a40f3bc5c07", "tree": "de0d3264015e174f4182e04faed29c98c1f006f5", "parents": [ "052b1987faca3606109d88d96bce124851f7c4c2" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Wed Mar 21 16:34:18 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:55:00 2012 -0700" }, "message": "memcg: replace MEM_CONT by MEM_RES_CTLR\n\nCorrect an #endif comment in memcontrol.h from MEM_CONT to MEM_RES_CTLR.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nReviewed-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nAcked-by: Michal Hocko \u003cmhocko@suse.cz\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8d13bddd11c10db40e2c81b4b224c11126691fc0", "tree": "bec31e54cbc43bf6b49c391d81893203b903b5ec", "parents": [ "d1d5e05ffdc110021ae7937802e88ae0d223dcdc" ], "author": { "name": "Kautuk Consul", "email": "consul.kautuk@gmail.com", "time": "Wed Mar 21 16:34:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:55:00 2012 -0700" }, "message": "page_alloc.c: remove add_from_early_node_map()\n\nadd_from_early_node_map() is unused.\n\nSigned-off-by: Kautuk Consul \u003cconsul.kautuk@gmail.com\u003e\nAcked-by: David Rientjes \u003crientjes@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": "40716e29243de46720e5773797791466c28904ec", "tree": "19616ad05cbead73d0643b002a7ced8baa292ee2", "parents": [ "21a3c273f88c9cbbaf7e14505df0131d95c8f262" ], "author": { "name": "Steven Truelove", "email": "steven.truelove@utoronto.ca", "time": "Wed Mar 21 16:34:14 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:59 2012 -0700" }, "message": "hugetlbfs: fix alignment of huge page requests\n\nWhen calling shmget() with SHM_HUGETLB, shmget aligns the request size to\nPAGE_SIZE, but this is not sufficient.\n\nModify hugetlb_file_setup() to align requests to the huge page size, and\nto accept an address argument so that all alignment checks can be\nperformed in hugetlb_file_setup(), rather than in its callers. Change\nnewseg() and mmap_pgoff() to match the new prototype and eliminate a now\nredundant alignment check.\n\n[akpm@linux-foundation.org: fix build]\nSigned-off-by: Steven Truelove \u003csteven.truelove@utoronto.ca\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": "05af2e104a0c282dcd9303431e1360750ba76de6", "tree": "cdd5876f2d17b26cc3ded7ef85d04d0e853e9b7e", "parents": [ "90481622d75715bfcb68501280a917dbfe516029" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Wed Mar 21 16:34:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:59 2012 -0700" }, "message": "mm, counters: remove task argument to sync_mm_rss() and __sync_task_rss_stat()\n\nsync_mm_rss() can only be used for current to avoid race conditions in\niterating and clearing its per-task counters. Remove the task argument\nfor it and its helper function, __sync_task_rss_stat(), to avoid thinking\nit can be used safely for anything other than current.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "90481622d75715bfcb68501280a917dbfe516029", "tree": "63f7d9e4455366ab326ee74e6b39acf76b618fcf", "parents": [ "a1d776ee3147cec2a54a645e92eb2e3e2f65a137" ], "author": { "name": "David Gibson", "email": "david@gibson.dropbear.id.au", "time": "Wed Mar 21 16:34:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:59 2012 -0700" }, "message": "hugepages: fix use after free bug in \"quota\" handling\n\nhugetlbfs_{get,put}_quota() are badly named. They don\u0027t interact with the\ngeneral quota handling code, and they don\u0027t much resemble its behaviour.\nRather than being about maintaining limits on on-disk block usage by\nparticular users, they are instead about maintaining limits on in-memory\npage usage (including anonymous MAP_PRIVATE copied-on-write pages)\nassociated with a particular hugetlbfs filesystem instance.\n\nWorse, they work by having callbacks to the hugetlbfs filesystem code from\nthe low-level page handling code, in particular from free_huge_page().\nThis is a layering violation of itself, but more importantly, if the\nkernel does a get_user_pages() on hugepages (which can happen from KVM\namongst others), then the free_huge_page() can be delayed until after the\nassociated inode has already been freed. If an unmount occurs at the\nwrong time, even the hugetlbfs superblock where the \"quota\" limits are\nstored may have been freed.\n\nAndrew Barry proposed a patch to fix this by having hugepages, instead of\nstoring a pointer to their address_space and reaching the superblock from\nthere, had the hugepages store pointers directly to the superblock,\nbumping the reference count as appropriate to avoid it being freed.\nAndrew Morton rejected that version, however, on the grounds that it made\nthe existing layering violation worse.\n\nThis is a reworked version of Andrew\u0027s patch, which removes the extra, and\nsome of the existing, layering violation. It works by introducing the\nconcept of a hugepage \"subpool\" at the lower hugepage mm layer - that is a\nfinite logical pool of hugepages to allocate from. hugetlbfs now creates\na subpool for each filesystem instance with a page limit set, and a\npointer to the subpool gets added to each allocated hugepage, instead of\nthe address_space pointer used now. The subpool has its own lifetime and\nis only freed once all pages in it _and_ all other references to it (i.e.\nsuperblocks) are gone.\n\nsubpools are optional - a NULL subpool pointer is taken by the code to\nmean that no subpool limits are in effect.\n\nPrevious discussion of this bug found in: \"Fix refcounting in hugetlbfs\nquota handling.\". See: https://lkml.org/lkml/2011/8/11/28 or\nhttp://marc.info/?l\u003dlinux-mm\u0026m\u003d126928970510627\u0026w\u003d1\n\nv2: Fixed a bug spotted by Hillf Danton, and removed the extra parameter to\nalloc_huge_page() - since it already takes the vma, it is not necessary.\n\nSigned-off-by: Andrew Barry \u003cabarry@cray.com\u003e\nSigned-off-by: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a1d776ee3147cec2a54a645e92eb2e3e2f65a137", "tree": "244e9a44121be417dc9c999bed2a439b8cb01f8d", "parents": [ "ef6942224a185c9e434f6cfe69fe434e732f5b38" ], "author": { "name": "David Gibson", "email": "david@gibson.dropbear.id.au", "time": "Wed Mar 21 16:34:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:59 2012 -0700" }, "message": "hugetlb: cleanup hugetlb.h\n\nMake a couple of small cleanups to linux/include/hugetlb.h. The\nset_file_hugepages() function, which was not used anywhere is removed,\nand the hugetlbfs_config and hugetlbfs_inode_info structures with its\nHUGETLBFS_I helper function are moved into inode.c, the only place they\nwere used.\n\nThese structures are really linked to the hugetlbfs filesystem\nspecifically not to hugepage mm handling in general, so they belong in\nthe filesystem code not in a generally available header.\n\nIt would be nice to move the hugetlbfs_sb_info (superblock) structure in\nthere as well, but it\u0027s currently needed in a number of places via the\nhstate_vma() and hstate_inode().\n\nSigned-off-by: David Gibson \u003cdavid@gibson.dropbear.id.au\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Andrew Barry \u003cabarry@cray.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cc9a6c8776615f9c194ccf0b63a0aa5628235545", "tree": "0cbbf118e86541f8eb2fc7b717a0e08eaced986d", "parents": [ "e845e199362cc5712ba0e7eedc14eed70e144258" ], "author": { "name": "Mel Gorman", "email": "mgorman@suse.de", "time": "Wed Mar 21 16:34:11 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:59 2012 -0700" }, "message": "cpuset: mm: reduce large amounts of memory barrier related damage v3\n\nCommit c0ff7453bb5c (\"cpuset,mm: fix no node to alloc memory when\nchanging cpuset\u0027s mems\") wins a super prize for the largest number of\nmemory barriers entered into fast paths for one commit.\n\n[get|put]_mems_allowed is incredibly heavy with pairs of full memory\nbarriers inserted into a number of hot paths. This was detected while\ninvestigating at large page allocator slowdown introduced some time\nafter 2.6.32. The largest portion of this overhead was shown by\noprofile to be at an mfence introduced by this commit into the page\nallocator hot path.\n\nFor extra style points, the commit introduced the use of yield() in an\nimplementation of what looks like a spinning mutex.\n\nThis patch replaces the full memory barriers on both read and write\nsides with a sequence counter with just read barriers on the fast path\nside. This is much cheaper on some architectures, including x86. The\nmain bulk of the patch is the retry logic if the nodemask changes in a\nmanner that can cause a false failure.\n\nWhile updating the nodemask, a check is made to see if a false failure\nis a risk. If it is, the sequence number gets bumped and parallel\nallocators will briefly stall while the nodemask update takes place.\n\nIn a page fault test microbenchmark, oprofile samples from\n__alloc_pages_nodemask went from 4.53% of all samples to 1.15%. The\nactual results were\n\n 3.3.0-rc3 3.3.0-rc3\n rc3-vanilla nobarrier-v2r1\n Clients 1 UserTime 0.07 ( 0.00%) 0.08 (-14.19%)\n Clients 2 UserTime 0.07 ( 0.00%) 0.07 ( 2.72%)\n Clients 4 UserTime 0.08 ( 0.00%) 0.07 ( 3.29%)\n Clients 1 SysTime 0.70 ( 0.00%) 0.65 ( 6.65%)\n Clients 2 SysTime 0.85 ( 0.00%) 0.82 ( 3.65%)\n Clients 4 SysTime 1.41 ( 0.00%) 1.41 ( 0.32%)\n Clients 1 WallTime 0.77 ( 0.00%) 0.74 ( 4.19%)\n Clients 2 WallTime 0.47 ( 0.00%) 0.45 ( 3.73%)\n Clients 4 WallTime 0.38 ( 0.00%) 0.37 ( 1.58%)\n Clients 1 Flt/sec/cpu 497620.28 ( 0.00%) 520294.53 ( 4.56%)\n Clients 2 Flt/sec/cpu 414639.05 ( 0.00%) 429882.01 ( 3.68%)\n Clients 4 Flt/sec/cpu 257959.16 ( 0.00%) 258761.48 ( 0.31%)\n Clients 1 Flt/sec 495161.39 ( 0.00%) 517292.87 ( 4.47%)\n Clients 2 Flt/sec 820325.95 ( 0.00%) 850289.77 ( 3.65%)\n Clients 4 Flt/sec 1020068.93 ( 0.00%) 1022674.06 ( 0.26%)\n MMTests Statistics: duration\n Sys Time Running Test (seconds) 135.68 132.17\n User+Sys Time Running Test (seconds) 164.2 160.13\n Total Elapsed Time (seconds) 123.46 120.87\n\nThe overall improvement is small but the System CPU time is much\nimproved and roughly in correlation to what oprofile reported (these\nperformance figures are without profiling so skew is expected). The\nactual number of page faults is noticeably improved.\n\nFor benchmarks like kernel builds, the overall benefit is marginal but\nthe system CPU time is slightly reduced.\n\nTo test the actual bug the commit fixed I opened two terminals. The\nfirst ran within a cpuset and continually ran a small program that\nfaulted 100M of anonymous data. In a second window, the nodemask of the\ncpuset was continually randomised in a loop.\n\nWithout the commit, the program would fail every so often (usually\nwithin 10 seconds) and obviously with the commit everything worked fine.\nWith this patch applied, it also worked fine so the fix should be\nfunctionally equivalent.\n\nSigned-off-by: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Miao Xie \u003cmiaox@cn.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Christoph Lameter \u003ccl@linux.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e845e199362cc5712ba0e7eedc14eed70e144258", "tree": "3968125d82e512c3aee44ed96694fdd58b863506", "parents": [ "c7cfa37b7324a190fc36ff116d79d0f899e8d273" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Wed Mar 21 16:34:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:59 2012 -0700" }, "message": "mm, memcg: pass charge order to oom killer\n\nThe oom killer typically displays the allocation order at the time of oom\nas a part of its diangostic messages (for global, cpuset, and mempolicy\nooms).\n\nThe memory controller may also pass the charge order to the oom killer so\nit can emit the same information. This is useful in determining how large\nthe memory allocation is that triggered the oom killer.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Balbir Singh \u003cbsingharora@gmail.com\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f0cb3c76ae1ced85f9034480b1b24cd96530ec78", "tree": "997ae67621f76b3b6bf588604f85738a8c97cbef", "parents": [ "3268c63eded4612a3d07b56d1e02ce7731e6608e" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Wed Mar 21 16:34:06 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:58 2012 -0700" }, "message": "mm: drain percpu lru add/rotate page-vectors on cpu hot-unplug\n\nThis cpu hotplug hook was accidentally removed in commit 00a62ce91e55\n(\"mm: fix Committed_AS underflow on large NR_CPUS environment\")\n\nThe visible effect of this accident: some pages are borrowed in per-cpu\npage-vectors. Truncate can deal with it, but these pages cannot be\nreused while this cpu is offline. So this is like a temporary memory\nleak.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Dave Hansen \u003cdave@linux.vnet.ibm.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Eric B Munson \u003cebmunson@us.ibm.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "385de35722c9a22917e7bc5e63cd83a8cffa5ecd", "tree": "41ae2e23e096d189cdf614cf1eaf0c8f9ddeeb3b", "parents": [ "6d9d88d07e132259c35f9493b15429e19198489c" ], "author": { "name": "Dean Nelson", "email": "dnelson@redhat.com", "time": "Wed Mar 21 16:34:05 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:58 2012 -0700" }, "message": "thp: allow a hwpoisoned head page to be put back to LRU\n\nAndrea Arcangeli pointed out to me that a check in __memory_failure()\nwhich was intended to prevent THP tail pages from being checked for the\nabsence of the PG_lru flag (something that is always the case), was also\npreventing THP head pages from being checked.\n\nA THP head page could actually benefit from the call to shake_page() by\nending up being put back to a LRU, provided it had been waiting in a\npagevec array.\n\nAndrea suggested that the \"!PageTransCompound(p)\" in the if-statement\nshould be replaced by a \"!PageTransTail(p)\", thus allowing THP head pages\nto be checked and possibly shaken.\n\nSigned-off-by: Dean Nelson \u003cdnelson@redhat.com\u003e\nCc: Jin Dongming \u003cjin.dongming@np.css.fujitsu.com\u003e\nReviewed-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Hidetoshi Seto \u003cseto.hidetoshi@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "08ab9b10d43aca091fdff58b69fc1ec89c5b8a83", "tree": "73abfd3a257f3feadc0fa28c3117aaa9d95af596", "parents": [ "b76437579d1344b612cf1851ae610c636cec7db0" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Wed Mar 21 16:34:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:58 2012 -0700" }, "message": "mm, oom: force oom kill on sysrq+f\n\nThe oom killer chooses not to kill a thread if:\n\n - an eligible thread has already been oom killed and has yet to exit,\n and\n\n - an eligible thread is exiting but has yet to free all its memory and\n is not the thread attempting to currently allocate memory.\n\nSysRq+F manually invokes the global oom killer to kill a memory-hogging\ntask. This is normally done as a last resort to free memory when no\nprogress is being made or to test the oom killer itself.\n\nFor both uses, we always want to kill a thread and never defer. This\npatch causes SysRq+F to always kill an eligible thread and can be used to\nforce a kill even if another oom killed thread has failed to exit.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: Pekka Enberg \u003cpenberg@kernel.org\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b76437579d1344b612cf1851ae610c636cec7db0", "tree": "37c31c957f1159635258168e27e49b90347e37aa", "parents": [ "9e81130b7ce23050335b1197bb51743517b5b9d0" ], "author": { "name": "Siddhesh Poyarekar", "email": "siddhesh.poyarekar@gmail.com", "time": "Wed Mar 21 16:34:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:58 2012 -0700" }, "message": "procfs: mark thread stack correctly in proc/\u003cpid\u003e/maps\n\nStack for a new thread is mapped by userspace code and passed via\nsys_clone. This memory is currently seen as anonymous in\n/proc/\u003cpid\u003e/maps, which makes it difficult to ascertain which mappings\nare being used for thread stacks. This patch uses the individual task\nstack pointers to determine which vmas are actually thread stacks.\n\nFor a multithreaded program like the following:\n\n\t#include \u003cpthread.h\u003e\n\n\tvoid *thread_main(void *foo)\n\t{\n\t\twhile(1);\n\t}\n\n\tint main()\n\t{\n\t\tpthread_t t;\n\t\tpthread_create(\u0026t, NULL, thread_main, NULL);\n\t\tpthread_join(t, NULL);\n\t}\n\nproc/PID/maps looks like the following:\n\n 00400000-00401000 r-xp 00000000 fd:0a 3671804 /home/siddhesh/a.out\n 00600000-00601000 rw-p 00000000 fd:0a 3671804 /home/siddhesh/a.out\n 019ef000-01a10000 rw-p 00000000 00:00 0 [heap]\n 7f8a44491000-7f8a44492000 ---p 00000000 00:00 0\n 7f8a44492000-7f8a44c92000 rw-p 00000000 00:00 0\n 7f8a44c92000-7f8a44e3d000 r-xp 00000000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a44e3d000-7f8a4503d000 ---p 001ab000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a4503d000-7f8a45041000 r--p 001ab000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a45041000-7f8a45043000 rw-p 001af000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a45043000-7f8a45048000 rw-p 00000000 00:00 0\n 7f8a45048000-7f8a4505f000 r-xp 00000000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4505f000-7f8a4525e000 ---p 00017000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4525e000-7f8a4525f000 r--p 00016000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4525f000-7f8a45260000 rw-p 00017000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a45260000-7f8a45264000 rw-p 00000000 00:00 0\n 7f8a45264000-7f8a45286000 r-xp 00000000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45457000-7f8a4545a000 rw-p 00000000 00:00 0\n 7f8a45484000-7f8a45485000 rw-p 00000000 00:00 0\n 7f8a45485000-7f8a45486000 r--p 00021000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45486000-7f8a45487000 rw-p 00022000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45487000-7f8a45488000 rw-p 00000000 00:00 0\n 7fff6273b000-7fff6275c000 rw-p 00000000 00:00 0 [stack]\n 7fff627ff000-7fff62800000 r-xp 00000000 00:00 0 [vdso]\n ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall]\n\nHere, one could guess that 7f8a44492000-7f8a44c92000 is a stack since\nthe earlier vma that has no permissions (7f8a44e3d000-7f8a4503d000) but\nthat is not always a reliable way to find out which vma is a thread\nstack. Also, /proc/PID/maps and /proc/PID/task/TID/maps has the same\ncontent.\n\nWith this patch in place, /proc/PID/task/TID/maps are treated as \u0027maps\nas the task would see it\u0027 and hence, only the vma that that task uses as\nstack is marked as [stack]. All other \u0027stack\u0027 vmas are marked as\nanonymous memory. /proc/PID/maps acts as a thread group level view,\nwhere all thread stack vmas are marked as [stack:TID] where TID is the\nprocess ID of the task that uses that vma as stack, while the process\nstack is marked as [stack].\n\nSo /proc/PID/maps will look like this:\n\n 00400000-00401000 r-xp 00000000 fd:0a 3671804 /home/siddhesh/a.out\n 00600000-00601000 rw-p 00000000 fd:0a 3671804 /home/siddhesh/a.out\n 019ef000-01a10000 rw-p 00000000 00:00 0 [heap]\n 7f8a44491000-7f8a44492000 ---p 00000000 00:00 0\n 7f8a44492000-7f8a44c92000 rw-p 00000000 00:00 0 [stack:1442]\n 7f8a44c92000-7f8a44e3d000 r-xp 00000000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a44e3d000-7f8a4503d000 ---p 001ab000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a4503d000-7f8a45041000 r--p 001ab000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a45041000-7f8a45043000 rw-p 001af000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a45043000-7f8a45048000 rw-p 00000000 00:00 0\n 7f8a45048000-7f8a4505f000 r-xp 00000000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4505f000-7f8a4525e000 ---p 00017000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4525e000-7f8a4525f000 r--p 00016000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4525f000-7f8a45260000 rw-p 00017000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a45260000-7f8a45264000 rw-p 00000000 00:00 0\n 7f8a45264000-7f8a45286000 r-xp 00000000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45457000-7f8a4545a000 rw-p 00000000 00:00 0\n 7f8a45484000-7f8a45485000 rw-p 00000000 00:00 0\n 7f8a45485000-7f8a45486000 r--p 00021000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45486000-7f8a45487000 rw-p 00022000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45487000-7f8a45488000 rw-p 00000000 00:00 0\n 7fff6273b000-7fff6275c000 rw-p 00000000 00:00 0 [stack]\n 7fff627ff000-7fff62800000 r-xp 00000000 00:00 0 [vdso]\n ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall]\n\nThus marking all vmas that are used as stacks by the threads in the\nthread group along with the process stack. The task level maps will\nhowever like this:\n\n 00400000-00401000 r-xp 00000000 fd:0a 3671804 /home/siddhesh/a.out\n 00600000-00601000 rw-p 00000000 fd:0a 3671804 /home/siddhesh/a.out\n 019ef000-01a10000 rw-p 00000000 00:00 0 [heap]\n 7f8a44491000-7f8a44492000 ---p 00000000 00:00 0\n 7f8a44492000-7f8a44c92000 rw-p 00000000 00:00 0 [stack]\n 7f8a44c92000-7f8a44e3d000 r-xp 00000000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a44e3d000-7f8a4503d000 ---p 001ab000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a4503d000-7f8a45041000 r--p 001ab000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a45041000-7f8a45043000 rw-p 001af000 fd:00 2097482 /lib64/libc-2.14.90.so\n 7f8a45043000-7f8a45048000 rw-p 00000000 00:00 0\n 7f8a45048000-7f8a4505f000 r-xp 00000000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4505f000-7f8a4525e000 ---p 00017000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4525e000-7f8a4525f000 r--p 00016000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a4525f000-7f8a45260000 rw-p 00017000 fd:00 2099938 /lib64/libpthread-2.14.90.so\n 7f8a45260000-7f8a45264000 rw-p 00000000 00:00 0\n 7f8a45264000-7f8a45286000 r-xp 00000000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45457000-7f8a4545a000 rw-p 00000000 00:00 0\n 7f8a45484000-7f8a45485000 rw-p 00000000 00:00 0\n 7f8a45485000-7f8a45486000 r--p 00021000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45486000-7f8a45487000 rw-p 00022000 fd:00 2097348 /lib64/ld-2.14.90.so\n 7f8a45487000-7f8a45488000 rw-p 00000000 00:00 0\n 7fff6273b000-7fff6275c000 rw-p 00000000 00:00 0\n 7fff627ff000-7fff62800000 r-xp 00000000 00:00 0 [vdso]\n ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0 [vsyscall]\n\nwhere only the vma that is being used as a stack by *that* task is\nmarked as [stack].\n\nAnalogous changes have been made to /proc/PID/smaps,\n/proc/PID/numa_maps, /proc/PID/task/TID/smaps and\n/proc/PID/task/TID/numa_maps. Relevant snippets from smaps and\nnuma_maps:\n\n [siddhesh@localhost ~ ]$ pgrep a.out\n 1441\n [siddhesh@localhost ~ ]$ cat /proc/1441/smaps | grep \"\\[stack\"\n 7f8a44492000-7f8a44c92000 rw-p 00000000 00:00 0 [stack:1442]\n 7fff6273b000-7fff6275c000 rw-p 00000000 00:00 0 [stack]\n [siddhesh@localhost ~ ]$ cat /proc/1441/task/1442/smaps | grep \"\\[stack\"\n 7f8a44492000-7f8a44c92000 rw-p 00000000 00:00 0 [stack]\n [siddhesh@localhost ~ ]$ cat /proc/1441/task/1441/smaps | grep \"\\[stack\"\n 7fff6273b000-7fff6275c000 rw-p 00000000 00:00 0 [stack]\n [siddhesh@localhost ~ ]$ cat /proc/1441/numa_maps | grep \"stack\"\n 7f8a44492000 default stack:1442 anon\u003d2 dirty\u003d2 N0\u003d2\n 7fff6273a000 default stack anon\u003d3 dirty\u003d3 N0\u003d3\n [siddhesh@localhost ~ ]$ cat /proc/1441/task/1442/numa_maps | grep \"stack\"\n 7f8a44492000 default stack anon\u003d2 dirty\u003d2 N0\u003d2\n [siddhesh@localhost ~ ]$ cat /proc/1441/task/1441/numa_maps | grep \"stack\"\n 7fff6273a000 default stack anon\u003d3 dirty\u003d3 N0\u003d3\n\n[akpm@linux-foundation.org: checkpatch fixes]\n[akpm@linux-foundation.org: fix build]\nSigned-off-by: Siddhesh Poyarekar \u003csiddhesh.poyarekar@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@gmail.com\u003e\nCc: Alexander Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Jamie Lokier \u003cjamie@shareable.org\u003e\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: Matt Mackall \u003cmpm@selenic.com\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "978ea78b65794ef07eb66b9946064dea66b52554", "tree": "f1c2eea5ab72bdca622e764a52e956bfb3ae749f", "parents": [ "6583a84304e5a6cb27ec2aace79ef9c4ba888d12" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@linux.vnet.ibm.com", "time": "Wed Mar 21 16:34:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:57 2012 -0700" }, "message": "rmap: remove __anon_vma_link() declaration\n\nThis declaration is not used anymore, remove it.\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@linux.vnet.ibm.com\u003e\nAcked-by: David Rientjes \u003crientjes@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": "ce1744f4ed20ca873360e54502f8a71564ef7cc6", "tree": "ec26dbc6a5417c75a8fa65ab093374d3e0045032", "parents": [ "092b50bacd1cdbffef2643b7a46f2a215407919c" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Wed Mar 21 16:33:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:57 2012 -0700" }, "message": "mm: replace PAGE_MIGRATION with IS_ENABLED(CONFIG_MIGRATION)\n\nSince commit 2a11c8ea20bf (\"kconfig: Introduce IS_ENABLED(),\nIS_BUILTIN() and IS_MODULE()\") there is a generic grep-friendly method\nfor checking config options in C expressions.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e873c49fbfdd595481976b915850e682441bcbec", "tree": "87ad5d125563d1eb6418e1f7b5a094fab6098108", "parents": [ "025c5b2451e42c9e8dfdecd6dc84956ce8f321b5" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Wed Mar 21 16:33:58 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:57 2012 -0700" }, "message": "pagemap: export KPF_THP\n\nThis flag shows that a given page is a subpage of a transparent hugepage.\nIt helps us debug and test the kernel by showing physical address of thp.\n\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nReviewed-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "025c5b2451e42c9e8dfdecd6dc84956ce8f321b5", "tree": "423b4ef1a0ce021360304a80f6e0ba902581a3ad", "parents": [ "5aaabe831eb527e0d9284f0745d830a755f70393" ], "author": { "name": "Naoya Horiguchi", "email": "n-horiguchi@ah.jp.nec.com", "time": "Wed Mar 21 16:33:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:57 2012 -0700" }, "message": "thp: optimize away unnecessary page table locking\n\nCurrently when we check if we can handle thp as it is or we need to split\nit into regular sized pages, we hold page table lock prior to check\nwhether a given pmd is mapping thp or not. Because of this, when it\u0027s not\n\"huge pmd\" we suffer from unnecessary lock/unlock overhead. To remove it,\nthis patch introduces a optimized check function and replace several\nsimilar logics with it.\n\n[akpm@linux-foundation.org: checkpatch fixes]\nSigned-off-by: Naoya Horiguchi \u003cn-horiguchi@ah.jp.nec.com\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Jiri Slaby \u003cjslaby@suse.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "aff622495c9a0b56148192e53bdec539f5e147f2", "tree": "78f6400d8b6bec3279483006a0e9543e47aa833e", "parents": [ "7be62de99adcab4449d416977b4274985c5fe023" ], "author": { "name": "Rik van Riel", "email": "riel@redhat.com", "time": "Wed Mar 21 16:33:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:56 2012 -0700" }, "message": "vmscan: only defer compaction for failed order and higher\n\nCurrently a failed order-9 (transparent hugepage) compaction can lead to\nmemory compaction being temporarily disabled for a memory zone. Even if\nwe only need compaction for an order 2 allocation, eg. for jumbo frames\nnetworking.\n\nThe fix is relatively straightforward: keep track of the highest order at\nwhich compaction is succeeding, and only defer compaction for orders at\nwhich compaction is failing.\n\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7be62de99adcab4449d416977b4274985c5fe023", "tree": "20ae021ec9811ad730e6a17a3530d3aa6b5027d0", "parents": [ "fe2c2a106663130a5ab45cb0e3414b52df2fff0c" ], "author": { "name": "Rik van Riel", "email": "riel@redhat.com", "time": "Wed Mar 21 16:33:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:56 2012 -0700" }, "message": "vmscan: kswapd carefully call compaction\n\nWith CONFIG_COMPACTION enabled, kswapd does not try to free contiguous\nfree pages, even when it is woken for a higher order request.\n\nThis could be bad for eg. jumbo frame network allocations, which are done\nfrom interrupt context and cannot compact memory themselves. Higher than\nbefore allocation failure rates in the network receive path have been\nobserved in kernels with compaction enabled.\n\nTeach kswapd to defragment the memory zones in a node, but only if\nrequired and compaction is not deferred in a zone.\n\n[akpm@linux-foundation.org: reduce scope of zones_need_compaction]\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "67f96aa252e606cdf6c3cf1032952ec207ec0cf0", "tree": "a5a4299dd32789831eda558b51c0120272846664", "parents": [ "c38446cc65e1f2b3eb8630c53943b94c4f65f670" ], "author": { "name": "Rik van Riel", "email": "riel@redhat.com", "time": "Wed Mar 21 16:33:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:56 2012 -0700" }, "message": "mm: make swapin readahead skip over holes\n\nEver since abandoning the virtual scan of processes, for scalability\nreasons, swap space has been a little more fragmented than before. This\ncan lead to the situation where a large memory user is killed, swap space\nends up full of \"holes\" and swapin readahead is totally ineffective.\n\nOn my home system, after killing a leaky firefox it took over an hour to\npage just under 2GB of memory back in, slowing the virtual machines down\nto a crawl.\n\nThis patch makes swapin readahead simply skip over holes, instead of\nstopping at them. This allows the system to swap things back in at rates\nof several MB/second, instead of a few hundred kB/second.\n\nThe checks done in valid_swaphandles are already done in\nread_swap_cache_async as well, allowing us to remove a fair amount of\ncode.\n\n[akpm@linux-foundation.org: fix it for page_cluster \u003e\u003d 32]\nSigned-off-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: Minchan Kim \u003cminchan.kim@gmail.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@gmail.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Adrian Drzewiecki \u003cz@drze.net\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": "69c978232aaa99476f9bd002c2a29a84fa3779b5", "tree": "7edb0da034b8824040f4f7327dd31ad260532167", "parents": [ "6131728914810a6c02e08750e13e45870101e862" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Wed Mar 21 16:33:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:55 2012 -0700" }, "message": "mm: make get_mm_counter static-inline\n\nMake get_mm_counter() always static inline, it is simple enough for that.\nAnd remove unused set_mm_counter()\n\nbloat-o-meter:\n\nadd/remove: 0/1 grow/shrink: 4/12 up/down: 99/-341 (-242)\nfunction old new delta\ntry_to_unmap_one 886 952 +66\nsys_remap_file_pages 1214 1230 +16\ndup_mm 1684 1700 +16\ndo_exit 2277 2278 +1\nzap_page_range 208 205 -3\nunmap_region 304 296 -8\nstatic.oom_kill_process 554 546 -8\ntry_to_unmap_file 1716 1700 -16\ngetrusage 925 909 -16\nflush_old_exec 1704 1688 -16\nstatic.dump_header 416 390 -26\nacct_update_integrals 218 187 -31\ndo_task_stat 2986 2954 -32\nget_mm_counter 34 - -34\nxacct_add_tsk 371 334 -37\ntask_statm 172 118 -54\ntask_mem 383 323 -60\n\ntry_to_unmap_one() grows because update_hiwater_rss() now completely inline.\n\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: Kirill A. Shutemov \u003ckirill@shutemov.name\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1a5a9906d4e8d1976b701f889d8f35d54b928f25", "tree": "e51912e725f224663a738045a4d0528d08da4572", "parents": [ "31f6765266417c0d99f0e922fe82848a7c9c2ae9" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Mar 21 16:33:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 17:54:54 2012 -0700" }, "message": "mm: thp: fix pmd_bad() triggering in code paths holding mmap_sem read mode\n\nIn some cases it may happen that pmd_none_or_clear_bad() is called with\nthe mmap_sem hold in read mode. In those cases the huge page faults can\nallocate hugepmds under pmd_none_or_clear_bad() and that can trigger a\nfalse positive from pmd_bad() that will not like to see a pmd\nmaterializing as trans huge.\n\nIt\u0027s not khugepaged causing the problem, khugepaged holds the mmap_sem\nin write mode (and all those sites must hold the mmap_sem in read mode\nto prevent pagetables to go away from under them, during code review it\nseems vm86 mode on 32bit kernels requires that too unless it\u0027s\nrestricted to 1 thread per process or UP builds). The race is only with\nthe huge pagefaults that can convert a pmd_none() into a\npmd_trans_huge().\n\nEffectively all these pmd_none_or_clear_bad() sites running with\nmmap_sem in read mode are somewhat speculative with the page faults, and\nthe result is always undefined when they run simultaneously. This is\nprobably why it wasn\u0027t common to run into this. For example if the\nmadvise(MADV_DONTNEED) runs zap_page_range() shortly before the page\nfault, the hugepage will not be zapped, if the page fault runs first it\nwill be zapped.\n\nAltering pmd_bad() not to error out if it finds hugepmds won\u0027t be enough\nto fix this, because zap_pmd_range would then proceed to call\nzap_pte_range (which would be incorrect if the pmd become a\npmd_trans_huge()).\n\nThe simplest way to fix this is to read the pmd in the local stack\n(regardless of what we read, no need of actual CPU barriers, only\ncompiler barrier needed), and be sure it is not changing under the code\nthat computes its value. Even if the real pmd is changing under the\nvalue we hold on the stack, we don\u0027t care. If we actually end up in\nzap_pte_range it means the pmd was not none already and it was not huge,\nand it can\u0027t become huge from under us (khugepaged locking explained\nabove).\n\nAll we need is to enforce that there is no way anymore that in a code\npath like below, pmd_trans_huge can be false, but pmd_none_or_clear_bad\ncan run into a hugepmd. The overhead of a barrier() is just a compiler\ntweak and should not be measurable (I only added it for THP builds). I\ndon\u0027t exclude different compiler versions may have prevented the race\ntoo by caching the value of *pmd on the stack (that hasn\u0027t been\nverified, but it wouldn\u0027t be impossible considering\npmd_none_or_clear_bad, pmd_bad, pmd_trans_huge, pmd_none are all inlines\nand there\u0027s no external function called in between pmd_trans_huge and\npmd_none_or_clear_bad).\n\n\t\tif (pmd_trans_huge(*pmd)) {\n\t\t\tif (next-addr !\u003d HPAGE_PMD_SIZE) {\n\t\t\t\tVM_BUG_ON(!rwsem_is_locked(\u0026tlb-\u003emm-\u003emmap_sem));\n\t\t\t\tsplit_huge_page_pmd(vma-\u003evm_mm, pmd);\n\t\t\t} else if (zap_huge_pmd(tlb, vma, pmd, addr))\n\t\t\t\tcontinue;\n\t\t\t/* fall through */\n\t\t}\n\t\tif (pmd_none_or_clear_bad(pmd))\n\nBecause this race condition could be exercised without special\nprivileges this was reported in CVE-2012-1179.\n\nThe race was identified and fully explained by Ulrich who debugged it.\nI\u0027m quoting his accurate explanation below, for reference.\n\n\u003d\u003d\u003d\u003d\u003d\u003d start quote \u003d\u003d\u003d\u003d\u003d\u003d\u003d\n mapcount 0 page_mapcount 1\n kernel BUG at mm/huge_memory.c:1384!\n\n At some point prior to the panic, a \"bad pmd ...\" message similar to the\n following is logged on the console:\n\n mm/memory.c:145: bad pmd ffff8800376e1f98(80000000314000e7).\n\n The \"bad pmd ...\" message is logged by pmd_clear_bad() before it clears\n the page\u0027s PMD table entry.\n\n 143 void pmd_clear_bad(pmd_t *pmd)\n 144 {\n -\u003e 145 pmd_ERROR(*pmd);\n 146 pmd_clear(pmd);\n 147 }\n\n After the PMD table entry has been cleared, there is an inconsistency\n between the actual number of PMD table entries that are mapping the page\n and the page\u0027s map count (_mapcount field in struct page). When the page\n is subsequently reclaimed, __split_huge_page() detects this inconsistency.\n\n 1381 if (mapcount !\u003d page_mapcount(page))\n 1382 printk(KERN_ERR \"mapcount %d page_mapcount %d\\n\",\n 1383 mapcount, page_mapcount(page));\n -\u003e 1384 BUG_ON(mapcount !\u003d page_mapcount(page));\n\n The root cause of the problem is a race of two threads in a multithreaded\n process. Thread B incurs a page fault on a virtual address that has never\n been accessed (PMD entry is zero) while Thread A is executing an madvise()\n system call on a virtual address within the same 2 MB (huge page) range.\n\n virtual address space\n .---------------------.\n | |\n | |\n .-|---------------------|\n | | |\n | | |\u003c-- B(fault)\n | | |\n 2 MB | |/////////////////////|-.\n huge \u003c |/////////////////////| \u003e A(range)\n page | |/////////////////////|-\u0027\n | | |\n | | |\n \u0027-|---------------------|\n | |\n | |\n \u0027---------------------\u0027\n\n - Thread A is executing an madvise(..., MADV_DONTNEED) system call\n on the virtual address range \"A(range)\" shown in the picture.\n\n sys_madvise\n // Acquire the semaphore in shared mode.\n down_read(\u0026current-\u003emm-\u003emmap_sem)\n ...\n madvise_vma\n switch (behavior)\n case MADV_DONTNEED:\n madvise_dontneed\n zap_page_range\n unmap_vmas\n unmap_page_range\n zap_pud_range\n zap_pmd_range\n //\n // Assume that this huge page has never been accessed.\n // I.e. content of the PMD entry is zero (not mapped).\n //\n if (pmd_trans_huge(*pmd)) {\n // We don\u0027t get here due to the above assumption.\n }\n //\n // Assume that Thread B incurred a page fault and\n .---------\u003e // sneaks in here as shown below.\n | //\n | if (pmd_none_or_clear_bad(pmd))\n | {\n | if (unlikely(pmd_bad(*pmd)))\n | pmd_clear_bad\n | {\n | pmd_ERROR\n | // Log \"bad pmd ...\" message here.\n | pmd_clear\n | // Clear the page\u0027s PMD entry.\n | // Thread B incremented the map count\n | // in page_add_new_anon_rmap(), but\n | // now the page is no longer mapped\n | // by a PMD entry (-\u003e inconsistency).\n | }\n | }\n |\n v\n - Thread B is handling a page fault on virtual address \"B(fault)\" shown\n in the picture.\n\n ...\n do_page_fault\n __do_page_fault\n // Acquire the semaphore in shared mode.\n down_read_trylock(\u0026mm-\u003emmap_sem)\n ...\n handle_mm_fault\n if (pmd_none(*pmd) \u0026\u0026 transparent_hugepage_enabled(vma))\n // We get here due to the above assumption (PMD entry is zero).\n do_huge_pmd_anonymous_page\n alloc_hugepage_vma\n // Allocate a new transparent huge page here.\n ...\n __do_huge_pmd_anonymous_page\n ...\n spin_lock(\u0026mm-\u003epage_table_lock)\n ...\n page_add_new_anon_rmap\n // Here we increment the page\u0027s map count (starts at -1).\n atomic_set(\u0026page-\u003e_mapcount, 0)\n set_pmd_at\n // Here we set the page\u0027s PMD entry which will be cleared\n // when Thread A calls pmd_clear_bad().\n ...\n spin_unlock(\u0026mm-\u003epage_table_lock)\n\n The mmap_sem does not prevent the race because both threads are acquiring\n it in shared mode (down_read). Thread B holds the page_table_lock while\n the page\u0027s map count and PMD table entry are updated. However, Thread A\n does not synchronize on that lock.\n\n\u003d\u003d\u003d\u003d\u003d\u003d end quote \u003d\u003d\u003d\u003d\u003d\u003d\u003d\n\n[akpm@linux-foundation.org: checkpatch fixes]\nReported-by: Ulrich Obergfell \u003cuobergfe@redhat.com\u003e\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nAcked-by: Larry Woodman \u003clwoodman@redhat.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t\t[2.6.38+]\nCc: Mark Salter \u003cmsalter@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e2a0883e4071237d09b604a342c28b96b44a04b3", "tree": "aa56f4d376b5eb1c32358c19c2669c2a94e0e1fd", "parents": [ "3a990a52f9f25f45469e272017a31e7a3fda60ed", "07c0c5d8b8c122b2f2df9ee574ac3083daefc981" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:36:41 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:36:41 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull vfs pile 1 from Al Viro:\n \"This is _not_ all; in particular, Miklos\u0027 and Jan\u0027s stuff is not there\n yet.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (64 commits)\n ext4: initialization of ext4_li_mtx needs to be done earlier\n debugfs-related mode_t whack-a-mole\n hfsplus: add an ioctl to bless files\n hfsplus: change finder_info to u32\n hfsplus: initialise userflags\n qnx4: new helper - try_extent()\n qnx4: get rid of qnx4_bread/qnx4_getblk\n take removal of PF_FORKNOEXEC to flush_old_exec()\n trim includes in inode.c\n um: uml_dup_mmap() relies on -\u003emmap_sem being held, but activate_mm() doesn\u0027t hold it\n um: embed -\u003estub_pages[] into mmu_context\n gadgetfs: list_for_each_safe() misuse\n ocfs2: fix leaks on failure exits in module_init\n ecryptfs: make register_filesystem() the last potential failure exit\n ntfs: forgets to unregister sysctls on register_filesystem() failure\n logfs: missing cleanup on register_filesystem() failure\n jfs: mising cleanup on register_filesystem() failure\n make configfs_pin_fs() return root dentry on success\n configfs: configfs_create_dir() has parent dentry in dentry-\u003ed_parent\n configfs: sanitize configfs_create()\n ...\n" }, { "commit": "3a990a52f9f25f45469e272017a31e7a3fda60ed", "tree": "366f639d9ce1e907b65caa72bc098df6c4b5a240", "parents": [ "3556485f1595e3964ba539e39ea682acbb835cee", "f5cc4eef9987d0b517364d01e290d6438e47ee5d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:32:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:32:19 2012 -0700" }, "message": "Merge branch \u0027vm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs\n\nPull munmap/truncate race fixes from Al Viro:\n \"Fixes for racy use of unmap_vmas() on truncate-related codepaths\"\n\n* \u0027vm\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:\n VM: make zap_page_range() callers that act on a single VMA use separate helper\n VM: make unmap_vmas() return void\n VM: don\u0027t bother with feeding upper limit to tlb_finish_mmu() in exit_mmap()\n VM: make zap_page_range() return void\n VM: can\u0027t go through the inner loop in unmap_vmas() more than once...\n VM: unmap_page_range() can return void\n" }, { "commit": "3556485f1595e3964ba539e39ea682acbb835cee", "tree": "7f5ee254f425b1427ac0059b5f347a307f8538a1", "parents": [ "b8716614a7cc2fc15ea2a518edd04755fb08d922", "09f61cdbb32a9d812c618d3922db533542736bb0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:25:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:25:04 2012 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security\n\nPull security subsystem updates for 3.4 from James Morris:\n \"The main addition here is the new Yama security module from Kees Cook,\n which was discussed at the Linux Security Summit last year. Its\n purpose is to collect miscellaneous DAC security enhancements in one\n place. This also marks a departure in policy for LSM modules, which\n were previously limited to being standalone access control systems.\n Chromium OS is using Yama, and I believe there are plans for Ubuntu,\n at least.\n\n This patchset also includes maintenance updates for AppArmor, TOMOYO\n and others.\"\n\nFix trivial conflict in \u003cnet/sock.h\u003e due to the jumo_label-\u003estatic_key\nrename.\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (38 commits)\n AppArmor: Fix location of const qualifier on generated string tables\n TOMOYO: Return error if fails to delete a domain\n AppArmor: add const qualifiers to string arrays\n AppArmor: Add ability to load extended policy\n TOMOYO: Return appropriate value to poll().\n AppArmor: Move path failure information into aa_get_name and rename\n AppArmor: Update dfa matching routines.\n AppArmor: Minor cleanup of d_namespace_path to consolidate error handling\n AppArmor: Retrieve the dentry_path for error reporting when path lookup fails\n AppArmor: Add const qualifiers to generated string tables\n AppArmor: Fix oops in policy unpack auditing\n AppArmor: Fix error returned when a path lookup is disconnected\n KEYS: testing wrong bit for KEY_FLAG_REVOKED\n TOMOYO: Fix mount flags checking order.\n security: fix ima kconfig warning\n AppArmor: Fix the error case for chroot relative path name lookup\n AppArmor: fix mapping of META_READ to audit and quiet flags\n AppArmor: Fix underflow in xindex calculation\n AppArmor: Fix dropping of allowed operations that are force audited\n AppArmor: Add mising end of structure test to caps unpacking\n ...\n" }, { "commit": "b8716614a7cc2fc15ea2a518edd04755fb08d922", "tree": "2a8a5d04066b2bd589ba2ebbeb228e2a6a178ec9", "parents": [ "31f6765266417c0d99f0e922fe82848a7c9c2ae9", "2dc9b5dbdef09840de852a4f0cc6a9c9eece7220" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:20:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 13:20:43 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\nPull crypto update from Herbert Xu:\n \"* sha512 bug fixes (already in your tree).\n * SHA224/SHA384 AEAD support in caam.\n * X86-64 optimised version of Camellia.\n * Tegra AES support.\n * Bulk algorithm registration interface to make driver registration easier.\n * padata race fixes.\n * Misc fixes.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (31 commits)\n padata: Fix race on sequence number wrap\n padata: Fix race in the serialization path\n crypto: camellia - add assembler implementation for x86_64\n crypto: camellia - rename camellia.c to camellia_generic.c\n crypto: camellia - fix checkpatch warnings\n crypto: camellia - rename camellia module to camellia_generic\n crypto: tcrypt - add more camellia tests\n crypto: testmgr - add more camellia test vectors\n crypto: camellia - simplify key setup and CAMELLIA_ROUNDSM macro\n crypto: twofish-x86_64/i586 - set alignmask to zero\n crypto: blowfish-x86_64 - set alignmask to zero\n crypto: serpent-sse2 - combine ablk_*_init functions\n crypto: blowfish-x86_64 - use crypto_[un]register_algs\n crypto: twofish-x86_64-3way - use crypto_[un]register_algs\n crypto: serpent-sse2 - use crypto_[un]register_algs\n crypto: serpent-sse2 - remove dead code from serpent_sse2_glue.c::serpent_sse2_init()\n crypto: twofish-x86 - Remove dead code from twofish_glue_3way.c::init()\n crypto: In crypto_add_alg(), \u0027exact\u0027 wants to be initialized to 0\n crypto: caam - fix gcc 4.6 warning\n crypto: Add bulk algorithm registration interface\n ...\n" }, { "commit": "d15d76448bb58c7832e954b6a8f1e301720b7866", "tree": "7891c9e0779f5df33840be9cdba1f0331459e97c", "parents": [ "0c2fe82a9b106f1c03719783134360586d718a69", "4992fa1fd425f1934f503ffa96b68e235b89db9a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:34:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:34:56 2012 -0700" }, "message": "Merge tag \u0027regulator-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\nPull regulator updates for 3.4 from Mark Brown:\n \"This has been a fairly quiet release from a regulator point of view,\n the only real framework features added were devm support and a\n convenience helper for setting up fixed voltage regulators.\n\n We also added a couple of drivers (but will drop the BQ240022 driver\n via the arm-soc tree as it\u0027s been replaced by the more generic\n gpio-regulator driver) and Axel Lin continued his relentless and\n generally awesome stream of fixes and cleanups.\"\n\n* tag \u0027regulator-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (93 commits)\n regulator: Fix up a confusing dev_warn when DT lookup fails\n regulator: Convert tps6507x to set_voltage_sel\n regulator: Refactor tps6507x to use one tps6507x_pmic_ops for all LDOs and DCDCs\n regulator: Make s5m8767_get_voltage_register always return correct register\n regulator: s5m8767: Check pdata-\u003ebuck[2|3|4]_gpiodvs earlier\n regulator: tps65910: Provide settling time for DCDC voltage change\n regulator: Add Anatop regulator driver\n regulator: Simplify implementation of tps65912_get_voltage_dcdc\n regulator: Use tps65912_set_voltage_sel for both DCDCx and LDOx\n regulator: tps65910: Provide settling time for enabling rails\n regulator: max8925: Use DIV_ROUND_UP macro\n regulator: tps65912: Use simple equations to get register address\n regulator: Fix the logic of tps65910_get_mode\n regulator: Merge tps65217_pmic_ldo234_ops and tps65217_pmic_dcdc_ops to tps65217_pmic_ops\n regulator: Use DIV_ROUND_CLOSEST in wm8350_isink_get_current\n regulator: Use array to store dcdc_range settings for tps65912\n regulator: Rename s5m8767_convert_voltage to s5m8767_convert_voltage_to_sel\n regulator: tps6524x: Remove unneeded comment for N_REGULATORS\n regulator: Rename set_voltage_sel callback function name to *_sel\n regulator: Fix s5m8767_set_voltage_time_sel calculation value\n ...\n" }, { "commit": "0c2fe82a9b106f1c03719783134360586d718a69", "tree": "ec1a18ca49f1e6724ef3a93727f5f73b7df61931", "parents": [ "5f0e685f316a1de6d3af8b23eaf46651faca32ab", "f0e88aeb19dac00ed2e09fd4d39ee65f32d5e968" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:33:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:33:42 2012 -0700" }, "message": "Merge tag \u0027rdma-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\nPull InfiniBand/RDMA changes for the 3.4 merge window from Roland Dreier:\n \"Nothing big really stands out; by patch count lots of fixes to the\n mlx4 driver plus some cleanups and fixes to the core and other\n drivers.\"\n\n* tag \u0027rdma-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (28 commits)\n mlx4_core: Scale size of MTT table with system RAM\n mlx4_core: Allow dynamic MTU configuration for IB ports\n IB/mlx4: Fix info returned when querying IBoE ports\n IB/mlx4: Fix possible missed completion event\n mlx4_core: Report thermal error events\n mlx4_core: Fix one more static exported function\n IB: Change CQE \"csum_ok\" field to a bit flag\n RDMA/iwcm: Reject connect requests if cmid is not in LISTEN state\n RDMA/cxgb3: Don\u0027t pass irq flags to flush_qp()\n mlx4_core: Get rid of redundant ext_port_cap flags\n RDMA/ucma: Fix AB-BA deadlock\n IB/ehca: Fix ilog2() compile failure\n IB: Use central enum for speed instead of hard-coded values\n IB/iser: Post initial receive buffers before sending the final login request\n IB/iser: Free IB connection resources in the proper place\n IB/srp: Consolidate repetitive sysfs code\n IB/srp: Use pr_fmt() and pr_err()/pr_warn()\n IB/core: Fix SDR rates in sysfs\n mlx4: Enforce device max FMR maps in FMR alloc\n IB/mlx4: Set bad_wr for invalid send opcode\n ...\n" }, { "commit": "5f0e685f316a1de6d3af8b23eaf46651faca32ab", "tree": "af1ed231b7fcfc65b146be59a0aee699aa9f6353", "parents": [ "f8974cb71310a05632aada76be6a27576d61e609", "87bf5ab82884c829366914aaa813cc8b07b9fe58" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:32:00 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:32:00 2012 -0700" }, "message": "Merge tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull SPI changes for v3.4 from Grant Likely:\n \"Mostly a bunch of new drivers and driver bug fixes; but this also\n includes a few patches that create a core message queue infrastructure\n for the spi subsystem instead of making each driver open code it.\"\n\n* tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6: (34 commits)\n spi/fsl-espi: Make sure pm is within 2..32\n spi/fsl-espi: make the clock computation easier to read\n spi: sh-hspi: modify write/read method\n spi: sh-hspi: control spi clock more correctly\n spi: sh-hspi: convert to using core message queue\n spi: s3c64xx: Fix build\n spi: s3c64xx: remove unnecessary callback msg-\u003ecomplete\n spi: remove redundant variable assignment\n spi: release lock on error path in spi_pump_messages()\n spi: Compatibility with direction which is used in samsung DMA operation\n spi-topcliff-pch: add recovery processing in case wait-event timeout\n spi-topcliff-pch: supports a spi mode setup and bit order setup by IO control\n spi-topcliff-pch: Fix issue for transmitting over 4KByte\n spi-topcliff-pch: Modify pci-bus number dynamically to get DMA device info\n spi/imx: simplify error handling to free gpios\n spi: Convert to DEFINE_PCI_DEVICE_TABLE\n spi: add Broadcom BCM63xx SPI controller driver\n SPI: add CSR SiRFprimaII SPI controller driver\n spi-topcliff-pch: fix -Wuninitialized warning\n spi: Mark spi_register_board_info() __devinit\n ...\n" }, { "commit": "f8974cb71310a05632aada76be6a27576d61e609", "tree": "c0b6f59333796c95aa2de9a2eb755e9b68599b71", "parents": [ "c207f3a43194e108dda43dc9a1ce507335cff6b9", "0f22dd395fc473cee252b9af50249b8e0f32fde7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:30:03 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:30:03 2012 -0700" }, "message": "Merge tag \u0027dt-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull core device tree changes for Linux v3.4 from Grant Likely:\n \"This branch contains a minor documentation addition, a utility\n function for parsing string properties needed by some of the new ARM\n platforms, disables dynamic DT code that isn\u0027t used anywhere but on a\n few PPC machines, and exports DT node compatible data to userspace via\n UEVENT properties. Nothing earth shattering here.\"\n\n* tag \u0027dt-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n of: Only compile OF_DYNAMIC on PowerPC pseries and iseries\n arm/dts: OMAP3: Add omap3evm and am335xevm support\n drivercore: Output common devicetree information in uevent\n of: Add of_property_match_string() to find index into a string list\n" }, { "commit": "c207f3a43194e108dda43dc9a1ce507335cff6b9", "tree": "55880f8301e8546b1908f69947d0d41aaa044814", "parents": [ "c7c66c0cb0c77b1a8edf09bca57d922312d58030", "e7cc3aca0f6a36b018934264ee20bee45dc13e29" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:27:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:27:19 2012 -0700" }, "message": "Merge tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull irq_domain support for all architectures from Grant Likely:\n \"Generialize powerpc\u0027s irq_host as irq_domain\n\n This branch takes the PowerPC irq_host infrastructure (reverse mapping\n from Linux IRQ numbers to hardware irq numbering), generalizes it,\n renames it to irq_domain, and makes it available to all architectures.\n\n Originally the plan has been to create an all-new irq_domain\n implementation which addresses some of the powerpc shortcomings such\n as not handling 1:1 mappings well, but doing that proved to be far\n more difficult and invasive than generalizing the working code and\n refactoring it in-place. So, this branch rips out the \u0027new\u0027\n irq_domain and replaces it with the modified powerpc version (in a\n fully bisectable way of course). It converts all users over to the\n new API and makes irq_domain selectable on any architecture.\n\n No architecture is forced to enable irq_domain, but the infrastructure\n is required for doing OpenFirmware style irq translations. It will\n even work on SPARC even though SPARC has it\u0027s own mechanism for\n translating irqs at boot time. MIPS, microblaze, embedded x86 and c6x\n are converted too.\n\n The resulting irq_domain code is probably still too verbose and can be\n optimized more, but that can be done incrementally and is a task for\n follow-on patches.\"\n\n* tag \u0027irqdomain-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6: (31 commits)\n dt: fix twl4030 for non-dt compile on x86\n mfd: twl-core: Add IRQ_DOMAIN dependency\n devicetree: Add empty of_platform_populate() for !CONFIG_OF_ADDRESS (sparc)\n irq_domain: Centralize definition of irq_dispose_mapping()\n irq_domain/mips: Allow irq_domain on MIPS\n irq_domain/x86: Convert x86 (embedded) to use common irq_domain\n ppc-6xx: fix build failure in flipper-pic.c and hlwd-pic.c\n irq_domain/microblaze: Convert microblaze to use irq_domains\n irq_domain/powerpc: Replace custom xlate functions with library functions\n irq_domain/powerpc: constify irq_domain_ops\n irq_domain/c6x: Use library of xlate functions\n irq_domain/c6x: constify irq_domain structures\n irq_domain/c6x: Convert c6x to use generic irq_domain support.\n irq_domain: constify irq_domain_ops\n irq_domain: Create common xlate functions that device drivers can use\n irq_domain: Remove irq_domain_add_simple()\n irq_domain: Remove \u0027new\u0027 irq_domain in favour of the ppc one\n mfd: twl-core.c: Fix the number of interrupts managed by twl4030\n of/address: add empty static inlines for !CONFIG_OF\n irq_domain: Add support for base irq and hwirq in legacy mappings\n ...\n" }, { "commit": "c7c66c0cb0c77b1a8edf09bca57d922312d58030", "tree": "77277103c5f16aa4dee64978a060933d92e14776", "parents": [ "9f3938346a5c1fa504647670edb5fea5756cfb00", "98e8bdafeb4728a6af7bbcbcc3984967d1cf2bc1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:15:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 10:15:51 2012 -0700" }, "message": "Merge tag \u0027pm-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull power management updates for 3.4 from Rafael Wysocki:\n \"Assorted extensions and fixes including:\n\n * Introduction of early/late suspend/hibernation device callbacks.\n * Generic PM domains extensions and fixes.\n * devfreq updates from Axel Lin and MyungJoo Ham.\n * Device PM QoS updates.\n * Fixes of concurrency problems with wakeup sources.\n * System suspend and hibernation fixes.\"\n\n* tag \u0027pm-for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (43 commits)\n PM / Domains: Check domain status during hibernation restore of devices\n PM / devfreq: add relation of recommended frequency.\n PM / shmobile: Make MTU2 driver use pm_genpd_dev_always_on()\n PM / shmobile: Make CMT driver use pm_genpd_dev_always_on()\n PM / shmobile: Make TMU driver use pm_genpd_dev_always_on()\n PM / Domains: Introduce \"always on\" device flag\n PM / Domains: Fix hibernation restore of devices, v2\n PM / Domains: Fix handling of wakeup devices during system resume\n sh_mmcif / PM: Use PM QoS latency constraint\n tmio_mmc / PM: Use PM QoS latency constraint\n PM / QoS: Make it possible to expose PM QoS latency constraints\n PM / Sleep: JBD and JBD2 missing set_freezable()\n PM / Domains: Fix include for PM_GENERIC_DOMAINS\u003dn case\n PM / Freezer: Remove references to TIF_FREEZE in comments\n PM / Sleep: Add more wakeup source initialization routines\n PM / Hibernate: Enable usermodehelpers in hibernate() error path\n PM / Sleep: Make __pm_stay_awake() delete wakeup source timers\n PM / Sleep: Fix race conditions related to wakeup source timer function\n PM / Sleep: Fix possible infinite loop during wakeup source destruction\n PM / Hibernate: print physical addresses consistently with other parts of kernel\n ...\n" }, { "commit": "9f3938346a5c1fa504647670edb5fea5756cfb00", "tree": "7cf6d24d6b076c8db8571494984924cac03703a2", "parents": [ "69a7aebcf019ab3ff5764525ad6858fbe23bb86d", "317b6e128247f75976b0fc2b9fd8d2c20ef13b3a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 09:40:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Mar 21 09:40:26 2012 -0700" }, "message": "Merge branch \u0027kmap_atomic\u0027 of git://github.com/congwang/linux\n\nPull kmap_atomic cleanup from Cong Wang.\n\nIt\u0027s been in -next for a long time, and it gets rid of the (no longer\nused) second argument to k[un]map_atomic().\n\nFix up a few trivial conflicts in various drivers, and do an \"evil\nmerge\" to catch some new uses that have come in since Cong\u0027s tree.\n\n* \u0027kmap_atomic\u0027 of git://github.com/congwang/linux: (59 commits)\n feature-removal-schedule.txt: schedule the deprecated form of kmap_atomic() for removal\n highmem: kill all __kmap_atomic() [swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]\n drbd: remove the second argument of k[un]map_atomic()\n zcache: remove the second argument of k[un]map_atomic()\n gma500: remove the second argument of k[un]map_atomic()\n dm: remove the second argument of k[un]map_atomic()\n tomoyo: remove the second argument of k[un]map_atomic()\n sunrpc: remove the second argument of k[un]map_atomic()\n rds: remove the second argument of k[un]map_atomic()\n net: remove the second argument of k[un]map_atomic()\n mm: remove the second argument of k[un]map_atomic()\n lib: remove the second argument of k[un]map_atomic()\n power: remove the second argument of k[un]map_atomic()\n kdb: remove the second argument of k[un]map_atomic()\n udf: remove the second argument of k[un]map_atomic()\n ubifs: remove the second argument of k[un]map_atomic()\n squashfs: remove the second argument of k[un]map_atomic()\n reiserfs: remove the second argument of k[un]map_atomic()\n ocfs2: remove the second argument of k[un]map_atomic()\n ntfs: remove the second argument of k[un]map_atomic()\n ...\n" }, { "commit": "b73d12303ecfc91123363d8900e127da44bf42a6", "tree": "acf71b4c4a932c44cacaf7b69106b872db50dccd", "parents": [ "da0df92b57311aa1b26a2a90599ed16e1e968b90" ], "author": { "name": "Inki Dae", "email": "inki.dae@samsung.com", "time": "Wed Mar 21 10:55:26 2012 +0900" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 21 10:15:49 2012 +0000" }, "message": "drm/exynos: added virtual display driver.\n\nthis driver would be used for wireless display. virtual display\ndriver has independent crtc, encoder and connector and to use\nthis driver, user application should send edid data to this driver\nfrom wireless display.\n\nSigned-off-by: Inki Dae \u003cinki.dae@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\n" }, { "commit": "8f9c60f2e29717155227f225b557d3f1fda442bd", "tree": "293b53e20f8092f55d76a25877b6c99c7adf3334", "parents": [ "f363afc168e772a6034ea97b7b213a1b47b8f376" ], "author": { "name": "Kuninori Morimoto", "email": "kuninori.morimoto.gx@renesas.com", "time": "Tue Mar 20 18:34:10 2012 -0700" }, "committer": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Wed Mar 21 07:24:01 2012 +0000" }, "message": "fbdev: sh_mipi_dsi: add extra phyctrl for sh_mipi_dsi_info\n\nsh_mipi uses some clocks, but the method of setup depends on CPU.\n\nCurrent SuperH (like sh73a0) can control all of these clocks\nby CPG (Clock Pulse Generator).\nIt means we can control it by clock framework only.\nBut on sh7372, it needs CPG settings AND sh_mipi PHYCTRL::PLLDS,\nand only sh7372 has PHYCTRL::PLLDS.\n\nBut on current sh_mipi driver, PHYCTRL::PLLDS of sh7372 was\noverwrote since the callback timing of clock setting was changed\nby c2658b70f06108361aa5024798f9c1bf47c73374\n(fbdev: sh_mipi_dsi: fixup setup timing of sh_mipi_setup()).\nTo solve this issue, this patch adds extra .phyctrl.\n\nThis patch adds detail explanation for unclear mipi settings\nand fixup wrong PHYCTRL::PLLDS value for ap4evb (0xb -\u003e 0x6).\n\nSigned-off-by: Kuninori Morimoto \u003ckuninori.morimoto.gx@renesas.com\u003e\nSigned-off-by: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\n" }, { "commit": "d09b38d4311d5a1d94407a3f65313a51ce96814f", "tree": "e093ceec1a3252399aba69133dbd3dc06e40c64b", "parents": [ "be63fe8c8fd5a44dc5efd77aaaf2cab3a1bdefff" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Mar 20 17:18:41 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 21 06:55:58 2012 +0000" }, "message": "drm/radeon/kms: add trinity pci ids\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "fc7dbcc371c2b35d41f4db71aed7c55bb2a1175e", "tree": "4b4c10d2ae3863269f808cf81da59820664d170e", "parents": [ "c1b2f69f816fc5442563a68c4365dbded6450af8" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Mar 20 17:18:27 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 21 06:55:55 2012 +0000" }, "message": "drm/radeon/kms: Add SI pci ids\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dfcf5f36529d69eb35f4fdedfa6f244c5249698c", "tree": "da1fc31a5ef8d53c63786121f16f29fe3b12a92a", "parents": [ "d2800ee59ed28a5eaf3a4a8645feca040eacf7df" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Tue Mar 20 17:18:14 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 21 06:55:53 2012 +0000" }, "message": "drm/radeon/kms: add support for the CONST IB to the CS ioctl\n\nThis adds a new chunk id to the CS ioctl to support the\nINDIRECT_BUFFER_CONST packet.\n\nOn SI, the CP adds a new engine called the CE (Constant Engine)\nwhich runs simulatenously with the DE (Drawing Engine, formerly\ncalled the ME). This allows the CP to process two related IBs\nsimultaneously. The CE is tasked with loading the constant data\n(constant buffers, resource descriptors, samplers, etc.) while\nthe DE loads context register state and issues drawing commands.\nIt\u0027s up to the userspace application to sychronize the CE and the\nDE using special synchronization packets.\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "609c1e15a44c25f722fb93e18668da30179a172f", "tree": "4fb8f7faf5d5bb5e7df05b4fd04d4028ba702152", "parents": [ "da0df92b57311aa1b26a2a90599ed16e1e968b90" ], "author": { "name": "Tom Stellard", "email": "tstellar@gmail.com", "time": "Tue Mar 20 17:17:55 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Mar 21 06:55:49 2012 +0000" }, "message": "drm/radeon/kms: add info query for max pipes\n\nThe maximum number of pipes is needed by the user space compute\ndriver to calculate the number of wavefronts per thread group.\n\nSigned-off-by: Tom Stellard \u003cthomas.stellard@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "69a7aebcf019ab3ff5764525ad6858fbe23bb86d", "tree": "7211df5704b743a7667159748c670a9744164482", "parents": [ "d464c92b5234227c1698862a1906827e2e398ae0", "f1f996b66cc3908a8f5ffccc2ff41840e92f3b10" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:12:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:12:50 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\nPull trivial tree from Jiri Kosina:\n \"It\u0027s indeed trivial -- mostly documentation updates and a bunch of\n typo fixes from Masanari.\n\n There are also several linux/version.h include removals from Jesper.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (101 commits)\n kcore: fix spelling in read_kcore() comment\n constify struct pci_dev * in obvious cases\n Revert \"char: Fix typo in viotape.c\"\n init: fix wording error in mm_init comment\n usb: gadget: Kconfig: fix typo for \u0027different\u0027\n Revert \"power, max8998: Include linux/module.h just once in drivers/power/max8998_charger.c\"\n writeback: fix fn name in writeback_inodes_sb_nr_if_idle() comment header\n writeback: fix typo in the writeback_control comment\n Documentation: Fix multiple typo in Documentation\n tpm_tis: fix tis_lock with respect to RCU\n Revert \"media: Fix typo in mixer_drv.c and hdmi_drv.c\"\n Doc: Update numastat.txt\n qla4xxx: Add missing spaces to error messages\n compiler.h: Fix typo\n security: struct security_operations kerneldoc fix\n Documentation: broken URL in libata.tmpl\n Documentation: broken URL in filesystems.tmpl\n mtd: simplify return logic in do_map_probe()\n mm: fix comment typo of truncate_inode_pages_range\n power: bq27x00: Fix typos in comment\n ...\n" }, { "commit": "3b59bf081622b6446db77ad06c93fe23677bc533", "tree": "3f4bb5a27c90cc86994a1f6d3c53fbf9208003cb", "parents": [ "e45836fafe157df137a837093037f741ad8f4c90", "bbdb32cb5b73597386913d052165423b9d736145" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 21:04:47 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next\n\nPull networking merge from David Miller:\n \"1) Move ixgbe driver over to purely page based buffering on receive.\n From Alexander Duyck.\n\n 2) Add receive packet steering support to e1000e, from Bruce Allan.\n\n 3) Convert TCP MD5 support over to RCU, from Eric Dumazet.\n\n 4) Reduce cpu usage in handling out-of-order TCP packets on modern\n systems, also from Eric Dumazet.\n\n 5) Support the IP{,V6}_UNICAST_IF socket options, making the wine\n folks happy, from Erich Hoover.\n\n 6) Support VLAN trunking from guests in hyperv driver, from Haiyang\n Zhang.\n\n 7) Support byte-queue-limtis in r8169, from Igor Maravic.\n\n 8) Outline code intended for IP_RECVTOS in IP_PKTOPTIONS existed but\n was never properly implemented, Jiri Benc fixed that.\n\n 9) 64-bit statistics support in r8169 and 8139too, from Junchang Wang.\n\n 10) Support kernel side dump filtering by ctmark in netfilter\n ctnetlink, from Pablo Neira Ayuso.\n\n 11) Support byte-queue-limits in gianfar driver, from Paul Gortmaker.\n\n 12) Add new peek socket options to assist with socket migration, from\n Pavel Emelyanov.\n\n 13) Add sch_plug packet scheduler whose queue is controlled by\n userland daemons using explicit freeze and release commands. From\n Shriram Rajagopalan.\n\n 14) Fix FCOE checksum offload handling on transmit, from Yi Zou.\"\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1846 commits)\n Fix pppol2tp getsockname()\n Remove printk from rds_sendmsg\n ipv6: fix incorrent ipv6 ipsec packet fragment\n cpsw: Hook up default ndo_change_mtu.\n net: qmi_wwan: fix build error due to cdc-wdm dependecy\n netdev: driver: ethernet: Add TI CPSW driver\n netdev: driver: ethernet: add cpsw address lookup engine support\n phy: add am79c874 PHY support\n mlx4_core: fix race on comm channel\n bonding: send igmp report for its master\n fs_enet: Add MPC5125 FEC support and PHY interface selection\n net: bpf_jit: fix BPF_S_LDX_B_MSH compilation\n net: update the usage of CHECKSUM_UNNECESSARY\n fcoe: use CHECKSUM_UNNECESSARY instead of CHECKSUM_PARTIAL on tx\n net: do not do gso for CHECKSUM_UNNECESSARY in netif_needs_gso\n ixgbe: Fix issues with SR-IOV loopback when flow control is disabled\n net/hyperv: Fix the code handling tx busy\n ixgbe: fix namespace issues when FCoE/DCB is not enabled\n rtlwifi: Remove unused ETH_ADDR_LEN defines\n igbvf: Use ETH_ALEN\n ...\n\nFix up fairly trivial conflicts in drivers/isdn/gigaset/interface.c and\ndrivers/net/usb/{Kconfig,qmi_wwan.c} as per David.\n" }, { "commit": "6e8bb0193af3f308ef22817a5560422d33e58b90", "tree": "6001421c8d389bd00b18e0510e3f6c9130f9f80b", "parents": [ "853f5e264018113b1f96f05551b07a74b836c7fc" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Mar 05 13:41:15 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:39:51 2012 -0400" }, "message": "VM: make unmap_vmas() return void\n\nsame story - nobody uses it and it\u0027s been pointless since\n\"mm: Remove i_mmap_lock lockbreak\" went in.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "14f5ff5df37a8fabe2d25b1e64df7e010cc87db9", "tree": "10f46ad8429790de35ebad33631d435f74aaff0e", "parents": [ "8b2a12382ccc9df31b27dac37fe04dffe088b57c" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Mar 05 13:38:09 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:39:50 2012 -0400" }, "message": "VM: make zap_page_range() return void\n\n... since all callers ignore its return value and it\u0027s been\nuseless since commit 97a894136f29802da19a15541de3c019e1ca147e\n(mm: Remove i_mmap_lock lockbreak) anyway.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "88187398cc5fa6650f38b9dcd5464667f468888f", "tree": "eb9d45cdbe4506340b1131951bc7f2dba2f2a796", "parents": [ "a051f71ce97c53cde3ac64de64eb02d658d9308e" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 06:00:24 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:53 2012 -0400" }, "message": "debugfs-related mode_t whack-a-mole\n\nall of those should be umode_t...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "8fc3dc5a3a17aa2b353886422bd89420619af211", "tree": "74a3290ad9621ff1c225b772df2c529c8feb5f43", "parents": [ "54bf586e1f51018ba7624c851e7aa14cee0548d2" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 03:05:16 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:46 2012 -0400" }, "message": "__register_binfmt() made void\n\nJust don\u0027t pass NULL to it - nobody does, anyway.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "765fd6b23d8b1130bd9e2c995040b137faa0992d", "tree": "6157a1716ce74ddb77657e08bc13c208dafd671f", "parents": [ "f466c6fdb3b1f043ff1977a8d2a1d0cd4dc164fa" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 01:19:24 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:43 2012 -0400" }, "message": "kill reiserfs_fs_{i,sb}.h\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "f466c6fdb3b1f043ff1977a8d2a1d0cd4dc164fa", "tree": "4ebd1b27da5be1a77c6d095b2d0066ab8fb2c5e0", "parents": [ "a8a4b79b53fc7cbb023afedf58b04dd4e9bbb114" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 01:16:43 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:43 2012 -0400" }, "message": "move private bits of reiserfs_fs.h to fs/reiserfs/reiserfs.h\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "a3063ab88fcbe5249f841cb95dfd626b8bf2674f", "tree": "bb3304f3317a4075cee2926b39867336cae708b0", "parents": [ "c45ac8887e778c4fa2b572c51a94a681a0955d4d" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 01:03:10 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:42 2012 -0400" }, "message": "move reiserfs_acl.h to fs/reiserfs/acl.h\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "c45ac8887e778c4fa2b572c51a94a681a0955d4d", "tree": "913d8c72376def5c3c29838273b2ddde49887c81", "parents": [ "82234e61a8fc75599f29026c0805fc0cfe2a6c87" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sat Mar 17 00:59:06 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:42 2012 -0400" }, "message": "take private bits of reiserfs_xattr.h to fs/reiserfs/xattr.h\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "68ac1234fb949b66941d94dce4157742799fc581", "tree": "04059b7dbaed92d672b8ceef1fcf25c6185e06f8", "parents": [ "40ffe67d2e89c7a475421d007becc11a2f88ea3d" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Thu Mar 15 08:21:57 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:41 2012 -0400" }, "message": "switch touch_atime to struct path\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "40ffe67d2e89c7a475421d007becc11a2f88ea3d", "tree": "5373e71b18895b9ffd8370a88aec6c54438240a0", "parents": [ "38eff2892628fa5c4fc8962a17b7296f42833ebe" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 14 21:54:32 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:41 2012 -0400" }, "message": "switch unix_sock to struct path\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "38eff2892628fa5c4fc8962a17b7296f42833ebe", "tree": "6a138b3a4bd712b65797bae334bd7bd3ec12c038", "parents": [ "66b3fad3f4c535c92b6a1184d535a97d6aa5d82a" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 14 21:51:10 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:40 2012 -0400" }, "message": "constify path argument of trace_seq_path()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "66b3fad3f4c535c92b6a1184d535a97d6aa5d82a", "tree": "e0ac7f847b760b9e8b9777df27cd1581099935a2", "parents": [ "9fcf03d0d6e845ed495fc8b1ec328b473ff298b3" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Mar 14 21:48:20 2012 -0400" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:40 2012 -0400" }, "message": "constify path argument of audit_log_d_path()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "5d026c7242201e7c9d0e12fcb2bcaffead9d59fd", "tree": "3a3663fd35e3077574e30cf705a614ede69925eb", "parents": [ "516cdb68e5b44ca1bef31619f5da8d5e9e298f88" ], "author": { "name": "Kai Bankett", "email": "chaosman@ontika.net", "time": "Fri Feb 17 05:59:20 2012 +0100" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:38 2012 -0400" }, "message": "fs: initial qnx6fs addition\n\nAdds support for qnx6fs readonly support to the linux kernel.\n\n* Mount option\n The option mmi_fs can be used to mount Harman Becker/Audi MMI 3G\n HDD qnx6fs filesystems.\n\n* Documentation\n A high level filesystem stucture description can be found in the\n Documentation/filesystems directory. (qnx6.txt)\n\n* Additional features\n - Active (stable) superblock selection\n - Superblock checksum check (enforced)\n - Supports mount of qnx6 filesystems with to host different endianess\n - Automatic endianess detection\n - Longfilename support (with non-enfocing crc check)\n - All blocksizes (512, 1024, 2048 and 4096 supported)\n\nSigned-off-by: Kai Bankett \u003cchaosman@ontika.net\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "32991ab305ace7017c62f8eecbe5eb36dc32e13b", "tree": "7a802091fa9f152f38577a4eeaa24937c4b4b2c9", "parents": [ "318ceed088497d1ca839b1172518ac4cc7096b82" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Feb 12 22:15:47 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:37 2012 -0400" }, "message": "vfs: d_alloc_root() gone\n\nall callers converted to d_make_root() by now\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "9bcb4b733c22b7dbc4cf847e707ac98f751e9180", "tree": "f99c68d0b7d049d7a25706d23f224c734d0e1da1", "parents": [ "e28e832c3e1e1197873cfd0b6ce86868cf5c391d" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Feb 12 19:43:17 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:33 2012 -0400" }, "message": "vfs: turn generic_drop_inode() into static inline\n\nOnce upon a time it used to be much bigger, but these days there\u0027s\nno point whatsoever keeping it in fs/inode.c, especially since\nit\u0027s not even needed as initializer for -\u003edrop_inode() - it\u0027s the\ndefault and leaving -\u003edrop_inode NULL will do just as well.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "b57ce9694ec43dcb6ef6f189d6540e4b3d2c5e7a", "tree": "a6eaccac7c19b094d6ba956d3931e7315dfd3ef9", "parents": [ "8de52778798fe39660a8d6b26f290e0c93202761" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Sun Feb 12 02:38:16 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:32 2012 -0400" }, "message": "vfs: drop_file_write_access() made static\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "8de52778798fe39660a8d6b26f290e0c93202761", "tree": "56384beb7863c1f338f2b66b509bf58eea5a99c2", "parents": [ "c16fa4f2ad19908a47c63d8fa436a1178438c7e7" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Feb 06 12:45:27 2012 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Mar 20 21:29:32 2012 -0400" }, "message": "vfs: check i_nlink limits in vfs_{mkdir,rename_dir,link}\n\nNew field of struct super_block - -\u003es_max_links. Maximal allowed\nvalue of -\u003ei_nlink or 0; in the latter case all checks still need\nto be done in -\u003elink/-\u003emkdir/-\u003erename instances. Note that this\nlimit applies both to directoris and to non-directories.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "0d9cabdccedb79ee5f27b77ff51f29a9e7d23275", "tree": "8bfb64c3672d058eb90aec3c3a9c4f61cef9097c", "parents": [ "701085b219016d38f105b031381b9cee6200253a", "3ce3230a0cff484e5130153f244d4fb8a56b3a8b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 18:11:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 18:11:21 2012 -0700" }, "message": "Merge branch \u0027for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull cgroup changes from Tejun Heo:\n \"Out of the 8 commits, one fixes a long-standing locking issue around\n tasklist walking and others are cleanups.\"\n\n* \u0027for-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:\n cgroup: Walk task list under tasklist_lock in cgroup_enable_task_cg_list\n cgroup: Remove wrong comment on cgroup_enable_task_cg_list()\n cgroup: remove cgroup_subsys argument from callbacks\n cgroup: remove extra calls to find_existing_css_set\n cgroup: replace tasklist_lock with rcu_read_lock\n cgroup: simplify double-check locking in cgroup_attach_proc\n cgroup: move struct cgroup_pidlist out from the header file\n cgroup: remove cgroup_attach_task_current_cg()\n" }, { "commit": "44e8ba93cf330f075178e31759100f367313790a", "tree": "27956beb159bfb603d672b43cb207690a087dd0a", "parents": [ "e9fe8a714e450b26f76eaf8832f5b9fe24d00e79", "c16fa4f2ad19908a47c63d8fa436a1178438c7e7" ], "author": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Tue Mar 20 18:59:50 2012 +0000" }, "committer": { "name": "Florian Tobias Schandinat", "email": "FlorianSchandinat@gmx.de", "time": "Tue Mar 20 18:59:50 2012 +0000" }, "message": "Merge commit \u0027v3.3\u0027 into fbdev-next\n" }, { "commit": "ed378a52dabf77b406b447fd3238f83ea24b71fa", "tree": "07e1a7ec2d1c08767ee81b9910f5912b80502632", "parents": [ "843ec558f91b8e8fdb6efc908f2c0506407cc750", "11207b6fe05438b2e87a26435cd98db3d55e6fa7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 11:26:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 11:26:30 2012 -0700" }, "message": "Merge tag \u0027usb-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB merge for 3.4-rc1 from Greg KH:\n \"Here\u0027s the big USB merge for the 3.4-rc1 merge window.\n\n Lots of gadget driver reworks here, driver updates, xhci changes, some\n new drivers added, usb-serial core reworking to fix some bugs, and\n other various minor things.\n\n There are some patches touching arch code, but they have all been\n acked by the various arch maintainers.\"\n\n* tag \u0027usb-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (302 commits)\n net: qmi_wwan: add support for ZTE MF820D\n USB: option: add ZTE MF820D\n usb: gadget: f_fs: Remove lock is held before freeing checks\n USB: option: make interface blacklist work again\n usb/ub: deprecate \u0026 schedule for removal the \"Low Performance USB Block\" driver\n USB: ohci-pxa27x: add clk_prepare/clk_unprepare calls\n USB: use generic platform driver on ath79\n USB: EHCI: Add a generic platform device driver\n USB: OHCI: Add a generic platform device driver\n USB: ftdi_sio: new PID: LUMEL PD12\n USB: ftdi_sio: add support for FT-X series devices\n USB: serial: mos7840: Fixed MCS7820 device attach problem\n usb: Don\u0027t make USB_ARCH_HAS_{XHCI,OHCI,EHCI} depend on USB_SUPPORT.\n usb gadget: fix a section mismatch when compiling g_ffs with CONFIG_USB_FUNCTIONFS_ETH\n USB: ohci-nxp: Remove i2c_write(), use smbus\n USB: ohci-nxp: Support for LPC32xx\n USB: ohci-nxp: Rename symbols from pnx4008 to nxp\n USB: OHCI-HCD: Rename ohci-pnx4008 to ohci-nxp\n usb: gadget: Kconfig: fix typo for \u0027different\u0027\n usb: dwc3: pci: fix another failure path in dwc3_pci_probe()\n ...\n" }, { "commit": "843ec558f91b8e8fdb6efc908f2c0506407cc750", "tree": "1866dccbc298390fc8686875942324075fd83f9d", "parents": [ "71e7ff2578c3bc67fd893a9ba7f69fd563f271de", "fb8ebec00b04f921ea1614a7303f1a8e5e9e47c5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 11:24:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 11:24:39 2012 -0700" }, "message": "Merge tag \u0027tty-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull TTY/serial patches from Greg KH:\n \"tty and serial merge for 3.4-rc1\n\n Here\u0027s the big serial and tty merge for the 3.4-rc1 tree.\n\n There\u0027s loads of fixes and reworks in here from Jiri for the tty\n layer, and a number of patches from Alan to help try to wrestle the vt\n layer into a sane model.\n\n Other than that, lots of driver updates and fixes, and other minor\n stuff, all detailed in the shortlog.\"\n\n* tag \u0027tty-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (132 commits)\n serial: pxa: add clk_prepare/clk_unprepare calls\n TTY: Wrong unicode value copied in con_set_unimap()\n serial: PL011: clear pending interrupts\n serial: bfin-uart: Don\u0027t access tty circular buffer in TX DMA interrupt after it is reset.\n vt: NULL dereference in vt_do_kdsk_ioctl()\n tty: serial: vt8500: fix annotations for probe/remove\n serial: remove back and forth conversions in serial_out_sync\n serial: use serial_port_in/out vs serial_in/out in 8250\n serial: introduce generic port in/out helpers\n serial: reduce number of indirections in 8250 code\n serial: delete useless void casts in 8250.c\n serial: make 8250\u0027s serial_in shareable to other drivers.\n serial: delete last unused traces of pausing I/O in 8250\n pch_uart: Add module parameter descriptions\n pch_uart: Use existing default_baud in setup_console\n pch_uart: Add user_uartclk parameter\n pch_uart: Add Fish River Island II uart clock quirks\n pch_uart: Use uartclk instead of base_baud\n mpc5200b/uart: select more tolerant uart prescaler on low baudrates\n tty: moxa: fix bit test in moxa_start()\n ...\n" }, { "commit": "4a52246302f01596f0edf7b4a3e6425e23479192", "tree": "f384d86722d3ccfc875e3e5e8d8726e993a922ee", "parents": [ "9f9d2760da8c7f94fae119fac3e13d5a1702f8f0", "adc80ae60eae24a43a357bf5b30fb496f34aa605" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 11:16:20 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 11:16:20 2012 -0700" }, "message": "Merge tag \u0027driver-core-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\nPull driver core patches for 3.4-rc1 from Greg KH:\n \"Here\u0027s the big driver core merge for 3.4-rc1.\n\n Lots of various things here, sysfs fixes/tweaks (with the nlink\n breakage reverted), dynamic debugging updates, w1 drivers, hyperv\n driver updates, and a variety of other bits and pieces, full\n information in the shortlog.\"\n\n* tag \u0027driver-core-3.3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (78 commits)\n Tools: hv: Support enumeration from all the pools\n Tools: hv: Fully support the new KVP verbs in the user level daemon\n Drivers: hv: Support the newly introduced KVP messages in the driver\n Drivers: hv: Add new message types to enhance KVP\n regulator: Support driver probe deferral\n Revert \"sysfs: Kill nlink counting.\"\n uevent: send events in correct order according to seqnum (v3)\n driver core: minor comment formatting cleanups\n driver core: move the deferred probe pointer into the private area\n drivercore: Add driver probe deferral mechanism\n DS2781 Maxim Stand-Alone Fuel Gauge battery and w1 slave drivers\n w1_bq27000: Only one thread can access the bq27000 at a time.\n w1_bq27000 - remove w1_bq27000_write\n w1_bq27000: remove unnecessary NULL test.\n sysfs: Fix memory leak in sysfs_sd_setsecdata().\n intel_idle: Revert change of auto_demotion_disable_flags for Nehalem\n w1: Fix w1_bq27000\n driver-core: documentation: fix up Greg\u0027s email address\n powernow-k6: Really enable auto-loading\n powernow-k7: Fix CPU family number\n ...\n" }, { "commit": "161f7a7161191ab9c2e97f787829ef8dd2b95771", "tree": "9776d3f963c7f0d247b7fb324eab4811a1302f67", "parents": [ "2ba68940c893c8f0bfc8573c041254251bb6aeab", "a078c6d0e6288fad6d83fb6d5edd91ddb7b6ab33" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:32:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:32:09 2012 -0700" }, "message": "Merge branch \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull timer changes for v3.4 from Ingo Molnar\n\n* \u0027timers-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (32 commits)\n ntp: Fix integer overflow when setting time\n math: Introduce div64_long\n cs5535-clockevt: Allow the MFGPT IRQ to be shared\n cs5535-clockevt: Don\u0027t ignore MFGPT on SMP-capable kernels\n x86/time: Eliminate unused irq0_irqs counter\n clocksource: scx200_hrt: Fix the build\n x86/tsc: Reduce the TSC sync check time for core-siblings\n timer: Fix bad idle check on irq entry\n nohz: Remove ts-\u003eEinidle checks before restarting the tick\n nohz: Remove update_ts_time_stat from tick_nohz_start_idle\n clockevents: Leave the broadcast device in shutdown mode when not needed\n clocksource: Load the ACPI PM clocksource asynchronously\n clocksource: scx200_hrt: Convert scx200 to use clocksource_register_hz\n clocksource: Get rid of clocksource_calc_mult_shift()\n clocksource: dbx500: convert to clocksource_register_hz()\n clocksource: scx200_hrt: use pr_\u003clevel\u003e instead of printk\n time: Move common updates to a function\n time: Reorder so the hot data is together\n time: Remove most of xtime_lock usage in timekeeping.c\n ntp: Add ntp_lock to replace xtime_locking\n ...\n" }, { "commit": "2ba68940c893c8f0bfc8573c041254251bb6aeab", "tree": "fa83ebb01d32abd98123fa28f9f6f0b3eaeee25d", "parents": [ "9c2b957db1772ebf942ae7a9346b14eba6c8ca66", "600e145882802d6ccbfe2c4aea243d97caeb91a9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:31:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:31:44 2012 -0700" }, "message": "Merge branch \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler changes for v3.4 from Ingo Molnar\n\n* \u0027sched-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (27 commits)\n printk: Make it compile with !CONFIG_PRINTK\n sched/x86: Fix overflow in cyc2ns_offset\n sched: Fix nohz load accounting -- again!\n sched: Update yield() docs\n printk/sched: Introduce special printk_sched() for those awkward moments\n sched/nohz: Correctly initialize \u0027next_balance\u0027 in \u0027nohz\u0027 idle balancer\n sched: Cleanup cpu_active madness\n sched: Fix load-balance wreckage\n sched: Clean up parameter passing of proc_sched_autogroup_set_nice()\n sched: Ditch per cgroup task lists for load-balancing\n sched: Rename load-balancing fields\n sched: Move load-balancing arguments into helper struct\n sched/rt: Do not submit new work when PI-blocked\n sched/rt: Prevent idle task boosting\n sched/wait: Add __wake_up_all_locked() API\n sched/rt: Document scheduler related skip-resched-check sites\n sched/rt: Use schedule_preempt_disabled()\n sched/rt: Add schedule_preempt_disabled()\n sched/rt: Do not throttle when PI boosting\n sched/rt: Keep period timer ticking when rt throttling is active\n ...\n" }, { "commit": "9c2b957db1772ebf942ae7a9346b14eba6c8ca66", "tree": "0dbb83e57260ea7fc0dc421f214d5f1b26262005", "parents": [ "0bbfcaff9b2a69c71a95e6902253487ab30cb498", "bea95c152dee1791dd02cbc708afbb115bb00f9a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:29:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:29:15 2012 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf events changes for v3.4 from Ingo Molnar:\n\n - New \"hardware based branch profiling\" feature both on the kernel and\n the tooling side, on CPUs that support it. (modern x86 Intel CPUs\n with the \u0027LBR\u0027 hardware feature currently.)\n\n This new feature is basically a sophisticated \u0027magnifying glass\u0027 for\n branch execution - something that is pretty difficult to extract from\n regular, function histogram centric profiles.\n\n The simplest mode is activated via \u0027perf record -b\u0027, and the result\n looks like this in perf report:\n\n\t$ perf record -b any_call,u -e cycles:u branchy\n\n\t$ perf report -b --sort\u003dsymbol\n\t 52.34% [.] main [.] f1\n\t 24.04% [.] f1 [.] f3\n\t 23.60% [.] f1 [.] f2\n\t 0.01% [k] _IO_new_file_xsputn [k] _IO_file_overflow\n\t 0.01% [k] _IO_vfprintf_internal [k] _IO_new_file_xsputn\n\t 0.01% [k] _IO_vfprintf_internal [k] strchrnul\n\t 0.01% [k] __printf [k] _IO_vfprintf_internal\n\t 0.01% [k] main [k] __printf\n\n This output shows from/to branch columns and shows the highest\n percentage (from,to) jump combinations - i.e. the most likely taken\n branches in the system. \"branches\" can also include function calls\n and any other synchronous and asynchronous transitions of the\n instruction pointer that are not \u0027next instruction\u0027 - such as system\n calls, traps, interrupts, etc.\n\n This feature comes with (hopefully intuitive) flat ascii and TUI\n support in perf report.\n\n - Various \u0027perf annotate\u0027 visual improvements for us assembly junkies.\n It will now recognize function calls in the TUI and by hitting enter\n you can follow the call (recursively) and back, amongst other\n improvements.\n\n - Multiple threads/processes recording support in perf record, perf\n stat, perf top - which is activated via a comma-list of PIDs:\n\n\tperf top -p 21483,21485\n\tperf stat -p 21483,21485 -ddd\n\tperf record -p 21483,21485\n\n - Support for per UID views, via the --uid paramter to perf top, perf\n report, etc. For example \u0027perf top --uid mingo\u0027 will only show the\n tasks that I am running, excluding other users, root, etc.\n\n - Jump label restructurings and improvements - this includes the\n factoring out of the (hopefully much clearer) include/linux/static_key.h\n generic facility:\n\n\tstruct static_key key \u003d STATIC_KEY_INIT_FALSE;\n\n\t...\n\n\tif (static_key_false(\u0026key))\n\t do unlikely code\n\telse\n\t do likely code\n\n\t...\n\tstatic_key_slow_inc();\n\t...\n\tstatic_key_slow_inc();\n\t...\n\n The static_key_false() branch will be generated into the code with as\n little impact to the likely code path as possible. the\n static_key_slow_*() APIs flip the branch via live kernel code patching.\n\n This facility can now be used more widely within the kernel to\n micro-optimize hot branches whose likelihood matches the static-key\n usage and fast/slow cost patterns.\n\n - SW function tracer improvements: perf support and filtering support.\n\n - Various hardenings of the perf.data ABI, to make older perf.data\u0027s\n smoother on newer tool versions, to make new features integrate more\n smoothly, to support cross-endian recording/analyzing workflows\n better, etc.\n\n - Restructuring of the kprobes code, the splitting out of \u0027optprobes\u0027,\n and a corner case bugfix.\n\n - Allow the tracing of kernel console output (printk).\n\n - Improvements/fixes to user-space RDPMC support, allowing user-space\n self-profiling code to extract PMU counts without performing any\n system calls, while playing nice with the kernel side.\n\n - \u0027perf bench\u0027 improvements\n\n - ... and lots of internal restructurings, cleanups and fixes that made\n these features possible. And, as usual this list is incomplete as\n there were also lots of other improvements\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (120 commits)\n perf report: Fix annotate double quit issue in branch view mode\n perf report: Remove duplicate annotate choice in branch view mode\n perf/x86: Prettify pmu config literals\n perf report: Enable TUI in branch view mode\n perf report: Auto-detect branch stack sampling mode\n perf record: Add HEADER_BRANCH_STACK tag\n perf record: Provide default branch stack sampling mode option\n perf tools: Make perf able to read files from older ABIs\n perf tools: Fix ABI compatibility bug in print_event_desc()\n perf tools: Enable reading of perf.data files from different ABI rev\n perf: Add ABI reference sizes\n perf report: Add support for taken branch sampling\n perf record: Add support for sampling taken branch\n perf tools: Add code to support PERF_SAMPLE_BRANCH_STACK\n x86/kprobes: Split out optprobe related code to kprobes-opt.c\n x86/kprobes: Fix a bug which can modify kernel code permanently\n x86/kprobes: Fix instruction recovery on optimized path\n perf: Add callback to flush branch_stack on context switch\n perf: Disable PERF_SAMPLE_BRANCH_* when not supported\n perf/x86: Add LBR software filter support for Intel CPUs\n ...\n" }, { "commit": "0bbfcaff9b2a69c71a95e6902253487ab30cb498", "tree": "f422bbfb8ba57909bf6e43f1d560b3f056cc3c61", "parents": [ "5928a2b60cfdbad730f93696acab142d0b607280", "e04268b0effc0ceea366c50b3107baad9edadafa" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:28:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:28:56 2012 -0700" }, "message": "Merge branch \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull irq/core changes for v3.4 from Ingo Molnar\n\n* \u0027irq-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n genirq: Remove paranoid warnons and bogus fixups\n genirq: Flush the irq thread on synchronization\n genirq: Get rid of unnecessary IRQTF_DIED flag\n genirq: No need to check IRQTF_DIED before stopping a thread handler\n genirq: Get rid of unnecessary irqaction field in task_struct\n genirq: Fix incorrect check for forced IRQ thread handler\n softirq: Reduce invoke_softirq() code duplication\n genirq: Fix long-term regression in genirq irq_set_irq_type() handling\n x86-32/irq: Don\u0027t switch to irq stack for a user-mode irq\n" }, { "commit": "5928a2b60cfdbad730f93696acab142d0b607280", "tree": "49bb21c9219673e61bad7a7c9202c7f25f5fe1be", "parents": [ "5ed59af85077d28875a3a137b21933aaf1b4cd50", "bdd4431c8d071491a68a65d9457996f222b5ecd3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 19 17:12:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 20 10:10:18 2012 -0700" }, "message": "Merge branch \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull RCU changes for v3.4 from Ingo Molnar. The major features of this\nseries are:\n\n - making RCU more aggressive about entering dyntick-idle mode in order\n to improve energy efficiency\n\n - converting a few more call_rcu()s to kfree_rcu()s\n\n - applying a number of rcutree fixes and cleanups to rcutiny\n\n - removing CONFIG_SMP #ifdefs from treercu\n\n - allowing RCU CPU stall times to be set via sysfs\n\n - adding CPU-stall capability to rcutorture\n\n - adding more RCU-abuse diagnostics\n\n - updating documentation\n\n - fixing yet more issues located by the still-ongoing top-to-bottom\n inspection of RCU, this time with a special focus on the CPU-hotplug\n code path.\n\n* \u0027core-rcu-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (48 commits)\n rcu: Stop spurious warnings from synchronize_sched_expedited\n rcu: Hold off RCU_FAST_NO_HZ after timer posted\n rcu: Eliminate softirq-mediated RCU_FAST_NO_HZ idle-entry loop\n rcu: Add RCU_NONIDLE() for idle-loop RCU read-side critical sections\n rcu: Allow nesting of rcu_idle_enter() and rcu_idle_exit()\n rcu: Remove redundant check for rcu_head misalignment\n PTR_ERR should be called before its argument is cleared.\n rcu: Convert WARN_ON_ONCE() in rcu_lock_acquire() to lockdep\n rcu: Trace only after NULL-pointer check\n rcu: Call out dangers of expedited RCU primitives\n rcu: Rework detection of use of RCU by offline CPUs\n lockdep: Add CPU-idle/offline warning to lockdep-RCU splat\n rcu: No interrupt disabling for rcu_prepare_for_idle()\n rcu: Move synchronize_sched_expedited() to rcutree.c\n rcu: Check for illegal use of RCU from offlined CPUs\n rcu: Update stall-warning documentation\n rcu: Add CPU-stall capability to rcutorture\n rcu: Make documentation give more realistic rcutorture duration\n rcutorture: Permit holding off CPU-hotplug operations during boot\n rcu: Print scheduling-clock information on RCU CPU stall-warning messages\n ...\n" }, { "commit": "a24401bcf4a67c8fe17e649e74eeb09b08b79ef5", "tree": "c4b1be87e0a63057e85ae82076d54c437313b1f8", "parents": [ "589973a7042f5a91a5b8bf78a32c97ae073e2c72" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Sat Nov 26 10:53:39 2011 +0800" }, "committer": { "name": "Cong Wang", "email": "xiyou.wangcong@gmail.com", "time": "Tue Mar 20 21:48:30 2012 +0800" }, "message": "highmem: kill all __kmap_atomic()\n[swarren@nvidia.com: highmem: Fix ARM build break due to __kmap_atomic rename]\n\nSigned-off-by: Stephen Warren \u003cswarren@nvidia.com\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\n" }, { "commit": "e8e3c3d66fd9d1ee2250f68d778cc48c1346d228", "tree": "2d69e1bb0cefe36bbfc4b75ddfa6cec8e72bcb98", "parents": [ "c6daa7ffa834c850b3dbb38af6980415caef680d" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Fri Nov 25 23:14:27 2011 +0800" }, "committer": { "name": "Cong Wang", "email": "xiyou.wangcong@gmail.com", "time": "Tue Mar 20 21:48:21 2012 +0800" }, "message": "fs: remove the second argument of k[un]map_atomic()\n\nAcked-by: Benjamin LaHaise \u003cbcrl@kvack.org\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\n" }, { "commit": "f0dfc0b0b7f3d961da8a98bcfccc8be9107a848b", "tree": "41cd58ad3ed1a96381984ba8047d9887b951f1cb", "parents": [ "8fd75e1216e0ba601a746177e6c102d5593b572f" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Fri Nov 25 23:14:17 2011 +0800" }, "committer": { "name": "Cong Wang", "email": "xiyou.wangcong@gmail.com", "time": "Tue Mar 20 21:48:16 2012 +0800" }, "message": "crypto: remove the second argument of k[un]map_atomic()\n\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\n" }, { "commit": "1ec9c5ddc17aa398f05646abfcbaf315b544e62f", "tree": "7399616ceb7305c648e99c6b7aed46c3abc4a418", "parents": [ "980c19e3f8ca1d5d43cce588059ea78cac27062a" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Fri Nov 25 23:14:14 2011 +0800" }, "committer": { "name": "Cong Wang", "email": "xiyou.wangcong@gmail.com", "time": "Tue Mar 20 21:48:13 2012 +0800" }, "message": "include/linux/highmem.h: remove the second argument of k[un]map_atomic()\n\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\n" }, { "commit": "980c19e3f8ca1d5d43cce588059ea78cac27062a", "tree": "35e9bea10a21ba78ba6fa58650c4ee6d18877f41", "parents": [ "c16fa4f2ad19908a47c63d8fa436a1178438c7e7" ], "author": { "name": "Cong Wang", "email": "amwang@redhat.com", "time": "Fri Nov 25 22:08:45 2011 +0800" }, "committer": { "name": "Cong Wang", "email": "xiyou.wangcong@gmail.com", "time": "Tue Mar 20 21:48:13 2012 +0800" }, "message": "highmem: mark k[un]map_atomic() with two arguments as deprecated\n\nFor backward compatibility, we still keep the deprecated form,\nand will warn the users if they still use the deprecated one, like this:\n\ndrivers/block/drbd/drbd_bitmap.c: In function ‘bm_page_io_async’:\ndrivers/block/drbd/drbd_bitmap.c:973:3: warning: ‘kmap_atomic_deprecated’ is deprecated (declared at /home/wangcong/linux-2.6/include/linux/highmem.h:124)\ndrivers/block/drbd/drbd_bitmap.c:977:3: warning: ‘kunmap_atomic_deprecated’ is deprecated (declared at /home/wangcong/linux-2.6/include/linux/highmem.h:144)\n\nThanks to Nick Bowler for the cpp trick!\n\nCc: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nCc: Nick Bowler \u003cnbowler@elliptictech.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Cong Wang \u003camwang@redhat.com\u003e\n" } ], "next": "da0df92b57311aa1b26a2a90599ed16e1e968b90" }