)]}' { "log": [ { "commit": "00bcb4ac7ee7e557a491b614219142cea0ef16f4", "tree": "992cfa1d0e653aa3de8f0865c5e1a5a0fee4f935", "parents": [ "d0c6f6258478e1dba532bf7c28e2cd6e1047d3a4" ], "author": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Tue Jun 01 19:37:23 2010 +1000" }, "committer": { "name": "NeilBrown", "email": "neilb@suse.de", "time": "Wed Jul 21 13:27:53 2010 +1000" }, "message": "md: reduce dependence on sysfs.\n\nWe will want md devices to live as dm targets where sysfs is not\nvisible. So allow md to not connect to sysfs.\n\nSigned-off-by: NeilBrown \u003cneilb@suse.de\u003e\n" }, { "commit": "d0c6f6258478e1dba532bf7c28e2cd6e1047d3a4", "tree": "1051c0dbd14bcd05b9a17a08b6af1f25b0a9c0d6", "parents": [ "46ac0cc92eedf92f7909e563ffcd2dbc4b914bc3", "f82c3d71d6fd2e6a3e3416f09099e29087e39abf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 19 13:19:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 19 13:19:32 2010 -0700" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, pci, mrst: Add extra sanity check in walking the PCI extended cap chain\n x86: Fix x2apic preenabled system with kexec\n x86: Force HPET readback_cmp for all ATI chipsets\n" }, { "commit": "46ac0cc92eedf92f7909e563ffcd2dbc4b914bc3", "tree": "25b9c293e4f9a33b8593f83c86f1db5ddf247ead", "parents": [ "2decd5a7cea2c1dae6418fe778857d43680a91aa", "9078370c0d2cfe4a905aa34f398bbb0d65921a2b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 19 13:18:34 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 19 13:18:34 2010 -0700" }, "message": "Merge branch \u0027kmemleak\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm\n\n* \u0027kmemleak\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-2.6-cm:\n kmemleak: Add support for NO_BOOTMEM configurations\n kmemleak: Annotate false positive in init_section_page_cgroup()\n" }, { "commit": "2decd5a7cea2c1dae6418fe778857d43680a91aa", "tree": "2ff5a57ef9db7a5fc000d323910b13ece778ab5b", "parents": [ "b4fd4f890bca2291a12bb0807027db40f929a82d", "878c495644be28cc881e7ee792f00fd879a1ebf9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 19 13:18:05 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 19 13:18:05 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6\n\n* \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6:\n [S390] cio: fix potential overflow in chpid descriptor\n [S390] add missing device put\n [S390] dasd: use correct label location for diag fba disks\n" }, { "commit": "b4fd4f890bca2291a12bb0807027db40f929a82d", "tree": "12d55f40767af5841778b858e3b1085d18bb130c", "parents": [ "a9f7f2e74ae0e6a801a2433dc8e9124d73da0cb4" ], "author": { "name": "Sreedhara DS", "email": "sreedhara.ds@intel.com", "time": "Mon Jul 19 09:37:42 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 19 13:17:37 2010 -0700" }, "message": "intel_scu_ipc: Oops/crash fixes\n\n- fix reversing of command/sub arguments\n- fix a crash if the i2c interface is called before the device is found\n\nSigned-off-by: Sreedhara DS \u003csreedhara.ds@intel.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9078370c0d2cfe4a905aa34f398bbb0d65921a2b", "tree": "0b0d3b1f2a9a6dd2f2deaae9fbf9c8c5509ac13c", "parents": [ "7952f98818d561ed0e11434a7a16acd9a7bae859" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jul 19 11:54:15 2010 +0100" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jul 19 11:54:15 2010 +0100" }, "message": "kmemleak: Add support for NO_BOOTMEM configurations\n\nWith commits 08677214 and 59be5a8e, alloc_bootmem()/free_bootmem() and\nfriends use the early_res functions for memory management when\nNO_BOOTMEM is enabled. This patch adds the kmemleak calls in the\ncorresponding code paths for bootmem allocations.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nAcked-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "7952f98818d561ed0e11434a7a16acd9a7bae859", "tree": "b8e74d8a3aa9ac6939889487b8c46ce098c7d9f3", "parents": [ "815c4163b6c8ebf8152f42b0a5fd015cfdcedc78" ], "author": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jul 19 11:54:14 2010 +0100" }, "committer": { "name": "Catalin Marinas", "email": "catalin.marinas@arm.com", "time": "Mon Jul 19 11:54:14 2010 +0100" }, "message": "kmemleak: Annotate false positive in init_section_page_cgroup()\n\nThe pointer to the page_cgroup table allocated in\ninit_section_page_cgroup() is stored in section-\u003epage_cgroup as (base -\npfn). Since this value does not point to the beginning or inside the\nallocated memory block, kmemleak reports a false positive.\n\nThis was reported in bugzilla.kernel.org as #16297.\n\nSigned-off-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nReported-by: Adrien Dessemond \u003cadrien.dessemond@gmail.com\u003e\nReviewed-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\n" }, { "commit": "878c495644be28cc881e7ee792f00fd879a1ebf9", "tree": "61f9ea2be8e821424d2643c8a26b720fd2a5a3bf", "parents": [ "0abccf77402af44855da739b439d01cfb65b4bfd" ], "author": { "name": "Sebastian Ott", "email": "sebott@linux.vnet.ibm.com", "time": "Mon Jul 19 09:22:37 2010 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Mon Jul 19 09:22:50 2010 +0200" }, "message": "[S390] cio: fix potential overflow in chpid descriptor\n\nThe length filed in the chsc response block (if valid)\nhas a value of n*(sizeof(chp_desc))+8 (for the response\nblock header). When we memcopied from the response block\nto the actual descriptor we copied 8 bytes too much.\nThe bug was not revealed since the descriptor is embedded\nin struct channel_path.\nSince we only write one descriptor at a time ignore the\nlength value and use sizeof(*desc).\n\nSigned-off-by: Sebastian Ott \u003csebott@linux.vnet.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "0abccf77402af44855da739b439d01cfb65b4bfd", "tree": "125232a749ad17ae39db7ce6c52205233f51e240", "parents": [ "cffab6bc5511cd6f67a60bf16b62de4267b68c4c" ], "author": { "name": "Stefan Haberland", "email": "stefan.haberland@de.ibm.com", "time": "Mon Jul 19 09:22:36 2010 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Mon Jul 19 09:22:50 2010 +0200" }, "message": "[S390] add missing device put\n\nThe dasd_alias_show function does not return a device reference\nin case the device is an alias.\n\nSigned-off-by: Stefan Haberland \u003cstefan.haberland@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "cffab6bc5511cd6f67a60bf16b62de4267b68c4c", "tree": "edcc2a5ed2ef5865e98c8fa01bcb866a579edf89", "parents": [ "a9f7f2e74ae0e6a801a2433dc8e9124d73da0cb4" ], "author": { "name": "Peter Oberparleiter", "email": "peter.oberparleiter@de.ibm.com", "time": "Mon Jul 19 09:22:35 2010 +0200" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Mon Jul 19 09:22:50 2010 +0200" }, "message": "[S390] dasd: use correct label location for diag fba disks\n\nPartition boundary calculation fails for DASD FBA disks under the\nfollowing conditions:\n- disk is formatted with CMS FORMAT with a blocksize of more than\n 512 bytes\n- all of the disk is reserved to a single CMS file using CMS RESERVE\n- the disk is accessed using the DIAG mode of the DASD driver\n\nUnder these circumstances, the partition detection code tries to\nread the CMS label block containing partition-relevant information\nfrom logical block offset 1, while it is in fact located at physical\nblock offset 1.\n\nFix this problem by using the correct CMS label block location\ndepending on the device type as determined by the DASD SENSE ID\ninformation.\n\nSigned-off-by: Peter Oberparleiter \u003cpeter.oberparleiter@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "a9f7f2e74ae0e6a801a2433dc8e9124d73da0cb4", "tree": "a52644367533e48d9fe4f4abea0c8b39dc2523e2", "parents": [ "2044f2282d7558c765270d78e19dbdcf6190ca71", "a197479848a2f1a2a5c07cffa6c31ab5e8c82797" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 15:13:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 15:13:30 2010 -0700" }, "message": "Merge branch \u0027x86/kprobes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland\n\n* \u0027x86/kprobes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:\n x86: kprobes: fix swapped segment registers in kretprobe\n" }, { "commit": "a197479848a2f1a2a5c07cffa6c31ab5e8c82797", "tree": "6d66cad929d5a2e2aaeb9d33d94b46c9d1093b26", "parents": [ "bea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d" ], "author": { "name": "Roland McGrath", "email": "roland@redhat.com", "time": "Fri Jul 16 18:17:12 2010 -0700" }, "committer": { "name": "Roland McGrath", "email": "roland@redhat.com", "time": "Sun Jul 18 15:05:34 2010 -0700" }, "message": "x86: kprobes: fix swapped segment registers in kretprobe\n\nIn commit f007ea26, the order of the %es and %ds segment registers\ngot accidentally swapped, so synthesized \u0027struct pt_regs\u0027 frames\nhave the two values inverted. It\u0027s almost sure that these values\nnever matter, and that they also never differ. But wrong is wrong.\n\nSigned-off-by: Roland McGrath \u003croland@redhat.com\u003e\n" }, { "commit": "2044f2282d7558c765270d78e19dbdcf6190ca71", "tree": "03b2c4d211fa8e7e2ef8c489d28a16442f030d57", "parents": [ "bea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d", "58c84eda07560a6b75b03e8d3b26d6eddfc14011" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 15:05:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 15:05:22 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:\n PCI: fall back to original BIOS BAR addresses\n" }, { "commit": "bea9a6d239cb2aa2ced4dcb0a05e1827ce61fa3d", "tree": "39f23bd918c4dcda4359ebd9b8f188b9cb5e25b1", "parents": [ "cd9f040df6ce46573760a507cb88192d05d27d86", "5453258d532e72731b0829e4fefd36dd611a2fff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 10:09:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 10:09:25 2010 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:\n ocfs2: Silence gcc warning in ocfs2_write_zero_page().\n jbd2/ocfs2: Fix block checksumming when a buffer is used in several transactions\n ocfs2/dlm: Remove BUG_ON from migration in the rare case of a down node\n ocfs2: Don\u0027t duplicate pages past i_size during CoW.\n ocfs2: tighten up strlen() checking\n ocfs2: Make xattr reflink work with new local alloc reservation.\n ocfs2: make xattr extension work with new local alloc reservation.\n ocfs2: Remove the redundant cpu_to_le64.\n ocfs2/dlm: don\u0027t access beyond bitmap size\n ocfs2: No need to zero pages past i_size.\n ocfs2: Zero the tail cluster when extending past i_size.\n ocfs2: When zero extending, do it by page.\n ocfs2: Limit default local alloc size within bitmap range.\n ocfs2: Move orphan scan work to ocfs2_wq.\n fs/ocfs2/dlm: Add missing spin_unlock\n" }, { "commit": "cd9f040df6ce46573760a507cb88192d05d27d86", "tree": "096de3bb2202a14269ff8d36d0c932ee50619808", "parents": [ "f469461df6ff822f71b8737bda86eea20f16ff93" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 09:44:37 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 18 09:44:37 2010 -0700" }, "message": "drm/i915: add \u0027reclaimable\u0027 to i915 self-reclaimable page allocations\n\nThe hibernate issues that got fixed in commit 985b823b9192 (\"drm/i915:\nfix hibernation since i915 self-reclaim fixes\") turn out to have been\nincomplete. Vefa Bicakci tested lots of hibernate cycles, and without\nthe __GFP_RECLAIMABLE flag the system eventually fails to resume.\n\nWith the flag added, Vefa can apparently hibernate forever (or until he\ngets bored running his automated scripts, whichever comes first).\n\nThe reclaimable flag was there originally, and was one of the flags that\nwere dropped (unintentionally) by commit 4bdadb978569 (\"drm/i915:\nSelectively enable self-reclaim\") that introduced all these problems,\nbut I didn\u0027t want to just blindly add back all the flags in commit\n985b823b9192, and it looked like __GFP_RECLAIM wasn\u0027t necessary. It\nclearly was.\n\nI still suspect that there is some subtle reason we\u0027re missing that\ncauses the problems, but __GFP_RECLAIMABLE is certainly not wrong to use\nin this context, and is what the code historically used. And we have no\nidea what the causes the corruption without it.\n\nReported-and-tested-by: M. Vefa Bicakci \u003cbicave@superonline.com\u003e\nCc: Dave Airlie \u003cairlied@gmail.com\u003e\nCc: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f82c3d71d6fd2e6a3e3416f09099e29087e39abf", "tree": "2101f7be744320cce3356e290fb4ba6c1796a1c2", "parents": [ "fd19dce7ac07973f700b0f13fb7f94b951414a4c" ], "author": { "name": "Jacob Pan", "email": "jacob.jun.pan@linux.intel.com", "time": "Fri Jul 16 11:58:26 2010 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Fri Jul 16 16:52:15 2010 -0700" }, "message": "x86, pci, mrst: Add extra sanity check in walking the PCI extended cap chain\n\nThe fixed bar capability structure is searched in PCI extended\nconfiguration space. We need to make sure there is a valid capability\nID to begin with otherwise, the search code may stuck in a infinite\nloop which results in boot hang. This patch adds additional check for\ncap ID 0, which is also invalid, and indicates end of chain.\n\nEnd of chain is supposed to have all fields zero, but that doesn\u0027t\nseem to always be the case in the field.\n\nSuggested-by: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: Jacob Pan \u003cjacob.jun.pan@linux.intel.com\u003e\nReviewed-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nLKML-Reference: \u003c1279306706-27087-1-git-send-email-jacob.jun.pan@linux.intel.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "fd19dce7ac07973f700b0f13fb7f94b951414a4c", "tree": "746eef7532060f4aa63d5281f1283a901b93f12b", "parents": [ "08be97962bf338161325d4901642f956ce8c1adb" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Thu Jul 15 00:00:59 2010 -0700" }, "committer": { "name": "H. Peter Anvin", "email": "hpa@linux.intel.com", "time": "Fri Jul 16 16:49:41 2010 -0700" }, "message": "x86: Fix x2apic preenabled system with kexec\n\nFound one x2apic system kexec loop test failed\nwhen CONFIG_NMI_WATCHDOG\u003dy (old) or CONFIG_LOCKUP_DETECTOR\u003dy (current tip)\n\nfirst kernel can kexec second kernel, but second kernel can not kexec third one.\n\nit can be duplicated on another system with BIOS preenabled x2apic.\nFirst kernel can not kexec second kernel.\n\nIt turns out, when kernel boot with pre-enabled x2apic, it will not execute\ndisable_local_APIC on shutdown path.\n\nwhen init_apic_mappings() is called in setup_arch, it will skip setting of\napic_phys when x2apic_mode is set. ( x2apic_mode is much early check_x2apic())\nThen later, disable_local_APIC() will bail out early because !apic_phys.\n\nSo check !x2apic_mode in x2apic_mode in disable_local_APIC with !apic_phys.\n\nanother solution could be updating init_apic_mappings() to set apic_phys even\nfor preenabled x2apic system. Actually even for x2apic system, that lapic\naddress is mapped already in early stage.\n\nBTW: is there any x2apic preenabled system with apicid of boot cpu \u003e 255?\n\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nLKML-Reference: \u003c4C3EB22B.3000701@kernel.org\u003e\nAcked-by: Suresh Siddha \u003csuresh.b.siddha@intel.com\u003e\nCc: stable@kernel.org\nSigned-off-by: H. Peter Anvin \u003chpa@linux.intel.com\u003e\n" }, { "commit": "5453258d532e72731b0829e4fefd36dd611a2fff", "tree": "6caa67ad70df5cd266ff42f458d6994b689898a5", "parents": [ "13ceef099edd2b70c5a6f3a9ef5d6d97cda2e096" ], "author": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Fri Jul 16 13:32:33 2010 -0700" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Fri Jul 16 13:33:39 2010 -0700" }, "message": "ocfs2: Silence gcc warning in ocfs2_write_zero_page().\n\nocfs2_write_zero_page() has a loop that won\u0027t ever be skipped, but gcc\ndoesn\u0027t know that. Set ret\u003d0 just to make gcc happy.\n\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\n" }, { "commit": "58c84eda07560a6b75b03e8d3b26d6eddfc14011", "tree": "0104345d24d5fb79842ffd563ea69fdf2906931d", "parents": [ "2f7989efd4398d92b8adffce2e07dd043a0895fe" ], "author": { "name": "Bjorn Helgaas", "email": "bjorn.helgaas@hp.com", "time": "Thu Jul 15 09:41:42 2010 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 16 11:39:48 2010 -0700" }, "message": "PCI: fall back to original BIOS BAR addresses\n\nIf we fail to assign resources to a PCI BAR, this patch makes us try the\noriginal address from BIOS rather than leaving it disabled.\n\nLinux tries to make sure all PCI device BARs are inside the upstream\nPCI host bridge or P2P bridge apertures, reassigning BARs if necessary.\nWindows does similar reassignment.\n\nBefore this patch, if we could not move a BAR into an aperture, we left\nthe resource unassigned, i.e., at address zero. Windows leaves such BARs\nat the original BIOS addresses, and this patch makes Linux do the same.\n\nThis is a bit ugly because we disable the resource long before we try to\nreassign it, so we have to keep track of the BIOS BAR address somewhere.\nFor lack of a better place, I put it in the struct pci_dev.\n\nI think it would be cleaner to attempt the assignment immediately when the\nclaim fails, so we could easily remember the original address. But we\ncurrently claim motherboard resources in the middle, after attempting to\nclaim PCI resources and before assigning new PCI resources, and changing\nthat is a fairly big job.\n\nAddresses https://bugzilla.kernel.org/show_bug.cgi?id\u003d16263\n\nReported-by: Andrew \u003cnitr0@seti.kr.ua\u003e\nTested-by: Andrew \u003cnitr0@seti.kr.ua\u003e\nSigned-off-by: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "f469461df6ff822f71b8737bda86eea20f16ff93", "tree": "d7605dd5846725ed6949621084a5652782d9b02d", "parents": [ "79140bc486fac016249f3d1d67ec9a39ebed9ad9", "44a54f787c0abcf75a2ed49b8ec8b2b512468f73" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 11:26:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 11:26:33 2010 -0700" }, "message": "Merge branch \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n tracing: Add alignment to syscall metadata declarations\n perf: Sync callchains with period based hits\n perf: Resurrect flat callchains\n perf: Version String fix, for fallback if not from git\n perf: Version String fix, using kernel version\n" }, { "commit": "79140bc486fac016249f3d1d67ec9a39ebed9ad9", "tree": "e022f9e593b48018c5ae218f5fcc364e2cacab4c", "parents": [ "cc10b6ffd39ef982f86de68d95e5811df82cf819", "728a756b8fcd22d80e2dbba8117a8a3aafd3f203" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 08:23:10 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 08:23:10 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-fixes:\n GFS2: rename causes kernel Oops\n GFS2: BUG in gfs2_adjust_quota\n GFS2: Fix kernel NULL pointer dereference by dlm_astd\n GFS2: recovery stuck on transaction lock\n GFS2: O_TRUNC not working on stuffed files across cluster\n" }, { "commit": "cc10b6ffd39ef982f86de68d95e5811df82cf819", "tree": "cb6f24f40d0211513321b5230b87efc022aeed1f", "parents": [ "042bd1ff6cf255e71689db913786dbb6bb79542d", "5b39187fad6faefae5ce1a1e997651d4e382b135" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 08:22:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 16 08:22:40 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: w90p910_ts - fix call to setup_timer()\n Input: synaptics - fix wrong dimensions check\n Input: i8042 - mark stubs in i8042.h \"static inline\"\n" }, { "commit": "5b39187fad6faefae5ce1a1e997651d4e382b135", "tree": "0a6095cfc219b932afead2bb4597aaf811e25367", "parents": [ "bbddd199995ff55f1bb0336cadff4ee3d02b5a2c" ], "author": { "name": "Wan ZongShun", "email": "mcuos.com@gmail.com", "time": "Thu Jul 15 23:28:57 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Jul 15 23:51:03 2010 -0700" }, "message": "Input: w90p910_ts - fix call to setup_timer()\n\nNo need to take address, w90p910_ts is already a pointer.\n\nSigned-off-by: Wan ZongShun \u003cmcuos.com@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "042bd1ff6cf255e71689db913786dbb6bb79542d", "tree": "dbc4b4da7f34a4de52156d67588ad90fb9d447d7", "parents": [ "2f7989efd4398d92b8adffce2e07dd043a0895fe", "2716fbf63ee39eadc1aa9b3841b20f75b99a9bc3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 15 20:25:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 15 20:25:44 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n crypto: skcipher - avoid NULL dereference\n" }, { "commit": "13ceef099edd2b70c5a6f3a9ef5d6d97cda2e096", "tree": "5d65c397e9e85abe11a6fb0ebf3a69e8a4e91e0d", "parents": [ "a39953dd95ff10e311083d94f4f95c348cb22464" ], "author": { "name": "Jan Kara", "email": "jack@suse.cz", "time": "Wed Jul 14 07:56:33 2010 +0200" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Thu Jul 15 15:17:47 2010 -0700" }, "message": "jbd2/ocfs2: Fix block checksumming when a buffer is used in several transactions\n\nOCFS2 uses t_commit trigger to compute and store checksum of the just\ncommitted blocks. When a buffer has b_frozen_data, checksum is computed\nfor it instead of b_data but this can result in an old checksum being\nwritten to the filesystem in the following scenario:\n\n1) transaction1 is opened\n2) handle1 is opened\n3) journal_access(handle1, bh)\n - This sets jh-\u003eb_transaction to transaction1\n4) modify(bh)\n5) journal_dirty(handle1, bh)\n6) handle1 is closed\n7) start committing transaction1, opening transaction2\n8) handle2 is opened\n9) journal_access(handle2, bh)\n - This copies off b_frozen_data to make it safe for transaction1 to commit.\n jh-\u003eb_next_transaction is set to transaction2.\n10) jbd2_journal_write_metadata() checksums b_frozen_data\n11) the journal correctly writes b_frozen_data to the disk journal\n12) handle2 is closed\n - There was no dirty call for the bh on handle2, so it is never queued for\n any more journal operation\n13) Checkpointing finally happens, and it just spools the bh via normal buffer\nwriteback. This will write b_data, which was never triggered on and thus\ncontains a wrong (old) checksum.\n\nThis patch fixes the problem by calling the trigger at the moment data is\nfrozen for journal commit - i.e., either when b_frozen_data is created by\ndo_get_write_access or just before we write a buffer to the log if\nb_frozen_data does not exist. We also rename the trigger to t_frozen as\nthat better describes when it is called.\n\nSigned-off-by: Jan Kara \u003cjack@suse.cz\u003e\nSigned-off-by: Mark Fasheh \u003cmfasheh@suse.com\u003e\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\n" }, { "commit": "a39953dd95ff10e311083d94f4f95c348cb22464", "tree": "c905adf070262a6782d7a1b664495c36fbe95fab", "parents": [ "f5e27b6ddfbafdd9c9c2f06bbf28af12581409bc" ], "author": { "name": "Wengang Wang", "email": "wen.gang.wang@oracle.com", "time": "Wed Jul 14 22:38:21 2010 +0800" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Thu Jul 15 10:56:30 2010 -0700" }, "message": "ocfs2/dlm: Remove BUG_ON from migration in the rare case of a down node\n\nFor migration, we are waiting for DLM_LOCK_RES_MIGRATING flag to be set\nbefore sending DLM_MIG_LOCKRES_MSG message to the target. We are using\ndlm_migration_can_proceed() for that purpose. However, if the node is\ndown, dlm_migration_can_proceed() will also return \"go ahead\". In this\nrare case, the DLM_LOCK_RES_MIGRATING flag might not be set yet. Remove\nthe BUG_ON() that trips over this condition.\n\nSigned-off-by: Wengang Wang \u003cwen.gang.wang@oracle.com\u003e\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\n" }, { "commit": "f5e27b6ddfbafdd9c9c2f06bbf28af12581409bc", "tree": "b55eb9842a3ee2cfebb6a24ab2ee4ffbd597daee", "parents": [ "e372357ba55ae89307af15cd680467d8f0db4f01" ], "author": { "name": "Tao Ma", "email": "tao.ma@oracle.com", "time": "Wed Jul 14 11:19:32 2010 +0800" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Thu Jul 15 10:54:28 2010 -0700" }, "message": "ocfs2: Don\u0027t duplicate pages past i_size during CoW.\n\nDuring CoW, the pages after i_size don\u0027t contain valid data, so there\u0027s\nno need to read and duplicate them.\n\nSigned-off-by: Tao Ma \u003ctao.ma@oracle.com\u003e\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\n" }, { "commit": "08be97962bf338161325d4901642f956ce8c1adb", "tree": "a4a765845def5eb95f954bf0d41ad283883a696e", "parents": [ "2f7989efd4398d92b8adffce2e07dd043a0895fe" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Jul 14 21:36:27 2010 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Jul 15 17:10:02 2010 +0200" }, "message": "x86: Force HPET readback_cmp for all ATI chipsets\n\ncommit 30a564be (x86, hpet: Restrict read back to affected ATI\nchipset) restricted the workaround for the HPET bug to SMX00\nchipsets. This was reasonable as those were the only ones against\nwhich we ever got a bug report.\n\nStephan Wolf reported now that this patch breaks his IXP400 based\nmachine. Though it\u0027s confirmed to work on other IXP400 based systems.\n\nTo error out on the safe side, we force the HPET readback workaround\nfor all ATI SMbus class chipsets.\n\nReported-by: Stephan Wolf \u003cstephan@letzte-bankreihe.de\u003e\nLKML-Reference: \u003calpine.LFD.2.00.1007142134140.3321@localhost.localdomain\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nTested-by: Stephan Wolf \u003cstephan@letzte-bankreihe.de\u003e\nAcked-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\n" }, { "commit": "728a756b8fcd22d80e2dbba8117a8a3aafd3f203", "tree": "82662dc27aaf1e277df977e57d778939be8ddb4a", "parents": [ "8b4216018bdbfbb1b76150d202b15ee68c38e991" ], "author": { "name": "Bob Peterson", "email": "rpeterso@redhat.com", "time": "Wed Jul 14 18:12:26 2010 -0400" }, "committer": { "name": "Steven Whitehouse", "email": "swhiteho@redhat.com", "time": "Thu Jul 15 09:07:56 2010 +0100" }, "message": "GFS2: rename causes kernel Oops\n\nThis patch fixes a kernel Oops in the GFS2 rename code.\n\nThe problem was in the way the gfs2 directory code was trying\nto re-use sentinel directory entries.\n\nIn the failing case, gfs2\u0027s rename function was renaming a\nfile to another name that had the same non-trivial length.\nThe file being renamed happened to be the first directory\nentry on the leaf block.\n\nFirst, the rename code (gfs2_rename in ops_inode.c) found the\noriginal directory entry and decided it could do its job by\nsimply replacing the directory entry with another. Therefore\nit determined correctly that no block allocations were needed.\n\nNext, the rename code deleted the old directory entry prior to\nreplacing it with the new name. Therefore, the soon-to-be\nreplaced directory entry was temporarily made into a directory\nentry \"sentinel\" or a place holder at the start of a leaf block.\n\nLastly, it went to re-add the replacement directory entry in\nthat leaf block. However, when gfs2_dirent_find_space was\nlooking for space in the leaf block, it used the wrong value\nfor the sentinel. That threw off its calculations so later\nit decides it can\u0027t really re-use the sentinel and therefore\nmust allocate a new leaf block. But because it previously decided\nto re-use the directory entry, it didn\u0027t waste the time to\ngrab a new block allocation for the inode. Therefore, the\ninode\u0027s i_alloc pointer was still NULL and it crashes trying to\nreference it.\n\nIn the case of sentinel directory entries, the entire dirent is\nreused, not just the \"free space\" portion of it, and therefore\nthe function gfs2_dirent_find_space should use the value 0\nrather than GFS2_DIRENT_SIZE(0) for the actual dirent size.\n\nFixing this calculation enables the reproducer programs to work\nproperly.\n\nSigned-off-by: Bob Peterson \u003crpeterso@redhat.com\u003e\nSigned-off-by: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\n" }, { "commit": "8b4216018bdbfbb1b76150d202b15ee68c38e991", "tree": "c13bd1db68ca135b6362ee8e67e558fe87bfb93c", "parents": [ "b1becbdee776b447f203aa8da9a40488d5a75e1d" ], "author": { "name": "Abhijith Das", "email": "adas@redhat.com", "time": "Sun Jul 04 01:33:24 2010 -0400" }, "committer": { "name": "Steven Whitehouse", "email": "swhiteho@redhat.com", "time": "Thu Jul 15 09:07:16 2010 +0100" }, "message": "GFS2: BUG in gfs2_adjust_quota\n\nHighMem pages on i686 do not get mapped to the buffer_heads and this was\ncausing a NULL pointer dereference when we were trying to memset page buffers\nto zero.\nWe now use zero_user() that kmaps the page and directly manipulates page data.\nThis patch also fixes a boundary condition that was incorrect.\n\nSigned-off-by: Abhi Das \u003cadas@redhat.com\u003e\nSigned-off-by: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\n" }, { "commit": "b1becbdee776b447f203aa8da9a40488d5a75e1d", "tree": "1bf927adf4bf63cc39961cad2476774ab88b47ee", "parents": [ "b7dc2df5725fe7355fd76000ead7e39728e1b8a9" ], "author": { "name": "Bob Peterson", "email": "rpeterso@redhat.com", "time": "Thu Jun 17 16:45:37 2010 -0400" }, "committer": { "name": "Steven Whitehouse", "email": "swhiteho@redhat.com", "time": "Thu Jul 15 09:06:25 2010 +0100" }, "message": "GFS2: Fix kernel NULL pointer dereference by dlm_astd\n\nThis patch fixes a problem in an error path when looking\nup dinodes. There are two sister-functions, gfs2_inode_lookup\nand gfs2_process_unlinked_inode. Both functions acquire and\nhold the i_iopen glock for the dinode being looked up. The last\nthing they try to do is hold the i_gl glock for the dinode.\nIf that glock fails for some reason, the error path was\nincorrectly calling gfs2_glock_put for the i_iopen glock twice.\nThis resulted in the glock being prematurely freed. The\n\"minimum hold time\" usually kept the glock in memory, but the\nlock interface to dlm (aka lock_dlm) freed its memory for the\nglock. In some circumstances, it would cause dlm\u0027s dlm_astd daemon\nto try to call the bast function for the freed lock_dlm memory,\nwhich resulted in a NULL pointer dereference.\n\nSigned-off-by: Bob Peterson \u003crpeterso@redhat.com\u003e\nSigned-off-by: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\n" }, { "commit": "b7dc2df5725fe7355fd76000ead7e39728e1b8a9", "tree": "4057c89535f6204d95f28950809fcb4b1c25dfa4", "parents": [ "a8bf2bc212e129dd59a8b06cdbc15079cc3bd876" ], "author": { "name": "Bob Peterson", "email": "rpeterso@redhat.com", "time": "Wed Jun 23 11:44:47 2010 -0400" }, "committer": { "name": "Steven Whitehouse", "email": "swhiteho@redhat.com", "time": "Thu Jul 15 09:05:57 2010 +0100" }, "message": "GFS2: recovery stuck on transaction lock\n\nThis patch fixes bugzilla bug #590878: GFS2: recovery stuck on\ntransaction lock. We set the frozen flag on the glock when we receive\na completion that cannot be delivered due to blocked locks. At that\npoint we check to see whether the first waiting holder has the noexp\nflag set. If the noexp lock is queued later, then we need to unfreeze\nthe glock at that point in time, namely, in the glock work function.\n\nThis patch was originally written by Steve Whitehouse, but since\nhe\u0027s on holiday, I\u0027m submitting it. It\u0027s been well tested with a\ncomplex recovery test called revolver.\n\nSigned-off-by: Steve Whitehouse \u003cswhiteho@redhat.com\u003e\nSigned-off-by: Bob Peterson \u003crpeterso@redhat.com\u003e\n" }, { "commit": "a8bf2bc212e129dd59a8b06cdbc15079cc3bd876", "tree": "b0a298e7f2534de52b9506fa1d6040e98e263a87", "parents": [ "2f7989efd4398d92b8adffce2e07dd043a0895fe" ], "author": { "name": "Bob Peterson", "email": "rpeterso@redhat.com", "time": "Thu Jun 24 19:15:09 2010 -0400" }, "committer": { "name": "Steven Whitehouse", "email": "swhiteho@redhat.com", "time": "Thu Jul 15 09:05:17 2010 +0100" }, "message": "GFS2: O_TRUNC not working on stuffed files across cluster\n\nThis patch replaces a statement that got dropped out by accident.\nWithout the patch, truncates on stuffed (very small) files cause\nthose files to have an unpredictable size.\n\nSigned-off-by: Bob Peterson \u003crpeterso@redhat.com\u003e\nSigned-off-by: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\n" }, { "commit": "2f7989efd4398d92b8adffce2e07dd043a0895fe", "tree": "8acbc880a8908ea18d724f747ea26d0afc2160bf", "parents": [ "6f7dd68b755b215deda5188a2c13c00f4776ea66", "0ebe25f90cd99bb1bcf622ec8a841421d48380d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 14 17:28:13 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 14 17:28:13 2010 -0700" }, "message": "Merge master.kernel.org:/home/rmk/linux-2.6-arm\n\n* master.kernel.org:/home/rmk/linux-2.6-arm:\n ARM: 6226/1: fix kprobe bug in ldr instruction emulation\n ARM: Update mach-types\n ARM: lockdep: fix unannotated irqs-on\n ARM: 6184/2: ux500: use neutral PRCMU base\n ARM: 6212/1: atomic ops: add memory constraints to inline asm\n ARM: 6211/1: atomic ops: fix register constraints for atomic64_add_unless\n ARM: 6210/1: Do not rely on reset defaults of L2X0_AUX_CTRL\n" }, { "commit": "6f7dd68b755b215deda5188a2c13c00f4776ea66", "tree": "2a63c972ac89d7ae290910d5c6b1c6300ccbafd5", "parents": [ "ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548", "95f72d1ed41a66f1c1c29c24d479de81a0bea36f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 14 17:27:44 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 14 17:27:44 2010 -0700" }, "message": "Merge branch \u0027lmb-to-memblock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027lmb-to-memblock\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n lmb: rename to memblock\n" }, { "commit": "ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548", "tree": "ed80eaf6245d8d1509662dc42e7184391b91e7d1", "parents": [ "bcefc8d0d3a0cba9078f519d69f138b93ad30e39", "77154a2026ee5cb2ce05a7d370c16e4c123028e5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 14 17:27:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 14 17:27:29 2010 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc/fsl-booke: Fix address issue when using relocatable kernels\n powerpc/cpm1: Mark micropatch code/data static and __init\n powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations\n powerpc/cpm: Reintroduce global spi_pram struct (fixes build issue)\n" }, { "commit": "0ebe25f90cd99bb1bcf622ec8a841421d48380d6", "tree": "ccd150cc328b87b13ea00379a3b6ea8e3c6469d0", "parents": [ "d8495378e25b3ffd40d7a78effba2566f1fe65cf" ], "author": { "name": "Nicolas Pitre", "email": "nico@fluxnic.net", "time": "Wed Jul 14 05:21:22 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Wed Jul 14 23:28:06 2010 +0100" }, "message": "ARM: 6226/1: fix kprobe bug in ldr instruction emulation\n\nFrom: Bin Yang \u003cbin.yang@marvell.com\u003e\n\nCc: stable@kernel.org\nSigned-off-by: Bin Yang \u003cbin.yang@marvell.com\u003e\nSigned-off-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "bbddd199995ff55f1bb0336cadff4ee3d02b5a2c", "tree": "ffc2f282465bd67ed58fa8f5451eef54b7650a14", "parents": [ "c59690fa484c04ab96fe932241b569a09755a4d2" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Jul 14 09:32:46 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Wed Jul 14 09:33:56 2010 -0700" }, "message": "Input: synaptics - fix wrong dimensions check\n\nThe commit 83ba9ea8a04b72dfee2515428c15e7414ba4fc61 ommitted the return\nline for the old synaptics model accidentally. This resulted in a wrong\ncheck, namely, the dimensions are checked for the old devices that don\u0027t\nsupport the query properly.\n\nThis patch adds the return line back.\n\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "95f72d1ed41a66f1c1c29c24d479de81a0bea36f", "tree": "bd92b3804ff0bea083d69af0ede52f99ab34c0af", "parents": [ "1c5474a65bf15a4cb162dfff86d6d0b5a08a740c" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Mon Jul 12 14:36:09 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 14 17:14:00 2010 +1000" }, "message": "lmb: rename to memblock\n\nvia following scripts\n\n FILES\u003d$(find * -type f | grep -vE \u0027oprofile|[^K]config\u0027)\n\n sed -i \\\n -e \u0027s/lmb/memblock/g\u0027 \\\n -e \u0027s/LMB/MEMBLOCK/g\u0027 \\\n $FILES\n\n for N in $(find . -name lmb.[ch]); do\n M\u003d$(echo $N | sed \u0027s/lmb/memblock/g\u0027)\n mv $N $M\n done\n\nand remove some wrong change like lmbench and dlmb etc.\n\nalso move memblock.c from lib/ to mm/\n\nSuggested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "bcefc8d0d3a0cba9078f519d69f138b93ad30e39", "tree": "45079de6cba248d2ea0f420cddda20f29f386aea", "parents": [ "177dd7e1ebac9420636f155e8d429bc4f809c724", "5cdfa1c3bbabb809ef3134f741a63e13373a8cad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 13 17:31:11 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 13 17:31:11 2010 -0700" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n input: i8042 - add runtime check in x86\u0027s i8042_platform_init\n Revert \"Input: fixup X86_MRST selects\"\n Revert \"Input: do not force selecting i8042 on Moorestown\"\n x86, mrst: Add i8042_detect API for Moorestwon platform\n x86: Add i8042 pre-detection hook to x86_platform_ops\n x86, platform: Export x86_platform to modules\n" }, { "commit": "177dd7e1ebac9420636f155e8d429bc4f809c724", "tree": "e68acbf2dcab6848e46700ac14a4b6d902bc1749", "parents": [ "1c5474a65bf15a4cb162dfff86d6d0b5a08a740c", "91546356d0e550fa23abf7f4b04a903c2855761f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 13 17:30:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 13 17:30:49 2010 -0700" }, "message": "Merge branch \u0027kvm-updates/2.6.35\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm\n\n* \u0027kvm-updates/2.6.35\u0027 of git://git.kernel.org/pub/scm/virt/kvm/kvm:\n KVM: MMU: flush remote tlbs when overwriting spte with different pfn\n KVM: VMX: Fix host MSR_KERNEL_GS_BASE corruption\n" }, { "commit": "1c5474a65bf15a4cb162dfff86d6d0b5a08a740c", "tree": "d7c667ace9790b0e62352ad738c131d7604ae9f6", "parents": [ "c2330e286f68f1c408b4aa6515ba49d57f05beae" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:55:33 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:55:33 2010 -0700" }, "message": "Linux 2.6.35-rc5\n" }, { "commit": "c2330e286f68f1c408b4aa6515ba49d57f05beae", "tree": "f981251a3fa0a9a31668e5eac0a76281e9d55ba2", "parents": [ "7e48c02829ad6a824775a78bf100acbcbac2871f", "07a8c03f3e06129e847acd068b8b89c13357ee64" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:47:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:47:01 2010 -0700" }, "message": "Merge branch \u0027arm/defconfig/reduced-v2.6.35-rc1\u0027 of git://git.pengutronix.de/git/ukl/linux-2.6\n\n* \u0027arm/defconfig/reduced-v2.6.35-rc1\u0027 of git://git.pengutronix.de/git/ukl/linux-2.6:\n ARM: reduce defconfigs\n\nThis is a big change, but results in no loss of information, despite us\nlosing almost 200k lines:\n\n 177 files changed, 652 insertions(+), 194157 deletions(-)\n\nand Grant Likely thinks powerpc can also use the same reduction\ntechnique.\n\nThe python script that did the reduction looks like this:\n\n #! /usr/bin/env python\n # vim: set fileencoding\u003dutf-8 :\n # Copyright (C) 2010 by Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\n\n import re\n import subprocess\n import os\n import sys\n\n # This prevents including a timestamp in the .config which makes comparing a\n # bit easier.\n os.environ[\u0027KCONFIG_NOTIMESTAMP\u0027] \u003d \u0027Yes, please\u0027\n\n # XXX: get these using getopt\n kernel_tree \u003d \u0027\u0027 # os.path.join(os.environ[\u0027HOME\u0027], \u0027gsrc\u0027, \u0027linux-2.6\u0027)\n arch \u003d \u0027arm\u0027\n target \u003d sys.argv[1]\n defconfig_src \u003d os.path.join(kernel_tree, \u0027arch/%s/configs/%s\u0027 % (arch, target))\n\n subprocess.check_call([\u0027make\u0027, \u0027-s\u0027, \u0027ARCH\u003d%s\u0027 % arch, target])\n origconfig \u003d list(open(\u0027.config\u0027))\n config \u003d list(origconfig)\n config_size \u003d os.stat(\u0027.config\u0027).st_size\n\n i \u003d 0\n\n while i \u003c len(config):\n print \u0027test for %r\u0027 % config[i]\n defconfig \u003d open(defconfig_src, \u0027w\u0027)\n defconfig.writelines(config[:i])\n defconfig.writelines(config[i + 1:])\n defconfig.close()\n subprocess.check_call([\u0027make\u0027, \u0027-s\u0027, \u0027ARCH\u003d%s\u0027 % arch, target])\n if os.stat(\u0027.config\u0027).st_size \u003d\u003d config_size and list(open(\u0027.config\u0027)) \u003d\u003d origconfig:\n del config[i]\n else:\n i +\u003d 1\n\n defconfig \u003d open(defconfig_src, \u0027w\u0027)\n defconfig.writelines(config)\n defconfig.close()\n\nwhich is pretty self-explanatory.\n\nAcked-by: Nicolas Pitre \u003cnico@fluxnic.net\u003e\nAcked-by: Russell King \u003clinux@arm.linux.org.uk\u003e\nAcked-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7e48c02829ad6a824775a78bf100acbcbac2871f", "tree": "9f9cb4a2cd18e64a63535878d30253236ccca5e0", "parents": [ "9f71963702764243d0835b07660ae505b66ca09f", "ac0547dc62e67a3e0b0c1628b6e49efba8f517db" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:44:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:44:43 2010 -0700" }, "message": "Merge branch \u0027fix/hda\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027fix/hda\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:\n ALSA: hda - Restore cleared pin controls on resume\n" }, { "commit": "9f71963702764243d0835b07660ae505b66ca09f", "tree": "cb6b4d3ea8c796fe00d309601c7279aded078906", "parents": [ "293ffa8faa21bbc5e77d3f779d95c4146ee8f709", "5d9955f8a978c1992a0f9966d22c43471214d43b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:44:19 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:44:19 2010 -0700" }, "message": "Merge branch \u0027v4l_for_2.6.35\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_2.6.35\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:\n V4L/DVB: uvc: Fix multiple symbols definitions with UVC gadget and host drivers\n V4L/DVB: v4l: mem2mem_testdev: fix g_fmt NULL pointer dereference\n V4L/DVB: uvcvideo: Power line frequency control doesn\u0027t support GET_MIN/MAX/RES\n V4L/DVB: ivtv: Add delay to ensure the decoder always restarts with a blank screen\n V4L/DVB: Documentation: Add the Philips FQ1236 MK5 to video4linux/CARDLIST.tuner\n V4L/DVB: tveeprom: Add an entry for tuner code 168: a TCL M30WTP-4N-E tuner\n V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner\n V4L/DVB: OMAP_VOUT: fix: Module params were not working through bootargs\n V4L/DVB: OMAP_VOUT: fix: Replaced dma-sg with dma-contig\n V4L/DVB: OMAP_VOUT:Build FIX: Rebased against latest DSS2 changes\n" }, { "commit": "293ffa8faa21bbc5e77d3f779d95c4146ee8f709", "tree": "e3783df5039b7a7bfa02d1d61d4afa95c6c6c810", "parents": [ "70aff0ce210f58afa3ed47102532f20834da31b3", "29129a98e6fc892d63bf7b8efcb458a258fe1683" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:42:21 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:42:21 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:\n HID: Send Report ID when numbered reports are sent over the control endpoint.\n HID: Enable HID_QUIRK_MULTI_INPUT for Retro Adaptor\n HID: add support for CH Eclipse yoke\n HID: eliminate a double lock in debug code\n HID: ntrig: add support for new firwmare versions\n HID: check for HID_QUIRK_IGNORE during probing\n HID: roccat: fix modules interdependencies\n" }, { "commit": "70aff0ce210f58afa3ed47102532f20834da31b3", "tree": "ddfde26c11622b04a3303794422b2df556fe22bd", "parents": [ "589643be6693c46fbc54bae77745f336c8ed4bcc" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Jul 12 17:45:49 2010 -0300" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 12 14:42:05 2010 -0700" }, "message": "MAINTAINERS: fix EDAC-I7CORE file patterns\n\nFile patterns are one per line.\nFixed include file location.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@infradead.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e372357ba55ae89307af15cd680467d8f0db4f01", "tree": "ad5220668336431e815d0a933ffc9faed6a4a408", "parents": [ "121a39bb00b421211f4f590c440a8f636d3ae807" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat Jul 10 16:33:36 2010 +0200" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Mon Jul 12 13:57:53 2010 -0700" }, "message": "ocfs2: tighten up strlen() checking\n\nThis function is only called from one place and it\u0027s like this:\n\tdlm_register_domain(conn-\u003ecc_name, dlm_key, \u0026fs_version);\n\nThe \"conn-\u003ecc_name\" is 64 characters long. If strlen(conn-\u003ecc_name)\nwere equal to O2NM_MAX_NAME_LEN (64) that would be a bug because\nstrlen() doesn\u0027t count the NULL character.\n\nIn fact, if you look how O2NM_MAX_NAME_LEN is used, it mostly describes\n64 character buffers. The only exception is nd_name from struct\no2nm_node.\n\nAnyway I looked into it and in this case the domain string comes from\nosb-\u003euuid_str in ocfs2_setup_osb_uuid(). That\u0027s 32 characters and NULL\nwhich easily fits into O2NM_MAX_NAME_LEN. This patch doesn\u0027t change how\nthe code works, but I think it makes the code a little cleaner.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\n" }, { "commit": "121a39bb00b421211f4f590c440a8f636d3ae807", "tree": "18219c168c7b35e9d17a283f1217eb802f0d3d11", "parents": [ "a78f9f4668949a6588b8872f162e86685c63d023" ], "author": { "name": "Tao Ma", "email": "tao.ma@oracle.com", "time": "Fri Jul 09 14:53:12 2010 +0800" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Mon Jul 12 13:57:50 2010 -0700" }, "message": "ocfs2: Make xattr reflink work with new local alloc reservation.\n\nThe new reservation code in local alloc has add the limitation\nthat the caller should handle the case that the local alloc\ndoesn\u0027t give use enough contiguous clusters. It make the old\nxattr reflink code broken.\n\nSo this patch udpate the xattr reflink code so that it can\nhandle the case that local alloc give us one cluster at a time.\n\nSigned-off-by: Tao Ma \u003ctao.ma@oracle.com\u003e\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\n" }, { "commit": "a78f9f4668949a6588b8872f162e86685c63d023", "tree": "e4757b666f2c51f3e2f596a921d4f9fe13c2dbc1", "parents": [ "0a463b74e7e6856b24e613de2b85237c6e11890b" ], "author": { "name": "Tao Ma", "email": "tao.ma@oracle.com", "time": "Fri Jul 09 14:53:11 2010 +0800" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Mon Jul 12 13:57:24 2010 -0700" }, "message": "ocfs2: make xattr extension work with new local alloc reservation.\n\nThe old ocfs2_xattr_extent_allocation is too optimistic about\nthe clusters we can get. So actually if the file system is\ntoo fragmented, ocfs2_add_clusters_in_btree will return us\nwith EGAIN and we need to allocate clusters once again.\n\nSo this patch change it to a while loop so that we can allocate\nclusters until we reach clusters_to_add.\n\nSigned-off-by: Tao Ma \u003ctao.ma@oracle.com\u003e\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "0a463b74e7e6856b24e613de2b85237c6e11890b", "tree": "ad64c3fca8ee02b71a1ae44886abcc3057b80452", "parents": [ "f471c9df922a80ca9af1d9a490b4aab3f990ec19" ], "author": { "name": "Tao Ma", "email": "tao.ma@oracle.com", "time": "Thu Jul 08 11:11:11 2010 +0800" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Mon Jul 12 13:56:18 2010 -0700" }, "message": "ocfs2: Remove the redundant cpu_to_le64.\n\nIn ocfs2_block_group_alloc, we set c_blkno by bg-\u003ebg_blkno.\nBut actually bg-\u003ebg_blkno is already changed to little endian\nin ocfs2_block_group_fill. So remove the extra cpu_to_le64.\n\nReported-by: Marcos Matsunaga \u003cMarcos.Matsunaga@oracle.com\u003e\nSigned-off-by: Tao Ma \u003ctao.ma@oracle.com\u003e\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\n" }, { "commit": "f471c9df922a80ca9af1d9a490b4aab3f990ec19", "tree": "554116c78b9345c7bc0741bbc6be1fd7d5d390d4", "parents": [ "693c241a5f6aa01417f5f4caf9f82e60e316398d" ], "author": { "name": "Wengang Wang", "email": "wen.gang.wang@oracle.com", "time": "Wed Jun 30 20:23:30 2010 +0800" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Mon Jul 12 13:56:14 2010 -0700" }, "message": "ocfs2/dlm: don\u0027t access beyond bitmap size\n\ndlm-\u003erecovery_map is defined as\n\tunsigned long recovery_map[BITS_TO_LONGS(O2NM_MAX_NODES)];\n\nWe should treat O2NM_MAX_NODES as the bit map size in bits.\nThis patches fixes a bit operation that takes O2NM_MAX_NODES + 1 as bitmap size.\n\nSigned-off-by: Wengang Wang \u003cwen.gang.wang@oracle.com\u003e\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\n" }, { "commit": "693c241a5f6aa01417f5f4caf9f82e60e316398d", "tree": "4d3509db621c7af934332c433e62b49bb548a60b", "parents": [ "5693486bad2bc2ac585a2c24f7e2f3964b478df9" ], "author": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Fri Jul 02 17:20:27 2010 -0700" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Mon Jul 12 13:55:27 2010 -0700" }, "message": "ocfs2: No need to zero pages past i_size.\n\nWhen ocfs2 fills a hole, it does so by allocating clusters. When a\ncluster is larger than the write, ocfs2 must zero the portions of the\ncluster outside of the write. If the clustersize is smaller than a\npagecache page, this is handled by the normal pagecache mechanisms, but\nwhen the clustersize is larger than a page, ocfs2\u0027s write code will zero\nthe pages adjacent to the write. This makes sure the entire cluster is\nzeroed correctly.\n\nCurrently ocfs2 behaves exactly the same when writing past i_size.\nHowever, this means ocfs2 is writing zeroed pages for portions of a new\ncluster that are beyond i_size. The page writeback code isn\u0027t expecting\nthis. It treats all pages past the one containing i_size as left behind\ndue to a previous truncate operation.\n\nThankfully, ocfs2 calculates the number of pages it will be working on\nup front. The rest of the write code merely honors the original\ncalculation. We can simply trim the number of pages to only cover the\nactual file data.\n\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "d8495378e25b3ffd40d7a78effba2566f1fe65cf", "tree": "55d64ed558899907587259de76fb1b09302c6396", "parents": [ "ac78884e6d89714d18b32b5b7d574116ecfb7c88" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jul 12 21:10:16 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Mon Jul 12 21:14:53 2010 +0100" }, "message": "ARM: Update mach-types\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "91546356d0e550fa23abf7f4b04a903c2855761f", "tree": "ce2e9304bac3b125a1e3fca09db7dca2a2de883f", "parents": [ "da38f43859467a8048365b9e1cce99ccbc62b6e2" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@cn.fujitsu.com", "time": "Wed Jun 30 16:04:06 2010 +0800" }, "committer": { "name": "Marcelo Tosatti", "email": "mtosatti@redhat.com", "time": "Mon Jul 12 14:05:56 2010 -0300" }, "message": "KVM: MMU: flush remote tlbs when overwriting spte with different pfn\n\nAfter remove a rmap, we should flush all vcpu\u0027s tlb\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@cn.fujitsu.com\u003e\nSigned-off-by: Marcelo Tosatti \u003cmtosatti@redhat.com\u003e\n" }, { "commit": "29129a98e6fc892d63bf7b8efcb458a258fe1683", "tree": "846461a57bf8ae779a681d2af6fdd6886bf5c299", "parents": [ "1f45e3249cd4720ab72c3bea82c27162a2d8b577" ], "author": { "name": "Alan Ott", "email": "alan@signal11.us", "time": "Wed Jun 30 09:50:36 2010 -0400" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Sun Jul 11 23:13:15 2010 +0200" }, "message": "HID: Send Report ID when numbered reports are sent over the control endpoint.\n\nThe Report ID wasn\u0027t sent as part of the payload for reports which were sent\nover the control endpoint. This is required by section 8.1 of the HID spec.\n\nSigned-off-by: Alan Ott \u003calan@signal11.us\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "5d9955f8a978c1992a0f9966d22c43471214d43b", "tree": "a207631118ed9ae8f7757adabda576ee5923ae97", "parents": [ "b6ae906b04113cb73c1ffe9c42fbcdcb074d9f07" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Sat Jul 10 16:13:05 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Sun Jul 11 17:45:10 2010 -0300" }, "message": "V4L/DVB: uvc: Fix multiple symbols definitions with UVC gadget and host drivers\n\nThe UVC gadget driver borrowed code from the UVC host driver without\nchanging the symbol names. This results in a namespace clash with\nmultiple definitions of several symbols when compiling both drivers in\nthe kernel.\n\nMake all generic UVC functions and variables static in the UVC gadget\ndriver, as the symbols are not referenced outside of the gadget driver.\nRename the uvc_trace_param global variable to uvc_gadget_trace_param.\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "589643be6693c46fbc54bae77745f336c8ed4bcc", "tree": "03c855e34cc86d5e0dc914321698a1d2dfc11f04", "parents": [ "80519bc77b52729ca49b278b67d58715e38b85e9", "faabd47f7e3a36574abcdff0b3506abb092bbe24" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 11 13:35:34 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 11 13:35:34 2010 -0700" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n hwmon: Fix autoloading of fschmd on recent Fujitsu machines\n hwmon: (coretemp) Properly label the sensors\n hwmon: (coretemp) Skip duplicate CPU entries\n hwmon: (it87) Fix in7 on IT8720F\n hwmon: (k8temp) Fix temperature reporting for ASB1 processor revisions\n" }, { "commit": "80519bc77b52729ca49b278b67d58715e38b85e9", "tree": "9c6dca32abb277f23a8eb99bfc39997cef42c6c7", "parents": [ "ecd4b48a163b55d7eb4132617100b90d0d2768ec", "102b59c6d6d30fb6560177fd1ae8a34c4c163897" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 11 13:32:55 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jul 11 13:32:55 2010 -0700" }, "message": "Merge branch \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027i2c-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n i2c/mips: Fix error return codes from Sibyte i2c bus driver\n i2c: Fix probability check\n" }, { "commit": "1f45e3249cd4720ab72c3bea82c27162a2d8b577", "tree": "9273567c55eab5ae2b321b7c22f655439a1eb08b", "parents": [ "c8e846461184c130fa4db90f1d218e1dffb97612" ], "author": { "name": "Peter Edwards", "email": "samwise@bagshot-row.org", "time": "Sun Jul 11 17:45:50 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Sun Jul 11 22:11:42 2010 +0200" }, "message": "HID: Enable HID_QUIRK_MULTI_INPUT for Retro Adaptor\n\nPatch for linux-2.6.35-rc4 mainline kernel to enable Paul Qureshi\u0027s\nRetro Adapter [http://keio.dk/retroadapter.html], an open source USB\ndevice which allows controllers and joysticks from classic computers\nand consoles to work on modern PCs, to appear as two separate devices\nunder Linux.\nSigned-off-by: Peter Edwards \u003csamwise@bagshot-row.org\u003e\nAcked-by: Paul Qureshi \u003cretro@world3.net\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "c8e846461184c130fa4db90f1d218e1dffb97612", "tree": "21cf963b75ec846e722e1c9f4377190b80eda1fe", "parents": [ "ca9fe1588427f246ad4c389b0170b29a432804b6" ], "author": { "name": "Jonathan Rockway", "email": "jon@jrock.us", "time": "Sat Jul 03 02:59:01 2010 -0500" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Sun Jul 11 21:52:06 2010 +0200" }, "message": "HID: add support for CH Eclipse yoke\n\nThis USB flight yoke needs the NOGET quirk, like most of CH\u0027s other\nproducts. This patch adds that.\n\nSigned-off-by: Jonathan Rockway \u003cjon@jrock.us\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "77154a2026ee5cb2ce05a7d370c16e4c123028e5", "tree": "acd8ef9ff3e7d21f9f6deab764d058dbf79f7d7f", "parents": [ "af71bcfeaaaad92147922282341d394093a4fc9b" ], "author": { "name": "Matthew McClintock", "email": "msm@freescale.com", "time": "Tue Jun 29 14:42:07 2010 -0500" }, "committer": { "name": "Kumar Gala", "email": "galak@kernel.crashing.org", "time": "Sun Jul 11 11:04:08 2010 -0500" }, "message": "powerpc/fsl-booke: Fix address issue when using relocatable kernels\n\nWhen booting a relocatable kernel it needs to jump to the correct\nstart address, which for BookE parts is usually unchanged\nregardless of the physical memory offset.\n\nRecent changes cause problems with how we calculate the start\naddress, it was always adding the RMO into the start address\nwhich is incorrect. This patch only adds in the RMO offset\nif we are in the kexec code path, as it needs the RMO to work\ncorrectly.\n\nInstead of adding the RMO offset in in the common code path, we\ncan just set r6 to the RMO offset in the kexec code path instead\nof to zero, and finally perform the masking in the common code\npath\n\nSigned-off-by: Matthew McClintock \u003cmsm@freescale.com\u003e\nSigned-off-by: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\n" }, { "commit": "af71bcfeaaaad92147922282341d394093a4fc9b", "tree": "21195287b429f52c270f6d19a54265e3c8a14c77", "parents": [ "2069a6ae19a34d96cc9cb284eb645b165138e03f" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Thu Jul 08 21:16:16 2010 +0400" }, "committer": { "name": "Kumar Gala", "email": "galak@kernel.crashing.org", "time": "Sun Jul 11 11:04:06 2010 -0500" }, "message": "powerpc/cpm1: Mark micropatch code/data static and __init\n\nThis saves runtime memory and fixes lots of sparse warnings like this:\n\n CHECK arch/powerpc/sysdev/micropatch.c\n arch/powerpc/sysdev/micropatch.c:27:6: warning: symbol \u0027patch_2000\u0027\n was not declared. Should it be static?\n arch/powerpc/sysdev/micropatch.c:146:6: warning: symbol \u0027patch_2f00\u0027\n was not declared. Should it be static?\n ...\n\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nSigned-off-by: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\n" }, { "commit": "2069a6ae19a34d96cc9cb284eb645b165138e03f", "tree": "6a176cb00eab48113e1b99fa3601be46f0be4a7c", "parents": [ "56825c88ff438f4dbb51a44591cc29e707fe783a" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Thu Jul 08 21:16:14 2010 +0400" }, "committer": { "name": "Kumar Gala", "email": "galak@kernel.crashing.org", "time": "Sun Jul 11 11:03:49 2010 -0500" }, "message": "powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations\n\nWarnings are treated as errors for arch/powerpc code, so build fails\nwith CONFIG_I2C_SPI_UCODE_PATCH\u003dy:\n\n CC arch/powerpc/sysdev/micropatch.o\n cc1: warnings being treated as errors\n arch/powerpc/sysdev/micropatch.c: In function \u0027cpm_load_patch\u0027:\n arch/powerpc/sysdev/micropatch.c:630: warning: unused variable \u0027smp\u0027\n make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1\n\nAnd with CONFIG_USB_SOF_UCODE_PATCH\u003dy:\n\n CC arch/powerpc/sysdev/micropatch.o\n cc1: warnings being treated as errors\n arch/powerpc/sysdev/micropatch.c: In function \u0027cpm_load_patch\u0027:\n arch/powerpc/sysdev/micropatch.c:629: warning: unused variable \u0027spp\u0027\n arch/powerpc/sysdev/micropatch.c:628: warning: unused variable \u0027iip\u0027\n make[1]: *** [arch/powerpc/sysdev/micropatch.o] Error 1\n\nThis patch fixes these issues by introducing proper #ifdefs.\n\nCc: \u003cstable@kernel.org\u003e [ .33, .34 ]\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nSigned-off-by: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\n" }, { "commit": "56825c88ff438f4dbb51a44591cc29e707fe783a", "tree": "766611bf5fa245863eeabfbe011991bf9b3eaf5c", "parents": [ "e467e104bb7482170b79f516d2025e7cfcaaa733" ], "author": { "name": "Anton Vorontsov", "email": "avorontsov@mvista.com", "time": "Thu Jul 08 21:16:10 2010 +0400" }, "committer": { "name": "Kumar Gala", "email": "galak@kernel.crashing.org", "time": "Sun Jul 11 11:03:22 2010 -0500" }, "message": "powerpc/cpm: Reintroduce global spi_pram struct (fixes build issue)\n\nspi_t was removed in commit 644b2a680ccc51a9ec4d6beb12e9d47d2dee98e2\n(\"powerpc/cpm: Remove SPI defines and spi structs\"), the commit assumed\nthat spi_t isn\u0027t used anywhere outside of the spi_mpc8xxx driver. But\nit appears that the struct is needed for micropatch code. So, let\u0027s\nreintroduce the struct.\n\nFixes the following build issue:\n\n CC arch/powerpc/sysdev/micropatch.o\n micropatch.c: In function \u0027cpm_load_patch\u0027:\n micropatch.c:629: error: expected \u0027\u003d\u0027, \u0027,\u0027, \u0027;\u0027, \u0027asm\u0027 or \u0027__attribute__\u0027 before \u0027*\u0027 token\n micropatch.c:629: error: \u0027spp\u0027 undeclared (first use in this function)\n micropatch.c:629: error: (Each undeclared identifier is reported only once\n micropatch.c:629: error: for each function it appears in.)\n\nReported-by: LEROY Christophe \u003cchristophe.leroy@c-s.fr\u003e\nReported-by: Tony Breeds \u003ctony@bakeyournoodle.com\u003e\nCc: \u003cstable@kernel.org\u003e [ .33, .34 ]\nSigned-off-by: Anton Vorontsov \u003cavorontsov@mvista.com\u003e\nSigned-off-by: Kumar Gala \u003cgalak@kernel.crashing.org\u003e\n" }, { "commit": "ac78884e6d89714d18b32b5b7d574116ecfb7c88", "tree": "4e2d9d3106f10f5ce7ae3c9469444cab8ec75024", "parents": [ "d9e38040ccf9eb06b9b41c393c512ceb23f51a7f" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 10 10:10:18 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Jul 10 10:53:13 2010 +0100" }, "message": "ARM: lockdep: fix unannotated irqs-on\n\nCPU: Testing write buffer coherency: ok\n------------[ cut here ]------------\nWARNING: at kernel/lockdep.c:3145 check_flags+0xcc/0x1dc()\nModules linked in:\n[\u003cc0035120\u003e] (unwind_backtrace+0x0/0xf8) from [\u003cc0355374\u003e] (dump_stack+0x20/0x24)\n[\u003cc0355374\u003e] (dump_stack+0x20/0x24) from [\u003cc0060c04\u003e] (warn_slowpath_common+0x58/0x70)\n[\u003cc0060c04\u003e] (warn_slowpath_common+0x58/0x70) from [\u003cc0060c3c\u003e] (warn_slowpath_null+0x20/0x24)\n[\u003cc0060c3c\u003e] (warn_slowpath_null+0x20/0x24) from [\u003cc008f224\u003e] (check_flags+0xcc/0x1dc)\n[\u003cc008f224\u003e] (check_flags+0xcc/0x1dc) from [\u003cc00945dc\u003e] (lock_acquire+0x50/0x140)\n[\u003cc00945dc\u003e] (lock_acquire+0x50/0x140) from [\u003cc0358434\u003e] (_raw_spin_lock+0x50/0x88)\n[\u003cc0358434\u003e] (_raw_spin_lock+0x50/0x88) from [\u003cc00fd114\u003e] (set_task_comm+0x2c/0x60)\n[\u003cc00fd114\u003e] (set_task_comm+0x2c/0x60) from [\u003cc007e184\u003e] (kthreadd+0x30/0x108)\n[\u003cc007e184\u003e] (kthreadd+0x30/0x108) from [\u003cc0030104\u003e] (kernel_thread_exit+0x0/0x8)\n---[ end trace 1b75b31a2719ed1c ]---\npossible reason: unannotated irqs-on.\nirq event stamp: 3\nhardirqs last enabled at (2): [\u003cc0059bb0\u003e] finish_task_switch+0x48/0xb0\nhardirqs last disabled at (3): [\u003cc002f0b0\u003e] ret_slow_syscall+0xc/0x1c\nsoftirqs last enabled at (0): [\u003cc005f3e0\u003e] copy_process+0x394/0xe5c\nsoftirqs last disabled at (0): [\u003c(null)\u003e] (null)\n\nFix this by ensuring that the lockdep interrupt state is manipulated in\nthe appropriate places. We essentially treat userspace as an entirely\nseparate environment which isn\u0027t relevant to lockdep (lockdep doesn\u0027t\nmonitor userspace.) We don\u0027t tell lockdep that IRQs will be enabled\nin that environment.\n\nInstead, when creating kernel threads (which is a rare event compared\nto entering/leaving userspace) we have to update the lockdep state. Do\nthis by starting threads with IRQs disabled, and in the kthread helper,\ntell lockdep that IRQs are enabled, and enable them.\n\nThis provides lockdep with a consistent view of the current IRQ state\nin kernel space.\n\nThis also revert portions of 0d928b0b616d1c5c5fe76019a87cba171ca91633\nwhich didn\u0027t fix the problem.\n\nTested-by: Ming Lei \u003ctom.leiming@gmail.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "102b59c6d6d30fb6560177fd1ae8a34c4c163897", "tree": "7e39292a3c448479df96f1ba6a0941de32e65d76", "parents": [ "827900c55665dc8e20b05bb18d3f6e078eaa6183" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sat Jul 10 09:42:47 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Sat Jul 10 09:42:47 2010 +0200" }, "message": "i2c/mips: Fix error return codes from Sibyte i2c bus driver\n\nSibyte i2c bus driver returns non-descriptive error values.\nUpdate to return error values as defined in Documentation/i2c/fault-codes.\n\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "827900c55665dc8e20b05bb18d3f6e078eaa6183", "tree": "11777ea285278026d01a1f84751e6b52dd6d4521", "parents": [ "e467e104bb7482170b79f516d2025e7cfcaaa733" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Sat Jul 10 09:42:46 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Sat Jul 10 09:42:46 2010 +0200" }, "message": "i2c: Fix probability check\n\nThe new unified probing function differs from the original code, and\nthe preliminary test whether probing is possible must be updated\naccordingly.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "44a54f787c0abcf75a2ed49b8ec8b2b512468f73", "tree": "debbf5656caf6260aa4d6fc276dd043624527822", "parents": [ "108553e1f3c45a92d23681a378ad9e4c3230eebc" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Fri Jul 09 15:41:44 2010 -0400" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Fri Jul 09 15:53:04 2010 -0400" }, "message": "tracing: Add alignment to syscall metadata declarations\n\nFor some reason if we declare a static variable and then assign it\nlater, and the assignment contains a __attribute__((__aligned__(#))),\nsome versions of gcc will ignore it.\n\nThis caused the syscall meta data to not be compact in its section\nand caused a kernel oops when the section was being read.\n\nThe fix for these versions of gcc seems to be to add the aligned\nattribute to the declaration as well.\n\nThis fixes the BZ regression:\n\n https://bugzilla.kernel.org/show_bug.cgi?id\u003d16353\n\nReported-by: Zeev Tarantov \u003czeev.tarantov@gmail.com\u003e\nTested-by: Zeev Tarantov \u003czeev.tarantov@gmail.com\u003e\nAcked-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003cAANLkTinkKVmB0fpVeqUkMeqe3ZYeXJdI8xDuzJEOjYwh@mail.gmail.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "faabd47f7e3a36574abcdff0b3506abb092bbe24", "tree": "dfe23ab344d56a0cdc2c222a87cb6dc0f802bcf0", "parents": [ "3f4f09b4be35d38d6e2bf22c989443e65e70fc4c" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Fri Jul 09 16:22:51 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Fri Jul 09 16:22:51 2010 +0200" }, "message": "hwmon: Fix autoloading of fschmd on recent Fujitsu machines\n\nFujitsu slightly changed the DMI strings in their recent machines,\n(for example the D2778) and this breaks the automatic loading of the\nneeded fschmd driver. Being more tolerant on string comparison fixes\nthe issue.\n\nThis closes bug #15634:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d15634\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nTested-by: Sergey Spiridonov \u003csena@hurd.homeunix.org\u003e\nCc: Hans de Goede \u003chdegoede@redhat.com\u003e\n" }, { "commit": "3f4f09b4be35d38d6e2bf22c989443e65e70fc4c", "tree": "3c40801ab0f08191232bf8ac465bbafe317dc42c", "parents": [ "d883b9f0977269d519469da72faec6a7f72cb489" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Fri Jul 09 16:22:51 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Fri Jul 09 16:22:51 2010 +0200" }, "message": "hwmon: (coretemp) Properly label the sensors\n\nDon\u0027t assume that CPU entry number and core ID always match. It\nworked in the simple cases (single CPU, no HT) but fails on\nmulti-CPU systems.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Huaxu Wan \u003chuaxu.wan@intel.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "d883b9f0977269d519469da72faec6a7f72cb489", "tree": "75f5764d4272e8aef005ecb5e7667773afa1b7e7", "parents": [ "436cad2a41a40c6c32bd9152b63d17eeb1f7c99b" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Fri Jul 09 16:22:49 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Fri Jul 09 16:22:49 2010 +0200" }, "message": "hwmon: (coretemp) Skip duplicate CPU entries\n\nOn hyper-threaded CPUs, each core appears twice in the CPU list. Skip\nthe second entry to avoid duplicate sensors.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Huaxu Wan \u003chuaxu.wan@intel.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "436cad2a41a40c6c32bd9152b63d17eeb1f7c99b", "tree": "d6077cd22d86eabaa6a833b67b27d00e4cac5873", "parents": [ "d535bad90dad4eb42ec6528043fcfb53627d4f89" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Fri Jul 09 16:22:48 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Fri Jul 09 16:22:48 2010 +0200" }, "message": "hwmon: (it87) Fix in7 on IT8720F\n\nThe IT8720F has no VIN7 pin, so VCCH should always be routed\ninternally to VIN7 with an internal divider. Curiously, there still\nis a configuration bit to control this, which means it can be set\nincorrectly. And even more curiously, many boards out there are\nimproperly configured, even though the IT8720F datasheet claims that\nthe internal routing of VCCH to VIN7 is the default setting. So we\nforce the internal routing in this case.\n\nIt turns out that all boards with the wrong setting are from Gigabyte,\nso I suspect a BIOS bug. But it\u0027s easy enough to workaround in the\ndriver, so let\u0027s do it.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Jean-Marc Spaggiari \u003cjean-marc@spaggiari.org\u003e\nCc: stable@kernel.org\n" }, { "commit": "d535bad90dad4eb42ec6528043fcfb53627d4f89", "tree": "0ec65cd980bcfa0e859cdf4a43d583d331fd130f", "parents": [ "e467e104bb7482170b79f516d2025e7cfcaaa733" ], "author": { "name": "Andreas Herrmann", "email": "andreas.herrmann3@amd.com", "time": "Fri Jul 09 16:22:47 2010 +0200" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Fri Jul 09 16:22:47 2010 +0200" }, "message": "hwmon: (k8temp) Fix temperature reporting for ASB1 processor revisions\n\nReported temperature for ASB1 CPUs is too high.\nAdd ASB1 CPU revisions (these are also non-desktop variants) to the\nlist of CPUs for which the temperature fixup is not required.\n\nExample: (from LENOVO ThinkPad Edge 13, 01972NG, system was idle)\n\n Current kernel reports\n\n $ sensors\n k8temp-pci-00c3\n Adapter: PCI adapter\n Core0 Temp: +74.0 C\n Core0 Temp: +70.0 C\n Core1 Temp: +69.0 C\n Core1 Temp: +70.0 C\n\n With this patch I have\n\n $ sensors\n k8temp-pci-00c3\n Adapter: PCI adapter\n Core0 Temp: +54.0 C\n Core0 Temp: +51.0 C\n Core1 Temp: +48.0 C\n Core1 Temp: +49.0 C\n\nCc: stable@kernel.org [.32.x .33.x, .34.x]\nCc: Rudolf Marek \u003cr.marek@assembler.cz\u003e\nSigned-off-by: Andreas Herrmann \u003candreas.herrmann3@amd.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "d9e38040ccf9eb06b9b41c393c512ceb23f51a7f", "tree": "ca6103a3d1976832031e2c6561ce768432ce75ad", "parents": [ "398aa66827155ef52bab58bebd24597d90968929" ], "author": { "name": "Linus Walleij", "email": "linus.walleij@stericsson.com", "time": "Wed Jun 23 07:59:48 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jul 09 14:46:47 2010 +0100" }, "message": "ARM: 6184/2: ux500: use neutral PRCMU base\n\nThe MTU wallclock timing fix-up patch was hardwired to the DB8500\ncausing a regression. This makes it work on the DB5500 as well.\n\nSigned-off-by: Linus Walleij \u003clinus.walleij@stericsson.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "398aa66827155ef52bab58bebd24597d90968929", "tree": "51c49d73d0aba2bb3433e735533274f0c61362fb", "parents": [ "068de8d1be48a04b92fd97f76bb7e113b7be82a8" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Thu Jul 08 10:59:16 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jul 09 11:29:35 2010 +0100" }, "message": "ARM: 6212/1: atomic ops: add memory constraints to inline asm\n\nCurrently, the 32-bit and 64-bit atomic operations on ARM do not\ninclude memory constraints in the inline assembly blocks. In the\ncase of barrier-less operations [for example, atomic_add], this\nmeans that the compiler may constant fold values which have actually\nbeen modified by a call to an atomic operation.\n\nThis issue can be observed in the atomic64_test routine in\n\u003ckernel root\u003e/lib/atomic64_test.c:\n\n00000000 \u003ctest_atomic64\u003e:\n 0:\te1a0c00d \tmov\tip, sp\n 4:\te92dd830 \tpush\t{r4, r5, fp, ip, lr, pc}\n 8:\te24cb004 \tsub\tfp, ip, #4\n c:\te24dd008 \tsub\tsp, sp, #8\n 10:\te24b3014 \tsub\tr3, fp, #20\n 14:\te30d000d \tmovw\tr0, #53261\t; 0xd00d\n 18:\te3011337 \tmovw\tr1, #4919\t; 0x1337\n 1c:\te34c0001 \tmovt\tr0, #49153\t; 0xc001\n 20:\te34a1aa3 \tmovt\tr1, #43683\t; 0xaaa3\n 24:\te16300f8 \tstrd\tr0, [r3, #-8]!\n 28:\te30c0afe \tmovw\tr0, #51966\t; 0xcafe\n 2c:\te30b1eef \tmovw\tr1, #48879\t; 0xbeef\n 30:\te34d0eaf \tmovt\tr0, #57007\t; 0xdeaf\n 34:\te34d1ead \tmovt\tr1, #57005\t; 0xdead\n 38:\te1b34f9f \tldrexd\tr4, [r3]\n 3c:\te1a34f90 \tstrexd\tr4, r0, [r3]\n 40:\te3340000 \tteq\tr4, #0\n 44:\t1afffffb \tbne\t38 \u003ctest_atomic64+0x38\u003e\n 48:\te59f0004 \tldr\tr0, [pc, #4]\t; 54 \u003ctest_atomic64+0x54\u003e\n 4c:\te3a0101e \tmov\tr1, #30\n 50:\tebfffffe \tbl\t0 \u003c__bug\u003e\n 54:\t00000000 \t.word\t0x00000000\n\nThe atomic64_set (0x38-0x44) writes to the atomic64_t, but the\ncompiler doesn\u0027t see this, assumes the test condition is always\nfalse and generates an unconditional branch to __bug. The rest of the\ntest is optimised away.\n\nThis patch adds suitable memory constraints to the atomic operations on ARM\nto ensure that the compiler is informed of the correct data hazards. We have\nto use the \"Qo\" constraints to avoid hitting the GCC anomaly described at\nhttp://gcc.gnu.org/bugzilla/show_bug.cgi?id\u003d44492 , where the compiler\nmakes assumptions about the writeback in the addressing mode used by the\ninline assembly. These constraints forbid the use of auto{inc,dec} addressing\nmodes, so it doesn\u0027t matter if we don\u0027t use the operand exactly once.\n\nCc: stable@kernel.org\nReviewed-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "068de8d1be48a04b92fd97f76bb7e113b7be82a8", "tree": "a10b8e65776c3d7122799eb7d6b7568d89f1dbbb", "parents": [ "4082cfa77680a70e407efdfb207c743107bd8fe4" ], "author": { "name": "Will Deacon", "email": "will.deacon@arm.com", "time": "Thu Jul 08 10:58:06 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jul 09 11:29:35 2010 +0100" }, "message": "ARM: 6211/1: atomic ops: fix register constraints for atomic64_add_unless\n\nThe atomic64_add_unless function compares an atomic variable with\na given value and, if they are not equal, adds another given value\nto the atomic variable. The function returns zero if the addition\ndid not occur and non-zero otherwise.\n\nOn ARM, the return value is initialised to 1 in C code. Inline assembly\ncode then performs the atomic64_add_unless operation, setting the\nreturn value to 0 iff the addition does not occur. This means that\nwhen the addition *does* occur, the value of ret must be preserved\nacross the inline assembly and therefore requires a \"+r\" constraint\nrather than the current one of \"\u003d\u0026r\".\n\nThanks to Nicolas Pitre for helping to spot this.\n\nCc: stable@kernel.org\nReviewed-by: Nicolas Pitre \u003cnicolas.pitre@linaro.org\u003e\nSigned-off-by: Will Deacon \u003cwill.deacon@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "4082cfa77680a70e407efdfb207c743107bd8fe4", "tree": "50220be137306502a61dfcc866c5482b14317783", "parents": [ "e467e104bb7482170b79f516d2025e7cfcaaa733" ], "author": { "name": "Sascha Hauer", "email": "s.hauer@pengutronix.de", "time": "Thu Jul 08 08:36:21 2010 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Jul 09 11:28:53 2010 +0100" }, "message": "ARM: 6210/1: Do not rely on reset defaults of L2X0_AUX_CTRL\n\nOn i.MX35 the L2X0_AUX_CTRL register does not have sensible reset\ndefault values. Allow them to be overwritten with the aux_val/aux_mask\narguments passed to l2x0_init().\n\nSigned-off-by: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nAcked-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "ac0547dc62e67a3e0b0c1628b6e49efba8f517db", "tree": "dafd1c8283cc09c3eda5d8fc2a1d06ffeb0141c8", "parents": [ "f189efcd1cc06b75fe18642c9751d26aa5ed2b54" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Mon Jul 05 16:50:13 2010 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Fri Jul 09 08:42:29 2010 +0200" }, "message": "ALSA: hda - Restore cleared pin controls on resume\n\nMany codecs now clear the pin controls at suspend via snd_hda_shutup_pins()\nfor reducing the click noise at power-off. But this leaves some pins\nuninitialized, and they\u0027ll be never recovered after resume.\n\nThis patch adds the proper recovery of cleared pin controls on resume.\nAlso it adds a check of bus-\u003eshutdown so that pins won\u0027t be cleared at\nmodule unloading.\n\nReference: Kernel bug 16339\n\thttp://bugzilla.kernel.org/show_bug.cgi?id\u003d16339\n\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "ecd4b48a163b55d7eb4132617100b90d0d2768ec", "tree": "dd22655125704e755779d6a846b95a0a817509fa", "parents": [ "e467e104bb7482170b79f516d2025e7cfcaaa733" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Thu Jul 01 20:37:20 2010 +0000" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Thu Jul 08 13:27:05 2010 -0700" }, "message": "IB/qib: Use request_firmware() to load SD7220 firmware\n\nExtract the microcode for the QLogic QLE7220 series IB HCA and use the\nkernel microcode request facility to load the microcode. This\nsupports Debian Linux\u0027s requirements to separate microcode which\ndoesn\u0027t have open source code available from the device driver.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "5693486bad2bc2ac585a2c24f7e2f3964b478df9", "tree": "03d61d72c1b73bbf0b049bf0328f8e0c69f35a43", "parents": [ "a4bfb4cf11fd2211b788af59dc8a8b4394bca227" ], "author": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Thu Jul 01 15:13:31 2010 -0700" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Thu Jul 08 13:25:35 2010 -0700" }, "message": "ocfs2: Zero the tail cluster when extending past i_size.\n\nocfs2\u0027s allocation unit is the cluster. This can be larger than a block\nor even a memory page. This means that a file may have many blocks in\nits last extent that are beyond the block containing i_size. There also\nmay be more unwritten extents after that.\n\nWhen ocfs2 grows a file, it zeros the entire cluster in order to ensure\nfuture i_size growth will see cleared blocks. Unfortunately,\nblock_write_full_page() drops the pages past i_size. This means that\nocfs2 is actually leaking garbage data into the tail end of that last\ncluster. This is a bug.\n\nWe adjust ocfs2_write_begin_nolock() and ocfs2_extend_file() to detect\nwhen a write or truncate is past i_size. They will use\nocfs2_zero_extend() to ensure the data is properly zeroed.\n\nOlder versions of ocfs2_zero_extend() simply zeroed every block between\ni_size and the zeroing position. This presumes three things:\n\n1) There is allocation for all of these blocks.\n2) The extents are not unwritten.\n3) The extents are not refcounted.\n\n(1) and (2) hold true for non-sparse filesystems, which used to be the\nonly users of ocfs2_zero_extend(). (3) is another bug.\n\nSince we\u0027re now using ocfs2_zero_extend() for sparse filesystems as\nwell, we teach ocfs2_zero_extend() to check every extent between\ni_size and the zeroing position. If the extent is unwritten, it is\nignored. If it is refcounted, it is CoWed. Then it is zeroed.\n\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "a4bfb4cf11fd2211b788af59dc8a8b4394bca227", "tree": "c06f45ac5a992575a0e47dbc80bdf187db030cca", "parents": [ "1739da40543ed2129050ccfa8a076a851ab6ed00" ], "author": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Tue Jul 06 14:36:06 2010 -0700" }, "committer": { "name": "Joel Becker", "email": "joel.becker@oracle.com", "time": "Thu Jul 08 13:24:49 2010 -0700" }, "message": "ocfs2: When zero extending, do it by page.\n\nocfs2_zero_extend() does its zeroing block by block, but it calls a\nfunction named ocfs2_write_zero_page(). Let\u0027s have\nocfs2_write_zero_page() handle the page level. From\nocfs2_zero_extend()\u0027s perspective, it is now page-at-a-time.\n\nSigned-off-by: Joel Becker \u003cjoel.becker@oracle.com\u003e\nCc: stable@kernel.org\n" }, { "commit": "b6ae906b04113cb73c1ffe9c42fbcdcb074d9f07", "tree": "01ff8392bcd9035b2e9bdad87eb170622a4a7775", "parents": [ "9c3b10b53875279306d8464fe9b24fa634329fc8" ], "author": { "name": "Pawel Osciak", "email": "p.osciak@samsung.com", "time": "Tue Jun 22 05:38:41 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 08 16:50:24 2010 -0300" }, "message": "V4L/DVB: v4l: mem2mem_testdev: fix g_fmt NULL pointer dereference\n\nCalling g_fmt before s_fmt resulted in a NULL pointer dereference as no\ndefault formats were being selected on probe.\n\nReported-by: Németh Márton \u003cnm127@freemail.hu\u003e\nSigned-off-by: Pawel Osciak \u003cp.osciak@samsung.com\u003e\nSigned-off-by: Kyungmin Park \u003ckyungmin.park@samsung.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "9c3b10b53875279306d8464fe9b24fa634329fc8", "tree": "0d7a6eaf473e05240c73e0678f6cc60b6828fd6a", "parents": [ "f06b9bd4c62ef93f9467a1432acf2efa84aa3456" ], "author": { "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com", "time": "Mon Jul 05 15:24:39 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 08 16:50:16 2010 -0300" }, "message": "V4L/DVB: uvcvideo: Power line frequency control doesn\u0027t support GET_MIN/MAX/RES\n\nIssuing a GET_MIN request on the power line frequency control times out\non at least the Apple iSight. As the UVC specification doesn\u0027t list\nGET_MIN/MAX/RES as supported on that control, remove them from the\nuvc_ctrls array.\n\nSigned-off-by: Laurent Pinchart \u003claurent.pinchart@ideasonboard.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "f06b9bd4c62ef93f9467a1432acf2efa84aa3456", "tree": "3dbcbde4fa0fa6c58b98cfc10a4808c633ca6499", "parents": [ "bd1fc7c59669fba897d23d72289341ac9d51ca4e" ], "author": { "name": "Ian Armstrong", "email": "ian@iarmst.demon.co.uk", "time": "Sun Jun 20 15:12:28 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 08 16:50:10 2010 -0300" }, "message": "V4L/DVB: ivtv: Add delay to ensure the decoder always restarts with a blank screen\n\nAdd a short delay when stopping the decoder, allowing it to settle and\npreventing some unexpected interaction with other firmware commands.\n\nSigned-off-by: Ian Armstrong \u003cian@iarmst.demon.co.uk\u003e\nTested-by: Martin Dauskardt \u003cmartin.dauskardt@gmx.de\u003e\nSigned-off-by: Andy Walls \u003cawalls@md.metrocast.net\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "bd1fc7c59669fba897d23d72289341ac9d51ca4e", "tree": "9ccf3ef75a0766f914b99d624f91eb80c3071a13", "parents": [ "310e3be4c2a2b9a5d2b806455e0db177ad44b6f7" ], "author": { "name": "Andy Walls", "email": "awalls@md.metrocast.net", "time": "Thu Jun 17 22:24:09 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 08 16:50:05 2010 -0300" }, "message": "V4L/DVB: Documentation: Add the Philips FQ1236 MK5 to video4linux/CARDLIST.tuner\n\nSigned-off-by: Andy Walls \u003cawalls@md.metrocast.net\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "310e3be4c2a2b9a5d2b806455e0db177ad44b6f7", "tree": "7ab52a9408ed71832004c09a877a1d1fec145064", "parents": [ "095c24710aa508a303edff86709637007113fbbf" ], "author": { "name": "Andy Walls", "email": "awalls@md.metrocast.net", "time": "Sat Jun 12 20:24:24 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 08 16:49:59 2010 -0300" }, "message": "V4L/DVB: tveeprom: Add an entry for tuner code 168: a TCL M30WTP-4N-E tuner\n\nHauppauge EEPROM tuner code 168 has recently shown up on HVR-1600 TV\ncapture cards supported by the cx18 driver. This change allows analog\ntuner type autodetection to succeed for these cards.\n\nInformation for decoding tuner code 168 was provided by Hauppauge.\n\nSigned-off-by: Andy Walls \u003cawalls@md.metrocast.net\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "095c24710aa508a303edff86709637007113fbbf", "tree": "d74e8cc8fbbe6e704b4dabf12a206b8be7ab6e3f", "parents": [ "691d38451c466e931a629c17836b19dd615c8a75" ], "author": { "name": "Andy Walls", "email": "awalls@md.metrocast.net", "time": "Sat Jun 12 20:20:36 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 08 16:49:53 2010 -0300" }, "message": "V4L/DVB: tuner: Add a definition for the Philips FQ1236 MK5 NTSC tuner\n\nSigned-off-by: Andy Walls \u003cawalls@md.metrocast.net\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "691d38451c466e931a629c17836b19dd615c8a75", "tree": "a7e296894291a707077cb913e83ba38ca255b563", "parents": [ "dd880dd477f11aceffb2866f702c718fec2862f4" ], "author": { "name": "Vaibhav Hiremath", "email": "hvaibhav@ti.com", "time": "Thu May 27 08:17:09 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 08 16:49:48 2010 -0300" }, "message": "V4L/DVB: OMAP_VOUT: fix: Module params were not working through bootargs\n\nSigned-off-by: Vaibhav Hiremath \u003chvaibhav@ti.com\u003e\nSigned-off-by: Muralidharan Karicheri \u003cmkaricheri@gmail.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "dd880dd477f11aceffb2866f702c718fec2862f4", "tree": "d14cb7a6fbfacf6e655f020dadefe0199d5afbed", "parents": [ "5ba9bb0ef658a7f4c082cdfc4f779729506042f5" ], "author": { "name": "Vaibhav Hiremath", "email": "hvaibhav@ti.com", "time": "Thu May 27 08:17:08 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 08 16:49:37 2010 -0300" }, "message": "V4L/DVB: OMAP_VOUT: fix: Replaced dma-sg with dma-contig\n\nActually OMAP doesn\u0027t support scatter-gather DMA for\nDisplay subsystem but due to legacy coding it has been overlooked\ntill now.\n\nSigned-off-by: Vaibhav Hiremath \u003chvaibhav@ti.com\u003e\nSigned-off-by: Muralidharan Karicheri \u003cmkaricheri@gmail.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "5ba9bb0ef658a7f4c082cdfc4f779729506042f5", "tree": "171bc7cabb071ec51a5a93f2de6ed91d923e6855", "parents": [ "815c4163b6c8ebf8152f42b0a5fd015cfdcedc78" ], "author": { "name": "Vaibhav Hiremath", "email": "hvaibhav@ti.com", "time": "Thu May 27 08:17:07 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Thu Jul 08 16:48:44 2010 -0300" }, "message": "V4L/DVB: OMAP_VOUT:Build FIX: Rebased against latest DSS2 changes\n\nChanges -\n\t- Kconfig option dependancy changed to ARCH_OMAP2/3 from\n\tARCH_OMAP24XX/34XX\n\t- There are some moments of function from omap_dss_device\n\tto omap_dss_driver. Incorporated changes for the same.\n\nSigned-off-by: Vaibhav Hiremath \u003chvaibhav@ti.com\u003e\nSigned-off-by: Muralidharan Karicheri \u003cmkaricheri@gmail.com\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "e467e104bb7482170b79f516d2025e7cfcaaa733", "tree": "d9de9b008b2cec2e5f46e7bbc83cef50d3d5d288", "parents": [ "b9f399594d12e353dcb609c25219bdaa76c2a050", "9e770044a0f08a6dcf245152ec1575f7cb0b9631" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 12:20:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 12:20:54 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n IPoIB: Fix world-writable child interface control sysfs attributes\n IB/qib: Clean up properly if qib_init() fails\n IB/qib: Completion queue callback needs to be single threaded\n IB/qib: Update 7322 serdes tables\n IB/qib: Clear 6120 hardware error register\n IB/qib: Clear eager buffer memory for each new process\n IB/qib: Mask hardware error during link reset\n IB/qib: Don\u0027t mark VL15 bufs as WC to avoid a rare 7322 chip problem\n RDMA/cxgb4: Derive smac_idx from port viid\n RDMA/cxgb4: Avoid false GTS CIDX_INC overflows\n RDMA/cxgb4: Don\u0027t call abort_connection() for active connect failures\n RDMA/cxgb4: Use the DMA state API instead of the pci equivalents\n" }, { "commit": "9e770044a0f08a6dcf245152ec1575f7cb0b9631", "tree": "37e1f1e68b5224875f11719c6470160a413ba79f", "parents": [ "2c5934bfc5ffcbef3622d0bdbad93628d210012a", "7a52b34b07122ff5f45258d47f260f8a525518f0", "756a33b8dc3ed5c27685a130339de8a894d528a7" ], "author": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Thu Jul 08 09:10:24 2010 -0700" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Thu Jul 08 09:10:24 2010 -0700" }, "message": "Merge branches \u0027cxgb4\u0027, \u0027ipoib\u0027 and \u0027qib\u0027 into for-next\n" }, { "commit": "b9f399594d12e353dcb609c25219bdaa76c2a050", "tree": "98328f0b47ce23634657004edcc7ae251da39352", "parents": [ "c77e9e68269bf50573ce130b5d95ff6e539dbcf8", "7645054f181404e6a28c616b307c4d2562423a50" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 08:20:41 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 08:20:41 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:\n ALSA: hda - Enable beep on Realtek codecs with PCI SSID override\n ALSA: usb-audio - Add volume resolution quirk for some Logitech webcams\n ALSA: hda - Add Macbook 5,2 quirk\n ALSA: hda - Fix uninitialized variable\n" }, { "commit": "c77e9e68269bf50573ce130b5d95ff6e539dbcf8", "tree": "99edc1b070717e18f5958f934bc3921cfed2ce1f", "parents": [ "31016e9941be85e8c487b1f3c45d253eda356715", "83ba7b071f30f7c01f72518ad72d5cd203c27502" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 08:06:40 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 08:06:40 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n writeback: simplify the write back thread queue\n writeback: split writeback_inodes_wb\n writeback: remove writeback_inodes_wbc\n fs-writeback: fix kernel-doc warnings\n splice: check f_mode for seekable file\n splice: direct_splice_actor() should not use pos in sd\n" }, { "commit": "31016e9941be85e8c487b1f3c45d253eda356715", "tree": "f2984c3b651a72d8b160b7d7df545c01af6bef40", "parents": [ "67415020950046e32f520c1447e79ebebbf447ac", "bf23690b89b731468478c21eb07bbb645cc66ead" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 08:05:43 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 08:05:43 2010 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc: Fix userspace build of ptrace.h\n powerpc: Fix default_machine_crash_shutdown #ifdef botch\n powerpc: Fix logic error in fixup_irqs\n powerpc/iseries: Fix possible null pointer dereference in iSeries_pcibios_fixup_resources\n powerpc: Linux cannot run with 0 cores\n powerpc: Fix feature-fixup tests for gcc 4.5\n powerpc: Disable SPARSE_IRQ by default\n powerpc: Fix compile errors in prom_init_check for gcc 4.5\n powerpc: Fix module building for gcc 4.5 and 64 bit\n powerpc/perf_event: Fix for power_pmu_disable()\n" }, { "commit": "67415020950046e32f520c1447e79ebebbf447ac", "tree": "75e2f5e99634343766fb2cf5ca4198f2517949b2", "parents": [ "2aa72f612144a0a7d4b0b22ae7c122692ac6a013", "f50b8bc707988e2543f884d3030199868ca0f48f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 08:02:18 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 08 08:02:18 2010 -0700" }, "message": "Merge branch \u0027s5p-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung\n\n* \u0027s5p-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:\n ARM: SAMSUNG: Fix on wrong function name for S5PV210 sdhci0\n ARM: S5P6442: Fix PLL setting announce message.\n ARM: SAMSUNG: Fix build without SDHCI controllers for S3C64XX\n ARM: S5PV210: Correct clock register properties\n ARM: S5P: Bug fix on external interrupt for S5P SoCs\n" }, { "commit": "7645054f181404e6a28c616b307c4d2562423a50", "tree": "bcc8f969dc6f0f6e2a4acede51db5dd436a06403", "parents": [ "b492c4e8954d54f806875c149bbcafaa7ede7ada", "a5c7d797dcce3be5e77cd6ea62cc4920ededc32b" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jul 08 16:55:26 2010 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jul 08 16:55:26 2010 +0200" }, "message": "Merge branch \u0027fix/misc\u0027 into for-linus\n" }, { "commit": "b492c4e8954d54f806875c149bbcafaa7ede7ada", "tree": "b088a6518ef1cf6750df1867305bbcea29e99956", "parents": [ "815c4163b6c8ebf8152f42b0a5fd015cfdcedc78", "f189efcd1cc06b75fe18642c9751d26aa5ed2b54" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jul 08 16:55:02 2010 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jul 08 16:55:02 2010 +0200" }, "message": "Merge branch \u0027fix/hda\u0027 into for-linus\n" }, { "commit": "bf23690b89b731468478c21eb07bbb645cc66ead", "tree": "fefe0772be3d4c76bc211d60fcc677a83e4a82a4", "parents": [ "c2be05481f6125254c45b78f334d4dd09c701c82" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sun May 09 08:52:31 2010 +0200" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Thu Jul 08 18:11:46 2010 +1000" }, "message": "powerpc: Fix userspace build of ptrace.h\n\nBuild of ptrace.h failed for assembly because it\npulls in stdint.h.\nUse exportable types (__u32, __u64) to avoid the dependency\non stdint.h.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: Andrey Volkov \u003cavolkov@varma-el.com\u003e\nCc: Dave Kleikamp \u003cshaggy@linux.vnet.ibm.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Dave Kleikamp \u003cshaggy@linux.vnet.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" } ], "next": "c2be05481f6125254c45b78f334d4dd09c701c82" }