)]}' { "log": [ { "commit": "69964ea4c7b68c9399f7977aa5b9aa6539a6a98a", "tree": "5d780ab27d9c0b1478eb9fb96a84eac311f275b3", "parents": [ "6cfdd02b886aac866098f33262d409565f101ce0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 15:19:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 15:19:10 2012 -0700" }, "message": "Linux 3.4-rc5\n" }, { "commit": "6cfdd02b886aac866098f33262d409565f101ce0", "tree": "178b5abf48eb98b9ef0a29d865d7214798ed8b57", "parents": [ "64f371bc3107e69efce563a3d0f0e6880de0d537", "26e0f90fded422f309deb6169dfbccb204435698" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 15:00:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 15:00:44 2012 -0700" }, "message": "Merge tag \u0027pm-for-3.4-rc5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm\n\nPull power management fixes from Rafael J. Wysocki:\n \"Fix for an issue causing hibernation to hang on systems with highmem\n (that practically means i386) due to broken memory management (bug\n introduced in 3.2, so -stable material) and PM documentation update\n making the freezer documentation follow the code again after some\n recent updates.\"\n\n* tag \u0027pm-for-3.4-rc5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:\n PM / Freezer / Docs: Update documentation about freezing of tasks\n PM / Hibernate: fix the number of pages used for hibernate/thaw buffering\n" }, { "commit": "64f371bc3107e69efce563a3d0f0e6880de0d537", "tree": "7eac8ef3bf7a6cc8f9e147b9bf341b14fc6ae7f3", "parents": [ "9883035ae7edef3ec62ad215611cb8e17d6a1a5d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 13:30:08 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 13:30:08 2012 -0700" }, "message": "autofs: make the autofsv5 packet file descriptor use a packetized pipe\n\nThe autofs packet size has had a very unfortunate size problem on x86:\nbecause the alignment of \u0027u64\u0027 differs in 32-bit and 64-bit modes, and\nbecause the packet data was not 8-byte aligned, the size of the autofsv5\npacket structure differed between 32-bit and 64-bit modes despite\nlooking otherwise identical (300 vs 304 bytes respectively).\n\nWe first fixed that up by making the 64-bit compat mode know about this\nproblem in commit a32744d4abae (\"autofs: work around unhappy compat\nproblem on x86-64\"), and that made a 32-bit \u0027systemd\u0027 work happily on a\n64-bit kernel because everything then worked the same way as on a 32-bit\nkernel.\n\nBut it turned out that \u0027automount\u0027 had actually known and worked around\nthis problem in user space, so fixing the kernel to do the proper 32-bit\ncompatibility handling actually *broke* 32-bit automount on a 64-bit\nkernel, because it knew that the packet sizes were wrong and expected\nthose incorrect sizes.\n\nAs a result, we ended up reverting that compatibility mode fix, and\nthus breaking systemd again, in commit fcbf94b9dedd.\n\nWith both automount and systemd doing a single read() system call, and\nverifying that they get *exactly* the size they expect but using\ndifferent sizes, it seemed that fixing one of them inevitably seemed to\nbreak the other. At one point, a patch I seriously considered applying\nfrom Michael Tokarev did a \"strcmp()\" to see if it was automount that\nwas doing the operation. Ugly, ugly.\n\nHowever, a prettier solution exists now thanks to the packetized pipe\nmode. By marking the communication pipe as being packetized (by simply\nsetting the O_DIRECT flag), we can always just write the bigger packet\nsize, and if user-space does a smaller read, it will just get that\npartial end result and the extra alignment padding will simply be thrown\naway.\n\nThis makes both automount and systemd happy, since they now get the size\nthey asked for, and the kernel side of autofs simply no longer needs to\ncare - it could pad out the packet arbitrarily.\n\nOf course, if there is some *other* user of autofs (please, please,\nplease tell me it ain\u0027t so - and we haven\u0027t heard of any) that tries to\nread the packets with multiple writes, that other user will now be\nbroken - the whole point of the packetized mode is that one system call\ngets exactly one packet, and you cannot read a packet in pieces.\n\nTested-by: Michael Tokarev \u003cmjt@tls.msk.ru\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Ian Kent \u003craven@themaw.net\u003e\nCc: Thomas Meyer \u003cthomas@m3y3r.de\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "26e0f90fded422f309deb6169dfbccb204435698", "tree": "0a3f58957920fe57deaa8da051f146e9e16ca328", "parents": [ "f8262d476823a7ea1eb497ff9676d1eab2393c75" ], "author": { "name": "Marcos Paulo de Souza", "email": "marcos.souza.org@gmail.com", "time": "Sun Apr 29 22:29:30 2012 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Sun Apr 29 22:29:30 2012 +0200" }, "message": "PM / Freezer / Docs: Update documentation about freezing of tasks\n\nThe file Documentation/power/freezing-of-tasks.txt was still referencing\nthe TIF_FREEZE flag, that was removed by the commit\nd88e4cb67197d007fb778d62fe17360e970d5bfa(freezer: remove now unused\nTIF_FREEZE).\n\nThis patch removes all the references of TIF_FREEZE that were left\nbehind.\n\nSigned-off-by: Marcos Paulo de Souza \u003cmarcos.souza.org@gmail.com\u003e\nSigned-off-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "9883035ae7edef3ec62ad215611cb8e17d6a1a5d", "tree": "ab4afff1603e0f1e85e349b8a1fdb8415cc457cf", "parents": [ "de9e24eda331bbefb9195a4d646c786bdcbba7d4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 13:12:42 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 13:12:42 2012 -0700" }, "message": "pipes: add a \"packetized pipe\" mode for writing\n\nThe actual internal pipe implementation is already really about\nindividual packets (called \"pipe buffers\"), and this simply exposes that\nas a special packetized mode.\n\nWhen we are in the packetized mode (marked by O_DIRECT as suggested by\nAlan Cox), a write() on a pipe will not merge the new data with previous\nwrites, so each write will get a pipe buffer of its own. The pipe\nbuffer is then marked with the PIPE_BUF_FLAG_PACKET flag, which in turn\nwill tell the reader side to break the read at that boundary (and throw\naway any partial packet contents that do not fit in the read buffer).\n\nEnd result: as long as you do writes less than PIPE_BUF in size (so that\nthe pipe doesn\u0027t have to split them up), you can now treat the pipe as a\npacket interface, where each read() system call will read one packet at\na time. You can just use a sufficiently big read buffer (PIPE_BUF is\nsufficient, since bigger than that doesn\u0027t guarantee atomicity anyway),\nand the return value of the read() will naturally give you the size of\nthe packet.\n\nNOTE! We do not support zero-sized packets, and zero-sized reads and\nwrites to a pipe continue to be no-ops. Also note that big packets will\ncurrently be split at write time, but that the size at which that\nhappens is not really specified (except that it\u0027s bigger than PIPE_BUF).\nCurrently that limit is the system page size, but we might want to\nexplicitly support bigger packets some day.\n\nThe main user for this is going to be the autofs packet interface,\nallowing us to stop having to care so deeply about exact packet sizes\n(which have had bugs with 32/64-bit compatibility modes). But user\nspace can create packetized pipes with \"pipe2(fd, O_DIRECT)\", which will\nfail with an EINVAL on kernels that do not support this interface.\n\nTested-by: Michael Tokarev \u003cmjt@tls.msk.ru\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Ian Kent \u003craven@themaw.net\u003e\nCc: Thomas Meyer \u003cthomas@m3y3r.de\u003e\nCc: stable@kernel.org # needed for systemd/autofs interaction fix\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "de9e24eda331bbefb9195a4d646c786bdcbba7d4", "tree": "bf13f53713e5f8dec8621eee4c5a281fd64d7abd", "parents": [ "8d7d1adcd77ffa2e0edec79d4e48a7b1a1943c47", "89f21cc050d5eed8eeffee5b46297fb7a74ef9dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 12:19:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 12:19:13 2012 -0700" }, "message": "Merge tag \u0027staging-3.4-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging\n\nPull staging tree fixes from Greg Kroah-Hartman:\n \"Here are some tiny drivers/staging/ bugfixes. Some build fixes that\n were recently reported, as well as one kfree bug that is hitting a\n number of users.\"\n\n* tag \u0027staging-3.4-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:\n staging: ozwpan: Fix bug where kfree is called twice.\n staging: octeon-ethernet: fix build errors by including interrupt.h\n staging: zcache: fix Kconfig crypto dependency\n staging: tidspbridge: remove usage of OMAP2_L4_IO_ADDRESS\n" }, { "commit": "8d7d1adcd77ffa2e0edec79d4e48a7b1a1943c47", "tree": "45d2f7fc7588306fd9eb19415d3ee541698a1289", "parents": [ "f7b006931751f029620ad2f8310ac7a1484fbdb4", "41c8a48aa8de88ff56ed2f657b93d2446dd7882c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 12:17:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 29 12:17:54 2012 -0700" }, "message": "Merge tag \u0027usb-3.4-rc5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb\n\nPull USB fixes from Greg Kroah-Hartman:\n \"Here are a number of small USB fixes for 3.4-rc5.\n\n Nothing major, as before, some USB gadget fixes. There\u0027s a crash fix\n for a number of ASUS laptops on resume that had been reported by a\n number of different people. We think the fix might also pertain to\n other machines, as this was a BIOS bug, and they seem to travel to\n different models and manufacturers quite easily. Other than that,\n some other reported problems fixed as well.\"\n\n* tag \u0027usb-3.4-rc5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:\n usb: gadget: udc-core: fix incompatibility with dummy-hcd\n usb: gadget: udc-core: fix wrong call order\n USB: cdc-wdm: fix race leading leading to memory corruption\n USB: EHCI: fix crash during suspend on ASUS computers\n usb gadget: uvc: uvc_request_data::length field must be signed\n usb: gadget: dummy: do not call pullup() on udc_stop()\n usb: musb: davinci.c: add missing unregister\n usb: musb: drop __deprecated flag\n USB: gadget: storage gadgets send wrong error code for unknown commands\n usb: otg: gpio_vbus: Add otg transceiver events and notifiers\n" }, { "commit": "f7b006931751f029620ad2f8310ac7a1484fbdb4", "tree": "71120f4c4c51752902317fbf853e3b0316c2adb0", "parents": [ "b990f9b3cb068578b8aefd3a34f8c8555661ef95", "dc7fdde39e4962b1a88741f7eba2a6b3be1285d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 09:30:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 09:30:07 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs\n\nPull btrfs fixes from Chris Mason:\n \"This has our collection of bug fixes. I missed the last rc because I\n thought our patches were making NFS crash during my xfs test runs.\n Turns out it was an NFS client bug fixed by someone else while I tried\n to bisect it.\n\n All of these fixes are small, but some are fairly high impact. The\n biggest are fixes for our mount -o remount handling, a deadlock due to\n GFP_KERNEL allocations in readdir, and a RAID10 error handling bug.\n\n This was tested against both 3.3 and Linus\u0027 master as of this morning.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: (26 commits)\n Btrfs: reduce lock contention during extent insertion\n Btrfs: avoid deadlocks from GFP_KERNEL allocations during btrfs_real_readdir\n Btrfs: Fix space checking during fs resize\n Btrfs: fix block_rsv and space_info lock ordering\n Btrfs: Prevent root_list corruption\n Btrfs: fix repair code for RAID10\n Btrfs: do not start delalloc inodes during sync\n Btrfs: fix that check_int_data mount option was ignored\n Btrfs: don\u0027t count CRC or header errors twice while scrubbing\n Btrfs: fix btrfs_ioctl_dev_info() crash on missing device\n btrfs: don\u0027t return EINTR\n Btrfs: double unlock bug in error handling\n Btrfs: always store the mirror we read the eb from\n fs/btrfs/volumes.c: add missing free_fs_devices\n btrfs: fix early abort in \u0027remount\u0027\n Btrfs: fix max chunk size check in chunk allocator\n Btrfs: add missing read locks in backref.c\n Btrfs: don\u0027t call free_extent_buffer twice in iterate_irefs\n Btrfs: Make free_ipath() deal gracefully with NULL pointers\n Btrfs: avoid possible use-after-free in clear_extent_bit()\n ...\n" }, { "commit": "b990f9b3cb068578b8aefd3a34f8c8555661ef95", "tree": "091e7f7d62bcc75c244f9cc4615eaab2da6b9991", "parents": [ "cd88e3a61683d3d13276dda9d0debe5dc43c0727", "6e76538b9ef2b2a14ad9b57d65dc35d151765917" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 09:28:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 09:28:43 2012 -0700" }, "message": "Merge tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc\n\nPull ARM SoC fixes from Olof Johansson:\n \"Nothing controversial, just another batch of fixes:\n\n - Samsung/exynos fixes for more merge window fallout: build errors\n and warnings mostly, but also some clock/device setup issues on\n exynos4/5\n - PXA bug and warning fixes related to gpio and pinmux\n - IRQ domain conversion bugfixes for U300 and MSM\n - A regulator setup fix for U300\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: PXA2xx: MFP: fix potential direction bug\n ARM: PXA2xx: MFP: fix bug with MFP_LPM_KEEP_OUTPUT\n arm/sa1100: fix sa1100-rtc memory resource\n ARM: pxa: fix gpio wakeup setting\n ARM: SAMSUNG: add missing MMC_CAP2_BROKEN_VOLTAGE capability\n ARM: EXYNOS: Fix compilation error when CONFIG_OF is not defined\n ARM: EXYNOS: Fix resource on dev-dwmci.c\n ARM: S3C24XX: Fix build warning for S3C2410_PM\n ARM: mini2440_defconfig: Fix build error\n ARM: msm: Fix gic irqdomain support\n ARM: EXYNOS: Fix incorrect initialization of GIC\n ARM: EXYNOS: use \u0027exynos4-sdhci\u0027 as device name for sdhci controllers\n ARM: u300: bump all IRQ numbers by one\n ARM: ux300: Fix unimplementable regulation constraints\n" }, { "commit": "cd88e3a61683d3d13276dda9d0debe5dc43c0727", "tree": "7ce609fa49acae4e655b7e6758ec41682d366b70", "parents": [ "fcbf94b9dedd2ce08e798a99aafc94fec8668161", "3a69ddd6f872180b6f61fda87152b37202118fbc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 09:27:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 09:27:07 2012 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"As soon as I sent the non-urgent stack, two important fixes come in:\n\n - i915: fixes SNB GPU hangs in a number of 3D apps\n\n - radeon: initial fix for VGA on LLano system, 3 or 4 of us have\n spent time debugging this, and Jerome finally figured out the magic\n bit the BIOS/fglrx set that we didn\u0027t. This at least should get\n things working, there may be future reliability fixes.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm/i915: Set the Stencil Cache eviction policy to non-LRA mode.\n drm/radeon/kms: need to set up ss on DP bridges as well\n" }, { "commit": "fcbf94b9dedd2ce08e798a99aafc94fec8668161", "tree": "bc81982bbcf96538a09103b2c722ac7d2c99bdef", "parents": [ "c629eaf8392b676b4f83c3dc344e66402bfeec92" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 08:29:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Apr 28 08:29:56 2012 -0700" }, "message": "Revert \"autofs: work around unhappy compat problem on x86-64\"\n\nThis reverts commit a32744d4abae24572eff7269bc17895c41bd0085.\n\nWhile that commit was technically the right thing to do, and made the\nx86-64 compat mode work identically to native 32-bit mode (and thus\nfixing the problem with a 32-bit systemd install on a 64-bit kernel), it\nturns out that the automount binaries had workarounds for this compat\nproblem.\n\nNow, the workarounds are disgusting: doing an \"uname()\" to find out the\narchitecture of the kernel, and then comparing it for the 64-bit cases\nand fixing up the size of the read() in automount for those. And they\nwere confused: it\u0027s not actually a generic 64-bit issue at all, it\u0027s\nvery much tied to just x86-64, which has different alignment for an\n\u0027u64\u0027 in 64-bit mode than in 32-bit mode.\n\nBut the end result is that fixing the compat layer actually breaks the\ncase of a 32-bit automount on a x86-64 kernel.\n\nThere are various approaches to fix this (including just doing a\n\"strcmp()\" on current-\u003ecomm and comparing it to \"automount\"), but I\nthink that I will do the one that teaches pipes about a special \"packet\nmode\", which will allow user space to not have to care too deeply about\nthe padding at the end of the autofs packet.\n\nThat change will make the compat workaround unnecessary, so let\u0027s revert\nit first, and get automount working again in compat mode. The\npacketized pipes will then fix autofs for systemd.\n\nReported-and-requested-by: Michael Tokarev \u003cmjt@tls.msk.ru\u003e\nCc: Ian Kent \u003craven@themaw.net\u003e\nCc: stable@kernel.org # for 3.3\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3a69ddd6f872180b6f61fda87152b37202118fbc", "tree": "b1d8d861f6f0e7befc3eef07e940f607770da1af", "parents": [ "700698e7c303f5095107c62a81872c2c3dad1702" ], "author": { "name": "Kenneth Graunke", "email": "kenneth@whitecape.org", "time": "Fri Apr 27 12:44:41 2012 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Apr 28 08:05:15 2012 +0100" }, "message": "drm/i915: Set the Stencil Cache eviction policy to non-LRA mode.\n\nClearing bit 5 of CACHE_MODE_0 is necessary to prevent GPU hangs in\nOpenGL programs such as Google MapsGL, Google Earth, and gzdoom when\nusing separate stencil buffers. Without it, the GPU tries to use the\nLRA eviction policy, which isn\u0027t supported. This was supposed to be off\nby default, but seems to be on for many machines.\n\nThis cannot be done in gen6_init_clock_gating with most of the other\nworkaround bits; the render ring needs to exist. Otherwise, the\nregister write gets dropped on the floor (one printk will show it\nchanged, but a second printk immediately following shows the value\nreverts to the old one).\n\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d47535\nCc: stable@vger.kernel.org\nCc: Rob Castle \u003cfuturedub@gmail.com\u003e\nCc: Eric Appleman \u003cerappleman@gmail.com\u003e\nCc: aaron667@gmx.net\nCc: Keith Packard \u003ckeithp@keithp.com\u003e\nSigned-off-by: Kenneth Graunke \u003ckenneth@whitecape.org\u003e\nReviewed-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nAcked-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "700698e7c303f5095107c62a81872c2c3dad1702", "tree": "dc8086b0975a90496cde7f907f0edb7653177d88", "parents": [ "c629eaf8392b676b4f83c3dc344e66402bfeec92" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Fri Apr 27 17:18:59 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Sat Apr 28 08:04:34 2012 +0100" }, "message": "drm/radeon/kms: need to set up ss on DP bridges as well\n\nMakes Nutmeg DP to VGA bridges work for me.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d42490\n\nNoticed by Jerome Glisse (after weeks of debugging).\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c629eaf8392b676b4f83c3dc344e66402bfeec92", "tree": "5edd51bb94b7b83ddf3c3c2793c0a6a1ac671e9c", "parents": [ "4bbbf13fd55a9817452533934dee489683e703b8", "28f8881023c9713c303c0feda270929f9384c019" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 20:56:54 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 20:56:54 2012 -0700" }, "message": "Merge git://git.samba.org/sfrench/cifs-2.6\n\nPull CIFS fixes from Steve French.\n\n* git://git.samba.org/sfrench/cifs-2.6:\n Use correct conversion specifiers in cifs_show_options\n CIFS: Show backupuid/gid in /proc/mounts\n cifs: fix offset handling in cifs_iovec_write\n" }, { "commit": "4bbbf13fd55a9817452533934dee489683e703b8", "tree": "a1766ee11bd554ef2610f51a371a4b187fc45f57", "parents": [ "84c6a81bc68ca5cf15d1b2b58bcc5645c64010b5", "7eb7ce4d2e8991aff4ecb71a81949a907ca755ac" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:56:22 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:56:22 2012 -0700" }, "message": "Merge tag \u0027stable/for-linus-3.4-rc4-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen\n\nPull Xen fixes from Konrad Rzeszutek Wilk:\n \"Some of these had been in existence since the 2.6.27 days, some since\n 3.0 - and some due to new features added in v3.4.\n\n The one that is most interesting is David\u0027s one - in the low-level\n assembler code we had be checking events needlessly. With his patch\n now we do it when the appropriate flag is set - with the added benefit\n that we can process events faster. Stefano\u0027s is fixing a mistake\n where the Linux IRQ numbers were ACK-ed instead of the Xen IRQ,\n resulting in missing interrupts. The other ones are bootup related\n that can show up on various hardware.\"\n\n - In the low-level assembler code we would jump to check events even if\n none were present. This incorrect behavior had been there since\n 2.6.27 days!\n - When using the fast-path for ACK-ing interrupts we were using the\n Linux IRQ numbers instead of the Xen ones (and they can differ) and\n missing interrupts in process.\n - Fix bootup crashes when ACPI hotplug CPUs were present and they would\n expand past the set number of CPUs we were allocated.\n - Deal with broken BIOSes when uploading C-states to the hypervisor.\n - Disable the cpuid check for MWAIT_LEAF if the ACPI PAD driver is\n loaded. If the ACPI PAD driver is used it will crash, so lets not\n export the functionality so the ACPI PAD driver won\u0027t load.\n\n* tag \u0027stable/for-linus-3.4-rc4-tag\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:\n xen: correctly check for pending events when restoring irq flags\n xen/acpi: Workaround broken BIOSes exporting non-existing C-states.\n xen/smp: Fix crash when booting with ACPI hotplug CPUs.\n xen: use the pirq number to check the pirq_eoi_map\n xen/enlighten: Disable MWAIT_LEAF so that acpi-pad won\u0027t be loaded.\n" }, { "commit": "84c6a81bc68ca5cf15d1b2b58bcc5645c64010b5", "tree": "cd2e0ccf78d2226fcc969539594d392088dddac9", "parents": [ "9f7e2f9037ffa03f4c4cd6f19159a367e4e02f44", "2431a8154634027ce3915200699f26fb3725a1f2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:52:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:52:30 2012 -0700" }, "message": "Merge tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6\n\nPull misc SPI device driver bug fixes from Grant Likely.\n\n* tag \u0027spi-for-linus\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/spi-bfin5xx: Fix flush of last bit after each spi transfer\n spi/spi-bfin5xx: fix reversed if condition in interrupt mode\n spi/spi_bfin_sport: drop bits_per_word from client data\n spi/bfin_spi: drop bits_per_word from client data\n spi/spi-bfin-sport: move word length setup to transfer handler\n spi/bfin5xx: rename config macro name for bfin5xx spi controller driver\n spi/pl022: Allow request for higher frequency than maximum possible\n spi/bcm63xx: set master driver mode_bits.\n spi/bcm63xx: don\u0027t use the stopping state\n spi/bcm63xx: convert to the pump message infrastructure\n spi/spi-ep93xx.c: use dma_transfer_direction instead of dma_data_direction\n spi: fix spi.h kernel-doc warning\n spi/pl022: Fix calculate_effective_freq()\n spi/pl022: Fix range checking for bits per word\n" }, { "commit": "9f7e2f9037ffa03f4c4cd6f19159a367e4e02f44", "tree": "fe0b16b755eca36435be7932ea9a922df4c87973", "parents": [ "a882a4d053847f9fb148905f416fd85b20bb88fa", "c3e40a9972428d6e2d8e287ed0233a57a218c30f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:50:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:50:56 2012 -0700" }, "message": "Merge tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging\n\nPull hwmon patches from Guenter Roeck:\n - Fix build warning in ad7314 driver\n - Fix pci_device_id array access in fam15h_power driver, introduced by\n commit 00250ec90963 (\"hwmon: fam15h_power: fix bogus values with\n current BIOSes\")\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n hwmon: (fam15h_power) Fix pci_device_id array\n hwmon: (ad7314) Fix build warning\n" }, { "commit": "a882a4d053847f9fb148905f416fd85b20bb88fa", "tree": "57eab5490c138bb2371ab18c209f4175ee3694a0", "parents": [ "78e97a478882fcdacb0d5d467cb840bc325b27da", "37d4174d2d252c37dcb3d88cafae488542087848" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:46:31 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:46:31 2012 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"For your Friday pull request stack, nothing astounding or shattering\n this week some exynos, some intel, some radeon fixes. One intel fix\n for a regression somwehere back in 2.6.35 land.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm/radeon/kms: use frac fb div on APUs\n drm/radeon: add a missing entry to encoder_names\n drm/i915: handle input/output sdvo timings separately in mode_set\n drm/i915: fix integer overflow in i915_gem_do_execbuffer()\n drm/i915: fix integer overflow in i915_gem_execbuffer2()\n drm/exynos: added missed vm area region mapping type.\n drm/exynos: fixed exynos_drm_gem_map_pages bug.\n drm/exynos: fixed duplicatd memory allocation bug.\n drm/i915: fixup load-detect on enabled, but not active pipe\n" }, { "commit": "78e97a478882fcdacb0d5d467cb840bc325b27da", "tree": "9f42453b6136861248be057354cdb834aded7145", "parents": [ "c28c48516975af9cad219a52557333342e0ed319", "4d8cd7e780aab781e40ea3178bdbae089f5125a0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:40:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:40:56 2012 -0700" }, "message": "Merge branch \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull RCU fix from Ingo Molnar.\n\n* \u0027core-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n rcu: Permit call_rcu() from CPU_DYING notifiers\n" }, { "commit": "c28c48516975af9cad219a52557333342e0ed319", "tree": "80015a8cee2e413348391d0e9e19662fc0385170", "parents": [ "daae677f56187e83ddc81cf8e45bbcc236e0e661", "ea0dcf903e7d76aa5d483d876215fedcfdfe140f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:40:17 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:40:17 2012 -0700" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 fixes from Ingo Molnar.\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x86/apic: Use x2apic physical mode based on FADT setting\n x86/mrst: Quiet sparse noise about plain integer as NULL pointer\n x86, intel_cacheinfo: Fix error return code in amd_set_l3_disable_slot()\n" }, { "commit": "daae677f56187e83ddc81cf8e45bbcc236e0e661", "tree": "ed4dbd2383c4096f6ef00f57fd4635f5b045a6b1", "parents": [ "06fc5d3d248bdae213aed9efe3a262acf10acd94", "fb2cf2c660971bea0ad86a9a5c19ad39eab61344" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:37:00 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:37:00 2012 -0700" }, "message": "Merge branch \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull scheduler fixes from Ingo Molnar.\n\n* \u0027sched-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n sched: Fix OOPS when build_sched_domains() percpu allocation fails\n sched: Fix more load-balancing fallout\n" }, { "commit": "06fc5d3d248bdae213aed9efe3a262acf10acd94", "tree": "c2d9163a1f41760566586ebacac26ecd64dd22e9", "parents": [ "f6072452c903f2e4dcbae1230f8fbcbf058bd71a", "724b6daa13e100067c30cfc4d1ad06629609dc4e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:35:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:35:50 2012 -0700" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull perf fixes from Ingo Molnar.\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n perf: Fix perf_event_for_each() to use sibling\n perf symbols: Read plt symbols from proper symtab_type binary\n tracing: Fix stacktrace of latency tracers (irqsoff and friends)\n perf tools: Add \u0027G\u0027 and \u0027H\u0027 modifiers to event parsing\n tracing: Fix regression with tracing_on\n perf tools: Drop CROSS_COMPILE from flex and bison calls\n perf report: Fix crash showing warning related to kernel maps\n tracing: Fix build breakage without CONFIG_PERF_EVENTS (again)\n" }, { "commit": "f6072452c903f2e4dcbae1230f8fbcbf058bd71a", "tree": "7f33a247279beb624ddca9df3d10822104048e13", "parents": [ "d7e69bc73c423723c30b5cd3d4b1d72c06ed22e6", "8e12a038f88e819c878e5697ff681cb08bcebb08" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:32:37 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:32:37 2012 -0700" }, "message": "Merge branch \u0027for-v3.4-rc5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux\n\nPull build fixes for less mainstream architectures from Paul Gortmaker:\n \"These are fixes for frv(1), blackfin(2), powerpc(1) and xtensa(4).\n\n Fortunately the touches are nearly all specific to files just used by\n the arch in question. The two touches to shared/common files\n [kernel/irq/debug.h and drivers/pci/Makefile] are trivial to assess as\n no risk to anyone.\n\n Half of them relate to xtensa directly. It was only when I fixed the\n last xtensa issue that I realized that the arch has been broken for a\n significant time, and isn\u0027t a specific v3.4 regression. So if you\n wanted, we could leave xtensa lying bleeding in the street for a\n couple more weeks and queue those for 3.5. But given they are no risk\n to anyone outside of xtensa, I figured to just leave them in.\n\n If you are OK with taking the xtensa fixes, then please pull to get:\n\n - one last implicit include uncovered by system.h that is in a file\n specific to just one powerpc defconfig. (I\u0027d sync\u0027d with BenH).\n\n - fix an oversight in the PCI makefile where shared code wasn\u0027t being\n compiled for ARCH\u003dfrv\n\n - fix a missing include for GPIO in blackfin framebuffer.\n\n - audit and tag endif in blackfin ezkit board file, in order to find\n and fix the misplaced endif masking a block of code.\n\n - fix irq/debug.h choice of temporary macro names to be more internal\n so they don\u0027t conflict with names used by xtensa.\n\n - fix a reference to an undeclared local var in xtensa\u0027s signal.c\n\n - fix an implicit bug.h usage in xtensa\u0027s asm/io.h uncovered by my\n removing bug.h from kernel.h\n\n - fix xtensa to properly indicate it is using asm-generic/hardirq.h\n in order to resolve the link error - undefined ack_bad_irq\n\n The xtensa still fails final link as my latest binutils does something\n evil when ld forward-relocates unlikely() blocks, but in theory people\n who have older/valid toolchains could now use the thing.\"\n\n* \u0027for-v3.4-rc5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux:\n xtensa: fix build fail on undefined ack_bad_irq\n blackfin: fix ifdef fustercluck in mach-bf538/boards/ezkit.c\n blackfin: fix compile error in bfin-lq035q1-fb.c\n pci: frv architecture needs generic setup-bus infrastructure\n irq: hide debug macros so they don\u0027t collide with others.\n xtensa: fix build error in xtensa/include/asm/io.h\n xtensa: fix build failure in xtensa/kernel/signal.c\n powerpc: fix system.h fallout in sysdev/scom.c [chroma_defconfig]\n" }, { "commit": "d7e69bc73c423723c30b5cd3d4b1d72c06ed22e6", "tree": "5fe02b0bc3b3883036d76fda82cc13c1966ae7da", "parents": [ "9c687702b66a24ddd688fcabf765be9e72219808", "3c3c801fcfafa53e7ab8615ca3bd596ba308f72b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:31:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:31:10 2012 -0700" }, "message": "Merge tag \u0027sh-for-linus\u0027 of git://github.com/pmundt/linux-sh\n\nPull SuperH fixes from Paul Mundt.\n\n* tag \u0027sh-for-linus\u0027 of git://github.com/pmundt/linux-sh:\n sh: Fix up tracepoint build fallout from static key introduction.\n sh: Fix error synchronising kernel page tables\n" }, { "commit": "9c687702b66a24ddd688fcabf765be9e72219808", "tree": "b3e9b82faf33be96a02f7d75db7e338109b5d839", "parents": [ "82b769063598d01a8b24abf250a53f8b437e09f1", "a05a4830a32ef9f89e7bd372a7bae9b96b1ac266" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:27:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 27 19:27:26 2012 -0700" }, "message": "Merge branch \u0027docs-3.4\u0027 of git://git.samba.org/jlayton/linux\n\nPull security key doc update from Jeff Layton:\n \"Ordinarily, I send my patches through others\u0027 trees, but David\n suggested I just send this one to you directly since it\u0027s just a\n Documentation/ update\"\n\n* \u0027docs-3.4\u0027 of git://git.samba.org/jlayton/linux:\n keys: update the documentation with info about \"logon\" keys\n" }, { "commit": "7eb7ce4d2e8991aff4ecb71a81949a907ca755ac", "tree": "f04b92fc472ca0d41ae5eb61daff6748789cd747", "parents": [ "b930fe5e1f5646e071facda70b25b137ebeae5af" ], "author": { "name": "David Vrabel", "email": "david.vrabel@citrix.com", "time": "Thu Apr 26 19:44:06 2012 +0100" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Fri Apr 27 16:04:21 2012 -0400" }, "message": "xen: correctly check for pending events when restoring irq flags\n\nIn xen_restore_fl_direct(), xen_force_evtchn_callback() was being\ncalled even if no events were pending. This resulted in (depending on\nworkload) about a 100 times as many xen_version hypercalls as\nnecessary.\n\nFix this by correcting the sense of the conditional jump.\n\nThis seems to give a significant performance benefit for some\nworkloads.\n\nThere is some subtle tricksy \"..since the check here is trying to\ncheck both pending and masked in a single cmpw, but I think this is\ncorrect. It will call check_events now only when the combined\nmask+pending word is 0x0001 (aka unmasked, pending).\" (Ian)\n\nCC: stable@kernel.org\nAcked-by: Ian Campbell \u003cian.campbell@citrix.com\u003e\nSigned-off-by: David Vrabel \u003cdavid.vrabel@citrix.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "dc7fdde39e4962b1a88741f7eba2a6b3be1285d8", "tree": "97cd8b1f9d8c0682c64303d45de1fb55925abcdf", "parents": [ "fede766f28dd766d4e8feb321fdb19edb21ef6fb" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 14:31:29 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 14:51:05 2012 -0400" }, "message": "Btrfs: reduce lock contention during extent insertion\n\nWe\u0027re spending huge amounts of time on lock contention during\nend_io processing because we unconditionally assume we are overwriting\nan existing extent in the file for each IO.\n\nThis checks to see if we are outside i_size, and if so, it uses a\nless expensive readonly search of the btree to look for existing\nextents.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "fede766f28dd766d4e8feb321fdb19edb21ef6fb", "tree": "86e59f6bf94ad77c2fa1b232faa8f8b63b8675cb", "parents": [ "7654b72417e10e294563496e25211200f9b8b6d3" ], "author": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 14:23:22 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 14:23:22 2012 -0400" }, "message": "Btrfs: avoid deadlocks from GFP_KERNEL allocations during btrfs_real_readdir\n\nBtrfs has an optimization where it will preallocate dentries during\nreaddir to fill in enough information to open the inode without an extra\nlookup.\n\nBut, we\u0027re calling d_alloc, which is doing GFP_KERNEL allocations, and\nthat leads to deadlocks because our readdir code has tree locks held.\n\nFor now, disable this optimization. We\u0027ll fix the gfp mask in the next\nmerge window.\n\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "2431a8154634027ce3915200699f26fb3725a1f2", "tree": "836dc408c6bfc8af24a5b9c5f0f46b7c23001438", "parents": [ "128465ca7c0775609b1c24f66cd6bddac5f59c9b" ], "author": { "name": "Scott Jiang", "email": "scott.jiang.linux@gmail.com", "time": "Mon Apr 23 18:18:13 2012 -0400" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 12:20:39 2012 -0600" }, "message": "spi/spi-bfin5xx: Fix flush of last bit after each spi transfer\n\nThis patch ensures that the last bit of a transfer gets correctly\nflushed out of the register.\n\nSigned-off-by: Scott Jiang \u003cscott.jiang.linux@gmail.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "128465ca7c0775609b1c24f66cd6bddac5f59c9b", "tree": "c3d4b1c135e36bbd0f99b56c8f50ec1c7fe71cf1", "parents": [ "8d9d2a4b6ca0013b62a438808d22bdd615abcd00" ], "author": { "name": "Scott Jiang", "email": "scott.jiang.linux@gmail.com", "time": "Mon Apr 23 18:18:12 2012 -0400" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 12:19:01 2012 -0600" }, "message": "spi/spi-bfin5xx: fix reversed if condition in interrupt mode\n\nThis condition is used to determine 8 bits or 16 and 32 bits transfer.\nObviously it is reversed.\n\nSigned-off-by: Scott Jiang \u003cscott.jiang.linux@gmail.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "8d9d2a4b6ca0013b62a438808d22bdd615abcd00", "tree": "8b613741abafb594ce3fa9e1f1070dcfc73ae382", "parents": [ "7666fd8b02af87a8b672b00d47e56d77f709127e" ], "author": { "name": "Scott Jiang", "email": "scott.jiang.linux@gmail.com", "time": "Mon Apr 23 18:18:11 2012 -0400" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 12:17:25 2012 -0600" }, "message": "spi/spi_bfin_sport: drop bits_per_word from client data\n\nSince the member was dropped from the common Blackfin header, we need\nto stop using it in the SPORT driver too.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Scott Jiang \u003cscott.jiang.linux@gmail.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "7666fd8b02af87a8b672b00d47e56d77f709127e", "tree": "e878378189b64b249c5b8cc371a275a999a46120", "parents": [ "488e1a9de27f0a299fc185f0b5c67246a3f0c6c9" ], "author": { "name": "Scott Jiang", "email": "scott.jiang.linux@gmail.com", "time": "Mon Apr 23 18:18:10 2012 -0400" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 12:16:39 2012 -0600" }, "message": "spi/bfin_spi: drop bits_per_word from client data\n\nNo other SPI controller has this field, and SPI clients should be setting\nthis up in their own drivers. So drop it from the Blackfin controller to\nkeep people from using it.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Scott Jiang \u003cscott.jiang.linux@gmail.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "488e1a9de27f0a299fc185f0b5c67246a3f0c6c9", "tree": "a4c3130931148e5d3744e8fbb7b69fc8d924959e", "parents": [ "22ac3e82e1d3e5cad92538fe4ab51906cb220444" ], "author": { "name": "Scott Jiang", "email": "scott.jiang.linux@gmail.com", "time": "Mon Apr 23 18:18:09 2012 -0400" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 12:16:21 2012 -0600" }, "message": "spi/spi-bfin-sport: move word length setup to transfer handler\n\nEach transfer may have its own bits per word.\n\nSigned-off-by: Scott Jiang \u003cscott.jiang.linux@gmail.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "22ac3e82e1d3e5cad92538fe4ab51906cb220444", "tree": "1fcbf1cc2b50c41f9c2adf72b6f220bb85b89dc9", "parents": [ "ea505bc99f77f3f9db02bb965bd59ac5db063f60" ], "author": { "name": "Scott Jiang", "email": "scott.jiang.linux@gmail.com", "time": "Mon Apr 23 18:18:08 2012 -0400" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 12:15:45 2012 -0600" }, "message": "spi/bfin5xx: rename config macro name for bfin5xx spi controller driver\n\nThis controller is only for blackfin 5xx soc, so rename it to BFIN5XX\n\nSigned-off-by: Scott Jiang \u003cscott.jiang.linux@gmail.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "ea505bc99f77f3f9db02bb965bd59ac5db063f60", "tree": "de89dabcfede2797cdecc224aa5224854db5232a", "parents": [ "88a3a255a510ed193bf0cc35424761c3c9247586" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Thu Apr 19 11:48:15 2012 +0530" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 12:07:40 2012 -0600" }, "message": "spi/pl022: Allow request for higher frequency than maximum possible\n\nCurrently, if we request for frequency greater than maximum possible, spi driver\nreturns error.\n\nFor example, if the spi block src frequency is 333/4 MHz, i.e. 83.33.. MHz,\nmaximum frequency programmable would be src/2. Which would come around 41.6...\n\nIt is difficult to pass frequency in these figures. We normally try to program\nin round figures, like 42 MHz and it should get programmed to \u003c\u003d\nrequested_frequency, i.e. 41.6...\n\nFor this to happen, we must not return error even if requested freq is higher\nthan max possible. But should program it to max possible.\n\nReported-by: Vinit Kamalaksha Shenoy \u003cvinit.shenoy@st.com\u003e\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "7654b72417e10e294563496e25211200f9b8b6d3", "tree": "5ca24ea9bb735133c0e09a789d3eb50d9a8b69b4", "parents": [ "1f699d38b6556c393ac80f1c23c2053502a51631" ], "author": { "name": "Daniel J Blueman", "email": "daniel@quora.org", "time": "Fri Apr 27 12:41:46 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 13:55:14 2012 -0400" }, "message": "Btrfs: Fix space checking during fs resize\n\nFix out-of-space checking, addressing a warning and potential resource\nleak when resizing the filesystem down while allocating blocks.\n\nSigned-off-by: Daniel J Blueman \u003cdaniel@quora.org\u003e\nReviewed-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "1f699d38b6556c393ac80f1c23c2053502a51631", "tree": "9ba8e3c95cc044461eab17dfba50515535ca2a25", "parents": [ "1daf3540fa77faea2f91d96bcaf07ce48ee827be" ], "author": { "name": "Stefan Behrens", "email": "sbehrens@giantdisaster.de", "time": "Fri Apr 27 12:41:46 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 13:55:14 2012 -0400" }, "message": "Btrfs: fix block_rsv and space_info lock ordering\n\nmay_commit_transaction() calls\n spin_lock(\u0026space_info-\u003elock);\n spin_lock(\u0026delayed_rsv-\u003elock);\nand update_global_block_rsv() calls\n spin_lock(\u0026block_rsv-\u003elock);\n spin_lock(\u0026sinfo-\u003elock);\n\nLockdep complains about this at run time.\nEverywhere except in update_global_block_rsv(), the space_info lock is\nthe outer lock, therefore the locking order in update_global_block_rsv()\nis changed.\n\nSigned-off-by: Stefan Behrens \u003csbehrens@giantdisaster.de\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "1daf3540fa77faea2f91d96bcaf07ce48ee827be", "tree": "0cdec92cca58085352b7ba8f4c3245a91dd0b5a9", "parents": [ "3e74317ad773ba9df36db1fa32848cba41ac4d1a" ], "author": { "name": "Daniel J Blueman", "email": "daniel@quora.org", "time": "Fri Apr 27 12:41:46 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 13:55:13 2012 -0400" }, "message": "Btrfs: Prevent root_list corruption\n\nI was seeing root_list corruption on unmount during fs resize in 3.4-rc4; add\ncorrect locking to address this.\n\nSigned-off-by: Daniel J Blueman \u003cdaniel@quora.org\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "3e74317ad773ba9df36db1fa32848cba41ac4d1a", "tree": "ad017d3a85aeaf32dbfd5c63312ff200502d33a7", "parents": [ "996d282c7ff470f150a467eb4815b90159d04c47" ], "author": { "name": "Jan Schmidt", "email": "list.btrfs@jan-o-sch.net", "time": "Fri Apr 27 12:41:45 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 13:55:13 2012 -0400" }, "message": "Btrfs: fix repair code for RAID10\n\nbtrfs_map_block sets mirror_num, so that the repair code knows eventually\nwhich device gave us the read error. For RAID10, mirror_num must be 1 or 2.\nBefore this fix mirror_num was incorrectly related to our stripe index.\n\nSigned-off-by: Jan Schmidt \u003clist.btrfs@jan-o-sch.net\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "996d282c7ff470f150a467eb4815b90159d04c47", "tree": "e6dcab1fc9db79eff901aa3ea07d01ddc734999a", "parents": [ "25cd999e1a685dab65292afbe9fa24d790d8a859" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Apr 23 20:35:03 2012 -0400" }, "committer": { "name": "Chris Mason", "email": "chris.mason@oracle.com", "time": "Fri Apr 27 13:55:12 2012 -0400" }, "message": "Btrfs: do not start delalloc inodes during sync\n\nbtrfs_start_delalloc_inodes will just walk the list of delalloc inodes and\nstart writing them out, but it doesn\u0027t splice the list or anything so as\nlong as somebody is doing work on the box you could end up in this section\n_forever_. So just remove it, it\u0027s not needed anyway since sync will start\nwriteback on all inodes anyway, all we need to do is wait for ordered\nextents and then we can commit the transaction. In my horrible torture test\nsync goes from taking 4 minutes to about 1.5 minutes. Thanks,\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@oracle.com\u003e\n" }, { "commit": "88a3a255a510ed193bf0cc35424761c3c9247586", "tree": "756d1d4e1fdea15858e65351075910173eed7995", "parents": [ "1e41dc0ee2f3807328db95e4f87ff1333245190f" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Fri Apr 20 15:37:35 2012 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 11:19:15 2012 -0600" }, "message": "spi/bcm63xx: set master driver mode_bits.\n\nWe were not properly advertising the MODE bits supported by this driver, fix\nthat.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "1e41dc0ee2f3807328db95e4f87ff1333245190f", "tree": "1f6539f37b28cf99d63805d0a9f81f730a4146c5", "parents": [ "cde4384e1037c15e5dd04c68d19c75798b6281dd" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Fri Apr 20 15:37:34 2012 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 11:16:46 2012 -0600" }, "message": "spi/bcm63xx: don\u0027t use the stopping state\n\nWe do not need to use a flag to indicate if the master driver is stopping\nit is sufficient to perform spi master unregistering in the platform\ndriver\u0027s remove function.\n\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "cde4384e1037c15e5dd04c68d19c75798b6281dd", "tree": "d3b9865bdb5d064c9f047310acd6588091f6d8cd", "parents": [ "d4b9b578cba7231c1fbafbe901a2e8f38654e056" ], "author": { "name": "Florian Fainelli", "email": "florian@openwrt.org", "time": "Fri Apr 20 15:37:33 2012 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 11:15:41 2012 -0600" }, "message": "spi/bcm63xx: convert to the pump message infrastructure\n\nThis patch converts the bcm63xx SPI driver to use the SPI infrastructure\npump message queue. Since we were previously sleeping in the SPI\ndriver\u0027s transfer() function (which is not allowed) this is now fixed as well.\n\nTo complete that conversion a certain number of changes have been made:\n- the transfer len is split into multiple hardware transfers in case its\n size is bigger than the hardware FIFO size\n- the FIFO refill is no longer done in the interrupt context, which was a\n bad idea leading to quick interrupt handler re-entrancy\n\nTested-by: Tanguy Bouzeloc \u003ctanguy.bouzeloc@efixo.com\u003e\nSigned-off-by: Florian Fainelli \u003cflorian@openwrt.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "d4b9b578cba7231c1fbafbe901a2e8f38654e056", "tree": "29daa1cec9737e4ec34f52354133d7ddfac987d0", "parents": [ "dbabe0d659d3cfe42830a779909ab3cd42f7b027" ], "author": { "name": "H Hartley Sweeten", "email": "hartleys@visionengravers.com", "time": "Tue Apr 17 18:46:36 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 11:11:28 2012 -0600" }, "message": "spi/spi-ep93xx.c: use dma_transfer_direction instead of dma_data_direction\n\nA new enum indicating the dma channel direction was introduced by:\n\ncommit 49920bc66984a512f4bcc7735a61642cd0e4d6f2\n dmaengine: add new enum dma_transfer_direction\n\nThe following commit changed spi-ep93xx to use the new enum:\n\ncommit a485df4b4404379786c4bdd258bc528b2617449d\n spi, serial: move to dma_transfer_direction\n\nIn doing so a sparse warning was introduced:\n\nwarning: mixing different enum types\n int enum dma_data_direction versus\n int enum dma_transfer_direction\n\nThis is produced because the \u0027dir\u0027 passed in ep93xx_spi_dma_prepare\nis an enum dma_data_direction and is being used to set the\ndma_slave_config \u0027direction\u0027 which is now an enum dma_transfer_direction.\n\nFix this by converting spi-ep93xx to use the new enum type in all\nplaces.\n\nSigned-off-by: H Hartley Sweeten \u003chsweeten@visionengravers.com\u003e\nAcked-by: Mika Westerberg \u003cmika.westerberg@iki.fi\u003e\nAcked-by: Vinod Koul \u003cvinod.koul@intel.com\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "dbabe0d659d3cfe42830a779909ab3cd42f7b027", "tree": "bc058a8d9f92df91064e0dc458a145be448a194f", "parents": [ "5eb806a3a68920a9f373f18b03fa14852047e62b" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Tue Apr 17 17:03:50 2012 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 11:03:38 2012 -0600" }, "message": "spi: fix spi.h kernel-doc warning\n\nFix kernel-doc warning in spi.h (copy/paste):\n\nWarning(include/linux/spi/spi.h:365): No description found for parameter \u0027unprepare_transfer_hardware\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "5eb806a3a68920a9f373f18b03fa14852047e62b", "tree": "0a5ecac4d4b8c729cefe70c6f406c17f274774db", "parents": [ "eb798c641a34ae9cee9fcacfbe5dd40bd7777607" ], "author": { "name": "Viresh Kumar", "email": "viresh.kumar@st.com", "time": "Thu Apr 19 14:44:21 2012 +0530" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Apr 27 10:47:51 2012 -0600" }, "message": "spi/pl022: Fix calculate_effective_freq()\n\ncalculate_effective_freq() was still not optimized and there were cases when it\nreturned without error and with values of cpsr and scr as zero.\n\nAlso, the variable named found is not used well.\n\nThis patch targets to optimize and correct this routine. Tested for SPEAr.\n\nSigned-off-by: Viresh Kumar \u003cviresh.kumar@st.com\u003e\nTested-by: Vinit Kamalaksha Shenoy \u003cvinit.shenoy@st.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "6e76538b9ef2b2a14ad9b57d65dc35d151765917", "tree": "abb95e720792583a5656137650eb0549c8967c10", "parents": [ "dadb3660a3ad162ac6e76be7262c72f48177f1aa", "9b4d1cbb1391ae603c20cbf8c0beb66e38397196" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Apr 27 09:40:06 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Apr 27 09:40:06 2012 -0700" }, "message": "Merge branch \u0027v3.4-samsung-fixes-3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes\n\n* \u0027v3.4-samsung-fixes-3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:\n ARM: SAMSUNG: add missing MMC_CAP2_BROKEN_VOLTAGE capability\n ARM: EXYNOS: Fix compilation error when CONFIG_OF is not defined\n ARM: EXYNOS: Fix resource on dev-dwmci.c\n ARM: S3C24XX: Fix build warning for S3C2410_PM\n ARM: mini2440_defconfig: Fix build error\n ARM: EXYNOS: Fix incorrect initialization of GIC\n ARM: EXYNOS: use \u0027exynos4-sdhci\u0027 as device name for sdhci controllers\n" }, { "commit": "dadb3660a3ad162ac6e76be7262c72f48177f1aa", "tree": "9298fc01b98d5f56afb1494ddedddcc753f2e2b4", "parents": [ "b7b617c527224acd862274fc58ff16dd34ab6466", "ef7c7c693b4b05a293678fd40ed1511bc94d6f61" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Apr 27 09:31:02 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Fri Apr 27 09:31:02 2012 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://github.com/hzhuang1/linux into fixes\n\n* \u0027fixes\u0027 of git://github.com/hzhuang1/linux:\n ARM: PXA2xx: MFP: fix potential direction bug\n ARM: PXA2xx: MFP: fix bug with MFP_LPM_KEEP_OUTPUT\n arm/sa1100: fix sa1100-rtc memory resource\n ARM: pxa: fix gpio wakeup setting\n" }, { "commit": "41c8a48aa8de88ff56ed2f657b93d2446dd7882c", "tree": "dae22797d5a162d029f3eb612f0cc940a9e680e5", "parents": [ "5c22837adca7c30b66121cf18ad3e160134268d4", "320cd1e750f1bf3e47eb41209dcb2be07264cb76" ], "author": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Apr 27 07:50:34 2012 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Fri Apr 27 07:50:34 2012 -0700" }, "message": "Merge tag \u0027fixes-for-v3.4-rc5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus\n\nusb: fixes for v3.4-rc cycle\n\nA few more fixes for v3.4-rc cycle.\n\nIt includes a couple of fixes to the ordering of the methods in udc-core.c.\nWithout these two patches, we will have issues when either unregistering a\ngadget driver (triggered with dummy_hcd only) or issuing a device-initiated\ndisconnect through sysfs.\n\nThere\u0027s also a fix on dummy_hcd to not call -\u003epullup() from udc_stop() because\nudc-core.c already handles that.\n\nA fix to MUSB as promised, to kill the compile warnings regarding deprecated\ninterfaces. We are essentially dropping the __deprecated flag because it\ndoesn\u0027t look like we will ever be able to live without it when we consider the\namount of silicon issues we find on different MUSB instantiations.\n\nA couple of other fixes are also available, one adding the missing transceiver\nevents to gpio_vbus and another adding a missing unregister call to MUSB\u0027s\ndavinci glue layer.\n" }, { "commit": "320cd1e750f1bf3e47eb41209dcb2be07264cb76", "tree": "62627ea5423feb10d7ae77e7e52360fa0d572326", "parents": [ "83a787a71e034244a9fd1d5988fe18f226341417" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Thu Apr 26 11:31:57 2012 -0400" }, "committer": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Fri Apr 27 11:06:15 2012 +0300" }, "message": "usb: gadget: udc-core: fix incompatibility with dummy-hcd\n\nThis patch (as1548) fixes a recently-introduced incompatibility\nbetween the UDC core and the dummy-hcd driver. Commit\n8ae8090c82eb407267001f75b3d256b3bd4ae691 (usb: gadget: udc-core: fix\nasymmetric calls in remove_driver) moved the usb_gadget_udc_stop()\ncall in usb_gadget_remove_driver() below the usb_gadget_disconnect()\ncall.\n\nAs a result, usb_gadget_disconnect() gets called at a time when the\ngadget driver believes it has been unbound but dummy-hcd believes\nit has not. A nasty error ensues when dummy-hcd calls the gadget\ndriver\u0027s disconnect method a second time.\n\nTo fix the problem, this patch moves the gadget driver\u0027s unbind\nnotification after the usb_gadget_disconnect() call. Now nothing\nhappens between the two unbind notifications, so nothing goes wrong.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nTested-by: Alexander Shishkin \u003calexander.shishkin@linux.intel.com\u003e\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n" }, { "commit": "83a787a71e034244a9fd1d5988fe18f226341417", "tree": "4ed07aa897320c5f1f24a77209ca0543be0be58b", "parents": [ "15b120d67019d691e4389372967332d74a80522a" ], "author": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Fri Apr 27 11:02:15 2012 +0300" }, "committer": { "name": "Felipe Balbi", "email": "balbi@ti.com", "time": "Fri Apr 27 11:02:15 2012 +0300" }, "message": "usb: gadget: udc-core: fix wrong call order\n\ncommit 6d258a4 (usb: gadget: udc-core: stop UDC on device-initiated\ndisconnect) introduced another case of asymmetric calls when issuing\na device-initiated disconnect. Fix it.\n\nReported-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: Felipe Balbi \u003cbalbi@ti.com\u003e\n" }, { "commit": "37d4174d2d252c37dcb3d88cafae488542087848", "tree": "41ecaaf98e3bc615fdb39e7752102b0886da8652", "parents": [ "df391c0df49560c7fceffbad5b9d083836d9f22f" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Apr 19 10:48:38 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Apr 27 08:30:19 2012 +0100" }, "message": "drm/radeon/kms: use frac fb div on APUs\n\nSeems to be more stable on certain monitors.\n\nFixes:\nhttps://bugs.freedesktop.org/show_bug.cgi?id\u003d48880\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "df391c0df49560c7fceffbad5b9d083836d9f22f", "tree": "32261702450cc00b421437016ccf6d6133c7c45e", "parents": [ "792ac99c9a09dae1408617a6578ba189424a911e" ], "author": { "name": "Ilija Hadzic", "email": "ihadzic@research.bell-labs.com", "time": "Thu Apr 19 12:22:20 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Apr 27 08:29:50 2012 +0100" }, "message": "drm/radeon: add a missing entry to encoder_names\n\nAn entry for INTERNAL_VCE encoder was missing. Add it.\n\nSigned-off-by: Ilija Hadzic \u003cihadzic@research.bell-labs.com\u003e\nReviewed-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "792ac99c9a09dae1408617a6578ba189424a911e", "tree": "44b3aa722dcee42c63493e148c51f9cd692805b1", "parents": [ "b9556e0fa22ae8217289d6be445a2120f7865043", "6651819b4b4fc3caa6964c5d825eb4bb996f3905" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Apr 27 08:21:28 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Apr 27 08:21:31 2012 +0100" }, "message": "Merge branch \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes\n\nFrom Daniel Vetter\n\n- VGA load-detect fix. This bug seems to be as old as the load-detect code\n (2.6.30), but needs stupid userspace (upowerd trying to detect\n connectors on dpms-off outputs) to actually kill the machine. And\n obviously a machine without VGA-hotplug, otherwise we don\u0027t do load\n detect.\n- 2 interger overflow fixes for unpriviledged ioctls from Xi Wang.\n- Fix SDVO regression for low-res (pixelclock \u003c 100MHz) digital outputs,\n introduce in 2.6.36.\n\n* \u0027drm-intel-fixes\u0027 of git://people.freedesktop.org/~danvet/drm-intel:\n drm/i915: handle input/output sdvo timings separately in mode_set\n drm/i915: fix integer overflow in i915_gem_do_execbuffer()\n drm/i915: fix integer overflow in i915_gem_execbuffer2()\n drm/i915: fixup load-detect on enabled, but not active pipe\n" }, { "commit": "b9556e0fa22ae8217289d6be445a2120f7865043", "tree": "b024b1eb408fd75a70c19b0ab5c0fad5bc4d0aef", "parents": [ "af3a3ab2966112c0d0a44df7eeb1e95fe32d4495", "818c4ea7c589c521912430ea54e0c0a0671b2c6d" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Apr 27 08:20:27 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Apr 27 08:20:35 2012 +0100" }, "message": "Merge branch \u0027exynos-drm-fixes\u0027 of git://git.infradead.org/users/kmpark/linux-2.6-samsung into drm-fixes\n\nFrom Inki Dae:\n\nthis patch set fixes gem allocation and mapping issue between user space and\nphysical memory region.\n\n* \u0027exynos-drm-fixes\u0027 of git://git.infradead.org/users/kmpark/linux-2.6-samsung:\n drm/exynos: added missed vm area region mapping type.\n drm/exynos: fixed exynos_drm_gem_map_pages bug.\n drm/exynos: fixed duplicatd memory allocation bug.\n" }, { "commit": "ef7c7c693b4b05a293678fd40ed1511bc94d6f61", "tree": "9ea5270c9139d9dd1047738c5eda6d89ef311162", "parents": [ "a13b878780ea98d8415203c4502a8fc5bc614656" ], "author": { "name": "Igor Grinberg", "email": "grinberg@compulab.co.il", "time": "Thu Apr 12 15:43:29 2012 +0300" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Fri Apr 27 11:14:06 2012 +0800" }, "message": "ARM: PXA2xx: MFP: fix potential direction bug\n\nPins configured as input and have MFP_LPM_DRIVE_* flag set, can have a\nwrong output value for some period of time (spike) during the suspend\nsequence.\nThis can happen because the direction of the pins (GPDR) is set by\nsoftware and the output level is set by hardware (PGSR) at a later\nstage.\n\nFix the above potential bug by setting the output levels first.\nAlso save the actual levels of the pins before the suspend and restore\nthem after the resume, but before the direction settings take place, so\nthe same bug as described above will not happen in the resume sequence.\n\nReported-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nSigned-off-by: Igor Grinberg \u003cgrinberg@compulab.co.il\u003e\nTested-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "a13b878780ea98d8415203c4502a8fc5bc614656", "tree": "2ffed2d5b92cca357fec94a15d3427783693a9ab", "parents": [ "9f9d27e3f3317f39c91c286b6184f1ca05452968" ], "author": { "name": "Igor Grinberg", "email": "grinberg@compulab.co.il", "time": "Thu Apr 12 15:43:28 2012 +0300" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Fri Apr 27 11:11:50 2012 +0800" }, "message": "ARM: PXA2xx: MFP: fix bug with MFP_LPM_KEEP_OUTPUT\n\nPins that have MFP_LPM_KEEP_OUTPUT set and are configured for output\nmust retain the output state in low power mode.\nCurrently, the pin direction configuration is overrided with values\nin gpdr_lpm[] array and do not obey the MFP_LPM_KEEP_OUTPUT setting.\n\nFix the above bug and add some documentation to clarify the\nMFP_LPM_KEEP_OUTPUT setting purpose.\n\nReported-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nSigned-off-by: Igor Grinberg \u003cgrinberg@compulab.co.il\u003e\nTested-by: Paul Parsons \u003clost.distance@yahoo.com\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "9f9d27e3f3317f39c91c286b6184f1ca05452968", "tree": "c67182f09e7d255b81ae646e413105f9d267723d", "parents": [ "b95ace54a23e2f8ebb032744cebb17c9f43bf651" ], "author": { "name": "Dmitry Artamonow", "email": "mad_soft@inbox.ru", "time": "Sat Apr 14 10:26:19 2012 +0400" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Fri Apr 27 11:02:14 2012 +0800" }, "message": "arm/sa1100: fix sa1100-rtc memory resource\n\nDEFINE_RES_MEM() takes the size of resource as a second argument,\nnot the end address. Passing end address leads to following error\nin runtime during device registration:\nsa1100-rtc: failed to claim resource 0\n\nFix it.\n\nSigned-off-by: Dmitry Artamonow \u003cmad_soft@inbox.ru\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "b95ace54a23e2f8ebb032744cebb17c9f43bf651", "tree": "7c7053a33426848bd27edabc977b7d5cfd1b84a7", "parents": [ "66f75a5d028beaf67c931435fdc3e7823125730c" ], "author": { "name": "Robert Jarzmik", "email": "robert.jarzmik@free.fr", "time": "Sun Apr 22 13:37:24 2012 +0200" }, "committer": { "name": "Haojian Zhuang", "email": "haojian.zhuang@gmail.com", "time": "Fri Apr 27 10:46:45 2012 +0800" }, "message": "ARM: pxa: fix gpio wakeup setting\n\nIn 3.3, gpio wakeup setting was broken. The call\nenable_irq_wake() didn\u0027t set up the PXA gpio registers\n(PWER, ...) anymore.\n\nFix it at least for pxa27x. The driver doesn\u0027t seem to be\nused in pxa25x (weird ...), and the fix doesn\u0027t extend to\npxa3xx and pxa95x (which don\u0027t have a gpio_set_wake()\navailable).\n\nSigned-off-by: Robert Jarzmik \u003crobert.jarzmik@free.fr\u003e\nSigned-off-by: Haojian Zhuang \u003chaojian.zhuang@gmail.com\u003e\n" }, { "commit": "b930fe5e1f5646e071facda70b25b137ebeae5af", "tree": "4f7bc16244bc7b95867ac1b72ca021bfc8b31ba4", "parents": [ "cf405ae612b0f7e2358db7ff594c0e94846137aa" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Apr 26 14:22:33 2012 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Apr 26 22:07:28 2012 -0400" }, "message": "xen/acpi: Workaround broken BIOSes exporting non-existing C-states.\n\nWe did a similar check for the P-states but did not do it for\nthe C-states. What we want to do is ignore cases where the DSDT\nhas definition for sixteen CPUs, but the machine only has eight\nCPUs and we get:\nxen-acpi-processor: (CX): Hypervisor error (-22) for ACPI CPU14\n\nReported-by: Tobias Geiger \u003ctobias.geiger@vido.info\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "cf405ae612b0f7e2358db7ff594c0e94846137aa", "tree": "5f3540aa675a25325c318da47d02853fe8b79043", "parents": [ "521394e4e679996955bc351cb6b64639751db2ff" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Apr 26 13:50:03 2012 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Apr 26 22:07:21 2012 -0400" }, "message": "xen/smp: Fix crash when booting with ACPI hotplug CPUs.\n\nWhen we boot on a machine that can hotplug CPUs and we\nare using \u0027dom0_max_vcpus\u003dX\u0027 on the Xen hypervisor line\nto clip the amount of CPUs available to the initial domain,\nwe get this:\n\n(XEN) Command line: com1\u003d115200,8n1 dom0_mem\u003d8G noreboot dom0_max_vcpus\u003d8 sync_console mce_verbosity\u003dverbose console\u003dcom1,vga loglvl\u003dall guest_loglvl\u003dall\n.. snip..\nDMI: Intel Corporation S2600CP/S2600CP, BIOS SE5C600.86B.99.99.x032.072520111118 07/25/2011\n.. snip.\nSMP: Allowing 64 CPUs, 32 hotplug CPUs\ninstalling Xen timer for CPU 7\ncpu 7 spinlock event irq 361\nNMI watchdog: disabled (cpu7): hardware events not enabled\nBrought up 8 CPUs\n.. snip..\n\t[acpi processor finds the CPUs are not initialized and starts calling\n\tarch_register_cpu, which creates /sys/devices/system/cpu/cpu8/online]\nCPU 8 got hotplugged\nCPU 9 got hotplugged\nCPU 10 got hotplugged\n.. snip..\ninitcall 1_acpi_battery_init_async+0x0/0x1b returned 0 after 406 usecs\ncalling erst_init+0x0/0x2bb @ 1\n\n\t[and the scheduler sticks newly started tasks on the new CPUs, but\n\tsaid CPUs cannot be initialized b/c the hypervisor has limited the\n\tamount of vCPUS to 8 - as per the dom0_max_vcpus\u003d8 flag.\n\tThe spinlock tries to kick the other CPU, but the structure for that\n\tis not initialized and we crash.]\nBUG: unable to handle kernel paging request at fffffffffffffed8\nIP: [\u003cffffffff81035289\u003e] xen_spin_lock+0x29/0x60\nPGD 180d067 PUD 180e067 PMD 0\nOops: 0002 [#1] SMP\nCPU 7\nModules linked in:\n\nPid: 1, comm: swapper/0 Not tainted 3.4.0-rc2upstream-00001-gf5154e8 #1 Intel Corporation S2600CP/S2600CP\nRIP: e030:[\u003cffffffff81035289\u003e] [\u003cffffffff81035289\u003e] xen_spin_lock+0x29/0x60\nRSP: e02b:ffff8801fb9b3a70 EFLAGS: 00010282\n\nWith this patch, we cap the amount of vCPUS that the initial domain\ncan run, to exactly what dom0_max_vcpus\u003dX has specified.\n\nIn the future, if there is a hypercall that will allow a running\ndomain to expand past its initial set of vCPUS, this patch should\nbe re-evaluated.\n\nCC: stable@kernel.org\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "3c3c801fcfafa53e7ab8615ca3bd596ba308f72b", "tree": "6ee9d86c1a9f7331b384cc1eb3a1a996ada8366f", "parents": [ "82b769063598d01a8b24abf250a53f8b437e09f1", "ec2ccd884ab1e190bc5ddb210c7d5f5ea2ddeba3" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Apr 27 11:27:34 2012 +0930" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Apr 27 11:27:34 2012 +0930" }, "message": "Merge branch \u0027sh/urgent\u0027 into sh-fixes-for-linus\n" }, { "commit": "ec2ccd884ab1e190bc5ddb210c7d5f5ea2ddeba3", "tree": "5db0f90f95770951cafacd6c029f9d1c5d201b4d", "parents": [ "f5bdb003a2ee6df5ab9bfa119df905f949a66b52" ], "author": { "name": "Nobuhiro Iwamatsu", "email": "nobuhiro.iwamatsu.yj@renesas.com", "time": "Fri Apr 27 11:12:38 2012 +0930" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Fri Apr 27 11:12:38 2012 +0930" }, "message": "sh: Fix up tracepoint build fallout from static key introduction.\n\nWith the introduction of static keys, anything using tracepoints blows up\nin the following manner:\n\ninclude/trace/events/oom.h:8:13: error: initializer element is not constant\ninclude/trace/events/oom.h:8:13: error: (near initialization for \u0027__tracepoint_oom_score_adj_update\u0027)\ninclude/trace/events/oom.h:8:13: error: initializer element is not constant\ninclude/trace/events/oom.h:8:13: error: (near initialization for \u0027__tracepoint_oom_score_adj_update.key\u0027)\n\nThis is a result of the STATIC_KEY_INIT_xxx defs wrapping ATOMIC_INIT()\nwhich on sh includes an atomic_t typecast. Given that we don\u0027t really\nneed the typecast for anything anymore, the simplest solution is simply\nto kill off the cast.\n\nSigned-off-by: Nobuhiro Iwamatsu \u003cnobuhiro.iwamatsu.yj@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "5c22837adca7c30b66121cf18ad3e160134268d4", "tree": "cc1c54f3354ea2768860c615c1b27100eda02145", "parents": [ "151b61284776be2d6f02d48c23c3625678960b97" ], "author": { "name": "Oliver Neukum", "email": "oliver@neukum.org", "time": "Thu Apr 26 21:59:10 2012 +0200" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Apr 26 16:59:44 2012 -0700" }, "message": "USB: cdc-wdm: fix race leading leading to memory corruption\n\nThis patch fixes a race whereby a pointer to a buffer\nwould be overwritten while the buffer was in use leading\nto a double free and a memory leak. This causes crashes.\nThis bug was introduced in 2.6.34\n\nSigned-off-by: Oliver Neukum \u003coneukum@suse.de\u003e\nTested-by: Bjørn Mork \u003cbjorn@mork.no\u003e\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "82b769063598d01a8b24abf250a53f8b437e09f1", "tree": "107a5d88d19f138b69945f50026e787034e1c6f9", "parents": [ "ebcf596d89f9686308db768e527a22165831b473", "05ef1b79d46347f94d9a78214cc745046c03e45a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:36:27 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:36:27 2012 -0700" }, "message": "Merge branch \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile\n\nPull arch/tile fixes from Chris Metcalf:\n \"One change fixes a platform-independent bug about environment var\n handling in the boot command line. The other is a trivial\n tile-specific bug fix to avoid a link-time warning.\"\n\n* \u0027stable\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:\n arch/tile: fix a couple of functions that should be __init\n init: fix bug where environment vars can\u0027t be passed via boot args\n" }, { "commit": "ebcf596d89f9686308db768e527a22165831b473", "tree": "df0452fdaf81db6920216d1e0136b7c08525e457", "parents": [ "acdf2fc860f785781bb304a7f178141541f85283", "b609379f8db3019f26950dd914f4f6cc7078dee8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:35:35 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:35:35 2012 -0700" }, "message": "Merge tag \u0027ib-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\nPull infiniband fixes from Roland Dreier:\n \"A few fixes for regressions introduced in 3.4-rc1:\n - fix memory leak in mlx4\n - fix two problems with new MAD response generation code\"\n\n* tag \u0027ib-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n IB/mlx4: Fix memory leaks in ib_link_query_port()\n IB/mad: Don\u0027t send response for failed MADs\n IB/mad: Set \u0027D\u0027 bit in response for unhandled MADs\n" }, { "commit": "8e12a038f88e819c878e5697ff681cb08bcebb08", "tree": "17f1cc49f53cbf37005ae5383304530fd66473b7", "parents": [ "fa83af7e8f2936732459a2399df87a0b648b454d" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Apr 26 14:23:22 2012 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Apr 26 18:35:32 2012 -0400" }, "message": "xtensa: fix build fail on undefined ack_bad_irq\n\nCommit e520c410854bab763be24e0fce7ba89dc252efee\n\n \"xtensa: convert to asm-generic/hardirq.h\"\n\nconverted over to using the asm-generic parts, but it also\nadded the sentinel\n\n\t#define ack_bad_irq ack_bad_irq\n\nwhich tells asm-generic to _not_ use the common ack_bad_irq.\n\nSince e520c41 deleted the duplicated code from the arch specific\nfile, we _do_ want the asm-generic one in scope. So delete\nthe trigger define above which hides it. In doing so we\u0027ll\nrealize that we\u0027ve got to delete the almost-duplicate prototype\nas well to avoid \"static declaration ... follows non-static\".\n\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "acdf2fc860f785781bb304a7f178141541f85283", "tree": "29eda8d4437983a99a601de56b30137dc79f30a1", "parents": [ "2390c0fca6d31af0c1194a491d9629fbe27703b8", "88c08a3fba9954ce0ec3e1eab07c498a419ad7e3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:33:36 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:33:36 2012 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull [GIT PULL] slave-dmaengine fixes from Vinod Koul.\n\n* \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma:\n dmaengine/amba-pl08x : reset phychan_hold on terminate all\n dma: pl330: fix a couple of compilation warnings\n dma/ste_dma40: fix erroneous comparison\n dma/ste_dma40: explicitly include regulator consumer header\n dma40: Improve the logic of stopping logical chan\n dmaengine: at_hdmac: remove clear-on-read in atc_dostart()\n dma: mxs-dma: enable channel in device_issue_pending call\n dmaengine: imx-dma: dont complete descriptor for cyclic dma\n" }, { "commit": "2390c0fca6d31af0c1194a491d9629fbe27703b8", "tree": "303f982c94a75339c93d4468df54b86fdd2abdd9", "parents": [ "65dd4b91080157fce76a3d60338e33dfa02c4bf8", "cff7873554eedc044029c41a9fd694245d97eff8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:32:39 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:32:39 2012 -0700" }, "message": "Merge tag \u0027sound-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound fixes from Takashi Iwai:\n \"A workaround for an ASUS laptop and a few ASoC changes; most of the\n commits are tagged for stable, too.\"\n\n* tag \u0027sound-3.4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ASoC: wm8994: Improve sequencing of AIF channel enables\n ALSA: HDA: Add external mic quirk for Asus Zenbook UX31E\n ASoC: fsi: update for dmaengine prep_slave_sg fallout.\n ASoC: core: Fix card RTD count for deferred probe.\n ASoC: cs42l73: don\u0027t use negative array index\n ASoC: dapm: Ensure power gets managed for line widgets\n" }, { "commit": "65dd4b91080157fce76a3d60338e33dfa02c4bf8", "tree": "611e98d8a4ca40103bd550c4a3eb46dfadebd4ca", "parents": [ "aaaf06981718ed0e033319897079530f6ec623d3", "d08c9a33b4aa6665b0ee3c4d1b57715fa0eae2a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:31:53 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:31:53 2012 -0700" }, "message": "Merge git://www.linux-watchdog.org/linux-watchdog\n\nPull a watchdog fix from Wim Van Sebroeck:\n \"It will fix the size when reading or writing to WD Timer port 0x72 in\n the hpwdt driver.\"\n\n* git://www.linux-watchdog.org/linux-watchdog:\n hpwdt: Only BYTE reads/writes to WD Timer port 0x72\n" }, { "commit": "aaaf06981718ed0e033319897079530f6ec623d3", "tree": "ef219f868584799203993f3536f28b368965e486", "parents": [ "110a5c8b389407e1e859c43293179f9089671a60", "a6371f80230eaaafd7eef7efeedaa9509bdc982d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:30:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:30:26 2012 -0700" }, "message": "Merge branch \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull timer fixes from Thomas Gleixner.\n\n* \u0027timers-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n tick: Fix the spurious broadcast timer ticks after resume\n tick: Ensure that the broadcast device is initialized\n tick: Fix oneshot broadcast setup really\n" }, { "commit": "110a5c8b389407e1e859c43293179f9089671a60", "tree": "83245c842a809ecd728f12814a344e7224109d7a", "parents": [ "2300fd67b4f29eec19addb15a8571837228f63fc", "6e8b09eaf268bceac0c62e389b4bc0cb83dfb8e5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:24:45 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 26 15:24:45 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\nMerge fixes from Andrew Morton:\n \"13 fixes. The acerhdf patches aren\u0027t (really) fixes. But they\u0027ve\n been stuck in my tree for up to two years, sent to Matthew multiple\n times and the developers are unhappy.\"\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (13 patches)\n mm: fix NULL ptr dereference in move_pages\n mm: fix NULL ptr dereference in migrate_pages\n revert \"proc: clear_refs: do not clear reserved pages\"\n drivers/rtc/rtc-ds1307.c: fix BUG shown with lock debugging enabled\n arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file\n hugetlbfs: lockdep annotate root inode properly\n acerhdf: lowered default temp fanon/fanoff values\n acerhdf: add support for new hardware\n acerhdf: add support for Aspire 1410 BIOS v1.3314\n fs/buffer.c: remove BUG() in possible but rare condition\n mm: fix up the vmscan stat in vmstat\n epoll: clear the tfile_check_list on -ELOOP\n mm/hugetlb: fix warning in alloc_huge_page/dequeue_huge_page_vma\n" }, { "commit": "521394e4e679996955bc351cb6b64639751db2ff", "tree": "bb34ba562e347340af2197947859dddbafd6e771", "parents": [ "df88b2d96e36d9a9e325bfcd12eb45671cbbc937" ], "author": { "name": "Stefano Stabellini", "email": "stefano.stabellini@eu.citrix.com", "time": "Wed Apr 25 16:11:38 2012 +0100" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Apr 26 18:02:02 2012 -0400" }, "message": "xen: use the pirq number to check the pirq_eoi_map\n\nIn pirq_check_eoi_map use the pirq number rather than the Linux irq\nnumber to check whether an eoi is needed in the pirq_eoi_map.\n\nThe reason is that the irq number is not always identical to the\npirq number so if we wrongly use the irq number to check the\npirq_eoi_map we are going to check for the wrong pirq to EOI.\n\nAs a consequence some interrupts might not be EOI\u0027ed by the\nguest correctly.\n\nSigned-off-by: Stefano Stabellini \u003cstefano.stabellini@eu.citrix.com\u003e\nTested-by: Tobias Geiger \u003ctobias.geiger@vido.info\u003e\n[v1: Added some extra wording to git commit]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "df88b2d96e36d9a9e325bfcd12eb45671cbbc937", "tree": "6e370456404b94aa4ddbb4eb3d4b91a0f6b9affe", "parents": [ "3d81acb1cdb242378a1acb3eb1bc28c6bb5895f1" ], "author": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Apr 26 13:13:21 2012 -0400" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Thu Apr 26 17:46:20 2012 -0400" }, "message": "xen/enlighten: Disable MWAIT_LEAF so that acpi-pad won\u0027t be loaded.\n\nThere are exactly four users of __monitor and __mwait:\n\n - cstate.c (which allows acpi_processor_ffh_cstate_enter to be called\n when the cpuidle API drivers are used. However patch\n \"cpuidle: replace xen access to x86 pm_idle and default_idle\"\n provides a mechanism to disable the cpuidle and use safe_halt.\n - smpboot (which allows mwait_play_dead to be called). However\n safe_halt is always used so we skip that.\n - intel_idle (same deal as above).\n - acpi_pad.c. This the one that we do not want to run as we\n will hit the below crash.\n\nWhy do we want to expose MWAIT_LEAF in the first place?\nWe want it for the xen-acpi-processor driver - which uploads\nC-states to the hypervisor. If MWAIT_LEAF is set, the cstate.c\nsets the proper address in the C-states so that the hypervisor\ncan benefit from using the MWAIT functionality. And that is\nthe sole reason for using it.\n\nWithout this patch, if a module performs mwait or monitor we\nget this:\n\ninvalid opcode: 0000 [#1] SMP\nCPU 2\n.. snip..\nPid: 5036, comm: insmod Tainted: G O 3.4.0-rc2upstream-dirty #2 Intel Corporation S2600CP/S2600CP\nRIP: e030:[\u003cffffffffa000a017\u003e] [\u003cffffffffa000a017\u003e] mwait_check_init+0x17/0x1000 [mwait_check]\nRSP: e02b:ffff8801c298bf18 EFLAGS: 00010282\nRAX: ffff8801c298a010 RBX: ffffffffa03b2000 RCX: 0000000000000000\nRDX: 0000000000000000 RSI: ffff8801c29800d8 RDI: ffff8801ff097200\nRBP: ffff8801c298bf18 R08: 0000000000000000 R09: 0000000000000000\nR10: 0000000000000000 R11: 0000000000000001 R12: 0000000000000000\nR13: ffffffffa000a000 R14: 0000005148db7294 R15: 0000000000000003\nFS: 00007fbb364f2700(0000) GS:ffff8801ff08c000(0000) knlGS:0000000000000000\nCS: e033 DS: 0000 ES: 0000 CR0: 000000008005003b\nCR2: 000000000179f038 CR3: 00000001c9469000 CR4: 0000000000002660\nDR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\nDR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\nProcess insmod (pid: 5036, threadinfo ffff8801c298a000, task ffff8801c29cd7e0)\nStack:\n ffff8801c298bf48 ffffffff81002124 ffffffffa03b2000 00000000000081fd\n 000000000178f010 000000000178f030 ffff8801c298bf78 ffffffff810c41e6\n 00007fff3fb30db9 00007fff3fb30db9 00000000000081fd 0000000000010000\nCall Trace:\n [\u003cffffffff81002124\u003e] do_one_initcall+0x124/0x170\n [\u003cffffffff810c41e6\u003e] sys_init_module+0xc6/0x220\n [\u003cffffffff815b15b9\u003e] system_call_fastpath+0x16/0x1b\nCode: \u003c0f\u003e 01 c8 31 c0 0f 01 c9 c9 c3 00 00 00 00 00 00 00 00 00 00 00 00\nRIP [\u003cffffffffa000a017\u003e] mwait_check_init+0x17/0x1000 [mwait_check]\n RSP \u003cffff8801c298bf18\u003e\n---[ end trace 16582fc8a3d1e29a ]---\nKernel panic - not syncing: Fatal exception\n\nWith this module (which is what acpi_pad.c would hit):\n\nMODULE_AUTHOR(\"Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\");\nMODULE_DESCRIPTION(\"mwait_check_and_back\");\nMODULE_LICENSE(\"GPL\");\nMODULE_VERSION();\n\nstatic int __init mwait_check_init(void)\n{\n\t__monitor((void *)\u0026current_thread_info()-\u003eflags, 0, 0);\n\t__mwait(0, 0);\n\treturn 0;\n}\nstatic void __exit mwait_check_exit(void)\n{\n}\nmodule_init(mwait_check_init);\nmodule_exit(mwait_check_exit);\n\nReported-by: Liu, Jinsong \u003cjinsong.liu@intel.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "89f21cc050d5eed8eeffee5b46297fb7a74ef9dd", "tree": "8e8f3a0b45056704452a7d13784f3157e8dbc789", "parents": [ "dc890df0a77cafe5f4a3d81c0dade637c27f1934" ], "author": { "name": "Rupesh Gujare", "email": "rgujare@ozmodevices.com", "time": "Wed Apr 25 23:54:58 2012 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@linuxfoundation.org", "time": "Thu Apr 26 12:40:53 2012 -0700" }, "message": "staging: ozwpan: Fix bug where kfree is called twice.\n\nSigned-off-by: Rupesh Gujare \u003crgujare@ozmodevices.com\u003e\nSigned-off-by: Chris Kelly \u003cckelly@ozmodevices.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\n" }, { "commit": "fa83af7e8f2936732459a2399df87a0b648b454d", "tree": "860076c80b6651bd0451c904f0c41120d4b6e702", "parents": [ "bc856a62c8036330cb2d95e24756285c6d8ecba2" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Apr 18 23:31:28 2012 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Apr 26 14:46:51 2012 -0400" }, "message": "blackfin: fix ifdef fustercluck in mach-bf538/boards/ezkit.c\n\nThis file has lots and lots of ifdef, around structure decls\nand structure usages. The failure issue was that we would\nbuild the BF538-EZKIT_defconfig and get:\n\n arch/blackfin/mach-bf538/boards/ezkit.c:924:3: error: \u0027bfin_lq035q1_device\u0027\n undeclared here (not in a function)\n\neven though the same ifdef _appeared_ to enable both the struct\ndeclaration and the code that used it. Yet cpp was telling us we\ndidn\u0027t have the struct, but we still had the usage of it.\n\nHowever, _appeared_ is the operative word. After marking all the\nanonymous #endif with their parent #ifdef config options, it was\n_then_ clear that there was a misplaced #endif that was hiding\nthe struct declaration.\n\nThe real guts of the patch boils down to this:\n\n-#endif\n+#endif /* CONFIG_MTD_M25P80 */\n+#endif /* CONFIG_SPI_BFIN5XX */\n [...]\n-#endif /* spi master and devices */\n\nbut since I had to tag the #endif with their respective #ifdef\noptions to find this misplaced SPI endif, it would be silly to\nthen go and delete them all. So they stay.\n\nCc: Sonic Zhang \u003csonic.zhang@analog.com\u003e\nCc: Bob Liu \u003clliubbo@gmail.com\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "bc856a62c8036330cb2d95e24756285c6d8ecba2", "tree": "d4ad7cc7a5e5205e73242a21e4282bcf1b47c656", "parents": [ "cd0a2bfb77a3edeecd652081e0b1a163d3b0696b" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Apr 18 22:32:24 2012 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Apr 26 14:46:51 2012 -0400" }, "message": "blackfin: fix compile error in bfin-lq035q1-fb.c\n\nThis file has an implicit dependency on GPIO stuff, showing\nup as the following build failure:\n\ndrivers/video/bfin-lq035q1-fb.c:369:6: error: \u0027GPIOF_OUT_INIT_LOW\u0027 undeclared\n\nOther more global bfin build issues prevent an automated bisect, but\nit really doesn\u0027t matter - simply add in the appropriate header.\n\nCc: Florian Tobias Schandinat \u003cFlorianSchandinat@gmx.de\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "cd0a2bfb77a3edeecd652081e0b1a163d3b0696b", "tree": "2d161b68d0a4cb536b08d4a425b58ab342f844f6", "parents": [ "9f3045eca89a2e6fdd1901aafb9e28231d3f31fb" ], "author": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Wed Apr 18 17:17:19 2012 -0400" }, "committer": { "name": "Paul Gortmaker", "email": "paul.gortmaker@windriver.com", "time": "Thu Apr 26 14:46:17 2012 -0400" }, "message": "pci: frv architecture needs generic setup-bus infrastructure\n\nOtherwise we get this link failure for frv\u0027s defconfig:\n\n LD .tmp_vmlinux1\n drivers/built-in.o: In function `pci_assign_resource\u0027:\n (.text+0xbf0c): undefined reference to `pci_cardbus_resource_alignment\u0027\n drivers/built-in.o: In function `pci_setup\u0027:\n pci.c:(.init.text+0x174): undefined reference to `pci_realloc_get_opt\u0027\n pci.c:(.init.text+0x1a0): undefined reference to `pci_realloc_get_opt\u0027\n make[1]: *** [.tmp_vmlinux1] Error 1\n\nCc: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Bjorn Helgaas \u003cbhelgaas@google.com\u003e\nSigned-off-by: Paul Gortmaker \u003cpaul.gortmaker@windriver.com\u003e\n" }, { "commit": "6651819b4b4fc3caa6964c5d825eb4bb996f3905", "tree": "942e329c3752aeef7777df0ae325b4217741f907", "parents": [ "44afb3a04391a74309d16180d1e4f8386fdfa745" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Sun Apr 01 19:16:18 2012 +0200" }, "committer": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Thu Apr 26 18:56:26 2012 +0200" }, "message": "drm/i915: handle input/output sdvo timings separately in mode_set\n\nWe seem to have a decent confusion between the output timings and the\ninput timings of the sdvo encoder. If I understand the code correctly,\nwe use the original mode unchanged for the output timings, safe for\nthe lvds case. And we should use the adjusted mode for input timings.\n\nClarify the situation by adding an explicit output_dtd to the sdvo\nmode_set function and streamline the code-flow by moving the input and\noutput mode setting in the sdvo encode together.\n\nFurthermore testing showed that the sdvo input timing needs the\nunadjusted dotclock, the sdvo chip will automatically compute the\nrequired pixel multiplier to get a dotclock above 100 MHz.\n\nFix this up when converting a drm mode to an sdvo dtd.\n\nThis regression was introduced in\n\ncommit c74696b9c890074c1e1ee3d7496fc71eb3680ced\nAuthor: Pavel Roskin \u003cproski@gnu.org\u003e\nDate: Thu Sep 2 14:46:34 2010 -0400\n\n i915: revert some checks added by commit 32aad86f\n\nparticularly the following hunk:\n\ndiff --git a/drivers/gpu/drm/i915/intel_sdvo.c\nb/drivers/gpu/drm/i915/intel_sdvo.c\nindex 093e914..62d22ae 100644\n--- a/drivers/gpu/drm/i915/intel_sdvo.c\n+++ b/drivers/gpu/drm/i915/intel_sdvo.c\n@@ -1122,11 +1123,9 @@ static void intel_sdvo_mode_set(struct drm_encoder *encoder,\n\n /* We have tried to get input timing in mode_fixup, and filled into\n adjusted_mode */\n- if (intel_sdvo-\u003eis_tv || intel_sdvo-\u003eis_lvds) {\n- intel_sdvo_get_dtd_from_mode(\u0026input_dtd, adjusted_mode);\n+ intel_sdvo_get_dtd_from_mode(\u0026input_dtd, adjusted_mode);\n+ if (intel_sdvo-\u003eis_tv || intel_sdvo-\u003eis_lvds)\n input_dtd.part2.sdvo_flags \u003d intel_sdvo-\u003esdvo_flags;\n- } else\n- intel_sdvo_get_dtd_from_mode(\u0026input_dtd, mode);\n\n /* If it\u0027s a TV, we already set the output timing in mode_fixup.\n * Otherwise, the output timing is equal to the input timing.\n\nDue to questions raised in review, below a more elaborate analysis of\nthe bug at hand:\n\nSdvo seems to have two timings, one is the output timing which will be\nsent over whatever is connected on the other side of the sdvo chip (panel,\nhdmi screen, tv), the other is the input timing which will be generated by\nthe gmch pipe. It looks like sdvo is expected to scale between the two.\n\nTo make things slightly more complicated, we have a bunch of special\ncases:\n- For lvds panel we always use a fixed output timing, namely\n intel_sdvo-\u003esdvo_lvds_fixed_mode, hence that special case.\n- Sdvo has an interface to generate a preferred input timing for a given\n output timing. This is the confusing thing that I\u0027ve tried to clear up\n with the follow-on patches.\n- A special requirement is that the input pixel clock needs to be between\n 100MHz and 200MHz (likely to keep it within the electromechanical design\n range of PCIe), 270MHz on later gen4+. Lower pixel clocks are\n doubled/quadrupled.\n\nThe thing this patch tries to fix is that the pipe needs to be\nexplicitly instructed to double/quadruple the pixels and needs the\ncorrespondingly higher pixel clock, whereas the sdvo adaptor seems to\ndo that itself and needs the unadjusted pixel clock. For the sdvo\nencode side we already set the pixel mutliplier with a different\ncommand (0x21).\n\nThis patch tries to fix this mess by:\n- Keeping the output mode timing in the unadjusted plain mode, safe\n for the lvds case.\n- Storing the input timing in the adjusted_mode with the adjusted\n pixel clock. This way we don\u0027t need to frob around with the core\n crtc mode set code.\n- Fixing up the pixelclock when constructing the sdvo dtd timing\n struct. This is why the first hunk of the patch is an integral part\n of the series.\n- Dropping the is_tv special case because input_dtd is equivalent to\n adjusted_mode after these changes. Follow-up patches clear this up\n further (by simply ripping out intel_sdvo-\u003einput_dtd because it\u0027s\n not needed).\n\nv2: Extend commit message with an in-depth bug analysis.\n\nReported-and-Tested-by: Bernard Blackham \u003cb-linuxgit@largestprime.net\u003e\nBugzilla: https://bugs.freedesktop.org/show_bug.cgi?id\u003d48157\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: stable@kernel.org\nSigned-off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\n" }, { "commit": "c3e40a9972428d6e2d8e287ed0233a57a218c30f", "tree": "c8b88e1ea6d9ad5f17e67a5fd2826b3d82527a7b", "parents": [ "eae1415dda93fd4edcce0637aa64b3c9b567563f" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Apr 25 13:44:20 2012 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Thu Apr 26 08:40:08 2012 -0700" }, "message": "hwmon: (fam15h_power) Fix pci_device_id array\n\npci_match_id() takes an *array* of IDs which must be properly zero-\nterminated.\n\nReported-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nCc: stable@vger.kernel.org # 3.0+: 00250ec hwmon: fam15h_power: fix bogus values\nCc: stable@vger.kernel.org # 3.0+\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "d08c9a33b4aa6665b0ee3c4d1b57715fa0eae2a2", "tree": "2ed5083a7509cb66727ba77685820b2f02f19af6", "parents": [ "2300fd67b4f29eec19addb15a8571837228f63fc" ], "author": { "name": "Mingarelli, Thomas", "email": "Thomas.Mingarelli@hp.com", "time": "Tue Apr 03 05:37:01 2012 +0000" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Thu Apr 26 14:38:07 2012 +0200" }, "message": "hpwdt: Only BYTE reads/writes to WD Timer port 0x72\n\nThis patch is to correct the use of the iLO port 0x72 usage.\nThe port 0x72 is a byte size write/read and hpwdt is currently\nwriting a WORD.\n\nSigned-off by: Thomas Mingarelli \u003cthomas.mingarelli@hp.com\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n" }, { "commit": "724b6daa13e100067c30cfc4d1ad06629609dc4e", "tree": "290b86e3c259922c350ea6469f43ddb953a83aa3", "parents": [ "c716ef56f1319e8a515cb1947a3ec59b06e94a5e" ], "author": { "name": "Michael Ellerman", "email": "michael@ellerman.id.au", "time": "Wed Apr 11 11:54:13 2012 +1000" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Thu Apr 26 13:51:31 2012 +0200" }, "message": "perf: Fix perf_event_for_each() to use sibling\n\nIn perf_event_for_each() we call a function on an event, and then\niterate over the siblings of the event.\n\nHowever we don\u0027t call the function on the siblings, we call it\nrepeatedly on the original event - it seems \"obvious\" that we should\nbe calling it with sibling as the argument.\n\nIt looks like this broke in commit 75f937f24bd9 (\"Fix ctx-\u003emutex\nvs counter-\u003emutex inversion\").\n\nThe only effect of the bug is that the PERF_IOC_FLAG_GROUP parameter\nto the ioctls doesn\u0027t work.\n\nSigned-off-by: Michael Ellerman \u003cmichael@ellerman.id.au\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLink: http://lkml.kernel.org/r/1334109253-31329-1-git-send-email-michael@ellerman.id.au\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "fb2cf2c660971bea0ad86a9a5c19ad39eab61344", "tree": "75343c1ef32657416dbef2dd5a683391ff8b00c9", "parents": [ "eb95308ee2a69403909e111837b9068c64cfc349" ], "author": { "name": "he, bo", "email": "bo.he@intel.com", "time": "Wed Apr 25 19:59:21 2012 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Thu Apr 26 12:54:53 2012 +0200" }, "message": "sched: Fix OOPS when build_sched_domains() percpu allocation fails\n\nUnder extreme memory used up situations, percpu allocation\nmight fail. We hit it when system goes to suspend-to-ram,\ncausing a kworker panic:\n\n EIP: [\u003cc124411a\u003e] build_sched_domains+0x23a/0xad0\n Kernel panic - not syncing: Fatal exception\n Pid: 3026, comm: kworker/u:3\n 3.0.8-137473-gf42fbef #1\n\n Call Trace:\n [\u003cc18cc4f2\u003e] panic+0x66/0x16c\n [...]\n [\u003cc1244c37\u003e] partition_sched_domains+0x287/0x4b0\n [\u003cc12a77be\u003e] cpuset_update_active_cpus+0x1fe/0x210\n [\u003cc123712d\u003e] cpuset_cpu_inactive+0x1d/0x30\n [...]\n\nWith this fix applied build_sched_domains() will return -ENOMEM and\nthe suspend attempt fails.\n\nSigned-off-by: he, bo \u003cbo.he@intel.com\u003e\nReviewed-by: Zhang, Yanmin \u003cyanmin.zhang@intel.com\u003e\nReviewed-by: Srivatsa S. Bhat \u003csrivatsa.bhat@linux.vnet.ibm.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: \u003cstable@kernel.org\u003e\nLink: http://lkml.kernel.org/r/1335355161.5892.17.camel@hebo\n[ So, we fail to deallocate a CPU because we cannot allocate RAM :-/\n I don\u0027t like that kind of sad behavior but nevertheless it should\n not crash under high memory load. ]\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "eb95308ee2a69403909e111837b9068c64cfc349", "tree": "92e9a3368e75b94486dc54f2688453fed17d4eed", "parents": [ "2300fd67b4f29eec19addb15a8571837228f63fc" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Apr 17 13:38:40 2012 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Thu Apr 26 12:54:52 2012 +0200" }, "message": "sched: Fix more load-balancing fallout\n\nCommits 367456c756a6 (\"sched: Ditch per cgroup task lists for\nload-balancing\") and 5d6523ebd (\"sched: Fix load-balance wreckage\")\nleft some more wreckage.\n\nBy setting loop_max unconditionally to -\u003enr_running load-balancing\ncould take a lot of time on very long runqueues (hackbench!). So keep\nthe sysctl as max limit of the amount of tasks we\u0027ll iterate.\n\nFurthermore, the min load filter for migration completely fails with\ncgroups since inequality in per-cpu state can easily lead to such\nsmall loads :/\n\nFurthermore the change to add new tasks to the tail of the queue\ninstead of the head seems to have some effect.. not quite sure I\nunderstand why.\n\nCombined these fixes solve the huge hackbench regression reported by\nTim when hackbench is ran in a cgroup.\n\nReported-by: Tim Chen \u003ctim.c.chen@linux.intel.com\u003e\nAcked-by: Tim Chen \u003ctim.c.chen@linux.intel.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nLink: http://lkml.kernel.org/r/1335365763.28150.267.camel@twins\n[ got rid of the CONFIG_PREEMPT tuning and made small readability edits ]\nSigned-off-by: Ingo Molnar \u003cmingo@kernel.org\u003e\n" }, { "commit": "2300fd67b4f29eec19addb15a8571837228f63fc", "tree": "5f2cfcc87f81ff9fa607ab45c1f0a9adf644cc76", "parents": [ "86ec090e58fca1025676e775093a87ab699f7f4d", "7bf97bc27308cfdc7a8dadd40ae50f7c4cb09b01" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:38:44 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:38:44 2012 -0700" }, "message": "Merge tag \u0027nfs-for-3.4-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull NFS client bugfixes from Trond Myklebust:\n - Fix NFSv4 infinite loops on open(O_TRUNC)\n - Fix an Oops and an infinite loop in the NFSv4 flock code\n - Don\u0027t register the PipeFS filesystem until it has been set up\n - Fix an Oops in nfs_try_to_update_request\n - Don\u0027t reuse NFSv4 open owners: fixes a bad sequence id storm.\n\n* tag \u0027nfs-for-3.4-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFSv4: Keep dropped state owners on the LRU list for a while\n NFSv4: Ensure that we don\u0027t drop a state owner more than once\n NFSv4: Ensure we do not reuse open owner names\n nfs: Enclose hostname in brackets when needed in nfs_do_root_mount\n NFS: put open context on error in nfs_flush_multi\n NFS: put open context on error in nfs_pagein_multi\n NFSv4: Fix open(O_TRUNC) and ftruncate() error handling\n NFSv4: Ensure that we check lock exclusive/shared type against open modes\n NFSv4: Ensure that the LOCK code sets exception-\u003einode\n NFS: check for req\u003d\u003dNULL in nfs_try_to_update_request cleanup\n SUNRPC: register PipeFS file system after pernet sybsystem\n" }, { "commit": "b7b617c527224acd862274fc58ff16dd34ab6466", "tree": "ccdf4bff98006701db343eb61bc273ec3d49331a", "parents": [ "8ec7c84027272952ab6d21c340f4aada1a3e5988", "1344500e2d79d09db81f748984697cbdd6b02279" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Apr 25 21:31:39 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Wed Apr 25 21:31:39 2012 -0700" }, "message": "Merge branch \u0027u300-fixes-for-arm-soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes\n\n* \u0027u300-fixes-for-arm-soc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:\n ARM: u300: bump all IRQ numbers by one\n ARM: ux300: Fix unimplementable regulation constraints\n" }, { "commit": "86ec090e58fca1025676e775093a87ab699f7f4d", "tree": "d3fb6c1898c8c1ea78462f0ec748c8da1086fff0", "parents": [ "bdd4f709a1501055ccb24f204fb24dd653244fd8", "89b8835ec865dddd6673a8dd7003581bf2377176" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:29:26 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:29:26 2012 -0700" }, "message": "Merge branch \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip\n\nPull x86 fixes from H. Peter Anvin.\n\n* \u0027x86-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n x32, siginfo: Provide proper overrides for x32 siginfo_t\n asm-generic: Allow overriding clock_t and add attributes to siginfo_t\n x32: Check __ILP32__ instead of __LP64__ for x32\n x86, acpi: Call acpi_enter_sleep_state via an asmlinkage C function from assembler\n ACPI: Convert wake_sleep_flags to a value instead of function\n x86, apic: APIC code touches invalid MSR on P5 class machines\n i387: ptrace breaks the lazy-fpu-restore logic\n x86/platform: Remove incorrect error message in x86_default_fixup_cpu_id()\n x86, efi: Add dedicated EFI stub entry point\n x86/amd: Remove broken links from comment and kernel message\n x86, microcode: Ensure that module is only loaded on supported AMD CPUs\n x86, microcode: Fix sysfs warning during module unload on unsupported CPUs\n" }, { "commit": "bdd4f709a1501055ccb24f204fb24dd653244fd8", "tree": "83d854f02dee4c2e56dbd8aad64bc9a86d52cd70", "parents": [ "ce587e65e8c669eec61df7fb1c515720302e3cc0", "d62d421b071b08249361044d8e56c8b5c3ed6aa7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:28:10 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:28:10 2012 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://cavan.codon.org.uk/platform-drivers-x86\n\nPull x86 platform driver fixes from Matthew Garrett:\n \"One annoyance fix (make intel_ips stop complaining unnecessarily) and\n one oops fix (unterminated list in dell-laptop). Both have been in\n -next for a while with no complaints.\"\n\n* \u0027for_linus\u0027 of git://cavan.codon.org.uk/platform-drivers-x86:\n dell-laptop: Terminate quirks list properly\n intel_ips: Hush the i915 symbols message\n" }, { "commit": "6e8b09eaf268bceac0c62e389b4bc0cb83dfb8e5", "tree": "8b284da8a79355ef631c8c418c369fd1ec83b251", "parents": [ "f2a9ef880763d7fbd657a3af646e132a90d70d34" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Wed Apr 25 16:01:53 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:34 2012 -0700" }, "message": "mm: fix NULL ptr dereference in move_pages\n\nCommit 3268c63 (\"mm: fix move/migrate_pages() race on task struct\") has\nadded an odd construct where \u0027mm\u0027 is checked for being NULL, and if it is,\nit would get dereferenced anyways by mput()ing it.\n\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nCc: Dave Hansen \u003cdave@linux.vnet.ibm.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: 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": "f2a9ef880763d7fbd657a3af646e132a90d70d34", "tree": "09df0c2a4b0572f44424f1e11aee655135082c94", "parents": [ "63f61a6f4633ff34c17bea7a0ed827eaeb0733e1" ], "author": { "name": "Sasha Levin", "email": "levinsasha928@gmail.com", "time": "Wed Apr 25 16:01:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:34 2012 -0700" }, "message": "mm: fix NULL ptr dereference in migrate_pages\n\nCommit 3268c63 (\"mm: fix move/migrate_pages() race on task struct\") has\nadded an odd construct where \u0027mm\u0027 is checked for being NULL, and if it is,\nit would get dereferenced anyways by mput()ing it.\n\nThis would lead to the following NULL ptr deref and BUG() when calling\nmigrate_pages() with a pid that has no mm struct:\n\n[25904.193704] BUG: unable to handle kernel NULL pointer dereference at 0000000000000050\n[25904.194235] IP: [\u003cffffffff810b0de7\u003e] mmput+0x27/0xf0\n[25904.194235] PGD 773e6067 PUD 77da0067 PMD 0\n[25904.194235] Oops: 0002 [#1] PREEMPT SMP\n[25904.194235] CPU 2\n[25904.194235] Pid: 31608, comm: trinity Tainted: G W 3.4.0-rc2-next-20120412-sasha #69\n[25904.194235] RIP: 0010:[\u003cffffffff810b0de7\u003e] [\u003cffffffff810b0de7\u003e] mmput+0x27/0xf0\n[25904.194235] RSP: 0018:ffff880077d49e08 EFLAGS: 00010202\n[25904.194235] RAX: 0000000000000286 RBX: 0000000000000000 RCX: 0000000000000000\n[25904.194235] RDX: ffff880075ef8000 RSI: 000000000000023d RDI: 0000000000000286\n[25904.194235] RBP: ffff880077d49e18 R08: 0000000000000001 R09: 0000000000000001\n[25904.194235] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000000\n[25904.194235] R13: 00000000ffffffea R14: ffff880034287740 R15: ffff8800218d3010\n[25904.194235] FS: 00007fc8b244c700(0000) GS:ffff880029800000(0000) knlGS:0000000000000000\n[25904.194235] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033\n[25904.194235] CR2: 0000000000000050 CR3: 00000000767c6000 CR4: 00000000000406e0\n[25904.194235] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n[25904.194235] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n[25904.194235] Process trinity (pid: 31608, threadinfo ffff880077d48000, task ffff880075ef8000)\n[25904.194235] Stack:\n[25904.194235] ffff8800342876c0 0000000000000000 ffff880077d49f78 ffffffff811b8020\n[25904.194235] ffffffff811b7d91 ffff880075ef8000 ffff88002256d200 0000000000000000\n[25904.194235] 00000000000003ff 0000000000000000 0000000000000000 0000000000000000\n[25904.194235] Call Trace:\n[25904.194235] [\u003cffffffff811b8020\u003e] sys_migrate_pages+0x340/0x3a0\n[25904.194235] [\u003cffffffff811b7d91\u003e] ? sys_migrate_pages+0xb1/0x3a0\n[25904.194235] [\u003cffffffff8266cbb9\u003e] system_call_fastpath+0x16/0x1b\n[25904.194235] Code: c9 c3 66 90 55 31 d2 48 89 e5 be 3d 02 00 00 48 83 ec 10 48 89 1c 24 4c 89 64 24 08 48 89 fb 48 c7 c7 cf 0e e1 82 e8 69 18 03 00 \u003cf0\u003e ff 4b 50 0f 94 c0 84 c0 0f 84 aa 00 00 00 48 89 df e8 72 f1\n[25904.194235] RIP [\u003cffffffff810b0de7\u003e] mmput+0x27/0xf0\n[25904.194235] RSP \u003cffff880077d49e08\u003e\n[25904.194235] CR2: 0000000000000050\n[25904.348999] ---[ end trace a307b3ed40206b4b ]---\n\nSigned-off-by: Sasha Levin \u003clevinsasha928@gmail.com\u003e\nCc: Dave Hansen \u003cdave@linux.vnet.ibm.com\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\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": "63f61a6f4633ff34c17bea7a0ed827eaeb0733e1", "tree": "5f8ae725b84635f441485ff6d68d6c105ebb8292", "parents": [ "3f5ec5e06d6ca88168277247dbac0ec7b501600f" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Wed Apr 25 16:01:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:34 2012 -0700" }, "message": "revert \"proc: clear_refs: do not clear reserved pages\"\n\nRevert commit 85e72aa5384 (\"proc: clear_refs: do not clear reserved\npages\"), which was a quick fix suitable for -stable until ARM had been\nmoved over to the gate_vma mechanism:\n\nhttps://lkml.org/lkml/2012/1/14/55\n\nWith commit f9d4861f (\"ARM: 7294/1: vectors: use gate_vma for vectors user\nmapping\"), ARM does now use the gate_vma, so the PageReserved check can be\nremoved from the proc code.\n\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nCc: Nicolas Pitre \u003cnico@linaro.org\u003e\nAcked-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": "3f5ec5e06d6ca88168277247dbac0ec7b501600f", "tree": "3feac4e2e95a345f0a48f3106af0dc60e3a6bc41", "parents": [ "db7b122cf5f769046d410f82a1e9fe7006ed955a" ], "author": { "name": "Anatolij Gustschin", "email": "agust@denx.de", "time": "Wed Apr 25 16:01:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:34 2012 -0700" }, "message": "drivers/rtc/rtc-ds1307.c: fix BUG shown with lock debugging enabled\n\nAdd struct bin_attribute initialization to fix the following bug:\n\nrtc-ds1307 3-0068: rtc core: registered ds1307 as rtc0\nBUG: key cfb14fcc not in .data!\n------------[ cut here ]------------\nWARNING: at kernel/lockdep.c:2986 sysfs_add_file_mode+0x84/0xdc()\nModules linked in:\n[\u003cc0018d94\u003e] (unwind_backtrace+0x0/0xf8) from [\u003cc0031f7c\u003e] (warn_slowpath_common+0x4c/0x64)\n[\u003cc0031f7c\u003e] (warn_slowpath_common+0x4c/0x64) from [\u003cc0031fb0\u003e] (warn_slowpath_null+0x1c/0x24)\n[\u003cc0031fb0\u003e] (warn_slowpath_null+0x1c/0x24) from [\u003cc012f7ac\u003e] (sysfs_add_file_mode+0x84/0xdc)\n[\u003cc012f7ac\u003e] (sysfs_add_file_mode+0x84/0xdc) from [\u003cc04b11e4\u003e] (ds1307_probe+0x5e4/0x6ac)\n[\u003cc04b11e4\u003e] (ds1307_probe+0x5e4/0x6ac) from [\u003cc036e600\u003e] (i2c_device_probe+0xdc/0x108)\n[\u003cc036e600\u003e] (i2c_device_probe+0xdc/0x108) from [\u003cc02cdf84\u003e] (driver_probe_device+0x90/0x210)\n[\u003cc02cdf84\u003e] (driver_probe_device+0x90/0x210) from [\u003cc02ce198\u003e] (__driver_attach+0x94/0x98)\n[\u003cc02ce198\u003e] (__driver_attach+0x94/0x98) from [\u003cc02cc824\u003e] (bus_for_each_dev+0x50/0x7c)\n[\u003cc02cc824\u003e] (bus_for_each_dev+0x50/0x7c) from [\u003cc02cd780\u003e] (bus_add_driver+0x184/0x244)\n[\u003cc02cd780\u003e] (bus_add_driver+0x184/0x244) from [\u003cc02ce43c\u003e] (driver_register+0x78/0x12c)\n[\u003cc02ce43c\u003e] (driver_register+0x78/0x12c) from [\u003cc03701ac\u003e] (i2c_register_driver+0x2c/0xb4)\n[\u003cc03701ac\u003e] (i2c_register_driver+0x2c/0xb4) from [\u003cc0008798\u003e] (do_one_initcall+0x34/0x178)\n[\u003cc0008798\u003e] (do_one_initcall+0x34/0x178) from [\u003cc0691860\u003e] (kernel_init+0xdc/0x194)\n[\u003cc0691860\u003e] (kernel_init+0xdc/0x194) from [\u003cc0013cf0\u003e] (kernel_thread_exit+0x0/0x8)\n\nSince commit 6992f5334995af4 (\"sysfs: Use one lockdep class per sysfs\nattribute\") this initialization is required.\n\nReported-by: Stefano Babic \u003csbabic@denx.de\u003e\nTested-by: Stefano Babic \u003csbabic@denx.de\u003e\nSigned-off-by: Anatolij Gustschin \u003cagust@denx.de\u003e\nCc: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Stefano Babic \u003csbabic@denx.de\u003e\nCc: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nAcked-by: Wolfram Sang \u003cw.sang@pengutronix.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "db7b122cf5f769046d410f82a1e9fe7006ed955a", "tree": "22310d7b8bac92c1fcf88e521cd4ae47f076cfa9", "parents": [ "65ed76010dfed3cb75c863c9052c367a1bacf80a" ], "author": { "name": "Vasiliy Kulikov", "email": "segoon@openwall.com", "time": "Wed Apr 25 16:01:51 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:34 2012 -0700" }, "message": "arch/arm/mach-ux500/mbox-db5500.c: world-writable sysfs fifo file\n\nDon\u0027t allow everybody to use a modem.\n\nSigned-off-by: Vasiliy Kulikov \u003csegoon@openwall.com\u003e\nCc: Srinidhi Kasagar \u003csrinidhi.kasagar@stericsson.com\u003e\nAcked-by: Linus Walleij \u003clinus.walleij@linaro.org\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "65ed76010dfed3cb75c863c9052c367a1bacf80a", "tree": "c4b21b9d6f48e1a90d095ddea09b40e38c97164e", "parents": [ "351963bb58af5717359544087b9f634c27b9b155" ], "author": { "name": "Aneesh Kumar K.V", "email": "aneesh.kumar@linux.vnet.ibm.com", "time": "Wed Apr 25 16:01:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:34 2012 -0700" }, "message": "hugetlbfs: lockdep annotate root inode properly\n\nThis fixes the below reported false lockdep warning. e096d0c7e2e4\n(\"lockdep: Add helper function for dir vs file i_mutex annotation\") added\na similar annotation for every other inode in hugetlbfs but missed the\nroot inode because it was allocated by a separate function.\n\nFor HugeTLB fs we allow taking i_mutex in mmap. HugeTLB fs doesn\u0027t\nsupport file write and its file read callback is modified in a05b0855fd\n(\"hugetlbfs: avoid taking i_mutex from hugetlbfs_read()\") to not take\ni_mutex. Hence for HugeTLB fs with regular files we really don\u0027t take\ni_mutex with mmap_sem held.\n\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n [ INFO: possible circular locking dependency detected ]\n 3.4.0-rc1+ #322 Not tainted\n -------------------------------------------------------\n bash/1572 is trying to acquire lock:\n (\u0026mm-\u003emmap_sem){++++++}, at: [\u003cffffffff810f1618\u003e] might_fault+0x40/0x90\n\n but task is already holding lock:\n (\u0026sb-\u003es_type-\u003ei_mutex_key#12){+.+.+.}, at: [\u003cffffffff81125f88\u003e] vfs_readdir+0x56/0xa8\n\n which lock already depends on the new lock.\n\n the existing dependency chain (in reverse order) is:\n\n -\u003e #1 (\u0026sb-\u003es_type-\u003ei_mutex_key#12){+.+.+.}:\n [\u003cffffffff810a09e5\u003e] lock_acquire+0xd5/0xfa\n [\u003cffffffff816a2f5e\u003e] __mutex_lock_common+0x48/0x350\n [\u003cffffffff816a3325\u003e] mutex_lock_nested+0x2a/0x31\n [\u003cffffffff811fb8e1\u003e] hugetlbfs_file_mmap+0x7d/0x104\n [\u003cffffffff810f859a\u003e] mmap_region+0x272/0x47d\n [\u003cffffffff810f8a39\u003e] do_mmap_pgoff+0x294/0x2ee\n [\u003cffffffff810f8b65\u003e] sys_mmap_pgoff+0xd2/0x10e\n [\u003cffffffff8103d19e\u003e] sys_mmap+0x1d/0x1f\n [\u003cffffffff816a5922\u003e] system_call_fastpath+0x16/0x1b\n\n -\u003e #0 (\u0026mm-\u003emmap_sem){++++++}:\n [\u003cffffffff810a0256\u003e] __lock_acquire+0xa81/0xd75\n [\u003cffffffff810a09e5\u003e] lock_acquire+0xd5/0xfa\n [\u003cffffffff810f1645\u003e] might_fault+0x6d/0x90\n [\u003cffffffff81125d62\u003e] filldir+0x6a/0xc2\n [\u003cffffffff81133a83\u003e] dcache_readdir+0x5c/0x222\n [\u003cffffffff81125fa8\u003e] vfs_readdir+0x76/0xa8\n [\u003cffffffff811260b6\u003e] sys_getdents+0x79/0xc9\n [\u003cffffffff816a5922\u003e] system_call_fastpath+0x16/0x1b\n\n other info that might help us debug this:\n\n Possible unsafe locking scenario:\n\n CPU0 CPU1\n ---- ----\n lock(\u0026sb-\u003es_type-\u003ei_mutex_key#12);\n lock(\u0026mm-\u003emmap_sem);\n lock(\u0026sb-\u003es_type-\u003ei_mutex_key#12);\n lock(\u0026mm-\u003emmap_sem);\n\n *** DEADLOCK ***\n\n 1 lock held by bash/1572:\n #0: (\u0026sb-\u003es_type-\u003ei_mutex_key#12){+.+.+.}, at: [\u003cffffffff81125f88\u003e] vfs_readdir+0x56/0xa8\n\n stack backtrace:\n Pid: 1572, comm: bash Not tainted 3.4.0-rc1+ #322\n Call Trace:\n [\u003cffffffff81699a3c\u003e] print_circular_bug+0x1f8/0x209\n [\u003cffffffff810a0256\u003e] __lock_acquire+0xa81/0xd75\n [\u003cffffffff810f38aa\u003e] ? handle_pte_fault+0x5ff/0x614\n [\u003cffffffff8109e622\u003e] ? mark_lock+0x2d/0x258\n [\u003cffffffff810f1618\u003e] ? might_fault+0x40/0x90\n [\u003cffffffff810a09e5\u003e] lock_acquire+0xd5/0xfa\n [\u003cffffffff810f1618\u003e] ? might_fault+0x40/0x90\n [\u003cffffffff816a3249\u003e] ? __mutex_lock_common+0x333/0x350\n [\u003cffffffff810f1645\u003e] might_fault+0x6d/0x90\n [\u003cffffffff810f1618\u003e] ? might_fault+0x40/0x90\n [\u003cffffffff81125d62\u003e] filldir+0x6a/0xc2\n [\u003cffffffff81133a83\u003e] dcache_readdir+0x5c/0x222\n [\u003cffffffff81125cf8\u003e] ? sys_ioctl+0x74/0x74\n [\u003cffffffff81125cf8\u003e] ? sys_ioctl+0x74/0x74\n [\u003cffffffff81125cf8\u003e] ? sys_ioctl+0x74/0x74\n [\u003cffffffff81125fa8\u003e] vfs_readdir+0x76/0xa8\n [\u003cffffffff811260b6\u003e] sys_getdents+0x79/0xc9\n [\u003cffffffff816a5922\u003e] system_call_fastpath+0x16/0x1b\n\nSigned-off-by: Aneesh Kumar K.V \u003caneesh.kumar@linux.vnet.ibm.com\u003e\nCc: Dave Jones \u003cdavej@redhat.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Josh Boyer \u003cjwboyer@redhat.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Mimi Zohar \u003czohar@linux.vnet.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "351963bb58af5717359544087b9f634c27b9b155", "tree": "eda345631181903a86a341b5b01e92dfd5f0391f", "parents": [ "43ae1e32e0b540fa04f059b7aa3b4f5cf49fc9ad" ], "author": { "name": "Peter Feuerer", "email": "peter@piie.net", "time": "Wed Apr 25 16:01:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:34 2012 -0700" }, "message": "acerhdf: lowered default temp fanon/fanoff values\n\nDue to new supported hardware, of which the actual temperature limits of\nprocessor, harddisk and other components are unknown, it feels safer with\nlower fanon / fanoff settings.\n\nIt won\u0027t change much for most people, already using acerhdf, as they use\ntheir own fanon/fanoff variable settings when loading the module.\n\nFurthermore seems like kernel and userspace tools have been improved to\nwork more efficient and netbooks don\u0027t get so hot anymore.\n\nSigned-off-by: Peter Feuerer \u003cpeter@piie.net\u003e\nAcked-by: Borislav Petkov \u003cpetkovbb@gmail.com\u003e\nCc: Matthew Garrett \u003cmjg@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": "43ae1e32e0b540fa04f059b7aa3b4f5cf49fc9ad", "tree": "d2bc11e35b2dd184475b8e7604e77ee2f05c1c6f", "parents": [ "e39a9ba2889edbfbda4a9336ea718b2e25a9c2b2" ], "author": { "name": "Peter Feuerer", "email": "peter@piie.net", "time": "Wed Apr 25 16:01:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:33 2012 -0700" }, "message": "acerhdf: add support for new hardware\n\nAdd support for new hardware:\nAcer Aspire LT-10Q/531/751/1810/1825,\nAcer Travelmate 7730,\nPackard Bell ENBFT/DOTVR46\n\nSigned-off-by: Peter Feuerer \u003cpeter@piie.net\u003e\nAcked-by: Borislav Petkov \u003cpetkovbb@gmail.com\u003e\nCc: Matthew Garrett \u003cmjg@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": "e39a9ba2889edbfbda4a9336ea718b2e25a9c2b2", "tree": "1720e9f556d7966a0b65545bb909cd291d65d47b", "parents": [ "61065a30af8df4b8989c2ac7a1f4b4034e4df2d5" ], "author": { "name": "Clay Carpenter", "email": "claycarpenter@gmail.com", "time": "Wed Apr 25 16:01:49 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:33 2012 -0700" }, "message": "acerhdf: add support for Aspire 1410 BIOS v1.3314\n\nAdd support for Aspire 1410 BIOS v1.3314. Fixes the following error:\n\nacerhdf: unknown (unsupported) BIOS version Acer/Aspire 1410/v1.3314,\nplease report, aborting!\n\nSigned-off-by: Clay Carpenter \u003cclaycarpenter@gmail.com\u003e\nSigned-off-by: Peter Feuerer \u003cpeter@piie.net\u003e\nCc: Matthew Garrett \u003cmjg@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": "61065a30af8df4b8989c2ac7a1f4b4034e4df2d5", "tree": "3b446b3d81e996ce15901a57e85bab10fcbd8899", "parents": [ "904249aa68010c8e223263c922fcbb840a3f42e4" ], "author": { "name": "Glauber Costa", "email": "glommer@parallels.com", "time": "Wed Apr 25 16:01:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:33 2012 -0700" }, "message": "fs/buffer.c: remove BUG() in possible but rare condition\n\nWhile stressing the kernel with with failing allocations today, I hit the\nfollowing chain of events:\n\nalloc_page_buffers():\n\n\tbh \u003d alloc_buffer_head(GFP_NOFS);\n\tif (!bh)\n\t\tgoto no_grow; \u003c\u003d path taken\n\ngrow_dev_page():\n bh \u003d alloc_page_buffers(page, size, 0);\n if (!bh)\n goto failed; \u003c\u003d taken, consequence of the above\n\nand then the failed path BUG()s the kernel.\n\nThe failure is inserted a litte bit artificially, but even then, I see no\nreason why it should be deemed impossible in a real box.\n\nEven though this is not a condition that we expect to see around every\ntime, failed allocations are expected to be handled, and BUG() sounds just\ntoo much. As a matter of fact, grow_dev_page() can return NULL just fine\nin other circumstances, so I propose we just remove it, then.\n\nSigned-off-by: Glauber Costa \u003cglommer@parallels.com\u003e\nCc: Michal Hocko \u003cmhocko@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": "904249aa68010c8e223263c922fcbb840a3f42e4", "tree": "5476bdf728cd77ac6fcaaeb986df1ddd5c9527d7", "parents": [ "13d518074a952d33d47c428419693f63389547e9" ], "author": { "name": "Ying Han", "email": "yinghan@google.com", "time": "Wed Apr 25 16:01:48 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:33 2012 -0700" }, "message": "mm: fix up the vmscan stat in vmstat\n\nThe \"pgsteal\" stat is confusing because it counts both direct reclaim as\nwell as background reclaim. However, we have \"kswapd_steal\" which also\ncounts background reclaim value.\n\nThis patch fixes it and also makes it match the existng \"pgscan_\" stats.\n\nTest:\npgsteal_kswapd_dma32 447623\npgsteal_kswapd_normal 42272677\npgsteal_kswapd_movable 0\npgsteal_direct_dma32 2801\npgsteal_direct_normal 44353270\npgsteal_direct_movable 0\n\nSigned-off-by: Ying Han \u003cyinghan@google.com\u003e\nReviewed-by: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: Christoph Lameter \u003ccl@linux.com\u003e\nCc: Johannes Weiner \u003channes@cmpxchg.org\u003e\nCc: Michal Hocko \u003cmhocko@suse.cz\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hillf Danton \u003cdhillf@gmail.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Dan Magenheimer \u003cdan.magenheimer@oracle.com\u003e\nReviewed-by: Minchan Kim \u003cminchan@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": "13d518074a952d33d47c428419693f63389547e9", "tree": "75ccd438b6579840f51b96eed7a5e760e6caf2eb", "parents": [ "b1c12cbcd0a02527c180a862e8971e249d3b347d" ], "author": { "name": "Jason Baron", "email": "jbaron@redhat.com", "time": "Wed Apr 25 16:01:47 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 25 21:26:33 2012 -0700" }, "message": "epoll: clear the tfile_check_list on -ELOOP\n\nAn epoll_ctl(,EPOLL_CTL_ADD,,) operation can return \u0027-ELOOP\u0027 to prevent\ncircular epoll dependencies from being created. However, in that case we\ndo not properly clear the \u0027tfile_check_list\u0027. Thus, add a call to\nclear_tfile_check_list() for the -ELOOP case.\n\nSigned-off-by: Jason Baron \u003cjbaron@redhat.com\u003e\nReported-by: Yurij M. Plotnikov \u003cYurij.Plotnikov@oktetlabs.ru\u003e\nCc: Nelson Elhage \u003cnelhage@nelhage.com\u003e\nCc: Davide Libenzi \u003cdavidel@xmailserver.org\u003e\nTested-by: Alexandra N. Kossovsky \u003cAlexandra.Kossovsky@oktetlabs.ru\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "b1c12cbcd0a02527c180a862e8971e249d3b347d" }