)]}' { "log": [ { "commit": "c031d52cac3fa4b05cf59cd03e9328790f4d4496", "tree": "2eb148d3be46779ea30d221c10c3e67b4e31d9ed", "parents": [ "c1c0cbb8781e4b684a3d902d05b01912b3a545d9", "ba9e9f3c08a5b58c1ffacf0cc6fb703ab0fa55ff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 03 16:08:36 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Feb 03 16:08:36 2010 -0800" }, "message": "Merge branch \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6\n\n* \u0027v4l_for_linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:\n saa7146: stop DMA before de-allocating DMA scatter/gather page buffers\n V4L/DVB: saa7134: remove stray unlock_kernel\n" }, { "commit": "2a2a5660f10a468016fed594ab09d77ef0bb6079", "tree": "7990efd295869854bfb3de100628206c3682dbf9", "parents": [ "ca0bf64d99f6e3f6e2fe2585e52a0ac57354beac", "f98bfbd78c37c5946cc53089da32a5f741efdeb7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 18:11:52 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 18:11:52 2010 -0800" }, "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: (23 commits)\n connector: Delete buggy notification code.\n be2net: use eq-id to calculate cev-isr reg offset\n Bluetooth: Use the control channel for raw HID reports\n Bluetooth: Add DFU driver for Atheros Bluetooth chipset AR3011\n Bluetooth: Redo checks in IRQ handler for shared IRQ support\n Bluetooth: Fix memory leak in L2CAP\n Bluetooth: Remove double free of SKB pointer in L2CAP\n cdc_ether: Partially revert \"usbnet: Set link down initially ...\"\n be2net: Fix memset() arg ordering.\n bonding: bond_open error return value\n ixgbe: if ixgbe_copy_dcb_cfg is going to fail learn about it early\n ixgbe: set the correct DCB bit for pg tx settings\n igbvf: fix issue w/ mapped_as_page being left set after unmap\n drivers/net: ks8851_mll ethernet network driver\n be2net: Bug fix to support newer generation of BE ASIC\n starfire: clean up properly if firmware loading fails\n mac80211: fix NULL pointer dereference when ftrace is enabled\n netfilter: ctnetlink: fix expectation mask dump\n ipv6: conntrack: Add member of user to nf_ct_frag6_queue structure\n ath9k: fix eeprom INI values override for 2GHz-only cards\n ...\n" }, { "commit": "ca0bf64d99f6e3f6e2fe2585e52a0ac57354beac", "tree": "a1b7b9120f3f5bd8f5abfe5e0762e56867c02c1b", "parents": [ "ea0854170c95245a258b386c7a9314399c949fe0" ], "author": { "name": "Thadeu Lima de Souza Cascardo", "email": "cascardo@holoscopio.com", "time": "Tue Feb 02 13:44:17 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 18:11:23 2010 -0800" }, "message": "pktcdvd: removing device does not remove its sysfs dir\n\nThis is the counterpart to cba767175becadc5c4016cceb7bfdd2c7fe722f4\n(\"pktcdvd: remove broken dev_t export of class devices\"). Device is not\nregistered using dev_t, so it should not be destroyed using device_destroy\nwhich looks up the device by dev_t. This will fail and adding the device\nagain will fail with the \"duplicate name\" error. This is fixed using\ndevice_unregister instead of device_destroy.\n\nSigned-off-by: Thadeu Lima de Souza Cascardo \u003ccascardo@holoscopio.com\u003e\nCc: Kay Sievers \u003ckay.sievers@vrfy.org\u003e\nCc: Peter Osterlund \u003cpetero2@telia.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Jens Axboe \u003cjens.axboe@oracle.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "03eac7bb882a75e6ee5705288f7ec36ad2e7d0d5", "tree": "893948c6d009ccbce351be43a81a1c9662ab8478", "parents": [ "1ec562035ba64e724652cb12b8a770b3906e9bf5" ], "author": { "name": "Richard Röjfors", "email": "richard.rojfors@pelagicore.com", "time": "Tue Feb 02 13:44:12 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 18:11:22 2010 -0800" }, "message": "uartlite: fix crash when using as console\n\nMove the ulite_console_setup to the .devinit section since it might be\ncalled on probe, which is in devinit. Fixes the crash below where the\nuartlite hw is probed after the .init section is freed from the kernel.\n\nuartlite: ttyUL0 at MMIO 0xc8000100 (irq \u003d 30) is a uartlite\nBUG: unable to handle kernel NULL pointer dereference at (null)\nIP: [\u003cc176720e\u003e] ulite_console_setup+0x6f/0xa8\n*pdpt \u003d 0000000036fb0001 *pde \u003d 0000000000000000\nOops: 0000 [#1] PREEMPT SMP\nlast sysfs file: /sys/devices/pci0000:00/0000:00:1f.1/host0/uevent\nModules linked in: puffin(+) serio_raw\n\nPid: 151, comm: modprobe Not tainted (2.6.31.5-1.0.b1-b1 #1) POULSBO\nEIP: 0060:[\u003cc176720e\u003e] EFLAGS: 00010246 CPU: 0\nEIP is at ulite_console_setup+0x6f/0xa8\nEAX: c16ec824 EBX: c16ec824 ECX: c176719f EDX: 00000000\nESI: 00000000 EDI: c17b42c4 EBP: f6fd1cf0 ESP: f6fd1cd8\n DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068\nProcess modprobe (pid: 151, ti\u003df6fd0000 task\u003df6fa1020 task.ti\u003df6fd0000)\nStack:\n c1031f51 00000000 00000000 00000246 c182237c f7742000 f6fd1d5c c11fd316\n\u003c0\u003e c16ec85c f77420d4 0000001e 00000000 00000000 c1633e78 4f494d4d 63783020\n\u003c0\u003e 30303038 00303031 f6fd1d3c c10e0786 f6fd1d48 00000000 f6fd1d48 00000000\nCall Trace:\n [\u003cc1031f51\u003e] ? register_console+0xf6/0x1fc\n [\u003cc11fd316\u003e] ? uart_add_one_port+0x237/0x2bb\n [\u003cc10e0786\u003e] ? sysfs_add_one+0x13/0xd3\n [\u003cc10e142f\u003e] ? sysfs_do_create_link+0xba/0xfc\n [\u003cc146f200\u003e] ? ulite_probe+0x198/0x1eb\n [\u003cc12064ee\u003e] ? platform_drv_probe+0xc/0xe\n [\u003cc120597b\u003e] ? driver_probe_device+0x79/0x105\n [\u003cc1205a8e\u003e] ? __device_attach+0x28/0x30\n [\u003cc120511f\u003e] ? bus_for_each_drv+0x3d/0x67\n [\u003cc1205af9\u003e] ? device_attach+0x44/0x58\n [\u003cc1205a66\u003e] ? __device_attach+0x0/0x30\n [\u003cc1204fb8\u003e] ? bus_probe_device+0x1f/0x34\n [\u003cc1203e68\u003e] ? device_add+0x385/0x4c0\n [\u003cc148491f\u003e] ? _write_unlock+0x8/0x1f\n [\u003cc1206aac\u003e] ? platform_device_add+0xd9/0x11c\n [\u003cc120c685\u003e] ? mfd_add_devices+0x165/0x1bc\n [\u003cf831b378\u003e] ? puffin_probe+0x2d0/0x390 [puffin]\n [\u003cc11a08ef\u003e] ? pci_match_device+0xa0/0xa7\n [\u003cc11a07bc\u003e] ? local_pci_probe+0xe/0x10\n [\u003cc11a11db\u003e] ? pci_device_probe+0x43/0x66\n [\u003cc120597b\u003e] ? driver_probe_device+0x79/0x105\n [\u003cc1205a4a\u003e] ? __driver_attach+0x43/0x5f\n [\u003cc120535d\u003e] ? bus_for_each_dev+0x3d/0x67\n [\u003cc1205852\u003e] ? driver_attach+0x14/0x16\n [\u003cc1205a07\u003e] ? __driver_attach+0x0/0x5f\n [\u003cc1204dea\u003e] ? bus_add_driver+0xf9/0x220\n [\u003cc1205c8f\u003e] ? driver_register+0x8b/0xeb\n [\u003cc11a1518\u003e] ? __pci_register_driver+0x43/0x9f\n [\u003cc10477ef\u003e] ? __blocking_notifier_call_chain+0x40/0x4c\n [\u003cf831f000\u003e] ? puffin_init+0x0/0x48 [puffin]\n [\u003cf831f017\u003e] ? puffin_init+0x17/0x48 [puffin]\n [\u003cc1001139\u003e] ? do_one_initcall+0x4c/0x131\n [\u003cc105607b\u003e] ? sys_init_module+0xa7/0x1b7\n [\u003cc1002a61\u003e] ? syscall_call+0x7/0xb\n Code: 6e 74 00 00 00 92 33 00 00 18 00 0e 01 73 79 6e 63 65 2d 72 65 67 69 73 74 72 79 0c 00 49 32\n00 00 14 00 09 01 61 6c 73 61 2d 69 \u003c6e\u003e 66 6f 00 00 00 42 37 00 00 10 00 07 01 6b 69 6c 6c 61 6c 6c\nEIP: [\u003cc176720e\u003e] ulite_console_setup+0x6f/0xa8 SS:ESP 0068:f6fd1cd8\nCR2: 0000000000000000\n\nSigned-off-by: Richard Röjfors \u003crichard.rojfors@pelagicore.com\u003e\nAcked-by: Peter Korsgaard \u003cjacmet@sunsite.dk\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1ec562035ba64e724652cb12b8a770b3906e9bf5", "tree": "639849e4d40b124f84fd36d166187a7cee87b06d", "parents": [ "4528fd0595847c2078b59f24800e751c2d6b7e41" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Tue Feb 02 13:44:10 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 18:11:22 2010 -0800" }, "message": "imxfb: correct location of callbacks in suspend and resume\n\nThe probe function passes a pointer to a struct fb_info to\nplatform_set_drvdata(), so don\u0027t interpret the return value of\nplatform_get_drvdata() as a pointer to struct imxfb_info.\n\nThe original imxfb_info *fbi backlight_power was NULL but in imxfb_suspend\nit was 4 resulting in an oops as imxfb_suspend calls\nimxfb_disable_controller(fbi) which in turn has\n\n\tif (fbi-\u003ebacklight_power)\n\t\t\tfbi-\u003ebacklight_power(0);\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nAcked-by: Sascha Hauer \u003ckernel@pengutronix.de\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c85e9a97c4102ce2e83112da850d838cfab5ab13", "tree": "7c3216be064c82eb2c7793d3d078d45a3bfc6f4c", "parents": [ "325fda71d0badc1073dc59f12a948f24ff05796a" ], "author": { "name": "Wu Fengguang", "email": "fengguang.wu@intel.com", "time": "Tue Feb 02 13:44:06 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 18:11:22 2010 -0800" }, "message": "devmem: fix kmem write bug on memory holes\n\nwrite_kmem() used to assume vwrite() always return the full buffer length.\nHowever now vwrite() could return 0 to indicate memory hole. This\ncreates a bug that \"buf\" is not advanced accordingly.\n\nFix it to simply ignore the return value, hence the memory hole.\n\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "325fda71d0badc1073dc59f12a948f24ff05796a", "tree": "b143817aba0e8c0d9b4b689bde32fa893a9fb559", "parents": [ "931e80e4b3263db75c8e34f078d22f11bbabd3a3" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Tue Feb 02 13:44:05 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 18:11:22 2010 -0800" }, "message": "devmem: check vmalloc address on kmem read/write\n\nOtherwise vmalloc_to_page() will BUG().\n\nThis also makes the kmem read/write implementation aligned with mem(4):\n\"References to nonexistent locations cause errors to be returned.\" Here we\nreturn -ENXIO (inspired by Hugh) if no bytes have been transfered to/from\nuser space, otherwise return partial read/write results.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nSigned-off-by: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nCc: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f4b5162820de60204afa5c8639335f4931b7fb0c", "tree": "02b51d90f98856f5d888930f5f851df988f758e8", "parents": [ "b3cb53721890879d7bde31f5f9eefd4edf41ab64" ], "author": { "name": "Sergey Matyukevich", "email": "geomatsi@gmail.com", "time": "Tue Feb 02 13:43:59 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 18:11:21 2010 -0800" }, "message": "rtc-fm3130: add missing braces\n\nAdd missing braces for multiline \u0027if\u0027 statements in fm3130_probe.\n\nSigned-off-by: Sergey Matyukevich \u003cgeomatsi@gmail.com\u003e\nSigned-off-by: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nCc: Sergey Lapin \u003cslapin@ossfans.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b3cb53721890879d7bde31f5f9eefd4edf41ab64", "tree": "5d1ead5aef27af84e332cdb3c0ed9d75c18472f7", "parents": [ "859ddf09743a8cc680af33f7259ccd0fd36bfe9d" ], "author": { "name": "Alberto Panizzo", "email": "maramaopercheseimorto@gmail.com", "time": "Tue Feb 02 13:43:59 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 18:11:21 2010 -0800" }, "message": "mx3fb: some debug and initialisation fixes\n\nFix the kernel oops when dev_dbg is called with mx3_fbi-\u003etxd \u003d\u003d NULL\n\nFix the late initialisation of mx3fb-\u003ebacklight_level. If not, in the\nchain of function started by init_fb_chan(), in __blank() call\nsdc_set_brightness(mx3fb, mx3fb-\u003ebacklight_level) that will shut down the\nCONTRAST PWM output.\n\nSigned-off-by: Alberto Panizzo \u003cmaramaopercheseimorto@gmail.com\u003e\nAcked-by: Guennadi Liakhovetski \u003cg.liakhovetski \u003cat\u003e gmx.de\u003e\nCc: Sascha Hauer \u003cs.hauer@pengutronix.de\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f98bfbd78c37c5946cc53089da32a5f741efdeb7", "tree": "885c756a95f28d4d00868f6eb06ab9c45f11b2e2", "parents": [ "a4c89051c83693e6cd5655b90300ec23a35e04f1" ], "author": { "name": "Evgeniy Polyakov", "email": "zbr@ioremap.net", "time": "Tue Feb 02 15:58:48 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 02 15:58:48 2010 -0800" }, "message": "connector: Delete buggy notification code.\n\nOn Tue, Feb 02, 2010 at 02:57:14PM -0800, Greg KH (gregkh@suse.de) wrote:\n\u003e \u003e There are at least two ways to fix it: using a big cannon and a small\n\u003e \u003e one. The former way is to disable notification registration, since it is\n\u003e \u003e not used by anyone at all. Second way is to check whether calling\n\u003e \u003e process is root and its destination group is -1 (kind of priveledged\n\u003e \u003e one) before command is dispatched to workqueue.\n\u003e \n\u003e Well if no one is using it, removing it makes the most sense, right?\n\u003e \n\u003e No objection from me, care to make up a patch either way for this?\n\nGetting it is not used, let\u0027s drop support for notifications about\n(un)registered events from connector.\nAnother option was to check credentials on receiving, but we can always\nrestore it without bugs if needed, but genetlink has a wider code base\nand none complained, that userspace can not get notification when some\nother clients were (un)registered.\n\nKudos for Sebastian Krahmer \u003ckrahmer@suse.de\u003e, who found a bug in the\ncode.\n\nSigned-off-by: Evgeniy Polyakov \u003czbr@ioremap.net\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1a45dcfe2525e9432cb4aba461d4994fc2befe42", "tree": "9df1443950d3bf64de2efd23878065b0a4760f61", "parents": [ "02b709df817c0db174f249cc59e5f7fd01b64d92", "1efe8fe1c2240acc476bed77740883df63373862" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 12:54:37 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 12:54:37 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-linus\u0027 of git://git.kernel.dk/linux-2.6-block:\n cfq-iosched: Do not idle on async queues\n blk-cgroup: Fix potential deadlock in blk-cgroup\n block: fix bugs in bio-integrity mempool usage\n block: fix bio_add_page for non trivial merge_bvec_fn case\n drbd: null dereference bug\n drbd: fix max_segment_size initialization\n" }, { "commit": "489b24f2cbdcc1c93f55a2707733bba702ba8dbf", "tree": "338a574de2e7913a3057f148b047f5ce37d31ba6", "parents": [ "4dab75ec3ebf28583fc902ac946b287b5acdbcad", "cd1510cb5f892907fe1a662f90b41fb3a42954e0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 12:48:49 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Feb 02 12:48:49 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:\n random: Remove unused inode variable\n crypto: padlock-sha - Add import/export support\n random: drop weird m_time/a_time manipulation\n" }, { "commit": "55bdeed9f67a92f184e1ddcdd722e622d9dd10c6", "tree": "2eb034830274c6e2be764dc511fea61772e39147", "parents": [ "1e98cadb0d2b9f945f35beee4a0ce667f3c6dbe4" ], "author": { "name": "Sathya Perla", "email": "sathyap@serverengines.com", "time": "Tue Feb 02 07:48:40 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Feb 02 07:48:40 2010 -0800" }, "message": "be2net: use eq-id to calculate cev-isr reg offset\n\ncev-isr reg offset for each function is better calculated using (any) eq-id\nalloted to that function instead of using pci-func number(which\ndoes not work in some configurations...)\n\nSigned-off-by: Sathya Perla \u003csathyap@serverengines.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e5ff15bec96ba18698dae5de0bbf7e6a0653ca65", "tree": "d311f375b0297dc4e92c09a50f175de0979241a8", "parents": [ "e8708ef7e86a463b3a5b01d4a9abf16c8748b464" ], "author": { "name": "Magnus Damm", "email": "damm@opensource.se", "time": "Wed Jan 27 07:41:19 2010 +0000" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Feb 02 11:30:45 2010 +0900" }, "message": "usb: r8a66597-hdc disable interrupts fix\n\nThis patch improves disable_controller() in the r8a66597-hdc\ndriver to disable all interrupts and clear status flags. It\nalso makes sure that disable_controller() is called during\nprobe(). This fixes the relatively rare case of unexpected\npending interrupts after kexec reboot.\n\nSigned-off-by: Magnus Damm \u003cdamm@opensource.se\u003e\nAcked-by: Yoshihiro Shimoda \u003cshimoda.yoshihiro@renesas.com\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "e8708ef7e86a463b3a5b01d4a9abf16c8748b464", "tree": "38ef7ec68597da137f49a3e67886503afca82234", "parents": [ "ab658321f32770b903a4426e2a6fae0392757755" ], "author": { "name": "Markus Pietrek", "email": "Markus.Pietrek@emtrion.de", "time": "Tue Feb 02 11:29:15 2010 +0900" }, "committer": { "name": "Paul Mundt", "email": "lethal@linux-sh.org", "time": "Tue Feb 02 11:29:15 2010 +0900" }, "message": "spi: spi_sh_msiof: Fixed data sampling on the correct edge\n\nThe spi_sh_msiof.c driver presently misconfigures REDG and TEDG. TEDG\u003d\u003d0\noutputs data at the **rising edge** of the clock and REDG\u003d\u003d0 samples data\nat the **falling edge** of the clock. Therefore for SPI, TEDG must be\nequal to REDG, otherwise the last byte received is not sampled in SPI\nmode 3.\n\nThis brings the driver in line with the SH7723 HW Reference Manual\nsettings documented in Figures 20.20 and 20.21 (\"SPI Clock and data\ntiming\").\n\nSigned-off-by: Markus Pietrek \u003cMarkus.Pietrek@emtrion.de\u003e\nAcked-by: Magnus Damm \u003cdamm@opensource.se\u003e\nSigned-off-by: Paul Mundt \u003clethal@linux-sh.org\u003e\n" }, { "commit": "ba9e9f3c08a5b58c1ffacf0cc6fb703ab0fa55ff", "tree": "911a4e9dea6e28754768f2443a7cedff2fcbb68e", "parents": [ "7415c7602ddb14a9a9c39bc8c38afa667092a527" ], "author": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Mon Feb 01 21:23:46 2010 -0200" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Mon Feb 01 22:02:03 2010 -0200" }, "message": "saa7146: stop DMA before de-allocating DMA scatter/gather page buffers\n\nThanks-to: Hartmut \u003ce9hack@googlemail.com\u003e for pointing me the problem\nand testing the fix.\n\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "cd1510cb5f892907fe1a662f90b41fb3a42954e0", "tree": "7243a56629a53f048e07cdc41e3c8d324036b07d", "parents": [ "a8d7ac279743077965afeca0c9ed748507b68e89" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Feb 01 21:48:28 2010 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Feb 02 06:50:27 2010 +1100" }, "message": "random: Remove unused inode variable\n\nThe previous changeset left behind an unused inode variable.\nThis patch removes it.\n\nReported-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "a8d7ac279743077965afeca0c9ed748507b68e89", "tree": "d5bf192117944ba3c461fcd586c470c0713f3191", "parents": [ "a996996dd75a9086b12d1cb4010f26e1748993f0" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Feb 01 09:17:56 2010 +1100" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Feb 02 06:50:25 2010 +1100" }, "message": "crypto: padlock-sha - Add import/export support\n\nAs the padlock driver for SHA uses a software fallback to perform\npartial hashing, it must implement custom import/export functions.\nOtherwise hmac which depends on import/export for prehashing will\nnot work with padlock-sha.\n\nReported-by: Wolfgang Walter \u003cwolfgang.walter@stwm.de\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "a996996dd75a9086b12d1cb4010f26e1748993f0", "tree": "3a65c1d6636f24e3edc175b54fabfdfd1fed91ef", "parents": [ "92dcffb916d309aa01778bf8963a6932e4014d07" ], "author": { "name": "Matt Mackall", "email": "mpm@selenic.com", "time": "Fri Jan 29 21:50:36 2010 +1300" }, "committer": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Tue Feb 02 06:50:23 2010 +1100" }, "message": "random: drop weird m_time/a_time manipulation\n\nNo other driver does anything remotely like this that I know of except\nfor the tty drivers, and I can\u0027t see any reason for random/urandom to do\nit. In fact, it\u0027s a (trivial, harmless) timing information leak. And\nobviously, it generates power- and flash-cycle wasting I/O, especially\nif combined with something like hwrngd. Also, it breaks ubifs\u0027s\nexpectations.\n\nSigned-off-by: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\n" }, { "commit": "9ce929078af868ce5f5b0b3537184dad642fba43", "tree": "8d61d65f46ba894bbc346f5e0cfde72e7b2308de", "parents": [ "13af75740f345a5ddb5f7020a688c0f96b0d9f1f", "17aafccab4352b422aa01fa6ebf82daff693a5b3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:46:49 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:46:49 2010 -0800" }, "message": "Merge branch \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:\n drm/radeon/kms: Fix oops after radeon_cs_parser_init() failure.\n drm/radeon/kms: move radeon KMS on/off switch out of staging.\n drm/radeon/kms: Bailout of blit if error happen \u0026 protect with mutex V3\n drm/vmwgfx: Don\u0027t send bad flags to the host\n drm/vmwgfx: Request SVGA version 2 and bail if not found\n drm/vmwgfx: Correctly detect 3D\n drm/ttm: remove unnecessary save_flags and ttm_flag_masked in ttm_bo_util.c\n drm/kms: Remove incorrect comment in struct drm_mode_modeinfo\n drm/ttm: remove padding from ttm_ref_object on 64bit builds\n drm/radeon/kms: release agp on error.\n drm/kms/radeon/agp: Move the check of the aper_size after drm_acp_acquire and drm_agp_info\n drm/kms/radeon/agp: Fix warning, format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’\n drm/ttm: Avoid conflicting reserve_memtype during ttm_tt_set_page_caching.\n drm/kms/radeon: pick digitial encoders smarter. (v3)\n drm/radeon/kms: use active device to pick connector for encoder\n drm/radeon/kms: fix incorrect logic in DP vs eDP connector checking.\n" }, { "commit": "4ca5ded2bdc09259ad89915bac2d218e72cda351", "tree": "0091afa0c67c4f111cf1840a4500a74763a23d08", "parents": [ "ed23690d507c557d048255c683af1e9d228bfbe1", "61684ceaad4f65d1a9832c722f7bd5e7fc714de9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:42:35 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:42:35 2010 -0800" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86/agp: Fix agp_amd64_init regression\n x86: Add quirk for Intel DG45FC board to avoid low memory corruption\n x86: Add Dell OptiPlex 760 reboot quirk\n x86, UV: Fix RTC latency bug by reading replicated cachelines\n oprofile/x86: add Xeon 7500 series support\n oprofile/x86: fix crash when profiling more than 28 events\n lib/dma-debug.c: mark file-local struct symbol static.\n x86/amd-iommu: Fix deassignment of a device from the pt_domain\n x86/amd-iommu: Fix IOMMU-API initialization for iommu\u003dpt\n x86/amd-iommu: Fix NULL pointer dereference in __detach_device()\n x86/amd-iommu: Fix possible integer overflow\n" }, { "commit": "ed23690d507c557d048255c683af1e9d228bfbe1", "tree": "06e7ba68253ea82b1fd67d94241a8f800e3337ee", "parents": [ "32337f8a7020676b5fd6387def9ccb9060440c5c", "a2fad9bf26a1d44a8d31a5c4528108a2b9f468ab" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:42:08 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:42:08 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6:\n regulator: Specify REGULATOR_CHANGE_STATUS for WM835x LED constraints\n" }, { "commit": "32337f8a7020676b5fd6387def9ccb9060440c5c", "tree": "7688f053cc9a3be1e99a492c33b85473cd57c859", "parents": [ "abe94c756c08d50566c09a65b9c7fe72f83071c5", "94f28da8409c6059135e89ac64a0839993124155" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:37:58 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Feb 01 10:37:58 2010 -0800" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:\n powerpc: TIF_ABI_PENDING bit removal\n powerpc/pseries: Fix xics build without CONFIG_SMP\n powerpc/4xx: Add pcix type 1 transactions\n powerpc/pci: Add missing call to header fixup\n powerpc/pci: Add missing hookup to pci_slot\n powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge()\n powerpc/40x: Update the PowerPC 40x board defconfigs\n powerpc/44x: Update PowerPC 44x board defconfigs\n" }, { "commit": "a2fad9bf26a1d44a8d31a5c4528108a2b9f468ab", "tree": "cc9bfa3cae59bc03bc4d9a448c32402403485516", "parents": [ "abe94c756c08d50566c09a65b9c7fe72f83071c5" ], "author": { "name": "Mark Brown", "email": "broonie@opensource.wolfsonmicro.com", "time": "Mon Jan 04 15:30:54 2010 +0000" }, "committer": { "name": "Liam Girdwood", "email": "lrg@slimlogic.co.uk", "time": "Mon Feb 01 13:52:44 2010 +0000" }, "message": "regulator: Specify REGULATOR_CHANGE_STATUS for WM835x LED constraints\n\nThe WM8350 LED driver needs to be able to enable and disable the\nregulators it is using. Previously the core wasn\u0027t properly enforcing\nstatus change constraints so the driver was able to function but this\nhas always been intended to be required.\n\nSigned-off-by: Mark Brown \u003cbroonie@opensource.wolfsonmicro.com\u003e\nCc: stable@kernel.org\nSigned-off-by: Liam Girdwood \u003clrg@slimlogic.co.uk\u003e\n" }, { "commit": "1e98cadb0d2b9f945f35beee4a0ce667f3c6dbe4", "tree": "0b5940be30331d461cd4421abe7829b392ab6e62", "parents": [ "71cc1fa9f2d71eb2eba9b8e71e27cff9863e55f3", "6bf8268f9a91f1065c99503161ebd061492bebe3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 31 23:34:58 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 31 23:34:58 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6\n" }, { "commit": "17aafccab4352b422aa01fa6ebf82daff693a5b3", "tree": "cee643823053ccdaad63ee84e1c0a9e43f233ca0", "parents": [ "f71d0187987e691516cd10c2702f002c0e2f0edc" ], "author": { "name": "Michel Dänzer", "email": "daenzer@vmware.com", "time": "Fri Jan 22 09:20:00 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 12:49:28 2010 +1000" }, "message": "drm/radeon/kms: Fix oops after radeon_cs_parser_init() failure.\n\nIf radeon_cs_parser_init() fails, radeon_cs_ioctl() calls\nradeon_cs_parser_fini() with the non-zero error value. The latter dereferenced\nparser-\u003eib which hasn\u0027t been initialized yet -\u003e boom. Add a test for parser-\u003eib\nbeing non-NULL before dereferencing it.\n\nSigned-off-by: Michel Dänzer \u003cdaenzer@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f71d0187987e691516cd10c2702f002c0e2f0edc", "tree": "0fe6da59d5abd5e292e1f02eaa5580b284b90e41", "parents": [ "ff82f052d2a187dd0fa0e431ba70eb457c71a40e" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:35:47 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:35:47 2010 +1000" }, "message": "drm/radeon/kms: move radeon KMS on/off switch out of staging.\n\nWe are happy enough that the KMS driver is stable enough for enough people\nfor the kms enable/disable to leave staging. Distros can now contemplate\nturning this on.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "ff82f052d2a187dd0fa0e431ba70eb457c71a40e", "tree": "65bf2788445c3087cdb6c05fe2d40e81629ffd3b", "parents": [ "5ffdb658f605cbc420944e7c7eeec9fbb8a73772" ], "author": { "name": "Jerome Glisse", "email": "jglisse@redhat.com", "time": "Fri Jan 22 15:19:00 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:33:11 2010 +1000" }, "message": "drm/radeon/kms: Bailout of blit if error happen \u0026 protect with mutex V3\n\nIf an error happen in r600_blit_prepare_copy report it rather\nthan WARNING and keeping execution. For instance if ib allocation\nfailed we did just warn about but then latter tried to access\nNULL ib ptr causing oops. This patch also protect r600_copy_blit\nwith a mutex as otherwise one process might overwrite blit temporary\ndata with new one possibly leading to GPU lockup.\n\nShould partialy or totaly fix:\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d553279\n\nV2 failing blit initialization is not fatal, fallback to memcpy when\nthis happen\nV3 init blit before startup as we pin in startup, remove duplicate\ncode (this one was actualy tested unlike V2)\n\nSigned-off-by: Jerome Glisse \u003cjglisse@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5ffdb658f605cbc420944e7c7eeec9fbb8a73772", "tree": "9f091b311f1c434f506d4c34ce373346a77d895b", "parents": [ "c188660f6dbb0df9febe1b841a16c66c28353c15" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Sat Jan 30 03:38:08 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:29:59 2010 +1000" }, "message": "drm/vmwgfx: Don\u0027t send bad flags to the host\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "c188660f6dbb0df9febe1b841a16c66c28353c15", "tree": "268604303fd2f2336a686c093fc0165f6cf4fc1d", "parents": [ "8e19a951774a16cf2626292ae06fd2b62630e67e" ], "author": { "name": "Peter Hanzel", "email": "hanzelpeter@gmail.com", "time": "Sat Jan 30 03:38:07 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:29:31 2010 +1000" }, "message": "drm/vmwgfx: Request SVGA version 2 and bail if not found\n\nThis fixes the driver not loading on older versions of VMware.\n\nSigned-off-by: Peter Hanzel \u003chanzelpeter@gmail.com\u003e\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "8e19a951774a16cf2626292ae06fd2b62630e67e", "tree": "b1abc1cf6c493200d45663f71b1ff59ab3cd9477", "parents": [ "110b20c3ddcfa98cc932aef3af2d59b4e0841f08" ], "author": { "name": "Jakob Bornecrantz", "email": "jakob@vmware.com", "time": "Sat Jan 30 03:38:06 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:29:03 2010 +1000" }, "message": "drm/vmwgfx: Correctly detect 3D\n\nSigned-off-by: Jakob Bornecrantz \u003cjakob@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "110b20c3ddcfa98cc932aef3af2d59b4e0841f08", "tree": "26e4a4a91b823a2caed67c12b2e5e812a068abe0", "parents": [ "fa5829b36539067f3c675f5d437531dedcfc4ad8" ], "author": { "name": "Austin Yuan", "email": "shengquan.yuan@gmail.com", "time": "Thu Jan 21 13:45:40 2010 +0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:27:25 2010 +1000" }, "message": "drm/ttm: remove unnecessary save_flags and ttm_flag_masked in ttm_bo_util.c\n\nSigned-off-by: Austin Yuan \u003cshengquan.yuan@gmail.com\u003e\nAcked-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "dd5fde6041d7ea30fcfedcc159a4cec8b01f73b2", "tree": "d0a0331461928ef4d755775b1cedd86d5bcc03c6", "parents": [ "4b866288be6ffaefaad9cec212cb09e3258a68ee" ], "author": { "name": "Richard Kennedy", "email": "richard@rsk.demon.co.uk", "time": "Tue Jan 26 17:10:48 2010 +0000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:24:50 2010 +1000" }, "message": "drm/ttm: remove padding from ttm_ref_object on 64bit builds\n\nRe-order structure ttm_ref_object to remove 8 bytes of alignment padding\non 64 bit builds, so shrinking its size from 72 to 64 bytes allowing it\nto fit into a smaller slab.\n\nSigned-off-by: Richard Kennedy \u003crichard@rsk.demon.co.uk\u003e\nAcked-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "4b866288be6ffaefaad9cec212cb09e3258a68ee", "tree": "81317f5c119f6429324118bb5db9a658d429e224", "parents": [ "2dea2e29b9fad48c759aa406b5ea426bff4339af" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:22:10 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:22:10 2010 +1000" }, "message": "drm/radeon/kms: release agp on error.\n\nif we get an error, release the AGP if we\u0027ve acquired it already.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "2dea2e29b9fad48c759aa406b5ea426bff4339af", "tree": "df7ef0a169d7bb96b326595affef6836e9f588d7", "parents": [ "cdb6e375c3c84558ed2c13c5461b22e8f7b7980e" ], "author": { "name": "John Kacur", "email": "jkacur@redhat.com", "time": "Sun Jan 31 20:38:03 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:19:31 2010 +1000" }, "message": "drm/kms/radeon/agp: Move the check of the aper_size after drm_acp_acquire and drm_agp_info\n\nFirst call drm_agp_acquire to check if agp has been acquired.\nSecond call drm_agp_info to fill in the info data struct, including aper_size.\nFinally do the check to see if the aper_size makes sense.\n\nSigned-off-by: John Kacur \u003cjkacur@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "cdb6e375c3c84558ed2c13c5461b22e8f7b7980e", "tree": "28474a8fd0bff4ea869aef387ddf2c680df54aec", "parents": [ "db78e27de7e29a6db6be7caf607cf803d84094aa" ], "author": { "name": "John Kacur", "email": "jkacur@redhat.com", "time": "Sun Jan 31 20:38:02 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:19:08 2010 +1000" }, "message": "drm/kms/radeon/agp: Fix warning, format ‘%d’ expects type ‘int’, but argument 4 has type ‘size_t’\n\n- Fix warning by using %zu instead of %d for size_t\n- Fix spelling mistake, \"to\" should be \"too\".\n\nSigned-off-by: John Kacur \u003cjkacur@redhat.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "db78e27de7e29a6db6be7caf607cf803d84094aa", "tree": "c387de94b95e444205361bc31ce59acd29b10aee", "parents": [ "f28cf33945cc112f8ee835512b7440905dc29ad2" ], "author": { "name": "Francisco Jerez", "email": "currojerez@riseup.net", "time": "Tue Jan 12 18:49:43 2010 +0100" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 11:15:37 2010 +1000" }, "message": "drm/ttm: Avoid conflicting reserve_memtype during ttm_tt_set_page_caching.\n\nFixes errors like:\n\u003e reserve_ram_pages_type failed 0x15b7a000-0x15b7b000, track 0x8, req 0x10\nwhen a BO is moved between WC and UC areas.\n\nReported-by: Xavier Chantry \u003cshiningxc@gmail.com\u003e\nSigned-off-by: Francisco Jerez \u003ccurrojerez@riseup.net\u003e\nAcked-by: Thomas Hellstrom \u003cthellstrom@vmware.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f28cf33945cc112f8ee835512b7440905dc29ad2", "tree": "dc824913b484b5f726f23692ff0e7e100f7a3e7a", "parents": [ "43c33ed87d0f1b900a6a3014db556ecc7f4a989b" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Thu Jan 28 17:15:25 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 10:13:15 2010 +1000" }, "message": "drm/kms/radeon: pick digitial encoders smarter. (v3)\n\nbooting a Lenovo W500 with LVDS + DP outputs showed up a TODO we had\non our list, to pick a correct digital encoder block. The LVTMA\nencoder requires the second digital encoder, all others can use any\nencoder at all.\n\nThis fixes the digital encoder selection logic to enable LVDS/DP combos\nto work okay.\n\nV2: fix silly addition of connector dig_block and cleanup the other\nplaces in the code that pick the encoder.\n\nV3: rename to dig_encoder and clean up further - also fix\nthe picking algorithm.\n\ntested on Lenovo W500 + desktop 3650 cards.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "43c33ed87d0f1b900a6a3014db556ecc7f4a989b", "tree": "b8280b52b5965111e6673ab4bc699cefa3e588d3", "parents": [ "97b94ccb9aa1b82ed7a9a045d0ae5b32c99b84a0" ], "author": { "name": "Dave Airlie", "email": "airlied@linux.ie", "time": "Fri Jan 29 15:55:30 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 10:12:26 2010 +1000" }, "message": "drm/radeon/kms: use active device to pick connector for encoder\n\nOn the W500 we have UNIPHY routed to both DVI and DP, this seems\nto always pick the DVI connector which means link training fails.\n\nSwitch to using active device to pick the connector, this seems\nlike it should be safe from a code review, and it fixes things\na bit more here.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "97b94ccb9aa1b82ed7a9a045d0ae5b32c99b84a0", "tree": "0b2a40ecd440ec9ed36b7ca282fab514cb2358cb", "parents": [ "7087e16286913b41ba9a5186360645b57b8508dd" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Fri Jan 29 15:31:47 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Feb 01 10:12:17 2010 +1000" }, "message": "drm/radeon/kms: fix incorrect logic in DP vs eDP connector checking.\n\nThis makes displayport work again here.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "61684ceaad4f65d1a9832c722f7bd5e7fc714de9", "tree": "8a2509f1582656759efbecf98037a6aaff8d128d", "parents": [ "7c099ce1575126395f186ecf58b51a60d5c3be7d" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Mon Jan 25 14:10:47 2010 +0900" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Sun Jan 31 07:52:26 2010 +0100" }, "message": "x86/agp: Fix agp_amd64_init regression\n\nThis fixes the regression introduced by commit\n42590a75019a50012f25a962246498dead428433 (\"x86/agp: Fix\nagp_amd64_init and agp_amd64_cleanup\").\n\nThe above commit changes agp_amd64_init() not to do anything if\ngart_iommu_aperture is not zero.\n\nIf GART iommu calls agp_amd64_init(), we need to skip\nagp_amd64_init() when it\u0027s called later via module_init.\n\nThe problem is that gart_iommu_init() calls agp_amd64_init()\nwith not zero gart_iommu_aperture so agp_amd64_init() is never\ninitialized.\n\nWhen gart_iommu_init() calls agp_amd64_init(), agp should be\nalways initialized.\n\nReported-by: Marin Mitov \u003cmitov@issp.bas.bg\u003e\nReported-by: Johannes Hirte \u003cjohannes.hirte@fem.tu-ilmenau.de\u003e\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nTested-by: Marin Mitov \u003cmitov@issp.bas.bg\u003e\nTested-by: Kevin Winchester \u003ckjwinchester@gmail.com\u003e\nCc: davej@redhat.com\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLKML-Reference: \u003c20100125141006O.fujita.tomonori@lab.ntt.co.jp\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9670d80a9a6e24725c4111bef5d6cc7786ad0dc5", "tree": "22cb112a77bb85cb297cb68bb5ac360b62358b61", "parents": [ "7427847d2d044d85f478757ea03165ae3cfe87c4" ], "author": { "name": "Vikram Kandukuri", "email": "vkandukuri@atheros.com", "time": "Wed Jan 06 19:04:15 2010 +0530" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Sat Jan 30 05:57:34 2010 -0800" }, "message": "Bluetooth: Add DFU driver for Atheros Bluetooth chipset AR3011\n\nSigned-off-by: Vikram Kandukuri \u003cvikram.kandukuri@atheros.com\u003e\nSigned-off-by: Alicke Xu \u003csxu@atheros.com\u003e\nReviewed-by: Luis R. Rodriguez \u003clrodriguez@atheros.com\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "7427847d2d044d85f478757ea03165ae3cfe87c4", "tree": "17c2da9c5dc61ccf4151065483a0751eb26f8dd8", "parents": [ "e420aba331f44de0eed6871441293a6124d566d1" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Mon Sep 14 13:43:49 2009 -0400" }, "committer": { "name": "Marcel Holtmann", "email": "marcel@holtmann.org", "time": "Sat Jan 30 05:57:26 2010 -0800" }, "message": "Bluetooth: Redo checks in IRQ handler for shared IRQ support\n\nCommit ac019360fe3 changed the irq handler logic to BUG_ON rather than\nreturning IRQ_NONE when the incoming argument is invalid. While this\nworks in most cases, it doesn\u0027t work when the IRQ is shared with other\ndevices (or when DEBUG_SHIRQ is enabled).\n\nSo revert the previous change and replace the warning message with a\ncomment explaining that we want this behavior.\n\nSigned-off-by: Michael Hennerich \u003cmichael.hennerich@analog.com\u003e\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: Marcel Holtmann \u003cmarcel@holtmann.org\u003e\n" }, { "commit": "7415c7602ddb14a9a9c39bc8c38afa667092a527", "tree": "b837c85e88d1979fd9fe9afcd9aa0c7e8625b88a", "parents": [ "92dcffb916d309aa01778bf8963a6932e4014d07" ], "author": { "name": "Hans Verkuil", "email": "hverkuil@xs4all.nl", "time": "Fri Jan 29 06:51:08 2010 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@redhat.com", "time": "Fri Jan 29 18:34:06 2010 -0200" }, "message": "V4L/DVB: saa7134: remove stray unlock_kernel\n\nAn earlier commit removed the lock_kernel/unlock_kernel pair but forgot\nto remove the unlock_kernel call in the cleanup path at the end of the\nfunction.\n\nSigned-off-by: Hans Verkuil \u003chverkuil@xs4all.nl\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@redhat.com\u003e\n" }, { "commit": "4995c0b3673c6be76e54b2c89479b1cdf29e69ca", "tree": "b4d48987207a77898d5c990e358c7390b8700253", "parents": [ "499a2673713c85734a54c37dd90b4b729de399c4" ], "author": { "name": "Dmitry Artamonow", "email": "mad_soft@inbox.ru", "time": "Sun Jan 24 00:20:20 2010 +0300" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@linux.intel.com", "time": "Fri Jan 29 21:03:09 2010 +0100" }, "message": "mfd: Fix asic3 build\n\nasic3 also needs tmio_core or otherwise will fail to build.\n\nSigned-off-by: Dmitry Artamonow \u003cmad_soft@inbox.ru\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@linux.intel.com\u003e\n" }, { "commit": "499a2673713c85734a54c37dd90b4b729de399c4", "tree": "426f8e4c7c792dad998beeefb094c439a81b776b", "parents": [ "a7016235a61d520e6806f38129001d935c4b6661", "f6bdc2303da6786cc22a7d24b6790e9f75b4cfdc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 29 11:15:32 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jan 29 11:15:32 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: update multi-touch protocol documentation\n Input: add the ABS_MT_PRESSURE event\n Input: winbond-cir - remove dmesg spam\n Input: lifebook - add another Lifebook DMI signature\n Input: ad7879 - support auxiliary GPIOs via gpiolib\n" }, { "commit": "cb6ecf6f7afece066265e243657b0ac28150a7b2", "tree": "063906ad19c8bd9d1796312723f8e77b9b7ad5e7", "parents": [ "93fb84b50fe03aabca8d9dea5d3ba521a07e8571" ], "author": { "name": "Henrik Rydberg", "email": "rydberg@euromail.se", "time": "Thu Jan 28 22:28:27 2010 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Jan 28 22:32:45 2010 -0800" }, "message": "Input: add the ABS_MT_PRESSURE event\n\nFor pressure-based multi-touch devices, a direct way to send sensor\nintensity data per finger is needed. This patch adds the ABS_MT_PRESSURE\nevent to the MT protocol.\n\nRequested-by: Yoonyoung Shim \u003cjy0922.shim@samsung.com\u003e\nRequested-by: Mika Kuoppala \u003cmika.kuoppala@nokia.com\u003e\nRequested-by: Peter Hutterer \u003cpeter.hutterer@who-t.net\u003e\nSigned-off-by: Henrik Rydberg \u003crydberg@euromail.se\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "93fb84b50fe03aabca8d9dea5d3ba521a07e8571", "tree": "9ad4cc5d086f14ce0348acce867c6d58f1a099d7", "parents": [ "57b5e2ae5b5f6b687ef2c644b1cb06bd217cdbe7" ], "author": { "name": "David Härdeman", "email": "david@hardeman.nu", "time": "Thu Jan 28 22:28:27 2010 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Jan 28 22:32:38 2010 -0800" }, "message": "Input: winbond-cir - remove dmesg spam\n\nI missed converting one dev_info call to deb_dbg before submitting the driver.\nWithout this change, a message will be printed to dmesg for each button press\nif a RC6 remote is used.\n\nSigned-off-by: David Härdeman \u003cdavid@hardeman.nu\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "bb209c8287d2d55ec4a67e3933346e0a3ee0da76", "tree": "2e444f273e631fa4dded4ee13ac779565e5efb43", "parents": [ "b04da8bfdfbbd79544cab2fadfdc12e87eb01600" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Tue Jan 26 17:10:03 2010 +0000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Fri Jan 29 16:51:10 2010 +1100" }, "message": "powerpc/pci: Add calls to set_pcie_port_type() and set_pcie_hotplug_bridge()\n\nWe are missing these when building the pci_dev from scratch off\nthe Open Firmware device-tree\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "71cc1fa9f2d71eb2eba9b8e71e27cff9863e55f3", "tree": "9a5236c71a37292b1d081b5869597787a131e294", "parents": [ "d291b9af1a1a12f59a464494900c6e0db26e2ec3" ], "author": { "name": "Ben Hutchings", "email": "ben@decadent.org.uk", "time": "Thu Jan 28 21:37:18 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 21:37:18 2010 -0800" }, "message": "cdc_ether: Partially revert \"usbnet: Set link down initially ...\"\n\nCommit 37e8273cd30592d3a82bcb70cbb1bdc4eaeb6b71 (\"usbnet: Set link down\ninitially for drivers that update link state\") changed the initial link\nstate in cdc_ether and other drivers based on the understanding that the\ndevices they support generate link change interrupts. However, this is\noptional in the CDC Ethernet protocol, and two users have reported in\n\u003chttp://bugzilla.kernel.org/show_bug.cgi?id\u003d14791\u003e that the link state\nfor their devices remains down. Therefore, revert the change in\ncdc_ether.\n\nSigned-off-by: Ben Hutchings \u003cben@decadent.org.uk\u003e\nTested-by: Avi Rozen \u003cavi.rozen@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "d291b9af1a1a12f59a464494900c6e0db26e2ec3", "tree": "5381b240523afd3ce8e7b369dea6bff41372eef3", "parents": [ "b473946a0853860e13b51c28add5524741117786" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 21:36:21 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 21:36:21 2010 -0800" }, "message": "be2net: Fix memset() arg ordering.\n\nNoticed by Ben Hutchings.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "64a028a6de08545a2c94f302bc7694bf48aee5b5", "tree": "d01fd905efb117cb5b00443464073a6539a23684", "parents": [ "3d29935ff0773fe466e957f17284ca777a2aaa89", "12e9a45609054fb83d4a8b716a5265cc1a393e10" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 18:48:53 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 18:48:53 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:\n Fix failure exit in ipathfs\n fix oops in fs/9p late mount failure\n fix leak in romfs_fill_super()\n get rid of pointless checks after simple_pin_fs()\n Fix failure exits in bfs_fill_super()\n fix affs parse_options()\n Fix remount races with symlink handling in affs\n Fix a leak in affs_fill_super()\n" }, { "commit": "3d29935ff0773fe466e957f17284ca777a2aaa89", "tree": "dcbadff76bb481124fe996e4103c138f1810e984", "parents": [ "474118d06d1d5053f27450224f0541219483ec69", "e8e06eae4ffd683931b928f460c11c40cd3f7fd8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 16:33:12 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 16:33:12 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:\n x86/PCI: remove IOH range fetching\n PCI: fix nested spinlock hang in aer_inject\n" }, { "commit": "551e28dbe82f9de58993d7587201a2569b942341", "tree": "8f14618a4f5f016d41eb5b263784e3e2a4dd2bf3", "parents": [ "b39bda6e7329b1be6dfc2741ed298b6e814532a5", "c5ce5b46af76f52dea21f467397d24c4ae6cb3ff" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 12:57:50 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 12:57:50 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.infradead.org/ubi-2.6\n\n* \u0027for-linus\u0027 of git://git.infradead.org/ubi-2.6:\n UBI: fix volume creation input checking\n" }, { "commit": "b39bda6e7329b1be6dfc2741ed298b6e814532a5", "tree": "c1d8f0bad47b45e47cc8aaa814aaba502ec28ea9", "parents": [ "be8cde8b24c9dca1e54598690115eee5b1476519", "7a481436787cbc932af6c407b317ac603969a242" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 12:56:23 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 28 12:56:23 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:\n firewire: ohci: fix crashes with TSB43AB23 on 64bit systems\n firewire: core: fix use-after-free regression in FCP handler\n firewire: cdev: add_descriptor documentation fix\n firewire: core: add_descriptor size check\n" }, { "commit": "b473946a0853860e13b51c28add5524741117786", "tree": "f60ad1068ba160e2628a915aa073ced46872f966", "parents": [ "3ce1cc52d2e76b6a6b9d0b52b70eb181497efa50" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Mon Jan 25 23:34:15 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 05:55:54 2010 -0800" }, "message": "bonding: bond_open error return value\n\nThe convention for API functions in kernel is to return errno value;\nbond_open would return -1 if alb setup failed. The only reason that\ncould happen is if kmalloc() failed.\n\nSigned-off-by: Stephen Hemminger \u003cshemminger@vyatta.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3ce1cc52d2e76b6a6b9d0b52b70eb181497efa50", "tree": "e6eed2508b3feab63eaa091b78616c17f5eed89a", "parents": [ "ebe1b30cd441b576fb9d0b42857af3e423dd5826" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Wed Jan 27 16:38:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 05:55:54 2010 -0800" }, "message": "ixgbe: if ixgbe_copy_dcb_cfg is going to fail learn about it early\n\nCall ixgbe_copy_dcb_cfg() earlier in the ixgbe_dcbnl_set_all() so that\nwe can learn if this is going to fail as early as possible. Previously,\nixgbe_down or ixgbe_close were being called before this check and the\nIXGBE_RESETTING bit was being set and cleared. Worse if this failed\nthe corresponding ixgbe_up/ndo_open would not called.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nAcked-by: PJ Waskiewicz \u003cpeter.p.waskiewicz.jr@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ebe1b30cd441b576fb9d0b42857af3e423dd5826", "tree": "37743934a110b17c85c65f8c34de845955ee6faf", "parents": [ "ac26d7d6aca9621f75f6954c159d2727c9c9cbd0" ], "author": { "name": "John Fastabend", "email": "john.r.fastabend@intel.com", "time": "Wed Jan 27 16:37:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 05:55:53 2010 -0800" }, "message": "ixgbe: set the correct DCB bit for pg tx settings\n\nSet the correct bit BIT_PG_TX when tx PG settings are set.\n\nSigned-off-by: John Fastabend \u003cjohn.r.fastabend@intel.com\u003e\nAcked-by: PJ Waskiewicz \u003cpeter.p.waskiewicz.jr@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ac26d7d6aca9621f75f6954c159d2727c9c9cbd0", "tree": "289fa801414a3497031c1294cac9452fc340d557", "parents": [ "aeedba8bd2cf2f6f7b45bc7853754a03bc926797" ], "author": { "name": "Alexander Duyck", "email": "alexander.h.duyck@intel.com", "time": "Wed Jan 27 15:30:39 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 05:55:53 2010 -0800" }, "message": "igbvf: fix issue w/ mapped_as_page being left set after unmap\n\nThis change fixes an issue in igbvf with mapped_as_page being left set\nafter a page is unmapped which results in buffers which are mapped via map\nsingle being unmapped as page.\n\nSigned-off-by: Alexander Duyck \u003calexander.h.duyck@intel.com\u003e\nSigned-off-by: Jeff Kirsher \u003cjeffrey.t.kirsher@intel.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "aeedba8bd2cf2f6f7b45bc7853754a03bc926797", "tree": "5273b572bf9b96232665925c5f06f038a2b9a7aa", "parents": [ "7b139c83c590d4965259aad8889cbb08104b2891" ], "author": { "name": "Choi, David", "email": "David.Choi@Micrel.Com", "time": "Wed Jan 27 06:03:16 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 05:54:49 2010 -0800" }, "message": "drivers/net: ks8851_mll ethernet network driver\n\nHello David Miller,\n\nI fix a bug in ks8851_mll driver, which has existed since 2.6.32-rc6.\n\n\u003eFrom : David J. Choi \u003cdavid.choi@micrel.com\u003e\n\nFix a bug that the data pointers in the interrupt handler are set wrong, which is related with the 5th parameter of request_irq().\n\nSigned-off-by : David J. Choi \u003cdavid.choi@micrel.com\u003e\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7b139c83c590d4965259aad8889cbb08104b2891", "tree": "12d6d9295be36e716a3a3ef71743a4bcc0f80b1e", "parents": [ "744595c847cefd6ac0eec8f66e9fba95687c3f4f" ], "author": { "name": "Ajit Khaparde", "email": "ajitk@serverengines.com", "time": "Wed Jan 27 21:56:44 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 05:54:18 2010 -0800" }, "message": "be2net: Bug fix to support newer generation of BE ASIC\n\nBug fix in be2net for newer generation of BladeEngine ASIC.\n\nSigned-off-by: Ajit Khaparde \u003cajitk@serverengines.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "744595c847cefd6ac0eec8f66e9fba95687c3f4f", "tree": "3d4b4e5213b584567d87f705f369808d7cfe8dbd", "parents": [ "c928febf4bc703ea542340e5a208e0445d998839", "3092ad054406f069991ca561adc74f2d9fbb6867" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 05:42:33 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Jan 28 05:42:33 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "57b5e2ae5b5f6b687ef2c644b1cb06bd217cdbe7", "tree": "b079bd137ee16d0bd0d502b6d63a01985fe22f0e", "parents": [ "ec51b7f538c440bfa5a4d538133c659071c02155" ], "author": { "name": "Jon Dodgson", "email": "crayzeejon@gmail.com", "time": "Thu Jan 28 00:07:45 2010 -0800" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Jan 28 00:29:03 2010 -0800" }, "message": "Input: lifebook - add another Lifebook DMI signature\n\nThere are many many ways one can capitalize \"Lifebook B Series\"...\n\nSigned-off-by: Jon Dodgson \u003ccrayzeejon@gmail.com\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "be8cde8b24c9dca1e54598690115eee5b1476519", "tree": "5142cedbf08050eb2af074f00979cf89d90b744f", "parents": [ "981a2edd1922c00e747680f30734ea50c86af28d", "534ef056db8a8fb6b9d50188d88ed5d1fbc66673" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:54:08 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:54:08 2010 -0800" }, "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] aic79xx: check for non-NULL scb in ahd_handle_nonpkt_busfree\n [SCSI] zfcp: Set hardware timeout as requested by BSG request.\n [SCSI] zfcp: Introduce bsg_timeout callback.\n [SCSI] scsi_transport_fc: Allow LLD to reset FC BSG timeout\n [SCSI] zfcp: add missing compat ptr conversion\n [SCSI] zfcp: Fix linebreak in hba trace\n [SCSI] zfcp: Issue zfcp_fc_wka_port_put after FC CT BSG request\n [SCSI] qla2xxx: Update version number to 8.03.01-k10.\n [SCSI] fc-transport: Use packed modifier for fc_bsg_request structure.\n [SCSI] qla2xxx: Perform fast mailbox read of flash regardless of size nor address alignment.\n [SCSI] qla2xxx: Correct FCP2 recovery handling.\n [SCSI] scsi_lib: Fix bug in completion of bidi commands\n [SCSI] mptsas: Fix issue with chain pools allocation on katmai\n [SCSI] aacraid: fix File System going into read-only mode\n [SCSI] lpfc: fix file permissions\n" }, { "commit": "981a2edd1922c00e747680f30734ea50c86af28d", "tree": "e32a9896900ea525eeb6019e618f8fa9d233d81e", "parents": [ "4bdadb9785696439c6e2b3efe34aa76df1149c83", "21ec7f6dbf10492ce9a21718040677d3e68bd57d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:27:44 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:27:44 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6\n\n* \u0027for-linus\u0027 of git://git390.marist.edu/pub/scm/linux-2.6:\n [S390] fix single stepped svcs with TRACE_IRQFLAGS\u003dy\n [S390] zcrypt: Do not remove coprocessor for error 8/72\n [S390] sclp_vt220: set initial terminal window size\n [S390] use set_current_state in sigsuspend\n [S390] irqflags: add missing types.h include\n [S390] dasd: fix possible NULL pointer errors\n" }, { "commit": "4bdadb9785696439c6e2b3efe34aa76df1149c83", "tree": "986b06ebf3f585f78a7e11cae39d5fdb7251c757", "parents": [ "0531b2aac59c2296570ac52bfc032ef2ace7d5e1" ], "author": { "name": "Chris Wilson", "email": "chris@chris-wilson.co.uk", "time": "Wed Jan 27 13:36:32 2010 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 27 09:26:43 2010 -0800" }, "message": "drm/i915: Selectively enable self-reclaim\n\nHaving missed the ENOMEM return via i915_gem_fault(), there are probably\nother paths that I also missed. By not enabling NORETRY by default these\npaths can run the shrinker and take memory from the system (but not from\nour own inactive lists because our shrinker can not run whilst we hold\nthe struct mutex) and this may allow the system to survive a little longer\nwhilst our drivers consume all available memory.\n\nReferences:\n OOM killer unexpectedly called with kernel 2.6.32\n http://bugzilla.kernel.org/show_bug.cgi?id\u003d14933\n\nv2: Pass gfp into page mapping.\nv3: Use new read_cache_page_gfp() instead of open-coding.\n\nSigned-off-by: Chris Wilson \u003cchris@chris-wilson.co.uk\u003e\nCc: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nCc: Eric Anholt \u003ceric@anholt.net\u003e\nCc: stable@kernel.org\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7a481436787cbc932af6c407b317ac603969a242", "tree": "b58660247f56926f591b06bd9b1e77280beef51e", "parents": [ "281e20323ab72180137824a298ee9e21e6f9acf6" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jan 26 21:39:07 2010 +0100" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Wed Jan 27 18:24:53 2010 +0100" }, "message": "firewire: ohci: fix crashes with TSB43AB23 on 64bit systems\n\nUnsurprisingly, Texas Instruments TSB43AB23 exhibits the same behaviour\nas TSB43AB22/A in dual buffer IR DMA mode: If descriptors are located\nat physical addresses above the 31 bit address range (2 GB), the\ncontroller will overwrite random memory. With luck, this merely\nprevents video reception. With only a little less luck, the machine\ncrashes.\n\nWe use the same workaround here as with TSB43AB22/A: Switch off the\ndual buffer capability flag and use packet-per-buffer IR DMA instead.\nAnother possible workaround would be to limit the coherent DMA mask to\n31 bits.\n\nIn Linux 2.6.33, this change serves effectively only as documentation\nsince dual buffer mode is not used for any controller anymore. But\nsomebody might want to re-enable it in the future to make use of\nfeatures of dual buffer DMA that are not available in packet-per-buffer\nmode.\n\nIn Linux 2.6.32 and older, this update is vital for anyone with this\ncontroller, more than 2 GB RAM, a 64 bit kernel, and FireWire video or\naudio applications.\n\nWe have at least four reports:\nhttp://bugzilla.kernel.org/show_bug.cgi?id\u003d13808\nhttp://marc.info/?l\u003dlinux1394-user\u0026m\u003d126154279004083\nhttps://bugzilla.redhat.com/show_bug.cgi?id\u003d552142\nhttp://marc.info/?l\u003dlinux1394-user\u0026m\u003d126432246128386\n\nReported-by: Paul Johnson\nReported-by: Ronneil Camara\nReported-by: G Zornetzer\nReported-by: Mark Thompson\nCc: stable@kernel.org\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "aca3bb5910119d4cf6c28568a642582efb4cc14a", "tree": "a6a14bbb8a9ae4b469b506d1c611c41637e311ce", "parents": [ "e0b5f80dd4226a920257c91a3b9070e81149060b" ], "author": { "name": "Dimitri Sivanich", "email": "sivanich@sgi.com", "time": "Fri Jan 22 09:41:40 2010 -0600" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jan 27 11:33:53 2010 +0100" }, "message": "x86, UV: Fix RTC latency bug by reading replicated cachelines\n\nFor SGI UV node controllers (HUB) rev 2.0 or greater, use\nreplicated cachelines to read the RTC timer. This optimization\nallows faster simulataneous reads from a given socket.\n\nSigned-off-by: Dimitri Sivanich \u003csivanich@sgi.com\u003e\nCc: Jack Steiner \u003csteiner@sgi.com\u003e\nLKML-Reference: \u003c20100122154140.GB4975@sgi.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "c5ce5b46af76f52dea21f467397d24c4ae6cb3ff", "tree": "cd45d66f718c6e632ab366e9847129c913821f41", "parents": [ "92dcffb916d309aa01778bf8963a6932e4014d07" ], "author": { "name": "Mika Westerberg", "email": "ext-mika.1.westerberg@nokia.com", "time": "Tue Jan 26 17:47:05 2010 +0200" }, "committer": { "name": "Artem Bityutskiy", "email": "Artem.Bityutskiy@nokia.com", "time": "Wed Jan 27 11:55:43 2010 +0200" }, "message": "UBI: fix volume creation input checking\n\nDo not use an unchecked variable UBI_IOCMKVOL ioctl.\n\nSigned-off-by: Mika Westerberg \u003cext-mika.1.westerberg@nokia.com\u003e\nSigned-off-by: Artem Bityutskiy \u003cArtem.Bityutskiy@nokia.com\u003e\nCc: stable@vger.kernel.org\n" }, { "commit": "19b123ebacacdce5e75045bfe82122b01c821a5b", "tree": "31a7975e6521f306bb7d6e09e7453d860d56ecdb", "parents": [ "0b665d770d2d4dca8e9ea53129735fe214838ec9" ], "author": { "name": "Felix Beck", "email": "felix.beck@de.ibm.com", "time": "Wed Jan 27 10:12:39 2010 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Wed Jan 27 10:12:49 2010 +0100" }, "message": "[S390] zcrypt: Do not remove coprocessor for error 8/72\n\nIn a case where the number of the input data is bigger than the\nmodulus of the key, the coprocessor adapters will report an 8/72\nerror. This case is not caught yet, thus the adapter will be taken\noffline. To prevent this, we return an -EINVAL instead.\n\nSigned-off-by: Felix Beck \u003cfelix.beck@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "0b665d770d2d4dca8e9ea53129735fe214838ec9", "tree": "365f0b15c48fc2fe22bf5468c40998af95a96f9e", "parents": [ "0b4d78903bf48fe6b125c4c9f0755437a4f21d47" ], "author": { "name": "Hendrik Brueckner", "email": "brueckner@linux.vnet.ibm.com", "time": "Wed Jan 27 10:12:38 2010 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Wed Jan 27 10:12:49 2010 +0100" }, "message": "[S390] sclp_vt220: set initial terminal window size\n\nWhen opening a SCLP VT220 terminal, the terminal window size is not\ninitialized (defaults to zero).\nSince the SCLP VT220 terminal supports only 80x24, explicitly set\nthe window size to prevent (n)curses applications from guessing\nthe default setting.\n\nSigned-off-by: Hendrik Brueckner \u003cbrueckner@linux.vnet.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "294001a80c9810e2fe27aaaad7df8be12a103065", "tree": "1615733697057a38054f68bf46109fffeeb5e549", "parents": [ "b04da8bfdfbbd79544cab2fadfdc12e87eb01600" ], "author": { "name": "Stefan Haberland", "email": "stefan.haberland@de.ibm.com", "time": "Wed Jan 27 10:12:35 2010 +0100" }, "committer": { "name": "Martin Schwidefsky", "email": "sky@mschwide.boeblingen.de.ibm.com", "time": "Wed Jan 27 10:12:48 2010 +0100" }, "message": "[S390] dasd: fix possible NULL pointer errors\n\nFix possible NULL pointer in DASD messages and correct discipline\nchecking.\n\nSigned-off-by: Stefan Haberland \u003cstefan.haberland@de.ibm.com\u003e\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n" }, { "commit": "c928febf4bc703ea542340e5a208e0445d998839", "tree": "b43875f67bca052b4e5826eae5d2d9f45c5edb67", "parents": [ "c92b544bd5d8e7ed7d81c77bbecab6df2a95aa53" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Tue Jan 26 18:27:09 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jan 26 21:05:25 2010 -0800" }, "message": "starfire: clean up properly if firmware loading fails\n\nnetdev_open() will return without cleaning up net device or hardware state\nif firmware loading fails. This results in a BUG() on a second attempt to\nbring the interface up, reported in\n\u003chttp://bugzilla.kernel.org/show_bug.cgi?id\u003d15091\u003e, and probably has even\nworse effects if the driver is removed afterwards.\n\nCall netdev_close() to clean up on failure.\n\nAddresses http://bugzilla.kernel.org/show_bug.cgi?id\u003d15091\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nReported-by: Michael Moffatt \u003cmichael@moffatt.org.nz\u003e\nTested-by: Michael Moffatt \u003cmichael@moffatt.org.nz\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "12e9a45609054fb83d4a8b716a5265cc1a393e10", "tree": "a760a5b72acc47fc0362ac8c0c8e42483beb2555", "parents": [ "083c73c253c23c20359a344dfe1198ea628e6259" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Jan 25 18:44:58 2010 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Tue Jan 26 22:22:27 2010 -0500" }, "message": "Fix failure exit in ipathfs\n\ndeactivate_locked_super() will be done by caller of fill_super, doing\nit there as well is b0rken.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "281e20323ab72180137824a298ee9e21e6f9acf6", "tree": "b807edaafec3c00e442d41d9091b9783a53820f9", "parents": [ "6d3faf6f431bafb25f4b9926c50a7e5c267738c6" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jan 24 16:45:03 2010 +0100" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jan 26 20:54:50 2010 +0100" }, "message": "firewire: core: fix use-after-free regression in FCP handler\n\nCommit db5d247a \"firewire: fix use of multiple AV/C devices, allow\nmultiple FCP listeners\" introduced a regression into 2.6.33-rc3:\nThe core freed payloads of incoming requests to FCP_Request or\nFCP_Response before a userspace driver accessed them.\n\nWe need to copy such payloads for each registered userspace client\nand free the copies according to the lifetime rules of non-FCP client\nrequest resources.\n\n(This could possibly be optimized by reference counts instead of\ncopies.)\n\nThe presently only kernelspace driver which listens for FCP requests,\nfiredtv, was not affected because it already copies FCP frames into an\nown buffer before returning to firewire-core\u0027s FCP handler dispatcher.\n\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "e300839da40e99581581c5d053a95a172651fec8", "tree": "bb6c59a38828f4af0fd728f959dcbd39546891ce", "parents": [ "92dcffb916d309aa01778bf8963a6932e4014d07" ], "author": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Sun Jan 24 14:47:02 2010 +0100" }, "committer": { "name": "Stefan Richter", "email": "stefanr@s5r6.in-berlin.de", "time": "Tue Jan 26 20:54:50 2010 +0100" }, "message": "firewire: core: add_descriptor size check\n\nPresently, firewire-core only checks whether descriptors that are to be\nadded by userspace drivers to the local node\u0027s config ROM do not exceed\na size of 256 quadlets. However, the sum of the bare minimum ROM plus\nall descriptors (from firewire-core, from firewire-net, from userspace)\nmust not exceed 256 quadlets.\n\nOtherwise, the bounds of a statically allocated buffer will be\noverwritten. If the kernel survives that, firewire-core will\nsubsequently be unable to parse the local node\u0027s config ROM.\n\n(Note, userspace drivers can add descriptors only through device files\nof local nodes. These are usually only accessible by root, unlike\ndevice files of remote nodes which may be accessible to lesser\nprivileged users.)\n\nTherefore add a test which takes the actual present and required ROM\nsize into account for all descriptors of kernelspace and userspace\ndrivers.\n\nCc: stable@kernel.org\nSigned-off-by: Stefan Richter \u003cstefanr@s5r6.in-berlin.de\u003e\n" }, { "commit": "01974ea61fc22f086d2987b4b717cbda055f0d03", "tree": "bf5dacb0640bece071cc2b68378bc75a40cfa94a", "parents": [ "7c1c05afddf6bb0a4804cb506f3885248a749aa2", "ef39a1bf3c4fbdea085c618be424cc88b803f248" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:03:58 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:03:58 2010 -0800" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:\n [WATCHDOG] sbc_fitpc2_wdt: fix I/O space access technique.\n [WATCHDOG] ixp2000: Fix build failure caused by missing include\n" }, { "commit": "a8d0b6666ecfe14226f1e46d693d5e2cde072337", "tree": "fc561f1e0d1489961782fb3c37466ce9c7f1951e", "parents": [ "c799d15333ff52a3f19ca926636a7774a16cca58", "ebddd63b74dcf1cb676d14328d5852f1fee19a8a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:02:06 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:02:06 2010 -0800" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.infradead.org/ubi-2.6\n\n* \u0027linux-next\u0027 of git://git.infradead.org/ubi-2.6:\n UBI: fix memory leak in update path\n UBI: add more checks to chdev open\n UBI: initialise update marker\n" }, { "commit": "c799d15333ff52a3f19ca926636a7774a16cca58", "tree": "0b0cdb1665aad0ff215a8297cf7af64e63a97f57", "parents": [ "abefedd538f57f63199d821ade33f282e7fe0921", "c453615f77aa51593c1c9c9031b4278797d3fd19" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:00:56 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 19:00:56 2010 -0800" }, "message": "Merge branch \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging\n\n* \u0027hwmon-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:\n hwmon: (fschmd) Fix a memleak on multiple opens of /dev/watchdog\n hwmon: (asus_atk0110) Do not fail if MBIF is missing\n hwmon: (amc6821) Double unlock bug\n hwmon: (smsc47m1) Fix section mismatch\n" }, { "commit": "abefedd538f57f63199d821ade33f282e7fe0921", "tree": "d5b442c1d504ac0ed12c2801b98b6418a7f79764", "parents": [ "840f51ffe126123e748df0f36c411a90db1efd93", "7087e16286913b41ba9a5186360645b57b8508dd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:59:47 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:59:47 2010 -0800" }, "message": "Merge branch \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6\n\n* \u0027drm-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (95 commits)\n drm/radeon/kms: preface warning printk with driver name\n drm/radeon/kms: drop unnecessary printks.\n drm: fix regression in fb blank handling\n drm/radeon/kms: make hibernate work on IGPs\n drm/vmwgfx: Optimize memory footprint for DMA buffers.\n drm/ttm: Allow system memory as a busy placement.\n drm/ttm: Fix race condition in ttm_bo_delayed_delete (v3, final)\n drm/nv50: prevent switching off SOR when in use for DVI-over-DP\n drm/nv50: fail auxch transaction if reply count not what we expect\n drm/nouveau: fix failure path if userspace specifies no valid memtypes\n drm/nouveau: report LVDS as disconnected if lid closed\n drm/radeon/kms: fix legacy get_engine/memory clock\n drm/radeon/kms/atom: atom parser fixes\n drm/radeon/kms: clean up atombios pll code\n drm/radeon/kms: clean up pll struct\n drm/radeon/kms/atom: fix crtc lock ordering\n drm/radeon: r6xx/r7xx possible security issue, system ram access\n drm/radeon/kms: r600/r700 don\u0027t test ib if ib initialization fails\n drm/radeon/kms: Forbid creation of framebuffer with no valid GEM object\n drm/radeon/kms: r600 handle irq vector ring overflow\n ...\n" }, { "commit": "e2197787efe54c0dcbdc4f6acb6dabb65f27f347", "tree": "fb9bbf08293f0f43954f128708e6422f1d21a404", "parents": [ "4f4e65d2484811210a2826fa9d59712c7fcf1b49", "39d321577405e8e269fd238b278aaf2425fa788a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:57:07 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jan 25 18:57:07 2010 -0800" }, "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: (42 commits)\n virtio_net: Make delayed refill more reliable\n sfc: Use fixed-size buffers for MCDI NVRAM requests\n sfc: Add workspace for GMAC bug workaround to MCDI MAC_STATS buffer\n tcp_probe: avoid modulus operation and wrap fix\n qlge: Only free resources if they were allocated\n netns xfrm: deal with dst entries in netns\n sky2: revert config space change\n vlan: fix vlan_skb_recv()\n netns xfrm: fix \"ip xfrm state|policy count\" misreport\n sky2: Enable/disable WOL per hardware device\n net: Fix IPv6 GSO type checks in Intel ethernet drivers\n igb/igbvf: cleanup exception handling in tx_map_adv\n MAINTAINERS: Add Intel igbvf maintainer\n e1000/e1000e: don\u0027t use small hardware rx buffers\n fmvj18x_cs: add new id (Panasonic lan \u0026 modem card)\n be2net: swap only first 2 fields of mcc_wrb\n Please add support for Microsoft MN-120 PCMCIA network card\n be2net: fix bug in rx page posting\n wimax/i2400m: Add support for more i6x50 SKUs\n e1000e: enhance frame fragment detection\n ...\n" }, { "commit": "39d321577405e8e269fd238b278aaf2425fa788a", "tree": "923bded413373b0ee72b0929fa7413953888da12", "parents": [ "5a27e86babe79cf5f575394bb1055448458df6c7" ], "author": { "name": "Herbert Xu", "email": "herbert@gondor.apana.org.au", "time": "Mon Jan 25 15:51:01 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 25 15:51:01 2010 -0800" }, "message": "virtio_net: Make delayed refill more reliable\n\nI have seen RX stalls on a machine that experienced a suspected\nOOM. After the stall, the RX buffer is empty on the guest side\nand there are exactly 16 entries available on the host side. As\nthe number of entries is less than that required by a maximal\nskb, the host cannot proceed.\n\nThe guest did not have a refill job scheduled.\n\nMy diagnosis is that an OOM had occured, with the delayed refill\njob scheduled. The job was able to allocate at least one skb, but\nnot enough to overcome the minimum required by the host to proceed.\n\nAs the refill job would only reschedule itself if it failed completely\nto allocate any skbs, this would lead to an RX stall.\n\nThe following patch removes this stall possibility by always\nrescheduling the refill job until the ring is totally refilled.\n\nTesting has shown that the RX stall no longer occurs whereas\npreviously it would occur within a day.\n\nSigned-off-by: Herbert Xu \u003cherbert@gondor.apana.org.au\u003e\nAcked-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5a27e86babe79cf5f575394bb1055448458df6c7", "tree": "fa64f367db6367525ed6fb3097e6a509ec93c581", "parents": [ "8704a2c8e9db24157a7b08d1678bf840f2318779" ], "author": { "name": "Ben Hutchings", "email": "bhutchings@solarflare.com", "time": "Mon Jan 25 15:49:59 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 25 15:49:59 2010 -0800" }, "message": "sfc: Use fixed-size buffers for MCDI NVRAM requests\n\nThe low-level MCDI code always uses 32-bit MMIO operations, and\ncallers must pad input and output buffers to multiples of 4 bytes.\nThe MCDI NVRAM functions are not doing this. Also, their buffers are\ndeclared as variable-length arrays with no explicit maximum length.\n\nSwitch to a fixed buffer size based on the chunk size used by the\nMTD driver (which is a multiple of 4).\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8704a2c8e9db24157a7b08d1678bf840f2318779", "tree": "c05b65c9497729a38afbf7146a8d97f7261b2f86", "parents": [ "f81074f86176605bfbfafb9944e27628a4e26ce6" ], "author": { "name": "Guido Barzini", "email": "gbarzini@solarflare.com", "time": "Mon Jan 25 15:49:19 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 25 15:49:19 2010 -0800" }, "message": "sfc: Add workspace for GMAC bug workaround to MCDI MAC_STATS buffer\n\nDue to a hardware bug in the SFC9000 family, the firmware must\ntransfer raw GMAC statistics to host memory before aggregating them\ninto the cooked (speed-independent) MAC statistics. Extend the stats\nbuffer to support this.\n\nThe length of the buffer is explicit in the MAC_STATS command, so this\nchange is backward-compatible on both sides.\n\nSigned-off-by: Ben Hutchings \u003cbhutchings@solarflare.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4f9a91c81273b66afe0b6a9be460b47581b28246", "tree": "a9868d5c1765e7bb13d7b4bf4013a4f8df043052", "parents": [ "d7c7544c3d5f59033d1bf3236bc7b289f5f26b75" ], "author": { "name": "Breno Leitao", "email": "leitao@linux.vnet.ibm.com", "time": "Mon Jan 25 15:46:58 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Jan 25 15:46:58 2010 -0800" }, "message": "qlge: Only free resources if they were allocated\n\nCurrently qlge tries to release regions even if they were not allocated.\nThis causes messages like the following in the kernel log\n\nTrying to free nonexistent resource \u003c00000000006af400-00000000006af4ff\u003e\nTrying to free nonexistent resource \u003c00003c04ff9f4000-00003c04ff9f7fff\u003e\nTrying to free nonexistent resource \u003c00003c04ffc00000-00003c04ffcfffff\u003e\n\nThis patch fixes the goto logic in order to not release the resources\nif they were not allocated.\n\nSigned-off-by: Breno Leitao \u003cleitao@linux.vnet.ibm.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c84a301d4a4b1cc382a6549b4e7881ce5b796d63", "tree": "3fbff18c9674208079ec3c5dab92fbf13870a794", "parents": [ "f6760aa024199cfbce564311dc4bc4d47b6fb349", "d3db7b485ad7c467a61279d6a8ef51a3c83352df" ], "author": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Mon Jan 25 23:15:41 2010 +0100" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Mon Jan 25 23:15:41 2010 +0100" }, "message": "Merge branch \u0027for-jens\u0027 of git://git.drbd.org/linux-2.6-drbd into for-linus\n" }, { "commit": "aa8bc9ef18a2c5b2b97e1f36ee9604cf15743f96", "tree": "de5f4fd3da38b2a7a856e573f15559ea8a1acb81", "parents": [ "0b5d9b2689af0f59aeba67dc749b3681290d2166" ], "author": { "name": "Felix Fietkau", "email": "nbd@openwrt.org", "time": "Sat Jan 23 20:04:18 2010 +0100" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 25 16:17:26 2010 -0500" }, "message": "ath9k: fix eeprom INI values override for 2GHz-only cards\n\nAmong other changes, this commit:\n\n commit 06d0f0663e11cab4ec5f2c143a118d71a12fbbe9\n Author: Sujith \u003cSujith.Manoharan@atheros.com\u003e\n Date: Thu Feb 12 10:06:45 2009 +0530\n\n ath9k: Enable Fractional N mode\n\nchanged the hw attach code to fix up initialization values only for\ndual band devices, however the commit message did not give a reason as\nto why this would be useful or necessary.\n\nAccording to tests by Jorge Boncompte, this breaks at least some\n2GHz-only cards, so the code should be changed back to the\nunconditional INI fixup.\n\nSigned-off-by: Felix Fietkau \u003cnbd@openwrt.org\u003e\nReported-by: Jorge Boncompte \u003cjorge@dti2.net\u003e\nCc: stable@kernel.org\nTested-by: Pavel Roskin \u003cproski@gnu.org\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "0b5d9b2689af0f59aeba67dc749b3681290d2166", "tree": "3ebe48f0f8df6eae827588bb3cf0a720d9c6c197", "parents": [ "74401773f80b6d42f7a4c6994ca0cca883b03745" ], "author": { "name": "Johannes Berg", "email": "johannes@sipsolutions.net", "time": "Fri Jan 22 14:22:34 2010 -0800" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Jan 25 16:17:25 2010 -0500" }, "message": "iwlwifi: fix pointer signedness warning\n\nThere are a few station addresses that are\nchar *, instead of the normal u8 *; gcc\ngives pointer signedness warnings for some\nof those, so use u8 * consistently.\n\nSigned-off-by: Johannes Berg \u003cjohannes@sipsolutions.net\u003e\nSigned-off-by: Reinette Chatre \u003creinette.chatre@intel.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "ef39a1bf3c4fbdea085c618be424cc88b803f248", "tree": "44be93747836260b3fb2778cfe5830c2c467abe1", "parents": [ "e605d554ec17be55741b066387ae9f341777f52c" ], "author": { "name": "Denis Turischev", "email": "denis@compulab.co.il", "time": "Thu Jan 21 16:10:07 2010 +0200" }, "committer": { "name": "Wim Van Sebroeck", "email": "wim@iguana.be", "time": "Mon Jan 25 19:48:49 2010 +0000" }, "message": "[WATCHDOG] sbc_fitpc2_wdt: fix I/O space access technique.\n\nThe mdelay function was used between I/O access commands, that causes peak\nin CPU usage. Fix it by substitution mdelay to msleep.\n\nExpand usage on fitPC2 compatible boards according to DMI identification.\n\nSigned-off-by: Denis Turischev \u003cdenis@compulab.co.il\u003e\nSigned-off-by: Wim Van Sebroeck \u003cwim@iguana.be\u003e\n\n" }, { "commit": "bd1f46deba615971a58193afd0202878cadf19a7", "tree": "1a197e82ad0f6314f0ff0507c04030aaad933c7c", "parents": [ "61c39bb354a1f791ba6f562b766a72e508a036ee" ], "author": { "name": "Andrew Patterson", "email": "andrew.patterson@hp.com", "time": "Fri Jan 22 14:06:53 2010 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Jan 25 10:42:52 2010 -0800" }, "message": "PCI: fix nested spinlock hang in aer_inject\n\nThe aer_inject module hangs in aer_inject() when checking the device\u0027s\nerror masks. The hang is due to a recursive use of the aer_inject lock.\nThe aer_inject() routine grabs the lock while processing the error and then\ncalls pci_read_config_dword to read the masks. The pci_read_config_dword\nroutine is earlier overridden by pci_read_aer, which among other things,\ngrabs the aer_inject lock.\n\nFixed by moving the pci_read_config_dword calls to read the masks to before\nthe lock is taken.\n\nAcked-by: Huang Ying \u003cying.huang@intel.com\u003e\nSigned-off-by: Andrew Patterson \u003candrew.patterson@hp.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "d3db7b485ad7c467a61279d6a8ef51a3c83352df", "tree": "ca9dbee2840d5781dd02c1c84194b38e7d94006f", "parents": [ "98ec286e016a028678cc943b1a1f87668ad447c8" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Sat Jan 23 15:45:22 2010 +0300" }, "committer": { "name": "Philipp Reisner", "email": "philipp.reisner@linbit.com", "time": "Mon Jan 25 18:01:41 2010 +0100" }, "message": "drbd: null dereference bug\n\nepoch is always NULL here.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Philipp Reisner \u003cphilipp.reisner@linbit.com\u003e\n" }, { "commit": "c453615f77aa51593c1c9c9031b4278797d3fd19", "tree": "7d6c05c9487b311d4f276d4c4bdf42d4e06fa445", "parents": [ "5542482b9c61c2588f1178f315310a794988051a" ], "author": { "name": "Hans de Goede", "email": "hdegoede@redhat.com", "time": "Mon Jan 25 15:00:50 2010 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 25 15:00:50 2010 +0100" }, "message": "hwmon: (fschmd) Fix a memleak on multiple opens of /dev/watchdog\n\nWhen /dev/watchdog gets opened a second time we return -EBUSY, but\nwe already have got a kref then, so we end up leaking our data struct.\n\nSigned-off-by: Hans de Goede \u003chdegoede@redhat.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nCc: stable@kernel.org\n" }, { "commit": "5542482b9c61c2588f1178f315310a794988051a", "tree": "13f23a4bca5d825a8eecddeff1097e286bf20d7d", "parents": [ "316e2664dcc82e9c5f73360a4fb8f9279a8152ed" ], "author": { "name": "Luca Tettamanti", "email": "kronos.it@gmail.com", "time": "Mon Jan 25 15:00:49 2010 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 25 15:00:49 2010 +0100" }, "message": "hwmon: (asus_atk0110) Do not fail if MBIF is missing\n\nMBIF (motherboard identification) is only used to print the name of\nthe board, it\u0027s not essential for the driver; do not fail if it\u0027s\nmissing. Based on Juan\u0027s patch.\n\nSigned-off-by: Luca Tettamanti \u003ckronos.it@gmail.com\u003e\nAcked-by: Juan RP \u003cxtraeme@gmail.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "316e2664dcc82e9c5f73360a4fb8f9279a8152ed", "tree": "e305e6e6ef37ff528af19434ef86dce06b711045", "parents": [ "a00d643a2a841e76dfb76ec4f8a1e71844252974" ], "author": { "name": "Dan Carpenter", "email": "error27@gmail.com", "time": "Mon Jan 25 15:00:49 2010 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 25 15:00:49 2010 +0100" }, "message": "hwmon: (amc6821) Double unlock bug\n\nThe mutex gets unlocked after we goto EXIT.\n\nSigned-off-by: Dan Carpenter \u003cerror27@gmail.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "a00d643a2a841e76dfb76ec4f8a1e71844252974", "tree": "7173fc5d9655a17a109298b919ea4e7aeb690abe", "parents": [ "f6760aa024199cfbce564311dc4bc4d47b6fb349" ], "author": { "name": "Jeff Mahoney", "email": "jeffm@suse.com", "time": "Mon Jan 25 15:00:48 2010 +0100" }, "committer": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Mon Jan 25 15:00:48 2010 +0100" }, "message": "hwmon: (smsc47m1) Fix section mismatch\n\nsmsc47m1_restore is called from sm_smsc47m1_exit, which is an __exit\nfunction, so it can\u0027t be __init.\n\nSigned-off-by: Jeff Mahoney \u003cjeffm@suse.com\u003e\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\n" }, { "commit": "a40ccc6868943e74ec12f26a266ce1d0373b2b32", "tree": "7ac30003808ea30998d0949927c150b09aa1364e", "parents": [ "2dc85e91d05be91343033df78e4e6d99dc7ea50e" ], "author": { "name": "stephen hemminger", "email": "shemminger@vyatta.com", "time": "Sun Jan 24 18:46:06 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jan 24 22:37:07 2010 -0800" }, "message": "sky2: revert config space change\n\nObviously, this register had some other impact that is causing\nthe regression. Either it is masking some other access or needs\nto be reset in some path.\n\nEither, way it is best to just revert the change for 2.6.33\n\nThis reverts commit 166a0fd4c788ec7f10ca8194ec6d526afa12db75.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7087e16286913b41ba9a5186360645b57b8508dd", "tree": "5a199665f9c04a78c0a3cbb5d1b98785d3edfaf7", "parents": [ "f2ab3a13d2cbe19426c27c35a014c98212e914a5" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:13:55 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:13:55 2010 +1000" }, "message": "drm/radeon/kms: preface warning printk with driver name\n\nThis just adds a little more info to the warning for old -ati/mesa\nuserspaces.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "f2ab3a13d2cbe19426c27c35a014c98212e914a5", "tree": "976a541f1394200ac57ad25c939723dff66c801c", "parents": [ "5fd4df4d475a7fee96fff54f6341192f547984e0" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:13:12 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:13:12 2010 +1000" }, "message": "drm/radeon/kms: drop unnecessary printks.\n\nThese printks aren\u0027t required anymore.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "5fd4df4d475a7fee96fff54f6341192f547984e0", "tree": "d6a5c1f2c9cf8cca953aabed543f86c732e2adee", "parents": [ "d796d8446fe0ff4442c1a1d0b10c861f17ac8168" ], "author": { "name": "Zhenyu Wang", "email": "zhenyuw@linux.intel.com", "time": "Mon Jan 18 16:47:04 2010 +0800" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:04:47 2010 +1000" }, "message": "drm: fix regression in fb blank handling\n\ncommit 731b5a15a3b1474a41c2ca29b4c32b0f21bc852e\nAuthor: James Simmons \u003cjsimmons@infradead.org\u003e\nDate: Thu Oct 29 20:39:07 2009 +0000\n\n drm/kms: properly handle fbdev blanking\n\nuses DRM_MODE_DPMS_ON for FB_BLANK_NORMAL, but DRM_MODE_DPMS_ON\nis actually for turning output on instead of blank.\n\nThis makes fb blank broken on my T61, it put LVDS on but leave\npipe disabled which made screen totally white or caused some\n\u0027burning\u0027 effect.\n\n[airlied: James objects to this but at this point in 2.6.33,\nI can\u0027t see a patch that will fix this properly like he wants coming\nin time and otherwise this is a regression - proper fix for 2.6.34\nhopefully.]\n\nCc: James Simmons \u003cjsimmons@infradead.org\u003e\nSigned-off-by: Zhenyu Wang \u003czhenyuw@linux.intel.com\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "d796d8446fe0ff4442c1a1d0b10c861f17ac8168", "tree": "c3457449a8c9bf019fb81becd042a3f64ee0b972", "parents": [ "8ba5152a3acd5914cade42a1c8c9dc58ad8d1a89" ], "author": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 13:08:08 2010 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Mon Jan 25 16:04:42 2010 +1000" }, "message": "drm/radeon/kms: make hibernate work on IGPs\n\nThis is the least invasive fix without migrating the radeon driver\nto pm_ops from what I can see. We just always migrate VRAM objects\non IGPs for now and we can fix it up later to migrate depending\non STR vs STD.\n\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" } ], "next": "8ba5152a3acd5914cade42a1c8c9dc58ad8d1a89" }