)]}' { "log": [ { "commit": "ff4e9da2330beb8d64498a513d3f9694e941b01a", "tree": "c45a1d50d1f9a015af9497afe8f17b6025200efd", "parents": [ "7d536cb3fb9993bdcd5a2fbaa6b0670ded4e101c" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@cn.fujitsu.com", "time": "Mon Jun 22 10:33:07 2009 +0800" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Jul 20 12:02:09 2009 -0400" }, "message": "tracing: cleanup for tracing_trace_options_read()\n\n\u0027\\n\u0027 is already appended, and what we need is just an extra\nspace for the \u0027\\0\u0027.\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@cn.fujitsu.com\u003e\nLKML-Reference: \u003c4A3EED63.3090908@cn.fujitsu.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "7d536cb3fb9993bdcd5a2fbaa6b0670ded4e101c", "tree": "63c4a6ec6de75d9a2db7d677c768a5f2953fa237", "parents": [ "68fd60a8c8bca6af51805c45f286f0f2572ac977" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Thu Jul 16 10:54:02 2009 +0800" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Jul 20 11:38:44 2009 -0400" }, "message": "tracing/events: record the size of dynamic arrays\n\nWhen a dynamic array is defined, we add __data_loc_foo in\ntrace_entry to record the offset of the array, but the\nsize of the array is not recorded, which causes 2 problems:\n\n- the event filter just compares the first 2 chars of the strings.\n\n- parsers can\u0027t parse dynamic arrays.\n\nSo we encode the size of each dynamic array in the higher 16 bits\nof __data_loc_foo, while the offset is in lower 16 bits.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nLKML-Reference: \u003c4A5E964A.9000403@cn.fujitsu.com\u003e\nAcked-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "68fd60a8c8bca6af51805c45f286f0f2572ac977", "tree": "7f7272bf201093e878f1f07c0bfe233f7e781634", "parents": [ "d34a4debef933061924ee17c2ede33f5c44925fb" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Thu Jul 16 10:53:34 2009 +0800" }, "committer": { "name": "Steven Rostedt", "email": "rostedt@goodmis.org", "time": "Mon Jul 20 10:52:51 2009 -0400" }, "message": "tracing/events: add missing type info of dynamic arrays\n\nThe format file doesn\u0027t contain enough information for\n__dynamic_array/__string. The type name is missing.\n\nBefore:\n # cat format:\n name: irq_handler_entry\n ...\n field:__data_loc name; offset:16; size:2;\n\nAfter:\n # cat format:\n name: irq_handler_entry\n ...\n field:__data_loc char[] name; offset:16; size:2;\n\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nLKML-Reference: \u003c4A5E962E.9020900@cn.fujitsu.com\u003e\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nAcked-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\n" }, { "commit": "d34a4debef933061924ee17c2ede33f5c44925fb", "tree": "099b8ae8bebc2cbbb5593e06f8508f8a64fed480", "parents": [ "566b0aaf798a0dddfc455d1a5b05c424c6686c65" ], "author": { "name": "jolsa@redhat.com", "email": "jolsa@redhat.com", "time": "Thu Jul 16 21:44:28 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 18 12:21:17 2009 +0200" }, "message": "tracing: Remove .globl in the scripts/recordmcount.pl doc\n\nI was reading throught the recordmcount.pl starting comment,\nand spotted a tiny discrepancy.\n\nThe second example is about my_func not being global, but the\nexample code has the \".globl my_func\" statement just moved.\n\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nCc: rostedt@goodmis.org\nLKML-Reference: \u003c1247773468-11594-4-git-send-email-jolsa@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "566b0aaf798a0dddfc455d1a5b05c424c6686c65", "tree": "ce8e8bfb62986ba4e5ba1b1d7d729c83aeb74387", "parents": [ "45bceffc3013bda7d2ebc7802e9b153b674e2d44" ], "author": { "name": "jolsa@redhat.com", "email": "jolsa@redhat.com", "time": "Thu Jul 16 21:44:26 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 18 12:21:16 2009 +0200" }, "message": "tracing: Remove unused fields/variables\n\nSigned-off-by: Jiri Olsa \u003cjolsa@redhat.com\u003e\nCc: rostedt@goodmis.org\nLKML-Reference: \u003c1247773468-11594-2-git-send-email-jolsa@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "45bceffc3013bda7d2ebc7802e9b153b674e2d44", "tree": "222d7dd8fd300925cbf12cdc0fba5bee2528997e", "parents": [ "6f2f3cf00ee32f75ba007a46bab88a54d68a5deb", "78af08d90b8f745044b1274430bc4bc6b2b27aca" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 18 12:19:57 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sat Jul 18 12:20:01 2009 +0200" }, "message": "Merge branch \u0027linus\u0027 into tracing/core\n\nMerge reason: tracing/core was on an older, pre-rc1 base.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "78af08d90b8f745044b1274430bc4bc6b2b27aca", "tree": "9e233eb5acf9974bf02de57a9d88c35f86629114", "parents": [ "a1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232", "ecca0683230b83e8f830ff157911fad20bc43015" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 21:19:50 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 21:19:50 2009 -0700" }, "message": "Merge branch \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-fixes\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm: Move a dereference below a NULL test\n fb/intelfb: conflict with DRM_I915 and hide by default\n drm/ttm: fix misplaced parentheses\n drm/via: Fix vblank IRQ on VIA hardware.\n drm: drm_gem, check kzalloc retval\n drm: drm_debugfs, check kmalloc retval\n drm/radeon: add some missing pci ids\n" }, { "commit": "a1cc1ba7aec1ba41317d227b1fe8d0f8c0cec232", "tree": "ad9ed53d30b54141d99a67c90eefdd3a4a0d83dc", "parents": [ "499ee0710f9881423d807c6ecc451c5e1bd5ff62", "18282b36d742347abd9a4bc74fe9fd2432a8335b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 11:15:00 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 11:15:00 2009 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/fyu/linux-2.6:\n Revert \"Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h\"\n Add dma_debug_init() for ia64\n Fix ia64 compilation IS_ERR and PTE_ERR errors.\n" }, { "commit": "499ee0710f9881423d807c6ecc451c5e1bd5ff62", "tree": "27f94b3d81e7c3e5dbc97b7b1fa2d16257fc5af4", "parents": [ "8e3b3bb5e5ac064f83a8556100f10b7dfa1c719b", "857fdc53a0a90c3ba7fcf5b1fb4c7a62ae03cf82" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 10:51:55 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 10:51:55 2009 -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 x86/pci: insert ioapic resource before assigning unassigned resources\n" }, { "commit": "8e3b3bb5e5ac064f83a8556100f10b7dfa1c719b", "tree": "34b84efc765807eadeaa4475a5fdf036a6c6f327", "parents": [ "301d95c4dade09388f94258ee797d2d650dc00b5", "15c2ac051c730210b7ef2c93807b576e89e129d2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 08:53:56 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 08:53:56 2009 -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: riptide - proper handling of pci_register_driver for joystick\n sound: usb-audio: add workaround for Blue Microphones devices\n ALSA: hda_intel: more strict alc880_parse_auto_config dig_nid checking\n ASoC: Fix NULL pointer dereference in __pxa2xx_pcm_hw_free\n" }, { "commit": "301d95c4dade09388f94258ee797d2d650dc00b5", "tree": "0f0b1fcb60d5893241e4646cf044105b9ca7865a", "parents": [ "b983d0deb0e28f8880cdea79def575d96a27e603", "e79f07e2925b10f09a2621650c16f3d6ea778747" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 08:53:41 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 08:53:41 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:\n virtio_net: Sync header with qemu\n virtio-pci: correctly unregister root device on error\n virtio_blk: ioctl return value fix\n virtio_blk: don\u0027t bounce highmem requests\n lguest: restrict CPUID to avoid perf counter wrmsr\n lguest: remove unnecessary forward struct declaration\n lguest: fix journey\n" }, { "commit": "b983d0deb0e28f8880cdea79def575d96a27e603", "tree": "c1ae4f893647e2835e908717bf9073b8c7352a45", "parents": [ "ecc2e05e739c30870c8e4f252b63a0c4041f2724", "04aef32d39cc4ef80087c0ce8ed113c6d64f1a6b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 08:53:14 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 08:53:14 2009 -0700" }, "message": "Merge branch \u0027tracing-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n tracing/function: Fix the return value of ftrace_trace_onoff_callback()\n" }, { "commit": "ecc2e05e739c30870c8e4f252b63a0c4041f2724", "tree": "7d8f7ac3ac40bb2e2e8c80954256d173cc8aa46f", "parents": [ "4b0a84043e0c14088958fddb62f416d050368011" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Fri Jul 17 16:17:26 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 17 08:50:43 2009 -0700" }, "message": "tty_port: Fix return on interrupted use\n\nWhoops.. fortunately not many people use this yet.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "18282b36d742347abd9a4bc74fe9fd2432a8335b", "tree": "095e08ecd4c1e9ac7414606d7ad2d8d4f486d62c", "parents": [ "390bd132b2831a2ad0268e84bffbfc0680debfe5" ], "author": { "name": "Aurelien Jarno", "email": "aurelien@aurel32.net", "time": "Fri Jul 17 06:35:05 2009 -0700" }, "committer": { "name": "Fenghua Yu", "email": "fenghua.yu@intel.com", "time": "Fri Jul 17 06:35:05 2009 -0700" }, "message": "Revert \"Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h\"\n\nasm/fpu.h uses the __IA64_UL macro which is declared in asm/types.h, so\nthis include is really required. Without it, GNU libc fails to build.\n\nThis reverts commit 2678c07b07ac2076675e5d57653bdf02e9af1950.\n\nSigned-off-by: Aurelien Jarno \u003caurelien@aurel32.net\u003e\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\n" }, { "commit": "390bd132b2831a2ad0268e84bffbfc0680debfe5", "tree": "b4ce45ac15161eef7a3b6132569eb5571764a057", "parents": [ "6f409461210baf76ade1bfdd9470fd5b98378b36" ], "author": { "name": "fujita", "email": "fujita@tulip.osrg.net", "time": "Thu Jul 09 21:25:05 2009 -0700" }, "committer": { "name": "Fenghua Yu", "email": "fenghua.yu@intel.com", "time": "Fri Jul 17 06:34:57 2009 -0700" }, "message": "Add dma_debug_init() for ia64\n\nThe commit 9916219579d078c80377dd3988c2cc213536d868 was supposed to\nadd CONFIG_DMA_API_DEBUG support to IA64 however I forgot to add\ndma_debug_init().\n\nSigned-off-by: fujita \u003cfujita@tulip.osrg.net\u003e\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\n" }, { "commit": "6f409461210baf76ade1bfdd9470fd5b98378b36", "tree": "5b53a29227c7b49a1dca48daec6ba8bfe5c1c581", "parents": [ "4b0a84043e0c14088958fddb62f416d050368011" ], "author": { "name": "Fenghua Yu", "email": "fenghua.yu@intel.com", "time": "Thu Jul 09 21:23:39 2009 -0700" }, "committer": { "name": "Fenghua Yu", "email": "fenghua.yu@intel.com", "time": "Fri Jul 17 06:34:50 2009 -0700" }, "message": "Fix ia64 compilation IS_ERR and PTE_ERR errors.\n\nWhen building ia64 kernel with CONFIG_XEN_SYS_HYPERVISOR, compiler reports\nerrors:\n\ndrivers/xen/sys-hypervisor.c: In function ‘uuid_show’:\ndrivers/xen/sys-hypervisor.c:125: error: implicit declaration of function ‘IS_ERR’\ndrivers/xen/sys-hypervisor.c:126: error: implicit declaration of function ‘PTR_ERR’\n\nThis patch fixes the errors.\n\nSigned-off-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nAcked-by: Isaku Yamahata \u003cyamahata@valinux.co.jp\u003e\n" }, { "commit": "e79f07e2925b10f09a2621650c16f3d6ea778747", "tree": "564b574f0e517c16a48ff2fb59d444b28543702e", "parents": [ "4b892e6582e3a4fe01f623aea386907270d5bf83" ], "author": { "name": "Alex Williamson", "email": "alex.williamson@hp.com", "time": "Tue Jul 07 08:47:10 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jul 17 21:47:47 2009 +0930" }, "message": "virtio_net: Sync header with qemu\n\nQemu added support for a few extra RX modes that Linux doesn\u0027t\ncurrently make use of. Sync the headers to maintain consistency.\n\nSigned-off-by: Alex Williamson \u003calex.williamson@hp.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "4b892e6582e3a4fe01f623aea386907270d5bf83", "tree": "82214468d537c8cf90b1fc0195bf33c688db3bfd", "parents": [ "d9ecdea7ed7467db32ec160f4eca46c279255606" ], "author": { "name": "Mark McLoughlin", "email": "markmc@redhat.com", "time": "Tue Jul 07 08:26:45 2009 +0100" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jul 17 21:47:47 2009 +0930" }, "message": "virtio-pci: correctly unregister root device on error\n\nIf pci_register_driver() fails we\u0027re incorrectly unregistering the root\ndevice with device_unregister() rather than root_device_unregister().\n\nReported-by: Don Zickus \u003cdzickus@redhat.com\u003e\nSigned-off-by: Mark McLoughlin \u003cmarkmc@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "d9ecdea7ed7467db32ec160f4eca46c279255606", "tree": "d28aaecc9e06af13baa02e6d36a02e7e8fe58fb1", "parents": [ "4eff3cae9c9809720c636e64bc72f212258e0bd5" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Sat Jun 20 21:29:41 2009 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jul 17 21:47:46 2009 +0930" }, "message": "virtio_blk: ioctl return value fix\n\nBlock driver ioctl methods must return ENOTTY and not -ENOIOCTLCMD if\nthey expect the block layer to handle generic ioctls.\n\nThis triggered a BLKROSET failure in xfsqa #200.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "4eff3cae9c9809720c636e64bc72f212258e0bd5", "tree": "2a6a33f09a59ec8bdc7f2422b36c72eaa85af055", "parents": [ "7a5049205f7265620c48781814155f2763e70abb" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Fri Jul 17 21:47:45 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jul 17 21:47:46 2009 +0930" }, "message": "virtio_blk: don\u0027t bounce highmem requests\n\nBy default a block driver bounces highmem requests, but virtio-blk is\nperfectly fine with any request that fit into it\u0027s 64 bit addressing scheme,\nmapped in the kernel virtual space or not.\n\nBesides improving performance on highmem systems this also makes the\nreproducible oops in __bounce_end_io go away (but hiding the real cause).\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "7a5049205f7265620c48781814155f2763e70abb", "tree": "7b3cf5ec83687e74028bbfa100dac4e6d449155a", "parents": [ "27de22d03d6808a82bbe9bd7e3cc75d60132ba9e" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jul 17 21:47:44 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jul 17 21:47:45 2009 +0930" }, "message": "lguest: restrict CPUID to avoid perf counter wrmsr\n\nAvoid the following:\n[ 0.012093] WARNING: at arch/x86/kernel/apic/apic.c:249 native_apic_write_dummy+0x2f/0x40()\n\nRather than chase each new cpuid-detected feature, just lie about the highest\nvalid CPUID so this code is never run.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "27de22d03d6808a82bbe9bd7e3cc75d60132ba9e", "tree": "e38eee58015f1d7abb5f5e08c445be08748c266e", "parents": [ "5780888bcac316508eb5f4dd23bbea8b5057647c" ], "author": { "name": "Davide Libenzi", "email": "davidel@xmailserver.org", "time": "Fri Jul 17 21:47:44 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jul 17 21:47:44 2009 +0930" }, "message": "lguest: remove unnecessary forward struct declaration\n\nWhile fixing lg.h to drop the fwd declaration, I noticed\nthere\u0027s another one ;)\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "5780888bcac316508eb5f4dd23bbea8b5057647c", "tree": "59d8b6ad427e87ebb7b41f855d32b7a2126b1dc6", "parents": [ "4b0a84043e0c14088958fddb62f416d050368011" ], "author": { "name": "Matias Zabaljauregui", "email": "zabaljauregui@gmail.com", "time": "Thu Jun 18 11:44:06 2009 -0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jul 17 21:47:44 2009 +0930" }, "message": "lguest: fix journey\n\nfix: \"make Guest\" was complaining about duplicated G:032\n\nSigned-off-by: Matias Zabaljauregui \u003czabaljauregui@gmail.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "6f2f3cf00ee32f75ba007a46bab88a54d68a5deb", "tree": "89aaab40d502c84e135b7e9e72b20bb7d498bc8c", "parents": [ "79173bf556417a737e9d2e096e0788452ec30a61" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@cn.fujitsu.com", "time": "Thu Jul 16 14:21:08 2009 +0800" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Jul 17 01:45:51 2009 -0400" }, "message": "tracing/function: Cleanup for function tracer\n\nWe can directly use %pf input format instead of kallsyms_lookup()\nand %s input format\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@cn.fujitsu.com\u003e\nReviewed-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "79173bf556417a737e9d2e096e0788452ec30a61", "tree": "c27a263ce2efae15ad7b045f60cd28a0b2390862", "parents": [ "64fbcd162819bddaf0d99e78b16371b655aa5dee" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@cn.fujitsu.com", "time": "Thu Jul 16 14:17:11 2009 +0800" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Jul 17 01:44:10 2009 -0400" }, "message": "tracing/trace_stack: Cleanup for trace_lookup_stack()\n\nWe can directly use %pF input format instead of sprint_symbol()\nand %s input format.\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@cn.fujitsu.com\u003e\nReviewed-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "64fbcd162819bddaf0d99e78b16371b655aa5dee", "tree": "abc34dd23386f13675502455d99d868b9b63173e", "parents": [ "da706d8bc833e7153622435560422e653bdb2e94" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@cn.fujitsu.com", "time": "Wed Jul 15 12:32:15 2009 +0800" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Fri Jul 17 00:37:53 2009 -0400" }, "message": "tracing/function: Simplify __ftrace_replace_code()\n\nRewrite the __ftrace_replace_code() function, simplify it, but don\u0027t\nchange the code\u0027s logic.\n\nFirst, we get the state we want to set, if the record has the same\nstate, then do nothing, otherwise enable/disable it.\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@cn.fujitsu.com\u003e\nReviewed-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "04aef32d39cc4ef80087c0ce8ed113c6d64f1a6b", "tree": "fb6e1231d7ac8fb38cf514c0c6107291234228d9", "parents": [ "4b0a84043e0c14088958fddb62f416d050368011" ], "author": { "name": "Xiao Guangrong", "email": "xiaoguangrong@cn.fujitsu.com", "time": "Wed Jul 15 12:29:06 2009 +0800" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Jul 16 23:34:32 2009 -0400" }, "message": "tracing/function: Fix the return value of ftrace_trace_onoff_callback()\n\nftrace_trace_onoff_callback() will return an error even if we do the\nright operation, for example:\n\n # echo _spin_*:traceon:10 \u003e set_ftrace_filter\n -bash: echo: write error: Invalid argument\n # cat set_ftrace_filter\n #### all functions enabled ####\n _spin_trylock_bh:traceon:count\u003d10\n _spin_unlock_irq:traceon:count\u003d10\n _spin_unlock_bh:traceon:count\u003d10\n _spin_lock_irq:traceon:count\u003d10\n _spin_unlock:traceon:count\u003d10\n _spin_trylock:traceon:count\u003d10\n _spin_unlock_irqrestore:traceon:count\u003d10\n _spin_lock_irqsave:traceon:count\u003d10\n _spin_lock_bh:traceon:count\u003d10\n _spin_lock:traceon:count\u003d10\n\nWe want to set _spin_*:traceon:10 to set_ftrace_filter, it complains\nwith \"Invalid argument\", but the operation is successful.\n\nThis is because ftrace_process_regex() returns the number of functions that\nmatched the pattern. If the number is not 0, this value is returned\nby ftrace_regex_write() whereas we want to return the number of bytes\nvirtually written.\nAlso the file offset pointer is not updated in this case.\n\nIf the number of matched functions is lower than the number of bytes written\nby the user, this results to a reprocessing of the string given by the user with\na lower size, leading to a malformed ftrace regex and then a -EINVAL returned.\n\nSo, this patch fixes it by returning 0 if no error occured.\nThe fix also applies on 2.6.30\n\nSigned-off-by: Xiao Guangrong \u003cxiaoguangrong@cn.fujitsu.com\u003e\nReviewed-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "da706d8bc833e7153622435560422e653bdb2e94", "tree": "0da824f6db67ce361976ef3b4d5a7212ea92619b", "parents": [ "e202687927c132b1e1ff36b526b5e78ac33de840" ], "author": { "name": "Lai Jiangshan", "email": "laijs@cn.fujitsu.com", "time": "Wed Jul 15 16:27:30 2009 +0800" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu Jul 16 18:46:47 2009 -0400" }, "message": "ring_buffer: Fix warning while ignoring cmpxchg return value\n\nkernel/trace/ring_buffer.c: In function \u0027rb_tail_page_update\u0027:\nkernel/trace/ring_buffer.c:849: warning: value computed is not used\nkernel/trace/ring_buffer.c:850: warning: value computed is not used\n\nAdd \"(void)\"s to fix this warning, because we don\u0027t need here to handle\nthe fail case of cmpxchg, it\u0027s fine if an interrupt already did the\njob.\n\nChanged from V1:\n Add a comment(which is written by Steven) for it.\n\nSigned-off-by: Lai Jiangshan \u003claijs@cn.fujitsu.com\u003e\nAcked-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\n" }, { "commit": "4b0a84043e0c14088958fddb62f416d050368011", "tree": "cf5df6cef66a178c35e335240a756798caf2c399", "parents": [ "63f7a330014ad29b662638caabd8e96fe945b9ed", "d07387b490b1c43bfcb9f3900faf96f2dafb2630" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 10:18:29 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 10:18:29 2009 -0700" }, "message": "Merge branch \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-sched\n\n* \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/peterz/linux-2.6-sched:\n sched: Fix bug in SCHED_IDLE interaction with group scheduling\n sched: Fix rt_rq-\u003epushable_tasks initialization in init_rt_rq()\n sched: Reset sched stats on fork()\n sched_rt: Fix overload bug on rt group scheduling\n sched: Documentation/sched-rt-group: Fix style issues \u0026 bump version\n" }, { "commit": "63f7a330014ad29b662638caabd8e96fe945b9ed", "tree": "4a866e63fee62d3f36ca430bbdd5adf5bb75e82b", "parents": [ "a132ebcb454568cc06fbdf3a5629eb9d64c9d578", "f9f868dbcca961ed62f1df1d114abd0c38c47dce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 10:07:37 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 10:07:37 2009 -0700" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n timer stats: fix quick check optimization\n" }, { "commit": "a132ebcb454568cc06fbdf3a5629eb9d64c9d578", "tree": "38e05a5a9b42f9e5a69dca6ad2de04ba126e95e8", "parents": [ "807708844979ba8c6d5717345a8608454992696d", "0115cb544b0a6709e9cf3de615e150d22e7d9d10" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 10:05:34 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 10:05:34 2009 -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 another bug in move of altivec code to vector.S\n powerpc: Fix booke user_disable_single_step()\n" }, { "commit": "807708844979ba8c6d5717345a8608454992696d", "tree": "97daa91a0ddd6ed6fe48a5967762523c4fe1f924", "parents": [ "9237a81a1468d0aca1cc4e244bba2362d6f81b35" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Jul 16 16:07:03 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 09:19:16 2009 -0700" }, "message": "n_tty: Fix echo race\n\nIf a tty in N_TTY mode with echo enabled manages to get itself into a state\nwhere\n\t- echo characters are pending\n\t- FASYNC is enabled\n\t- tty_write_wakeup is called from either\n\t\t- a device write path (pty)\n\t\t- an IRQ (serial)\n\nthen it either deadlocks or explodes taking a mutex in the IRQ path.\n\nOn the serial side it is almost impossible to reproduce because you have to\ngo from a full serial port to a near empty one with echo characters\npending. The pty case happens to have become possible to trigger using\nemacs and ptys, the pty changes having created a scenario which shows up\nthis bug.\n\nThe code path is\n\n\tn_tty:process_echoes() (takes mutex)\n\ttty_io:tty_put_char()\n\tpty:pty_write (or serial paths)\n\ttty_wakeup (from pty_write or serial IRQ)\n\tn_tty_write_wakeup()\n\tprocess_echoes()\n\t*KABOOM*\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9237a81a1468d0aca1cc4e244bba2362d6f81b35", "tree": "a7bb7bf9f834e25fe7b8189eca678c33dfb19130", "parents": [ "5c9228f0cfb09a098a8a380116b42ae099e967b6" ], "author": { "name": "Jiri Slaby", "email": "jirislaby@gmail.com", "time": "Thu Jul 16 16:06:18 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 09:19:16 2009 -0700" }, "message": "tty: nozomi, fix tty refcounting bug\n\nDon\u0027t forget to drop a tty refererence on fail paths in\nreceive_data().\n\nSigned-off-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5c9228f0cfb09a098a8a380116b42ae099e967b6", "tree": "f3306b2a1e53309b876d5d2543ad6fa85ae66caf", "parents": [ "ff5392d77bbb0746d1a034e955231f03ffc30b61" ], "author": { "name": "Johannes Weiner", "email": "hannes@cmpxchg.org", "time": "Thu Jul 16 16:06:09 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 09:19:16 2009 -0700" }, "message": "vt: drop bootmem/slab memory distinction\n\nBootmem is not used for the vt screen buffer anymore as slab is now\navailable at the time the console is initialized.\n\nGet rid of the now superfluous distinction between slab and bootmem,\nit\u0027s always slab.\n\nThis also fixes a kmalloc leak which Catalin described thusly:\n\nCommit a5f4f52e (\"vt: use kzalloc() instead of the bootmem allocator\")\nreplaced the alloc_bootmem() with kzalloc() but didn\u0027t set vc_kmalloced to\n1 and the memory block is later leaked. The corresponding kmemleak trace:\n\nunreferenced object 0xdf828000 (size 8192):\n comm \"swapper\", pid 0, jiffies 4294937296\n backtrace:\n [\u003cc006d473\u003e] __save_stack_trace+0x17/0x1c\n [\u003cc000d869\u003e] log_early+0x55/0x84\n [\u003cc01cfa4b\u003e] kmemleak_alloc+0x33/0x3c\n [\u003cc006c013\u003e] __kmalloc+0xd7/0xe4\n [\u003cc00108c7\u003e] con_init+0xbf/0x1b8\n [\u003cc0010149\u003e] console_init+0x11/0x20\n [\u003cc0008797\u003e] start_kernel+0x137/0x1e4\n\nSigned-off-by: Johannes Weiner \u003channes@cmpxchg.org\u003e\nReviewed-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nTested-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ff5392d77bbb0746d1a034e955231f03ffc30b61", "tree": "f41b968d99abf1e076b48b30442189920835c8ec", "parents": [ "8f4256b22c554f713ffdd395c1f2bfd53746cfc9" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Thu Jul 16 16:05:53 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 09:19:16 2009 -0700" }, "message": "drivers/serial/bfin_sport_uart.c: remove wrong and unneeded memset\n\ndcb314@hotmail.com notes that this memset has its args reversed.\n\nIt\u0027s unneeded anyway, so remove it.\n\nAddresses http://bugzilla.kernel.org/show_bug.cgi?id\u003d13587\n\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8f4256b22c554f713ffdd395c1f2bfd53746cfc9", "tree": "bea08b4d561546e9a073b15a0cee74bc351c9562", "parents": [ "c8d50041734534e0a4b0ea13df36ed5857fccd56" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Thu Jul 16 16:05:43 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 09:19:16 2009 -0700" }, "message": "serial: don\u0027t add msm_serial\u0027s probe function to the driver struct\n\nmsm_serial_driver is registered using platform_driver_probe which takes\ncare for the probe function itself. So don\u0027t pass it in the driver\nstruct, too.\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c8d50041734534e0a4b0ea13df36ed5857fccd56", "tree": "c654fde94ba2fbf1eb936f017d687860aed0deed", "parents": [ "a3ca86aea507904148870946d599e07a340b39bf" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Jul 16 16:05:08 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 09:19:16 2009 -0700" }, "message": "tty: fix close/hangup race\n\nWe can get a situation where a hangup occurs during or after a close. In\nthat case the ldisc gets disposed of by the close and the hangup then\nexplodes.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a3ca86aea507904148870946d599e07a340b39bf", "tree": "b5d6c35f8048bf7f071f1fc16f5d543c07a725b2", "parents": [ "4a21b8cb3550f19f838f7c48345fbbf6a0e8536b" ], "author": { "name": "Eugene Teo", "email": "eteo@redhat.com", "time": "Wed Jul 15 14:59:10 2009 +0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 09:19:16 2009 -0700" }, "message": "Add \u0027-fno-delete-null-pointer-checks\u0027 to gcc CFLAGS\n\nTurning on this flag could prevent the compiler from optimising away\nsome \"useless\" checks for null pointers. Such bugs can sometimes become\nexploitable at compile time because of the -O2 optimisation.\n\nSee http://gcc.gnu.org/onlinedocs/gcc-4.1.2/gcc/Optimize-Options.html\n\nAn example that clearly shows this \u0027problem\u0027 is commit 6bf67672.\n\n static void __devexit agnx_pci_remove(struct pci_dev *pdev)\n {\n struct ieee80211_hw *dev \u003d pci_get_drvdata(pdev);\n- struct agnx_priv *priv \u003d dev-\u003epriv;\n+ struct agnx_priv *priv;\n AGNX_TRACE;\n\n if (!dev)\n return;\n+ priv \u003d dev-\u003epriv;\n\nBy reverting this patch, and compile it with and without\n-fno-delete-null-pointer-checks flag, we can see that the check for dev\nis compiled away.\n\n call printk #\n- testq %r12, %r12 # dev\n- je .L94 #,\n movq %r12, %rdi # dev,\n\nClearly the \u0027fix\u0027 is to stop using dev before it is tested, but building\nwith -fno-delete-null-pointer-checks flag at least makes it harder to\nabuse.\n\nSigned-off-by: Eugene Teo \u003ceugeneteo@kernel.sg\u003e\nAcked-by: Eric Paris \u003ceparis@redhat.com\u003e\nAcked-by: Wang Cong \u003camwang@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4a21b8cb3550f19f838f7c48345fbbf6a0e8536b", "tree": "2cd257d7255e9fa3524a67da4fa1d22b01023c87", "parents": [ "35b5c55fee08e6e4001ba98060a2d0b82f70b5f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 09:14:23 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jul 16 09:14:23 2009 -0700" }, "message": "Revert \"ppp: Fix throttling bugs\"\n\nThis reverts commit a6540f731d506d9e82444cf0020e716613d4c46c, as\nrequested by Alan:\n\n \"... as it was wrong, the pty code is now fixed and the fact this\n isn\u0027t reverted is breaking pptp setups.\"\n\nRequested-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "15c2ac051c730210b7ef2c93807b576e89e129d2", "tree": "f0705accc9cf352d83102709ba5537825e42628f", "parents": [ "9d79b136910de2cf9e4f0e37c3048c0fc7d9eab3", "8886f33f25083a47d5fa24ad7b57bb708c5c5403" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jul 16 16:35:50 2009 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jul 16 16:35:50 2009 +0200" }, "message": "Merge branch \u0027fix/usb-audio\u0027 into for-linus\n\n* fix/usb-audio:\n sound: usb-audio: add workaround for Blue Microphones devices\n" }, { "commit": "9d79b136910de2cf9e4f0e37c3048c0fc7d9eab3", "tree": "77fdffedeb0c52a00b0bfaaeafeec946d6e09517", "parents": [ "26887793b64ae93342c1e2548595d4c6f7dce694", "cb65c8732a50f8a145d36dbdac026a1789ad1587" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jul 16 16:35:48 2009 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jul 16 16:35:48 2009 +0200" }, "message": "Merge branch \u0027fix/misc\u0027 into for-linus\n\n* fix/misc:\n ALSA: riptide - proper handling of pci_register_driver for joystick\n" }, { "commit": "26887793b64ae93342c1e2548595d4c6f7dce694", "tree": "f6ab1830d5664c01009096297d328b70314d636e", "parents": [ "9d5b28d530000aa5a256046f0dd42a3787687cc9", "9d30937accf2c01e8b0bd59787409a7348cbbcb7" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jul 16 16:35:47 2009 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jul 16 16:35:47 2009 +0200" }, "message": "Merge branch \u0027fix/hda\u0027 into for-linus\n\n* fix/hda:\n ALSA: hda_intel: more strict alc880_parse_auto_config dig_nid checking\n" }, { "commit": "9d5b28d530000aa5a256046f0dd42a3787687cc9", "tree": "e17c9965b731e1fb76f8301354c8f54201b11a55", "parents": [ "6847e154e3cd74fca6084124c097980a7634285a", "b7d4de7ff03085fda8310b2983b907166dd40f43" ], "author": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jul 16 16:35:46 2009 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Thu Jul 16 16:35:46 2009 +0200" }, "message": "Merge branch \u0027fix/asoc\u0027 into for-linus\n\n* fix/asoc:\n ASoC: Fix NULL pointer dereference in __pxa2xx_pcm_hw_free\n" }, { "commit": "35b5c55fee08e6e4001ba98060a2d0b82f70b5f4", "tree": "a50b920260c7ccdb2da90bd6a064de168280beeb", "parents": [ "e9e961c9a818a2f24711af493b907a8e40a69efc", "b2dde6afe5d29212d521e69492ebc299db235001" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 15 10:29:09 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 15 10:29:09 2009 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:\n ahci: add device ID for 82801JI sata controller\n drivers/ata: Move a dereference below a NULL test\n libata: implement and use HORKAGE_NOSETXFER, take#2\n libata: fix follow-up SRST failure path\n" }, { "commit": "cb65c8732a50f8a145d36dbdac026a1789ad1587", "tree": "f80fcc499ef02d7e7868868bf4d37774d722ceae", "parents": [ "c2a30d711852e4f39c8a79135b3caa701f7a8e02" ], "author": { "name": "Jaswinder Singh Rajput", "email": "jaswinder@kernel.org", "time": "Wed Jul 15 16:45:40 2009 +0530" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Jul 15 14:00:40 2009 +0200" }, "message": "ALSA: riptide - proper handling of pci_register_driver for joystick\n\nWe need to check returning error for pci_register_driver(\u0026joystick_driver)\n\nOn failure, we should unregister formerly registered audio drivers\n\nThis also fixed the compiler warning :\n\n CC [M] sound/pci/riptide/riptide.o\n sound/pci/riptide/riptide.c: In function ‘alsa_card_riptide_init’:\n sound/pci/riptide/riptide.c:2200: warning: ignoring return value of ‘__pci_register_driver’, declared with attribute warn_unused_result\n\nSigned-off-by: Jaswinder Singh Rajput \u003cjaswinderrajput@gmail.com\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "8886f33f25083a47d5fa24ad7b57bb708c5c5403", "tree": "6f6e50f07811c01cd7ec469223ba70fb71ae50f6", "parents": [ "6847e154e3cd74fca6084124c097980a7634285a" ], "author": { "name": "Clemens Ladisch", "email": "clemens@ladisch.de", "time": "Mon Jul 13 13:21:58 2009 +0200" }, "committer": { "name": "Takashi Iwai", "email": "tiwai@suse.de", "time": "Wed Jul 15 11:55:00 2009 +0200" }, "message": "sound: usb-audio: add workaround for Blue Microphones devices\n\nBlue Microphones USB devices have an alternate setting that sends two\nchannels of data to the computer. Unfortunately, the descriptors of\nthat altsetting have a wrong channel setting, which means that any\nrecorded data from such a device has twice the sample rate from what\nwould be expected.\n\nThis patch adds a workaround to ignore that altsetting. Since these\ndevices have only one actual channel, no data is lost.\n\nSigned-off-by: Clemens Ladisch \u003cclemens@ladisch.de\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Takashi Iwai \u003ctiwai@suse.de\u003e\n" }, { "commit": "0115cb544b0a6709e9cf3de615e150d22e7d9d10", "tree": "24f916083e856150d877c8f6f3eb616230f05ffb", "parents": [ "28477fb1ed1a00c67b382ae8f37f35708e3bf5dd" ], "author": { "name": "Andreas Schwab", "email": "schwab@linux-m68k.org", "time": "Fri Jul 10 11:17:36 2009 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 15 17:41:46 2009 +1000" }, "message": "powerpc: Fix another bug in move of altivec code to vector.S\n\nWhen moving load_up_altivec to vector.S a typo in a comment caused a\nthinko setting the wrong variable.\n\nSigned-off-by: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "28477fb1ed1a00c67b382ae8f37f35708e3bf5dd", "tree": "7dda6fa6262aa362175ffdb976da01d9aa7e0e68", "parents": [ "e9e961c9a818a2f24711af493b907a8e40a69efc" ], "author": { "name": "Dave Kleikamp", "email": "shaggy@linux.vnet.ibm.com", "time": "Wed Jul 08 13:46:18 2009 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 15 17:41:45 2009 +1000" }, "message": "powerpc: Fix booke user_disable_single_step()\n\nOn booke processors, gdb is seeing spurious SIGTRAPs when setting a\nwatchpoint.\n\nuser_disable_single_step() simply quits when the DAC is non-zero. It should\nbe clearing the DBCR0_IC and DBCR0_BT bits from the dbcr0 register and\nTIF_SINGLESTEP from the thread flag.\n\nSigned-off-by: Dave Kleikamp \u003cshaggy@linux.vnet.ibm.com\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "ecca0683230b83e8f830ff157911fad20bc43015", "tree": "95d69ae4726d58b80a44fb7c9ef3702b5e5e34a6", "parents": [ "ba0ab82358a12e7a7f2872d6b65c437157c6888f" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Sat Jul 11 09:50:09 2009 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Wed Jul 15 16:56:48 2009 +1000" }, "message": "drm: Move a dereference below a NULL test\n\nIf the NULL test is necessary, then the dereference should be moved below\nthe NULL test.\n\nThe semantic patch that makes this change is as follows:\n(http://www.emn.fr/x-info/coccinelle/)\n\n// \u003csmpl\u003e\n@@\ntype T;\nexpression E;\nidentifier i,fld;\nstatement S;\n@@\n\n- T i \u003d E-\u003efld;\n+ T i;\n ... when !\u003d E\n when !\u003d i\n if (E \u003d\u003d NULL) S\n+ i \u003d E-\u003efld;\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Dave Airlie \u003cairlied@linux.ie\u003e\n" }, { "commit": "ba0ab82358a12e7a7f2872d6b65c437157c6888f", "tree": "434b13e9f81dd8cf59b7d08a8f010196a87001c0", "parents": [ "916635bfcae5fec170ccd36f4b451cf7c5d23b9d" ], "author": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Fri Jul 03 11:24:46 2009 -0700" }, "committer": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Wed Jul 15 16:01:55 2009 +1000" }, "message": "fb/intelfb: conflict with DRM_I915 and hide by default\n\nUsers get confused by this driver. It\u0027s really a special purpose\nembedded driver, and causes a lot of problems if enabled. So hide it\nunder EMBEDDED by default, and make sure it doesn\u0027t get enabled with\nthe i915 DRM driver.\n\nDave, I\u0027m hoping you can feed this to Linus through your tree. It\u0027s\nappropriate for 2.6.31 I think.\n\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@linux.ie\u003e\n" }, { "commit": "916635bfcae5fec170ccd36f4b451cf7c5d23b9d", "tree": "8099d4df449fedb93aaf19442b2796ee83ad1d6c", "parents": [ "42dd8619940a153e950c4d2301cd5e49f7342f99" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Wed Jul 15 16:00:37 2009 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Wed Jul 15 16:00:37 2009 +1000" }, "message": "drm/ttm: fix misplaced parentheses\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@linux.ie\u003e\n" }, { "commit": "42dd8619940a153e950c4d2301cd5e49f7342f99", "tree": "c2ddcadc9d3d36823792494a9b11c08fb109874b", "parents": [ "845792d940f5755b7a7837c450a71d9e831a13e2" ], "author": { "name": "Simon Farnsworth", "email": "simon.farnsworth@onelan.com", "time": "Fri Jul 10 11:25:16 2009 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Wed Jul 15 16:00:07 2009 +1000" }, "message": "drm/via: Fix vblank IRQ on VIA hardware.\n\nvia_enable_vblank wasn\u0027t setting the VBlank enable bit - instead, it\nwas masking out the rest of the register.\n\nAt the same time, fix via_disable_vblank to clear the VBlank enable\nbit.\n\nSigned-off-by: Dave Airlie \u003cairlied@linux.ie\u003e\n" }, { "commit": "845792d940f5755b7a7837c450a71d9e831a13e2", "tree": "92b4aee24f19c6522e17e2b2b026ea1128389c93", "parents": [ "d25e3a6faa82eeaa6e5487c2d2e27cfd938ed108" ], "author": { "name": "Jiri Slaby", "email": "jirislaby@gmail.com", "time": "Mon Jul 13 23:20:21 2009 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Wed Jul 15 15:56:12 2009 +1000" }, "message": "drm: drm_gem, check kzalloc retval\n\nCheck kzalloc retval against NULL in drm_gem_object_alloc and bail out\nappropriately.\n\nWhile at it merge the fail paths and jump to them by gotos at the end\nof the function.\n\nSigned-off-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@linux.ie\u003e\n" }, { "commit": "d25e3a6faa82eeaa6e5487c2d2e27cfd938ed108", "tree": "76daab3e4ac8b34f205429cec03317121fa37299", "parents": [ "069a9dce384e211784ce6fdfaf1f13921327480d" ], "author": { "name": "Jiri Slaby", "email": "jirislaby@gmail.com", "time": "Mon Jul 13 23:20:20 2009 +0200" }, "committer": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Wed Jul 15 15:55:37 2009 +1000" }, "message": "drm: drm_debugfs, check kmalloc retval\n\nCheck kmalloc return value in drm_debugfs_create_files and bail out\nappropriately if the pointer is NULL.\n\nSigned-off-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@linux.ie\u003e\n" }, { "commit": "069a9dce384e211784ce6fdfaf1f13921327480d", "tree": "82bdedb49c4712f441ef940c34ffe748eb8835f7", "parents": [ "e9e961c9a818a2f24711af493b907a8e40a69efc" ], "author": { "name": "Alex Deucher", "email": "alexdeucher@gmail.com", "time": "Wed Jul 01 13:03:52 2009 -0400" }, "committer": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Wed Jul 15 15:48:36 2009 +1000" }, "message": "drm/radeon: add some missing pci ids\n\nAlso, fix ordering for a couple others\n\nSigned-off-by: Alex Deucher \u003calexdeucher@gmail.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@linux.ie\u003e\n" }, { "commit": "b2dde6afe5d29212d521e69492ebc299db235001", "tree": "c05d878a44b79740c9987c4292ea3f4b054aea8f", "parents": [ "1e1f421a8137824127a41303a30493356b5da638" ], "author": { "name": "Mark Goodwin", "email": "mgoodwin@redhat.com", "time": "Fri Jun 26 10:44:11 2009 -0500" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Tue Jul 14 22:42:56 2009 -0400" }, "message": "ahci: add device ID for 82801JI sata controller\n\nAdd device ID for Intel 82801JI SATA AHCI controller.\n\nSigned-off-by: David Milburn \u003cdmilburn@redhat.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "1e1f421a8137824127a41303a30493356b5da638", "tree": "e112d0f728f33ba9376af26c703472b97a53f60b", "parents": [ "d0cb43b35d64877b2944bd37719708be5d7bbf99" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Sat Jul 11 09:49:48 2009 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Tue Jul 14 22:42:51 2009 -0400" }, "message": "drivers/ata: Move a dereference below a NULL test\n\nIf the NULL test is necessary, then the dereference should be moved below\nthe NULL test.\n\nThe semantic patch that makes this change is as follows:\n(http://www.emn.fr/x-info/coccinelle/)\n\n// \u003csmpl\u003e\n@@\ntype T;\nexpression E;\nidentifier i,fld;\nstatement S;\n@@\n\n- T i \u003d E-\u003efld;\n+ T i;\n ... when !\u003d E\n when !\u003d i\n if (E \u003d\u003d NULL) S\n+ i \u003d E-\u003efld;\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "d0cb43b35d64877b2944bd37719708be5d7bbf99", "tree": "7b282b1070613c552143d143f74e407c2ccb4b6e", "parents": [ "fe2c4d018fc6127610fef677e020b3bb41cfaaaf" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Jul 09 09:27:50 2009 +0900" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Tue Jul 14 22:41:46 2009 -0400" }, "message": "libata: implement and use HORKAGE_NOSETXFER, take#2\n\nPIONEER DVD-RW DVRTD08 times out SETXFER if no media is present. The\ndevice is SATA and simply skipping SETXFER works around the problem.\nImplement ATA_HORKAGE_NOSETXFER and apply it to the device.\n\nReported by Moritz Rigler in the following thread.\n\n http://thread.gmane.org/gmane.linux.ide/36790\n\nand by Lars in bko#9540.\n\nUpdated to whine and ignore NOSETXFER if PATA component is detected as\nsuggested by Alan Cox.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nReported-by: Moritz Rigler \u003clinux-ide@momail.e4ward.com\u003e\nReported-by: Lars \u003clars21ce@gmx.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "fe2c4d018fc6127610fef677e020b3bb41cfaaaf", "tree": "ce6bfcc0a34066c246667a31bf9f1d5f9538f651", "parents": [ "6847e154e3cd74fca6084124c097980a7634285a" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jul 08 12:16:37 2009 +0900" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Tue Jul 14 22:41:28 2009 -0400" }, "message": "libata: fix follow-up SRST failure path\n\nata_eh_reset() was missing error return handling after follow-up SRST\nallowing EH to continue the normal probing path after reset failure.\nThis was discovered while testing new WD 2TB drives which take longer\nthan 10 secs to spin up and cause the first follow-up SRST to time\nout.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "e9e961c9a818a2f24711af493b907a8e40a69efc", "tree": "66960fe0f8085959b53596d4747d1381a2cbc50e", "parents": [ "8aa651e23e2835b6d64381ce17447c995040ab30", "593308259bbd335eda9c5280cdd1f7883c746211" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:40:15 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:40:15 2009 -0700" }, "message": "Merge branch \u0027i2c-for-2631-rc3\u0027 of git://aeryn.fluff.org.uk/bjdooks/linux\n\n* \u0027i2c-for-2631-rc3\u0027 of git://aeryn.fluff.org.uk/bjdooks/linux:\n i2c: Use resource_size\n i2c-davinci: behave with i2cdetect\n i2c-davinci: convert clock usage after clkdev conversion\n" }, { "commit": "8aa651e23e2835b6d64381ce17447c995040ab30", "tree": "68c6a283b26b89cb2591f3be2f927234243a5d7d", "parents": [ "d878fe2331219ff8518192b67f66699cb6d164e2", "a89d63a159b1ba5833be2bef00adf8ad8caac8be" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:37:24 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:37:24 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:\n dlm: free socket in error exit path\n dlm: fix plock use-after-free\n dlm: Fix uninitialised variable warning in lock.c\n" }, { "commit": "d878fe2331219ff8518192b67f66699cb6d164e2", "tree": "c3255588130a98256e56396c13c29e887fa1d6c1", "parents": [ "62f49052ac4b68152ddf742b78b2151ba20dbc28", "92bd3bbfbe644ea0860cfe84cf175fffa5246423" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:37:09 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:37:09 2009 -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 mlx4_core: Add new ConnectX EN PCI ID 0x6764\n mlx4_core: Handle multi-physical function devices\n" }, { "commit": "62f49052ac4b68152ddf742b78b2151ba20dbc28", "tree": "f5cc92c195484360176e884fd88e8d3d01ae4b18", "parents": [ "5be6717e0d2493a20791d592e2d20fd2b2f62d44", "6ff7041dbfeb3bd7dfe9aa67275c21199ef760d6" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:35:24 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:35:24 2009 -0700" }, "message": "Merge branch \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n hrtimer: Fix migration expiry check\n hrtimer: migration: do not check expiry time on current CPU\n" }, { "commit": "5be6717e0d2493a20791d592e2d20fd2b2f62d44", "tree": "ec0b9833e3485bf95e60d26a553505dff18a5659", "parents": [ "989fa940961faa9d51f073bafa58c2b5653d5969", "2ad76643ff58bb8841f391ea8327c14abe273ea3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:35:11 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:35:11 2009 -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: Fix warning in pvclock.c\n x86, apic: Fix false positive section mismatch in numaq_32.c\n x86: Fix false positive section mismatch in es7000_32.c\n x86: Remove spurious printk level from segfault message\n" }, { "commit": "989fa940961faa9d51f073bafa58c2b5653d5969", "tree": "1d28774b8449b0a840b2cc396fd6229e7549fde2", "parents": [ "c0c50b541a4b147c5c2572ed051420238c47f57a", "ce2ae53b750abfaa012ce408e93da131a5b5649b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:35:00 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:35:00 2009 -0700" }, "message": "Merge branch \u0027core-fixes-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-fixes-for-linus-2\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n futexes: Fix infinite loop in get_futex_key() on huge page\n" }, { "commit": "c0c50b541a4b147c5c2572ed051420238c47f57a", "tree": "7500aefddead1009ed271c5b413f4b4fa89083a1", "parents": [ "a376d446771710790f5f3425172b467bf8578e22", "6ab5d668b131d3c5416f6df1d3ca95b82d4fe8a2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:34:32 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:34:32 2009 -0700" }, "message": "Merge branch \u0027tracing-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n tracing/function-profiler: do not free per cpu variable stat\n tracing/events: Move TRACE_SYSTEM outside of include guard\n" }, { "commit": "a376d446771710790f5f3425172b467bf8578e22", "tree": "64dd36bcb3df9a4d76d31900f1967b0cc302254e", "parents": [ "6847e154e3cd74fca6084124c097980a7634285a", "252aa9d94a04252046f3a382e6aca1b5c95921d8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:33:54 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jul 14 18:33:54 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:\n Revert \"NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines.\"\n skbuff.h: Fix comment for NET_IP_ALIGN\n drivers/net: using spin_lock_irqsave() in net_send_packet()\n NET: phy_device, fix lock imbalance\n gre: fix ToS/DiffServ inherit bug\n igb: gcc-3.4.6 fix\n atlx: duplicate testing of MCAST flag\n NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines.\n netdev: restore MTU change operation\n netdev: restore MAC address set and validate operations\n sit: fix regression: do not release skb-\u003edst before xmit\n net: ip_push_pending_frames() fix\n net: sk_prot_alloc() should not blindly overwrite memory\n" }, { "commit": "593308259bbd335eda9c5280cdd1f7883c746211", "tree": "60c9882dec12dfa7a262f1d14a81b8318d45d0f4", "parents": [ "7605fa3b0aedbb6c77471517ba16753f276156d9" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Sun Jul 05 08:37:50 2009 +0200" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed Jul 15 00:03:56 2009 +0100" }, "message": "i2c: Use resource_size\n\nUse the function resource_size, which reduces the chance of introducing\noff-by-one errors in calculating the resource size.\n\nThe semantic patch that makes this change is as follows:\n(http://www.emn.fr/x-info/coccinelle/)\n\n// \u003csmpl\u003e\n@@\nstruct resource *res;\n@@\n\n- (res-\u003eend - res-\u003estart) + 1\n+ resource_size(res)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "7605fa3b0aedbb6c77471517ba16753f276156d9", "tree": "33dfad8e4a52bd8a48f3064a7a4f1f5ae96fb6fd", "parents": [ "e164ddeeb82920c5b1470b6585767a000c8b0e45" ], "author": { "name": "David Brownell", "email": "dbrownell@users.sourceforge.net", "time": "Mon Jul 06 15:48:36 2009 -0700" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed Jul 15 00:03:56 2009 +0100" }, "message": "i2c-davinci: behave with i2cdetect\n\nMake i2c-davinci cope properly with \"i2cdetect\": don\u0027t spew\nsyslog spam on perfectly normal behaviors, or respond to any\naddress other than the one reserved for the SMBus host.\n\nSigned-off-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "e164ddeeb82920c5b1470b6585767a000c8b0e45", "tree": "6364fc34263736dfe1e04c731574f4edebdafe31", "parents": [ "6847e154e3cd74fca6084124c097980a7634285a" ], "author": { "name": "Kevin Hilman", "email": "khilman@deeprootsystems.com", "time": "Mon Jul 06 15:48:35 2009 -0700" }, "committer": { "name": "Ben Dooks", "email": "ben-linux@fluff.org", "time": "Wed Jul 15 00:03:56 2009 +0100" }, "message": "i2c-davinci: convert clock usage after clkdev conversion\n\nDaVinci core code has converted to the new clkdev API so\nclock name strings are not needed. Instead, just the a\n\u0027struct device\u0027 pointer is needed.\n\nSigned-off-by: Kevin Hilman \u003ckhilman@deeprootsystems.com\u003e\nSigned-off-by: Ben Dooks \u003cben-linux@fluff.org\u003e\n" }, { "commit": "252aa9d94a04252046f3a382e6aca1b5c95921d8", "tree": "5b265e4ae8011bd99938b2d4da5abac411aa6fc7", "parents": [ "8660c1240ec6016522b882c88751cb4ce40bf0e8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 14 13:13:41 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 14 13:13:41 2009 -0700" }, "message": "Revert \"NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines.\"\n\nThis reverts commit adeab1afb7de89555c69aab5ca21300c14af6369.\n\nAs Alan Cox explained, the TTY layer changes that went recently\nto get rid of the tty-\u003elow_latency stuff fixes this already,\nand even for -stable it\u0027s the -\u003elow_latency changes that should\ngo in to fix this, rather than this patch.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8660c1240ec6016522b882c88751cb4ce40bf0e8", "tree": "560b0136efdface63b6c3dc52d5ab7bcf30b4021", "parents": [ "79fbe134832ebb70a49d8802cfeb2401dc35bb38" ], "author": { "name": "Tobias Klauser", "email": "klto@zhaw.ch", "time": "Mon Jul 13 22:48:16 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 14 12:03:42 2009 -0700" }, "message": "skbuff.h: Fix comment for NET_IP_ALIGN\n\nUse the correct function call for skb_reserve in the comment for\nNET_IP_ALIGN.\n\nSigned-off-by: Tobias Klauser \u003cklto@zhaw.ch\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "79fbe134832ebb70a49d8802cfeb2401dc35bb38", "tree": "52e810d78f6357826b83963286b1fcd9d53bd882", "parents": [ "bc23283c7bc90958927abe26eedc562701743a88" ], "author": { "name": "Dongdong Deng", "email": "dongdong.deng@windriver.com", "time": "Sun Jul 12 20:27:06 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 14 12:03:41 2009 -0700" }, "message": "drivers/net: using spin_lock_irqsave() in net_send_packet()\n\nspin_unlock_irq() will enable interrupt in net_send_packet(),\nthis patch changes it to spin_lock_irqsave/spin_lock_irqrestore,\nso that it doesn\u0027t enable interrupts when already disabled,\nand netconsole would work properly over cs89x0/isa-skeleton.\n\nCall trace:\nnetconsole write_msg()\n{\n ...\n -\u003e spin_lock_irqsave();\n -\u003e netpoll_send_udp()\n -\u003e netpoll_send_skb()\n -\u003e net_send_packet()\n -\u003e...\n\n -\u003e spin_unlock_irqrestore();\n ...\n}\n\nSigned-off-by: Dongdong Deng \u003cdongdong.deng@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bc23283c7bc90958927abe26eedc562701743a88", "tree": "9bf032d073db84d3b094d2c43fd0cb352095ce45", "parents": [ "ee686ca919193d7c1f87f907e732df5e2f942523" ], "author": { "name": "Jiri Slaby", "email": "jirislaby@gmail.com", "time": "Mon Jul 13 11:23:39 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 14 12:03:39 2009 -0700" }, "message": "NET: phy_device, fix lock imbalance\n\nDon\u0027t forget to unlock a mutex in phy_scan_fixups on a fail path.\n\nSigned-off-by: Jiri Slaby \u003cjirislaby@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a89d63a159b1ba5833be2bef00adf8ad8caac8be", "tree": "520fa4131a549d1956c2a938e8e5a682e1ef5dab", "parents": [ "c78a87d0a1fc885dfdbe21fd5e07787691dfb068" ], "author": { "name": "Casey Dahlin", "email": "cdahlin@redhat.com", "time": "Tue Jul 14 12:17:51 2009 -0500" }, "committer": { "name": "David Teigland", "email": "teigland@redhat.com", "time": "Tue Jul 14 12:28:43 2009 -0500" }, "message": "dlm: free socket in error exit path\n\nIn the tcp_connect_to_sock() error exit path, the socket\nallocated at the top of the function was not being freed.\n\nSigned-off-by: Casey Dahlin \u003ccdahlin@redhat.com\u003e\nSigned-off-by: David Teigland \u003cteigland@redhat.com\u003e\n" }, { "commit": "ee686ca919193d7c1f87f907e732df5e2f942523", "tree": "2a1f528de455ffc952ab9bc795dd38a863604aaa", "parents": [ "c8159b2db1b49f6bda4429008c85108e2da60712" ], "author": { "name": "Andreas Jaggi", "email": "aj@open.ch", "time": "Tue Jul 14 09:35:59 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jul 14 09:35:59 2009 -0700" }, "message": "gre: fix ToS/DiffServ inherit bug\n\nFixes two bugs:\n- ToS/DiffServ inheritance was unintentionally activated when using impair fixed ToS values\n- ECN bit was lost during ToS/DiffServ inheritance\n\nSigned-off-by: Andreas Jaggi \u003caj@open.ch\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2ad76643ff58bb8841f391ea8327c14abe273ea3", "tree": "ca96bcbbe0a266dfff594a1c2cb81b65a6163547", "parents": [ "7473727be884293c8171775a148e1d174d1606e6" ], "author": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Mon Jul 13 16:14:37 2009 -0400" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 14 16:25:05 2009 +0200" }, "message": "x86: Fix warning in pvclock.c\n\nwhen building 32-bit, I see this ..\narch/x86/kernel/pvclock.c:63:7: warning: \"__x86_64__\" is not defined\n\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\nLKML-Reference: \u003c20090713201437.GA12165@redhat.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n\n" }, { "commit": "6847e154e3cd74fca6084124c097980a7634285a", "tree": "95cac2d8b251a810f44495de4b2bab83dd94a515", "parents": [ "1cf29683f4414296dc772a87caa207cab16c310c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 18:18:52 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 18:18:52 2009 -0700" }, "message": "Linux 2.6.31-rc3\n" }, { "commit": "1cf29683f4414296dc772a87caa207cab16c310c", "tree": "90d05ba531c5ad48d8d171d5b78038a7df7728e7", "parents": [ "4a390e07fc53ce9dd615d7b788e9ecc73f87ad94", "96577c43827697ca1af5982fa256a34786d0c720" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 16:39:25 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 16:39:25 2009 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:\n jbd2: fix race between write_metadata_buffer and get_write_access\n ext4: Fix ext4_mb_initialize_context() to initialize all fields\n ext4: fix null handler of ioctls in no journal mode\n ext4: Fix buffer head reference leak in no-journal mode\n ext4: Move __ext4_journalled_writepage() to avoid forward declaration\n ext4: Fix mmap/truncate race when blocksize \u003c pagesize \u0026\u0026 !nodellaoc\n ext4: Fix mmap/truncate race when blocksize \u003c pagesize \u0026\u0026 delayed allocation\n ext4: Don\u0027t look at buffer_heads outside i_size.\n ext4: Fix goal inum check in the inode allocator\n ext4: fix no journal corruption with locale-gen\n ext4: Calculate required journal credits for inserting an extent properly\n ext4: Fix truncation of symlinks after failed write\n jbd2: Fix a race between checkpointing code and journal_get_write_access()\n ext4: Use rcu_barrier() on module unload.\n ext4: naturally align struct ext4_allocation_request\n ext4: mark several more functions in mballoc.c as noinline\n ext4: Fix potential reclaim deadlock when truncating partial block\n jbd2: Remove GFP_ATOMIC kmalloc from inside spinlock critical region\n ext4: Fix type warning on 64-bit platforms in tracing events header\n" }, { "commit": "96577c43827697ca1af5982fa256a34786d0c720", "tree": "aa752d4685f5702976683401dadb7557f161d62d", "parents": [ "833576b362e15c38be3bfe43942cda693e56287c" ], "author": { "name": "dingdinghua", "email": "dingdinghua85@gmail.com", "time": "Mon Jul 13 17:55:35 2009 -0400" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Mon Jul 13 17:55:35 2009 -0400" }, "message": "jbd2: fix race between write_metadata_buffer and get_write_access\n\nThe function jbd2_journal_write_metadata_buffer() calls\njbd_unlock_bh_state(bh_in) too early; this could potentially allow\nanother thread to call get_write_access on the buffer head, modify the\ndata, and dirty it, and allowing the wrong data to be written into the\njournal. Fortunately, if we lose this race, the only time this will\nactually cause filesystem corruption is if there is a system crash or\nother unclean shutdown of the system before the next commit can take\nplace.\n\nSigned-off-by: dingdinghua \u003cdingdinghua85@gmail.com\u003e\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\n" }, { "commit": "c8159b2db1b49f6bda4429008c85108e2da60712", "tree": "d4bfda1c95baed5d1166b2c3e5fe3269c31be569", "parents": [ "41796e91a2a30fd82a0fd561022489b61f8a3188" ], "author": { "name": "Eric Dumazet", "email": "eric.dumazet@gmail.com", "time": "Mon Jul 13 11:11:41 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 13 11:11:41 2009 -0700" }, "message": "igb: gcc-3.4.6 fix\n\nforward declaration of inline function should be avoided, or\nold gcc cannot compile.\n\nReported-by: Teck Choon Giam \u003cgiamteckchoon@gmail.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "41796e91a2a30fd82a0fd561022489b61f8a3188", "tree": "e7e4dd3a921045745a22d42ecaca387eff2fe64b", "parents": [ "adeab1afb7de89555c69aab5ca21300c14af6369" ], "author": { "name": "roel kluin", "email": "roel.kluin@gmail.com", "time": "Sun Jul 12 13:12:37 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jul 13 11:02:55 2009 -0700" }, "message": "atlx: duplicate testing of MCAST flag\n\nFix duplicate testing of MCAST flag\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nAcked-by: Jay Cliburn \u003cjcliburn@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4a390e07fc53ce9dd615d7b788e9ecc73f87ad94", "tree": "1086088a8efb55be1d2878cff8fefd1514301c15", "parents": [ "a4dc32374ed6dd56e09039ea8b7151c3a3e2307d", "f6387184f5196242edecbb5385bcc3481fae212a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 10:24:43 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 10:24:43 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:\n Staging: stlc45xx: convert config_interface to bss_info_changed, fixing a build error\n Staging: comedi: s626: use subvendor:subdevice ids for SAA7146 board\n Staging: prevent rtl8192su from crashing dev_ioctl in SIOCGIWNAME\n Staging: prevent rtl8187se from crashing dev_ioctl() in SIOCGIWNAME\n Staging: rtl8192su: convert to net_device_ops\n Staging: serqt_usb2: declare qt_open static in serqt_usb2\n Staging: serqt_usb2: fix qt_close parameters in serqt_usb2\n Staging: comedi: jr3_pci.c: add required includes\n Staging: meilhaus: add email address to TODO\n Staging: rspiusb: use NULL virtual address instead of a bogus one\n Staging: vt6655: compile fix\n Staging: rt2870: Add USB ID for Sitecom WL-608\n" }, { "commit": "a4dc32374ed6dd56e09039ea8b7151c3a3e2307d", "tree": "c1a5482db418ff1adb0135ac9d3abd01d138c2ad", "parents": [ "51feb98d2547a389be2f666514f5bcd658f79eab", "38c7dc373029e4666b17850054dd43c1c96bb264" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 10:24:08 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 10:24:08 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:\n wm97xx_batery: replace driver_data with dev_get_drvdata()\n omap: video: remove direct access of driver_data\n Sound: remove direct access of driver_data\n driver model: fix show/store prototypes in doc.\n Firmware: firmware_class, fix lock imbalance\n Driver Core: remove BUS_ID_SIZE\n sparc: remove driver-core BUS_ID_SIZE\n partitions: fix broken uevent_suppress conversion\n devres: WARN() and return, don\u0027t crash on device_del() of uninitialized device\n" }, { "commit": "51feb98d2547a389be2f666514f5bcd658f79eab", "tree": "bd3d3eb486a0008340afd5807d9d2db12ec3b7b3", "parents": [ "8f8f013478133eb98e35e1d669c98c5e39d769c7", "dc7520c17982ca4232233d2781e5cde29e58fbad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 10:23:03 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 10:23:03 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (48 commits)\n USB: otg: fix module reinsert issue\n USB: handle zero-length usbfs submissions correctly\n USB: EHCI: report actual_length for iso transfers\n USB: option: remove unnecessary and erroneous code\n USB: cypress_m8: remove invalid Clear-Halt\n USB: musb_host: undo incorrect change in musb_advance_schedule()\n USB: fix LANGID\u003d0 regression\n USB: serial: sierra driver id_table additions\n USB serial: Add ID for Turtelizer, an FT2232L-based JTAG/RS-232 adapter.\n USB: fix race leading to a write after kfree in usbfs\n USB: Sierra: fix oops upon device close\n USB: option.c: add A-Link 3GU device id\n USB: Serial: Add support for Arkham Technology adapters\n USB: Fix option_ms regression in 2.6.31-rc2\n USB: gadget audio: select SND_PCM\n USB: ftdi: support NDI devices\n Revert USB: usbfs: deprecate and hide option for !embedded\n USB: usb.h: fix kernel-doc notation\n USB: RNDIS gadget, fix issues talking from PXA\n USB: serial: FTDI with product code FB80 and vendor id 0403\n ...\n" }, { "commit": "8f8f013478133eb98e35e1d669c98c5e39d769c7", "tree": "244d9f9f88dd8f0d6e5a8d9d1ef50b419a5781eb", "parents": [ "5fddcdb70fd9e8fd52d42ed52a572fecb8eb7cde" ], "author": { "name": "Dave Kleikamp", "email": "shaggy@linux.vnet.ibm.com", "time": "Mon Jul 13 11:02:24 2009 -0500" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 09:10:20 2009 -0700" }, "message": "update JFS entry in MAINTAINERS\n\nJFS hasn\u0027t really been supported for a while. It\u0027s still maintained,\nbut saying it\u0027s supported is a stretch. Updating my preferred email\naddress as well.\n\nSigned-off-by: Dave Kleikamp \u003cshaggy@linux.vnet.ibm.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5fddcdb70fd9e8fd52d42ed52a572fecb8eb7cde", "tree": "baa5ff2e3d67f6fb3ca4353c602e8c3566235521", "parents": [ "1d03d2bd6e6421224d618b120348bd5ee328d96a" ], "author": { "name": "Huang Weiyi", "email": "weiyi.huang@gmail.com", "time": "Mon Jul 13 15:09:25 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 09:09:08 2009 -0700" }, "message": "mn10300: remove duplicated #include\n\nRemove duplicated #include(\u0027s) in\n arch/mn10300/kernel/sys_mn10300.c\n\nSigned-off-by: Huang Weiyi \u003cweiyi.huang@gmail.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1d03d2bd6e6421224d618b120348bd5ee328d96a", "tree": "2afae6ccb70c8532485b3c7ffa292300cc358bc1", "parents": [ "7638d5322bd89d49e013a03fe2afaeb6d214fabd" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jul 13 12:39:05 2009 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 13 09:09:08 2009 -0700" }, "message": "Fix staging drivers after smp_lock.h redux\n\nCommit 405f55712dfe464b3240d7816cc4fe4174831be2 (\"headers: smp_lock.h\nredux\") broke the build of two staging drivers. Fix them.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "833576b362e15c38be3bfe43942cda693e56287c", "tree": "5a221bd167ae7f1b0575fd24fbc5e4cdae18a598", "parents": [ "ac046f1d6121ccdda6db66bd88acd52418f489b2" ], "author": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Mon Jul 13 09:45:52 2009 -0400" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Mon Jul 13 09:45:52 2009 -0400" }, "message": "ext4: Fix ext4_mb_initialize_context() to initialize all fields\n\nPavel Roskin pointed out that kmemcheck indicated that\next4_mb_store_history() was accessing uninitialized values of\nac-\u003eac_tail and ac-\u003eac_buddy leading to garbage in the mballoc\nhistory. Fix this by initializing the entire structure to all zeros\nfirst.\n\nAlso, two fields were getting doubly initialized by the caller of\next4_mb_initialize_context, so remove them for efficiency\u0027s sake.\n\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\n" }, { "commit": "ac046f1d6121ccdda6db66bd88acd52418f489b2", "tree": "3a52ddd6ae7663b0cdd52a9eab059711626ae491", "parents": [ "e6b5d30104db5f34110678ecab14988f1f1eff63" ], "author": { "name": "Peng Tao", "email": "bergwolf@gmail.com", "time": "Mon Jul 13 09:30:17 2009 -0400" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Mon Jul 13 09:30:17 2009 -0400" }, "message": "ext4: fix null handler of ioctls in no journal mode\n\nThe EXT4_IOC_GROUP_ADD and EXT4_IOC_GROUP_EXTEND ioctls should not\nflush the journal in no_journal mode. Otherwise, running resize2fs on\na mounted no_journal partition triggers the following error messages:\n\nBUG: unable to handle kernel NULL pointer dereference at 00000014\nIP: [\u003cc039d282\u003e] _spin_lock+0x8/0x19\n*pde \u003d 00000000 \nOops: 0002 [#1] SMP\n\nSigned-off-by: Peng Tao \u003cbergwolf@gmail.com\u003e\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\n" }, { "commit": "e6b5d30104db5f34110678ecab14988f1f1eff63", "tree": "922408d70d388925f0113998649d56da475deff4", "parents": [ "62e086be5d2abef8cad854bc5707329ad345f2ec" ], "author": { "name": "Curt Wohlgemuth", "email": "curtw@google.com", "time": "Mon Jul 13 09:07:20 2009 -0400" }, "committer": { "name": "Theodore Ts\u0027o", "email": "tytso@mit.edu", "time": "Mon Jul 13 09:07:20 2009 -0400" }, "message": "ext4: Fix buffer head reference leak in no-journal mode\n\nWe found a problem with buffer head reference leaks when using an ext4\npartition without a journal. In particular, calls to ext4_forget() would\nnot to a brelse() on the input buffer head, which will cause pages they\nbelong to to not be reclaimable.\n\nFurther investigation showed that all places where ext4_journal_forget() and\next4_journal_revoke() are called are subject to the same problem. The patch\nbelow changes __ext4_journal_forget/__ext4_journal_revoke to do an explicit\nrelease of the buffer head when the journal handle isn\u0027t valid.\n\nSigned-off-by: Curt Wohlgemuth \u003ccurtw@google.com\u003e\nSigned-off-by: \"Theodore Ts\u0027o\" \u003ctytso@mit.edu\u003e\n" }, { "commit": "7473727be884293c8171775a148e1d174d1606e6", "tree": "efff9967bec780e0acd8583c15a43012bd491c3b", "parents": [ "151586d0f70405d99324d89aea13706cf6d7f993" ], "author": { "name": "Rakib Mullick", "email": "rakib.mullick@gmail.com", "time": "Sun Jul 12 17:07:19 2009 +0600" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jul 13 11:03:27 2009 +0200" }, "message": "x86, apic: Fix false positive section mismatch in numaq_32.c\n\nThe variable apic_numaq placed in noninit section references the\nfunction wakeup_secondary_cpu_via_nmi(), which is in __cpuinit\nsection. Thus causes a section mismatch warning. To avoid such\nmismatch we mark apic_numaq as __refdata.\n\nWe were warned by the following warning:\n\n WARNING: arch/x86/kernel/built-in.o(.data+0x932c): Section mismatch in\n reference from the variable apic_numaq to the function\n .cpuinit.text:wakeup_secondary_cpu_via_nmi()\n\nSigned-off-by: Rakib Mullick \u003crakib.mullick@gmail.com\u003e\nLKML-Reference: \u003cb9df5fa10907120407p6b4f67dtf4d563155488188a@mail.gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "151586d0f70405d99324d89aea13706cf6d7f993", "tree": "9f9afbed7361005fa68cf81420fc8c7d2b3b27c9", "parents": [ "a1a08d1cb0ab148fd74216e4c0b4d4db18fe62c6" ], "author": { "name": "Rakib Mullick", "email": "rakib.mullick@gmail.com", "time": "Sun Jul 12 17:04:12 2009 +0600" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jul 13 11:03:26 2009 +0200" }, "message": "x86: Fix false positive section mismatch in es7000_32.c\n\nThe variable apic_es7000_cluster references the function __cpuinit\nwakeup_secondary_cpu_via_mip() from a noninit section. So we\u0027ve been\nwarned by the following warning. To avoid possible collision between\ninit/noninit, its best to mark the variable as __refdata.\n\nWe were warned by the following warning:\n\n LD arch/x86/kernel/apic/built-in.o\n WARNING: arch/x86/kernel/apic/built-in.o(.data+0x198c): Section\n mismatch in reference from the variable apic_es7000_cluster to the\n function .cpuinit.text:wakeup_secondary_cpu_via_mip()\n\nSigned-off-by: Rakib Mullick \u003crakib.mullick@gmail.com\u003e\nLKML-Reference: \u003cb9df5fa10907120404k6279a10ch5e9682432272706f@mail.gmail.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "6ab5d668b131d3c5416f6df1d3ca95b82d4fe8a2", "tree": "dc5cd05361845a431c1388f83f913e4610a2dfca", "parents": [ "d0b6e04a4cd8360e3c9c419f7c30a3081a0c142a" ], "author": { "name": "Steven Rostedt", "email": "srostedt@redhat.com", "time": "Thu Jun 04 00:55:45 2009 -0400" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jul 13 11:01:10 2009 +0200" }, "message": "tracing/function-profiler: do not free per cpu variable stat\n\nThe per cpu variable stat is freeded if we fail to allocate a name\non start up. This was due to stat at first being allocated in the\ninitial design. But since then, it has become a static per cpu variable\nbut the free on error was not removed.\n\nAlso added __init annotation to the function that this is in.\n\n[ Impact: prevent possible memory corruption on low mem at boot up ]\n\nSigned-off-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d0b6e04a4cd8360e3c9c419f7c30a3081a0c142a", "tree": "621a99cac5fdc0c90a3bcdab60d5896daba04a00", "parents": [ "7638d5322bd89d49e013a03fe2afaeb6d214fabd" ], "author": { "name": "Li Zefan", "email": "lizf@cn.fujitsu.com", "time": "Mon Jul 13 10:33:21 2009 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Jul 13 10:59:55 2009 +0200" }, "message": "tracing/events: Move TRACE_SYSTEM outside of include guard\n\nIf TRACE_INCLDUE_FILE is defined, \u003ctrace/events/TRACE_INCLUDE_FILE.h\u003e\nwill be included and compiled, otherwise it will be\n\u003ctrace/events/TRACE_SYSTEM.h\u003e\n\nSo TRACE_SYSTEM should be defined outside of #if proctection,\njust like TRACE_INCLUDE_FILE.\n\nImaging this scenario:\n\n #include \u003ctrace/events/foo.h\u003e\n -\u003e TRACE_SYSTEM \u003d\u003d foo\n ...\n #include \u003ctrace/events/bar.h\u003e\n -\u003e TRACE_SYSTEM \u003d\u003d bar\n ...\n #define CREATE_TRACE_POINTS\n #include \u003ctrace/events/foo.h\u003e\n -\u003e TRACE_SYSTEM \u003d\u003d bar !!!\n\nand then bar.h will be included and compiled.\n\nSigned-off-by: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nLKML-Reference: \u003c4A5A9CF1.2010007@cn.fujitsu.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "adeab1afb7de89555c69aab5ca21300c14af6369", "tree": "9e300563895b33a75876be58f167006fa8cbde3d", "parents": [ "635ecaa70e862f85f652581305fe0074810893be" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Sun Jul 12 21:09:20 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 12 21:09:20 2009 -0700" }, "message": "NET: Fix locking issues in PPP, 6pack, mkiss and strip line disciplines.\n\nGuido Trentalancia reports:\n\nI am trying to use the kiss driver in the Linux kernel that is being\nshipped with Fedora 10 but unfortunately I get the following oops:\n\nmkiss: AX.25 Multikiss, Hans Albas PE1AYX\nmkiss: ax0: crc mode is auto.\nADDRCONF(NETDEV_CHANGE): ax0: link becomes ready\n------------[ cut here ]------------\nWARNING: at kernel/softirq.c:77 __local_bh_disable+0x2f/0x83() (Not\ntainted)\n[...]\nunloaded: microcode]\nPid: 0, comm: swapper Not tainted 2.6.27.25-170.2.72.fc10.i686 #1\n [\u003cc042ddfb\u003e] warn_on_slowpath+0x65/0x8b\n [\u003cc06ab62b\u003e] ? _spin_unlock_irqrestore+0x22/0x38\n [\u003cc04228b4\u003e] ? __enqueue_entity+0xe3/0xeb\n [\u003cc042431e\u003e] ? enqueue_entity+0x203/0x20b\n [\u003cc0424361\u003e] ? enqueue_task_fair+0x3b/0x3f\n [\u003cc041f88c\u003e] ? resched_task+0x3a/0x6e\n [\u003cc06ab62b\u003e] ? _spin_unlock_irqrestore+0x22/0x38\n [\u003cc06ab4e2\u003e] ? _spin_lock_bh+0xb/0x16\n [\u003cc043255b\u003e] __local_bh_disable+0x2f/0x83\n [\u003cc04325ba\u003e] local_bh_disable+0xb/0xd\n [\u003cc06ab4e2\u003e] _spin_lock_bh+0xb/0x16\n [\u003cf8b6f600\u003e] mkiss_receive_buf+0x2fb/0x3a6 [mkiss]\n [\u003cc0572a30\u003e] flush_to_ldisc+0xf7/0x198\n [\u003cc0572b12\u003e] tty_flip_buffer_push+0x41/0x51\n [\u003cf89477f2\u003e] ftdi_process_read+0x375/0x4ad [ftdi_sio]\n [\u003cf8947a5a\u003e] ftdi_read_bulk_callback+0x130/0x138 [ftdi_sio]\n [\u003cc05d4bec\u003e] usb_hcd_giveback_urb+0x63/0x93\n [\u003cc05ea290\u003e] uhci_giveback_urb+0xe5/0x15f\n [\u003cc05eaabf\u003e] uhci_scan_schedule+0x52e/0x767\n [\u003cc05f6288\u003e] ? psmouse_handle_byte+0xc/0xe5\n [\u003cc054df78\u003e] ? acpi_ev_gpe_detect+0xd6/0xe1\n [\u003cc05ec5b0\u003e] uhci_irq+0x110/0x125\n [\u003cc05d4834\u003e] usb_hcd_irq+0x40/0xa3\n [\u003cc0465313\u003e] handle_IRQ_event+0x2f/0x64\n [\u003cc046642b\u003e] handle_level_irq+0x74/0xbe\n [\u003cc04663b7\u003e] ? handle_level_irq+0x0/0xbe\n [\u003cc0406e6e\u003e] do_IRQ+0xc7/0xfe\n [\u003cc0405668\u003e] common_interrupt+0x28/0x30\n [\u003cc056821a\u003e] ? acpi_idle_enter_simple+0x162/0x19d\n [\u003cc0617f52\u003e] cpuidle_idle_call+0x60/0x92\n [\u003cc0403c61\u003e] cpu_idle+0x101/0x134\n [\u003cc069b1ba\u003e] rest_init+0x4e/0x50\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n---[ end trace b7cc8076093467ad ]---\n------------[ cut here ]------------\nWARNING: at kernel/softirq.c:136 _local_bh_enable_ip+0x3d/0xc4()\n[...]\nPid: 0, comm: swapper Tainted: G W 2.6.27.25-170.2.72.fc10.i686\n [\u003cc042ddfb\u003e] warn_on_slowpath+0x65/0x8b\n [\u003cc06ab62b\u003e] ? _spin_unlock_irqrestore+0x22/0x38\n [\u003cc04228b4\u003e] ? __enqueue_entity+0xe3/0xeb\n [\u003cc042431e\u003e] ? enqueue_entity+0x203/0x20b\n [\u003cc0424361\u003e] ? enqueue_task_fair+0x3b/0x3f\n [\u003cc041f88c\u003e] ? resched_task+0x3a/0x6e\n [\u003cc06ab62b\u003e] ? _spin_unlock_irqrestore+0x22/0x38\n [\u003cc06ab4e2\u003e] ? _spin_lock_bh+0xb/0x16\n [\u003cf8b6f642\u003e] ? mkiss_receive_buf+0x33d/0x3a6 [mkiss]\n [\u003cc04325f9\u003e] _local_bh_enable_ip+0x3d/0xc4\n [\u003cc0432688\u003e] local_bh_enable_ip+0x8/0xa\n [\u003cc06ab54d\u003e] _spin_unlock_bh+0x11/0x13\n [\u003cf8b6f642\u003e] mkiss_receive_buf+0x33d/0x3a6 [mkiss]\n [\u003cc0572a30\u003e] flush_to_ldisc+0xf7/0x198\n [\u003cc0572b12\u003e] tty_flip_buffer_push+0x41/0x51\n [\u003cf89477f2\u003e] ftdi_process_read+0x375/0x4ad [ftdi_sio]\n [\u003cf8947a5a\u003e] ftdi_read_bulk_callback+0x130/0x138 [ftdi_sio]\n [\u003cc05d4bec\u003e] usb_hcd_giveback_urb+0x63/0x93\n [\u003cc05ea290\u003e] uhci_giveback_urb+0xe5/0x15f\n [\u003cc05eaabf\u003e] uhci_scan_schedule+0x52e/0x767\n [\u003cc05f6288\u003e] ? psmouse_handle_byte+0xc/0xe5\n [\u003cc054df78\u003e] ? acpi_ev_gpe_detect+0xd6/0xe1\n [\u003cc05ec5b0\u003e] uhci_irq+0x110/0x125\n [\u003cc05d4834\u003e] usb_hcd_irq+0x40/0xa3\n [\u003cc0465313\u003e] handle_IRQ_event+0x2f/0x64\n [\u003cc046642b\u003e] handle_level_irq+0x74/0xbe\n [\u003cc04663b7\u003e] ? handle_level_irq+0x0/0xbe\n [\u003cc0406e6e\u003e] do_IRQ+0xc7/0xfe\n [\u003cc0405668\u003e] common_interrupt+0x28/0x30\n [\u003cc056821a\u003e] ? acpi_idle_enter_simple+0x162/0x19d\n [\u003cc0617f52\u003e] cpuidle_idle_call+0x60/0x92\n [\u003cc0403c61\u003e] cpu_idle+0x101/0x134\n [\u003cc069b1ba\u003e] rest_init+0x4e/0x50\n \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n---[ end trace b7cc8076093467ad ]---\nmkiss: ax0: Trying crc-smack\nmkiss: ax0: Trying crc-flexnet\n\nThe issue was, that the locking code in mkiss was assuming it was only\never being called in process or bh context. Fixed by converting the\ninvolved locking code to use irq-safe locks.\n\nReview of other networking line disciplines shows that 6pack, both sync\nand async PPP and STRIP have similar issues. The ppp_async one is the\nmost interesting one as it sorts out half of the issue as far back as\n2004 in commit http://git.kernel.org/?p\u003dlinux/kernel/git/tglx/history.git;a\u003dcommitdiff;h\u003d2996d8deaeddd01820691a872550dc0cfba0c37d\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nReported-by: Guido Trentalancia \u003cguido@trentalancia.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "dc7520c17982ca4232233d2781e5cde29e58fbad", "tree": "af18840e3bfa282f82e398b2cd0aa09c4c978cec", "parents": [ "9180135bc80ab11199d482b6111e23f74d65af4a" ], "author": { "name": "Ajay Kumar Gupta", "email": "ajay.gupta@ti.com", "time": "Fri Jul 03 13:18:45 2009 +0530" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sun Jul 12 15:16:41 2009 -0700" }, "message": "USB: otg: fix module reinsert issue\n\nPlatform_device instance (pd) is not set to NULL in\nusb_nop_xceiv_unregister() causing usb_nop_xceiv_register()\nto fail during module reinsert.\n\nFrom: Ajay Kumar Gupta \u003cajay.gupta@ti.com\u003e\nSigned-off-by: Babu Ravi \u003cravibabu@ti.com\u003e\nAcked-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\n\n" }, { "commit": "9180135bc80ab11199d482b6111e23f74d65af4a", "tree": "570d7079252a6a7b821e42383913ec0bfa09e4eb", "parents": [ "ec6d67e39f5638c792eb7490bf32586ccb9d8005" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Mon Jun 29 11:04:54 2009 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sun Jul 12 15:16:41 2009 -0700" }, "message": "USB: handle zero-length usbfs submissions correctly\n\nThis patch (as1262) fixes a bug in usbfs: It refuses to accept\nzero-length transfers, and it insists that the buffer pointer be valid\neven if there is no data being transferred.\n\nThe patch also consolidates a bunch of repetitive access_ok() checks\ninto a single check, which incidentally fixes the lack of such a check\nfor Isochronous URBs.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "ec6d67e39f5638c792eb7490bf32586ccb9d8005", "tree": "c65d267dc4979edfd7695d6a2e55d44ab13a8d7e", "parents": [ "f092c240494f2d807401d93f95f683909b90af96" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Mon Jun 29 14:34:59 2009 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sun Jul 12 15:16:40 2009 -0700" }, "message": "USB: EHCI: report actual_length for iso transfers\n\nThis patch (as1259b) makes ehci-hcd return the total number of bytes\ntransferred in urb-\u003eactual_length for Isochronous transfers.\nUntil now, the actual_length value was unaccountably left at 0.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nAcked-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "f092c240494f2d807401d93f95f683909b90af96", "tree": "ae123a40cb9957c1ff47f832a500ae4343cf5a6e", "parents": [ "4d2fae8b3597bc787f1f1c06637ce5ab8187e5a7" ], "author": { "name": "Alan Stern", "email": "stern@rowland.harvard.edu", "time": "Thu Jul 09 12:58:43 2009 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Sun Jul 12 15:16:40 2009 -0700" }, "message": "USB: option: remove unnecessary and erroneous code\n\nThis patch (as1264) removes a bunch of unnecessary and erroneous stuff\nfrom the option USB-serial driver. Clearly there\u0027s no need to verify\nthat the device pointer stored in the URBs is right or to store the\nsame pointer over again. After all, the pointer can\u0027t change once it\nhas been set up.\n\nThere\u0027s also no need to call usb_clear_halt for the IN endpoint\nmultiple times -- in fact, doing so is an error since every time after\nthe first there will be active URBs queued for that endpoint. Since\nthe Clear-Halts don\u0027t appear to be needed at all, the patch simply\nremoves them.\n\nSigned-off-by: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" } ], "next": "4d2fae8b3597bc787f1f1c06637ce5ab8187e5a7" }