)]}' { "log": [ { "commit": "c12f667e7563c2c0e0908c997900b91b41b23592", "tree": "add57171404be906a87e03820d9e0e5f31d53238", "parents": [ "0792644d22852f40c8ad16c4ba1fefd76aba5643", "942c1a927bf296fd64fd49f04c5a8f66bb14446b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 06 17:48:02 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jun 06 17:48:02 2011 +0900" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:\n hwmon: (max6642): Better chip detection schema\n hwmon: (coretemp) Further relax temperature range checks\n hwmon: (coretemp) Fix TjMax detection for older CPUs\n hwmon: (coretemp) Relax target temperature range check\n hwmon: (max6642) Rename temp_fault sysfs attribute to temp2_fault\n" }, { "commit": "942c1a927bf296fd64fd49f04c5a8f66bb14446b", "tree": "58020f9137fd23755a918eca1ad0621109123a80", "parents": [ "bb9973e4e73f43bd86698483d0c3f7a362ff94ce" ], "author": { "name": "Per Dalén", "email": "per.dalen@appeartv.com", "time": "Thu May 26 09:08:53 2011 -0400" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Sat Jun 04 10:34:28 2011 -0700" }, "message": "hwmon: (max6642): Better chip detection schema\n\nImprove detection of MAX6642 by reading non existing registers (0x04, 0x06\nand 0xff). Reading those registers returns the previously read value.\n\nSigned-off-by: Per Dalen \u003cper.dalen@appeartv.com\u003e\n[guenter.roeck@ericsson.com: added second set of register reads]\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "23c79d31a3dd2602ee1a5ff31303b2d7a2d3c159", "tree": "95187d64da68a22339ee0e61ba4e9939aeefb2b1", "parents": [ "0e833d8cfcb52b5ee3ead22cabbab81dea32c3f0", "e73e079bf128d68284efedeba1fbbc18d78610f9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 23:19:51 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 23:19:51 2011 +0900" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:\n [SCSI] Fix oops caused by queue refcounting failure\n" }, { "commit": "0e833d8cfcb52b5ee3ead22cabbab81dea32c3f0", "tree": "0c64533ba9181c014a4b2dcda75c273ae0437dd6", "parents": [ "4f1ba49efafccbc73017f824efa2505c81b247cd", "7b29dc21ea084be7ddfb536994a9cfae95337690" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 23:16:00 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 23:16:00 2011 +0900" }, "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: (40 commits)\n tg3: Fix tg3_skb_error_unmap()\n net: tracepoint of net_dev_xmit sees freed skb and causes panic\n drivers/net/can/flexcan.c: add missing clk_put\n net: dm9000: Get the chip in a known good state before enabling interrupts\n drivers/net/davinci_emac.c: add missing clk_put\n af-packet: Add flag to distinguish VID 0 from no-vlan.\n caif: Fix race when conditionally taking rtnl lock\n usbnet/cdc_ncm: add missing .reset_resume hook\n vlan: fix typo in vlan_dev_hard_start_xmit()\n net/ipv4: Check for mistakenly passed in non-IPv4 address\n iwl4965: correctly validate temperature value\n bluetooth l2cap: fix locking in l2cap_global_chan_by_psm\n ath9k: fix two more bugs in tx power\n cfg80211: don\u0027t drop p2p probe responses\n Revert \"net: fix section mismatches\"\n drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run()\n sctp: stop pending timers and purge queues when peer restart asoc\n drivers/net: ks8842 Fix crash on received packet when in PIO mode.\n ip_options_compile: properly handle unaligned pointer\n iwlagn: fix incorrect PCI subsystem id for 6150 devices\n ...\n" }, { "commit": "4f1ba49efafccbc73017f824efa2505c81b247cd", "tree": "db072bbccffd1f1c6b1269ac7a752cb30af3a726", "parents": [ "39b4a46f19295b4876fba6655f27d67232dc6a1f", "e3a57b3ccf5c04934ac43b5b80e32ba51b817288" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 08:11:26 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 08:11:26 2011 +0900" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-block:\n block: Use hlist_entry() for io_context.cic_list.first\n cfq-iosched: Remove bogus check in queue_fail path\n xen/blkback: potential null dereference in error handling\n xen/blkback: don\u0027t call vbd_size() if bd_disk is NULL\n block: blkdev_get() should access -\u003ebd_disk only after success\n CFQ: Fix typo and remove unnecessary semicolon\n block: remove unwanted semicolons\n Revert \"block: Remove extra discard_alignment from hd_struct.\"\n nbd: adjust \u0027max_part\u0027 according to part_shift\n nbd: limit module parameters to a sane value\n nbd: pass MSG_* flags to kernel_recvmsg()\n block: improve the bio_add_page() and bio_add_pc_page() descriptions\n" }, { "commit": "1f3bd0f2ac870c9eb29590f193ee3d94e2d35514", "tree": "40a12bd6ac1fb2c0ef51e51265d773a9044c7281", "parents": [ "bb3d6bf1919a20c56b3257b4ec09e67a9226cfb2", "a1b2cc50679c1d2eed44e2885f6178ce907498b7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 07:04:25 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 07:04:25 2011 +0900" }, "message": "Merge branch \u0027sh-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* \u0027sh-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:\n dmaengine: shdma: fix a regression: initialise DMA channels for memcpy\n dmaengine: shdma: Fix up fallout from runtime PM changes.\n Revert \"clocksource: sh_cmt: Runtime PM support\"\n Revert \"clocksource: sh_tmu: Runtime PM support\"\n sh: Fix up asm-generic/ptrace.h fallout.\n sh64: Move from P1SEG to CAC_ADDR for consistent sync.\n sh64: asm/pgtable.h needs asm/mmu.h\n sh: asm/tlb.h needs linux/swap.h\n sh: mark DMA slave ID 0 as invalid\n sh: Update shmin to reflect PIO dependency.\n sh: arch/sh/kernel/process_32.c needs linux/prefetch.h.\n sh: add MMCIF runtime PM support on ecovec\n sh: switch ap325rxa to dynamically manage the platform camera\n" }, { "commit": "55db4c64eddf37e31279ec15fe90314713bc9cfa", "tree": "4bd186333049c5fcc1eacdff0efc82ac8b80ff5e", "parents": [ "1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 06:33:24 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Jun 04 06:33:24 2011 +0900" }, "message": "Revert \"tty: make receive_buf() return the amout of bytes received\"\n\nThis reverts commit b1c43f82c5aa265442f82dba31ce985ebb7aa71c.\n\nIt was broken in so many ways, and results in random odd pty issues.\n\nIt re-introduced the buggy schedule_work() in flush_to_ldisc() that can\ncause endless work-loops (see commit a5660b41af6a: \"tty: fix endless\nwork loop when the buffer fills up\").\n\nIt also used an \"unsigned int\" return value fo the -\u003ereceive_buf()\nfunction, but then made multiple functions return a negative error code,\nand didn\u0027t actually check for the error in the caller.\n\nAnd it didn\u0027t actually work at all. BenH bisected down odd tty behavior\nto it:\n \"It looks like the patch is causing some major malfunctions of the X\n server for me, possibly related to PTYs. For example, cat\u0027ing a\n large file in a gnome terminal hangs the kernel for -minutes- in a\n loop of what looks like flush_to_ldisc/workqueue code, (some ftrace\n data in the quoted bits further down).\n\n ...\n\n Some more data: It -looks- like what happens is that the\n flush_to_ldisc work queue entry constantly re-queues itself (because\n the PTY is full ?) and the workqueue thread will basically loop\n forver calling it without ever scheduling, thus starving the consumer\n process that could have emptied the PTY.\"\n\nwhich is pretty much exactly the problem we fixed in a5660b41af6a.\n\nMilton Miller pointed out the \u0027unsigned int\u0027 issue.\n\nReported-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nReported-by: Milton Miller \u003cmiltonm@bga.com\u003e\nCc: Stefan Bigler \u003cstefan.bigler@keymile.com\u003e\nCc: Toby Gray \u003ctoby.gray@realvnc.com\u003e\nCc: Felipe Balbi \u003cbalbi@ti.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7b29dc21ea084be7ddfb536994a9cfae95337690", "tree": "799f5becd9484e53e09b5f620ebfd5315bdfe033", "parents": [ "9a2e0fb0893ddf595d0a372e681f5b98017c6d90", "dfe21582ac5ebc460dda98c67e8589dd506d02cd" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 03 14:31:50 2011 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Jun 03 14:31:50 2011 -0400" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into for-davem\n" }, { "commit": "9a2e0fb0893ddf595d0a372e681f5b98017c6d90", "tree": "fc32f2ae2fefe55bfe5b3381629b33550f7adea6", "parents": [ "ec764bf083a6ff396234351b51fd236f53c903bf" ], "author": { "name": "Matt Carlson", "email": "mcarlson@broadcom.com", "time": "Thu Jun 02 13:01:39 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 03 00:01:30 2011 -0700" }, "message": "tg3: Fix tg3_skb_error_unmap()\n\nThis function attempts to free one fragment beyond the number of\nfragments that were actually mapped. This patch brings back the limit\nto the correct spot.\n\nSigned-off-by: Matt Carlson \u003cmcarlson@broadcom.com\u003e\nTested-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e73e079bf128d68284efedeba1fbbc18d78610f9", "tree": "7477ba6759346155bb784e9719fe68bab89ee88e", "parents": [ "1fa7b6a29c61358cc2ca6f64cef4aa0e1a7ca74c" ], "author": { "name": "James Bottomley", "email": "James.Bottomley@HansenPartnership.com", "time": "Wed May 25 15:52:14 2011 -0500" }, "committer": { "name": "James Bottomley", "email": "jbottomley@parallels.com", "time": "Thu Jun 02 18:34:43 2011 +0900" }, "message": "[SCSI] Fix oops caused by queue refcounting failure\n\nIn certain circumstances, we can get an oops from a torn down device.\nMost notably this is from CD roms trying to call scsi_ioctl. The root\ncause of the problem is the fact that after scsi_remove_device() has\nbeen called, the queue is fully torn down. This is actually wrong\nsince the queue can be used until the sdev release function is called.\nTherefore, we add an extra reference to the queue which is released in\nsdev-\u003erelease, so the queue always exists.\n\nReported-by: Parag Warudkar \u003cparag.lkml@gmail.com\u003e\nCc: stable@kernel.org\nSigned-off-by: James Bottomley \u003cjbottomley@parallels.com\u003e\n" }, { "commit": "2e4ceec4edaef6e903422792de4f7f37de98cec6", "tree": "628626d17ea26b1c77449afc9bdee88581982033", "parents": [ "6979d5dd96a4a4975ce240982436e92a3da23315" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed Jun 01 19:48:50 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jun 02 00:10:01 2011 -0700" }, "message": "drivers/net/can/flexcan.c: add missing clk_put\n\nThe failed_get label is used after the call to clk_get has succeeded, so it\nshould be moved up above the call to clk_put.\n\nThe failed_req labels doesn\u0027t do anything different than failed_get, so\ndelete it.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r exists@\nexpression e1,e2;\nstatement S;\n@@\n\ne1 \u003d clk_get@p1(...);\n... when !\u003d e1 \u003d e2\n when !\u003d clk_put(e1)\n when any\nif (...) { ... when !\u003d clk_put(e1)\n when !\u003d if (...) { ... clk_put(e1) ... }\n* return@p3 ...;\n } else S\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a1b2cc50679c1d2eed44e2885f6178ce907498b7", "tree": "e30d672493dc63325dc9d92a05ed70e6ec995957", "parents": [ "1222de7c415cfa70f441f836588fd79a3334d4fe" ], "author": { "name": "Guennadi Liakhovetski", "email": "g.liakhovetski@gmx.de", "time": "Tue May 31 09:25:16 2011 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Thu Jun 02 14:40:43 2011 +0900" }, "message": "dmaengine: shdma: fix a regression: initialise DMA channels for memcpy\n\nA recent patch has introduced a regression, where repeating a memcpy\nDMA test with shdma module unloading between them skips the DMA channel\nconfiguration. Fix this regression by always configuring the channel\nduring its allocation.\n\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "6979d5dd96a4a4975ce240982436e92a3da23315", "tree": "b8a5c017e168d87f91668b5cab89c7df56dcda58", "parents": [ "b722dbf176b67c75fe0f5a6b1b31f5ea8aa6117d" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Wed Jun 01 10:18:09 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 01 21:22:15 2011 -0700" }, "message": "net: dm9000: Get the chip in a known good state before enabling interrupts\n\nCurrently the DM9000 driver requests the primary interrupt before it\nresets the chip and puts it into a known good state. This means that if\nthe chip is asserting interrupt for some reason we can end up with a\nscreaming IRQ that the interrupt handler is unable to deal with. Avoid\nthis by only requesting the interrupt after we\u0027ve reset the chip so we\nknow what state it\u0027s in.\n\nThis started manifesting itself on one of my boards in the past month or\nso, I suspect as a result of some core infrastructure changes removing\nsome form of mitigation against bad behaviour here, even when things boot\nit seems that the new code brings the interface up more quickly.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b722dbf176b67c75fe0f5a6b1b31f5ea8aa6117d", "tree": "8eb77b610efcabd6185b964b817b2b30bdebad0d", "parents": [ "a3bcc23e890a6d49d6763d9eb073d711de2e0469" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Wed Jun 01 07:10:10 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 01 21:20:14 2011 -0700" }, "message": "drivers/net/davinci_emac.c: add missing clk_put\n\nGo to existing error handling code at the end of the function that calls\nclk_put.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r exists@\nexpression e1,e2;\nstatement S;\n@@\n\ne1 \u003d clk_get@p1(...);\n... when !\u003d e1 \u003d e2\n when !\u003d clk_put(e1)\n when any\nif (...) { ... when !\u003d clk_put(e1)\n when !\u003d if (...) { ... clk_put(e1) ... }\n* return@p3 ...;\n } else S\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nAcked-by: Kevin Hilman \u003ckhilman@ti.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "85e3c65fa3a1d0542c181510a950a2be7733ff29", "tree": "7efb6a9f3ed34ed52358eef6b4a59659a5fdea94", "parents": [ "307f73df2b9829ee5a261d1ed432ff683c426cdf" ], "author": { "name": "Stefan Metzmacher", "email": "metze@samba.org", "time": "Wed Jun 01 02:01:41 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 01 21:10:49 2011 -0700" }, "message": "usbnet/cdc_ncm: add missing .reset_resume hook\n\nThis avoids messages like this after suspend:\n\n cdc_ncm 2-1.4:1.6: no reset_resume for driver cdc_ncm?\n cdc_ncm 2-1.4:1.7: no reset_resume for driver cdc_ncm?\n cdc_ncm 2-1.4:1.6: usb0: unregister \u0027cdc_ncm\u0027 usb-0000:00:1d.0-1.4, CDC NCM\n\nThis is important for the Ericsson F5521gw GSM/UMTS modem.\nOtherwise modemmanager looses the fact that the cdc_ncm and cdc_acm devices\nbelong together.\n\nThe cdc_ether module does the same.\n\nSigned-off-by: Stefan Metzmacher \u003cmetze@samba.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "bb9973e4e73f43bd86698483d0c3f7a362ff94ce", "tree": "2595ca9c4a1dad5c12ad21947bf07bccb9c32a4c", "parents": [ "4f5f71a7abe329bdad81ee6a8e4545054a7cc30a" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Jun 01 11:03:41 2011 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Jun 01 20:10:40 2011 -0700" }, "message": "hwmon: (coretemp) Further relax temperature range checks\n\nFurther relax temperature range checks after reading the IA32_TEMPERATURE_TARGET\nregister. If the register returns a value other than 0 in bits 16..32, assume\nthat the returned value is correct.\n\nThis change applies to both packet and core temperature limits.\n\nCc: Carsten Emde \u003cC.Emde@osadl.org\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\n" }, { "commit": "4f5f71a7abe329bdad81ee6a8e4545054a7cc30a", "tree": "e7d907a27fa72bd1c706a4f8a0eb2ca246ad26e5", "parents": [ "4c6e0f8101e62d8b2d01dc94b835a98b191a1454" ], "author": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Tue May 31 06:54:21 2011 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Jun 01 20:10:31 2011 -0700" }, "message": "hwmon: (coretemp) Fix TjMax detection for older CPUs\n\nCommit a321cedb12904114e2ba5041a3673ca24deb09c9 excludes CPU models 0xe, 0xf,\n0x16, and 0x1a from TjMax temperature adjustment, even though several of those\nCPUs are known to have TiMax other than 100 degrees C, and even though the code\nin adjust_tjmax() explicitly handles those CPUs and points to a Web document\nlisting several of the affected CPU IDs.\n\nReinstate original TjMax adjustment if TjMax can not be determined using the\nIA32_TEMPERATURE_TARGET register.\n\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d32582\n\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nCc: Huaxu Wan \u003chuaxu.wan@linux.intel.com\u003e\nCc: Carsten Emde \u003cC.Emde@osadl.org\u003e\nCc: Valdis Kletnieks \u003cvaldis.kletnieks@vt.edu\u003e\nCc: Henrique de Moraes Holschuh \u003chmh@hmh.eng.br\u003e\nCc: Yong Wang \u003cyong.y.wang@linux.intel.com\u003e\nCc: Rudolf Marek \u003cr.marek@assembler.cz\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nTested-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nCc: \u003cstable@kernel.org\u003e # .35.x .36.x .37.x .38.x .39.x\n" }, { "commit": "f0f52a9463839c52a63c05d6e7d4a330d94a9794", "tree": "d964f65aa37dd46b457bc615f2f37e75390c6df8", "parents": [ "0f48f2600911d5de6393829e4a9986d4075558b3", "70e535d1e5d1e4317e894d6228b762cf9c3fbc6a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:48:50 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:48:50 2011 +0900" }, "message": "Merge git://git.infradead.org/iommu-2.6\n\n* git://git.infradead.org/iommu-2.6:\n intel-iommu: Fix off-by-one in RMRR setup\n intel-iommu: Add domain check in domain_remove_one_dev_info\n intel-iommu: Remove Host Bridge devices from identity mapping\n intel-iommu: Use coherent DMA mask when requested\n intel-iommu: Dont cache iova above 32bit\n intel-iommu: Speed up processing of the identity_mapping function\n intel-iommu: Check for identity mapping candidate using system dma mask\n intel-iommu: Only unlink device domains from iommu\n intel-iommu: Enable super page (2MiB, 1GiB, etc.) support\n intel-iommu: Flush unmaps at domain_exit\n intel-iommu: Remove obsolete comment from detect_intel_iommu\n intel-iommu: fix VT-d PMR disable for TXT on S3 resume\n" }, { "commit": "0f48f2600911d5de6393829e4a9986d4075558b3", "tree": "39745ab1858bb308f3b101f5ae555f08485bb7ea", "parents": [ "3f303103b884ca577908d3e5c0650ad12e40c586" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:29:19 2011 +0900" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 02 05:29:19 2011 +0900" }, "message": "block: fix mismerge of the DISK_EVENT_MEDIA_CHANGE removal\n\nJens\u0027 back-merge commit 698567f3fa79 (\"Merge commit \u0027v2.6.39\u0027 into\nfor-2.6.40/core\") was incorrectly done, and re-introduced the\nDISK_EVENT_MEDIA_CHANGE lines that had been removed earlier in commits\n\n - 9fd097b14918 (\"block: unexport DISK_EVENT_MEDIA_CHANGE for\n legacy/fringe drivers\")\n\n - 7eec77a1816a (\"ide: unexport DISK_EVENT_MEDIA_CHANGE for ide-gd\n and ide-cd\")\n\nbecause of conflicts with the \"g-\u003eflags\" updates near-by by commit\nd4dc210f69bc (\"block: don\u0027t block events on excl write for non-optical\ndevices\")\n\nAs a result, we re-introduced the hanging behavior due to infinite disk\nmedia change reports.\n\nTssk, tssk, people! Don\u0027t do back-merges at all, and *definitely* don\u0027t\ndo them to hide merge conflicts from me - especially as I\u0027m likely\nbetter at merging them than you are, since I do so many merges.\n\nReported-by: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Jens Axboe \u003cjaxboe@fusionio.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "dfe21582ac5ebc460dda98c67e8589dd506d02cd", "tree": "76fe13dd7d63a378d432ac98b62015fcae38a2e3", "parents": [ "a7567b2059020bf3fa96c389ec25eed8e28ad4ba" ], "author": { "name": "Stanislaw Gruszka", "email": "sgruszka@redhat.com", "time": "Wed Jun 01 17:17:57 2011 +0200" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 01 14:41:13 2011 -0400" }, "message": "iwl4965: correctly validate temperature value\n\nIn some cases we can read wrong temperature value. If after that\ntemperature value will not be updated to good one, we badly configure\ntx power parameters and device is unable to send a data.\n\nResolves:\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d35932\n\nCc: stable@kernel.org # 2.6.39+\nSigned-off-by: Stanislaw Gruszka \u003csgruszka@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "21fdc87248d1d28492c775e05fa92b3c8c7bc8db", "tree": "cd0f69b7a496b866d2a67cfcf12305b1e5060abc", "parents": [ "333ba7325213f0a09dfa5ceeddb056d6ad74b3b5" ], "author": { "name": "Daniel Halperin", "email": "dhalperi@cs.washington.edu", "time": "Tue May 31 11:59:30 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Wed Jun 01 14:35:54 2011 -0400" }, "message": "ath9k: fix two more bugs in tx power\n\nThis is the same fix as\n\n commit 841051602e3fa18ea468fe5a177aa92b6eb44b56\n Author: Matteo Croce \u003ctechnoboy85@gmail.com\u003e\n Date: Fri Dec 3 02:25:08 2010 +0100\n\n The ath9k driver subtracts 3 dBm to the txpower as with two radios the\n signal power is doubled.\n The resulting value is assigned in an u16 which overflows and makes\n the card work at full power.\n\nin two more places. I grepped the ath tree and didn\u0027t find any others.\n\nCc: stable@kernel.org\nSigned-off-by: Daniel Halperin \u003cdhalperi@cs.washington.edu\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "4c6e0f8101e62d8b2d01dc94b835a98b191a1454", "tree": "99631d4139ad63d6eb326754e70e99321463c3ca", "parents": [ "614198bbf8d74617381aea82521b261c7f9baaf6" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Tue May 31 15:50:51 2011 -0400" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Jun 01 11:11:28 2011 -0700" }, "message": "hwmon: (coretemp) Relax target temperature range check\n\nThe current temperature range check of MSR_IA32_TEMPERATURE_TARGET\nseems too strict to me, some TjMax values documented in\nDocumentation/hwmon/coretemp wouldn\u0027t pass. Relax the check so that\nall the documented values pass.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: Carsten Emde \u003cC.Emde@osadl.org\u003e\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "614198bbf8d74617381aea82521b261c7f9baaf6", "tree": "f7302190c660bdf05243fabff97b36c2b7aa6870", "parents": [ "55922c9d1b84b89cb946c777fddccb3247e7df2c" ], "author": { "name": "Per Dalen", "email": "per.dalen@appeartv.com", "time": "Tue May 31 06:54:21 2011 -0700" }, "committer": { "name": "Guenter Roeck", "email": "guenter.roeck@ericsson.com", "time": "Wed Jun 01 11:11:27 2011 -0700" }, "message": "hwmon: (max6642) Rename temp_fault sysfs attribute to temp2_fault\n\nThe temp_fault sysfs attribute is wrong, it should be temp2_fault instead.\n\nReported-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\nSigned-off-by: Per Dalen \u003cper.dalen@appeartv.com\u003e\nAcked-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nSigned-off-by: Guenter Roeck \u003cguenter.roeck@ericsson.com\u003e\n" }, { "commit": "9b83c771214cf6a256ee875050e6eaf320cf7983", "tree": "39b5308ea40a47d19cefab98721402296b78a246", "parents": [ "6464920a6e30604cb71d0ecbaa20e35009bd76fb" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Fri May 27 09:27:16 2011 +0300" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Jun 01 09:28:21 2011 -0400" }, "message": "xen/blkback: potential null dereference in error handling\n\nblkbk-\u003epending_pages can be NULL here so I added a check for it.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\n[v1: Redid the loop a bit]\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "6464920a6e30604cb71d0ecbaa20e35009bd76fb", "tree": "e4b8e6a06c6548d739176988c0bbdc21cafa40eb", "parents": [ "4c49ff3fe128ca68dabd07537415c419ad7f82f9" ], "author": { "name": "Laszlo Ersek", "email": "lersek@redhat.com", "time": "Wed May 25 12:24:25 2011 +0200" }, "committer": { "name": "Konrad Rzeszutek Wilk", "email": "konrad.wilk@oracle.com", "time": "Wed Jun 01 09:28:20 2011 -0400" }, "message": "xen/blkback: don\u0027t call vbd_size() if bd_disk is NULL\n\n...because vbd_size() dereferences bd_disk if bd_part is NULL.\n\nSigned-off-by: Laszlo Ersek\u003clersek@redhat.com\u003e\nSigned-off-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\n" }, { "commit": "70e535d1e5d1e4317e894d6228b762cf9c3fbc6a", "tree": "2c7ed5f263440c6a7302c19a31827488eade9ea5", "parents": [ "8519dc4401ddf8a5399f979870bbeeadbc111186" ], "author": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Tue May 31 00:22:52 2011 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:48:21 2011 +0100" }, "message": "intel-iommu: Fix off-by-one in RMRR setup\n\nWe were mapping an extra byte (and hence usually an extra page):\niommu_prepare_identity_map() expects to be given an \u0027end\u0027 argument which\nis the last byte to be mapped; not the first byte *not* to be mapped.\n\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "8519dc4401ddf8a5399f979870bbeeadbc111186", "tree": "a1eb0bc0fa29b955a757a1e1c1c76f569e6be4ee", "parents": [ "825507d6d059f1cbe2503e0e5a3926225b983aec" ], "author": { "name": "Mike Habeck", "email": "habeck@sgi.com", "time": "Sat May 28 13:15:07 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:48 2011 +0100" }, "message": "intel-iommu: Add domain check in domain_remove_one_dev_info\n\nThe comment in domain_remove_one_dev_info() states \"No need to compare\nPCI domain; it has to be the same\". But for the si_domain that isn\u0027t\ngoing to be true, as it consists of all the PCI devices that are\nidentity mapped thus multiple PCI domains can be in si_domain. The\ncode needs to validate the PCI domain too.\n\nSigned-off-by: Mike Habeck \u003chabeck@sgi.com\u003e\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "825507d6d059f1cbe2503e0e5a3926225b983aec", "tree": "8f191cb5c4704a4710c7b89b81d9629206714d3b", "parents": [ "c681d0ba1252954208220ad32248a3e8e2fc98e4" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Sat May 28 13:15:06 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:46 2011 +0100" }, "message": "intel-iommu: Remove Host Bridge devices from identity mapping\n\nWhen using the 1:1 (identity) PCI DMA remapping, PCI Host Bridge devices\nthat do not use the IOMMU causes a kernel panic. Fix that by not\ninserting those devices into the si_domain.\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "c681d0ba1252954208220ad32248a3e8e2fc98e4", "tree": "fe74fdee4fa76e743aa0e8d2d22f958b1a1c710e", "parents": [ "1c9fc3d11b84fbd0c4f4aa7855702c2a1f098ebb" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Sat May 28 13:15:05 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:45 2011 +0100" }, "message": "intel-iommu: Use coherent DMA mask when requested\n\nThe __intel_map_single function is not honoring the passed in DMA mask.\nThis results in not using the coherent DMA mask when called from\nintel_alloc_coherent().\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nAcked-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "1c9fc3d11b84fbd0c4f4aa7855702c2a1f098ebb", "tree": "c06f2bcc3b5aa5d0cb0869815e6247afc736ea7a", "parents": [ "cb452a4040bb051d92e85d6e7eb60c11734c1781" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Sat May 28 13:15:04 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:40 2011 +0100" }, "message": "intel-iommu: Dont cache iova above 32bit\n\nMike Travis and Mike Habeck reported an issue where iova allocation\nwould return a range that was larger than a device\u0027s dma mask.\n\nhttps://lkml.org/lkml/2011/3/29/423\n\nThe dmar initialization code will reserve all PCI MMIO regions and copy\nthose reservations into a domain specific iova tree. It is possible for\none of those regions to be above the dma mask of a device. It is typical\nto allocate iovas with a 32bit mask (despite device\u0027s dma mask possibly\nbeing larger) and cache the result until it exhausts the lower 32bit\naddress space. Freeing the iova range that is \u003e\u003d the last iova in the\nlower 32bit range when there is still an iova above the 32bit range will\ncorrupt the cached iova by pointing it to a region that is above 32bit.\nIf that region is also larger than the device\u0027s dma mask, a subsequent\nallocation will return an unusable iova and cause dma failure.\n\nSimply don\u0027t cache an iova that is above the 32bit caching boundary.\n\nReported-by: Mike Travis \u003ctravis@sgi.com\u003e\nReported-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nAcked-by: Mike Travis \u003ctravis@sgi.com\u003e\nTested-by: Mike Habeck \u003chabeck@sgi.com\u003e\nSigned-off-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "cb452a4040bb051d92e85d6e7eb60c11734c1781", "tree": "ef19298ec70274c9c199fa74a4f08e77cc69080b", "parents": [ "8fcc5372fbac085199d84a880503ed67aba3fe49" ], "author": { "name": "Mike Travis", "email": "travis@sgi.com", "time": "Sat May 28 13:15:03 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:36 2011 +0100" }, "message": "intel-iommu: Speed up processing of the identity_mapping function\n\nWhen there are a large count of PCI devices, and the pass through\noption for iommu is set, much time is spent in the identity_mapping\nfunction hunting though the iommu domains to check if a specific\ndevice is \"identity mapped\".\n\nSpeed up the function by checking the cached info to see if\nit\u0027s mapped to the static identity domain.\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "8fcc5372fbac085199d84a880503ed67aba3fe49", "tree": "aab84e5ac18fa8028efa49e2cc47a5b97d873916", "parents": [ "9b4554b21ed07e8556405510638171f0c787742a" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Sat May 28 13:15:02 2011 -0500" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:34 2011 +0100" }, "message": "intel-iommu: Check for identity mapping candidate using system dma mask\n\nThe identity mapping code appears to make the assumption that if the\ndevices dma_mask is greater than 32bits the device can use identity\nmapping. But that is not true: take the case where we have a 40bit\ndevice in a 44bit architecture. The device can potentially receive a\nphysical address that it will truncate and cause incorrect addresses\nto be used.\n\nInstead check to see if the device\u0027s dma_mask is large enough\nto address the system\u0027s dma_mask.\n\nSigned-off-by: Mike Travis \u003ctravis@sgi.com\u003e\nReviewed-by: Mike Habeck \u003chabeck@sgi.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "9b4554b21ed07e8556405510638171f0c787742a", "tree": "384c8517f6aee9a09a43ac55c7d0cbadc3d2ee23", "parents": [ "6dd9a7c73761a8a5f5475d5cfdc15368a0f4c06d" ], "author": { "name": "Alex Williamson", "email": "alex.williamson@redhat.com", "time": "Tue May 24 12:19:04 2011 -0400" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:47:29 2011 +0100" }, "message": "intel-iommu: Only unlink device domains from iommu\n\nCommit a97590e5 added unlinking domains from iommus to reciprocate the\niommu from domains unlinking that was already done. We actually want\nto only do this for device domains and never for the static\nidentity map domain or VM domains. The SI domain is special and\nnever freed, while VM domain-\u003eid lives in their own special address\nspace, separate from iommu-\u003edomain_ids.\n\nIn the current code, a VM can get domain-\u003eid zero, then mark that\ndomain unused when unbound from pci-stub. This leads to DMAR\nwrite faults when the device is re-bound to the host driver.\n\nSigned-off-by: Alex Williamson \u003calex.williamson@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "6dd9a7c73761a8a5f5475d5cfdc15368a0f4c06d", "tree": "cb685e370cc1cb2dec39b29500bdd22fd1814596", "parents": [ "7b668357810ecb5fdda4418689d50f5d95aea6a8" ], "author": { "name": "Youquan Song", "email": "youquan.song@intel.com", "time": "Wed May 25 19:13:49 2011 +0100" }, "committer": { "name": "David Woodhouse", "email": "David.Woodhouse@intel.com", "time": "Wed Jun 01 12:26:35 2011 +0100" }, "message": "intel-iommu: Enable super page (2MiB, 1GiB, etc.) support\n\nThere are no externally-visible changes with this. In the loop in the\ninternal __domain_mapping() function, we simply detect if we are mapping:\n - size \u003e\u003d 2MiB, and\n - virtual address aligned to 2MiB, and\n - physical address aligned to 2MiB, and\n - on hardware that supports superpages.\n\n(and likewise for larger superpages).\n\nWe automatically use a superpage for such mappings. We never have to\nworry about *breaking* superpages, since we trust that we will always\n*unmap* the same range that was mapped. So all we need to do is ensure\nthat dma_pte_clear_range() will also cope with superpages.\n\nAdjust pfn_to_dma_pte() to take a superpage \u0027level\u0027 as an argument, so\nit can return a PTE at the appropriate level rather than always\nextending the page tables all the way down to level 1. Again, this is\nsimplified by the fact that we should never encounter existing small\npages when we\u0027re creating a mapping; any old mapping that used the same\nvirtual range will have been entirely removed and its obsolete page\ntables freed.\n\nProvide an \u0027intel_iommu\u003dsp_off\u0027 argument on the command line as a\nchicken bit. Not that it should ever be required.\n\n\u003d\u003d\n\nThe original commit seen in the iommu-2.6.git was Youquan\u0027s\nimplementation (and completion) of my own half-baked code which I\u0027d\ntyped into an email. Followed by half a dozen subsequent \u0027fixes\u0027.\n\nI\u0027ve taken the unusual step of rewriting history and collapsing the\noriginal commits in order to keep the main history simpler, and make\nlife easier for the people who are going to have to backport this to\nolder kernels. And also so I can give it a more coherent commit comment\nwhich (hopefully) gives a better explanation of what\u0027s going on.\n\nThe original sequence of commits leading to identical code was:\n\nYouquan Song (3):\n intel-iommu: super page support\n intel-iommu: Fix superpage alignment calculation error\n intel-iommu: Fix superpage level calculation error in dma_pfn_level_pte()\n\nDavid Woodhouse (4):\n intel-iommu: Precalculate superpage support for dmar_domain\n intel-iommu: Fix hardware_largepage_caps()\n intel-iommu: Fix inappropriate use of superpages in __domain_mapping()\n intel-iommu: Fix phys_pfn in __domain_mapping for sglist pages\n\nSigned-off-by: Youquan Song \u003cyouquan.song@intel.com\u003e\nSigned-off-by: David Woodhouse \u003cDavid.Woodhouse@intel.com\u003e\n" }, { "commit": "603d04b2010976a52f62b7633f9999d104046900", "tree": "884a5db96f4254cda481423fcaa18bae7e2a4c67", "parents": [ "e12ca23d41bd157354a5d1aadff30211a410c53a" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Sat May 28 10:04:25 2011 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 01 16:35:01 2011 +0900" }, "message": "kgdbts: only use new asm-generic/ptrace.h api when needed\n\nThe new instruction_pointer_set helper is defined for people who have\nconverted to asm-generic/ptrace.h, so don\u0027t use it generally unless\nthe arch needs it (in which case it has been converted). This should\nfix building of kgdb tests for arches not yet converted.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "948252cb9e01d65a89ecadf67be5018351eee15e", "tree": "c26e0de3e2b938139f2673cff12520e100f0cd3b", "parents": [ "930a6eac9f40e692bd9670d89bcd9ac0f4019356" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 31 19:27:48 2011 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 31 19:28:32 2011 -0700" }, "message": "Revert \"net: fix section mismatches\"\n\nThis reverts commit e5cb966c0838e4da43a3b0751bdcac7fe719f7b4.\n\nIt causes new build regressions with gcc-4.2 which is\npretty common on non-x86 platforms.\n\nReported-by: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "930a6eac9f40e692bd9670d89bcd9ac0f4019356", "tree": "9da346841ed70c260580d29e9462ad629d0f076f", "parents": [ "a000c01e60e40e15304ffe48fff051d17a7bea91" ], "author": { "name": "Alexey Khoroshilov", "email": "khoroshilov@ispras.ru", "time": "Mon May 30 07:06:24 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 31 15:30:17 2011 -0700" }, "message": "drivers/net/usb/catc.c: Fix potential deadlock in catc_ctrl_run()\n\ncatc_ctrl_run() calls usb_submit_urb() with GFP_KERNEL, while it is called from\ncatc_ctrl_async() and catc_ctrl_done() with catc-\u003ectrl_lock spinlock held.\n\nThe patch replaces GFP_KERNEL with GFP_ATOMIC.\n\nFound by Linux Driver Verification project (linuxtesting.org).\n\nSigned-off-by: Alexey Khoroshilov \u003ckhoroshilov@ispras.ru\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b10cec8a4e8167075b9e1ff3f05419769e7f381a", "tree": "78f82ee427a29c9b3afcd4f06968495cb757b5bf", "parents": [ "48bdf072c3f1f8f739f76d19c74f4c79605cac46" ], "author": { "name": "Dennis Aberilla", "email": "dennis.aberilla@mimomax.com", "time": "Sun May 29 11:46:54 2011 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@zippy.davemloft.net", "time": "Tue May 31 15:14:31 2011 -0700" }, "message": "drivers/net: ks8842 Fix crash on received packet when in PIO mode.\n\nThis patch fixes a driver crash during packet reception due to not enough\nbytes allocated in the skb. Since the loop reads out 4 bytes at a time, we\nneed to allow for up to 3 bytes of slack space.\n\nSigned-off-by: Dennis Aberilla \u003cdenzzzhome@yahoo.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@zippy.davemloft.net\u003e\n" }, { "commit": "1144181c1bc054dc5e001a6f10b4820167e6c883", "tree": "bdd36e2b480c594c11451d9bc7c8d03d47c93b20", "parents": [ "59342f6a6bc35df623fb44784daa5e1077063b8f" ], "author": { "name": "Wey-Yi Guy", "email": "wey-yi.w.guy@intel.com", "time": "Mon May 30 09:32:52 2011 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:51:53 2011 -0400" }, "message": "iwlagn: fix incorrect PCI subsystem id for 6150 devices\n\nFor 6150 devices, modify the supported PCI subsystem ID.\n\nCc: stable@kernel.org\nSigned-off-by: Wey-Yi Guy \u003cwey-yi.w.guy@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "59342f6a6bc35df623fb44784daa5e1077063b8f", "tree": "612d3ec8c09d18fb0a97f841a535de8b25e46ada", "parents": [ "66870b1ccd5c1460e437c18b0026e2dcaab1ece9" ], "author": { "name": "Jussi Kivilinna", "email": "jussi.kivilinna@mbnet.fi", "time": "Mon May 30 10:15:47 2011 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:47:26 2011 -0400" }, "message": "zd1211rw: fix to work on OHCI\n\nzd1211 devices register \u0027EP 4 OUT\u0027 endpoint as Interrupt type on USB 2.0:\n\n Endpoint Descriptor:\n bLength 7\n bDescriptorType 5\n bEndpointAddress 0x04 EP 4 OUT\n bmAttributes 3\n Transfer Type Interrupt\n Synch Type None\n Usage Type Data\n wMaxPacketSize 0x0040 1x 64 bytes\n bInterval 1\n\nHowever on USB 1.1 endpoint becomes Bulk:\n\n Endpoint Descriptor:\n bLength 7\n bDescriptorType 5\n bEndpointAddress 0x04 EP 4 OUT\n bmAttributes 2\n Transfer Type Bulk\n Synch Type None\n Usage Type Data\n wMaxPacketSize 0x0040 1x 64 bytes\n bInterval 0\n\nCommit 37939810b937aba830dd751291fcdc51cae1a6cb assumed that endpoint is\nalways interrupt type and changed usb_bulk_msg() calls to usb_interrupt_msg().\n\nProblem here is that usb_bulk_msg() on interrupt endpoint selfcorrects the\ncall and changes requested pipe to interrupt type (see usb_bulk_msg).\nHowever with usb_interrupt_msg() on bulk endpoint does not correct the\npipe type to bulk, but instead URB is submitted with interrupt type pipe.\n\nSo pre-2.6.39 used usb_bulk_msg() and therefore worked with both endpoint\ntypes, however in 2.6.39 usb_interrupt_msg() with bulk endpoint causes\nohci_hcd to fail submitted URB instantly with -ENOSPC and preventing zd1211rw\nfrom working with OHCI.\n\nFix this by detecting endpoint type and using correct endpoint/pipe types\nfor URB. Also fix asynchronous zd_usb_iowrite16v_async() to use right\nURB type on \u0027EP 4 OUT\u0027.\n\nCc: stable@kernel.org\nSigned-off-by: Jussi Kivilinna \u003cjussi.kivilinna@mbnet.fi\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "66870b1ccd5c1460e437c18b0026e2dcaab1ece9", "tree": "0067c12e2014b4e4aa58ca6204236618515b3d79", "parents": [ "50a66d7f04adbfab9db55144c58dc693358cb635" ], "author": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Fri May 27 15:34:48 2011 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:47:26 2011 -0400" }, "message": "wl12xx: fix oops in sched_scan when forcing a passive scan\n\nFix kernel oops when trying to use passive scheduled scans. The\nreason was that in passive scans there are no SSIDs, so there was a\nNULL pointer dereference.\n\nTo solve the problem, we now check the number of SSIDs provided in the\nsched_scan request and only access the list if there\u0027s one or more\n(ie. passive scan is not forced). We also force all the channels to\nbe passive by adding the IEEE80211_CHAN_PASSIVE_SCAN flag locally\nbefore the checks in the wl1271_scan_get_sched_scan_channels()\nfunction.\n\nSigned-off-by: Luciano Coelho \u003ccoelho@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "50a66d7f04adbfab9db55144c58dc693358cb635", "tree": "5b332a377b92a58991666a57fbaa274d15a7797b", "parents": [ "2497a246e880d1fb537f754f551177c01fa39242" ], "author": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Fri May 27 15:34:47 2011 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:47:25 2011 -0400" }, "message": "wl12xx: add separate config value for DFS dwell time on sched scan\n\nUse a different value for DFS dwell time when performing a scheduled\nscan. Previously we were using the same value as for normal passive\nscans. This adds some flexibility between these two different types\nof passive scan.\n\nFor now we use 150 TUs for DFS channel dwell time. This may need to\nbe fine-tuned in the future.\n\nSigned-off-by: Luciano Coelho \u003ccoelho@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "2497a246e880d1fb537f754f551177c01fa39242", "tree": "530cd6f0533ae65ec3336e3b85e7f94f051d54d7", "parents": [ "dd08682150e1815fe5cdd0673a2f2e9cd2d55a7a" ], "author": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Fri May 27 15:34:46 2011 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:47:25 2011 -0400" }, "message": "wl12xx: fix DFS channels handling in scheduled scan\n\nDFS channels were never getting included in the scheduled scans,\nbecause they always contain the passive flag as well and the call was\nasking for DFS and active channels.\n\nFix this by ignoring the passive flag when collecting DFS channels.\nAlso, move the DFS channels in the channel list before the 5GHz active\nchannels (this was implemented in the FW differently than specified).\n\nSigned-off-by: Luciano Coelho \u003ccoelho@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "dd08682150e1815fe5cdd0673a2f2e9cd2d55a7a", "tree": "3c52564a8c92cb75c0b9fa49a91809412c1bdaeb", "parents": [ "71005be40a7fc95edda3cc462361ce0243e4f5fa" ], "author": { "name": "Luciano Coelho", "email": "coelho@ti.com", "time": "Fri May 27 15:34:45 2011 +0300" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:47:24 2011 -0400" }, "message": "wl12xx: fix passive and radar channel generation for scheduled scan\n\nWe were comparing bitwise AND results with a boolean, so when the\nboolean was set to true, it was not matching as it should.\n\nFix this by booleanizing the bitwise AND results with !!.\n\nSigned-off-by: Luciano Coelho \u003ccoelho@ti.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "71005be40a7fc95edda3cc462361ce0243e4f5fa", "tree": "d2787b9d02c8a77cffa1028e079856b7fbae50cd", "parents": [ "11ad2f52826ac6d58d6780d3d8a3e098c88d9142" ], "author": { "name": "Daniel Drake", "email": "dsd@laptop.org", "time": "Thu May 26 21:31:08 2011 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Tue May 31 14:47:23 2011 -0400" }, "message": "libertas: Set command sequence number later to ensure consistency\n\nBefore this patch, the command sequence number is being set before\nlbs_queue_cmd() adds the command to the queue. However, lbs_queue_cmd()\nsometimes forces commands to queue-jump (e.g. CMD_802_11_WAKEUP_CONFIRM).\nIt currently does this without considering that sequence numbers might need\nadjusting to keep things running in order.\n\nFix this by setting the sequence number at a later stage, just before\nwe\u0027re actually submitting the command to the hardware. Also fixes a\npossible race where seqnum was being modified outside of the driver\nlock.\n\nSigned-off-by: Daniel Drake \u003cdsd@laptop.org\u003e\nAcked-by: Dan Williams \u003cdcbw@redhat.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "5c2de44417523385010b529599a2b30f290831a3", "tree": "adb1ff03eee4b2c9955ab11664548a529f6d2bc8", "parents": [ "9436b4abec28a22edd961ae375535d940625f1f2" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue May 31 15:53:03 2011 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue May 31 15:53:03 2011 +0900" }, "message": "dmaengine: shdma: Fix up fallout from runtime PM changes.\n\nThe runtime PM changes introduce sh_dmae_rst() wrapping via the\nruntime_resume helper, depending on dev_get_drvdata() to fetch the\nplatform data needed for the DMAOR initialization default at a time\nwhere drvdata hasn\u0027t yet been established by the probe path, resulting\nin general probe misery:\n\n Unable to handle kernel NULL pointer dereference at virtual address 000000c4\n pc \u003d 8025adee\n *pde \u003d 00000000\n Oops: 0000 [#1]\n Modules linked in:\n\n Pid : 1, Comm: swapper\n CPU : 0 Not tainted (3.0.0-rc1-00012-g9436b4a-dirty #1456)\n\n PC is at sh_dmae_rst+0x28/0x86\n PR is at sh_dmae_rst+0x22/0x86\n PC : 8025adee SP : 9e803d10 SR : 400080f1 TEA : 000000c4\n R0 : 000000c4 R1 : 0000fff8 R2 : 00000000 R3 : 00000040\n R4 : 000000f0 R5 : 00000000 R6 : 00000000 R7 : 804f184c\n R8 : 00000000 R9 : 804dd0e8 R10 : 80283204 R11 : ffffffda\n R12 : 000000a0 R13 : 804dd18c R14 : 9e803d10\n MACH: 00000000 MACL: 00008f20 GBR : 00000000 PR : 8025ade8\n\n Call trace:\n [\u003c8025ae70\u003e] sh_dmae_runtime_resume+0x24/0x34\n [\u003c80283238\u003e] pm_generic_runtime_resume+0x34/0x3c\n [\u003c80283370\u003e] rpm_callback+0x4a/0x7e\n [\u003c80283efc\u003e] rpm_resume+0x240/0x384\n [\u003c80283f54\u003e] rpm_resume+0x298/0x384\n [\u003c8028428c\u003e] __pm_runtime_resume+0x44/0x7c\n [\u003c8038a358\u003e] __ioremap_caller+0x0/0xec\n [\u003c80284296\u003e] __pm_runtime_resume+0x4e/0x7c\n [\u003c8038a358\u003e] __ioremap_caller+0x0/0xec\n [\u003c80666254\u003e] sh_dmae_probe+0x180/0x6a0\n [\u003c802803ae\u003e] platform_drv_probe+0x26/0x2e\n\nFix up the ordering accordingly.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "9436b4abec28a22edd961ae375535d940625f1f2", "tree": "e0e6e4120d4364587a4830a724adea89be7a8ebb", "parents": [ "d4905ce38c73964b868037e49a5945e1cf47a7f2" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue May 31 15:26:42 2011 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue May 31 15:26:42 2011 +0900" }, "message": "Revert \"clocksource: sh_cmt: Runtime PM support\"\n\nThis reverts commit 01fa68b58492a5d6708a91c1f474b6a099a9509e.\n\nThe same note as per the sh_tmu change applies here, too.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "d4905ce38c73964b868037e49a5945e1cf47a7f2", "tree": "f7b41c1720dabb7b14a92ff0c47aeff1d6e4d70f", "parents": [ "db7eba292e913390fa881272bfbc3da0a5380513" ], "author": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue May 31 15:23:20 2011 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue May 31 15:23:20 2011 +0900" }, "message": "Revert \"clocksource: sh_tmu: Runtime PM support\"\n\nThis reverts commit 1b842e91fea9447eff5eb687e28ad61c02f5033e.\n\nThere is a fundamental ordering race between the early and late probe\npaths and the runtime PM tie-in that results in __pm_runtime_resume()\nattempting to take a lock that hasn\u0027t been initialized yet (which by\nproxy also suggests that pm_runtime_init() hasn\u0027t yet been run on the\ndevice either, making the entire thing unsafe) -- resulting in instant\ndeath on SMP or on UP with spinlock debugging enabled:\n\n\t sh_tmu.0: used for clock events\n\t sh_tmu.0: used for periodic clock events\n\tBUG: spinlock trylock failure on UP on CPU#0, swapper/0\n\t lock: 804db198, .magic: 00000000, .owner: \u003cnone\u003e/-1, .owner_cpu: 0\n\t...\n\nRevert it for now until the ordering issues can be resolved, or we can get\nsome more help from the runtime PM framework to make this possible.\n\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "7a66f784375c5922315bbe879b789ee50b924d26", "tree": "66585f94de392dedff6bf5f5d057490e68b1cfa7", "parents": [ "7ab358c23cbf15cea08129cd722d1ce77433a94d" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri May 20 02:11:23 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:16 2011 +0930" }, "message": "virtio_net: delay TX callbacks\n\nAsk for delayed callbacks on TX ring full, to give the\nother side more of a chance to make progress.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "7ab358c23cbf15cea08129cd722d1ce77433a94d", "tree": "713d38823efda30222230314bcae26b919782f16", "parents": [ "4423fe40b03f32b11e72ecfa03077e702e55d5a9" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri May 20 02:11:14 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:16 2011 +0930" }, "message": "virtio: add api for delayed callbacks\n\nAdd an API that tells the other side that callbacks\nshould be delayed until a lot of work has been done.\nImplement using the new event_idx feature.\n\nNote: it might seem advantageous to let the drivers\nask for a callback after a specific capacity has\nbeen reached. However, as a single head can\nfree many entries in the descriptor table,\nwe don\u0027t really have a clue about capacity\nuntil get_buf is called. The API is the simplest\nto implement at the moment, we\u0027ll see what kind of\nhints drivers can pass when there\u0027s more than one\nuser of the feature.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "8ea8cf89e19aeb596b818ee5f2bec8a8b0586b60", "tree": "3303edab83f45265f2e9d05a5ef59f67e758b5f7", "parents": [ "a5c262c5fd83ece01bd649fb08416c501d4c59d7" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri May 20 02:10:54 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:15 2011 +0930" }, "message": "vhost: support event index\n\nSupport the new event index feature. When acked,\nutilize it to reduce the # of interrupts sent to the guest.\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "a5c262c5fd83ece01bd649fb08416c501d4c59d7", "tree": "295ddc61d59236b6521f5587e2e78ccb8da5d97a", "parents": [ "bf7035bf20563a6cadcb9e870406e7b21daf5e30" ], "author": { "name": "Michael S. Tsirkin", "email": "mst@redhat.com", "time": "Fri May 20 02:10:44 2011 +0300" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:15 2011 +0930" }, "message": "virtio_ring: support event idx feature\n\nSupport for the new event idx feature:\n1. When enabling interrupts, publish the current avail index\n value to the host to get interrupts on the next update.\n2. Use the new avail_event feature to reduce the number\n of exits from the guest.\n\nSimple test with the simulator:\n\n[virtio]# time ./virtio_test\nspurious wakeus: 0x7\n\nreal 0m0.169s\nuser 0m0.140s\nsys 0m0.019s\n[virtio]# time ./virtio_test --no-event-idx\nspurious wakeus: 0x11\n\nreal 0m0.649s\nuser 0m0.295s\nsys 0m0.335s\n\nSigned-off-by: Michael S. Tsirkin \u003cmst@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "bf50e69f63d21091e525185c3ae761412be0ba72", "tree": "fc88d1e774ae03e680b2fddc265404ee628b8545", "parents": [ "177dbd95637a52b9118aca757d5856ec3995d3e7" ], "author": { "name": "Dave Hansen", "email": "dave@linux.vnet.ibm.com", "time": "Thu Apr 07 10:43:25 2011 -0700" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:13 2011 +0930" }, "message": "virtio balloon: kill tell-host-first logic\n\nThe virtio balloon driver has a VIRTIO_BALLOON_F_MUST_TELL_HOST\nfeature bit. Whenever the bit is set, the guest kernel must\nalways tell the host before we free pages back to the allocator.\nWithout this feature, we might free a page (and have another\nuser touch it) while the hypervisor is unprepared for it.\n\nBut, if the bit is _not_ set, we are under no obligation to\nreverse the order; we\u0027re under no obligation to do _anything_.\nAs of now, qemu-kvm defines the bit, but doesn\u0027t set it.\n\nThis patch makes the \"tell host first\" logic the only case. This\nshould make everybody happy, and reduce the amount of untested or\nuntestable code in the kernel.\n\nThis _also_ means that we don\u0027t have to preserve a pfn list\nafter the pages are freed, which should let us get rid of some\ntemporary storage (vb-\u003epfns) eventually.\n\nSigned-off-by: Dave Hansen \u003cdave@linux.vnet.ibm.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "177dbd95637a52b9118aca757d5856ec3995d3e7", "tree": "11731b46424543051298d515d8e33d0ae23977c4", "parents": [ "6917f83ffe5e6b6414ccc845263b792ed201c0f1" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:13 2011 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:13 2011 +0930" }, "message": "virtio console: don\u0027t manually set or finalize VIRTIO_CONSOLE_F_MULTIPORT.\n\nThat\u0027s already been done by the virtio infrastructure before the probe\nfunction is called.\n\nReported-by: alexey.kardashevskiy@au1.ibm.com\nAcked-by: Amit Shah \u003camit.shah@redhat.com\u003e\nTested-by: Amit Shah \u003camit.shah@redhat.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "6917f83ffe5e6b6414ccc845263b792ed201c0f1", "tree": "e90ecfcad36fc10e679ae0b6d2a7e5e725b58d1e", "parents": [ "7a7c924cf03da2a76ea4dc0aac1a788cf95a9c29" ], "author": { "name": "Liu Yuan", "email": "tailai.ly@taobao.com", "time": "Sun Apr 24 02:49:26 2011 +0800" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:13 2011 +0930" }, "message": "drivers, block: virtio_blk: Replace cryptic number with the macro\n\nIt is easier to figure out the context by reading SCSI_SENSE_BUFFERSIZE\ninstead of plain \u002796\u0027.\n\nSigned-off-by: Liu Yuan \u003ctailai.ly@taobao.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "7a7c924cf03da2a76ea4dc0aac1a788cf95a9c29", "tree": "717aba1aab456d252c684abf256afa8e92b7dd96", "parents": [ "990c91f0af46c57f0291060d928c7ab82f9d5667" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Tue Feb 01 21:43:48 2011 +0100" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon May 30 11:14:13 2011 +0930" }, "message": "virtio_blk: allow re-reading config space at runtime\n\nWire up the virtio_driver config_changed method to get notified about\nconfig changes raised by the host. For now we just re-read the device\nsize to support online resizing of devices, but once we add more\nattributes that might be changeable they could be added as well.\n\nNote that the config_changed method is called from irq context, so\nwe\u0027ll have to use the workqueue infrastructure to provide us a proper\nuser context for our changes.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "fac04863cef53a69830590b2e1c54345068a9747", "tree": "59b9161b442ccd340324a8b42cdace84206014bb", "parents": [ "2ba781ced93922e249dee2ac0751faccb4fb0656" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 14:06:42 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 14:06:42 2011 -0700" }, "message": "arm gpio drivers: make them \u0027depends on ARM\u0027\n\nWe had a few drivers move from arch/arm into drivers/gpio, but they\ndon\u0027t actually compile without the ARM platform headers etc. As a\nresult they were messing up allyesconfig on x86.\n\nMake them depend on ARM.\n\nReported-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2ba781ced93922e249dee2ac0751faccb4fb0656", "tree": "8b62346278b60d1bc9765dc6691f07219a27d894", "parents": [ "6345d24daf0c1fffe6642081d783cdf653ebaa5c", "437cb0dbd104a1564e0e78f0d486b97677f80909" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:44:33 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:44:33 2011 -0700" }, "message": "Merge branch \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86\n\n* \u0027for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (43 commits)\n acer-wmi: support integer return type from WMI methods\n msi-laptop: fix section mismatch in reference from the function load_scm_model_init\n acer-wmi: support to set communication device state by new wmid method\n acer-wmi: allow 64-bits return buffer from WMI methods\n acer-wmi: check the existence of internal 3G device when set capability\n platform/x86:delete two unused variables\n support wlan hotkey on Acer Travelmate 5735Z\n platform-x86: intel_mid_thermal: Fix memory leak\n platform/x86: Fix Makefile for intel_mid_powerbtn\n platform/x86: Simplify intel_mid_powerbtn\n acer-wmi: Delete out-of-date documentation\n acerhdf: Clean up includes\n acerhdf: Drop pointless dependency on THERMAL_HWMON\n acer-wmi: Update MAINTAINERS\n wmi: Orphan ACPI-WMI driver\n tc1100-wmi: Orphan driver\n acer-wmi: does not allow negative number set to initial device state\n platform/oaktrail: ACPI EC Extra driver for Oaktrail\n thinkpad_acpi: Convert printks to pr_\u003clevel\u003e\n thinkpad_acpi: Correct !CONFIG_THINKPAD_ACPI_VIDEO warning\n ...\n" }, { "commit": "437cb0dbd104a1564e0e78f0d486b97677f80909", "tree": "e066b3d65eb965ca68ecc8ef14581f2450ad3a61", "parents": [ "139f37f5e14cd883eee2a8a36289f544b5390a44", "987dfbaa65b2c3568b85e29d2598da08a011ee09" ], "author": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Sun May 29 14:27:13 2011 -0400" }, "committer": { "name": "Matthew Garrett", "email": "mjg@redhat.com", "time": "Sun May 29 14:27:13 2011 -0400" }, "message": "Merge branch \u0027x86-platform-next\u0027 into x86-platform\n" }, { "commit": "b11b06d90a41766c2d31f0acb8a87aa0f2a7188f", "tree": "be326cde997bcc38b2a9e0a6d6bc7d7ee7b4cbed", "parents": [ "f1d1c9fa8f360990e263bdcb73e35ab6fbdc41fe", "fa34ce73072f90ecd90dcc43f29d82e70e5f8676" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:20:48 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:20:48 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm:\n dm kcopyd: return client directly and not through a pointer\n dm kcopyd: reserve fewer pages\n dm io: use fixed initial mempool size\n dm kcopyd: alloc pages from the main page allocator\n dm kcopyd: add gfp parm to alloc_pl\n dm kcopyd: remove superfluous page allocation spinlock\n dm kcopyd: preallocate sub jobs to avoid deadlock\n dm kcopyd: avoid pointless job splitting\n dm mpath: do not fail paths after integrity errors\n dm table: reject devices without request fns\n dm table: allow targets to support discards internally\n" }, { "commit": "daa94222b638bfe34f745d0982de7a165ce7f67c", "tree": "2157ed94339d46f7a2da22e22648a70319e8fdd0", "parents": [ "f310642123e0d32d919c60ca3fab5acd130c4ba3", "751516f0a9bad32544f40f471037c0e45fb639c9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:19:16 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:19:16 2011 -0700" }, "message": "Merge branch \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6\n\n* \u0027release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:\n ACPI EC: remove redundant code\n ACPI: Add D3 cold state\n ACPI: processor: fix processor_physically_present in UP kernel\n ACPI: Split out custom_method functionality into an own driver\n ACPI: Cleanup custom_method debug stuff\n ACPI EC: enable MSI workaround for Quanta laptops\n ACPICA: Update to version 20110413\n ACPICA: Execute an orphan _REG method under the EC device\n ACPICA: Move ACPI_NUM_PREDEFINED_REGIONS to a more appropriate place\n ACPICA: Update internal address SpaceID for DataTable regions\n ACPICA: Add more methods eligible for NULL package element removal\n ACPICA: Split all internal Global Lock functions to new file - evglock\n ACPI: EC: add another DMI check for ASUS hardware\n ACPI EC: remove dead code\n ACPICA: Fix code divergence of global lock handling\n ACPICA: Use acpi_os_create_lock interface\n ACPI: osl, add acpi_os_create_lock interface\n ACPI:Fix goto flows in thermal-sys\n" }, { "commit": "f310642123e0d32d919c60ca3fab5acd130c4ba3", "tree": "f3844152e2e8c0fdd01621a400f84c8a159252a0", "parents": [ "ef1d57599dc904fdb31b8e9b5336350d21a1fde1", "5d4c47e0195b989f284907358bd5c268a44b91c7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:18:09 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun May 29 11:18:09 2011 -0700" }, "message": "Merge branch \u0027idle-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6\n\n* \u0027idle-release\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:\n x86 idle: deprecate mwait_idle() and \"idle\u003dmwait\" cmdline param\n x86 idle: deprecate \"no-hlt\" cmdline param\n x86 idle APM: deprecate CONFIG_APM_CPU_IDLE\n x86 idle floppy: deprecate disable_hlt()\n x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it\n x86 idle: clarify AMD erratum 400 workaround\n idle governor: Avoid lock acquisition to read pm_qos before entering idle\n cpuidle: menu: fixed wrapping timers at 4.294 seconds\n" }, { "commit": "fa34ce73072f90ecd90dcc43f29d82e70e5f8676", "tree": "26f9c986da4433fa8ed00a1685e34709997474b2", "parents": [ "5f43ba2950414dc0abf4ac44c397d88069056746" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Sun May 29 13:03:13 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Sun May 29 13:03:13 2011 +0100" }, "message": "dm kcopyd: return client directly and not through a pointer\n\nReturn client directly from dm_kcopyd_client_create, not through a\nparameter, making it consistent with dm_io_client_create.\n\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "5f43ba2950414dc0abf4ac44c397d88069056746", "tree": "f80df9947ef30f965d9c33e649d1856f1e47220f", "parents": [ "bda8efec5c706a672e0714d341a342e811f0262a" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Sun May 29 13:03:11 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Sun May 29 13:03:11 2011 +0100" }, "message": "dm kcopyd: reserve fewer pages\n\nReserve just the minimum of pages needed to process one job.\n\nBecause we allocate pages from page allocator, we don\u0027t need to reserve\na large number of pages. The maximum job size is SUB_JOB_SIZE and we\ncalculate the number of reserved pages based on this.\n\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "bda8efec5c706a672e0714d341a342e811f0262a", "tree": "7daf7b505723f5ed2767353dc3fe53b939c46d87", "parents": [ "d04714580f12379fcf7a0f799e86c92b96dd4e1f" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Sun May 29 13:03:09 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Sun May 29 13:03:09 2011 +0100" }, "message": "dm io: use fixed initial mempool size\n\nReplace the arbitrary calculation of an initial io struct mempool size\nwith a constant.\n\nThe code calculated the number of reserved structures based on the request\nsize and used a \"magic\" multiplication constant of 4. This patch changes\nit to reserve a fixed number - itself still chosen quite arbitrarily.\nFurther testing might show if there is a better number to choose.\n\nNote that if there is no memory pressure, we can still allocate an\narbitrary number of \"struct io\" structures. One structure is enough to\nprocess the whole request.\n\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "d04714580f12379fcf7a0f799e86c92b96dd4e1f", "tree": "3a6c152dcb0d062dadfecd9fb8b1866a0fdbfce5", "parents": [ "f99b55eec795bd0fd577ab3ca06f3acfbe3b1ab1" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Sun May 29 13:03:07 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Sun May 29 13:03:07 2011 +0100" }, "message": "dm kcopyd: alloc pages from the main page allocator\n\nThis patch changes dm-kcopyd so that it allocates pages from the main\npage allocator with __GFP_NOWARN | __GFP_NORETRY flags (so that it can\nfail in case of memory pressure). If the allocation fails, dm-kcopyd\nallocates pages from its own reserve.\n\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "f99b55eec795bd0fd577ab3ca06f3acfbe3b1ab1", "tree": "b4e4b21bf5477895ac7f8b8b998847dd8c0686aa", "parents": [ "4cc1b4cffd187a5c5d6264c8d766c49b3c57fb05" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Sun May 29 13:03:04 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Sun May 29 13:03:04 2011 +0100" }, "message": "dm kcopyd: add gfp parm to alloc_pl\n\nIntroduce a parameter for gfp flags to alloc_pl() for use in following\npatches.\n\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "4cc1b4cffd187a5c5d6264c8d766c49b3c57fb05", "tree": "98b550b7e3c00fcdf20cc8b0a9c5b9478cb45ac9", "parents": [ "c6ea41fbbe08f270a8edef99dc369faf809d1bd6" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Sun May 29 13:03:02 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Sun May 29 13:03:02 2011 +0100" }, "message": "dm kcopyd: remove superfluous page allocation spinlock\n\nRemove the spinlock protecting the pages allocation. The spinlock is only\ntaken on initialization or from single-threaded workqueue. Therefore, the\nspinlock is useless.\n\nThe spinlock is taken in kcopyd_get_pages and kcopyd_put_pages.\n\nkcopyd_get_pages is only called from run_pages_job, which is only\ncalled from process_jobs called from do_work.\n\nkcopyd_put_pages is called from client_alloc_pages (which is initialization\nfunction) or from run_complete_job. run_complete_job is only called from\nprocess_jobs called from do_work.\n\nAnother spinlock, kc-\u003ejob_lock is taken each time someone pushes or pops\nsome work for the worker thread. Once we take kc-\u003ejob_lock, we\nguarantee that any written memory is visible to the other CPUs.\n\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "c6ea41fbbe08f270a8edef99dc369faf809d1bd6", "tree": "34210fcc635c029939d43b3b556314210c7171c5", "parents": [ "a705a34a565a5445bf731bd8006d51ea4d2b4236" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Sun May 29 13:03:00 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Sun May 29 13:03:00 2011 +0100" }, "message": "dm kcopyd: preallocate sub jobs to avoid deadlock\n\nThere\u0027s a possible theoretical deadlock in dm-kcopyd because multiple\nallocations from the same mempool are required to finish a request.\nAvoid this by preallocating sub jobs.\n\nThere is a mempool of 512 entries. Each request requires up to 9\nentries from the mempool. If we have at least 57 concurrent requests\nrunning, the mempool may overflow and mempool allocations may start\nblocking until another entry is freed to the mempool. Because the same\nthread is used to free entries to the mempool and allocate entries from\nthe mempool, this may result in a deadlock.\n\nThis patch changes it so that one mempool entry contains all 9 \"struct\nkcopyd_job\" required to fulfill the whole request. The allocation is\ndone only once in dm_kcopyd_copy and no further mempool allocations are\ndone during request processing.\n\nIf dm_kcopyd_copy is not run in the completion thread, this\nimplementation is deadlock-free.\n\nMIN_JOBS needs reducing accordingly and we\u0027ve chosen to reduce it\nfurther to 8.\n\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "a705a34a565a5445bf731bd8006d51ea4d2b4236", "tree": "84d4761ff62398110a44e630085bc43a97bae805", "parents": [ "6f13f6fba76edc7d0e7580c5deee829d59a41b2f" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Sun May 29 13:02:58 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Sun May 29 13:02:58 2011 +0100" }, "message": "dm kcopyd: avoid pointless job splitting\n\nDon\u0027t split SUB_JOB_SIZE jobs\n\nIf the job size equals SUB_JOB_SIZE, there is no point in splitting it.\nSplitting it just unnecessarily wastes time, because the split job size\nis SUB_JOB_SIZE too.\n\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "6f13f6fba76edc7d0e7580c5deee829d59a41b2f", "tree": "f192d41174ac3f97cfec5f8f20ad6021a524b10b", "parents": [ "f4808ca99a203f20b4475601748e44b25a65bdec" ], "author": { "name": "Martin K. Petersen", "email": "martin.petersen@oracle.com", "time": "Sun May 29 13:02:55 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Sun May 29 13:02:55 2011 +0100" }, "message": "dm mpath: do not fail paths after integrity errors\n\nIntegrity errors need to be passed to the owner of the integrity\nmetadata for processing. Consequently EILSEQ should be passed up the\nstack.\n\nCc: stable@kernel.org\nSigned-off-by: Martin K. Petersen \u003cmartin.petersen@oracle.com\u003e\nAcked-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "f4808ca99a203f20b4475601748e44b25a65bdec", "tree": "442641730674c130ec228c626b94606ad4f2e3c7", "parents": [ "4c2593270133708698d4b8cea2dab469479ad13b" ], "author": { "name": "Milan Broz", "email": "mbroz@redhat.com", "time": "Sun May 29 13:02:52 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Sun May 29 13:02:52 2011 +0100" }, "message": "dm table: reject devices without request fns\n\nThis patch adds a check that a block device has a request function\ndefined before it is used. Otherwise, misconfiguration can cause an oops.\n\nBecause we are allowing devices with zero size e.g. an offline multipath\ndevice as in commit 2cd54d9bedb79a97f014e86c0da393416b264eb3\n(\"dm: allow offline devices\") there needs to be an additional check\nto ensure devices are initialised. Some block devices, like a loop\ndevice without a backing file, exist but have no request function.\n\nReproducer is trivial: dm-mirror on unbound loop device\n(no backing file on loop devices)\n\ndmsetup create x --table \"0 8 mirror core 2 8 sync 2 /dev/loop0 0 /dev/loop1 0\"\n\nand mirror resync will immediatelly cause OOps.\n\nBUG: unable to handle kernel NULL pointer dereference at (null)\n ? generic_make_request+0x2bd/0x590\n ? kmem_cache_alloc+0xad/0x190\n submit_bio+0x53/0xe0\n ? bio_add_page+0x3b/0x50\n dispatch_io+0x1ca/0x210 [dm_mod]\n ? read_callback+0x0/0xd0 [dm_mirror]\n dm_io+0xbb/0x290 [dm_mod]\n do_mirror+0x1e0/0x748 [dm_mirror]\n\nSigned-off-by: Milan Broz \u003cmbroz@redhat.com\u003e\nReported-by: Zdenek Kabelac \u003czkabelac@redhat.com\u003e\nAcked-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "4c2593270133708698d4b8cea2dab469479ad13b", "tree": "f408edef9145b2f9553cbb2142347fc79023c4ff", "parents": [ "139f37f5e14cd883eee2a8a36289f544b5390a44" ], "author": { "name": "Mike Snitzer", "email": "snitzer@redhat.com", "time": "Sun May 29 12:52:55 2011 +0100" }, "committer": { "name": "Alasdair G Kergon", "email": "agk@redhat.com", "time": "Sun May 29 12:52:55 2011 +0100" }, "message": "dm table: allow targets to support discards internally\n\nPermit a target to support discards regardless of whether or not all its\nunderlying devices do.\n\nSigned-off-by: Mike Snitzer \u003csnitzer@redhat.com\u003e\nSigned-off-by: Alasdair G Kergon \u003cagk@redhat.com\u003e\n" }, { "commit": "751516f0a9bad32544f40f471037c0e45fb639c9", "tree": "8bdd745909a1523f720ae978c12b9c686d58baaa", "parents": [ "6288cf1e768ae73db5ddaaae54d85245cc1c2b56", "08b53f0e6b565fe8dc0b8f929960ed16d76291bd" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 04:40:39 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 04:40:39 2011 -0400" }, "message": "Merge branch \u0027ec-cleanup\u0027 into release\n\nConflicts:\n\tdrivers/platform/x86/compal-laptop.c\n" }, { "commit": "6288cf1e768ae73db5ddaaae54d85245cc1c2b56", "tree": "2bf60eb8e66f9c98347838f5859f27356f65b25e", "parents": [ "0a63e2308cbbdc7e2f5645769afaf53785bcb9fa", "526b4af47f44148c9d665e57723ed9f86634c6e3", "932df7414336a00f45e5aec62724cf736b0bcfd4", "534bc4e3d27096e2f3fc00c14a20efd597837a4f", "28c2103dad04dba29ba86e22dad5735db8f0e13c", "af986d101d141f10231ffa7e40ae397dc7356857", "b299eb5cde1a91706c450804006c6559b0826df8" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 04:38:48 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 04:38:48 2011 -0400" }, "message": "Merge branches \u0027acpica\u0027, \u0027aml-custom\u0027, \u0027bugzilla-16548\u0027, \u0027bugzilla-20242\u0027, \u0027d3-cold\u0027, \u0027ec-asus\u0027 and \u0027thermal-fix\u0027 into release\n" }, { "commit": "3b70b2e5fcf6315eb833a1bcc2b810bdc75484ff", "tree": "803b88453cf6be96b81727105b67bb7566cf7b48", "parents": [ "06ae40ce073daf233607a3c54a489f2c1e44683e" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Apr 01 15:08:48 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 03:39:15 2011 -0400" }, "message": "x86 idle floppy: deprecate disable_hlt()\n\nPlan to remove floppy_disable_hlt in 2012, an ancient\nworkaround with comments that it should be removed.\n\nThis allows us to remove clutter and a run-time branch\nfrom the idle code.\n\nWARN_ONCE() on invocation until it is removed.\n\ncc: x86@kernel.org\ncc: stable@kernel.org # .39.x\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "02c68a02018669d1817c43c42de800975cbec467", "tree": "9e02b7913f650492fcdbb78cd6e8d3ff3160e43c", "parents": [ "333c5ae9948194428fe6c5ef5c088304fc98263b" ], "author": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Fri Apr 01 16:59:53 2011 -0400" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 03:38:57 2011 -0400" }, "message": "x86 idle: clarify AMD erratum 400 workaround\n\nThe workaround for AMD erratum 400 uses the term \"c1e\" falsely suggesting:\n1. Intel C1E is somehow involved\n2. All AMD processors with C1E are involved\n\nUse the string \"amd_c1e\" instead of simply \"c1e\" to clarify that\nthis workaround is specific to AMD\u0027s version of C1E.\nUse the string \"e400\" to clarify that the workaround is specific\nto AMD processors with Erratum 400.\n\nThis patch is text-substitution only, with no functional change.\n\ncc: x86@kernel.org\nAcked-by: Borislav Petkov \u003cborislav.petkov@amd.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "08b53f0e6b565fe8dc0b8f929960ed16d76291bd", "tree": "2e8c56e74e5cc78c9f022760c95075c885e59357", "parents": [ "1cb7b1e0de6a1f8f071f4a146e3d10f3a662f707" ], "author": { "name": "Zhang Rui", "email": "rui.zhang@intel.com", "time": "Tue Apr 26 16:29:55 2011 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 02:59:50 2011 -0400" }, "message": "ACPI EC: remove redundant code\n\nec-\u003ehandle is set in ec_parse_device(), so don\u0027t bother to set it again.\n\nSigned-off-by: Zhang Rui \u003crui.zhang@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "28c2103dad04dba29ba86e22dad5735db8f0e13c", "tree": "7bdd422ae53e4f48bdaa48e1d83e6c25a1ee56e4", "parents": [ "61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf" ], "author": { "name": "Lin Ming", "email": "ming.m.lin@intel.com", "time": "Wed May 04 22:56:43 2011 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 02:21:08 2011 -0400" }, "message": "ACPI: Add D3 cold state\n\n_SxW returns an Integer containing the lowest D-state supported in state\nSx. If OSPM has not indicated that it supports _PR3, then the value “3”\ncorresponds to D3. If it has indicated _PR3 support, the value “3”\nrepresents D3hot and the value “4” represents D3cold.\n\nLinux does set _OSC._PR3, so we should fix it to expect that _SxW can\nreturn 4.\n\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "932df7414336a00f45e5aec62724cf736b0bcfd4", "tree": "aaa896c278e90005729f566a437a4134b27dab2b", "parents": [ "61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf" ], "author": { "name": "Lin Ming", "email": "ming.m.lin@intel.com", "time": "Mon May 16 09:11:00 2011 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 02:17:56 2011 -0400" }, "message": "ACPI: processor: fix processor_physically_present in UP kernel\n\nUsually, there are multiple processors defined in ACPI table, for\nexample\n\n Scope (_PR)\n {\n Processor (CPU0, 0x00, 0x00000410, 0x06) {}\n Processor (CPU1, 0x01, 0x00000410, 0x06) {}\n Processor (CPU2, 0x02, 0x00000410, 0x06) {}\n Processor (CPU3, 0x03, 0x00000410, 0x06) {}\n }\n\nprocessor_physically_present(...) will be called to check whether those\nprocessors are physically present.\n\nCurrently we have below codes in processor_physically_present,\n\ncpuid \u003d acpi_get_cpuid(...);\nif ((cpuid \u003d\u003d -1) \u0026\u0026 (num_possible_cpus() \u003e 1))\n return false;\nreturn true;\n\nIn UP kernel, acpi_get_cpuid(...) always return -1 and\nnum_possible_cpus() always return 1, so\nprocessor_physically_present(...) always returns true for all passed in\nprocessor handles.\n\nThis is wrong for UP processor or SMP processor running UP kernel.\n\nThis patch removes the !SMP version of acpi_get_cpuid(), so both UP and\nSMP kernel use the same acpi_get_cpuid function.\n\nAnd for UP kernel, only processor 0 is valid.\n\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d16548\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d16357\n\nTested-by: Anton Kochkov \u003canton.kochkov@gmail.com\u003e\nTested-by: Ambroz Bizjak \u003cambrop7@gmail.com\u003e\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "5be7ef002469eaf757065ee16b4100c6d3ead1cc", "tree": "9ce6659a0455095c64e80f3115a6c3cbc7a66db8", "parents": [ "eee0f252c6537da2e883f75d22cff1427515eaf3" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Sat May 28 17:26:40 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 23:12:11 2011 -0700" }, "message": "scsi: fix scsi_proc new kernel-doc warning\n\nFix kernel-doc warnings in scsi_proc.c:\n\n Warning(drivers/scsi/scsi_proc.c:390): No description found for parameter \u0027dev\u0027\n Warning(drivers/scsi/scsi_proc.c:390): No description found for parameter \u0027data\u0027\n Warning(drivers/scsi/scsi_proc.c:390): Excess function parameter \u0027s\u0027 description in \u0027always_match\u0027\n Warning(drivers/scsi/scsi_proc.c:390): Excess function parameter \u0027p\u0027 description in \u0027always_match\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "526b4af47f44148c9d665e57723ed9f86634c6e3", "tree": "7906a3b45703aa730d5e7ebadc36a55aee5417ca", "parents": [ "aecad432fd68dafa5b3b497c4816fbfce6fd4066" ], "author": { "name": "Thomas Renninger", "email": "trenn@suse.de", "time": "Thu May 26 12:26:24 2011 +0200" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 01:50:40 2011 -0400" }, "message": "ACPI: Split out custom_method functionality into an own driver\n\nWith /sys/kernel/debug/acpi/custom_method root can write\nto arbitrary memory and increase his priveleges, even if\nthese are restricted.\n\n-\u003e Make this an own debug .config option and warn about the\nsecurity issue in the config description.\n\n-\u003e Still keep acpi/debugfs.c which now only creates an empty\n /sys/kernel/debug/acpi directory. There might be other\n users of it later.\n\nSigned-off-by: Thomas Renninger \u003ctrenn@suse.de\u003e\nAcked-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: rui.zhang@intel.com\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "aecad432fd68dafa5b3b497c4816fbfce6fd4066", "tree": "168b6b7358df13e2d1bd967c217599c77dd21fd8", "parents": [ "61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf" ], "author": { "name": "Thomas Renninger", "email": "trenn@suse.de", "time": "Thu May 26 12:26:23 2011 +0200" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 01:50:04 2011 -0400" }, "message": "ACPI: Cleanup custom_method debug stuff\n\n- Move param aml_debug_output to other params into sysfs.c\n- Split acpi_debugfs_init to prepare custom_method to be\n an own .config option and driver.\n\nSigned-off-by: Thomas Renninger \u003ctrenn@suse.de\u003e\nAcked-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: rui.zhang@intel.com\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "534bc4e3d27096e2f3fc00c14a20efd597837a4f", "tree": "bff2c1fd3d6c7b677ad7d32a0e7eadfd29b01457", "parents": [ "61c4f2c81c61f73549928dfd9f3e8f26aa36a8cf" ], "author": { "name": "Zhang Rui", "email": "rui.zhang@intel.com", "time": "Tue Apr 26 16:30:02 2011 +0800" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 01:35:46 2011 -0400" }, "message": "ACPI EC: enable MSI workaround for Quanta laptops\n\nEnable MSI workaround for Quanta laptops.\nhttps://bugzilla.kernel.org/show_bug.cgi?id\u003d20242\n\nTested-by: Jan-Matthias Braun \u003cjan_braun@gmx.net\u003e\nSigned-off-by: Zhang Rui \u003crui.zhang@intel.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "7467571f4480b273007517b26297c07154c73924", "tree": "e933b8cff072f5ec389cd5e20c85e756e49cafeb", "parents": [ "521cb40b0c44418a4fd36dc633f575813d59a43d" ], "author": { "name": "Tero Kristo", "email": "tero.kristo@nokia.com", "time": "Thu Feb 24 17:19:23 2011 +0200" }, "committer": { "name": "Len Brown", "email": "len.brown@intel.com", "time": "Sun May 29 00:35:47 2011 -0400" }, "message": "cpuidle: menu: fixed wrapping timers at 4.294 seconds\n\nCpuidle menu governor is using u32 as a temporary datatype for storing\nnanosecond values which wrap around at 4.294 seconds. This causes errors\nin predicted sleep times resulting in higher than should be C state\nselection and increased power consumption. This also breaks cpuidle\nstate residency statistics.\n\ncc: stable@kernel.org # .32.x through .39.x\nSigned-off-by: Tero Kristo \u003ctero.kristo@nokia.com\u003e\nSigned-off-by: Len Brown \u003clen.brown@intel.com\u003e\n" }, { "commit": "c4a227d89f758e582fd167bb15245f2704de99ef", "tree": "f5b6e0091e6543c14d1cd7cf1f93e097a96bbd64", "parents": [ "87367a0b71a5188e34a913c05673b5078f71a64d", "f506b3dc0ec454a16d40cab9ee5d75435b39dc50" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:55:55 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:55:55 2011 -0700" }, "message": "Merge branch \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-urgent-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (25 commits)\n perf: Fix SIGIO handling\n perf top: Don\u0027t stop if no kernel symtab is found\n perf top: Handle kptr_restrict\n perf top: Remove unused macro\n perf events: initialize fd array to -1 instead of 0\n perf tools: Make sure kptr_restrict warnings fit 80 col terms\n perf tools: Fix build on older systems\n perf symbols: Handle /proc/sys/kernel/kptr_restrict\n perf: Remove duplicate headers\n ftrace: Add internal recursive checks\n tracing: Update btrfs\u0027s tracepoints to use u64 interface\n tracing: Add __print_symbolic_u64 to avoid warnings on 32bit machine\n ftrace: Set ops-\u003eflag to enabled even on static function tracing\n tracing: Have event with function tracer check error return\n ftrace: Have ftrace_startup() return failure code\n jump_label: Check entries limit in __jump_label_update\n ftrace/recordmcount: Avoid STT_FUNC symbols as base on ARM\n scripts/tags.sh: Add magic for trace-events for etags too\n scripts/tags.sh: Fix ctags for DEFINE_EVENT()\n x86/ftrace: Fix compiler warning in ftrace.c\n ...\n" }, { "commit": "87367a0b71a5188e34a913c05673b5078f71a64d", "tree": "da14cc575bfe692f07b42c2c8a13d9aa403fc471", "parents": [ "4cb865deec59ef31d966622d1ec87411ae32dfab", "2cf95c18d5069e13c02a8667d91e064df8e17e09" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:36:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:36:15 2011 -0700" }, "message": "Merge branch \u0027for-usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci\n\n* \u0027for-usb-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sarah/xhci:\n Intel xhci: Limit number of active endpoints to 64.\n Intel xhci: Ignore spurious successful event.\n Intel xhci: Support EHCI/xHCI port switching.\n Intel xhci: Add PCI id for Panther Point xHCI host.\n xhci: STFU: Be quieter during URB submission and completion.\n xhci: STFU: Don\u0027t print event ring dequeue pointer.\n xhci: STFU: Remove function tracing.\n xhci: Don\u0027t submit commands when the host is dead.\n xhci: Clear stopped_td when Stop Endpoint command completes.\n" }, { "commit": "4cb865deec59ef31d966622d1ec87411ae32dfab", "tree": "e060d515f62e4f334aded38c9079485d50166693", "parents": [ "55f08e1baa3ef11c952b626dbc7ef9e3e8332a63", "19d78a61be6dd707dcec298c486303d4ba2c840a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:35:15 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:35:15 2011 -0700" }, "message": "Merge branch \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx\n\n* \u0027next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx: (33 commits)\n x86: poll waiting for I/OAT DMA channel status\n maintainers: add dma engine tree details\n dmaengine: add TODO items for future work on dma drivers\n dmaengine: Add API documentation for slave dma usage\n dmaengine/dw_dmac: Update maintainer-ship\n dmaengine: move link order\n dmaengine/dw_dmac: implement pause and resume in dwc_control\n dmaengine/dw_dmac: Replace spin_lock* with irqsave variants and enable submission from callback\n dmaengine/dw_dmac: Divide one sg to many desc, if sg len is greater than DWC_MAX_COUNT\n dmaengine/dw_dmac: set residue as total len in dwc_tx_status if status is !DMA_SUCCESS\n dmaengine/dw_dmac: don\u0027t call callback routine in case dmaengine_terminate_all() is called\n dmaengine: at_hdmac: pause: no need to wait for FIFO empty\n pch_dma: modify pci device table definition\n pch_dma: Support new device ML7223 IOH\n pch_dma: Support I2S for ML7213 IOH\n pch_dma: Fix DMA setting issue\n pch_dma: modify for checkpatch\n pch_dma: fix dma direction issue for ML7213 IOH video-in\n dmaengine: at_hdmac: use descriptor chaining help function\n dmaengine: at_hdmac: implement pause and resume in atc_control\n ...\n\nFix up trivial conflict in drivers/dma/dw_dmac.c\n" }, { "commit": "55f08e1baa3ef11c952b626dbc7ef9e3e8332a63", "tree": "4eb5f0bf3fd8d26ead9bd92ed8c5214cecf348ea", "parents": [ "d02bf062fbb5e714d84ecefd05106062b9a45159", "66c500ff36d74c6669ad260deda4ce8125b55304" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:33:51 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 12:33:51 2011 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6:\n mfd: Fix build breakage caused by tps65910 gpio directory move\n mfd: Use mfd cell platform_data for db8500-prcmu cells platform bits\n" }, { "commit": "d02bf062fbb5e714d84ecefd05106062b9a45159", "tree": "dde6fa5fe051bb147b7d62261ac204f5a371cb3c", "parents": [ "04830fccdcafa7e0ea913990ae56437253553fef", "9c3e737561b2473ea1fc5b83a0c1d51e1ff3d294" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 10:57:39 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 10:57:39 2011 -0700" }, "message": "Merge branch \u0027spi/next\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027spi/next\u0027 of git://git.secretlab.ca/git/linux-2.6:\n spi/spi_bfin_sport: new driver for a SPI bus via the Blackfin SPORT peripheral\n spi/tle620x: add missing device_remove_file()\n" }, { "commit": "04830fccdcafa7e0ea913990ae56437253553fef", "tree": "16d423628a516f544a0e5bb8fd4f00d88a55395f", "parents": [ "571503e10045c89af951962ea0bb783482663aad", "1486a7409b42ec434be310e091ef68660a2f6cd0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 10:56:34 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat May 28 10:56:34 2011 -0700" }, "message": "Merge branch \u0027gpio/next\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027gpio/next\u0027 of git://git.secretlab.ca/git/linux-2.6:\n gpio/pch_gpio: Support new device ML7223\n gpio: make gpio_{request,free}_array gpio array parameter const\n GPIO: OMAP: move to drivers/gpio\n GPIO: OMAP: move register offset defines into \u003cplat/gpio.h\u003e\n gpio: Convert gpio_is_valid to return bool\n gpio: Move the s5pc100 GPIO to drivers/gpio\n gpio: Move the s5pv210 GPIO to drivers/gpio\n gpio: Move the exynos4 GPIO to drivers/gpio\n gpio: Move to Samsung common GPIO library to drivers/gpio\n gpio/nomadik: add function to read GPIO pull down status\n gpio/nomadik: show all pins in debug\n gpio: move Nomadik GPIO driver to drivers/gpio\n gpio: move U300 GPIO driver to drivers/gpio\n langwell_gpio: add runtime pm support\n gpio/pca953x: Add support for pca9574 and pca9575 devices\n gpio/cs5535: Show explicit dependency between gpio_cs5535 and mfd_cs5535\n" }, { "commit": "5988ce239682854d4e632fb58bff000700830394", "tree": "442b44bb96632b7ed507bc5eeacd10fafc689afd", "parents": [ "3b2710824e00d238554c13b5add347e6c701ab1a" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Sat May 28 14:44:46 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat May 28 14:44:46 2011 +0200" }, "message": "nbd: adjust \u0027max_part\u0027 according to part_shift\n\nThe \u0027max_part\u0027 parameter determines how many partitions are supported\non each nbd device. However the actual number can be changed to the\npower of 2 minus 1 form during the module initialization as\nalloc_disk() is called with (1 \u003c\u003c part_shift) for some reason.\n\nSo adjust \u0027max_part\u0027 also at least for consistency with loop and brd.\nIt is exported via sysfs already, and a user should check this value\nafter module loading if [s]he wants to use that number correctly\n(i.e. fdisk or something).\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: Laurent Vivier \u003cLaurent.Vivier@bull.net\u003e\nCc: Paul Clements \u003cPaul.Clements@steeleye.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "3b2710824e00d238554c13b5add347e6c701ab1a", "tree": "dc89e30838c7c0447ef800ee4c26481583468447", "parents": [ "35fbf5bcf497d6ddbe7b6478141e7526d1474ff5" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Sat May 28 14:44:46 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat May 28 14:44:46 2011 +0200" }, "message": "nbd: limit module parameters to a sane value\n\nThe \u0027max_part\u0027 parameter controls the number of maximum partition\na nbd device can have. However if a user specifies very large\nvalue it would exceed the limitation of device minor number and\ncan cause a kernel oops (or, at least, produce invalid device\nnodes in some cases).\n\nIn addition, specifying large \u0027nbds_max\u0027 value causes same\nproblem for the same reason.\n\nOn my desktop, following command results to the kernel bug:\n\n$ sudo modprobe nbd max_part\u003d100000\n kernel BUG at /media/Linux_Data/project/linux/fs/sysfs/group.c:65!\n invalid opcode: 0000 [#1] SMP\n last sysfs file: /sys/devices/virtual/block/nbd4/range\n CPU 1\n Modules linked in: nbd(+) bridge stp llc kvm_intel kvm asus_atk0110 sg sr_mod cdrom\n\n Pid: 2522, comm: modprobe Tainted: G W 2.6.39-leonard+ #159 System manufacturer System Product Name/P5G41TD-M PRO\n RIP: 0010:[\u003cffffffff8115aa08\u003e] [\u003cffffffff8115aa08\u003e] internal_create_group+0x2f/0x166\n RSP: 0018:ffff8801009f1de8 EFLAGS: 00010246\n RAX: 00000000ffffffef RBX: ffff880103920478 RCX: 00000000000a7bd3\n RDX: ffffffff81a2dbe0 RSI: 0000000000000000 RDI: ffff880103920478\n RBP: ffff8801009f1e38 R08: ffff880103920468 R09: ffff880103920478\n R10: ffff8801009f1de8 R11: ffff88011eccbb68 R12: ffffffff81a2dbe0\n R13: ffff880103920468 R14: 0000000000000000 R15: ffff880103920400\n FS: 00007f3c49de9700(0000) GS:ffff88011f800000(0000) knlGS:0000000000000000\n CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b\n CR2: 00007f3b7fe7c000 CR3: 00000000cd58d000 CR4: 00000000000406e0\n DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000\n DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400\n Process modprobe (pid: 2522, threadinfo ffff8801009f0000, task ffff8801009a93a0)\n Stack:\n ffff8801009f1e58 ffffffff812e8f6e ffff8801009f1e58 ffffffff812e7a80\n ffff880000000010 ffff880103920400 ffff8801002fd0c0 ffff880103920468\n 0000000000000011 ffff880103920400 ffff8801009f1e48 ffffffff8115ab6a\n Call Trace:\n [\u003cffffffff812e8f6e\u003e] ? device_add+0x4f1/0x5e4\n [\u003cffffffff812e7a80\u003e] ? dev_set_name+0x41/0x43\n [\u003cffffffff8115ab6a\u003e] sysfs_create_group+0x13/0x15\n [\u003cffffffff810b857e\u003e] blk_trace_init_sysfs+0x14/0x16\n [\u003cffffffff811ee58b\u003e] blk_register_queue+0x4c/0xfd\n [\u003cffffffff811f3bdf\u003e] add_disk+0xe4/0x29c\n [\u003cffffffffa007e2ab\u003e] nbd_init+0x2ab/0x30d [nbd]\n [\u003cffffffffa007e000\u003e] ? 0xffffffffa007dfff\n [\u003cffffffff8100020f\u003e] do_one_initcall+0x7f/0x13e\n [\u003cffffffff8107ab0a\u003e] sys_init_module+0xa1/0x1e3\n [\u003cffffffff814f3542\u003e] system_call_fastpath+0x16/0x1b\n Code: 41 57 41 56 41 55 41 54 53 48 83 ec 28 0f 1f 44 00 00 48 89 fb 41 89 f6 49 89 d4 48 85 ff 74 0b 85 f6 75 0b 48 83\n 7f 30 00 75 14 \u003c0f\u003e 0b eb fe b9 ea ff ff ff 48 83 7f 30 00 0f 84 09 01 00 00 49\n RIP [\u003cffffffff8115aa08\u003e] internal_create_group+0x2f/0x166\n RSP \u003cffff8801009f1de8\u003e\n ---[ end trace 753285ffbf72c57c ]---\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: Laurent Vivier \u003cLaurent.Vivier@bull.net\u003e\nCc: Paul Clements \u003cPaul.Clements@steeleye.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "35fbf5bcf497d6ddbe7b6478141e7526d1474ff5", "tree": "1f2ecd1038aa175fd6a1086e06665cc134e13f56", "parents": [ "6df87e65dbe4528ef07b917af89913abb8caaaba" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Sat May 28 14:44:46 2011 +0200" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat May 28 14:44:46 2011 +0200" }, "message": "nbd: pass MSG_* flags to kernel_recvmsg()\n\nUnlike kernel_sendmsg(), kernel_recvmsg() requires passing flags explicitly\nvia last parameter instead of struct msghdr.msg_flags. Therefore calls to\nsock_xmit(lo, 0, ..., MSG_WAITALL) have not been processed properly by tcp\nlayer wrt. the flag. Fix it.\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: Paul Clements \u003cPaul.Clements@steeleye.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "66c500ff36d74c6669ad260deda4ce8125b55304", "tree": "522352393c15472ecb2f7e22791d17a82160c060", "parents": [ "1ed7891f8dcdba62041dfa265aea038afb49635c" ], "author": { "name": "Liam Girdwood", "email": "lrg@kernel.org", "time": "Fri May 27 22:13:08 2011 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sat May 28 08:38:55 2011 +0200" }, "message": "mfd: Fix build breakage caused by tps65910 gpio directory move\n\nSigned-off-by: Liam Girdwood \u003clrg@ti.com\u003e\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "1ed7891f8dcdba62041dfa265aea038afb49635c", "tree": "962eca4ef3495c9eb76ef556e178a38bb90ab369", "parents": [ "29a6ccca3869bbe33879dae0cd7df2a1559eff54" ], "author": { "name": "Mattias Wallin", "email": "mattias.wallin@stericsson.com", "time": "Fri May 27 11:49:43 2011 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Sat May 28 08:35:36 2011 +0200" }, "message": "mfd: Use mfd cell platform_data for db8500-prcmu cells platform bits\n\nWith the addition of a device platform mfd_cell pointer, MFD drivers\ncan go back to passing platform data back to their sub drivers.\nThis allows for an mfd_cell-\u003emfd_data removal and thus keep the\nsub drivers MFD agnostic. This is mostly needed for non MFD aware\nsub drivers.\n\nSigned-off-by: Mattias Wallin \u003cmattias.wallin@stericsson.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "1486a7409b42ec434be310e091ef68660a2f6cd0", "tree": "aea9fb012b3d7221a4b46f50a10edf809ee49f9a", "parents": [ "bc786ccead15262a12bd673ed7a5afa6cbf0edcf", "e5cdb13ff95e1400bc94d3e6610fc5e95be3b5b1" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri May 27 23:52:58 2011 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri May 27 23:52:58 2011 -0600" }, "message": "Merge branch \u0027for_2.6.40/gpio-move\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into gpio/next\n" }, { "commit": "29a6ccca3869bbe33879dae0cd7df2a1559eff54", "tree": "2d9d355d8662ede95af7bc812d686dc4d5f37ff3", "parents": [ "426048313dfa7d65dbd2379b1665755511f9544f", "6a8a98b22b10f1560d5f90aded4a54234b9b2724" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 20:06:53 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 20:06:53 2011 -0700" }, "message": "Merge git://git.infradead.org/mtd-2.6\n\n* git://git.infradead.org/mtd-2.6: (97 commits)\n mtd: kill CONFIG_MTD_PARTITIONS\n mtd: remove add_mtd_partitions, add_mtd_device and friends\n mtd: convert remaining users to mtd_device_register()\n mtd: samsung onenand: convert to mtd_device_register()\n mtd: omap2 onenand: convert to mtd_device_register()\n mtd: txx9ndfmc: convert to mtd_device_register()\n mtd: tmio_nand: convert to mtd_device_register()\n mtd: socrates_nand: convert to mtd_device_register()\n mtd: sharpsl: convert to mtd_device_register()\n mtd: s3c2410 nand: convert to mtd_device_register()\n mtd: ppchameleonevb: convert to mtd_device_register()\n mtd: orion_nand: convert to mtd_device_register()\n mtd: omap2: convert to mtd_device_register()\n mtd: nomadik_nand: convert to mtd_device_register()\n mtd: ndfc: convert to mtd_device_register()\n mtd: mxc_nand: convert to mtd_device_register()\n mtd: mpc5121_nfc: convert to mtd_device_register()\n mtd: jz4740_nand: convert to mtd_device_register()\n mtd: h1910: convert to mtd_device_register()\n mtd: fsmc_nand: convert to mtd_device_register()\n ...\n\nFixed up trivial conflicts in\n - drivers/mtd/maps/integrator-flash.c: removed in ARM tree\n - drivers/mtd/maps/physmap.c: addition of afs partition probe type\n clashing with removal of CONFIG_MTD_PARTITIONS\n" }, { "commit": "426048313dfa7d65dbd2379b1665755511f9544f", "tree": "dc727b9e41eb3d9dfe8e68f14b027c776d8aba98", "parents": [ "2a56d2220284b0e4dd8569fa475d7053f1c40a63", "7ad20aa9d39a525542b0840ac38bfc77be831e19" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 19:52:57 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 19:52:57 2011 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (60 commits)\n [SCSI] lpfc 8.3.24: Extend BSG infrastructure and add link diagnostics\n [SCSI] lpfc 8.3.24: Add resource extent support\n [SCSI] lpfc 8.3.24: Add request-firmware support\n [SCSI] lpfc 8.3.24: Add SR-IOV control\n [SCSI] lpfc 8.3.24: Extended hardware support and support dump images\n [SCSI] lpfc 8.3.24: Miscellaneous Fixes and Corrections\n [SCSI] libsas: Add option for SATA soft reset\n [SCSI] libsas: check dev-\u003egone before submitting sata i/o\n [SCSI] libsas: fix/amend device gone notification in sas_deform_port()\n [SCSI] MAINTAINERS update for SCSI (new email address)\n [SCSI] Fix Ultrastor asm snippet\n [SCSI] osst: fix warning\n [SCSI] osst: wrong index used in inner loop\n [SCSI] aic94xx: world-writable sysfs update_bios file\n [SCSI] MAINTAINERS: Add drivers/target/ entry\n [SCSI] target: Convert TASK_ATTR to scsi_tcq.h definitions\n [SCSI] target: Convert REPORT_LUNs to use int_to_scsilun\n [SCSI] target: Fix task-\u003etask_execute_queue\u003d1 clear bug + LUN_RESET OOPs\n [SCSI] target: Fix bug with task_sg chained transport_free_dev_tasks release\n [SCSI] target: Fix interrupt context bug with stats_lock and core_tmr_alloc_req\n ...\n" }, { "commit": "2a56d2220284b0e4dd8569fa475d7053f1c40a63", "tree": "96f959486a2f31db599e5f97167074bd1ecb3dc6", "parents": [ "46f2cc80514e389bacfb642a32a4181fa1f1d20b", "239df0fd5ee25588f8a5ba7f7ee646940cc403f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 19:51:32 2011 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 27 19:51:32 2011 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (45 commits)\n ARM: 6945/1: Add unwinding support for division functions\n ARM: kill pmd_off()\n ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks\n ARM: 6943/1: mm: use TTBR1 instead of reserved context ID\n ARM: 6942/1: mm: make TTBR1 always point to swapper_pg_dir on ARMv6/7\n ARM: 6941/1: cache: ensure MVA is cacheline aligned in flush_kern_dcache_area\n ARM: add sendmmsg syscall\n ARM: 6863/1: allow hotplug on msm\n ARM: 6832/1: mmci: support for ST-Ericsson db8500v2\n ARM: 6830/1: mach-ux500: force PrimeCell revisions\n ARM: 6829/1: amba: make hardcoded periphid override hardware\n ARM: 6828/1: mach-ux500: delete SSP PrimeCell ID\n ARM: 6827/1: mach-netx: delete hardcoded periphid\n ARM: 6940/1: fiq: Briefly document driver responsibilities for suspend/resume\n ARM: 6938/1: fiq: Refactor {get,set}_fiq_regs() for Thumb-2\n ARM: 6914/1: sparsemem: fix highmem detection when using SPARSEMEM\n ARM: 6913/1: sparsemem: allow pfn_valid to be overridden when using SPARSEMEM\n at91: drop at572d940hf support\n at91rm9200: introduce at91rm9200_set_type to specficy cpu package\n at91: drop boot_params and PLAT_PHYS_OFFSET\n ...\n" } ], "next": "bc786ccead15262a12bd673ed7a5afa6cbf0edcf" }