)]}' { "log": [ { "commit": "e9bf5f36b09f8ec6c168ef58ee7d4890545ede1c", "tree": "c413c0559e5e1fdae3b40bb5bebeff37aa1f803b", "parents": [ "d1346a6cbabf6d377d753f1adc16cb0b305830cc" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jun 27 09:26:01 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jun 27 09:27:35 2012 +0100" }, "message": "drm/nouveau: add license header to prime.\n\nJust forgot this when I posted it, and yes I\u0027m the only person\nto have changed the file since.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d1346a6cbabf6d377d753f1adc16cb0b305830cc", "tree": "06ab828fc8d51eac9a8d04d1fdb91c51d2939623", "parents": [ "60d2c25251cac20d8c142a03e230237528b68430", "9bd0c15fcfb42f6245447c53347d65ad9e72080b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 26 11:26:50 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 26 11:26:50 2012 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"Just two changes: one udl endian fix, one nouveau memory corruption on\n some GPUs.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm/nouveau/fbcon: using nv_two_heads is not a good idea\n drm/udl: Make sure to get correct endian keys from vendor descriptor\n" }, { "commit": "60d2c25251cac20d8c142a03e230237528b68430", "tree": "8cfd656a6c86a3fefde957962c419923e9a1640d", "parents": [ "aace99e57c90353a51952e9dd1f6f110eec30d15", "1f41a6a9947615dca37d80b044ab81616e956a67" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 26 11:23:41 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 26 11:23:41 2012 -0700" }, "message": "Merge branch \u0027upstream-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\nPull HID fixes from Jiri Kosina:\n \"The most important one is a purification of Kconfig for CONFIG_HID;\n the inclusion of HID groups and autoloading didn\u0027t leave the Kconfig\n in a really consistent state. Henrik\u0027s patch fixes that. In addition\n to that, there are two small fixes for logitech and magicmouse\n drivers.\"\n\n* \u0027upstream-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:\n HID: Fix the generic Kconfig options\n HID: magicmouse: Correct report range of major / minor axes\n HID: logitech: don\u0027t use stack based dj_report structures\n" }, { "commit": "9bd0c15fcfb42f6245447c53347d65ad9e72080b", "tree": "338d1d19fcb9f76e62ef951b568a8d97a00012ec", "parents": [ "d42f0349f3fed647c61c2d432e974bbdafcfb3fb" ], "author": { "name": "Ben Skeggs", "email": "bskeggs@redhat.com", "time": "Tue Jun 26 12:12:30 2012 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Jun 26 12:16:43 2012 +0100" }, "message": "drm/nouveau/fbcon: using nv_two_heads is not a good idea\n\nnv_two_heads() was never meant to be used outside of pre-nv50 code. The\ncode checks for \u003e\u003d NV_10 for 2 CRTCs, then downgrades a few specific\nchipsets to 1 CRTC based on (pci_device \u0026 0x0ff0).\n\nThe breakage example seen is on GTX 560Ti, with a pciid of 0x1200, which\ngets detected as an NV20 (0x020x) with 1 CRTC by nv_two_heads(), causing\nmemory corruption because there\u0027s actually 2 CRTCs..\n\nThis switches fbcon to use the CRTC count directly from the mode_config\nstructure, which will also fix the same issue on Kepler boards which have\n4 CRTCs.\n\nSigned-off-by: Ben Skeggs \u003cbskeggs@redhat.com\u003e\nCc: stable@vger.kernel.org\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "aace99e57c90353a51952e9dd1f6f110eec30d15", "tree": "286dc3f7e7da9731b0e816641e9a551f6a88dc54", "parents": [ "bbcaf41118809b2a4b05e69cf298d379ebb734d1", "099987f0aaf28771261b91a41240b9228f2e32b2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 25 14:53:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 25 14:53:09 2012 -0700" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media\n\nPull media fixes from Mauro Carvalho Chehab.\n\nTrivial conflict due to new USB HID ID\u0027s being added next to each other\n(Baanto vs Axentia).\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits)\n [media] smia: Fix compile failures\n [media] Fix VIDIOC_DQEVENT docbook entry\n [media] s5p-fimc: Fix control creation function\n [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file\n [media] s5p-mfc: Fix setting controls\n [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT\n [media] v4l/s5p-mfc: corrected encoder v4l control definitions\n [media] v4l: mem2mem_testdev: Fix race conditions in driver\n [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism\n [media] cxd2820r: Fix an incorrect modulation type bitmask\n [media] em28xx: Show a warning if the board does not support remote controls\n [media] em28xx: Add remote control support for Terratec\u0027s Cinergy HTC Stick HD\n [media] USB: Staging: media: lirc: initialize spinlocks before usage\n [media] Revert \"[media] media: mx2_camera: Fix mbus format handling\"\n [media] bw-qcam: driver and pixfmt documentation fixes\n [media] cx88: fix firmware load on big-endian systems\n [media] cx18: support big-endian systems\n [media] ivtv: fix support for big-endian systems\n [media] tuner-core: return the frequency range of the correct tuner\n [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()\n ...\n" }, { "commit": "bbcaf41118809b2a4b05e69cf298d379ebb734d1", "tree": "debdacc7de009620f39cbae552e701ccef44bcf2", "parents": [ "5c0a981fb1cacddc9a35dd87ea74045abd640942", "a68de074613abd028b2ce63366d18db9c29e15d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 25 10:39:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 25 10:39:13 2012 -0700" }, "message": "Merge tag \u0027regulator-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator\n\nPull regulator fixes from Mark Brown:\n \"A few small, driver specific bug fixes, nothing exciting here but all\n needed if you happen to be using the affected hardware.\"\n\n* tag \u0027regulator-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:\n regulator: palmas: fix regmap offsets for enable/disable\n regulator: tps6524x: Fix get_voltage_sel for fixed voltage\n regulator: tps65023: Fix mask for LDOs output voltage select control\n" }, { "commit": "5c0a981fb1cacddc9a35dd87ea74045abd640942", "tree": "824f9f36c974fca1abd6f0251580e144dd005947", "parents": [ "09682c1dd3820445a27d32dcbeee6a6eafff3dc9", "593f47355467b9ef44293698817e2bdb347e2d11" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 25 10:38:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 25 10:38:19 2012 -0700" }, "message": "Merge branch \u0027fixes-for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping\n\nGit pull DMA-mapping fix from Marek Szyprowski:\n \"Another minor fixup for ARM dma-mapping redesign and extensions merged\n in this merge window\"\n\n* \u0027fixes-for-linus\u0027 of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:\n ARM: dma-mapping: fix buffer chunk allocation order\n" }, { "commit": "09682c1dd3820445a27d32dcbeee6a6eafff3dc9", "tree": "7e4b74d59ea2fbcf2a6210c3834f58aceab194e0", "parents": [ "6b16351acbd415e66ba16bf7d473ece1574cf0bc" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Mon Jun 25 17:15:31 2012 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 25 10:32:49 2012 -0700" }, "message": "bug.h: Fix up CONFIG_BUG\u003dn implicit function declarations.\n\nCommit 2603efa31a03 (\"bug.h: Fix up powerpc build regression\") corrected\nthe powerpc build case and extended the __ASSEMBLY__ guards, but it also\ngot caught in pre-processor hell accidentally matching the else case of\nCONFIG_BUG resulting in the BUG disabled case tripping up on\n-Werror\u003dimplicit-function-declaration.\n\nIt\u0027s not possible to __ASSEMBLY__ guard the entire file as architecture\ncode needs to get at the BUGFLAG_WARNING definition in the GENERIC_BUG\ncase, but the rest of the CONFIG_BUG\u003dy/n case needs to be guarded.\n\nRather than littering endless __ASSEMBLY__ checks in each of the if/else\ncases we just move the BUGFLAG definitions up under their own\nGENERIC_BUG test and then shove everything else under one big\n__ASSEMBLY__ guard.\n\nBuild tested on all of x86 CONFIG_BUG\u003dy, CONFIG_BUG\u003dn, powerpc (due to\nit\u0027s dependence on BUGFLAG definitions in assembly code), and sh (due to\nnot bringing in linux/kernel.h to satisfy the taint flag definitions used\nby the generic bug code).\n\nHopefully that\u0027s the end of the corner cases and I can abstain from ever\nhaving to touch this infernal header ever again.\n\nReported-by: Fengguang Wu \u003cfengguang.wu@intel.com\u003e\nTested-by: Fengguang Wu \u003cwfg@linux.intel.com\u003e\nAcked-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1f41a6a9947615dca37d80b044ab81616e956a67", "tree": "23ff02f9aa0c3603e3bc4b944233acd8f70a8156", "parents": [ "e75561b3d2a4eb15080ed73f59f7dc2965c01423" ], "author": { "name": "Henrik Rydberg", "email": "rydberg@euromail.se", "time": "Mon Jun 25 16:55:41 2012 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jun 25 17:25:00 2012 +0200" }, "message": "HID: Fix the generic Kconfig options\n\nThe generic HID driver is obviously not a special driver, so move it\noutside of the special drivers menu. Explain the usage and make the\ndefault follow the HID setting. This should simplify migration from\nolder kernels. While at it, remove the redundant HID_SUPPORT option\nand modify the HID and USB_HID entries to better explain the bus\nstructure.\n\nReported-by: Jan Beulich \u003cjbeulich@suse.com\u003e\nSigned-off-by: Henrik Rydberg \u003crydberg@euromail.se\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "e75561b3d2a4eb15080ed73f59f7dc2965c01423", "tree": "01507c7e31e8874a25fbe37283f27b0fb792db35", "parents": [ "d8dc3494f77a5cc3b274bae36f7e74e85cf8a407" ], "author": { "name": "Yufeng Shen", "email": "miletus@chromium.org", "time": "Fri Jun 22 12:31:53 2012 -0400" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Jun 25 15:30:15 2012 +0200" }, "message": "HID: magicmouse: Correct report range of major / minor axes\n\nIn patch \"HID: magicmouse: Adjust major / minor axes to scale\",\ntouch_major and touch_minor axes are scaled by a factor of\nfour when reported but the max touch_major/minor is not scaled\naccordingly. This patch scales the max touch_major/minor to\nbe consistent with the reported value.\n\nSigned-off-by: Yufeng Shen \u003cmiletus@chromium.org\u003e\nAcked-by: Henrik Rydberg \u003crydberg@euromail.se\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "593f47355467b9ef44293698817e2bdb347e2d11", "tree": "2e90c04ac19f11cf8b94c92058d4a0ac0e00401d", "parents": [ "6b16351acbd415e66ba16bf7d473ece1574cf0bc" ], "author": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Thu Jun 21 11:48:11 2012 +0200" }, "committer": { "name": "Marek Szyprowski", "email": "m.szyprowski@samsung.com", "time": "Mon Jun 25 10:18:52 2012 +0200" }, "message": "ARM: dma-mapping: fix buffer chunk allocation order\n\nIOMMU-aware dma_alloc_attrs() implementation allocates buffers in\npower-of-two chunks to improve performance and take advantage of large\npage mappings provided by some IOMMU hardware. However current code, due\nto a subtle bug, allocated those chunks in the smallest-to-largest\norder, what completely killed all the advantages of using larger than\npage chunks. If a 4KiB chunk has been mapped as a first chunk, the\nconsecutive chunks are not aligned correctly to the power-of-two which\nmatch their size and IOMMU drivers were not able to use internal\nmappings of size other than the 4KiB (largest common denominator of\nalignment and chunk size).\n\nThis patch fixes this issue by changing to the correct largest-to-smallest\nchunk size allocation sequence.\n\nSigned-off-by: Marek Szyprowski \u003cm.szyprowski@samsung.com\u003e\n" }, { "commit": "d42f0349f3fed647c61c2d432e974bbdafcfb3fb", "tree": "239371bc88344798f75287da51ba93024bb2df64", "parents": [ "6b16351acbd415e66ba16bf7d473ece1574cf0bc" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jun 25 07:32:14 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jun 25 07:43:12 2012 +0100" }, "message": "drm/udl: Make sure to get correct endian keys from vendor descriptor\n\nThis is a port of\ncommit b49f184b640dcfab7ede394cf2a1ff4fe3d154f5\nAuthor: Ben Collins \u003cbcollins@ubuntu.com\u003e\nfrom udlfb to udl kms driver.\n\nThe driver was not using le16_to_cpu when reading keys from the vendor\ndescriptor, causing incorrect parsing. Mainly, sku_pixel_limit was not\nbeing parsed on big-endian systems. This would result in a blank screen\non big-endian CPUs where the DL chips\u0027s max mode was smaller than the\nmonitor\u0027s native mode.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "6b16351acbd415e66ba16bf7d473ece1574cf0bc", "tree": "5fa64d47f28cde6b8151b75c7047a98292d084ca", "parents": [ "02b7d83436ae4b1d86a5df03e72c1c69af7e239d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 24 12:53:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 24 12:53:04 2012 -0700" }, "message": "Linux 3.5-rc4\n" }, { "commit": "02b7d83436ae4b1d86a5df03e72c1c69af7e239d", "tree": "a6d59c053edd0a55aca13ad2bee4feef528655c5", "parents": [ "104452f052dfcf62dbf0c4110c9234a3285f59bf" ], "author": { "name": "Anatol Pomozov", "email": "anatol.pomozov@gmail.com", "time": "Sat Jun 23 15:54:34 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 24 11:03:52 2012 -0700" }, "message": "Fix typo in printed messages\n\nCoult -\u003e Could\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "104452f052dfcf62dbf0c4110c9234a3285f59bf", "tree": "9d508bbacb7d41286b21eeae4c1d6b222bcc361e", "parents": [ "08d49c46cf61f707f3f44228b362947bb57343e7", "081f323bd3cc3a4d5ee6276e53cc52eddfc20a63" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 24 11:02:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 24 11:02:09 2012 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/virt/kvm/kvm\n\nPull KVM fixes from Avi Kivity:\n \"Fixing a scheduling-while-atomic bug in the ppc code, and a bug which\n allowed pci bridges to be assigned to guests.\"\n\n* git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: PPC: Book3S HV: Drop locks around call to kvmppc_pin_guest_page\n KVM: Fix PCI header check on device assignment\n" }, { "commit": "08d49c46cf61f707f3f44228b362947bb57343e7", "tree": "a17255e96a1ca86ec5c8f789422cb7e46232d762", "parents": [ "a4a20fd981b2e6419556ca474b3b9689d42e5233", "2e51fd3c13e330d9364a211ddcd3e38771eeb4b4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 24 11:00:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 24 11:00:07 2012 -0700" }, "message": "Merge tag \u0027rdma-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\nPull InfiniBand/RDMA fixes from Roland Dreier:\n - Fixes to new ocrdma driver\n - Typo in test in CMA\n\n* tag \u0027rdma-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n RDMA/cma: QP type check on received REQs should be AND not OR\n RDMA/ocrdma: Fix off by one in ocrdma_query_gid()\n RDMA/ocrdma: Fixed RQ error CQE polling\n RDMA/ocrdma: Correct queue SGE calculation\n RDMA/ocrdma: Correct reported max queue sizes\n RDMA/ocrdma: Fixed GID table for vlan and events\n" }, { "commit": "a4a20fd981b2e6419556ca474b3b9689d42e5233", "tree": "fa12c3a45540e534cd1e739438386374dc39c424", "parents": [ "2ecedc478e7a20597d95f48144cbe5ee568c0f1b", "0fa1f0609a0c1fe8b2be3c0089a2cb48f7fda521" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 24 10:57:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 24 10:57:59 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 very controversial in here. Most of the fixes are for OMAP\n this time around, with some orion/kirkwood and a tegra patch mixed in.\"\n\n* tag \u0027fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:\n ARM: Orion: Fix Virtual/Physical mixup with watchdog\n ARM: Kirkwood: clk_register_gate_fn: add fn assignment\n ARM: Orion5x - Restore parts of io.h, with rework\n ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled\n ARM: OMAP2+: mux: fix sparse warning\n ARM: OMAP2+: CM: increase the module disable timeout\n ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks\n ARM: OMAP4: hwmod data: fix 32k sync timer idle modes\n ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby\n ARM: OMAP: Fix Beagleboard DVI reset gpio\n arm/dts: OMAP2: Fix interrupt controller binding\n ARM: OMAP2: Fix tusb6010 GPIO interrupt for n8x0\n ARM: OMAP2+: Fix MUSB ifdefs for platform init code\n ARM: tegra: make tegra_cpu_reset_handler_enable() __init\n ARM: OMAP: PM: Lock clocks list while generating summary\n ARM: iconnect: Remove include of removed linux/spi/orion_spi.h\n" }, { "commit": "2ecedc478e7a20597d95f48144cbe5ee568c0f1b", "tree": "360c2cf63478a62e5a7ee310fd060e721894e1e7", "parents": [ "002b758b6dc4d840e662f25625f696d7b43d48f4", "59bbe27ba0f6bae1d85f1521e43181d98ee9c5ab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 24 10:57:15 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 24 10:57:15 2012 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux\n\nPull drm fixes from Dave Airlie:\n \"Nothing major in here, one radeon SI fix for tiling, and one uninit\n var fix, two minor header file fixes.\"\n\n* \u0027drm-fixes\u0027 of git://people.freedesktop.org/~airlied/linux:\n drm: drop comment about this header being autogenerated.\n drm/edid: don\u0027t return stack garbage from supports_rb\n vga_switcheroo: Add include guard\n drm/radeon: SI tiling fixes for display\n" }, { "commit": "2e51fd3c13e330d9364a211ddcd3e38771eeb4b4", "tree": "f74fe4bd4a80fe85f5c2150ea5e5d0191a6403d1", "parents": [ "4dd81e895655c59bd19d7a8f03a5de1310f4aeb6", "7b33dc2b050b71de0e202885a26caffbc864d072" ], "author": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Jun 24 04:59:59 2012 -0700" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Sun Jun 24 04:59:59 2012 -0700" }, "message": "Merge branches \u0027cma\u0027 and \u0027ocrdma\u0027 into for-linus\n" }, { "commit": "0fa1f0609a0c1fe8b2be3c0089a2cb48f7fda521", "tree": "2e3a9eaab2c84de0a77c6afa97733d22e4e8fb90", "parents": [ "5fb2ce119c113e5c987fa81ed89e73b2653e28e4" ], "author": { "name": "Andrew Lunn", "email": "andrew@lunn.ch", "time": "Fri Jun 22 08:54:02 2012 +0200" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Jun 23 16:19:21 2012 -0700" }, "message": "ARM: Orion: Fix Virtual/Physical mixup with watchdog\n\nThe orion watchdog is expecting to be passed the physcial address of\nthe hardware, and will ioremap() it to give a virtual address it will\nuse as the base address for the hardware. However, when creating the\nplatform resource record, a virtual address was being used.\n\nAdd the necassary #define\u0027s so we can pass the physical address as\nexpected.\n\nTested on Kirkwood and Orion5x.\n\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "5fb2ce119c113e5c987fa81ed89e73b2653e28e4", "tree": "d11f2747ca98de28d53b6c62c5644fe36a4b475c", "parents": [ "b5e12229a4850ae9b19ee5252508749da8844b3c" ], "author": { "name": "Marc Kleine-Budde", "email": "mkl@blackshift.org", "time": "Fri Jun 22 08:54:01 2012 +0200" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Jun 23 16:19:02 2012 -0700" }, "message": "ARM: Kirkwood: clk_register_gate_fn: add fn assignment\n\nIn commit:\n 98d9986 ARM: Kirkwood: Replace clock gating\nthe kirkwood clock gating has been reworked. A custom variant of\nclock gating, that calls a custom function before gating the clock\noff, has been introduced. However in clk_register_gate_fn() this\ncustom function \"fn\" is never assigned.\n\nThis patch adds the missing fn assignment.\n\nCc: stable \u003cstable@vger.kernel.org\u003e\nSigned-off-by: Marc Kleine-Budde \u003cmkl@blackshift.org\u003e\nTested-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nAcked-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "b5e12229a4850ae9b19ee5252508749da8844b3c", "tree": "0f50e883e363ed48056543ab6a4a1b398fae38ac", "parents": [ "a34a3b7264fdb40c8d4be8bebb38fd56dc48d162" ], "author": { "name": "Andrew Lunn", "email": "andrew@lunn.ch", "time": "Fri Jun 22 20:57:57 2012 +0200" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Jun 23 16:18:17 2012 -0700" }, "message": "ARM: Orion5x - Restore parts of io.h, with rework\n\nCommit 4d5fc58dbe34b78157c05b319669bb3e064ba8bd (ARM: remove bunch of\nnow unused mach/io.h files) removed the orion5x io.h. Unfortunately,\nthis is still needed for the definition of IO_SPACE_LIMIT which\noverrides the default 64K. All Orion based systems have 1Mbyte of IO\nspace per PCI[e] bus, and try to request_resource() this size. Orion5x\nhas two such PCI buses.\n\nIt is likely that the original, removed version, was broken. This\nversion might be less broken. However, it has not been tested on\nhardware with a PCI card, let alone hardware with a PCI card with IO\ncapabilities.\n\nSigned-off-by: Andrew Lunn \u003candrew@lunn.ch\u003e\nAcked-by: Rob Herring \u003crob.herring@calxeda.com\u003e\nSigned-off-by: Olof Johansson \u003colof@lixom.net\u003e\n" }, { "commit": "a34a3b7264fdb40c8d4be8bebb38fd56dc48d162", "tree": "d8625985d600c8fb5ef8b5312e0f13a84af3435b", "parents": [ "e23d7096f9633d37aa35dffab9b0bd594ed64533", "dc57aef503859dbf724f6126c58b2e1672e215f3" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Jun 23 16:16:29 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Jun 23 16:16:29 2012 -0700" }, "message": "Merge tag \u0027omap-fixes-a-for-3.5rc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes\n\nFrom Paul Walmsley (as per Tony Lindgren\u0027s request):\n \"Some uncontroversial OMAP clock, hwmod, and compiler warning fixes for 3.5-rc\"\n\n* tag \u0027omap-fixes-a-for-3.5rc\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:\n ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled\n ARM: OMAP2+: mux: fix sparse warning\n ARM: OMAP2+: CM: increase the module disable timeout\n ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks\n ARM: OMAP4: hwmod data: fix 32k sync timer idle modes\n ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby\n ARM: OMAP: PM: Lock clocks list while generating summary\n" }, { "commit": "e23d7096f9633d37aa35dffab9b0bd594ed64533", "tree": "1de032158487c5ca078b7e08dad0e37ac970bfee", "parents": [ "6355f25ed965421725d92cf719fc63008690ca1c", "aef2b89662b8a7506846d0dc0df672d196ddf8d0" ], "author": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Jun 23 16:11:50 2012 -0700" }, "committer": { "name": "Olof Johansson", "email": "olof@lixom.net", "time": "Sat Jun 23 16:11:50 2012 -0700" }, "message": "Merge tag \u0027omap-fixes-for-v3.5-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes\n\nFrom Tony Lindgren:\n\"Here are a few fixes with the biggest one being fix for Beagle DVI\n reset. All of them are regression fixes, except for the missing omap2\n interrupt controller binding that somehow got missed earlier.\"\n\n* tag \u0027omap-fixes-for-v3.5-rc3\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:\n ARM: OMAP: Fix Beagleboard DVI reset gpio\n arm/dts: OMAP2: Fix interrupt controller binding\n ARM: OMAP2: Fix tusb6010 GPIO interrupt for n8x0\n ARM: OMAP2+: Fix MUSB ifdefs for platform init code\n" }, { "commit": "a68de074613abd028b2ce63366d18db9c29e15d2", "tree": "38f712aaf7c83d5336978ba86a6d4ce6513428b1", "parents": [ "8386a00f1443f676e8b614f654e2e324fdc0b3b3" ], "author": { "name": "Graeme Gregory", "email": "gg@slimlogic.co.uk", "time": "Fri Jun 22 13:36:20 2012 +0100" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Sat Jun 23 11:37:28 2012 +0100" }, "message": "regulator: palmas: fix regmap offsets for enable/disable\n\nI forgot to apply the offsets for the regmap helper functions for\nenable/disable on SMPS10 and the LDO regulators. This means regulators\nwill not enable/disable correctly.\n\nSigned-off-by: Graeme Gregory \u003cgg@slimlogic.co.uk\u003e\nTested-by: Sebastien Guiriec \u003cs-guiriec@ti.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "002b758b6dc4d840e662f25625f696d7b43d48f4", "tree": "99c83d7622066cdf7bb5d467f0017b2360fb7ada", "parents": [ "369c4f542fd5e197ace5f9fdd33c558fb2358480", "642c0dbde32f34baa7886e988a067089992adc8f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 22 17:47:08 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 22 17:47:08 2012 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client\n\nPull Ceph fixes from Sage Weil:\n \"There are a couple of fixes from Yan for bad pointer dereferences in\n the messenger code and when fiddling with page-\u003eprivate after page\n migration, a fix from Alex for a use-after-free in the osd client\n code, and a couple fixes for the message refcounting and shutdown\n ordering.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:\n libceph: flush msgr queue during mon_client shutdown\n rbd: Clear ceph_msg-\u003ebio_iter for retransmitted message\n libceph: use con get/put ops from osd_client\n libceph: osd_client: don\u0027t drop reply reference too early\n ceph: check PG_Private flag before accessing page-\u003eprivate\n" }, { "commit": "369c4f542fd5e197ace5f9fdd33c558fb2358480", "tree": "02ff18cb128f75a4d40f2f7d4169aca3586af397", "parents": [ "a11637194adc8bf2c2022ac89314dbdd1fcd1778", "f7bdf03a99efc083608cd9c0c3e03abff311c79e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 22 11:07:55 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 22 11:07:55 2012 -0700" }, "message": "Merge tag \u0027for-linus-Jun-21-2012\u0027 of git://oss.sgi.com/xfs/xfs\n\nPull XFS fixes from Ben Myers:\n - Fix stale data exposure with unwritten extents\n - Fix a warning in xfs_alloc_vextent with ODEBUG\n - Fix overallocation and alignment of pages for xfs_bufs\n - Fix a cursor leak\n - Fix a log hang\n - Fix a crash related to xfs_sync_worker\n - Rename xfs log structure from struct log to struct xlog so we can use\n crash dumps effectively\n\n* tag \u0027for-linus-Jun-21-2012\u0027 of git://oss.sgi.com/xfs/xfs:\n xfs: rename log structure to xlog\n xfs: shutdown xfs_sync_worker before the log\n xfs: Fix overallocation in xfs_buf_allocate_memory()\n xfs: fix allocbt cursor leak in xfs_alloc_ag_vextent_near\n xfs: check for stale inode before acquiring iflock on push\n xfs: fix debug_object WARN at xfs_alloc_vextent()\n xfs: xfs_vm_writepage clear iomap_valid when !buffer_uptodate (REV2)\n" }, { "commit": "a11637194adc8bf2c2022ac89314dbdd1fcd1778", "tree": "b761d38ee683a71b7140b4203aee1cd319c5ef0e", "parents": [ "636040b4eddf6152b5d0b2d574663809f898953b", "6921a575c9f26f7ea274aaea3b78967810ce5513" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 22 10:58:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 22 10:58:57 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 updates from Ingo Molnar.\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:\n ftrace: Make all inline tags also include notrace\n perf: Use css_tryget() to avoid propping up css refcount\n perf tools: Fix synthesizing tracepoint names from the perf.data headers\n perf stat: Fix default output file\n perf tools: Fix endianity swapping for adds_features bitmask\n" }, { "commit": "59bbe27ba0f6bae1d85f1521e43181d98ee9c5ab", "tree": "76dcb7d7b0aba3cda5eb45efcf2bb055764f33da", "parents": [ "b196a4980ff7bb54db478e2a408dc8b12be15304" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jun 22 11:04:55 2012 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jun 22 11:04:55 2012 +0100" }, "message": "drm: drop comment about this header being autogenerated.\n\nThis comment is well out of date.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dc57aef503859dbf724f6126c58b2e1672e215f3", "tree": "329e8bee393fa7f154e95585b3086250426f9e2d", "parents": [ "65e25976b75c4996c5650afadc4180db09ec7475" ], "author": { "name": "Ricardo Neri", "email": "ricardo.neri@ti.com", "time": "Thu Jun 21 10:08:53 2012 +0200" }, "committer": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Thu Jun 21 18:08:47 2012 -0600" }, "message": "ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled\n\nAs per the OMAP4 documentation, audio over HDMI must be transmitted in\nno-idle mode. This patch adds the HWMOD_SWSUP_SIDLE so that omap_hwmod uses\nno-idle/force-idle settings instead of smart-idle mode.\n\nThis is required as the DSS interface clock is used as functional clock\nfor the HDMI wrapper audio FIFO. If no-idle mode is not used, audio could\nbe choppy, have bad quality or not be audible at all.\n\nSigned-off-by: Ricardo Neri \u003cricardo.neri@ti.com\u003e\n[b-cousson@ti.com: Update the subject and align the .flags\nlocation with the script template]\nSigned-off-by: Benoit Cousson \u003cb-cousson@ti.com\u003e\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\n\n" }, { "commit": "65e25976b75c4996c5650afadc4180db09ec7475", "tree": "a9449d946c5bc2b0f42de345d776628563c47590", "parents": [ "b8f15b7e1dd3638d35cfff85571df1d7ea96e35e" ], "author": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Sun Jun 17 12:00:58 2012 -0600" }, "committer": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Thu Jun 21 18:08:47 2012 -0600" }, "message": "ARM: OMAP2+: mux: fix sparse warning\n\nCommit bbd707acee279a61177a604822db92e8164d00db (\"ARM: omap2: use\nmachine specific hook for late init\") resulted in the addition of this\nsparse warning:\n\narch/arm/mach-omap2/mux.c:791:12: warning: symbol \u0027omap_mux_late_init\u0027 was not declared. Should it be static?\n\nFix by including the header file containing the prototype.\n\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\nCc: Shawn Guo \u003cshawn.guo@linaro.org\u003e\nCc: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "b8f15b7e1dd3638d35cfff85571df1d7ea96e35e", "tree": "34c0db4df59886dbbeaab9d10fd90d49acd47f51", "parents": [ "9a47d32d5c4b91a4ce4c459f3b7b0290185e7578" ], "author": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Sun Jun 17 11:57:53 2012 -0600" }, "committer": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Thu Jun 21 18:08:47 2012 -0600" }, "message": "ARM: OMAP2+: CM: increase the module disable timeout\n\nIncrease the timeout for disabling an IP block to five milliseconds.\nThis is to handle the usb_host_fs idle latency, which takes almost\nfour milliseconds after a host controller reset.\n\nThis is the second of two patches needed to resolve the following\nboot warning:\n\nomap_hwmod: usb_host_fs: _wait_target_disable failed\n\nThanks to Sergei Shtylyov \u003csshtylyov@mvista.com\u003e for finding\nan unrelated hunk in a previous version of this patch.\n\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\nCc: Sergei Shtylyov \u003csshtylyov@mvista.com\u003e\nCc: Tero Kristo \u003ct-kristo@ti.com\u003e\n" }, { "commit": "9a47d32d5c4b91a4ce4c459f3b7b0290185e7578", "tree": "26dc6b1ecc819b0de5f3c163e2a280d33d1136e1", "parents": [ "252a4c5443ec4d0bd310ae5b0d1b7f9c5b1e7f46" ], "author": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Sun Jun 17 11:57:52 2012 -0600" }, "committer": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Thu Jun 21 18:08:47 2012 -0600" }, "message": "ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks\n\nUntil the OMAP4 code is converted to disable the use of the clock\nframework-based clockdomain enable/disable sequence, any clock used as\na hwmod main_clk must have a clockdomain associated with it. This\npatch populates some clock structure clockdomain names to resolve the\nfollowing warnings during kernel init:\n\nomap_hwmod: dpll_mpu_m2_ck: missing clockdomain for dpll_mpu_m2_ck.\nomap_hwmod: trace_clk_div_ck: missing clockdomain for trace_clk_div_ck.\nomap_hwmod: l3_div_ck: missing clockdomain for l3_div_ck.\nomap_hwmod: ddrphy_ck: missing clockdomain for ddrphy_ck.\n\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\nCc: Rajendra Nayak \u003crnayak@ti.com\u003e\nCc: Benoît Cousson \u003cb-cousson@ti.com\u003e\n" }, { "commit": "252a4c5443ec4d0bd310ae5b0d1b7f9c5b1e7f46", "tree": "39b6c17c3f75b0a524310370fa7de75f021aaff0", "parents": [ "561038f0a8aa1de272a2ac5dad24cc8246d9f496" ], "author": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Sun Jun 17 11:57:51 2012 -0600" }, "committer": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Thu Jun 21 18:08:47 2012 -0600" }, "message": "ARM: OMAP4: hwmod data: fix 32k sync timer idle modes\n\nThe 32k sync timer IP block target idle modes in the hwmod data are\nincorrect. The IP block does not support any smart-idle modes.\nUpdate the data to reflect the correct modes.\n\nThis problem was initially identified and a diff fragment posted to\nthe lists by Benoît Cousson \u003cb-cousson@ti.com\u003e. A patch description\nbug in the first version was also identified by Benoît.\n\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\nCc: Benoît Cousson \u003cb-cousson@ti.com\u003e\nCc: Tero Kristo \u003ct-kristo@ti.com\u003e\n" }, { "commit": "561038f0a8aa1de272a2ac5dad24cc8246d9f496", "tree": "ab5fc36a6a2fa2d57ee250082463f46c9229b8aa", "parents": [ "6bc07d6afa1679a2f5b272bc36618314686e143a" ], "author": { "name": "Djamil Elaidi", "email": "d-elaidi@ti.com", "time": "Sun Jun 17 11:57:51 2012 -0600" }, "committer": { "name": "Paul Walmsley", "email": "paul@pwsan.com", "time": "Thu Jun 21 18:08:46 2012 -0600" }, "message": "ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby\n\nIf an IP is configured in Smart-Standby-Wakeup, when disabling wakeup feature the\nIP will not go back to Smart-Standby, but will remain in Smart-Standby-Wakeup.\n\nSigned-off-by: Djamil Elaidi \u003cd-elaidi@ti.com\u003e\nSigned-off-by: Paul Walmsley \u003cpaul@pwsan.com\u003e\n" }, { "commit": "636040b4eddf6152b5d0b2d574663809f898953b", "tree": "6f2e8124e531f88e264e53d5cc3ef52368659a69", "parents": [ "8874e812feb4926f4a51a82c4fca75c7daa05fc5", "b1027439dff844675f6c0df97a1b1d190791a699" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 21 16:05:43 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 21 16:05:43 2012 -0700" }, "message": "Merge tag \u0027nfs-for-3.5-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs\n\nPull NFS client bugfixes from Trond Myklebust:\n - Fix a write hang due to an uninitalised variable when\n !defined(CONFIG_NFS_V4)\n - Address upcall races in the legacy NFSv4 idmapper\n - Remove an O_DIRECT refcounting issue\n - Fix a pNFS refcounting bug when the file layout metadata server is\n also acting as a data server\n - Fix a pNFS module loading race.\n\n* tag \u0027nfs-for-3.5-3\u0027 of git://git.linux-nfs.org/projects/trondmy/linux-nfs:\n NFS: Force the legacy idmapper to be single threaded\n NFS: Initialise commit_info.rpc_out when !defined(CONFIG_NFS_V4)\n NFS: Fix a refcounting issue in O_DIRECT\n NFSv4.1: Fix a race in set_pnfs_layoutdriver\n NFSv4.1: Fix umount when filelayout DS is also the MDS\n" }, { "commit": "8874e812feb4926f4a51a82c4fca75c7daa05fc5", "tree": "bd3f4cc08e6e32e3d6f687a0e51590d4ab0faacb", "parents": [ "7b8377862bd816a5e8ceb5c713d88bf82555c8d4", "cb77fcd88569cd2b7b25ecd4086ea932a53be9b3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 21 13:41:07 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 21 13:41: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 is a small pull with btrfs fixes. The biggest of the bunch is\n another fix for the new backref walking code.\n\n We\u0027re still hammering out one btrfs dio vs buffered reads problem, but\n that one will have to wait for the next rc.\"\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:\n Btrfs: delay iput with async extents\n Btrfs: add a missing spin_lock\n Btrfs: don\u0027t assume to be on the correct extent in add_all_parents\n Btrfs: introduce btrfs_next_old_item\n" }, { "commit": "7b8377862bd816a5e8ceb5c713d88bf82555c8d4", "tree": "a22e9d373ec5d85343094320acbdcbe238b534da", "parents": [ "7940b2adb474608318e51294d4e9fa0eee1bef61", "2355375efdf10f43680d420023baa97796bfcdff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 21 13:40:40 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 21 13:40:40 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 fixes from Guenter Roeck:\n \"Two minor fixes in emc2103 and applesmc drivers.\"\n\n* tag \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:\n hwmon: (emc2103) Fix use of an uninitilized variable in error case\n hwmon: (applesmc) Limit key length in warning messages\n" }, { "commit": "f7bdf03a99efc083608cd9c0c3e03abff311c79e", "tree": "a9edfa8688f957e1e2d7175f50a75444295bf5a5", "parents": [ "8866fc6fa55e31b2bce931b7963ff16641b39dc7" ], "author": { "name": "Mark Tinguely", "email": "tinguely@sgi.com", "time": "Thu Jun 14 09:22:15 2012 -0500" }, "committer": { "name": "Ben Myers", "email": "bpm@sgi.com", "time": "Thu Jun 21 14:21:11 2012 -0500" }, "message": "xfs: rename log structure to xlog\n\nRename the XFS log structure to xlog to help crash distinquish it from the\nother logs in Linux.\n\nSigned-off-by: Mark Tinguely \u003ctinguely@sgi.com\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Ben Myers \u003cbpm@sgi.com\u003e\n" }, { "commit": "8866fc6fa55e31b2bce931b7963ff16641b39dc7", "tree": "f86eb7377bc637f1cc4f007826ecda945525af48", "parents": [ "59c84ed0ddc11f1823b4a33ace4fbcc948261bb2" ], "author": { "name": "Ben Myers", "email": "bpm@sgi.com", "time": "Fri May 25 15:45:36 2012 -0500" }, "committer": { "name": "Ben Myers", "email": "bpm@sgi.com", "time": "Thu Jun 21 14:20:48 2012 -0500" }, "message": "xfs: shutdown xfs_sync_worker before the log\n\nRevert commit 1307bbd, which uses the s_umount semaphore to provide\nexclusion between xfs_sync_worker and unmount, in favor of shutting down\nthe sync worker before freeing the log in xfs_log_unmount. This is a\ncleaner way of resolving the race between xfs_sync_worker and unmount\nthan using s_umount.\n\nSigned-off-by: Ben Myers \u003cbpm@sgi.com\u003e\nReviewed-by: Mark Tinguely \u003ctinguely@sgi.com\u003e\nReviewed-by: Dave Chinner \u003cdchinner@redhat.com\u003e\n" }, { "commit": "59c84ed0ddc11f1823b4a33ace4fbcc948261bb2", "tree": "32d64523ae5c46b4959876a3d6b498adb6452dbc", "parents": [ "76d095388b040229ea1aad7dea45be0cfa20f589" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Wed Jun 06 00:32:26 2012 +0200" }, "committer": { "name": "Ben Myers", "email": "bpm@sgi.com", "time": "Thu Jun 21 14:20:36 2012 -0500" }, "message": "xfs: Fix overallocation in xfs_buf_allocate_memory()\n\nCommit de1cbee which removed b_file_offset in favor of b_bn introduced a bug\ncausing xfs_buf_allocate_memory() to overestimate the number of necessary\npages. The problem is that xfs_buf_alloc() sets b_bn to -1 and thus effectively\nevery buffer is straddling a page boundary which causes\nxfs_buf_allocate_memory() to allocate two pages and use vmalloc() for access\nwhich is unnecessary.\n\nDave says xfs_buf_alloc() doesn\u0027t need to set b_bn to -1 anymore since the\nbuffer is inserted into the cache only after being fully initialized now.\nSo just make xfs_buf_alloc() fill in proper block number from the beginning.\n\nCC: David Chinner \u003cdchinner@redhat.com\u003e\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nReviewed-by: Dave Chinner \u003cdchinner@redhat.com\u003e\nSigned-off-by: Ben Myers \u003cbpm@sgi.com\u003e\n" }, { "commit": "76d095388b040229ea1aad7dea45be0cfa20f589", "tree": "e3aa3051f396898675fff5ae227fd7c7d0f46aa6", "parents": [ "9a3a5dab63461b84213052888bf38a962b22d035" ], "author": { "name": "Dave Chinner", "email": "dchinner@redhat.com", "time": "Tue Jun 12 14:20:26 2012 +1000" }, "committer": { "name": "Ben Myers", "email": "bpm@sgi.com", "time": "Thu Jun 21 14:20:20 2012 -0500" }, "message": "xfs: fix allocbt cursor leak in xfs_alloc_ag_vextent_near\n\nWhen we fail to find an matching extent near the requested extent\nspecification during a left-right distance search in\nxfs_alloc_ag_vextent_near, we fail to free the original cursor that\nwe used to look up the XFS_BTNUM_CNT tree and hence leak it.\n\nReported-by: Chris J Arges \u003cchris.j.arges@canonical.com\u003e\nSigned-off-by: Dave Chinner \u003cdchinner@redhat.com\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Ben Myers \u003cbpm@sgi.com\u003e\n" }, { "commit": "9a3a5dab63461b84213052888bf38a962b22d035", "tree": "7f3bfcce7c1a6ea59267369f10ed5fa618afb3d1", "parents": [ "3b876c8f2a361ceeed3fed894980c69066f903a0" ], "author": { "name": "Brian Foster", "email": "bfoster@redhat.com", "time": "Mon Jun 11 10:39:43 2012 -0400" }, "committer": { "name": "Ben Myers", "email": "bpm@sgi.com", "time": "Thu Jun 21 14:20:06 2012 -0500" }, "message": "xfs: check for stale inode before acquiring iflock on push\n\nAn inode in the AIL can be flush locked and marked stale if\na cluster free transaction occurs at the right time. The\ninode item is then marked as flushing, which causes xfsaild\nto spin and leaves the filesystem stalled. This is\nreproduced by running xfstests 273 in a loop for an\nextended period of time.\n\nCheck for stale inodes before the flush lock. This marks\nthe inode as pinned, leads to a log flush and allows the\nfilesystem to proceed.\n\nSigned-off-by: Brian Foster \u003cbfoster@redhat.com\u003e\nReviewed-by: Dave Chinner \u003cdchinner@redhat.com\u003e\nReviewed-by: Christoph Hellwig \u003chch@lst.de\u003e\nReviewed-by: Mark Tinguely \u003ctinguely@sgi.com\u003e\nSigned-off-by: Ben Myers \u003cbpm@sgi.com\u003e\n" }, { "commit": "cb77fcd88569cd2b7b25ecd4086ea932a53be9b3", "tree": "331330ac068ce4028e8d97bb47388ca67cf7430b", "parents": [ "e18fca734278784bd6591de63ca148cc27344ca9" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Fri Jun 15 12:19:48 2012 -0600" }, "committer": { "name": "Chris Mason", "email": "chris.mason@fusionio.com", "time": "Thu Jun 21 07:19:36 2012 -0400" }, "message": "Btrfs: delay iput with async extents\n\nThere is some concern that these iput()\u0027s could be the final iputs and could\ninduce lockups on people waiting on writeback. This would happen in the\nrare case that we don\u0027t create ordered extents because of an error, but it\nis theoretically possible and we already have a mechanism to deal with this\nso just make them delayed iputs to negate any worry.\n\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@fusionio.com\u003e\n" }, { "commit": "e18fca734278784bd6591de63ca148cc27344ca9", "tree": "89eb4cf79e6aa93dd7e949883c613de99207fb3b", "parents": [ "69bca40d41c613927b150c5392505f1894fe3010" ], "author": { "name": "Josef Bacik", "email": "josef@redhat.com", "time": "Mon Jun 18 07:23:18 2012 -0600" }, "committer": { "name": "Chris Mason", "email": "chris.mason@fusionio.com", "time": "Thu Jun 21 07:19:35 2012 -0400" }, "message": "Btrfs: add a missing spin_lock\n\nWhen fixing up the locking in the delayed ref destruction work I accidently\nbroke the locking myself ;(. Add back a spin_lock that should be there and\nwe are now all set. Thanks,\nBtrfs: add a missing spin_lock\n\nWhen fixing up the locking in the delayed ref destruction work I accidently\nbroke the locking myself ;(. Add back a spin_lock that should be there and\nwe are now all set. Thanks,\n\nReported-by: Dan Carpenter \u003cdan.carpenter@oracle.com\u003e\nSigned-off-by: Josef Bacik \u003cjosef@redhat.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@fusionio.com\u003e\n" }, { "commit": "69bca40d41c613927b150c5392505f1894fe3010", "tree": "924b5d5f914a254f4348fc6b20e0e1e2e131a53c", "parents": [ "1c8f52a5e9539600543347bcdefafa1854e07986" ], "author": { "name": "Alexander Block", "email": "ablock84@googlemail.com", "time": "Tue Jun 19 07:42:26 2012 -0600" }, "committer": { "name": "Chris Mason", "email": "chris.mason@fusionio.com", "time": "Thu Jun 21 07:19:34 2012 -0400" }, "message": "Btrfs: don\u0027t assume to be on the correct extent in add_all_parents\n\nadd_all_parents did assume that path is already at a correct extent data\nitem, which may not be true in case of data extents that were partly\nrewritten and splitted.\n\nWe need to check if we\u0027re on a matching extent for every item and only\nfor the ones after the first. The loop is changed to do this now.\n\nThis patch also fixes a bug introduced with commit 3b127fd8 \"Btrfs:\nremove obsolete btrfs_next_leaf call from __resolve_indirect_ref\".\nThe removal of next_leaf did sometimes result in slot\u003d\u003dnritems when\nthe above described case happens, and thus resulting in invalid values\n(e.g. wanted_obejctid) in add_all_parents (leading to missed backrefs\nor even crashes).\n\nSigned-off-by: Alexander Block \u003cablock84@googlemail.com\u003e\nSigned-off-by: Jan Schmidt \u003clist.btrfs@jan-o-sch.net\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@fusionio.com\u003e\n" }, { "commit": "1c8f52a5e9539600543347bcdefafa1854e07986", "tree": "52b3bd5283ea390ad8d8e7ce6837944dea109ef7", "parents": [ "a8c4a33b98b097e69cd1a10672c43d17ad0ffb25" ], "author": { "name": "Alexander Block", "email": "ablock84@googlemail.com", "time": "Tue Jun 19 07:42:25 2012 -0600" }, "committer": { "name": "Chris Mason", "email": "chris.mason@fusionio.com", "time": "Thu Jun 21 07:19:34 2012 -0400" }, "message": "Btrfs: introduce btrfs_next_old_item\n\nWe introduce btrfs_next_old_item that uses btrfs_next_old_leaf instead\nof btrfs_next_leaf.\n\nbtrfs_next_item is also changed to simply call btrfs_next_old_item with\ntime_seq being 0.\n\nSigned-off-by: Alexander Block \u003cablock84@googlemail.com\u003e\nSigned-off-by: Chris Mason \u003cchris.mason@fusionio.com\u003e\n" }, { "commit": "b196a4980ff7bb54db478e2a408dc8b12be15304", "tree": "22a47e6dd31e0c573df44fb4c75101d69af0bdea", "parents": [ "d3decf3a0c1d28c80c76be170373f4c7a7217f09" ], "author": { "name": "Daniel Vetter", "email": "daniel.vetter@ffwll.ch", "time": "Tue Jun 19 11:33:06 2012 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jun 21 09:34:13 2012 +0100" }, "message": "drm/edid: don\u0027t return stack garbage from supports_rb\n\nWe need to initialize this to false, because the is_rb callback only\never sets it to true.\n\nNoticed while reading through the code.\n\nCc: stable@vger.kernel.org\nSigned-Off-by: Daniel Vetter \u003cdaniel.vetter@ffwll.ch\u003e\nReviewed-by: Adam Jackson \u003cajax@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d3decf3a0c1d28c80c76be170373f4c7a7217f09", "tree": "e91e467d199da7e15ddaa11ebee8c4af3bc4f023", "parents": [ "b7019b2f31fe7bec9f6f5dc1bf54cb0e0d73e047" ], "author": { "name": "Ozan Çağlayan", "email": "ozancag@gmail.com", "time": "Thu Jun 14 15:02:35 2012 +0300" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jun 21 09:32:16 2012 +0100" }, "message": "vga_switcheroo: Add include guard\n\nGuard vga_switcheroo.h against multiple inclusion.\n\nSigned-off-by: Ozan Çağlayan \u003cozancag@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "7940b2adb474608318e51294d4e9fa0eee1bef61", "tree": "2fde5c3547a4e3f69bd9db74187deda6c75b57f8", "parents": [ "2ce5682947872061148b0e5ed2212e03d0d8bc8b", "fdec53d5203ee3d44be7c09d1524e3a6287d46a7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 22:12:52 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 22:12:52 2012 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma\n\nPull slave-dmaengine fixes from Vinod Koul:\n \"A few fixes in pl330 and imx-sdma drivers.\"\n\n* \u0027fixes\u0027 of git://git.infradead.org/users/vkoul/slave-dma:\n DMA: PL330: Fix racy mutex unlock\n DMA: PL330: Add missing static storage class specifier\n dma: imx-sdma: buf_tail should be initialize in prepare function\n dmaengine: pl330: dont complete descriptor for cyclic dma\n" }, { "commit": "2ce5682947872061148b0e5ed2212e03d0d8bc8b", "tree": "0038a1806eac265460c13c4b1f0cfa91822978e2", "parents": [ "c4c0e9e544a0eb640798cc66e68f394fa4a561bf", "8e3bbf42c6d73881956863cc3305456afe2bc4ea" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 22:11:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 22:11:04 2012 -0700" }, "message": "Merge branch \u0027for-3.5-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup\n\nPull two cgroup fixes from Tejun Heo:\n \"This containes two patches fixing a refcnt race bug during css_put().\n Decrementing and checking the value weren\u0027t atomic and two tasks could\n think that they both pushed the counter to zero.\"\n\n* \u0027for-3.5-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:\n cgroups: Account for CSS_DEACT_BIAS in __css_put\n cgroup: make sure that decisions in __css_put are atomic\n" }, { "commit": "c4c0e9e544a0eb640798cc66e68f394fa4a561bf", "tree": "e317cd16d6ad065ba12f3b6618ffeb9685bd2872", "parents": [ "0e3534c0417fef6e6535db8867a04798f2024e3f" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Wed Jun 20 18:00:12 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 22:10:42 2012 -0700" }, "message": "mm, mempolicy: fix mbind() to do synchronous migration\n\nIf the range passed to mbind() is not allocated on nodes set in the\nnodemask, it migrates the pages to respect the constraint.\n\nThe final formal of migrate_pages() is a mode of type enum migrate_mode,\nnot a boolean. do_mbind() is currently passing \"true\" which is the\nequivalent of MIGRATE_SYNC_LIGHT. This should instead be MIGRATE_SYNC\nfor synchronous page migration.\n\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0e3534c0417fef6e6535db8867a04798f2024e3f", "tree": "a78b82ec42f40a79a2c27dcc7c94776f13762826", "parents": [ "bc259adc9b76f625fff0423df3ffb80a03802927" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Wed Jun 20 18:30:30 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 22:10:08 2012 -0700" }, "message": "media: pms.c needs linux/slab.h\n\ndrivers/media/video/pms.c uses kzalloc() and kfree() so it should\ninclude \u003clinux/slab.h\u003e to fix build errors and a warning.\n\n drivers/media/video/pms.c:1047:2: error: implicit declaration of function \u0027kzalloc\u0027\n drivers/media/video/pms.c:1047:6: warning: assignment makes pointer from integer without a cast\n drivers/media/video/pms.c:1116:2: error: implicit declaration of function \u0027kfree\u0027\n\nFound in mmotm but applies to mainline.\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nCc: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bc259adc9b76f625fff0423df3ffb80a03802927", "tree": "68082b9f84a90eaaa8ed5b3ac3177eac32f9fe39", "parents": [ "fe80352460971de12519bf46ed5ec4235350bcd7", "3026b0e942c65c65c8fc80d391d004228b52b916" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 15:15:03 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 15:15:03 2012 -0700" }, "message": "Merge tag \u0027staging-3.5-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 a number of small fixes for the drivers/staging tree, as well\n as iio and pstore drivers (which came from the staging tree in the\n 3.5-rc1 merge). All of these are tiny, but resolve issues that people\n have been reporting.\n\n There\u0027s also a documentation update to reflect what the iio drivers\n really are doing, which is good to get straightened out.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027staging-3.5-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:\n staging: r8712u: Add new USB IDs\n staging: gdm72xx: Release netlink socket properly\n iio: drop wrong reference from Kconfig\n pstore/inode: Make pstore_fill_super() static\n pstore/ram: Should zap persistent zone on unlink\n pstore/ram_core: Factor persistent_ram_zap() out of post_init()\n pstore/ram_core: Do not reset restored zone\u0027s position and size\n pstore/ram: Should update old dmesg buffer before reading\n staging:iio:ad7298: Fix linker error due to missing IIO kfifo buffer\n Revert \"staging: usbip: bugfix for stack corruption on 64-bit architectures\"\n staging: usbip: bugfix for stack corruption on 64-bit architectures\n staging/comedi: fix build for USB not enabled\n staging: omapdrm: fix crash when freeing bad fb\n staging:iio:ad7606: Re-add missing scale attribute\n iio: Fix potential use after free\n staging:iio: remove num_interrupt_lines from documentation\n iio: documentation: Add out_altvoltage and friends\n" }, { "commit": "fe80352460971de12519bf46ed5ec4235350bcd7", "tree": "5ecaa3409b76cb0829f905e5c1ceadf20a29829c", "parents": [ "f8fc0c9a5f7f4f5a3d2e7dd58147e30053cc5dd8", "96c9f05b39a5a3239cf0588cc86a1b95cac652c4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 15:14:28 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 15:14:28 2012 -0700" }, "message": "Merge tag \u0027driver-core-3.5-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core\n\nPull driver core and printk fixes from Greg Kroah-Hartman:\n \"Here are some fixes for 3.5-rc4 that resolve the kmsg problems that\n people have reported showing up after the printk and kmsg changes went\n into 3.5-rc1. There are also a smattering of other tiny fixes for the\n extcon and hyper-v drivers that people have reported.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027driver-core-3.5-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:\n extcon: max8997: Add missing kfree for info-\u003eedev in max8997_muic_remove()\n extcon: Set platform drvdata in gpio_extcon_probe() and fix irq leak\n extcon: Fix wrong index in max8997_extcon_cable[]\n kmsg - kmsg_dump() fix CONFIG_PRINTK\u003dn compilation\n printk: return -EINVAL if the message len is bigger than the buf size\n printk: use mutex lock to stop syslog_seq from going wild\n kmsg - kmsg_dump() use iterator to receive log buffer content\n vme: change maintainer e-mail address\n Extcon: Don\u0027t try to create duplicate link names\n driver core: fixup reversed deferred probe order\n printk: Fix alignment of buf causing crash on ARM EABI\n Tools: hv: verify origin of netlink connector message\n" }, { "commit": "f8fc0c9a5f7f4f5a3d2e7dd58147e30053cc5dd8", "tree": "92244b2aabeefcbf791205ff6bfe213c9b5c9d5f", "parents": [ "a1821f774d4600727edf71005f259a9fdb73981e", "49fbd3f1c3a67b99c053600a1cd7e5d0be48bed6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 15:13:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 15:13:56 2012 -0700" }, "message": "Merge tag \u0027char-misc-3.5-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc\n\nPull misc tree updates from Greg Kroah-Hartman:\n \"Here are some drivers/misc bugfixes (really just drivers/misc/mei/\n fixes) for a few problems that have been reported.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027char-misc-3.5-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:\n misc: mei: set WDIOF_ALARMONLY on mei watchdog\n misc: mei: Disable MSI when IRQ registration fails\n misc: mei: fix stalled read\n misc: mei: unregister misc device in pci_remove function\n misc: mei: set IRQF_ONESHOT for msi request_threaded_irq\n" }, { "commit": "a1821f774d4600727edf71005f259a9fdb73981e", "tree": "cc2d33e9217d6105cf9a9f2cbd2703b1e109132d", "parents": [ "a2a2609c97c1e21996b9d87d10d2c9ff07277524", "78d80c5a720ea370defa3e3124c0f7f7179bdfe5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 15:13:13 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 15:13:13 2012 -0700" }, "message": "Merge tag \u0027tty-3.5-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty\n\nPull serial driver fixes from Greg Kroah-Hartman:\n \"Here are 3 patches resolving a boot regression (the mop500 fix), a\n build warning fix, and a kernel-doc fix. All tiny, but should go into\n the final 3.5 release.\n\n Signed-off-by: Greg Kroah-Hartman \u003cgregkh@linuxfoundation.org\u003e\"\n\n* tag \u0027tty-3.5-rc4\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:\n serial/amba-pl011: move custom pin control to driver\n serial: fix serial_txx9.c build warning/typo\n serial: fix kernel-doc warnings in 8250.c\n" }, { "commit": "a2a2609c97c1e21996b9d87d10d2c9ff07277524", "tree": "c9db50783d6727f95d2a6b4c019c2d66952969d9", "parents": [ "a4d7a122385e27bdd91101635c704327d7c0d87f", "48c3b583bbddad2220ca4c22319ca5d1f78b2090" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:41:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:41:57 2012 -0700" }, "message": "Merge branch \u0027akpm\u0027 (Andrew\u0027s patch-bomb)\n\n* emailed from Andrew Morton \u003cakpm@linux-foundation.org\u003e: (21 patches)\n mm/memblock: fix overlapping allocation when doubling reserved array\n c/r: prctl: Move PR_GET_TID_ADDRESS to a proper place\n pidns: find_new_reaper() can no longer switch to init_pid_ns.child_reaper\n pidns: guarantee that the pidns init will be the last pidns process reaped\n fault-inject: avoid call to random32() if fault injection is disabled\n Viresh has moved\n get_maintainer: Fix --help warning\n mm/memory.c: fix kernel-doc warnings\n mm: fix kernel-doc warnings\n mm: correctly synchronize rss-counters at exit/exec\n mm, thp: print useful information when mmap_sem is unlocked in zap_pmd_range\n h8300: use the declarations provided by \u003casm/sections.h\u003e\n h8300: fix use of extinct _sbss and _ebss\n xtensa: use the declarations provided by \u003casm/sections.h\u003e\n xtensa: use \"test -e\" instead of bashism \"test -a\"\n xtensa: replace xtensa-specific _f{data,text} by _s{data,text}\n memcg: fix use_hierarchy css_is_ancestor oops regression\n mm, oom: fix and cleanup oom score calculations\n nilfs2: ensure proper cache clearing for gc-inodes\n thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE\n ...\n" }, { "commit": "48c3b583bbddad2220ca4c22319ca5d1f78b2090", "tree": "6b9b4c3dfa6dcd4360a629c081958bd137284fad", "parents": [ "5702c5eeab959e86ee2d9b4fe7f2d87e65b25d46" ], "author": { "name": "Greg Pearson", "email": "greg.pearson@hp.com", "time": "Wed Jun 20 12:53:05 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:36 2012 -0700" }, "message": "mm/memblock: fix overlapping allocation when doubling reserved array\n\n__alloc_memory_core_early() asks memblock for a range of memory then try\nto reserve it. If the reserved region array lacks space for the new\nrange, memblock_double_array() is called to allocate more space for the\narray. If memblock is used to allocate memory for the new array it can\nend up using a range that overlaps with the range originally allocated in\n__alloc_memory_core_early(), leading to possible data corruption.\n\nWith this patch memblock_double_array() now calls memblock_find_in_range()\nwith a narrowed candidate range (in cases where the reserved.regions array\nis being doubled) so any memory allocated will not overlap with the\noriginal range that was being reserved. The range is narrowed by passing\nin the starting address and size of the previously allocated range. Then\nthe range above the ending address is searched and if a candidate is not\nfound, the range below the starting address is searched.\n\nSigned-off-by: Greg Pearson \u003cgreg.pearson@hp.com\u003e\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nAcked-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5702c5eeab959e86ee2d9b4fe7f2d87e65b25d46", "tree": "43e67dfe6d036691e9594453dfda1288e1b298c2", "parents": [ "50d75f8daead8a1f850c40a3b6c6575ab19b48cf" ], "author": { "name": "Cyrill Gorcunov", "email": "gorcunov@openvz.org", "time": "Wed Jun 20 12:53:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:36 2012 -0700" }, "message": "c/r: prctl: Move PR_GET_TID_ADDRESS to a proper place\n\nDuring merging of PR_GET_TID_ADDRESS patch the code has been misplaced (it\nhappened to appear under PR_MCE_KILL) in result noone can use this option.\n\nFix it by moving code snippet to a proper place.\n\nSigned-off-by: Cyrill Gorcunov \u003cgorcunov@openvz.org\u003e\nAcked-by: Kees Cook \u003ckeescook@chromium.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nCc: Andrey Vagin \u003cavagin@openvz.org\u003e\nCc: Serge Hallyn \u003cserge.hallyn@canonical.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "50d75f8daead8a1f850c40a3b6c6575ab19b48cf", "tree": "1917eec9deadded31869372207772d9a3d3ca11a", "parents": [ "6347e90091041e34bea625370794c92f4ce71228" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 20 12:53:04 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:36 2012 -0700" }, "message": "pidns: find_new_reaper() can no longer switch to init_pid_ns.child_reaper\n\nfind_new_reaper() changes pid_ns-\u003echild_reaper, see add0d4df (\"pid_ns:\nzap_pid_ns_processes: fix the -\u003echild_reaper changing\").\n\nThe original reason has gone away after the previous patch, -\u003echildren\nlist must be empty after zap_pid_ns_processes().\n\nHowever now we can not switch to init_pid_ns.child_reaper.\n__unhash_process() relies on the \"-\u003echild_reaper \u003d\u003d parent\" check, but\nthis check does not work if the last exiting task is also the child\nreaper.\n\nAs Eric sugested, we can change __unhash_process() to use the parent\u0027s\npid_ns and remove this code.\n\nAlso, with this change we can move detach_pid(PIDTYPE_PID) back, where it\nwas before the previous fix.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Louis Rilling \u003clouis.rilling@kerlabs.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nTested-by: Andrew Wagin \u003cavagin@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6347e90091041e34bea625370794c92f4ce71228", "tree": "20614d4eedd2993248be3c3562177c7e00f24b68", "parents": [ "f39cdaebb89dc3e6dd4f3e75b6d4e87ef12190af" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Jun 20 12:53:03 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:36 2012 -0700" }, "message": "pidns: guarantee that the pidns init will be the last pidns process reaped\n\nToday we have a twofold bug. Sometimes release_task on pid \u003d\u003d 1 in a pid\nnamespace can run before other processes in a pid namespace have had\nrelease task called. With the result that pid_ns_release_proc can be\ncalled before the last proc_flus_task() is done using upid-\u003ens-\u003eproc_mnt,\nresulting in the use of a stale pointer. This same set of circumstances\ncan lead to waitpid(...) returning for a processes started with\nclone(CLONE_NEWPID) before the every process in the pid namespace has\nactually exited.\n\nTo fix this modify zap_pid_ns_processess wait until all other processes in\nthe pid namespace have exited, even EXIT_DEAD zombies.\n\nThe delay_group_leader and related tests ensure that the thread gruop\nleader will be the last thread of a process group to be reaped, or to\nbecome EXIT_DEAD and self reap. With the change to zap_pid_ns_processes\nwe get the guarantee that pid \u003d\u003d 1 in a pid namespace will be the last\ntask that release_task is called on.\n\nWith pid \u003d\u003d 1 being the last task to pass through release_task\npid_ns_release_proc can no longer be called too early nor can wait return\nbefore all of the EXIT_DEAD tasks in a pid namespace have exited.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Louis Rilling \u003clouis.rilling@kerlabs.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nAcked-by: Pavel Emelyanov \u003cxemul@parallels.com\u003e\nTested-by: Andrew Wagin \u003cavagin@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f39cdaebb89dc3e6dd4f3e75b6d4e87ef12190af", "tree": "3e6db2d5c97c822591350be26a09097589ef5b8c", "parents": [ "10d8935f46e5028847b179757ecbf9238b13d129" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Wed Jun 20 12:53:03 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:36 2012 -0700" }, "message": "fault-inject: avoid call to random32() if fault injection is disabled\n\nAfter enabling CONFIG_FAILSLAB I noticed random32 in profiles even if slub\nfault injection wasn\u0027t enabled at runtime.\n\nshould_fail forces a comparison against random32() even if probability is\n0:\n\n if (attr-\u003eprobability \u003c\u003d random32() % 100)\n return false;\n\nAdd a check up front for probability \u003d\u003d 0 and avoid all of the more\ncomplicated checks.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nAcked-by: Akinobu Mita \u003cakinobu.mita@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "10d8935f46e5028847b179757ecbf9238b13d129", "tree": "b98eaf16d74d9d985ae75bc78cf4c4e108df98af", "parents": [ "7dea26813507bfa3d261a81f70494336c3b28293" ], "author": { "name": "Viresh Kumar", "email": "viresh.linux@gmail.com", "time": "Wed Jun 20 12:53:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:36 2012 -0700" }, "message": "Viresh has moved\n\nviresh.kumar@st.com email-id doesn\u0027t exist anymore as I have left the\ncompany. Replace ST\u0027s id with viresh.linux@gmail.com.\n\nIt also updates .mailmap file to fix address for \u0027git shortlog\u0027\n\nSigned-off-by: Viresh Kumar \u003cviresh.linux@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7dea26813507bfa3d261a81f70494336c3b28293", "tree": "693eeed7a86af412c4a4cfd8a39072730009af15", "parents": [ "eb4546bbbdb160aff084d50511165f385756af18" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Wed Jun 20 12:53:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:36 2012 -0700" }, "message": "get_maintainer: Fix --help warning\n\nUsing --help emits a concatenation error. Fix it.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nReported-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nTested-by: Paul Bolle \u003cpebolle@tiscali.nl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "eb4546bbbdb160aff084d50511165f385756af18", "tree": "c9c0b1f367ae4f2deea43f06081356613b2b6e3e", "parents": [ "dad7557eb705688040aac134efa5418b66d5ed92" ], "author": { "name": "Randy Dunlap", "email": "rdunlap@xenotime.net", "time": "Wed Jun 20 12:53:02 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:36 2012 -0700" }, "message": "mm/memory.c: fix kernel-doc warnings\n\nFix kernel-doc warnings in mm/memory.c:\n\n Warning(mm/memory.c:1377): No description found for parameter \u0027start\u0027\n Warning(mm/memory.c:1377): Excess function parameter \u0027address\u0027 description in \u0027zap_page_range\u0027\n\nSigned-off-by: Randy Dunlap \u003crdunlap@xenotime.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dad7557eb705688040aac134efa5418b66d5ed92", "tree": "acc3084ba2041578b1095b2edd784ebabb9e38c5", "parents": [ "4fe7efdbdfb1c7e7a7f31decfd831c0f31d37091" ], "author": { "name": "Wanpeng Li", "email": "liwp@linux.vnet.ibm.com", "time": "Wed Jun 20 12:53:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:36 2012 -0700" }, "message": "mm: fix kernel-doc warnings\n\nFix kernel-doc warnings such as\n\n Warning(../mm/page_cgroup.c:432): No description found for parameter \u0027id\u0027\n Warning(../mm/page_cgroup.c:432): Excess function parameter \u0027mem\u0027 description in \u0027swap_cgroup_record\u0027\n\nSigned-off-by: Wanpeng Li \u003cliwp@linux.vnet.ibm.com\u003e\nCc: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4fe7efdbdfb1c7e7a7f31decfd831c0f31d37091", "tree": "5d8fdf353ba3791ef10031ade2d93aa87aa179d3", "parents": [ "e0897d75f0b22e8c3a7287a48548c5686ef73447" ], "author": { "name": "Konstantin Khlebnikov", "email": "khlebnikov@openvz.org", "time": "Wed Jun 20 12:53:01 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:36 2012 -0700" }, "message": "mm: correctly synchronize rss-counters at exit/exec\n\ndo_exit() and exec_mmap() call sync_mm_rss() before mm_release() does\nput_user(clear_child_tid) which can update task-\u003erss_stat and thus make\nmm-\u003erss_stat inconsistent. This triggers the \"BUG:\" printk in check_mm().\n\nLet\u0027s fix this bug in the safest way, and optimize/cleanup this later.\n\nReported-by: Markus Trippelsdorf \u003cmarkus@trippelsdorf.de\u003e\nSigned-off-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: \u003cstable@vger.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": "e0897d75f0b22e8c3a7287a48548c5686ef73447", "tree": "7c6e96b8f9e95ba81e322833363398df119102e0", "parents": [ "436814e61f5c526ed123853a9bf63fb2ff4ff94b" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Wed Jun 20 12:53:00 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:35 2012 -0700" }, "message": "mm, thp: print useful information when mmap_sem is unlocked in zap_pmd_range\n\nAndrea asked for addr, end, vma-\u003evm_start, and vma-\u003evm_end to be emitted\nwhen !rwsem_is_locked(\u0026tlb-\u003emm-\u003emmap_sem). Otherwise, debugging the\nunderlying issue is more difficult.\n\nSuggested-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "436814e61f5c526ed123853a9bf63fb2ff4ff94b", "tree": "57cbd11018f10bf7ad03ed9208f1e7bacf8cc85c", "parents": [ "ffb20313c01addc04212577af5f9b1399156a5bd" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Jun 20 12:53:00 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:35 2012 -0700" }, "message": "h8300: use the declarations provided by \u003casm/sections.h\u003e\n\nCleanups:\n - Include \u003casm/sections.h\u003e,\n - Remove the (different) extern declarations,\n - Remove the no longer needed address-of (\u0027\u0026\u0027) operators,\n - Remove the superfluous casts, use proper printk formatting instead.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Yoshinori Sato \u003cysato@users.sourceforge.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ffb20313c01addc04212577af5f9b1399156a5bd", "tree": "059ecf08116cb5e0d9e29e18f6d602ebf5310c64", "parents": [ "f022d0fa183c4def30ddd74f2baebd72c4254fcf" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Jun 20 12:53:00 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:35 2012 -0700" }, "message": "h8300: fix use of extinct _sbss and _ebss\n\nNowadays it should use __bss_start and __bss_stop\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Yoshinori Sato \u003cysato@users.sourceforge.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f022d0fa183c4def30ddd74f2baebd72c4254fcf", "tree": "24060a06c3d9b5279243d4d03f6a057da50529c8", "parents": [ "0eff08b5d1bf4b30f1a549a58c85806748256b18" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Jun 20 12:52:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:35 2012 -0700" }, "message": "xtensa: use the declarations provided by \u003casm/sections.h\u003e\n\nCleanups:\n - Include \u003casm/sections.h\u003e,\n - Remove the (different) extern declarations,\n - Remove the no longer needed address-of (\u0027\u0026\u0027) operators,\n - Use %p to format pointer differences.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0eff08b5d1bf4b30f1a549a58c85806748256b18", "tree": "f246ba6d7b2c23b2c5eb141f2a544feaee0add55", "parents": [ "5e7b6ed8e9bf3c8e3bb579fd0aec64f6526f8c81" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Jun 20 12:52:59 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:35 2012 -0700" }, "message": "xtensa: use \"test -e\" instead of bashism \"test -a\"\n\nOn Ubuntu, /bin/sh is a symlink to dash, which does not support \"test -a\".\nThis causes messages like\n\n test: 1: -a: unexpected operator\n test: 1: -a: unexpected operator\n\nand link failures like\n\n (.init.text+0x132): undefined reference to `platform_init\u0027\n\ndue to the appropriate platform code not being compiled.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5e7b6ed8e9bf3c8e3bb579fd0aec64f6526f8c81", "tree": "689926de5ab257b5cd55915e2e3d1128f8537709", "parents": [ "3a981f482cc29f7d0aeab509e51ea15519a6e961" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Jun 20 12:52:58 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:35 2012 -0700" }, "message": "xtensa: replace xtensa-specific _f{data,text} by _s{data,text}\n\ncommit a2d063ac216c161 (\"extable, core_kernel_data(): Make sure all archs\ndefine _sdata\") missed xtensa. Xtensa does have a start of data marker,\nbut calls it _fdata, causing\n\n kernel/built-in.o:(.text+0x964): undefined reference to `_sdata\u0027\n\n_stext was already defined, but it was duplicated by _fdata.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3a981f482cc29f7d0aeab509e51ea15519a6e961", "tree": "eb7f1f553ffbb99776fdd55216e679d4915f3b18", "parents": [ "61eafb00d55dfbccdfce543c6b60e369ff4f8f18" ], "author": { "name": "Hugh Dickins", "email": "hughd@google.com", "time": "Wed Jun 20 12:52:58 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:35 2012 -0700" }, "message": "memcg: fix use_hierarchy css_is_ancestor oops regression\n\nIf use_hierarchy is set, reclaim testing soon oopses in css_is_ancestor()\ncalled from __mem_cgroup_same_or_subtree() called from page_referenced():\nwhen processes are exiting, it\u0027s easy for mm_match_cgroup() to pass along\na NULL memcg coming from a NULL mm-\u003eowner.\n\nCheck for that in __mem_cgroup_same_or_subtree(). Return true or false?\nFalse because we cannot know if it was in the hierarchy, but also false\nbecause it\u0027s better not to count a reference from an exiting process.\n\nSigned-off-by: Hugh Dickins \u003chughd@google.com\u003e\nAcked-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nAcked-by: Konstantin Khlebnikov \u003ckhlebnikov@openvz.org\u003e\nAcked-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nAcked-by: 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": "61eafb00d55dfbccdfce543c6b60e369ff4f8f18", "tree": "e2be309a7412de35dd8414ea030b6650d2ea8b75", "parents": [ "fbb24a3a915f105016f1c828476be11aceac8504" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Wed Jun 20 12:52:58 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:35 2012 -0700" }, "message": "mm, oom: fix and cleanup oom score calculations\n\nThe divide in p-\u003esignal-\u003eoom_score_adj * totalpages / 1000 within\noom_badness() was causing an overflow of the signed long data type.\n\nThis adds both the root bias and p-\u003esignal-\u003eoom_score_adj before doing the\nnormalization which fixes the issue and also cleans up the calculation.\n\nTested-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fbb24a3a915f105016f1c828476be11aceac8504", "tree": "c3c9b8361e4a12a0ae80ce88a016cca71abf5ba1", "parents": [ "e4eed03fd06578571c01d4f1478c874bb432c815" ], "author": { "name": "Ryusuke Konishi", "email": "konishi.ryusuke@lab.ntt.co.jp", "time": "Wed Jun 20 12:52:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:35 2012 -0700" }, "message": "nilfs2: ensure proper cache clearing for gc-inodes\n\nA gc-inode is a pseudo inode used to buffer the blocks to be moved by\ngarbage collection.\n\nBlock caches of gc-inodes must be cleared every time a garbage collection\nfunction (nilfs_clean_segments) completes. Otherwise, stale blocks\nbuffered in the caches may be wrongly reused in successive calls of the GC\nfunction.\n\nFor user files, this is not a problem because their gc-inodes are\ndistinguished by a checkpoint number as well as an inode number. They\nnever buffer different blocks if either an inode number, a checkpoint\nnumber, or a block offset differs.\n\nHowever, gc-inodes of sufile, cpfile and DAT file can store different data\nfor the same block offset. Thus, the nilfs_clean_segments function can\nmove incorrect block for these meta-data files if an old block is cached.\nI found this is really causing meta-data corruption in nilfs.\n\nThis fixes the issue by ensuring cache clear of gc-inodes and resolves\nreported GC problems including checkpoint file corruption, b-tree\ncorruption, and the following warning during GC.\n\n nilfs_palloc_freev: entry number 307234 already freed.\n ...\n\nSigned-off-by: Ryusuke Konishi \u003ckonishi.ryusuke@lab.ntt.co.jp\u003e\nTested-by: Ryusuke Konishi \u003ckonishi.ryusuke@lab.ntt.co.jp\u003e\nCc: \u003cstable@vger.kernel.org\u003e\t[2.6.37+]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e4eed03fd06578571c01d4f1478c874bb432c815", "tree": "9cfd16247d8208a1fe55ad81b0d4d85c17b80415", "parents": [ "abca7c4965845924f65d40e0aa1092bdd895e314" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Wed Jun 20 12:52:57 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:35 2012 -0700" }, "message": "thp: avoid atomic64_read in pmd_read_atomic for 32bit PAE\n\nIn the x86 32bit PAE CONFIG_TRANSPARENT_HUGEPAGE\u003dy case while holding the\nmmap_sem for reading, cmpxchg8b cannot be used to read pmd contents under\nXen.\n\nSo instead of dealing only with \"consistent\" pmdvals in\npmd_none_or_trans_huge_or_clear_bad() (which would be conceptually\nsimpler) we let pmd_none_or_trans_huge_or_clear_bad() deal with pmdvals\nwhere the low 32bit and high 32bit could be inconsistent (to avoid having\nto use cmpxchg8b).\n\nThe only guarantee we get from pmd_read_atomic is that if the low part of\nthe pmd was found null, the high part will be null too (so the pmd will be\nconsidered unstable). And if the low part of the pmd is found \"stable\"\nlater, then it means the whole pmd was read atomically (because after a\npmd is stable, neither MADV_DONTNEED nor page faults can alter it anymore,\nand we read the high part after the low part).\n\nIn the 32bit PAE x86 case, it is enough to read the low part of the pmdval\natomically to declare the pmd as \"stable\" and that\u0027s true for THP and no\nTHP, furthermore in the THP case we also have a barrier() that will\nprevent any inconsistent pmdvals to be cached by a later re-read of the\n*pmd.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Jonathan Nieder \u003cjrnieder@gmail.com\u003e\nCc: Ulrich Obergfell \u003cuobergfe@redhat.com\u003e\nCc: Mel Gorman \u003cmgorman@suse.de\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Larry Woodman \u003clwoodman@redhat.com\u003e\nCc: Petr Matousek \u003cpmatouse@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Jan Beulich \u003cjbeulich@suse.com\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@gmail.com\u003e\nTested-by: Andrew Jones \u003cdrjones@redhat.com\u003e\nCc: \u003cstable@vger.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": "abca7c4965845924f65d40e0aa1092bdd895e314", "tree": "18d908b58243b6f46cadfa4515d6370299c88d3f", "parents": [ "485802a6c524e62b5924849dd727ddbb1497cc71" ], "author": { "name": "Pravin B Shelar", "email": "pshelar@nicira.com", "time": "Wed Jun 20 12:52:56 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 14:39:35 2012 -0700" }, "message": "mm: fix slab-\u003epage _count corruption when using slub\n\nOn arches that do not support this_cpu_cmpxchg_double() slab_lock is used\nto do atomic cmpxchg() on double word which contains page-\u003e_count. The\npage count can be changed from get_page() or put_page() without taking\nslab_lock. That corrupts page counter.\n\nFix it by moving page-\u003e_count out of cmpxchg_double data. So that slub\ndoes no change it while updating slub meta-data in struct page.\n\n[akpm@linux-foundation.org: use standard comment layout, tweak comment text]\nReported-by: Amey Bhide \u003cabhide@nicira.com\u003e\nSigned-off-by: Pravin B Shelar \u003cpshelar@nicira.com\u003e\nAcked-by: Christoph Lameter \u003ccl@linux.com\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: \u003cstable@vger.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": "3b876c8f2a361ceeed3fed894980c69066f903a0", "tree": "13d2eff1e5eb382e97746bbff615d5601efa58e9", "parents": [ "66f9311381b4772003d595fb6c518f1647450db0" ], "author": { "name": "Jeff Liu", "email": "jeff.liu@oracle.com", "time": "Thu Jun 07 15:44:32 2012 +0800" }, "committer": { "name": "Ben Myers", "email": "bpm@sgi.com", "time": "Wed Jun 20 14:58:24 2012 -0500" }, "message": "xfs: fix debug_object WARN at xfs_alloc_vextent()\n\nFengguang reports:\n\n[ 780.529603] XFS (vdd): Ending clean mount\n[ 781.454590] ODEBUG: object is on stack, but not annotated\n[ 781.455433] ------------[ cut here ]------------\n[ 781.455433] WARNING: at /c/kernel-tests/sound/lib/debugobjects.c:301 __debug_object_init+0x173/0x1f1()\n[ 781.455433] Hardware name: Bochs\n[ 781.455433] Modules linked in:\n[ 781.455433] Pid: 26910, comm: kworker/0:2 Not tainted 3.4.0+ #51\n[ 781.455433] Call Trace:\n[ 781.455433] [\u003cffffffff8106bc84\u003e] warn_slowpath_common+0x83/0x9b\n[ 781.455433] [\u003cffffffff8106bcb6\u003e] warn_slowpath_null+0x1a/0x1c\n[ 781.455433] [\u003cffffffff814919a5\u003e] __debug_object_init+0x173/0x1f1\n[ 781.455433] [\u003cffffffff81491c65\u003e] debug_object_init+0x14/0x16\n[ 781.455433] [\u003cffffffff8108842a\u003e] __init_work+0x20/0x22\n[ 781.455433] [\u003cffffffff8134ea56\u003e] xfs_alloc_vextent+0x6c/0xd5\n\nUse INIT_WORK_ONSTACK in xfs_alloc_vextent instead of INIT_WORK.\n\nReported-by: Wu Fengguang \u003cwfg@linux.intel.com\u003e\nSigned-off-by: Jie Liu \u003cjeff.liu@oracle.com\u003e\nSigned-off-by: Ben Myers \u003cbpm@sgi.com\u003e\n" }, { "commit": "66f9311381b4772003d595fb6c518f1647450db0", "tree": "bf7dfdb15f52965f50390de814c7366fb423811a", "parents": [ "f8f5701bdaf9134b1f90e5044a82c66324d2073f" ], "author": { "name": "Alain Renaud", "email": "arenaud@sgi.com", "time": "Fri Jun 08 15:34:46 2012 -0400" }, "committer": { "name": "Ben Myers", "email": "bpm@sgi.com", "time": "Wed Jun 20 14:57:28 2012 -0500" }, "message": "xfs: xfs_vm_writepage clear iomap_valid when !buffer_uptodate (REV2)\n\nOn filesytems with a block size smaller than PAGE_SIZE we currently have\na problem with unwritten extents. If a we have multi-block page for\nwhich an unwritten extent has been allocated, and only some of the\nbuffers have been written to, and they are not contiguous, we can expose\nstale data from disk in the blocks between the writes after extent\nconversion.\n\nExample of a page with unwritten and real data.\nbuffer content\n0 empty b_state \u003d 0\n1 DATA b_state \u003d 0x1023 Uptodate,Dirty,Mapped,Unwritten\n2 DATA b_state \u003d 0x1023 Uptodate,Dirty,Mapped,Unwritten\n3 empty b_state \u003d 0\n4 empty b_state \u003d 0\n5 DATA b_state \u003d 0x1023 Uptodate,Dirty,Mapped,Unwritten\n6 DATA b_state \u003d 0x1023 Uptodate,Dirty,Mapped,Unwritten\n7 empty b_state \u003d 0\n\nBuffers 1, 2, 5, and 6 have been written to, leaving 0, 3, 4, and 7\nempty. Currently buffers 1, 2, 5, and 6 are added to a single ioend,\nand when IO has completed, extent conversion creates a real extent from\nblock 1 through block 6, leaving 0 and 7 unwritten. However buffers 3\nand 4 were not written to disk, so stale data is exposed from those\nblocks on a subsequent read.\n\nFix this by setting iomap_valid \u003d 0 when we find a buffer that is not\nUptodate. This ensures that buffers 5 and 6 are not added to the same\nioend as buffers 1 and 2. Later these blocks will be converted into two\nseparate real extents, leaving the blocks in between unwritten.\n\nSigned-off-by: Alain Renaud \u003carenaud@sgi.com\u003e\nReviewed-by: Dave Chinner \u003cdchinner@redhat.com\u003e\nSigned-off-by: Ben Myers \u003cbpm@sgi.com\u003e\n" }, { "commit": "b7019b2f31fe7bec9f6f5dc1bf54cb0e0d73e047", "tree": "115a8cae761780b47d059c6ec1e7e9832ba3cefd", "parents": [ "fb09185a88cad9c59e22e84f8c0594303595e9af" ], "author": { "name": "Alex Deucher", "email": "alexander.deucher@amd.com", "time": "Thu Jun 14 15:58:25 2012 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Wed Jun 20 19:55:56 2012 +0100" }, "message": "drm/radeon: SI tiling fixes for display\n\n- Use the correct union for getting the tiling info\n- Properly init the PIPE_CONFIG field for SI\n\nSigned-off-by: Alex Deucher \u003calexander.deucher@amd.com\u003e\nReviewed-by: Michel Dänzer \u003cmichel.daenzer@amd.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "b1027439dff844675f6c0df97a1b1d190791a699", "tree": "fe844c6abe6590194a9e7223325254b25f063459", "parents": [ "1a0de48ae56b5cdb9a46b3d3a0b578dd7f787f22" ], "author": { "name": "Bryan Schumaker", "email": "bjschuma@netapp.com", "time": "Wed Jun 20 14:35:28 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Wed Jun 20 14:38:11 2012 -0400" }, "message": "NFS: Force the legacy idmapper to be single threaded\n\nIt was initially coded under the assumption that there would only be one\nrequest at a time, so use a lock to enforce this requirement..\n\nSigned-off-by: Bryan Schumaker \u003cbjschuma@netapp.com\u003e\nCC: stable@vger.kernel.org [3.4+]\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\n" }, { "commit": "a4d7a122385e27bdd91101635c704327d7c0d87f", "tree": "c7d2d601a0ff53194b4235e8f35e09234f98937b", "parents": [ "61fcbc8dfe40d6fb5e59ab31dfcef67d6019f1a5", "10aa5a35e34fb00a2dd814447199f08756eb307b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 09:42:09 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 09:42:09 2012 -0700" }, "message": "Merge branch \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm\n\nPull ARM fixes from Russell King:\n \"This includes three MMCI changes - one to fix up the wrong version of\n the DT support patch which was merged, and two to make deferred\n probing work. It also includes a fix to the OMAP SPI driver which is\n causing a boot time warning.\n\n The remainder are very minor ARM fixes.\"\n\n* \u0027fixes\u0027 of git://git.linaro.org/people/rmk/linux-arm:\n SPI: fix over-eager devm_xxx() conversion\n ARM: 7427/1: mmc: mmci: Defer probe() in case of yet uninitialized GPIOs\n ARM: 7426/1: mmc: mmci: Remove wrong error handling of gpio 0\n ARM: 7425/1: extable: ensure fixup entries are 4-byte aligned\n ARM: 7421/1: bpf_jit: BPF_S_ANC_ALU_XOR_X support\n ARM: 7423/1: kprobes: run t32_simulate_ldr_literal() without insn slot\n ARM: 7422/1: mmc: mmci: Allocate platform memory during Device Tree boot\n" }, { "commit": "61fcbc8dfe40d6fb5e59ab31dfcef67d6019f1a5", "tree": "498e16a152f033641a653f7969a0083399c6dca7", "parents": [ "f40759e7041498577235192727322186b43aa216", "daf731748f978efb4f741d19b499236e03bf667f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 09:41:21 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 20 09:41:21 2012 -0700" }, "message": "Merge tag \u0027pinctrl-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl\n\nPull two pinctrl fixes from Linus Walleij:\n - Fixed a 2-line compile error for MXS\n - A pure documentation fix for Nomadik\n\n* tag \u0027pinctrl-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:\n pinctrl/nomadik: document Alt-C glitch\n pinctrl: mxs: Use kfree to fix build error\n" }, { "commit": "aef2b89662b8a7506846d0dc0df672d196ddf8d0", "tree": "171bc0b5fec3d0b298399ac3c928088a155dfca8", "parents": [ "95dca12d6bf2dd5e7720506b8f9786318899b8d6" ], "author": { "name": "Russ Dill", "email": "Russ.Dill@ti.com", "time": "Wed May 09 15:15:03 2012 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Wed Jun 20 07:18:21 2012 -0700" }, "message": "ARM: OMAP: Fix Beagleboard DVI reset gpio\n\nCommit e813a55eb9c9bc6c8039fb16332cf43402125b30 (\"OMAP: board-files:\nremove custom PD GPIO handling for DVI output\") moved TFP410 chip\u0027s\npowerdown-gpio handling from the board files to the tfp410 driver. One\ngpio_request_one(powerdown-gpio, ...) was mistakenly left unremoved in\nthe Beagle board file. This causes the tfp410 driver to fail to request\nthe gpio on Beagle, causing the driver to fail and thus the DVI output\ndoesn\u0027t work.\n\nThis patch removes several boot errors from board-omap3beagle.c:\n\n - gpio_request: gpio--22 (DVI reset) status -22\n - Unable to get DVI reset GPIO\n\nThere is a combination of leftover code and revision confusion.\nAdditionally, xM support is currently a hack.\n\nFor original Beagleboard this removes the double initialization of GPIO\n170, properly configures it as an output, and wraps the initialization\nin an if block so that xM does not attempt to request it.\n\nFor Beagleboard xM it removes reference to GPIO 129 which was part\nof rev A1 and A2 designs, but never functioned. It then properly assigns\nbeagle_dvi_device.reset_gpio in beagle_twl_gpio_setup and removes the\nhack of initializing it high. Additionally, it uses\ngpio_set_value_cansleep since this GPIO is connected through i2c.\n\nUnfortunately, there is no way to tell the difference between xM A2 and\nA3. However, GPIO 129 does not function on rev A1 and A2, and the TWL\nGPIO used on A3 and beyond is not used on rev A1 and A2, there are no\nproblems created by this fix.\n\nTested on Beagleboard-xM Rev C1 and Beagleboard Rev B4.\n\nSigned-off-by: Russ Dill \u003cRuss.Dill@ti.com\u003e\nAcked-by: Tomi Valkeinen \u003ctomi.valkeinen@ti.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "95dca12d6bf2dd5e7720506b8f9786318899b8d6", "tree": "b501f33f415d4bb5cc3c7acf321fb7b02cd2ceb3", "parents": [ "3d09b33fecf204561e5c7126648ec05c756c631c" ], "author": { "name": "Jon Hunter", "email": "jon-hunter@ti.com", "time": "Tue Jun 12 19:40:46 2012 -0500" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Wed Jun 20 07:18:20 2012 -0700" }, "message": "arm/dts: OMAP2: Fix interrupt controller binding\n\nWhen booting with device-tree on an OMAP2420H4, the kernel is hanging when\ninitialising the interrupts and following kernel dumps is seen ...\n\n[ 0.000000] ------------[ cut here ]------------\n[ 0.000000] WARNING: at arch/arm/mach-omap2/irq.c:271 omap_intc_of_init+0x50/0xb4()\n[ 0.000000] unable to get intc registers\n[ 0.000000] Modules linked in:\n[ 0.000000] [\u003cc001befc\u003e] (unwind_backtrace+0x0/0xf4) from [\u003cc0040c34\u003e] (warn_slowpath_common+0x4c/0x64)\n[ 0.000000] [\u003cc0040c34\u003e] (warn_slowpath_common+0x4c/0x64) from [\u003cc0040ce0\u003e] (warn_slowpath_fmt+0x30/0x40)\n[ 0.000000] [\u003cc0040ce0\u003e] (warn_slowpath_fmt+0x30/0x40) from [\u003cc066b8a4\u003e] (omap_intc_of_init+0x50/0xb4)\n[ 0.000000] [\u003cc066b8a4\u003e] (omap_intc_of_init+0x50/0xb4) from [\u003cc0688b70\u003e] (of_irq_init+0x144/0x288)\n[ 0.000000] [\u003cc0688b70\u003e] (of_irq_init+0x144/0x288) from [\u003cc0663294\u003e] (init_IRQ+0x14/0x1c)\n[ 0.000000] [\u003cc0663294\u003e] (init_IRQ+0x14/0x1c) from [\u003cc06607fc\u003e] (start_kernel+0x198/0x304)\n[ 0.000000] [\u003cc06607fc\u003e] (start_kernel+0x198/0x304) from [\u003c80008044\u003e] (0x80008044)\n[ 0.000000] ---[ end trace 1b75b31a2719ed1c ]---\n[ 0.000000] of_irq_init: children remain, but no parents\n\nThe OMAP2 interrupt controller binding is missing the number of interrupts and\ninterrupt controller register address. Adding these fixes the problem.\n\nSigned-off-by: Jon Hunter \u003cjon-hunter@ti.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "3d09b33fecf204561e5c7126648ec05c756c631c", "tree": "f48783341a935db3a1547fe8a0a22e9db9f33337", "parents": [ "310018d52ec06c19dc946c2807c07c8b70e2d1a6" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Wed Jun 20 07:18:15 2012 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Wed Jun 20 07:18:15 2012 -0700" }, "message": "ARM: OMAP2: Fix tusb6010 GPIO interrupt for n8x0\n\nHere\u0027s one more gpio_to_irq conversion that we missed\nearlier. Tested with n800 in gadget mode using USB_ETH.\n\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "310018d52ec06c19dc946c2807c07c8b70e2d1a6", "tree": "50b43175441704b6edaa96bca3fe434a891d3f39", "parents": [ "485802a6c524e62b5924849dd727ddbb1497cc71" ], "author": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Wed Jun 20 07:18:15 2012 -0700" }, "committer": { "name": "Tony Lindgren", "email": "tony@atomide.com", "time": "Wed Jun 20 07:18:15 2012 -0700" }, "message": "ARM: OMAP2+: Fix MUSB ifdefs for platform init code\n\nCommit 62285963 (usb: musb: drop a gigantic amount of ifdeferry)\ngot rid of a bunch of ifdefs in the MUSB code. Looks like the\nplatform init code is still using these dropped defines though,\nwhich in many cases results the board defaulting always to host\nmode.\n\nCurrently the situation is that USB_MUSB_HDRC is the main\nKconfig option with additional USB_GADGET_MUSB_HDRC so only\nthese two should be used to select between host and OTG mode.\n\nFix the situation for omaps. The following users should fix the\nplatform init code in a similar way:\n\nDropped Kconfig option Current users\n\nUSB_MUSB_OTG blackfin, davinci, not in Kconfigs\nUSB_MUSB_PERIPHERAL davinci, not in Kconfigs\nUSB_MUSB_HOST davinci, not in Kconfigs\nUSB_MUSB_HDRC_HCD blackfin, not in Kconfigs\nUSB_MUSB_OTG blackfin, not in Kconfigs\n\nCc: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Sekhar Nori \u003cnsekhar@ti.com\u003e\nCc: linux-usb@vger.kernel.org\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nSigned-off-by: Tony Lindgren \u003ctony@atomide.com\u003e\n" }, { "commit": "642c0dbde32f34baa7886e988a067089992adc8f", "tree": "fc5fb85655f6c2c6d9a184ff00014fd3f85b8a83", "parents": [ "b132cf4c733f91bb4dd2277ea049243cf16e8b66" ], "author": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Sun Jun 10 20:43:56 2012 -0700" }, "committer": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Wed Jun 20 07:43:50 2012 -0500" }, "message": "libceph: flush msgr queue during mon_client shutdown\n\nWe need to flush the msgr workqueue during mon_client shutdown to\nensure that any work affecting our embedded ceph_connection is\nfinished so that we can be safely destroyed.\n\nPreviously, we were flushing the work queue after osd_client\nshutdown and before mon_client shutdown to ensure that any osd\nconnection refs to authorizers are flushed. Remove the redundant\nflush, and document in the comment that the mon_client flush is\nneeded to cover that case as well.\n\nSigned-off-by: Sage Weil \u003csage@inktank.com\u003e\nReviewed-by: Alex Elder \u003celder@inktank.com\u003e\n(cherry picked from commit f3dea7edd3d449fe7a6d402c1ce56a294b985261)\n" }, { "commit": "b132cf4c733f91bb4dd2277ea049243cf16e8b66", "tree": "1818eae2e75f6ee26c80736bfd11f15245ec79b2", "parents": [ "88ed6ea0b295f8e2383d599a04027ec596cdf97b" ], "author": { "name": "Yan, Zheng", "email": "zheng.z.yan@intel.com", "time": "Wed Jun 06 19:35:55 2012 -0500" }, "committer": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Wed Jun 20 07:43:50 2012 -0500" }, "message": "rbd: Clear ceph_msg-\u003ebio_iter for retransmitted message\n\nThe bug can cause NULL pointer dereference in write_partial_msg_pages\n\nSigned-off-by: Zheng Yan \u003czheng.z.yan@intel.com\u003e\nReviewed-by: Alex Elder \u003celder@inktank.com\u003e\n(cherry picked from commit 43643528cce60ca184fe8197efa8e8da7c89a037)\n" }, { "commit": "88ed6ea0b295f8e2383d599a04027ec596cdf97b", "tree": "e9a49af02373e76a9ce0ed94b4120ccc184a7461", "parents": [ "680584fab05efff732b5ae16ad601ba994d7b505" ], "author": { "name": "Sage Weil", "email": "sage@inktank.com", "time": "Thu May 31 20:22:18 2012 -0700" }, "committer": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Wed Jun 20 07:43:49 2012 -0500" }, "message": "libceph: use con get/put ops from osd_client\n\nThere were a few direct calls to ceph_con_{get,put}() instead of the con\nops from osd_client.c. This is a bug since those ops aren\u0027t defined to\nbe ceph_con_get/put.\n\nThis breaks refcounting on the ceph_osd structs that contain the\nceph_connections, and could lead to all manner of strangeness.\n\nThe purpose of the -\u003eget and -\u003eput methods in a ceph connection are\nto allow the connection to indicate it has a reference to something\nexternal to the messaging system, *not* to indicate something\nexternal has a reference to the connection.\n\n[elder@inktank.com: added that last sentence]\n\nSigned-off-by: Sage Weil \u003csage@newdream.net\u003e\nReviewed-by: Alex Elder \u003celder@inktank.com\u003e\n(cherry picked from commit 0d47766f14211a73eaf54cab234db134ece79f49)\n" }, { "commit": "680584fab05efff732b5ae16ad601ba994d7b505", "tree": "08f9fe218f4107c3afdaf1293f62bfeb97ca25b8", "parents": [ "61600ef8483924039dcdec8b4717ca32bd3353c6" ], "author": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Mon Jun 04 14:43:32 2012 -0500" }, "committer": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Wed Jun 20 07:43:48 2012 -0500" }, "message": "libceph: osd_client: don\u0027t drop reply reference too early\n\nIn ceph_osdc_release_request(), a reference to the r_reply message\nis dropped. But just after that, that same message is revoked if it\nwas in use to receive an incoming reply. Reorder these so we are\nsure we hold a reference until we\u0027re actually done with the message.\n\nSigned-off-by: Alex Elder \u003celder@inktank.com\u003e\nReviewed-by: Sage Weil \u003csage@inktank.com\u003e\n(cherry picked from commit ab8cb34a4b2f60281a4b18b1f1ad23bc2313d91b)\n" }, { "commit": "61600ef8483924039dcdec8b4717ca32bd3353c6", "tree": "3bb61de61e148b7adcae79b978c8b644a2582691", "parents": [ "f40759e7041498577235192727322186b43aa216" ], "author": { "name": "Yan, Zheng", "email": "zheng.z.yan@intel.com", "time": "Mon May 28 14:44:30 2012 +0800" }, "committer": { "name": "Alex Elder", "email": "elder@inktank.com", "time": "Wed Jun 20 07:43:48 2012 -0500" }, "message": "ceph: check PG_Private flag before accessing page-\u003eprivate\n\nI got lots of NULL pointer dereference Oops when compiling kernel on ceph.\nThe bug is because the kernel page migration routine replaces some pages\nin the page cache with new pages, these new pages\u0027 private can be non-zero.\n\nSigned-off-by: Zheng Yan \u003czheng.z.yan@intel.com\u003e\nSigned-off-by: Sage Weil \u003csage@inktank.com\u003e\n(cherry picked from commit 28c0254ede13ab575d2df5c6585ed3d4817c3e6b)\n" }, { "commit": "6921a575c9f26f7ea274aaea3b78967810ce5513", "tree": "be9ad9533541cb87a8d7dd091ad8ada20a75dc4c", "parents": [ "9c5da09d266ca9b32eb16cf940f8161d949c2fe5", "93b3cca1ccd30b1ad290951a3fc7c10c73db7313" ], "author": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Wed Jun 20 14:26:58 2012 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@kernel.org", "time": "Wed Jun 20 14:26:58 2012 +0200" }, "message": "Merge branch \u0027tip/perf/urgent-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/urgent\n" }, { "commit": "8386a00f1443f676e8b614f654e2e324fdc0b3b3", "tree": "5b94fa5a9b2dba0fe1331f68d21bf5286864441a", "parents": [ "6b57c0155cb78d15b0d93b2c7f66ad9536862476" ], "author": { "name": "Axel Lin", "email": "axel.lin@gmail.com", "time": "Thu Jun 14 16:00:53 2012 +0800" }, "committer": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed Jun 20 11:20:24 2012 +0100" }, "message": "regulator: tps6524x: Fix get_voltage_sel for fixed voltage\n\nget_voltage_sel() should return selector rather than voltage.\n\nSigned-off-by: Axel Lin \u003caxel.lin@gmail.com\u003e\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\n" }, { "commit": "f40759e7041498577235192727322186b43aa216", "tree": "1e824ccc4cdd7b9d48fe617d5dcf3effac128265", "parents": [ "2fe8ac608bf1a9c947f03f5d8cbf25c91b4f1a7c", "0b1d8e09089b69ac2e8be203fb28cd07cfe035b2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 19 23:37:19 2012 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 19 23:37:19 2012 -0700" }, "message": "Merge tag \u0027sound-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound\n\nPull sound fixes from Takashi Iwai:\n \"Most of changes are fairly small and driver-specific.\n\n A remaining regression fix for USB-audio sync pipe check, a fix for\n HD-audio power-up sequence, fixes for ASoC pxa-ssp compile issues, and\n bunch of ASoC codec and trivial fix patches.\"\n\n* tag \u0027sound-3.5\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:\n ALSA: 6fire: use NULL instead of 0 for pointer assignment\n ALSA: hda - Handle open while transitioning to D3.\n ALSA: snd-usb: make snd_usb_substream_capture_trigger static\n ALSA: snd-usb: fix sync pipe check\n ASoC: tegra+wm8903: turn of mic detect when card is removed\n ASoC: wm8996: Mark the CODEC as cache only when powering off on boot\n ASoC: wm8996: Move reset before the initial regulator disable\n ASoC: wm8996: Remove spurious regulator_bulk_free()\n ASoC: wm8904: Fix cache only management\n ASoC: wm8904: Fix GPIO and MICBIAS initialisation for regmap conversion\n ASoC: fix pxa-ssp compiling issue under mach-mmp\n ARM: MMP: add pxa910-ssp into ssp_id_table\n" }, { "commit": "4dd81e895655c59bd19d7a8f03a5de1310f4aeb6", "tree": "9d6904827a5bf03ec9b34b5c8f5b04b05ffecc45", "parents": [ "ae501be0f631bd4fb751c5f580e396f59b2011f1" ], "author": { "name": "Sean Hefty", "email": "sean.hefty@intel.com", "time": "Thu Jun 14 20:49:09 2012 +0000" }, "committer": { "name": "Roland Dreier", "email": "roland@purestorage.com", "time": "Tue Jun 19 20:04:04 2012 -0700" }, "message": "RDMA/cma: QP type check on received REQs should be AND not OR\n\nChange || check to the intended \u0026\u0026 when checking the QP type in a\nreceived connection request against the listening endpoint.\n\nSigned-off-by: Sean Hefty \u003csean.hefty@intel.com\u003e\nSigned-off-by: Roland Dreier \u003croland@purestorage.com\u003e\n" }, { "commit": "1a0de48ae56b5cdb9a46b3d3a0b578dd7f787f22", "tree": "25a4e70970633700ef856f5cd49e753aa0e26160", "parents": [ "5a695da26367f53a368c90435e0b883c12f02791" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Jun 19 18:38:56 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Jun 19 18:42:28 2012 -0400" }, "message": "NFS: Initialise commit_info.rpc_out when !defined(CONFIG_NFS_V4)\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: Fred Isaman \u003ciisaman@netapp.com\u003e\n" }, { "commit": "5a695da26367f53a368c90435e0b883c12f02791", "tree": "0bd0e628544370e9a5edabcdf0d38859d1364d6e", "parents": [ "0a9c63fae7df086ff5e107273c3cce8642430974" ], "author": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Jun 19 13:39:14 2012 -0400" }, "committer": { "name": "Trond Myklebust", "email": "Trond.Myklebust@netapp.com", "time": "Tue Jun 19 18:42:14 2012 -0400" }, "message": "NFS: Fix a refcounting issue in O_DIRECT\n\nIn nfs_direct_write_reschedule(), the requests from nfs_scan_commit_list\nhave a refcount of 2, whereas the operations in\nnfs_direct_write_completion_ops expect them to have a refcount of 1.\n\nThis patch adds a call to release the extra references.\n\nSigned-off-by: Trond Myklebust \u003cTrond.Myklebust@netapp.com\u003e\nCc: Fred Isaman \u003ciisaman@netapp.com\u003e\n" } ], "next": "2fe8ac608bf1a9c947f03f5d8cbf25c91b4f1a7c" }