)]}' { "log": [ { "commit": "31bad9246b5e17d547430697791acca5e9712333", "tree": "2c79be72236d0087637bb231ddf04d4fe36cd2bd", "parents": [ "bdd873540df9271634b0aae189f91c064f8b6147" ], "author": { "name": "Bernhard Walle", "email": "bwalle@suse.de", "time": "Tue Aug 12 15:09:14 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 16:07:31 2008 -0700" }, "message": "firmware/memmap: cleanup\n\nVarious cleanup the drivers/firmware/memmap (after review by AKPM):\n\n - fix kdoc to conform to the standard\n - move kdoc from header to implementation files\n - remove superfluous WARN_ON() after kmalloc()\n - WARN_ON(x); if (!x) -\u003e if(!WARN_ON(x))\n - improve some comments\n\nSigned-off-by: Bernhard Walle \u003cbwalle@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5f8c3c8edff426fd87098f057688463107fcd9ce", "tree": "f0c12022b9513796cc74a389bc47d4b9b013d0e9", "parents": [ "666593137185dc0ad1ee8966c8d7fef8f4bb84b2" ], "author": { "name": "Michael Abbott", "email": "michael@araneidae.co.uk", "time": "Tue Aug 12 15:09:11 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 16:07:31 2008 -0700" }, "message": "Make ioctl.h compatible with userland\n\nThe attached patch seems to already exist in a number of branches -- it\nkeeps popping up on Google for me, and is certainly already in Debian --\nbut is strangely absent from mainstream.\n\nThe problem appears to be that the patched file ends up as part of the\ntarget toolchain, but unfortunately the gcc constant folding doesn\u0027t\nappear to eliminate the __invalid_size_argument_for_IOC value early\nenough. Certainly compiling C++ programs which use _IO... macros as\nconstants fails without this patch.\n\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bc2aa80e18a1b43ea2b8066500006b729c4ba4a7", "tree": "ae1aaa86614f18f3bd3ff6981f0b23c01e4d37da", "parents": [ "40c9f22210f2d22f45d4fb430c94f472d19407d6" ], "author": { "name": "Harvey Harrison", "email": "harvey.harrison@gmail.com", "time": "Tue Aug 12 15:09:05 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 16:07:30 2008 -0700" }, "message": "byteorder: add include/linux/byteorder.h to define endian helpers\n\nSigned-off-by: Harvey Harrison \u003charvey.harrison@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "40c9f22210f2d22f45d4fb430c94f472d19407d6", "tree": "df633e4af23a8060aa3557d2910bdec16f717f06", "parents": [ "f18e439d1035d059534d261c414af33f89aee89a" ], "author": { "name": "Harvey Harrison", "email": "harvey.harrison@gmail.com", "time": "Tue Aug 12 15:09:04 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 16:07:30 2008 -0700" }, "message": "byteorder: add a new include/linux/swab.h to define byteswapping functions\n\nCollect the implementations from include/linux/byteorder/swab.h, swabb.h\nin swab.h\n\nThe functionality provided covers:\nu16 swab16(u16 val) - return a byteswapped 16 bit value\nu32 swab32(u32 val) - return a byteswapped 32 bit value\nu64 swab64(u64 val) - return a byteswapped 64 bit value\nu32 swahw32(u32 val) - return a wordswapped 32 bit value\nu32 swahb32(u32 val) - return a high/low byteswapped 32 bit value\n\nSimilar to above, but return swapped value from a naturally-aligned pointer\nu16 swab16p(u16 *p)\nu32 swab32p(u32 *p)\nu64 swab64p(u64 *p)\nu32 swahw32p(u32 *p)\nu32 swahb32p(u32 *p)\n\nSimilar to above, but swap the value in-place (in-situ)\nvoid swab16s(u16 *p)\nvoid swab32s(u32 *p)\nvoid swab64s(u64 *p)\nvoid swahw32s(u32 *p)\nvoid swahb32s(u32 *p)\n\nArches can override any of these with an optimized version by defining an\ninline in their asm/byteorder.h (example given for swab16()):\n\nu16 __arch_swab16() {}\n #define __arch_swab16 __arch_swab16\n\nSigned-off-by: Harvey Harrison \u003charvey.harrison@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "50ac2d694f2dd1658341cf97bcf2ffb836d772cb", "tree": "c4466ecb7c5211ee9423380783f00027411d5d5a", "parents": [ "dd763460eb628b57814251a15a39f8d75c044d76" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Aug 12 15:09:02 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 16:07:30 2008 -0700" }, "message": "seq_file: add seq_cpumask(), seq_nodemask()\n\nShort enough reads from /proc/irq/*/smp_affinity return -EINVAL for no\ngood reason.\n\nThis became noticed with NR_CPUS\u003d4096 patches, when length of printed\nrepresentation of cpumask becase 1152, but cat(1) continued to read with\n1024-byte chunks. bitmap_scnprintf() in good faith fills buffer, returns\n1023, check returns -EINVAL.\n\nFix it by switching to seq_file, so handler will just fill buffer and\ndoesn\u0027t care about offsets, length, filling EOF and all this crap.\n\nFor that add seq_bitmap(), and wrappers around it -- seq_cpumask() and\nseq_nodemask().\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nReviewed-by: Paul Jackson \u003cpj@sgi.com\u003e\nCc: Mike Travis \u003ctravis@sgi.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "070cb06593006e7d565d4763380f3edd8dbdc134", "tree": "70a71b6616bf4794a0da7398c8f282237977d618", "parents": [ "29a6d39bf3a890ad1d29e66baa9f4bc8d9334f3a" ], "author": { "name": "Uwe Kleine-König", "email": "Uwe.Kleine-Koenig@digi.com", "time": "Tue Aug 12 15:08:59 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 16:07:29 2008 -0700" }, "message": "move kernel-doc comment for might_sleep directly before its defining block\n\nSigned-off-by: Uwe Kleine-König \u003cUwe.Kleine-Koenig@digi.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ea757acad5a5183c65a3e1b28b49a5978fe6a052", "tree": "6cefcbb3770fa13719792e03158b9d8f3b0d36ac", "parents": [ "e730d8b0a5882b66c169e1bed09774d5d365e2e0" ], "author": { "name": "Haavard Skinnemoen", "email": "haavard.skinnemoen@atmel.com", "time": "Tue Aug 12 15:08:57 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 16:07:29 2008 -0700" }, "message": "atmel_lcdfb: add board parameter specify framebuffer memory size\n\nSpecify how much physically continuous, DMA capable memory will be\nallocated at driver initialization time. This allow to create framebuffer\ndevice with larger virtual resolution. Combine with y-panning this can be\nused to implement double buffering acceleration method.\n\nSigned-off-by: Stanislaw Gruszka \u003cstf_xl@wp.pl\u003e\nAcked-by: Haavard Skinnemoen \u003chaavard.skinnemoen@atmel.com\u003e\nAcked-by: Krzysztof Helt \u003ckrzysztof.h1@wp.pl\u003e\nCc: Nicolas Ferre \u003cnicolas.ferre@atmel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "10546355323e4826d13e62f85ac6198385a817a9", "tree": "7e51dcb04003d253cee8718a01f5c36f88d19351", "parents": [ "73b7d92f6106e2f55206b8672e5ccf6206689899" ], "author": { "name": "Jean Delvare", "email": "khali@linux-fr.org", "time": "Tue Aug 12 15:08:55 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 16:07:29 2008 -0700" }, "message": "matrox maven: convert to a new-style i2c driver\n\nThe legacy i2c model is going away soon, so switch to the new model.\n\nSigned-off-by: Jean Delvare \u003ckhali@linux-fr.org\u003e\nAcked-by: Krzysztof Helt \u003ckrzysztof.h1@wp.pl\u003e\nCc: Petr Vandrovec \u003cVANDROVE@vc.cvut.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "969830b2fedf8336c41d6195f49d250b1e166ff8", "tree": "ba7eec39395531b9baf62a0e13a875f085524409", "parents": [ "2b26736c88db85c038e04c2306d0745553e69602" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Tue Aug 12 15:08:51 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 16:07:28 2008 -0700" }, "message": "radeonfb: fix accel engine hangs\n\nSome chips appear to have the 2D engine hang during screen redraw,\ntypically in a sequence of copyarea operations. This appear to be\nsolved by adding a flush of the engine destination pixel cache\nand waiting for the engine to be idle before issuing the accel\noperation. The performance impact seems to be fairly small.\n\nHere is a trace on an RV370 (PCI device ID 0x5b64), it records the\nRBBM_STATUS register, then the source x/y, destination x/y, and\nwidth/height used for the copy:\n\n----------------------------------------\nradeonfb_prim_copyarea: STATUS[00000140] src[210:70] dst[210:60] wh[a0:10]\nradeonfb_prim_copyarea: STATUS[00000140] src[2b8:70] dst[2b8:60] wh[88:10]\nradeonfb_prim_copyarea: STATUS[00000140] src[348:70] dst[348:60] wh[40:10]\nradeonfb_prim_copyarea: STATUS[80020140] src[390:70] dst[390:60] wh[88:10]\nradeonfb_prim_copyarea: STATUS[8002613f] src[40:80] dst[40:70] wh[28:10]\nradeonfb_prim_copyarea: STATUS[80026139] src[a8:80] dst[a8:70] wh[38:10]\nradeonfb_prim_copyarea: STATUS[80026133] src[e8:80] dst[e8:70] wh[80:10]\nradeonfb_prim_copyarea: STATUS[8002612d] src[170:80] dst[170:70] wh[30:10]\nradeonfb_prim_copyarea: STATUS[80026127] src[1a8:80] dst[1a8:70] wh[8:10]\nradeonfb_prim_copyarea: STATUS[80026121] src[1b8:80] dst[1b8:70] wh[88:10]\nradeonfb_prim_copyarea: STATUS[8002611b] src[248:80] dst[248:70] wh[68:10]\n----------------------------------------\n\nWhen things are going fine the copies complete before the next ROP is\neven issued, but all of a sudden the 2D unit becomes active (bit 17 in\nRBBM_STATUS) and the FIFO retry (bit 13) and FIFO pipeline busy (bit\n14) are set as well. The FIFO begins to backup until it becomes full.\n\nWhat happens next is the radeon_fifo_wait() times out, and we access\nthe chip illegally leading to a bus error which usually wedges the\nbox. None of this makes it to the console screen, of course :-)\nradeon_fifo_wait() should be modified to reset the accelerator when\nthis timeout happens instead of programming the chip anyways.\n\n----------------------------------------\nradeonfb: FIFO Timeout !\nERROR(0): Cheetah error trap taken afsr[0010080005000000] afar[000007f900800e40] TL1(0)\nERROR(0): TPC[595114] TNPC[595118] O7[459788] TSTATE[11009601]\nERROR(0): TPC\u003cradeonfb_copyarea+0xfc/0x248\u003e\nERROR(0): M_SYND(0), E_SYND(0), Privileged\nERROR(0): Highest priority error (0000080000000000) \"Bus error response from system bus\"\nERROR(0): D-cache idx[0] tag[0000000000000000] utag[0000000000000000] stag[0000000000000000]\nERROR(0): D-cache data0[0000000000000000] data1[0000000000000000] data2[0000000000000000] data3[0000000000000000]\nERROR(0): I-cache idx[0] tag[0000000000000000] utag[0000000000000000] stag[0000000000000000] u[0000000000000000] l[00\\\n\nERROR(0): I-cache INSN0[0000000000000000] INSN1[0000000000000000] INSN2[0000000000000000] INSN3[0000000000000000]\nERROR(0): I-cache INSN4[0000000000000000] INSN5[0000000000000000] INSN6[0000000000000000] INSN7[0000000000000000]\nERROR(0): E-cache idx[800e40] tag[000000000e049f4c]\nERROR(0): E-cache data0[fffff8127d300180] data1[00000000004b5384] data2[0000000000000000] data3[0000000000000000]\nKer:xnel panic - not syncing: Irrecoverable deferred error trap.\n----------------------------------------\n\nAnother quirk is that these copyarea calls will not happen until the\nfirst drivers/char/vt.c:redraw_screen() occurs. This will only happen\nif you 1) VC switch or 2) run \"consolechars\" or 3) unblank the screen.\n\nThis seems to happen because until a redraw_screen() the screen scrolling\nmethod used by fbcon is not finalized yet. I\u0027ve seen this with other fb\ndrivers too.\n\nSo if all you do is boot straight into X you will never see this bug on\nthe relevant chips.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: \u003cstable@kernel.org\u003e\t\t[2.6.25.x, 2.6.26.x]\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "74768ed833344bb0f82b97cee46320a3d7f09ecd", "tree": "eee3404d1dd51eb184eab88e12dbc774dc693522", "parents": [ "866c36637f79506b283a6872a7c313b5ef499985" ], "author": { "name": "Jan Beulich", "email": "jbeulich@novell.com", "time": "Tue Aug 12 15:08:39 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 16:07:27 2008 -0700" }, "message": "page allocator: use no-panic variant of alloc_bootmem() in alloc_large_system_hash()\n\n.. since a failed allocation is being (initially) handled gracefully, and\npanic()-ed upon failure explicitly in the function if retries with smaller\nsizes failed.\n\nSigned-off-by: Jan Beulich \u003cjbeulich@novell.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1c89ac55017f982355c7761e1c912c88c941483d", "tree": "6878e95a0572defc725ea58f5a1449db937a5066", "parents": [ "88fa08f67bee1a0c765237bdac106a32872f57d2", "b1b135c8d619cb2c7045d6ee4e48375882518bb5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 08:40:19 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 08:40:19 2008 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:\n fix spinlock recursion in hvc_console\n stop_machine: remove unused variable\n modules: extend initcall_debug functionality to the module loader\n export virtio_rng.h\n lguest: use get_user_pages_fast() instead of get_user_pages()\n mm: Make generic weak get_user_pages_fast and EXPORT_GPL it\n lguest: don\u0027t set MAC address for guest unless specified\n" }, { "commit": "88fa08f67bee1a0c765237bdac106a32872f57d2", "tree": "6f15f1b4f236b7a5b32b0ce997c2822470a37203", "parents": [ "1ea2950884aa320c46315c8ddf62717c6ecf78d0", "91397585e3fb47b3900e17d70c6edc356e36bb46" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 08:28:32 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 12 08:28:32 2008 -0700" }, "message": "Merge branch \u0027agp-patches\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6\n\n* \u0027agp-patches\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/agp-2.6:\n agp: fix SIS 5591/5592 wrong PCI id\n intel/agp: rewrite GTT on resume\n agp: use dev_printk when possible\n amd64-agp: run fallback when no bridges found, not when driver registration fails\n intel_agp: official name for GM45 chipset\n" }, { "commit": "59f9415ffb9759e950d775f4c400f747b332cc02", "tree": "354544b8cad8ae77a5f960fe601b2a3613a2523a", "parents": [ "4bceba417a795b78a5146e3f85291cb7bb2402ef" ], "author": { "name": "Arjan van de Ven", "email": "arjan@linux.intel.com", "time": "Wed Jul 30 12:49:02 2008 -0700" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Tue Aug 12 17:52:54 2008 +1000" }, "message": "modules: extend initcall_debug functionality to the module loader\n\nThe kernel has this really nice facility where if you put \"initcall_debug\"\non the kernel commandline, it\u0027ll print which function it\u0027s going to\nexecute just before calling an initcall, and then after the call completes\nit will\n\n1) print if it had an error code\n\n2) checks for a few simple bugs (like leaving irqs off)\nand\n\n3) print how long the init call took in milliseconds.\n\nWhile trying to optimize the boot speed of my laptop, I have been loving\nnumber 3 to figure out what to optimize... ... and then I wished that\nthe same thing was done for module loading.\n\nThis patch makes the module loader use this exact same functionality; it\u0027s\na logical extension in my view (since modules are just sort of late\nbinding initcalls anyway) and so far I\u0027ve found it quite useful in finding\nwhere things are too slow in my boot.\n\nSigned-off-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "4bceba417a795b78a5146e3f85291cb7bb2402ef", "tree": "dc04f861e269f1e9a244a31603ec2fb40c48caa9", "parents": [ "71a3f4edc11b9dd7af28d003acbbd33496003da1" ], "author": { "name": "Christian Borntraeger", "email": "borntraeger@de.ibm.com", "time": "Fri Aug 08 11:15:07 2008 +0200" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Tue Aug 12 17:52:54 2008 +1000" }, "message": "export virtio_rng.h\n\nHello Rusty,\n\nThe entropy device was added after we exported all virtio headers. This\npatch adds virtio_rng.h to the exportable userspace headers.\n\nSigned-off-by: Christian Borntraeger \u003cborntraeger@de.ibm.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "912985dce45ef18fcdd9f5439fef054e0e22302a", "tree": "394b3be51134bddef200f86dde48aa3e3c7ae94c", "parents": [ "40c42076ebd362dc69210cccea101ac80b6d4bd4" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Tue Aug 12 17:52:52 2008 -0500" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Tue Aug 12 17:52:53 2008 +1000" }, "message": "mm: Make generic weak get_user_pages_fast and EXPORT_GPL it\n\nOut of line get_user_pages_fast fallback implementation, make it a weak\nsymbol, get rid of CONFIG_HAVE_GET_USER_PAGES_FAST.\n\nExport the symbol to modules so lguest can use it.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\n" }, { "commit": "a8c84df9f71e4a7b14bdd41687a70d366c087eef", "tree": "fc11f372de1543c6816d783ee8a852fcecf434d7", "parents": [ "e3cf69511a2c5369c58f6fd6a065de152c3d4b22" ], "author": { "name": "Keith Packard", "email": "keithp@keithp.com", "time": "Thu Jul 31 15:48:07 2008 +1000" }, "committer": { "name": "Dave Airlie", "email": "airlied@redhat.com", "time": "Tue Aug 12 10:13:38 2008 +1000" }, "message": "intel/agp: rewrite GTT on resume\n\nOn my Intel chipset (965GM), the GTT is entirely erased across\nsuspend/resume. This patch simply re-plays the current mapping at resume\ntime to restore the table.\u003d20\n\nI noticed this once I started relying on persistent GTT mappings across VT\nswitch in our GEM work -- the old X server and DRM code carefully unbind\nall memory from the GTT on VT switch, but GEM does not bother.\n\nI placed the list management and rewrite code in the generic layer on the\nassumption that it will be needed on other hardware, but I did not add the\nrewrite call to anything other than the Intel resume function.\n\nKeep a list of current GATT mappings. At resume time, rewrite them into\nthe GATT. This is needed on Intel (at least) as the entire GATT is\ncleared across suspend/resume.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Keith Packard \u003ckeithp@keithp.com\u003e\nCc: Dave Jones \u003cdavej@codemonkey.org.uk\u003e\nCc: Andi Kleen \u003candi@firstfloor.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Dave Airlie \u003cairlied@redhat.com\u003e\n" }, { "commit": "1ea2950884aa320c46315c8ddf62717c6ecf78d0", "tree": "3e03cfd79dd3d629ee46bb04771d79250fe52ad3", "parents": [ "67a077dca4e648a662e32cbeaaba8094d2e30229", "e26b33e9552c29c1d3fe67dc602c6264c29f5dc7" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 11 16:46:31 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 11 16:46:31 2008 -0700" }, "message": "Merge branch \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027sched-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n sched, cpu hotplug: fix set_cpus_allowed() use in hotplug callbacks\n sched: fix mysql+oltp regression\n sched_clock: delay using sched_clock()\n sched clock: couple local and remote clocks\n sched clock: simplify __update_sched_clock()\n sched: eliminate scd-\u003eprev_raw\n sched clock: clean up sched_clock_cpu()\n sched clock: revert various sched_clock() changes\n sched: move sched_clock before first use\n sched: test runtime rather than period in global_rt_runtime()\n sched: fix SCHED_HRTICK dependency\n sched: fix warning in hrtick_start_fair()\n" }, { "commit": "9b4d0bab32e18e4f72781f9fa309a81495b2aff3", "tree": "ce95c619d06d10bd0b2c0039f76a03deefaab2c2", "parents": [ "7019b1b50097a94d0f8a77b81bee0b19b108c634", "23a0ee908cbfba3264d19729c67c22b20fa73886" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 11 16:45:46 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 11 16:45:46 2008 -0700" }, "message": "Merge branch \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n lockdep: fix debug_lock_alloc\n lockdep: increase MAX_LOCKDEP_KEYS\n generic-ipi: fix stack and rcu interaction bug in smp_call_function_mask()\n lockdep: fix overflow in the hlock shrinkage code\n lockdep: rename map_[acquire|release]() \u003d\u003e lock_map_[acquire|release]()\n lockdep: handle chains involving classes defined in modules\n mm: fix mm_take_all_locks() locking order\n lockdep: annotate mm_take_all_locks()\n lockdep: spin_lock_nest_lock()\n lockdep: lock protection locks\n lockdep: map_acquire\n lockdep: shrink held_lock structure\n lockdep: re-annotate scheduler runqueues\n lockdep: lock_set_subclass - reset a held lock\u0027s subclass\n lockdep: change scheduler annotation\n debug_locks: set oops_in_progress if we will log messages.\n lockdep: fix combinatorial explosion in lock subgraph traversal\n" }, { "commit": "7019b1b50097a94d0f8a77b81bee0b19b108c634", "tree": "4213c3fc8a1459894c49eae167744fa96be1e93e", "parents": [ "f08c0761d6ff79e2f4c81f95fd01b761e0410785", "b74548e76a0eab1f29546e7c5a589429c069a680" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 11 16:44:35 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 11 16:44:35 2008 -0700" }, "message": "Merge branch \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027x86-fixes-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86: fix 2.6.27rc1 cannot boot more than 8CPUs\n x86: make \"apic\" an early_param() on 32-bit, NULL check\n EFI, x86: fix function prototype\n x86, pci-calgary: fix function declaration\n x86: work around gcc 3.4.x bug\n x86: make \"apic\" an early_param() on 32-bit\n x86, debug: tone down arch/x86/kernel/mpparse.c debugging printk\n x86_64: restore the proper NR_IRQS define so larger systems work.\n x86: Restore proper vector locking during cpu hotplug\n x86: Fix broken VMI in 2.6.27-rc..\n x86: fdiv bug detection fix\n" }, { "commit": "23a0ee908cbfba3264d19729c67c22b20fa73886", "tree": "541103f6283cbac6b82cff88a7b91128acfce046", "parents": [ "cc7a486cac78f6fc1a24e8cd63036bae8d2ab431", "0f2bc27be27ca1dcc66b96131e44bf7648b959c6" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Aug 12 00:11:49 2008 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Aug 12 00:11:49 2008 +0200" }, "message": "Merge branch \u0027core/locking\u0027 into core/urgent\n" }, { "commit": "10fec20ef5eec1c91913baec1225400f0d02df40", "tree": "2e226afc846616f901998c956290813b814b6714", "parents": [ "29bb1bdb260cd504c6ec0f567cc0cba6a4cf40e7", "25d6cbd840d958aada29a342c9ee370590ff7b21" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 11 10:44:43 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 11 10:44:43 2008 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.o-hand.com/linux-mfd\n\n* \u0027for-linus\u0027 of git://git.o-hand.com/linux-mfd:\n mfd: tc6393 cleanup and update\n mfd: have TMIO drivers and subdevices depend on ARM\n mfd: TMIO MMC driver\n mfd: driver for the TMIO NAND controller\n mfd: t7l66 MMC platform data\n mfd: tc6387 MMC platform data\n mfd: Fix 7l66 and 6387 according to the new mfd-core API\n mfd: Fix tc6393 according to the new tmio.h\n mfd: driver for the TC6387XB TMIO controller.\n mfd: driver for the T7L66XB TMIO SoC\n mfd: TMIO MMC structures and accessors.\n" }, { "commit": "e2205a156f4dd727097f7f492bf03aa8920b0071", "tree": "7c4947406e9e11b5fbe183db4e0ae1943b9a7d15", "parents": [ "a7ef6a40f700496c60b8f7206fff74fecd67b3a2", "13fa00a8780885edcdf0bc53b81e5d0fec71119a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 11 10:40:28 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 11 10:40:28 2008 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:\n powerpc: Remove include/linux/harrier_defs.h\n powerpc: Do not ignore arch/powerpc/include\n powerpc: Delete completed \"ppc removal\" task from feature removal file\n powerpc/mm: Fix attribute confusion with htab_bolt_mapping()\n powerpc/pci: Don\u0027t keep ISA memory hole resources in the tree\n powerpc: Zero fill the return values of rtas argument buffer\n powerpc/4xx: Update defconfig files for 2.6.27-rc1\n powerpc/44x: Incorrect NOR offset in Warp DTS\n powerpc/44x: Warp DTS changes for board updates\n powerpc/4xx: Cleanup Warp for i2c driver changes.\n powerpc/44x: Adjust warp-nand resource end address\n" }, { "commit": "a7ef6a40f700496c60b8f7206fff74fecd67b3a2", "tree": "aaba79c8ebafe06787b52c686505c76e15b81bdb", "parents": [ "000b9151d7851cc1e490b2a76d0206e524f43cca", "35405f256de924be56ea5edaca4cdc627f1bb0f8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 11 10:38:36 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 11 10:38:36 2008 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:\n PCI: Limit VPD length for Broadcom 5708S\n PCI PM: Export pci_pme_active to drivers\n PCI: remove duplicate symbol from pci_ids.h\n PCI: check the return value of device_create_bin_file() in pci_create_bus()\n PCI: fully restore MSI state at resume time\n DMA: make dma-coherent.c documentation kdoc-friendly\n PCI: make pci_register_driver() a macro\n PCI: add Broadcom 5708S to VPD length quirk\n" }, { "commit": "0e7d5bb8480e10f98f89bd1d418a430393b1e995", "tree": "897a474b9ba5758e992b33409103d6f3fb1b9088", "parents": [ "3838f59fc2ea9821f3ea13adb555bfc6ea43c74c" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Mon Aug 11 09:00:30 2008 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 11 10:37:34 2008 -0700" }, "message": "m68k{,nommu}: Wire up new system calls\n\nWire up for m68k{,nommu} the system calls that were added in the last merge\nwindow:\n\n - 4006553b06306b34054529477b06b68a1c66249b (\"flag parameters: inotify_init\")\n - ed8cae8ba01348bfd83333f4648dd807b04d7f08 (\"flag parameters: pipe\")\n - 336dd1f70ff62d7dd8655228caed4c5bfc818c56 (\"flag parameters: dup2\")\n - a0998b50c3f0b8fdd265c63e0032f86ebe377dbf (\"flag parameters: epoll_create\")\n - 9fe5ad9c8cef9ad5873d8ee55d1cf00d9b607df0 (\"flag parameters add-on: remove\n\t\t\t\t\t\t epoll_create size param\")\n - b087498eb5605673b0f260a7620d91818cd72304 (\"flag parameters: eventfd\")\n - 9deb27baedb79759c3ab9435a7d8b841842d56e9 (\"flag parameters: signalfd\")\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b0fbaa6b5976962434349849673b9ff63631b6d4", "tree": "4bc19d6c321643be89684102a5fdae567702d02d", "parents": [ "9b0094f7f289d752868aae1a3984517d712cbb22" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Thu Aug 07 15:12:39 2008 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 18:50:19 2008 +0200" }, "message": "EFI, x86: fix function prototype\n\nFix function prototype in header file to match source code:\n\nlinux-next-20080807/arch/x86/kernel/efi_64.c:100:14: error: symbol \u0027efi_ioremap\u0027 redeclared with different type (originally declared at include2/asm/efi.h:89) - different address spaces\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "e5f363e358cf16e4ad13a6826e15088c5495efe9", "tree": "dbcca9edd9d2001cace9f770e57f065f13c9cbd1", "parents": [ "b42e737e576339c795d9ac77a1fce6057f6bc0cf" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 12:37:27 2008 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 15:25:07 2008 +0200" }, "message": "lockdep: increase MAX_LOCKDEP_KEYS\n\ncertain configs produce:\n\n [ 70.076229] BUG: MAX_LOCKDEP_KEYS too low!\n [ 70.080230] turning off the locking correctness validator.\n\ntune them up.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "13fa00a8780885edcdf0bc53b81e5d0fec71119a", "tree": "8b2ba730becb3e9f61398b25c7273ce9498958a5", "parents": [ "0afd2ac9a56767b4fc8dfb6aa086fc05fc324fda" ], "author": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Mon Aug 11 20:59:59 2008 +1000" }, "committer": { "name": "Paul Mackerras", "email": "paulus@samba.org", "time": "Mon Aug 11 21:00:12 2008 +1000" }, "message": "powerpc: Remove include/linux/harrier_defs.h\n\nIt was only used by code in arch/ppc, and arch/ppc is gone, so remove\nthe unused harrier_defs.h as well.\n\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\n" }, { "commit": "b42e737e576339c795d9ac77a1fce6057f6bc0cf", "tree": "05aa0ba4f7dfd8d8a5ac3dc85893c18a20f159d3", "parents": [ "3295f0ef9ff048a4619ede597ad9ec9cab725654" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Aug 11 12:34:42 2008 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 12:34:42 2008 +0200" }, "message": "lockdep: fix overflow in the hlock shrinkage code\n\nThere is a overflow by 1 case in the new shrunken hlock code.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "3c7569b284e1be55d086b61a70d9f545326f6d74", "tree": "18b36c05d17bc92441d1f007084fa4b98b7e9f9b", "parents": [ "d388e5fdc461344d04307a3fa83862b9ed429647" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sun Aug 10 00:35:50 2008 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 10:39:04 2008 +0200" }, "message": "x86_64: restore the proper NR_IRQS define so larger systems work.\n\nAs pointed out and tracked by Yinghai Lu \u003cyhlu.kernel@gmail.com\u003e:\n\n Dhaval Giani got:\n kernel BUG at arch/x86/kernel/io_apic_64.c:357!\n invalid opcode: 0000 [1] SMP\n CPU 24\n ...\n\nhis system (x3950) has 8 ioapic, irq \u003e 256\n\nThis was caused by:\n\n commit 9b7dc567d03d74a1fbae84e88949b6a60d922d82\n Author: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n Date: Fri May 2 20:10:09 2008 +0200\n\n x86: unify interrupt vector defines\n\n The interrupt vector defines are copied 4 times around with minimal\n differences. Move them all into asm-x86/irq_vectors.h\n\nIt appears that Thomas did not notice that x86_64 does something\ncompletely different when he merge irq_vectors.h\n\nWe can solve this for 2.6.27 by simply reintroducing the old heuristic\nfor setting NR_IRQS on x86_64 to a usable value, which trivially removes\nthe regression.\n\nLong term it would be nice to harmonize the handling of ioapic interrupts\nof x86_32 and x86_64 so we don\u0027t have this kind of confusion.\n\nDhaval Giani \u003cdhaval@linux.vnet.ibm.com\u003e tested an earlier version of\nthis patch by YH which confirms simply increasing NR_IRQS fixes the\nproblem.\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nAcked-by: Yinghai Lu \u003cyhlu.kernel@gmail.com\u003e\nCc: Dhaval Giani \u003cdhaval@linux.vnet.ibm.com\u003e\nCc: Mike Travis \u003ctravis@sgi.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d388e5fdc461344d04307a3fa83862b9ed429647", "tree": "61a9a4311b165038423a0f3412e93b8811796c6b", "parents": [ "31343d8a5079cda57ffd539fcf4f00cea344fe98" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Sat Aug 09 15:09:02 2008 -0700" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 10:37:34 2008 +0200" }, "message": "x86: Restore proper vector locking during cpu hotplug\n\nHaving cpu_online_map change during assign_irq_vector can result\nin some really nasty and weird things happening. The one that\nbit me last time was accessing non existent per cpu memory for non\nexistent cpus.\n\nThis locking was removed in a sloppy x86_64 and x86_32 merge patch.\n\nGuys can we please try and avoid subtly breaking x86 when we are\nmerging files together?\n\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nSigned-off-by: H. Peter Anvin \u003chpa@zytor.com\u003e\n" }, { "commit": "3295f0ef9ff048a4619ede597ad9ec9cab725654", "tree": "f39a8ecf1958130a0b86c554399d23a65b1c3991", "parents": [ "8bfe0298f7a04952d19f4a2cf510d7a6311eeed0" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 10:30:30 2008 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 10:30:30 2008 +0200" }, "message": "lockdep: rename map_[acquire|release]() \u003d\u003e lock_map_[acquire|release]()\n\nthe names were too generic:\n\n drivers/uio/uio.c:87: error: expected identifier or \u0027(\u0027 before \u0027do\u0027\n drivers/uio/uio.c:87: error: expected identifier or \u0027(\u0027 before \u0027while\u0027\n drivers/uio/uio.c:113: error: \u0027map_release\u0027 undeclared here (not in a function)\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b7d39aff91454f2534db2275f55908656ec0470c", "tree": "24481f2fe7206ef69800a33df6ac3e1716085326", "parents": [ "7531e2f34d1d551b096143f19111139f0dd84c8b" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Aug 11 09:30:24 2008 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 09:30:24 2008 +0200" }, "message": "lockdep: spin_lock_nest_lock()\n\nExpose the new lock protection lock.\n\nThis can be used to annotate places where we take multiple locks of the\nsame class and avoid deadlocks by always taking another (top-level) lock\nfirst.\n\nNOTE: we\u0027re still bound to the MAX_LOCK_DEPTH (48) limit.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "7531e2f34d1d551b096143f19111139f0dd84c8b", "tree": "0a29d6703e28dc6752b9b4085594cca238595aac", "parents": [ "4f3e7524b2e703d9f8b02ac338153a53dd7ede66" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Aug 11 09:30:24 2008 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 09:30:24 2008 +0200" }, "message": "lockdep: lock protection locks\n\nOn Fri, 2008-08-01 at 16:26 -0700, Linus Torvalds wrote:\n\n\u003e On Fri, 1 Aug 2008, David Miller wrote:\n\u003e \u003e\n\u003e \u003e Taking more than a few locks of the same class at once is bad\n\u003e \u003e news and it\u0027s better to find an alternative method.\n\u003e\n\u003e It\u0027s not always wrong.\n\u003e\n\u003e If you can guarantee that anybody that takes more than one lock of a\n\u003e particular class will always take a single top-level lock _first_, then\n\u003e that\u0027s all good. You can obviously screw up and take the same lock _twice_\n\u003e (which will deadlock), but at least you cannot get into ABBA situations.\n\u003e\n\u003e So maybe the right thing to do is to just teach lockdep about \"lock\n\u003e protection locks\". That would have solved the multi-queue issues for\n\u003e networking too - all the actual network drivers would still have taken\n\u003e just their single queue lock, but the one case that needs to take all of\n\u003e them would have taken a separate top-level lock first.\n\u003e\n\u003e Never mind that the multi-queue locks were always taken in the same order:\n\u003e it\u0027s never wrong to just have some top-level serialization, and anybody\n\u003e who needs to take \u003cn\u003e locks might as well do \u003cn+1\u003e, because they sure as\n\u003e hell aren\u0027t going to be on _any_ fastpaths.\n\u003e\n\u003e So the simplest solution really sounds like just teaching lockdep about\n\u003e that one special case. It\u0027s not \"nesting\" exactly, although it\u0027s obviously\n\u003e related to it.\n\nDo as Linus suggested. The lock protection lock is called nest_lock.\n\nNote that we still have the MAX_LOCK_DEPTH (48) limit to consider, so anything\nthat spills that it still up shit creek.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "4f3e7524b2e703d9f8b02ac338153a53dd7ede66", "tree": "0033ade94f230d6044ad318e3791c55ad611069e", "parents": [ "f82b217e3513fe3af342c0f3ee1494e86250c21c" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Aug 11 09:30:23 2008 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 09:30:23 2008 +0200" }, "message": "lockdep: map_acquire\n\nMost the free-standing lock_acquire() usages look remarkably similar, sweep\nthem into a new helper.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "f82b217e3513fe3af342c0f3ee1494e86250c21c", "tree": "144b724c9e0c491c0983087627000080b25b9852", "parents": [ "1b12bbc747560ea68bcc132c3d05699e52271da0" ], "author": { "name": "Dave Jones", "email": "davej@redhat.com", "time": "Mon Aug 11 09:30:23 2008 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 09:30:23 2008 +0200" }, "message": "lockdep: shrink held_lock structure\n\nstruct held_lock {\n u64 prev_chain_key; /* 0 8 */\n struct lock_class * class; /* 8 8 */\n long unsigned int acquire_ip; /* 16 8 */\n struct lockdep_map * instance; /* 24 8 */\n int irq_context; /* 32 4 */\n int trylock; /* 36 4 */\n int read; /* 40 4 */\n int check; /* 44 4 */\n int hardirqs_off; /* 48 4 */\n\n /* size: 56, cachelines: 1 */\n /* padding: 4 */\n /* last cacheline: 56 bytes */\n};\n\nstruct held_lock {\n u64 prev_chain_key; /* 0 8 */\n long unsigned int acquire_ip; /* 8 8 */\n struct lockdep_map * instance; /* 16 8 */\n unsigned int class_idx:11; /* 24:21 4 */\n unsigned int irq_context:2; /* 24:19 4 */\n unsigned int trylock:1; /* 24:18 4 */\n unsigned int read:2; /* 24:16 4 */\n unsigned int check:2; /* 24:14 4 */\n unsigned int hardirqs_off:1; /* 24:13 4 */\n\n /* size: 32, cachelines: 1 */\n /* padding: 4 */\n /* bit_padding: 13 bits */\n /* last cacheline: 32 bytes */\n};\n\n[mingo@elte.hu: shrunk hlock-\u003eclass too]\n[peterz@infradead.org: fixup bit sizes]\nSigned-off-by: Dave Jones \u003cdavej@redhat.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\n" }, { "commit": "64aa348edc617dea17bbd01ddee4e47886d5ec8c", "tree": "002b5fa796aff225d0cb9d0c32bb3ba96da6eaaf", "parents": [ "5e710e37bde120bb069f691bee68e69ef4393173" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Aug 11 09:30:21 2008 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 09:30:21 2008 +0200" }, "message": "lockdep: lock_set_subclass - reset a held lock\u0027s subclass\n\nthis can be used to reset a held lock\u0027s subclass, for arbitrary-depth\niterated data structures such as trees or lists which have per-node\nlocks.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "cf206bffbb7542df54043fad9898113172af99d8", "tree": "c7e7ca9a93443b888f98a0c07e74751a1aa3c947", "parents": [ "c1955a3d4762e7a9bf84035eb3c4886a900f0d15", "796aadeb1b2db9b5d463946766c5bbfd7717158c" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 08:59:21 2008 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 08:59:21 2008 +0200" }, "message": "Merge branch \u0027linus\u0027 into sched/clock\n" }, { "commit": "c1955a3d4762e7a9bf84035eb3c4886a900f0d15", "tree": "a00dcd1736c612017df7094a91d8a6435b7a49c9", "parents": [ "4a273f209cc95d148f79b4c96d3d03997b44ffda" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Aug 11 08:59:03 2008 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 11 08:59:03 2008 +0200" }, "message": "sched_clock: delay using sched_clock()\n\nSome arch\u0027s can\u0027t handle sched_clock() being called too early - delay\nthis until sched_clock_init() has been called.\n\nReported-by: Bill Gatliff \u003cbgat@billgatliff.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nTested-by: Nishanth Aravamudan \u003cnacc@us.ibm.com\u003e\nCC: Russell King - ARM Linux \u003clinux@arm.linux.org.uk\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "25d6cbd840d958aada29a342c9ee370590ff7b21", "tree": "7b2bcc92ad14d046a1c0beb5e8edb732e819eaa4", "parents": [ "1c2c30acc52320d506d722f41d50e8eb8fda5cb5" ], "author": { "name": "Ian Molton", "email": "spyro@f2s.com", "time": "Sun Aug 10 23:32:07 2008 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@openedhand.com", "time": "Sun Aug 10 23:32:07 2008 +0200" }, "message": "mfd: tc6393 cleanup and update\n\nThis patchset cleans up the TC6393XB support.\n\n* Add provision for the MMC subdevice\n* Disable / enable clocks on suspend / resume\n* Remove fragments of badly merged code (eg. linux/fb include etc.)\n* Use a device specific clock name to break dependancy on ARM/PXA2XX\n* Drop unnecessary resource names\n* Switch to tmio_io* accessors\n\nSigned-off-by: Ian Molton \u003cspyro@f2s.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@openedhand.com\u003e\n" }, { "commit": "cbdfb426392557d49b1a0e7cb59b16c20dc42955", "tree": "c012fcaff3114613050536e421a353184dff14ef", "parents": [ "1f192015ca5b2f4d0a79c191f03f64e72fd8fc29" ], "author": { "name": "Ian Molton", "email": "spyro@f2s.com", "time": "Tue Jul 15 15:12:52 2008 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@openedhand.com", "time": "Sun Aug 10 20:09:55 2008 +0200" }, "message": "mfd: driver for the TC6387XB TMIO controller.\n\nThis patch adds support for the TC6387XB. Unlike other TMIO devices this one\nhas only one subdevice and no interrupt mux, however using the MFD framework\nallows it to share the TMIO MMC driver.\n\nSigned-off-by: Ian Molton \u003cspyro@f2s.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@openedhand.com\u003e\n" }, { "commit": "1f192015ca5b2f4d0a79c191f03f64e72fd8fc29", "tree": "073e1bca0f1f32417da5756762f8f2d72105ba23", "parents": [ "d3a2f71853ce543c5515d4982e202751e15b0b6d" ], "author": { "name": "Ian Molton", "email": "spyro@f2s.com", "time": "Tue Jul 15 15:09:43 2008 +0100" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@openedhand.com", "time": "Sun Aug 10 20:09:50 2008 +0200" }, "message": "mfd: driver for the T7L66XB TMIO SoC\n\nThis patchset provides support for the core functinality of the T7L66XB\nSoC from Toshiba. Supported in this patchset is the IRQ MUX, MMC controller\nand NAND flash controller.\n\nSigned-off-by: Ian Molton \u003cspyro@f2s.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@openedhand.com\u003e\n" }, { "commit": "d3a2f71853ce543c5515d4982e202751e15b0b6d", "tree": "29961e954be46326a8f914697c021dff153cef80", "parents": [ "796aadeb1b2db9b5d463946766c5bbfd7717158c" ], "author": { "name": "Ian Molton", "email": "spyro@f2s.com", "time": "Thu Jul 31 20:44:28 2008 +0200" }, "committer": { "name": "Samuel Ortiz", "email": "sameo@openedhand.com", "time": "Sun Aug 10 20:09:43 2008 +0200" }, "message": "mfd: TMIO MMC structures and accessors.\n\nSigned-off-by: Ian Molton \u003cspyro@f2s.com\u003e\nSigned-off-by: Samuel Ortiz \u003csameo@openedhand.com\u003e\n" }, { "commit": "4fbb71597af591fa0ef565df1ba745c92d5070f7", "tree": "dcfdfa866e2ad3a14992b5a1fe6cd19711d5efab", "parents": [ "e6ca23289f865f0372b89f42884c258a8e85460b", "5595cffc8248e4672c5803547445e85e4053c8fc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 09 16:21:33 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 09 16:21:33 2008 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:\n SLUB: dynamic per-cache MIN_PARTIAL\n mm: unexport ksize\n" }, { "commit": "28efb9e1a758435bb9d49798400fb0373d018d5c", "tree": "bc7f376f5cc37776068d6e52a8daba8595692e27", "parents": [ "796aadeb1b2db9b5d463946766c5bbfd7717158c", "33f197a603e61ddd099c29e94166d3172cdf57e4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 09 10:53:42 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 09 10:53:42 2008 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:\n avr32: Make atstk1006_nand_data definition static\n avr32: Reduce DataFlash bus speed to 8 MHz on ATNGW100\n avr32: Update defconfigs\n avr32: Clean up HMATRIX code\n avr32: Add MMIO address definitions for certain controllers\n avr32: Introduce \u003cmach/chip.h\u003e\n avr32: Remove include/asm-avr32/arch-at32ap\n" }, { "commit": "6724cce8fb4b408ae1a2fab455050f3407c80144", "tree": "14f85fa0c9ba43debf3b2dc021de305107218c25", "parents": [ "49b75b87ce2dfbd99e59a50c3681b154d07e3a22" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Fri Aug 08 13:56:20 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 08 16:17:16 2008 -0700" }, "message": "list.h: fix fatal kernel-doc error\n\nFix fatal multi-line kernel-doc error in list.h:\nfunction short description must be on one line.\n\nError(linux-2.6.27-rc2-git3//include/linux/list.h:318): duplicate section name \u0027Description\u0027\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "49b75b87ce2dfbd99e59a50c3681b154d07e3a22", "tree": "f14e1da19a13d87a512f9043c2f37fd75dd122b3", "parents": [ "f1c7f79b6ab4f7ada002a0fae47f462ede6b6857", "097d9eb537ff4d88b74c3fe67392e27c478ca3c5" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 08 11:38:42 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 08 11:38:42 2008 -0700" }, "message": "Merge branch \u0027for-linus-merged\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027for-linus-merged\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm:\n [ARM] 5177/1: arm/mach-sa1100/Makefile: remove CONFIG_SA1100_USB\n [ARM] 5166/1: magician: add MAINTAINERS entry\n [ARM] fix pnx4008 build errors\n [ARM] Fix SMP booting with non-zero PHYS_OFFSET\n [ARM] 5185/1: Fix spi num_chipselect for lubbock\n [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach\n [ARM] Add support for arch/arm/mach-*/include and arch/arm/plat-*/include\n [ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead\n [ARM] Eliminate useless includes of asm/mach-types.h\n [ARM] Fix circular include dependency with IRQ headers\n avr32: Use \u003cmach/foo.h\u003e instead of \u003casm/arch/foo.h\u003e\n avr32: Introduce arch/avr32/mach-*/include/mach\n avr32: Move include/asm-avr32 to arch/avr32/include/asm\n [ARM] sa1100_wdt: use reset_status to remember watchdog reset status\n [ARM] pxa: introduce reset_status and clear_reset_status for driver\u0027s usage\n [ARM] pxa: introduce reset.h for reset specific header information\n" }, { "commit": "097d9eb537ff4d88b74c3fe67392e27c478ca3c5", "tree": "9034d676d9096857a380aab9d99e3e88fccb6bfe", "parents": [ "c41107c2d4fd31924533f4dbc4c3428acc2b5894", "aeee90dfa01844168cd7f8051d0a0f969c573067" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Fri Aug 08 17:33:47 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Aug 08 19:18:18 2008 +0100" }, "message": "Merge Linus\u0027 latest into master\n\nConflicts:\n\n\tdrivers/watchdog/at91rm9200_wdt.c\n\tdrivers/watchdog/davinci_wdt.c\n\tdrivers/watchdog/ep93xx_wdt.c\n\tdrivers/watchdog/ixp2000_wdt.c\n\tdrivers/watchdog/ixp4xx_wdt.c\n\tdrivers/watchdog/ks8695_wdt.c\n\tdrivers/watchdog/omap_wdt.c\n\tdrivers/watchdog/pnx4008_wdt.c\n\tdrivers/watchdog/sa1100_wdt.c\n\tdrivers/watchdog/wdt285.c\n" }, { "commit": "f2d7499be1b1fe1cd8a5e6a01c1f44173894a241", "tree": "64d341a90d8cb831a5097e365d303367906f1373", "parents": [ "8d659f5e43c5db2630e85f507b7384365e9e1c1e", "76aab2c1eae491a5d73ac83deec97dd28ebac584" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 08 11:15:23 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 08 11:15:23 2008 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (99 commits)\n pkt_sched: Fix actions referencing\n bnx2x: fix logical op\n tcp: (whitespace only) fix confusing indentation\n pkt_sched: Fix qdisc config when link is down.\n [Bluetooth] Add full quirk implementation for btusb driver\n [Bluetooth] Removal of unnecessary ignore module parameter\n [Bluetooth] Add parameters to control BNEP header compression\n ath9k: Revamp wireless mode usage\n ath9k: More unused macros\n ath9k: Remove a few unused macros and fix indentation\n ath9k: Use mac80211\u0027s band macros and remove enum hal_freq_band\n ath9k: Remove redundant data structure ath9k_txq_info\n ath9k: Cleanup data structures related to HW capabilities\n ath9k: work around gcc ICEs\n ath9k: Add new Atheros IEEE 802.11n driver\n ath5k: remove Atheros 11n devices from supported list\n list.h: add list_cut_position()\n list.h: Add list_splice_tail() and list_splice_tail_init()\n p54: swap short slot time dcf values\n rt2x00: Block all unsupported modes\n ...\n" }, { "commit": "2727f226a65e034f93846def7fab314dee430df3", "tree": "68af1b225c3501358ec2666bf401f165a9eee739", "parents": [ "058ddee5625ade9e9e011b9ae155ac3b8d4eda3a" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Fri Aug 08 15:13:27 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Aug 08 15:13:27 2008 +0100" }, "message": "[ARM] fix pnx4008 build errors\n\ninclude/linux/i2c-pnx.h was missed when moving the include files.\nFix it now; it doesn\u0027t really need to include mach/i2c.h at all.\nSuccessfully build tested with pnx4008_defconfig, which had\nfailed in linux-next.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a7448db4826efb097e94f601f4cd9b37053e81bf", "tree": "6e65bfe7369dffae2f5bcd06f12381cd02da0541", "parents": [ "a09e64fbc0094e3073dbb09c3b4bfe4ab669244b" ], "author": { "name": "Haavard Skinnemoen", "email": "haavard.skinnemoen@atmel.com", "time": "Tue Aug 05 14:50:11 2008 +0200" }, "committer": { "name": "Haavard Skinnemoen", "email": "haavard.skinnemoen@atmel.com", "time": "Fri Aug 08 12:31:55 2008 +0200" }, "message": "avr32: Remove include/asm-avr32/arch-at32ap\n\nSince all users have been converted over to use \u003cmach/foo.h\u003e, there\u0027s no\nneed for the arch-at32ap directory and associated symlink anymore.\n\nSigned-off-by: Haavard Skinnemoen \u003chaavard.skinnemoen@atmel.com\u003e\n" }, { "commit": "aeee90dfa01844168cd7f8051d0a0f969c573067", "tree": "f7a62a16a1484321ce5b4306d5e5f7fa8819243c", "parents": [ "273b2578392bbf6e5c47a8a3d1ee461ce6fc7182", "5861bbfcc10fc0358abf52c7d22850c8d180f0b0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 07 18:14:24 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 07 18:14:24 2008 -0700" }, "message": "Merge branch \u0027tracehook\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace\n\n* \u0027tracehook\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-utrace:\n tracehook: fix CLONE_PTRACE\n" }, { "commit": "273b2578392bbf6e5c47a8a3d1ee461ce6fc7182", "tree": "1b00bd21574b1f8db084be4f682d7251a3a0ff3e", "parents": [ "8e43e12d638f732fa32600c324711f4be8fe0b1d", "06a91a02e9b249695f964bb59c8b02152c21e90c" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 07 18:14:07 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 07 18:14:07 2008 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:\n IB/mad: Test ib_create_send_mad() return with IS_ERR(), not \u003d\u003d NULL\n IB/mlx4: Allow 4K messages for UD QPs\n mlx4_core: Add ethernet fields to CQE struct\n IB/ipath: Fix printk format warnings\n RDMA/cxgb3: Fix deadlock initializing iw_cxgb3 device\n RDMA/cxgb3: Fix up MW access rights\n RDMA/cxgb3: Fix QP capabilities\n RDMA/cma: Remove padding arrays by using struct sockaddr_storage\n IB/ipath: Use unsigned long for irq flags\n IPoIB/cm: Set correct SG list in ipoib_cm_init_rx_wr()\n" }, { "commit": "3d8cd0c5d75c424f986c0602dc26579fbb7c8080", "tree": "03c61f81542f6c34e32eb5e0dfc3d34668f88fdd", "parents": [ "4c514a5ad1314b872e3185dabaf105c81d39d7e8", "58750139001bae11a1f9b074f3a9c774fecf5ba8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 07 18:07:33 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 07 18:07:33 2008 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:\n Move all of include/asm-m68knommu to arch/m68knommu/include/asm.\n" }, { "commit": "5861bbfcc10fc0358abf52c7d22850c8d180f0b0", "tree": "066a66bd465741973879675b150f517032adcbfa", "parents": [ "685d87f7ccc649ab92b55e18e507a65d0e694eb9" ], "author": { "name": "Roland McGrath", "email": "roland@redhat.com", "time": "Thu Aug 07 16:55:03 2008 -0700" }, "committer": { "name": "Roland McGrath", "email": "roland@redhat.com", "time": "Thu Aug 07 17:18:47 2008 -0700" }, "message": "tracehook: fix CLONE_PTRACE\n\nIn the change in commit 09a05394fe2448a4139b014936330af23fa7ec83, I\noverlooked two nits in the logic and this broke using CLONE_PTRACE\nwhen PTRACE_O_TRACE* are not being used.\n\nA parent that is itself traced at all but not using PTRACE_O_TRACE*,\nusing CLONE_PTRACE would have its new child fail to be traced.\n\nA parent that is not itself traced at all that uses CLONE_PTRACE\n(which should be a no-op in this case) would confuse the bookkeeping\nand lead to a crash at exit time.\n\nThis restores the missing checks and fixes both failure modes.\n\nReported-by: Eduardo Habkost \u003cehabkost@redhat.com\u003e\nSigned-off-by: Roland McGrath \u003croland@redhat.com\u003e\n" }, { "commit": "5a6c9b60b4cc15b22d3102b0033e5cb842125456", "tree": "b2fcd6eb53f998a1beb69ad6e4dbded3232ba292", "parents": [ "7bed523a95425b70af7a59df61d5adb422ef2038" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Aug 08 00:14:24 2008 +0200" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Aug 07 15:33:36 2008 -0700" }, "message": "PCI PM: Export pci_pme_active to drivers\n\nExport pci_pme_active() to drivers, so that they can clear the\nPME_status bit and disable PME# for their devices without involving\nACPI.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "06a91a02e9b249695f964bb59c8b02152c21e90c", "tree": "f4a771f1876f7acb967ceb1033bbe2fc38234018", "parents": [ "3f44675439b136d51179d31eb5a498383cb38624", "be43324d8b316fe83a7b4027334f2825f1121c2c", "70117b9e866b1fdf7e4e84ffb6f38a7b3e9702f8", "e08198169ec5facb3d85bb455efa44a2f8327842", "cd55ef5a10d1a2ea09853bc5fa40aadaf9f80614", "6e0d733d921526e628107fb8b1aff5f7de870d6f" ], "author": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Thu Aug 07 14:12:03 2008 -0700" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Thu Aug 07 14:12:03 2008 -0700" }, "message": "Merge branches \u0027cma\u0027, \u0027cxgb3\u0027, \u0027ipath\u0027, \u0027ipoib\u0027, \u0027mad\u0027 and \u0027mlx4\u0027 into for-linus\n" }, { "commit": "7bed523a95425b70af7a59df61d5adb422ef2038", "tree": "9be8dca899f346e36869a2bb29431a927f3916a7", "parents": [ "a844158a642ffe8b3b29964a88ee802c2834ed0a" ], "author": { "name": "akpm@linux-foundation.org", "email": "akpm@linux-foundation.org", "time": "Tue Aug 05 14:07:53 2008 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Aug 07 09:49:57 2008 -0700" }, "message": "PCI: remove duplicate symbol from pci_ids.h\n\npci.ids.h: remove a duplicated symbol\n\nCc: Doug Thompson \u003cdougthompson@xmission.com\u003e\nSigned-off-by: Grant Coady \u003cgcoady.lk@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "bba81165867313766534dd31603de51bdd36ef9b", "tree": "f6233ae2f717c49b8642009f1762599d30415a9c", "parents": [ "9d82d8eaec032bf935144e0d5789a5cd4b95e958" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Jul 30 12:07:04 2008 -0700" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Aug 07 06:52:01 2008 -0700" }, "message": "PCI: make pci_register_driver() a macro\n\nalpha:\n\nCC [M] drivers/usb/gadget/u_ether.o\nIn file included from include/asm/dma-mapping.h:7,\n from include/linux/dma-mapping.h:52,\n from include/linux/dmaengine.h:29,\n from include/linux/skbuff.h:29,\n from include/linux/if_ether.h:114,\n from include/linux/etherdevice.h:27,\n from drivers/usb/gadget/u_ether.c:29:\ninclude/linux/pci.h: In function \u0027pci_register_driver\u0027:\ninclude/linux/pci.h:673: error: \u0027KBUILD_MODNAME\u0027 undeclared (first use in this function)\ninclude/linux/pci.h:673: error: (Each undeclared identifier is reported only once\ninclude/linux/pci.h:673: error: for each function it appears in.)\n\nSam says:\n\nThe problem is that u_ether.o is used by two modules so when we build it\nKBUILD_MODNAME is not defined because kbuild does not know what value to\nuse.\n\nAnd in pci.h we have the following inline:\n\nstatic inline int __must_check pci_register_driver(struct pci_driver *driver)\n{\n return __pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME);\n}\n\nAnd alpha uses dma-mapping.h to nullify a number of functions that seem to\nrequire something from pci.h.\n\nMaking it a macro fixes this particular problem. However, the underlying issue\nof a file using KBUILD_MODNAME and being shared between multiple modules is\n*not* addressed. I guess the answer there is \"don\u0027t do that\".\n\nCc: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: Greg KH \u003cgreg@kroah.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "00e8a4da8cf0d7dba8cc4b0da28ea0f12dcf6b36", "tree": "66d6b18fbafd6f1887f7ab7246e98caff2dd720c", "parents": [ "7d283aee50351ec19eaf654a8690d77c4e1dff50" ], "author": { "name": "Luis R. Rodriguez", "email": "lrodriguez@atheros.com", "time": "Wed Aug 06 13:28:54 2008 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 07 09:49:42 2008 -0400" }, "message": "list.h: add list_cut_position()\n\nThis adds list_cut_position() which lets you cut a list into\ntwo lists given a pivot in the list.\n\nSigned-off-by: Luis R. Rodriguez \u003clrodriguez@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "7d283aee50351ec19eaf654a8690d77c4e1dff50", "tree": "8b0079f19db09ecd264cc2e8c428033fe725015f", "parents": [ "e6fce5b916cd7f7f79b2b3e53ba74bbfc1d7cf8b" ], "author": { "name": "Luis R. Rodriguez", "email": "lrodriguez@atheros.com", "time": "Wed Aug 06 15:21:26 2008 -0700" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Thu Aug 07 09:49:42 2008 -0400" }, "message": "list.h: Add list_splice_tail() and list_splice_tail_init()\n\nIf you are using linked lists for queues list_splice() will not do what\nyou would expect even if you use the elements passed reversed. We need\nto handle these differently. We add list_splice_tail() and\nlist_splice_tail_init().\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Luis R. Rodriguez \u003clrodriguez@atheros.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "32bb93b02da8c75031e601ff1f9a25f99febbe5f", "tree": "429d2b978f517d366de572fa5058d513ed7b51a6", "parents": [ "6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718", "3859069bc3358772b08bd91efe9edec39a746ea8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 07 02:10:27 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 07 02:10:27 2008 -0700" }, "message": "Merge branch \u0027upstream-davem\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6\n" }, { "commit": "a09e64fbc0094e3073dbb09c3b4bfe4ab669244b", "tree": "69689f467179891b498bd7423fcf61925173db31", "parents": [ "a1b81a84fff05dbfef45b7012c26e1fee9973e5d" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Tue Aug 05 16:14:15 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Aug 07 09:55:48 2008 +0100" }, "message": "[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach\n\nThis just leaves include/asm-arm/plat-* to deal with.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "a1b81a84fff05dbfef45b7012c26e1fee9973e5d", "tree": "3d053e76542ad4d20bd83ad35c13eabff97003ab", "parents": [ "4fb8af10d0fd09372d52966b76922b9e82bbc950", "3663b736a5083b3bce74520b637f630f01f66a7f" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Thu Aug 07 09:55:16 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Aug 07 09:55:16 2008 +0100" }, "message": "Merge branch \u0027header-move\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6\n" }, { "commit": "4fb8af10d0fd09372d52966b76922b9e82bbc950", "tree": "d240e4d40357583e3f3eb228dccf20122a5b31ed", "parents": [ "f44f82e8a20b98558486eb14497b2f71c78fa325", "64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Thu Aug 07 09:55:03 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Aug 07 09:55:03 2008 +0100" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes\n" }, { "commit": "be509729356b7433f73df2b9a966674a437fbbc1", "tree": "5a3e90513c106f9dcf08405e4ebd3599fd14413c", "parents": [ "0f8469a54f7bd65f2c740a5480c56260dc8a7ae0" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Mon Aug 04 10:41:28 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Aug 07 09:40:08 2008 +0100" }, "message": "[ARM] Remove asm/hardware.h, use asm/arch/hardware.h instead\n\nRemove includes of asm/hardware.h in addition to asm/arch/hardware.h.\nThen, since asm/hardware.h only exists to include asm/arch/hardware.h,\nupdate everything to directly include asm/arch/hardware.h and remove\nasm/hardware.h.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "0f8469a54f7bd65f2c740a5480c56260dc8a7ae0", "tree": "4f922bf707c379352eb4c077fbb0a8c48c07fc1f", "parents": [ "897d85275d7f061ff0ec838bd5224a9e76ad07d6" ], "author": { "name": "Russell King", "email": "rmk@dyn-67.arm.linux.org.uk", "time": "Sun Aug 03 15:06:16 2008 +0100" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Thu Aug 07 09:40:04 2008 +0100" }, "message": "[ARM] Eliminate useless includes of asm/mach-types.h\n\nThere are 43 includes of asm/mach-types.h by files that don\u0027t\nreference anything from that file. Remove these unnecessary\nincludes.\n\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "3859069bc3358772b08bd91efe9edec39a746ea8", "tree": "9ffe71711dd98cf511ad21d9990c597de0ac3b2b", "parents": [ "e2c709b0ba2886b5438b666222b4b3faf82d65a9", "867240f7b2a37b1be4ba37d904a9064a96c82099" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Thu Aug 07 04:05:46 2008 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu Aug 07 04:05:46 2008 -0400" }, "message": "Merge branch \u0027for-jeff\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into tmp\n" }, { "commit": "6edafaaf6f5e70ef1e620ff01bd6bacebe1e0718", "tree": "a470cdfd59d88ccf4acf4726db6b5d8d4df88da7", "parents": [ "ee7af8264dafa0c8c76a8dc596803966c2e29ebc" ], "author": { "name": "Gui Jianfeng", "email": "guijianfeng@cn.fujitsu.com", "time": "Wed Aug 06 23:50:04 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 06 23:50:04 2008 -0700" }, "message": "tcp: Fix kernel panic when calling tcp_v(4/6)_md5_do_lookup\n\nIf the following packet flow happen, kernel will panic.\nMathineA\t\t\tMathineB\n\t\tSYN\n\t----------------------\u003e \n \tSYN+ACK\n\t\u003c----------------------\n\t\tACK(bad seq)\n\t----------------------\u003e\nWhen a bad seq ACK is received, tcp_v4_md5_do_lookup(skb-\u003esk, ip_hdr(skb)-\u003edaddr))\nis finally called by tcp_v4_reqsk_send_ack(), but the first parameter(skb-\u003esk) is \nNULL at that moment, so kernel panic happens.\nThis patch fixes this bug.\n\nOOPS output is as following:\n[ 302.812793] IP: [\u003cc05cfaa6\u003e] tcp_v4_md5_do_lookup+0x12/0x42\n[ 302.817075] Oops: 0000 [#1] SMP \n[ 302.819815] Modules linked in: ipv6 loop dm_multipath rtc_cmos rtc_core rtc_lib pcspkr pcnet32 mii i2c_piix4 parport_pc i2c_core parport ac button ata_piix libata dm_mod mptspi mptscsih mptbase scsi_transport_spi sd_mod scsi_mod crc_t10dif ext3 jbd mbcache uhci_hcd ohci_hcd ehci_hcd [last unloaded: scsi_wait_scan]\n[ 302.849946] \n[ 302.851198] Pid: 0, comm: swapper Not tainted (2.6.27-rc1-guijf #5)\n[ 302.855184] EIP: 0060:[\u003cc05cfaa6\u003e] EFLAGS: 00010296 CPU: 0\n[ 302.858296] EIP is at tcp_v4_md5_do_lookup+0x12/0x42\n[ 302.861027] EAX: 0000001e EBX: 00000000 ECX: 00000046 EDX: 00000046\n[ 302.864867] ESI: ceb69e00 EDI: 1467a8c0 EBP: cf75f180 ESP: c0792e54\n[ 302.868333] DS: 007b ES: 007b FS: 00d8 GS: 0000 SS: 0068\n[ 302.871287] Process swapper (pid: 0, ti\u003dc0792000 task\u003dc0712340 task.ti\u003dc0746000)\n[ 302.875592] Stack: c06f413a 00000000 cf75f180 ceb69e00 00000000 c05d0d86 000016d0 ceac5400 \n[ 302.883275] c05d28f8 000016d0 ceb69e00 ceb69e20 681bf6e3 00001000 00000000 0a67a8c0 \n[ 302.890971] ceac5400 c04250a3 c06f413a c0792eb0 c0792edc cf59a620 cf59a620 cf59a634 \n[ 302.900140] Call Trace:\n[ 302.902392] [\u003cc05d0d86\u003e] tcp_v4_reqsk_send_ack+0x17/0x35\n[ 302.907060] [\u003cc05d28f8\u003e] tcp_check_req+0x156/0x372\n[ 302.910082] [\u003cc04250a3\u003e] printk+0x14/0x18\n[ 302.912868] [\u003cc05d0aa1\u003e] tcp_v4_do_rcv+0x1d3/0x2bf\n[ 302.917423] [\u003cc05d26be\u003e] tcp_v4_rcv+0x563/0x5b9\n[ 302.920453] [\u003cc05bb20f\u003e] ip_local_deliver_finish+0xe8/0x183\n[ 302.923865] [\u003cc05bb10a\u003e] ip_rcv_finish+0x286/0x2a3\n[ 302.928569] [\u003cc059e438\u003e] dev_alloc_skb+0x11/0x25\n[ 302.931563] [\u003cc05a211f\u003e] netif_receive_skb+0x2d6/0x33a\n[ 302.934914] [\u003cd0917941\u003e] pcnet32_poll+0x333/0x680 [pcnet32]\n[ 302.938735] [\u003cc05a3b48\u003e] net_rx_action+0x5c/0xfe\n[ 302.941792] [\u003cc042856b\u003e] __do_softirq+0x5d/0xc1\n[ 302.944788] [\u003cc042850e\u003e] __do_softirq+0x0/0xc1\n[ 302.948999] [\u003cc040564b\u003e] do_softirq+0x55/0x88\n[ 302.951870] [\u003cc04501b1\u003e] handle_fasteoi_irq+0x0/0xa4\n[ 302.954986] [\u003cc04284da\u003e] irq_exit+0x35/0x69\n[ 302.959081] [\u003cc0405717\u003e] do_IRQ+0x99/0xae\n[ 302.961896] [\u003cc040422b\u003e] common_interrupt+0x23/0x28\n[ 302.966279] [\u003cc040819d\u003e] default_idle+0x2a/0x3d\n[ 302.969212] [\u003cc0402552\u003e] cpu_idle+0xb2/0xd2\n[ 302.972169] \u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n[ 302.974274] Code: fc ff 84 d2 0f 84 df fd ff ff e9 34 fe ff ff 83 c4 0c 5b 5e 5f 5d c3 90 90 57 89 d7 56 53 89 c3 50 68 3a 41 6f c0 e8 e9 55 e5 ff \u003c8b\u003e 93 9c 04 00 00 58 85 d2 59 74 1e 8b 72 10 31 db 31 c9 85 f6 \n[ 303.011610] EIP: [\u003cc05cfaa6\u003e] tcp_v4_md5_do_lookup+0x12/0x42 SS:ESP 0068:c0792e54\n[ 303.018360] Kernel panic - not syncing: Fatal exception in interrupt\n\nSigned-off-by: Gui Jianfeng \u003cguijianfeng@cn.fujitsu.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "fe414248551e2880fe8913577699003ff145ab9d", "tree": "d775ad642b3bed42659956f2ddac3f8e382c6c35", "parents": [ "9a5d3414202a21ed4b053657345ea0fd492d513a" ], "author": { "name": "Laurent Pinchart", "email": "laurentp@cse-semaphore.com", "time": "Wed Jul 23 17:41:52 2008 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu Aug 07 02:22:54 2008 -0400" }, "message": "dm9000: Support MAC address setting through platform data.\n\nThe dm9000 driver reads the chip\u0027s MAC address from the attached EEPROM. When\nno EEPROM is present, or when the MAC address is invalid, it falls back to\nreading the address from the chip.\n\nThis patch lets platform code set the desired MAC address through platform\ndata.\n\nSigned-off-by: Laurent Pinchart \u003claurentp@cse-semaphore.com\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "b11f8d8cc3bb2fa6fa55286babc1a5ebb2e932c4", "tree": "bafbb4ca35003403da55c5a34c56e2390d1af8b2", "parents": [ "4f63135eb23015a17eaf4f7478deedf63e98ff5c" ], "author": { "name": "Brandon Philips", "email": "brandon@ifup.org", "time": "Tue Jul 15 02:18:41 2008 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jgarzik@redhat.com", "time": "Thu Aug 07 02:22:08 2008 -0400" }, "message": "ethtool: Expand ethtool_cmd.speed to 32 bits\n\nIntroduce the speed_hi field to ethtool_cmd, using the reserved space,\nto expand the speed field to 2^32 Megabits/second.\n\nMaking this field expansion now gives us plenty of time to fix up the\nuser-space pieces that use SIOCETHTOOL before hardware faster than 64\nGb/s is available.\n\nSigned-off-by: Brandon Philips \u003cbphilips@suse.de\u003e\nSigned-off-by: Jeff Garzik \u003cjgarzik@redhat.com\u003e\n" }, { "commit": "58750139001bae11a1f9b074f3a9c774fecf5ba8", "tree": "ecdafd4d8c3d2ef2cee7e512b7310552863a617c", "parents": [ "685d87f7ccc649ab92b55e18e507a65d0e694eb9" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jul 31 14:38:07 2008 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Aug 07 15:36:16 2008 +1000" }, "message": "Move all of include/asm-m68knommu to arch/m68knommu/include/asm.\nWith the current kbuild infrastructure in place no other changes\nare required for this to work.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "f780a9f119caa48088b230836a7fa73d1096de7c", "tree": "513fb3aa4342a481aa1f4101675ea2e9c41bc28a", "parents": [ "6e86841d05f371b5b9b86ce76c02aaee83352298" ], "author": { "name": "Yevgeny Petrilin", "email": "yevgenyp@mellanox.co.il", "time": "Wed Aug 06 20:14:06 2008 -0700" }, "committer": { "name": "Roland Dreier", "email": "rolandd@cisco.com", "time": "Wed Aug 06 20:14:06 2008 -0700" }, "message": "mlx4_core: Add ethernet fields to CQE struct\n\nAdd ethernet-related fields to struct mlx4_cqe so that the mlx4_en\nethernet NIC driver can share the same definition.\n\nSigned-off-by: Yevgeny Petrilin \u003cyevgenyp@mellanox.co.il\u003e\nSigned-off-by: Roland Dreier \u003crolandd@cisco.com\u003e\n" }, { "commit": "2e521061db61a35dd64ea85a1642f9a9dfde2872", "tree": "30fb02b0f57d19c566e6439ec3599613402727fd", "parents": [ "01c1e4ca8ec39d21be0cd9d1b300d479de97298a" ], "author": { "name": "Robert Jarzmik", "email": "robert.jarzmik@free.fr", "time": "Fri Aug 01 20:14:50 2008 -0300" }, "committer": { "name": "Mauro Carvalho Chehab", "email": "mchehab@infradead.org", "time": "Wed Aug 06 06:57:32 2008 -0300" }, "message": "V4L/DVB (8610): Add suspend/resume capabilities to soc_camera.\n\nAdd suspend/resume hooks to call soc operation specific\nsuspend and resume functions. This ensures the camera\nchip has been previously resumed, as well as the camera\nbus.\nThese hooks in camera chip drivers should save/restore\nchip context between suspend and resume time.\n\nSigned-off-by: Robert Jarzmik \u003crobert.jarzmik@free.fr\u003e\nSigned-off-by: Guennadi Liakhovetski \u003cg.liakhovetski@gmx.de\u003e\nSigned-off-by: Mauro Carvalho Chehab \u003cmchehab@infradead.org\u003e\n" }, { "commit": "18351070b86d155713cf790b26af4f21b1fd0b29", "tree": "66e98f59de072733af7ae65cebf135c37caab249", "parents": [ "e63e03273b89f7248baa56cf242474f661e776e1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 05 21:42:21 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 05 21:42:21 2008 -0700" }, "message": "Re-introduce \"[SCSI] extend the last_sector_bug flag to cover more sectors\"\n\nThis re-introduces commit 2b142900784c6e38c8d39fa57d5f95ef08e735d8,\nwhich was reverted due to the regression it caused by commit\nfca082c9f1e11ec07efa8d2f9f13688521253f36.\n\nThat regression was not root-caused by the original commit, it was just\nuncovered by it, and the real fix was done by Alan Stern in commit\n580da34847488b404218d1d7f53b156f245f5555 (\"Fix USB storage hang on\ncommand abort\").\n\nWe can thus re-introduce the change that was confirmed by Alan Jenkins\nto be still required by his odd card reader.\n\nCc: Alan Jenkins \u003calan-jenkins@tuffmail.co.uk\u003e\nCc: Alan Stern \u003cstern@rowland.harvard.edu\u003e\nCc: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e63e03273b89f7248baa56cf242474f661e776e1", "tree": "7e0a000ed3b252849b9002306ba479074c165330", "parents": [ "37193fb4639fa94f91cbbab1e8aca596300e1d94", "ffb208479bd62ab26c29a242faeb1de1c6d5fcdc" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 05 19:37:42 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 05 19:37:42 2008 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (78 commits)\n AX.25: Fix sysctl registration if !CONFIG_AX25_DAMA_SLAVE\n pktgen: mac count\n pktgen: random flow \n bridge: Eliminate unnecessary forward delay\n bridge: fix compile warning in net/bridge/br_netfilter.c\n ipv4: remove unused field in struct flowi (include/net/flow.h).\n tg3: Fix \u0027scheduling while atomic\u0027 errors\n net: Kill plain NET_XMIT_BYPASS.\n net_sched: Add qdisc __NET_XMIT_BYPASS flag\n net_sched: Add qdisc __NET_XMIT_STOLEN flag\n iwl3945: fix merge mistake for packet injection\n iwlwifi: grap nic access before accessing periphery registers\n iwlwifi: decrement rx skb counter in scan abort handler\n iwlwifi: fix unhandled interrupt when HW rfkill is on\n iwlwifi: implement iwl5000_calc_rssi\n iwlwifi: memory allocation optimization\n iwlwifi: HW bug fixes\n p54: Fix potential concurrent access to private data\n rt2x00: Disable link tuning in rt2500usb\n iwlwifi: Don\u0027t use buffer allocated on the stack for led names\n ...\n" }, { "commit": "bf1db69fbf4ff511e88736ce2e6318846f34492b", "tree": "545a9d60d7932dbfc7ce5d9af621c9af9923bc3a", "parents": [ "7c44319dc6deb0028ef7811670bf1e4bc6644672" ], "author": { "name": "Richard Hughes", "email": "richard@hughsie.com", "time": "Tue Aug 05 13:01:35 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 05 14:33:50 2008 -0700" }, "message": "pm_qos: spelling fixes\n\nA documentation cleanup patch. With a minor tweak to clarify units for\nkbs.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: mark gross \u003cmgross@linux.intel.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "efc491814308f89d5ef6c4fe19ae4552a67d4132", "tree": "2e00231a9ac9221ebb52cedf8249db0441603094", "parents": [ "f6ac436dcc4c34709bcde355f3f2254ac0a183d4" ], "author": { "name": "David Miller", "email": "davem@davemloft.net", "time": "Tue Aug 05 13:01:25 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 05 14:33:49 2008 -0700" }, "message": "radeon: misc corrections\n\nI have a new PCI-E radeon RV380 series card (PCI device ID 5b64) that\nhangs in my sparc64 boxes when the init scripts set the font. The problem\ngoes away if I disable acceleration.\n\nI haven\u0027t figured out that bug yet, but along the way I found some\ncorrections to make based upon some auditing.\n\n1) The RB2D_DC_FLUSH_ALL value used by the kernel fb driver\n and the XORG video driver differ. I\u0027ve made the kernel\n match what XORG is using.\n\n2) In radeonfb_engine_reset() we have top-level code structure\n that roughly looks like:\n\n\tif (family is 300, 350, or V350)\n\t\tdo this;\n\telse\n\t\tdo that;\n\t...\n\tif (family is NOT 300, OR\n\t family is NOT 350, OR\n\t family is NOT V350)\n\t\tdo another thing;\n\n this last conditional makes no sense, is always true,\n and obviously was likely meant to be \"family is NOT\n 300, 350, or V350\". So I\u0027ve made the code match the\n intent.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nTested-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f6ac436dcc4c34709bcde355f3f2254ac0a183d4", "tree": "a0f70b63df735a2bb780ee0bfac5d92be63a9f25", "parents": [ "8cd6819842b79953c61250c719f61e01e51dd8cd" ], "author": { "name": "Mark Asselstine", "email": "mark.asselstine@windriver.com", "time": "Tue Aug 05 13:01:24 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 05 14:33:48 2008 -0700" }, "message": "Remove the deprecated cli() sti() functions\n\nThese functions have been deprecated for some time now but remained until\nall legacy callers could be removed. With a few commits in 2.6.26 this\nhas happened so now we can remove these deprecated functions.\n\nSigned-off-by: Mark Asselstine \u003cmark.asselstine@windriver.com\u003e\nReviewed-by: Matthew Wilcox \u003cwilly@linux.intel.com\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "60cadec9da7b6c91aca51f408c828f7e74a68379", "tree": "006fa6831612ad3a70312f6b513c1dfc73cd5816", "parents": [ "756fcab27756f32722b748e2aff3393eef9a589d" ], "author": { "name": "Shadi Ammouri", "email": "shadi@marvell.com", "time": "Tue Aug 05 13:01:09 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 05 14:33:46 2008 -0700" }, "message": "spi: new orion_spi driver\n\nThis adds an SPI driver for the SPI controller found in various Marvell\nOrion ARM SoCs. It currently supports only one slave, which must use SPI\nmode 0.\n\n[dbrownell@users.sourceforge.net: cleanups, meet specs, pass \"sparse\"]\nSigned-off-by: Shadi Ammouri \u003cshadi@marvell.com\u003e\nSigned-off-by: Saeed Bishara \u003csaeed@marvell.com\u003e\nSigned-off-by: Lennert Buytenhek \u003cbuytenh@marvell.com\u003e\nSigned-off-by: David Brownell \u003cdbrownell@users.sourceforge.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c6e2bee26eee190b20cd87e71b288bca6a5357a4", "tree": "63c3db3e448e844fa60cc1f9a85a25bd970559f0", "parents": [ "775587b6d769af3ba779a12ce790db4ccf0d1676" ], "author": { "name": "Bernhard Walle", "email": "bwalle@suse.de", "time": "Tue Aug 05 13:01:05 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 05 14:33:46 2008 -0700" }, "message": "kdump: report actual value of VMCOREINFO_OSRELEASE in VMCOREINFO\n\nThe current implementation reports the structure name as\nVMCOREINFO_OSRELEASE in VMCOREINFO, e.g.\n\n VMCOREINFO_OSRELEASE\u003dinit_uts_ns.name.release\n\nThat doesn\u0027t make sense because it\u0027s always the same. Instead, use the\nvalue, e.g.\n\n VMCOREINFO_OSRELEASE\u003d2.6.26-rc3\n\nThat\u0027s also what the \u0027makedumpfile -g\u0027 does.\n\nSigned-off-by: Bernhard Walle \u003cbwalle@suse.de\u003e\nCc: \"Ken\u0027ichi Ohmichi\" \u003coomichi@mxs.nes.nec.co.jp\u003e\nAcked-by: Vivek Goyal \u003cvgoyal@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c5bfc3757f1d843a8e1261840c1f53c5062f8e92", "tree": "cd0a125eaaa3e4c8b2e90c59fc8d13e1011776bb", "parents": [ "0e25f710618ce919ac5ae4850c90d3fca19565c3" ], "author": { "name": "Adrian Bunk", "email": "bunk@kernel.org", "time": "Tue Aug 05 18:17:01 2008 +0200" }, "committer": { "name": "Bartlomiej Zolnierkiewicz", "email": "bzolnier@gmail.com", "time": "Tue Aug 05 18:17:01 2008 +0200" }, "message": "ide: remove CONFIG_IDE_MAX_HWIFS\n\nThe benefits of a user settable CONFIG_IDE_MAX_HWIFS have become pretty \ntiny and are no longer considered worth the trouble of an own option.\n\nSimply always #define MAX_HWIFS to 10.\n\nSigned-off-by: Adrian Bunk \u003cbunk@kernel.org\u003e\nSigned-off-by: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\n" }, { "commit": "39b986a6c73434d122967dc86efb295ab9a28437", "tree": "409dbbd1aa99c158a2de4f1e278f245e5785c956", "parents": [ "242f44261e6c5fdc13e3cd12f949ab717dc37d58" ], "author": { "name": "Bartlomiej Zolnierkiewicz", "email": "bzolnier@gmail.com", "time": "Tue Aug 05 18:16:57 2008 +0200" }, "committer": { "name": "Bartlomiej Zolnierkiewicz", "email": "bzolnier@gmail.com", "time": "Tue Aug 05 18:16:57 2008 +0200" }, "message": "ide: sanitize struct ide_port_ops documentation (take 2)\n\nv2:\nAdd missing \u0027@\u0027-s. (Noticed by Randy Dunlap)\n\nCc: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\n" }, { "commit": "84db8d7cdb072866f5a6c6ac2c9a74c5c48dd22f", "tree": "7f10cc33bca606abd1547ae90d90362134a35332", "parents": [ "2b12a4c524812fb3f6ee590a02e65b95c8c32229" ], "author": { "name": "Haavard Skinnemoen", "email": "haavard.skinnemoen@atmel.com", "time": "Tue Aug 05 13:35:07 2008 +0200" }, "committer": { "name": "Haavard Skinnemoen", "email": "haavard.skinnemoen@atmel.com", "time": "Tue Aug 05 13:35:07 2008 +0200" }, "message": "avr32: Move include/asm-avr32 to arch/avr32/include/asm\n\nLeaving include/asm/arch alone for now.\n\nSigned-off-by: Haavard Skinnemoen \u003chaavard.skinnemoen@atmel.com\u003e\n" }, { "commit": "33e334950abda8e42c3b6e6f280fad0d4ab92141", "tree": "7d52e5d4772f578c499200f38cfc54b79e3357fb", "parents": [ "ad619800e4e034cad44299b2a22df9eebb043ac3", "3e2236c108792c3afbbfbe3f373ee7fdd68eda8e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 05 01:28:35 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 05 01:28:35 2008 -0700" }, "message": "Merge branch \u0027no-ath9k\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6\n" }, { "commit": "95c3e8bfcdea8676e2d4d61910c379f4502049bf", "tree": "e6382fa937467903916ee113754d50f0c71e718e", "parents": [ "2f751b67a8be698cec52f786910ef4f0beffe9a7" ], "author": { "name": "Rami Rosen", "email": "ramirose@gmail.com", "time": "Tue Aug 05 01:19:50 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 05 01:19:50 2008 -0700" }, "message": "ipv4: remove unused field in struct flowi (include/net/flow.h).\n\nThis patch removes an unused field (flags) from struct flowi; it seems\nthat this \"flags\" field was used once in the past for multipath\nrouting with FLOWI_FLAG_MULTIPATHOLDROUTE flag (which does no longer\nexist); however, the \"flags\" field of struct flowi is not used\nanymore.\n\nSigned-off-by: Rami Rosen \u003cramirose@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "5595cffc8248e4672c5803547445e85e4053c8fc", "tree": "39aa137d63777fd345f5946f7b1662a6ed78dfda", "parents": [ "231367fd9bccbb36309ab5bf5012e11a84231031" ], "author": { "name": "Pekka Enberg", "email": "penberg@cs.helsinki.fi", "time": "Tue Aug 05 09:28:47 2008 +0300" }, "committer": { "name": "Pekka Enberg", "email": "penberg@cs.helsinki.fi", "time": "Tue Aug 05 09:28:47 2008 +0300" }, "message": "SLUB: dynamic per-cache MIN_PARTIAL\n\nThis patch changes the static MIN_PARTIAL to a dynamic per-cache -\u003emin_partial\nvalue that is calculated from object size. The bigger the object size, the more\npages we keep on the partial list.\n\nI tested SLAB, SLUB, and SLUB with this patch on Jens Axboe\u0027s \u0027netio\u0027 example\nscript of the fio benchmarking tool. The script stresses the networking\nsubsystem which should also give a fairly good beating of kmalloc() et al.\n\nTo run the test yourself, first clone the fio repository:\n\n git clone git://git.kernel.dk/fio.git\n\nand then run the following command n times on your machine:\n\n time ./fio examples/netio\n\nThe results on my 2-way 64-bit x86 machine are as follows:\n\n [ the minimum, maximum, and average are captured from 50 individual runs ]\n\n real time (seconds)\n min max avg sd\n SLAB 22.76 23.38 22.98 0.17\n SLUB 22.80 25.78 23.46 0.72\n SLUB (dynamic) 22.74 23.54 23.00 0.20\n\n sys time (seconds)\n min max avg sd\n SLAB 6.90 8.28 7.70 0.28\n SLUB 7.42 16.95 8.89 2.28\n SLUB (dynamic) 7.17 8.64 7.73 0.29\n\n user time (seconds)\n min max avg sd\n SLAB 36.89 38.11 37.50 0.29\n SLUB 30.85 37.99 37.06 1.67\n SLUB (dynamic) 36.75 38.07 37.59 0.32\n\nAs you can see from the above numbers, this patch brings SLUB to the same level\nas SLAB for this particular workload fixing a ~2% regression. I\u0027d expect this\nchange to help similar workloads that allocate a lot of objects that are close\nto the size of a page.\n\nCc: Matthew Wilcox \u003cmatthew@wil.cx\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nAcked-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nSigned-off-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\n" }, { "commit": "cc6533e98a7f3cb7fce9d740da49195c7aa523a4", "tree": "23b1a33c9c6894f799808e7dcbcf3afeb1d71192", "parents": [ "c27f339af90bb874a7a9c680b17abfd32d4a727b" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 04 23:04:08 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 04 23:04:08 2008 -0700" }, "message": "net: Kill plain NET_XMIT_BYPASS.\n\ndst_input() was doing something completely absurd, looping\non skb-\u003edst-\u003einput() if NET_XMIT_BYPASS was seen, but these\nfunctions never return such an error.\n\nAnd as a result plain ole\u0027 NET_XMIT_BYPASS has no more\nreferences and can be completely killed off.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c27f339af90bb874a7a9c680b17abfd32d4a727b", "tree": "5af236e0b3835976c70c1d5daa2f30be11adf35b", "parents": [ "378a2f090f7a478704a372a4869b8a9ac206234e" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Mon Aug 04 22:39:11 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 04 22:39:11 2008 -0700" }, "message": "net_sched: Add qdisc __NET_XMIT_BYPASS flag\n\nPatrick McHardy \u003ckaber@trash.net\u003e noticed that it would be nice to\nhandle NET_XMIT_BYPASS by NET_XMIT_SUCCESS with an internal qdisc flag\n__NET_XMIT_BYPASS and to remove the mapping from dev_queue_xmit().\n\nDavid Miller \u003cdavem@davemloft.net\u003e spotted a serious bug in the first\nversion of this patch.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "378a2f090f7a478704a372a4869b8a9ac206234e", "tree": "cf324a45a9dc21231d1d3225c51c9d5d2b57bbee", "parents": [ "6e583ce5242f32e925dcb198f7123256d0798370" ], "author": { "name": "Jarek Poplawski", "email": "jarkao2@gmail.com", "time": "Mon Aug 04 22:31:03 2008 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 04 22:31:03 2008 -0700" }, "message": "net_sched: Add qdisc __NET_XMIT_STOLEN flag\n\nPatrick McHardy \u003ckaber@trash.net\u003e noticed:\n\"The other problem that affects all qdiscs supporting actions is\nTC_ACT_QUEUED/TC_ACT_STOLEN getting mapped to NET_XMIT_SUCCESS\neven though the packet is not queued, corrupting upper qdiscs\u0027\nqlen counters.\"\n\nand later explained:\n\"The reason why it translates it at all seems to be to not increase\nthe drops counter. Within a single qdisc this could be avoided by\nother means easily, upper qdiscs would still increase the counter\nwhen we return anything besides NET_XMIT_SUCCESS though.\n\nThis means we need a new NET_XMIT return value to indicate this to\nthe upper qdiscs. So I\u0027d suggest to introduce NET_XMIT_STOLEN,\nreturn that to upper qdiscs and translate it to NET_XMIT_SUCCESS\nin dev_queue_xmit, similar to NET_XMIT_BYPASS.\"\n\nDavid Miller \u003cdavem@davemloft.net\u003e noticed:\n\"Maybe these NET_XMIT_* values being passed around should be a set of\nbits. They could be composed of base meanings, combined with specific\nattributes.\n\nSo you could say \"NET_XMIT_DROP | __NET_XMIT_NO_DROP_COUNT\"\n\nThe attributes get masked out by the top-level -\u003eenqueue() caller,\nsuch that the base meanings are the only thing that make their\nway up into the stack. If it\u0027s only about communication within the\nqdisc tree, let\u0027s simply code it that way.\"\n\nThis patch is trying to realize these ideas.\n\nSigned-off-by: Jarek Poplawski \u003cjarkao2@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ca5de404ff036a29b25e9a83f6919c9f606c5841", "tree": "474da867c4d4086313cee90cdc3560bb17fade96", "parents": [ "529ae9aaa08378cfe2a4350bded76f32cc8ff0ce" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Sat Aug 02 12:02:13 2008 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 21:56:09 2008 -0700" }, "message": "fs: rename buffer trylock\n\nLike the page lock change, this also requires name change, so convert the\nraw test_and_set bitop to a trylock.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "529ae9aaa08378cfe2a4350bded76f32cc8ff0ce", "tree": "d3ae998f9876c72a83a022805103a92111852b21", "parents": [ "e9ba9698187ddbc0c5bfcf41de0349a662d23d02" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Sat Aug 02 12:01:03 2008 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 21:31:34 2008 -0700" }, "message": "mm: rename page trylock\n\nConverting page lock to new locking bitops requires a change of page flag\noperation naming, so we might as well convert it to something nicer\n(!TestSetPageLocked_Lock \u003d\u003e trylock_page, SetPageLocked \u003d\u003e set_page_locked).\n\nThis also facilitates lockdeping of page lock.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nAcked-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2e1e9212ed8c532c6b324de77d3cafef5d2bc846", "tree": "15097a99d03679f2c95ea2fdc0eb3c3ebcc474b8", "parents": [ "2acb802b0c5485aedb46e23b2b45e49573454c09", "f5663f5bded3364158e2d31904173cb1debc2ecd" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 17:26:15 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 17:26:15 2008 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (29 commits)\n sh: enable maple_keyb in dreamcast_defconfig.\n SH2(A) cache update\n nommu: Provide vmalloc_exec().\n add addrespace definition for sh2a.\n sh: Kill off ARCH_SUPPORTS_AOUT and remnants of a.out support.\n sh: define GENERIC_HARDIRQS_NO__DO_IRQ.\n sh: define GENERIC_LOCKBREAK.\n sh: Save NUMA node data in vmcore for crash dumps.\n sh: module_alloc() should be using vmalloc_exec().\n sh: Fix up __bug_table handling in module loader.\n sh: Add documentation and integrate into docbook build.\n sh: Fix up broken kerneldoc comments.\n maple: Kill useless private_data pointer.\n maple: Clean up maple_driver_register/unregister routines.\n input: Clean up maple keyboard driver\n maple: allow removal and reinsertion of keyboard driver module\n sh: /proc/asids depends on MMU.\n arch/sh/boards/mach-se/7343/irq.c: removed duplicated #include\n arch/sh/boards/board-ap325rxa.c: removed duplicated #include\n sh/boards/Makefile typo fix\n ...\n" }, { "commit": "2acb802b0c5485aedb46e23b2b45e49573454c09", "tree": "82afbba3d073ce903cb737412b6eccdf8adab4b5", "parents": [ "d8f4b819c3a5b54a978c6fe5249a17cff490c4a1", "9c4cb82515130c62224e23fdf7c13c8f6c59c614" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 17:25:06 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 17:25:06 2008 -0700" }, "message": "Merge branch \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc\n\n* \u0027merge\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:\n powerpc: Remove use of CONFIG_PPC_MERGE\n powerpc: Force printing of \u0027total_memory\u0027 to unsigned long long\n powerpc: Fix compiler warning in arch/powerpc/mm/mem.c\n powerpc: Move include files to arch/powerpc/include/asm\n" }, { "commit": "115a326c1e5cab457924356123bbfd7d783ecf9d", "tree": "378baee7316461465ce08cf5c997e7426c2d93e6", "parents": [ "18f6db95dcfa68e93bafe435381299abbffb5c7e" ], "author": { "name": "Roland McGrath", "email": "roland@redhat.com", "time": "Mon Aug 04 13:56:01 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 17:23:43 2008 -0700" }, "message": "tracehook: kerneldoc fix\n\nMy last change to tracehook.h made it confuse the kerneldoc parser.\nMove the #define\u0027s before the comment so it\u0027s happy again.\n\nSigned-off-by: Roland McGrath \u003croland@redhat.com\u003e\nAcked-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7274264f60cc0b71389efed286001ff0860c3141", "tree": "ceae2181feb9215091db3127d6918b8ce4420f52", "parents": [ "725aad24c3ba96a7c06448c14c265a466cdbd663" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Sun Aug 03 22:02:10 2008 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 17:16:20 2008 -0700" }, "message": "m68k: some asm-sparc include files moved\n\nSo copy their contents into the asm-m68k files.\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5941de8eadc287f3f47b87ce9888734ee07d210b", "tree": "2f5a8e84c33ae2df61e4e807798a153d6b7f6fbb", "parents": [ "c44df7413fd711bca818111b94cbd7ce5f3600a9", "c6557e7f2b6ae76a44653d38f835174074c42e05" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 17:15:07 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 17:15:07 2008 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git390.osdl.marist.edu/pub/scm/linux-2.6\n\n* \u0027for-linus\u0027 of git://git390.osdl.marist.edu/pub/scm/linux-2.6:\n [S390] move include/asm-s390 to arch/s390/include/asm\n" }, { "commit": "c635fd3d3de9dec4729135add72c2ff32595605b", "tree": "9617681bd52cf63ae0797acc1ab13aefca2ed7d7", "parents": [ "82e68f7ffec3800425f2391c8c86277606860442", "cf368d2f9aced8adc8bd6b1f04294a71551d5fce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 17:03:56 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 17:03:56 2008 -0700" }, "message": "Merge git://git.infradead.org/users/dwmw2/random-2.6\n\n* git://git.infradead.org/users/dwmw2/random-2.6:\n drivers/video/console/promcon.c: fix build error\n Fix IHEX firmware generation/loading\n" }, { "commit": "82248a5e92793014d156a12dbcbba633794ce9f8", "tree": "c91d54ea1122d8faf69bf15c7b8e1dc6921296b4", "parents": [ "c2d5cedadcd3976cfc1fa5590e3a73a059c6401a", "31981db0d0b665713ab3e9531f936fdb67947225" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 17:00:37 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 17:00:37 2008 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:\n Add DIP switch readout for HFC-4S IOB4ST\n Fix remaining big endian issue of hfcmulti\n mISDN cleanup user interface\n mISDN fix main ISDN Makefile\n" }, { "commit": "1a3f7d98e5f50f21ce6fb1406a35531d9596c5c6", "tree": "c08708cd17f163f18c149133c92551f83249fd98", "parents": [ "fca082c9f1e11ec07efa8d2f9f13688521253f36" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 16:50:38 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 16:50:38 2008 -0700" }, "message": "Revert \"UFS: add const to parser token table\"\n\nThis reverts commit f9247273cb69ba101877e946d2d83044409cc8c5 (and\nfb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 - \"fix fs/nfs/nfsroot.c\ncompilation\" - that fixed a missed conversion).\n\nThe changes cause problems for at least the sparc build. Let\u0027s re-do\nthem when the exact issues are resolved.\n\nRequested-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nRequested-by: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fca082c9f1e11ec07efa8d2f9f13688521253f36", "tree": "94a18d0aed308b44ba606261c603c63860c35c30", "parents": [ "8f616cd5249e03c9e1b371623d85e76d4b86bbc1" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 16:36:20 2008 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 04 16:36:20 2008 -0700" }, "message": "Revert \"[SCSI] extend the last_sector_bug flag to cover more sectors\"\n\nThis reverts commit 2b142900784c6e38c8d39fa57d5f95ef08e735d8, since it\nseems to break some other USB storage devices (at least a JMicron USB to\nATA bridge). As such, while it apparently fixes some cardreaders, it\nwould need to be made conditional on the exact reader it fixes in order\nto avoid causing regressions.\n\nCc: Alan Jenkins \u003calan-jenkins@tuffmail.co.uk\u003e\nCc: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" } ], "next": "ea95bba41e69c616bb1512cf59d22f33266b8568" }