)]}' { "log": [ { "commit": "10d90f28033fbd97e86c0cde4c99214165547a4b", "tree": "dc750b7f2e7c39fb4900e96f9967a2745316991e", "parents": [ "aad1830e6b978f5d90e5d81d071e1752f526f732", "b19f8200392db88d529576a4f8178d08b70047be" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 11 08:01:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Sep 11 08:01:09 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sparc: Kill all BKL usage.\n" }, { "commit": "b19f8200392db88d529576a4f8178d08b70047be", "tree": "fcfdbc9de62c614e2ccdc8adcab021aaa60bbb5c", "parents": [ "25edd6946a1d74e5e77813c2324a0908c68bcf9e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 08 20:57:59 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Sep 08 20:57:59 2010 -0700" }, "message": "sparc: Kill all BKL usage.\n\nThey were all bogus artifacts and completely unnecessary.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "2637d139fb9a1bd428a003b7671fda40a034854f", "tree": "7983e0776c95990a545f83275682614e16a71167", "parents": [ "494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b", "288933c02b440621d9c8e7bb5f232cfb7bdef7df" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 13:55:31 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Aug 28 13:55:31 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:\n Input: pxa27x_keypad - remove input_free_device() in pxa27x_keypad_remove()\n Input: mousedev - fix regression of inverting axes\n Input: uinput - add devname alias to allow module on-demand load\n Input: hil_kbd - fix compile error\n USB: drop tty argument from usb_serial_handle_sysrq_char()\n Input: sysrq - drop tty argument form handle_sysrq()\n Input: sysrq - drop tty argument from sysrq ops handlers\n" }, { "commit": "1a7c55368c7c8749aa9326c29a50e79a4eba5d26", "tree": "abbbfe79f7362a2f2d2fa478c57f943514338ae2", "parents": [ "bd45fe539f0e26ff8d76b4cb954195ab8a6467af", "25edd6946a1d74e5e77813c2324a0908c68bcf9e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 24 10:10:13 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 24 10:10:13 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sparc64: Get rid of indirect p1275 PROM call buffer.\n sparc64: Fill a missing delay slot.\n sparc64: Make lock backoff really a NOP on UP builds.\n sparc64: simple microoptimizations for atomic functions\n sparc64: Make rwsems 64-bit.\n sparc64: Really fix atomic64_t interface types.\n" }, { "commit": "25edd6946a1d74e5e77813c2324a0908c68bcf9e", "tree": "29afc2a7287df17776e4e2b4a6ee78b108c09f10", "parents": [ "019408f9b89c68cd7b8ddb904960dc17ccf7e531" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 23 23:10:57 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 23 23:10:57 2010 -0700" }, "message": "sparc64: Get rid of indirect p1275 PROM call buffer.\n\nThis is based upon a report by Meelis Roos showing that it\u0027s possible\nthat we\u0027ll try to fetch a property that is 32K in size with some\ndevices. With the current fixed 3K buffer we use for moving data in\nand out of the firmware during PROM calls, that simply won\u0027t work.\n\nIn fact, it will scramble random kernel data during bootup.\n\nThe reasoning behind the temporary buffer is entirely historical. It\nused to be the case that we had problems referencing dynamic kernel\nmemory (including the stack) early in the boot process before we\nexplicitly told the firwmare to switch us over to the kernel trap\ntable.\n\nSo what we did was always give the firmware buffers that were locked\ninto the main kernel image.\n\nBut we no longer have problems like that, so get rid of all of this\nindirect bounce buffering.\n\nBesides fixing Meelis\u0027s bug, this also makes the kernel data about 3K\nsmaller.\n\nIt was also discovered during these conversions that the\nimplementation of prom_retain() was completely wrong, so that was\nfixed here as well. Currently that interface is not in use.\n\nReported-by: Meelis Roos \u003cmroos@linux.ee\u003e\nTested-by: Meelis Roos \u003cmroos@linux.ee\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1495cc9df4e81f5a8fa9b0b8f1034b14d24b7d8c", "tree": "7a08852f9fb0cb3073367ef84c0218af0b5479f7", "parents": [ "da5cabf80e2433131bf0ed8993abc0f7ea618c73" ], "author": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Tue Aug 17 21:15:46 2010 -0700" }, "committer": { "name": "Dmitry Torokhov", "email": "dmitry.torokhov@gmail.com", "time": "Thu Aug 19 22:07:06 2010 -0700" }, "message": "Input: sysrq - drop tty argument from sysrq ops handlers\n\nNoone is using tty argument so let\u0027s get rid of it.\n\nAcked-by: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nAcked-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nSigned-off-by: Dmitry Torokhov \u003cdtor@mail.ru\u003e\n" }, { "commit": "019408f9b89c68cd7b8ddb904960dc17ccf7e531", "tree": "c5a7c4ba3531652da7299dede4eb331c5517769e", "parents": [ "0f58189d4a3ca96d7959501ecb203177efdbc5bd" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Thu Aug 19 14:15:32 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Thu Aug 19 14:15:32 2010 -0700" }, "message": "sparc64: Fill a missing delay slot.\n\nIf the code were already aligned to 64 bytes, wr instruction would be executed\ntwice --- once in delay slot and once in the jump target.\n\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "0f58189d4a3ca96d7959501ecb203177efdbc5bd", "tree": "b5ad2f63da4c1caa5d20487cf370d51e4392111c", "parents": [ "6ec274750c99448c3412bbc10c97ce0c993f8a4e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 18 22:53:26 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 18 22:53:26 2010 -0700" }, "message": "sparc64: Make lock backoff really a NOP on UP builds.\n\nAs noticed by Mikulas Patocka, the backoff macros don\u0027t\ncompletely nop out for UP builds, we still get a\nbranch always and a delay slot nop.\n\nFix this by making the branch to the backoff spin loop\nselective, then we can nop out the spin loop completely.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6ec274750c99448c3412bbc10c97ce0c993f8a4e", "tree": "1ec5f1b5a964d893dee6f2b4ba3eb691a3dc78a7", "parents": [ "9b3bb86acabe0c05923cea1ed3b0bee9439fef4b" ], "author": { "name": "Mikulas Patocka", "email": "mpatocka@redhat.com", "time": "Wed Aug 18 08:03:37 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 18 22:51:08 2010 -0700" }, "message": "sparc64: simple microoptimizations for atomic functions\n\nSimple microoptimizations for sparc64 atomic functions:\nSave one instruction by using a delay slot.\nUse %g1 instead of %g7, because %g1 is written earlier.\n\nSigned-off-by: Mikulas Patocka \u003cmpatocka@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9b3bb86acabe0c05923cea1ed3b0bee9439fef4b", "tree": "44095535e5f2634c319122b718c8998ee3b52511", "parents": [ "b10f997bb0f4e5b34d447f498fb85834a40d3acb" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 22:49:26 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 22:49:26 2010 -0700" }, "message": "sparc64: Make rwsems 64-bit.\n\nBasically tip-off the powerpc code, use a 64-bit type and atomic64_t\ninterfaces for the implementation.\n\nThis gets us off of the by-hand asm code I wrote, which frankly I\nthink probably ruins I-cache hit rates.\n\nThe idea was the keep the call chains less deep, but anything taking\nthe rw-semaphores probably is also calling other stuff and therefore\nalready has allocated a stack-frame. So no real stack frame savings\never.\n\nBen H. has posted patches to make powerpc use 64-bit too and with some\nabstractions we can probably use a shared header file somewhere.\n\nWith suggestions from Sam Ravnborg.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b10f997bb0f4e5b34d447f498fb85834a40d3acb", "tree": "d12bb9908b3054f276644301ab949f7ead67592c", "parents": [ "86fa04b8742ac681d470786f55e2403ada0075b2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 21:44:13 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 21:44:13 2010 -0700" }, "message": "sparc64: Really fix atomic64_t interface types.\n\nLinus noticed that some of the interface arguments\ndidn\u0027t get \"int\" --\u003e \"long\" conversion, as needed.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "19147d0eb1472eac690a9a708893d4de096bbfcf", "tree": "7d68cc017199365b224c072130e64bfd929f7703", "parents": [ "2a6a432a9ce55876b92f9ea860d7baa05538de16", "86fa04b8742ac681d470786f55e2403ada0075b2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 17 18:14:08 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 17 18:14:08 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sparc64: Fix atomic64_t routine return values.\n sparc64: Fix rwsem constant bug leading to hangs.\n sparc: Hook up new fanotify and prlimit64 syscalls.\n sparc: Really fix \"console\u003d\" for serial consoles.\n" }, { "commit": "d7627467b7a8dd6944885290a03a07ceb28c10eb", "tree": "a18c83468418e878cfb2d44e4310d81b8db84ad7", "parents": [ "da5cabf80e2433131bf0ed8993abc0f7ea618c73" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Aug 17 23:52:56 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 17 18:07:43 2010 -0700" }, "message": "Make do_execve() take a const filename pointer\n\nMake do_execve() take a const filename pointer so that kernel_execve() compiles\ncorrectly on ARM:\n\narch/arm/kernel/sys_arm.c:88: warning: passing argument 1 of \u0027do_execve\u0027 discards qualifiers from pointer target type\n\nThis also requires the argv and envp arguments to be consted twice, once for\nthe pointer array and once for the strings the array points to. This is\nbecause do_execve() passes a pointer to the filename (now const) to\ncopy_strings_kernel(). A simpler alternative would be to cast the filename\npointer in do_execve() when it\u0027s passed to copy_strings_kernel().\n\ndo_execve() may not change any of the strings it is passed as part of the argv\nor envp lists as they are some of them in .rodata, so marking these strings as\nconst should be fine.\n\nFurther kernel_execve() and sys_execve() need to be changed to match.\n\nThis has been test built on x86_64, frv, arm and mips.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nTested-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "86fa04b8742ac681d470786f55e2403ada0075b2", "tree": "956d792b6a5b8a5e19bceab8e971339eded60d54", "parents": [ "ef201bebe5afc91a2b99b45dacc8c6dd88ca9e58" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 17:12:04 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 17:12:04 2010 -0700" }, "message": "sparc64: Fix atomic64_t routine return values.\n\nShould return \u0027long\u0027 instead of \u0027int\u0027.\n\nThanks to Dimitris Michailidis and Tony Luck.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ef201bebe5afc91a2b99b45dacc8c6dd88ca9e58", "tree": "08b1a29f9110325e335cebe6cb88fd4f46f038ad", "parents": [ "8e8073a449b2e00641c095ad55bd56f43468daf9" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 17:09:53 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Aug 17 17:09:53 2010 -0700" }, "message": "sparc64: Fix rwsem constant bug leading to hangs.\n\nAs noticed by Linus, it is critical that some of the\nrwsem constants be signed. Yet, hex constants are\nunsigned unless explicitly casted or negated.\n\nThe most critical one is RWSEM_WAITING_BIAS.\n\nThis bug was exacerbated by commit\n424acaaeb3a3932d64a9b4bd59df6cf72c22d8f3 (\"rwsem: wake queued readers\nwhen writer blocks on active read lock\")\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8e8073a449b2e00641c095ad55bd56f43468daf9", "tree": "7ac24dbc88d51a19745230be5c915206d20387d0", "parents": [ "300a103d1504134f8c4a7e831f995e917ea9b1e4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 15:04:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 15:04:29 2010 -0700" }, "message": "sparc: Hook up new fanotify and prlimit64 syscalls.\n\nThe only tricky bit is the compat version of fanotify_mark, which\nwhich on 32-bit the 64-bit mark argument is passed in as \"high32\",\n\"low32\".\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "300a103d1504134f8c4a7e831f995e917ea9b1e4", "tree": "7f94d5fff513d132bd0b57a9e3bd96c4cc80d707", "parents": [ "0a492896ac07336c98f37ad7fab4a6387b6ada78", "da5cabf80e2433131bf0ed8993abc0f7ea618c73" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 14:09:34 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 14:09:34 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "0a492896ac07336c98f37ad7fab4a6387b6ada78", "tree": "ae2f18d5113a5443b223239963790daefcc394d5", "parents": [ "2dc4ec5de039d5db4805dff170ab80f4e990e977" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 15 00:26:14 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 16 12:26:09 2010 -0700" }, "message": "sparc: Really fix \"console\u003d\" for serial consoles.\n\nIf a video head and keyboard are hooked up, specifying \"console\u003dttyS0\"\nor similar to use a serial console will not work properly.\n\nThe key issue is that we must register all serial console capable\ndevices with register_console(), otherwise the command line specified\ndevice won\u0027t be found. The sun serial drivers would only register\nthemselves as console devices if the OpenFirmware specified console\ndevice node matched. To fix this part we now unconditionally get\nthe serial console register by setting serial_drv-\u003econs always.\n\nSecondarily we must not add_preferred_console() using the firmware\nprovided console setting if the user gaven an override on the kernel\ncommand line using \"console\u003d\" The \"primary framebuffer\" matching\nlogic was always triggering o n openfirmware device node match, make\nit not when a command line override was given.\n\nReported-by: Frans Pop \u003celendil@planet.nl\u003e\nTested-by: Frans Pop \u003celendil@planet.nl\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "8b1bb90701f9a51f10ce8a990bcc1e237cb3b1c7", "tree": "20607f7e67bf9bceab68e5b91030231de993ff51", "parents": [ "7cfddeef357aac78179ea804b11cffb5fbba8288" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:05:58 2010 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:26:53 2010 +0200" }, "message": "defconfig reduction\n\nUse the defconfig files generated by \"make savedefconfig\" for\nremaining defconfig files.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "c7887325230aec47d47a32562a6e26014a0fafca", "tree": "10535943dace59ddb01d3440aa582bc4640e8016", "parents": [ "b84ae4a1401a731ef5fee987c0cb08743838dda7" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Aug 11 11:26:22 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 16:53:13 2010 -0700" }, "message": "Mark arguments to certain syscalls as being const\n\nMark arguments to certain system calls as being const where they should be but\naren\u0027t. The list includes:\n\n (*) The filename arguments of various stat syscalls, execve(), various utimes\n syscalls and some mount syscalls.\n\n (*) The filename arguments of some syscall helpers relating to the above.\n\n (*) The buffer argument of various write syscalls.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3b9c6c11f519718d618f5d7c9508daf78b207f6f", "tree": "6c99992e25b9305fbe3977dff30f5eeb445f25e0", "parents": [ "d80e0d96a328cc864a1cb359f545a6ed0c61812d" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Tue Aug 10 18:03:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:21 2010 -0700" }, "message": "dma-mapping: remove dma_is_consistent API\n\nArchitectures implement dma_is_consistent() in different ways (some\nmisinterpret the definition of API in DMA-API.txt). So it hasn\u0027t been so\nuseful for drivers. We have only one user of the API in tree. Unlikely\nout-of-tree drivers use the API.\n\nEven if we fix dma_is_consistent() in some architectures, it doesn\u0027t look\nuseful at all. It was invented long ago for some old systems that can\u0027t\nallocate coherent memory at all. It\u0027s better to export only APIs that are\ndefinitely necessary for drivers.\n\nLet\u0027s remove this API.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4565f0170dfc849b3629c27d769db800467baa62", "tree": "a2c70fb6f2f4826749b704ed83557623ca95bca5", "parents": [ "a6eb9fe105d5de0053b261148cee56c94b4720ca" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Tue Aug 10 18:03:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:21 2010 -0700" }, "message": "dma-mapping: unify dma_get_cache_alignment implementations\n\ndma_get_cache_alignment returns the minimum DMA alignment. Architectures\ndefines it as ARCH_DMA_MINALIGN (formally ARCH_KMALLOC_MINALIGN). So we\ncan unify dma_get_cache_alignment implementations.\n\nNote that some architectures implement dma_get_cache_alignment wrongly.\ndma_get_cache_alignment() should return the minimum DMA alignment. So\nfully-coherent architectures should return 1. This patch also fixes this\nissue.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2f9e825d3e0e2b407ae8f082de5c00afcf7378fb", "tree": "f8b3ee40674ce4acd5508a0a0bf52a30904caf6c", "parents": [ "7ae0dea900b027cd90e8a3e14deca9a19e17638b", "de75d60d5ea235e6e09f4962ab22541ce0fe176a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 10 15:22:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 10 15:22:42 2010 -0700" }, "message": "Merge branch \u0027for-2.6.36\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.36\u0027 of git://git.kernel.dk/linux-2.6-block: (149 commits)\n block: make sure that REQ_* types are seen even with CONFIG_BLOCK\u003dn\n xen-blkfront: fix missing out label\n blkdev: fix blkdev_issue_zeroout return value\n block: update request stacking methods to support discards\n block: fix missing export of blk_types.h\n writeback: fix bad _bh spinlock nesting\n drbd: revert \"delay probes\", feature is being re-implemented differently\n drbd: Initialize all members of sync_conf to their defaults [Bugz 315]\n drbd: Disable delay probes for the upcomming release\n writeback: cleanup bdi_register\n writeback: add new tracepoints\n writeback: remove unnecessary init_timer call\n writeback: optimize periodic bdi thread wakeups\n writeback: prevent unnecessary bdi threads wakeups\n writeback: move bdi threads exiting logic to the forker thread\n writeback: restructure bdi forker loop a little\n writeback: move last_active to bdi\n writeback: do not remove bdi from bdi_list\n writeback: simplify bdi code a little\n writeback: do not lose wake-ups in bdi threads\n ...\n\nFixed up pretty trivial conflicts in drivers/block/virtio_blk.c and\ndrivers/scsi/scsi_error.c as per Jens.\n" }, { "commit": "26df6d13406d1a53b0bda08bd712f1924affd7cd", "tree": "db17328acbd7cac9dc20bc854509527c1c89ca01", "parents": [ "a3c8ed693da9782f924223f65da9261da796e49b" ], "author": { "name": "hyc@symas.com", "email": "hyc@symas.com", "time": "Tue Jun 22 10:14:49 2010 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:39 2010 -0700" }, "message": "tty: Add EXTPROC support for LINEMODE\n\nThis patch is against the 2.6.34 source.\n\nParaphrased from the 1989 BSD patch by David Borman @ cray.com:\n\n These are the changes needed for the kernel to support\n LINEMODE in the server.\n\n There is a new bit in the termios local flag word, EXTPROC.\n When this bit is set, several aspects of the terminal driver\n are disabled. Input line editing, character echo, and mapping\n of signals are all disabled. This allows the telnetd to turn\n off these functions when in linemode, but still keep track of\n what state the user wants the terminal to be in.\n\n New ioctl:\n TIOCSIG Generate a signal to processes in the\n current process group of the pty.\n\n There is a new mode for packet driver, the TIOCPKT_IOCTL bit.\n When packet mode is turned on in the pty, and the EXTPROC bit\n is set, then whenever the state of the pty is changed, the\n next read on the master side of the pty will have the TIOCPKT_IOCTL\n bit set. This allows the process on the server side of the pty\n to know when the state of the terminal has changed; it can then\n issue the appropriate ioctl to retrieve the new state.\n\nSince the original BSD patches accompanied the source code for telnet\nI\u0027ve left that reference here, but obviously the feature is useful for\nany remote terminal protocol, including ssh.\n\nThe corresponding feature has existed in the BSD tty driver since 1989.\nFor historical reference, a good copy of the relevant files can be found\nhere:\n\nhttp://anonsvn.mit.edu/viewvc/krb5/trunk/src/appl/telnet/?pathrev\u003d17741\n\nSigned-off-by: Howard Chu \u003chyc@symas.com\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n\n" }, { "commit": "4d15393d20c1934a296a999d8ede125532d21cc4", "tree": "a1ad6f5314857c1d9dfd4ba981003c2853b8027f", "parents": [ "7fbd15f9b42f2c30ceeb94776a111d0c28669e0c", "2dc4ec5de039d5db4805dff170ab80f4e990e977" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 21:05:17 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 21:05:17 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sparc64: Update defconfig.\n sparc: Kill user copy check code.\n sparc64: Fix perf_arch_get_caller_regs().\n sparc64: Add missing ID to parport probing code.\n" }, { "commit": "597781f3e51f48ef8e67be772196d9e9673752c4", "tree": "6e1974bc899889da40f2fde47b04a5ece0bd3399", "parents": [ "3edd4fc9537d95e460d502987c63a90d6b9a7a82" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Mon Aug 09 17:18:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 20:44:54 2010 -0700" }, "message": "kmap_atomic: make kunmap_atomic() harder to misuse\n\nkunmap_atomic() is currently at level -4 on Rusty\u0027s \"Hard To Misuse\"\nlist[1] (\"Follow common convention and you\u0027ll get it wrong\"), except in\nsome architectures when CONFIG_DEBUG_HIGHMEM is set[2][3].\n\nkunmap() takes a pointer to a struct page; kunmap_atomic(), however, takes\ntakes a pointer to within the page itself. This seems to once in a while\ntrip people up (the convention they are following is the one from\nkunmap()).\n\nMake it much harder to misuse, by moving it to level 9 on Rusty\u0027s list[4]\n(\"The compiler/linker won\u0027t let you get it wrong\"). This is done by\nrefusing to build if the type of its first argument is a pointer to a\nstruct page.\n\nThe real kunmap_atomic() is renamed to kunmap_atomic_notypecheck()\n(which is what you would call in case for some strange reason calling it\nwith a pointer to a struct page is not incorrect in your code).\n\nThe previous version of this patch was compile tested on x86-64.\n\n[1] http://ozlabs.org/~rusty/index.cgi/tech/2008-04-01.html\n[2] In these cases, it is at level 5, \"Do it right or it will always\n break at runtime.\"\n[3] At least mips and powerpc look very similar, and sparc also seems to\n share a common ancestor with both; there seems to be quite some\n degree of copy-and-paste coding here. The include/asm/highmem.h file\n for these three archs mention x86 CPUs at its top.\n[4] http://ozlabs.org/~rusty/index.cgi/tech/2008-03-30.html\n[5] As an aside, could someone tell me why mn10300 uses unsigned long as\n the first parameter of kunmap_atomic() instead of void *?\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e (arch/arm)\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e (arch/mips)\nCc: David Howells \u003cdhowells@redhat.com\u003e (arch/frv, arch/mn10300)\nCc: Koichi Yasutake \u003cyasutake.koichi@jp.panasonic.com\u003e (arch/mn10300)\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e (arch/parisc)\nCc: Helge Deller \u003cdeller@gmx.de\u003e (arch/parisc)\nCc: \"James E.J. Bottomley\" \u003cjejb@parisc-linux.org\u003e (arch/parisc)\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e (arch/powerpc)\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e (arch/powerpc)\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e (arch/sparc)\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e (arch/x86)\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e (arch/x86)\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e (arch/x86)\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e (include/asm-generic)\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e (\"Hard To Misuse\" list)\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2dc4ec5de039d5db4805dff170ab80f4e990e977", "tree": "5bc27f4392430bea5a930da3c64f6a60c7d70578", "parents": [ "4cb6066af9ee58ddba58a63cc77b324ac21add75" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 09 03:12:56 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 09 03:12:56 2010 -0700" }, "message": "sparc64: Update defconfig.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4cb6066af9ee58ddba58a63cc77b324ac21add75", "tree": "4159489e6d6e3c7160f6dd2103992a163eded1a7", "parents": [ "b11287e8c5b2797b86351f6db0fcd9ff99b20bab" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 09 00:45:46 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 09 00:45:46 2010 -0700" }, "message": "sparc: Kill user copy check code.\n\nFor whatever reason GCC isn\u0027t able to figure things out in\nthe control flow (in particular when min() and max() expressions\nare involved) on sparc as well as it can on x86.\n\nSo lots of useless incorrect user copy warnings get spewed and the\nfull-on compile failure mode of the user copy checks were never usable\non sparc at all.\n\nPeople can debug these kinds of problems on x86.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b11287e8c5b2797b86351f6db0fcd9ff99b20bab", "tree": "560985ca36806d4463f71db4eb4ac4dd538a3cca", "parents": [ "c8837434e8bfd08abf3b596dbaeffe4a8b59a284" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 08 22:03:59 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 08 22:07:36 2010 -0700" }, "message": "sparc64: Fix perf_arch_get_caller_regs().\n\nAfter b0f82b81fe6bbcf78d478071f33e44554726bc81 (\"perf: Drop the skip\nargument from perf_arch_fetch_regs_caller\") the build broke on sparc64\ndue to the lack of a module symbol export of __perf_arch_fetch_caller_regs.\n\nBut that assembler helper can actually be complete eliminated now that\nthe semantics of this interface have been greatly simplified.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c8837434e8bfd08abf3b596dbaeffe4a8b59a284", "tree": "62a25aeaa9e0b033b26ab2b51b903e4ef6ea2eaa", "parents": [ "2d53056973079e6c2ffc0d7ae3afbdd3d4f18ae3" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 04 17:30:21 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Aug 08 22:07:22 2010 -0700" }, "message": "sparc64: Add missing ID to parport probing code.\n\nSunBlade-2500 has \u0027parallel\u0027 device node with compatible\nproperty \"pnpALI,1533,3\" so add that to the ID table.\n\nReported-by: Mikael Pettersson \u003cmikpe@it.uu.se\u003e\nTested-by: Mikael Pettersson \u003cmikpe@it.uu.se\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "7e005f79791dcd58436c88ded4a7f5aed1b82147", "tree": "3dfed83c36d9627ceffdedd783d1d02dadb7d436", "parents": [ "bfe172310e58225f0d07f9354b683abacbd6a0d8" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Mon May 31 15:59:04 2010 +0900" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:15:50 2010 +0200" }, "message": "remove needless ISA_DMA_THRESHOLD\n\nArchitectures don\u0027t need to define ISA_DMA_THRESHOLD anymore.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: James Bottomley \u003cJames.Bottomley@suse.de\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "b62ad9ab181a67207a4c8c373461b587c4861a68", "tree": "ace1572964d81f5f9bbc10b7960c1f742832d744", "parents": [ "af390084359a5de20046c901529b2b6a50b941cb", "b29230769e3482bbd62a07d6d9485371ee66a18f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:18:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:18:29 2010 -0700" }, "message": "Merge branch \u0027timers-timekeeping-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-timekeeping-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n um: Fix read_persistent_clock fallout\n kgdb: Do not access xtime directly\n powerpc: Clean up obsolete code relating to decrementer and timebase\n powerpc: Rework VDSO gettimeofday to prevent time going backwards\n clocksource: Add __clocksource_updatefreq_hz/khz methods\n x86: Convert common clocksources to use clocksource_register_hz/khz\n timekeeping: Make xtime and wall_to_monotonic static\n hrtimer: Cleanup direct access to wall_to_monotonic\n um: Convert to use read_persistent_clock\n timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset\n powerpc: Cleanup xtime usage\n powerpc: Simplify update_vsyscall\n time: Kill off CONFIG_GENERIC_TIME\n time: Implement timespec_add\n x86: Fix vtime/file timestamp inconsistencies\n\nTrivial conflicts in Documentation/feature-removal-schedule.txt\n\nMuch less trivial conflicts in arch/powerpc/kernel/time.c resolved as\nper Thomas\u0027 earlier merge commit 47916be4e28c (\"Merge branch\n\u0027powerpc.cherry-picks\u0027 into timers/clocksource\")\n" }, { "commit": "4aed2fd8e3181fea7c09ba79cf64e7e3f4413bf9", "tree": "1f69733e5daab4915a76a41de0e4d1dc61e12cfb", "parents": [ "3a3527b6461b1298cc53ce72f336346739297ac8", "fc9ea5a1e53ee54f681e226d735008e2a6f8f470" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 09:30:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 09:30:52 2010 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (162 commits)\n tracing/kprobes: unregister_trace_probe needs to be called under mutex\n perf: expose event__process function\n perf events: Fix mmap offset determination\n perf, powerpc: fsl_emb: Restore setting perf_sample_data.period\n perf, powerpc: Convert the FSL driver to use local64_t\n perf tools: Don\u0027t keep unreferenced maps when unmaps are detected\n perf session: Invalidate last_match when removing threads from rb_tree\n perf session: Free the ref_reloc_sym memory at the right place\n x86,mmiotrace: Add support for tracing STOS instruction\n perf, sched migration: Librarize task states and event headers helpers\n perf, sched migration: Librarize the GUI class\n perf, sched migration: Make the GUI class client agnostic\n perf, sched migration: Make it vertically scrollable\n perf, sched migration: Parameterize cpu height and spacing\n perf, sched migration: Fix key bindings\n perf, sched migration: Ignore unhandled task states\n perf, sched migration: Handle ignored migrate out events\n perf: New migration tool overview\n tracing: Drop cpparg() macro\n perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call\n ...\n\nFix up trivial conflicts in Makefile and drivers/cpufreq/cpufreq.c\n" }, { "commit": "03c0c29aff7e56b722eb6c47eace222b140d0377", "tree": "47267a19b523159cf36a050ef3c35f4dbdb33016", "parents": [ "c60c6a96b7bb0f1f8bb635fdfcf5b592aaf062b4", "7fb8f881c54beb05dd4d2c947dada1c636581d87" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 15:57:35 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 15:57:35 2010 -0700" }, "message": "Merge branch \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6\n\n* \u0027next-devicetree\u0027 of git://git.secretlab.ca/git/linux-2.6: (63 commits)\n of/platform: Register of_platform_drivers with an \"of:\" prefix\n of/address: Clean up function declarations\n of/spi: call of_register_spi_devices() from spi core code\n of: Provide default of_node_to_nid() implementation.\n of/device: Make of_device_make_bus_id() usable by other code.\n of/irq: Fix endian issues in parsing interrupt specifiers\n of: Fix phandle endian issues\n of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string\n of: remove of_default_bus_ids\n of: make of_find_device_by_node generic\n microblaze: remove references to of_device and to_of_device\n sparc: remove references to of_device and to_of_device\n powerpc: remove references to of_device and to_of_device\n of/device: Replace of_device with platform_device in includes and core code\n of/device: Protect against binding of_platform_drivers to non-OF devices\n of: remove asm/of_device.h\n of: remove asm/of_platform.h\n of/platform: remove all of_bus_type and of_platform_bus_type references\n of: Merge of_platform_bus_type with platform_bus_type\n drivercore/of: Add OF style matching to platform bus\n ...\n\nFix up trivial conflicts in arch/microblaze/kernel/Makefile due to just\nsome obj-y removals by the devicetree branch, while the microblaze\nupdates added a new file.\n" }, { "commit": "673b864fd76a29031aa0b4b08fc80886d527b3b7", "tree": "c9b3f01206e7d0dd5c801b504bfd7e82383470d6", "parents": [ "93b9e9a2d91b8a6c93f14e98382694f83de9f02e", "71cd03b0044183843318bfac0b6ce5868a96ef34" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 08:58:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Aug 05 08:58:30 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n arch/sparc/mm: Use GFP_KERNEL\n MAINTAINERS: Add trailing slash to SBUS path.\n sbus: autoconvert trivial BKL users to private mutex\n" }, { "commit": "d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f", "tree": "854ab394486288d40fa8179cbfaf66e8bdc44b0f", "parents": [ "73b2c7165b76b20eb1290e7efebc33cfd21db1ca", "3a09b1be53d23df780a0cd0e4087a05e2ca4a00c" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 04 15:14:38 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "71cd03b0044183843318bfac0b6ce5868a96ef34", "tree": "536b4c1782867bbde8a56417eea5652c405d3e8b", "parents": [ "7765b8bbee863c8e388f6a2126280fa5edbfcdf2" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Mon Aug 02 16:04:21 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Aug 02 16:04:21 2010 -0700" }, "message": "arch/sparc/mm: Use GFP_KERNEL\n\nGFP_ATOMIC is not needed here, as evidenced by the other two uses of\nGFP_KERNEL in the same function.\n\nThe semantic match that finds this problem is as follows:\n(http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@@ identifier f; @@\n\n*f(...,GFP_ATOMIC,...)\n... when !\u003d spin_unlock(...)\n when !\u003d read_unlock(...)\n when !\u003d write_unlock(...)\n when !\u003d read_unlock_irq(...)\n when !\u003d write_unlock_irq(...)\n when !\u003d read_unlock_irqrestore(...)\n when !\u003d write_unlock_irqrestore(...)\n when !\u003d spin_unlock_irq(...)\n when !\u003d spin_unlock_irqrestore(...)\n*f(...,GFP_KERNEL,...)\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "559e2b7ee7a1c7753d534abcb2742a4775339293", "tree": "28948fea73fcd9706d893f0f11c77861ed9ddca2", "parents": [ "c6601225380088018ae93df2ba7f0bb65334d63b" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jul 23 20:11:18 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jul 30 00:03:58 2010 -0600" }, "message": "of: Provide default of_node_to_nid() implementation.\n\nof_node_to_nid() is only relevant in a few architectures. Don\u0027t force\neveryone to implement it anyway.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "592913ecb87a9e06f98ddb55b298f1a66bf94c6b", "tree": "0f63f5535fe517faf418e0f7e69800fcf1e4d8db", "parents": [ "ce3bf7ab22527183634a76512d9854a38615e4d5" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Tue Jul 13 17:56:20 2010 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 27 12:40:54 2010 +0200" }, "message": "time: Kill off CONFIG_GENERIC_TIME\n\nNow that all arches have been converted over to use generic time via\nclocksources or arch_gettimeoffset(), we can remove the GENERIC_TIME\nconfig option and simplify the generic code.\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLKML-Reference: \u003c1279068988-21864-4-git-send-email-johnstul@us.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "c608558407aa64d2b98d58bfc116e95c0afb357e", "tree": "1dba985555b1fff5ce587c6368f47383ba00ebd4", "parents": [ "de48e369e8ea3a773cb2f959b76fcfad9966f4a0" ], "author": { "name": "Jonas Bonn", "email": "jonas@southpole.se", "time": "Fri Jul 23 19:19:35 2010 +0200" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:58:22 2010 -0600" }, "message": "of: make of_find_device_by_node generic\n\nThere\u0027s no need for this function to be architecture specific and all four\narchitectures defining it had the same definition. The function has been\nmoved to drivers/of/platform.c.\n\nSigned-off-by: Jonas Bonn \u003cjonas@southpole.se\u003e\n[grant.likely@secretlab.ca: moved to drivers/of/platform.c, simplified code, and added kerneldoc comment]\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "cd4cd7306a403f62ef3ca783b9d1cf2a03e595ed", "tree": "2eceb6990f5a0097f158c91316ee93fc2db5282d", "parents": [ "a454dc50590c6d758abba016a303a221f2f1b4b8" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jul 22 16:04:30 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:58:22 2010 -0600" }, "message": "sparc: remove references to of_device and to_of_device\n\nof_device is just a #define alias to platform_device. This patch\nreplaces all references to it with platform_device.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "94a0cb1fc61ab7a0d47d268a7764374efeb2160b", "tree": "c7da45e6023c77471e18215fb14eab1bc83739fa", "parents": [ "c1b6d380b781b5238989a4bfba02450057670804" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jul 22 13:59:23 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:58:21 2010 -0600" }, "message": "of/device: Replace of_device with platform_device in includes and core code\n\nof_device is currently just an #define alias to platform_device until it\ngets removed entirely. This patch removes references to it from the\ninclude directories and the core drivers/of code.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "295960429675e17ec658320ebb24385727032bed", "tree": "a4631bf0a2c209e964e261a471d9584b8db28197", "parents": [ "129ac799ad627b1e08382739f9e8cd75d7477fa3" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 29 11:15:54 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:57:52 2010 -0600" }, "message": "of: remove asm/of_device.h\n\nIt is mostly unused now. Sparc has a few defines left in it, but they\ncan be moved to other headers. Removing this header means that new\narchitectures adding CONFIG_OF support don\u0027t need to also add this\nheader file.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "129ac799ad627b1e08382739f9e8cd75d7477fa3", "tree": "2c42efc35fbd20546bf8cf06db9716825eb2bda0", "parents": [ "1ab1d63a85cee2545272f63a7644e9f855cb65d0" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 29 09:26:53 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:57:52 2010 -0600" }, "message": "of: remove asm/of_platform.h\n\nOnly thing left in it is of_instantiate_rtc() which can be moved to\nasm/prom.h on PowerPC and is unused in microblaze.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1ab1d63a85cee2545272f63a7644e9f855cb65d0", "tree": "089afe8c03370cdfaf3eeb30d09e1bcac8a67898", "parents": [ "eca3930163ba8884060ce9d9ff5ef0d9b7c7b00f" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Thu Jun 24 15:14:37 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:57:52 2010 -0600" }, "message": "of/platform: remove all of_bus_type and of_platform_bus_type references\n\nBoth of_bus_type and of_platform_bus_type are just #define aliases\nfor the platform bus. This patch removes all references to them and\nswitches to the of_register_platform_driver()/of_unregister_platform_driver()\nAPI for registering.\n\nSubsequent patches will convert each user of of_register_platform_driver()\ninto plain platform_drivers without the of_platform_driver shim. At which\npoint the of_register_platform_driver()/of_unregister_platform_driver()\nfunctions can be removed.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "eca3930163ba8884060ce9d9ff5ef0d9b7c7b00f", "tree": "5774d6d53b5f7d8f069e82b3937cdff7b3d45bbe", "parents": [ "05212157e94ccf4cf458413bbba509cfa95ff92b" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Jun 08 07:48:21 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:57:51 2010 -0600" }, "message": "of: Merge of_platform_bus_type with platform_bus_type\n\nof_platform_bus was being used in the same manner as the platform_bus.\nThe only difference being that of_platform_bus devices are generated\nfrom data in the device tree, and platform_bus devices are usually\nstatically allocated in platform code. Having them separate causes\nthe problem of device drivers having to be registered twice if it\nwas possible for the same device to appear on either bus.\n\nThis patch removes of_platform_bus_type and registers all of_platform\nbus devices and drivers on the platform bus instead. A previous patch\nmade the of_device structure an alias for the platform_device structure,\nand a shim is used to adapt of_platform_drivers to the platform bus.\n\nAfter all of of_platform_bus drivers are converted to be normal platform\ndrivers, the shim code can be removed.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4e4f62bf7396fca48efe61513640ee399a6046e3", "tree": "42a503af02d9806bcc05e5fcc2cd53f9bd45b0c2", "parents": [ "9e3288dc9a94fab5ea87db42177d3a9e0345a614", "b37fa16e78d6f9790462b3181602a26b5af36260" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:49:13 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat Jul 24 09:49:13 2010 -0600" }, "message": "Merge commit \u0027v2.6.35-rc6\u0027 into devicetree/next\n\nConflicts:\n\tarch/sparc/kernel/prom_64.c\n" }, { "commit": "9dcdbf7a33d9018ac5d45debcf261be648bdd56a", "tree": "bbcc1a018f11ff76cd7ce174ef3ffe2c02da07ee", "parents": [ "cc5edb0eb9ce892b530e34a5d110382483587942", "cd5b8f8755a89a57fc8c408d284b8b613f090345" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 21 21:43:03 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jul 21 21:43:06 2010 +0200" }, "message": "Merge branch \u0027linus\u0027 into perf/core\n\nMerge reason: Pick up the latest perf fixes.\n\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "95977d0ef23ee37990ce8704dfd6c61eab02a548", "tree": "d3bb7133f8f51f8e48c0c74ee28c14deb45fedbe", "parents": [ "a4ce96ac356e7024a7724ade9d18ba1bdf3c5c06", "f8324e20f8289dffc646d64366332e05eaacab25" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:28:50 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 21 09:28:50 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n math-emu: correct test for downshifting fraction in _FP_FROM_INT()\n perf: Add DWARF register lookup for sparc\n MAINTAINERS: Add SBUS driver path to sparc entry.\n drivers/sbus: Remove unnecessary casts of private_data\n sparc: remove homegrown L1_CACHE_ALIGN macro\n sparc64: fix the build error due to smp_kgdb_capture_client()\n sparc64: Fix maybe_change_configuration() PCR setting.\n arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference\n sparc64: Update defconfig.\n sunsu: Fix use after free in su_remove().\n sunserial: Don\u0027t call add_preferred_console() when console\u003d is specified.\n sparc32: Kill none_mask, it\u0027s bogus.\n" }, { "commit": "035ebefc737cce56d3938e9b7eaa5ac0e9c28715", "tree": "37593760f4411ec3d3db9b46e2b9a21255624549", "parents": [ "ef2a4524d6e776bbce819eeccbdcaeee5ce74027" ], "author": { "name": "Andres Salomon", "email": "dilinger@queued.net", "time": "Tue Jul 13 09:42:26 2010 +0000" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Jul 14 17:08:03 2010 -0600" }, "message": "of/sparc: move is_root_node() to of.h\n\nRename is_root_node() to of_node_is_root() and make it available for\nall archs to use, as it\u0027s not PROM-specific.\n\nSigned-off-by: Andres Salomon \u003cdilinger@queued.net\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "95f72d1ed41a66f1c1c29c24d479de81a0bea36f", "tree": "bd92b3804ff0bea083d69af0ede52f99ab34c0af", "parents": [ "1c5474a65bf15a4cb162dfff86d6d0b5a08a740c" ], "author": { "name": "Yinghai Lu", "email": "yinghai@kernel.org", "time": "Mon Jul 12 14:36:09 2010 +1000" }, "committer": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 14 17:14:00 2010 +1000" }, "message": "lmb: rename to memblock\n\nvia following scripts\n\n FILES\u003d$(find * -type f | grep -vE \u0027oprofile|[^K]config\u0027)\n\n sed -i \\\n -e \u0027s/lmb/memblock/g\u0027 \\\n -e \u0027s/LMB/MEMBLOCK/g\u0027 \\\n $FILES\n\n for N in $(find . -name lmb.[ch]); do\n M\u003d$(echo $N | sed \u0027s/lmb/memblock/g\u0027)\n mv $N $M\n done\n\nand remove some wrong change like lmbench and dlmb etc.\n\nalso move memblock.c from lib/ to mm/\n\nSuggested-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nSigned-off-by: Yinghai Lu \u003cyinghai@kernel.org\u003e\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\n" }, { "commit": "dd5e73794c9af30d6491963e13436d9f05ee6df6", "tree": "d47d19d765972f7f092807b4da9cf86c0aad485e", "parents": [ "bcbefae2bcad0996bcef7245e34176960e95a191" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Tue Jun 29 12:47:01 2010 +1000" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jul 05 16:14:54 2010 -0600" }, "message": "of: remove architecture CONFIG_OF definitions\n\nnow that CONFIG_OF is defined globally\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nAcked-by: Michal Simek \u003cmonstr@monstr.eu\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "7b14c647aee98db2d10705da385f9c19cc83a9af", "tree": "cfce92aaa3e28ce83146ff8aec5405f231917935", "parents": [ "10f85f43ef134014da72d2bcc1bff1abb9b0640c" ], "author": { "name": "Stephen Rothwell", "email": "sfr@canb.auug.org.au", "time": "Tue Jun 29 12:44:50 2010 +1000" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jul 05 16:14:54 2010 -0600" }, "message": "sparc: turn CONFIG_OF into a select\n\nso that we can make CONFIG_OF global and remove it from\nthe architecture Kconfig files later.\n\nSigned-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "f5fa3cb9b790db1c401f4b506d7fcc503771af0d", "tree": "3eaebf08f675bc807bda78724b028c83de68e152", "parents": [ "c67dda14389205f0a223c5089307495290939b3b" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Tue Jun 29 00:38:02 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Jun 29 00:38:02 2010 -0700" }, "message": "sparc: remove homegrown L1_CACHE_ALIGN macro\n\nLet\u0027s use the standard L1_CACHE_ALIGN macro instead.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "e3873444990dd6f8a095d1f72b5ad45192f8c506", "tree": "9e9fbc43fd4ffde3ac7d41827e0ab9c5f98363f0", "parents": [ "b505ff5e7291cca6379549297e3852ce3622d550" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jun 18 11:09:59 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jun 28 12:41:33 2010 -0700" }, "message": "of/irq: Move irq_of_parse_and_map() to common code\n\nMerge common code between PowerPC and Microblaze. SPARC implements\nirq_of_parse_and_map(), but the implementation is different, so it\ndoes not use this code.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCc: Jeremy Kerr \u003cjeremy.kerr@canonical.com\u003e\n\n" }, { "commit": "b505ff5e7291cca6379549297e3852ce3622d550", "tree": "a424d99dc5dc7e9e9e40270c41b0f66ccbc58924", "parents": [ "1636f8ac2b08410df4766449f7c86b912443cd99" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jun 18 11:09:59 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jun 28 12:41:33 2010 -0700" }, "message": "of: kill struct of_device\n\nNow that the device tree node pointer has been moved out of struct\nof_device and into the common struct device, there isn\u0027t anything\nunique about of_device anymore. In fact, there isn\u0027t much need\nfor a separate of_bus when all busses have access to OF style\nprobing.\n\narch/powerpc and arch/microblaze are moving away from using the of_bus\nand using the regular platform bus instead for mmio devices. This\npatch makes of_device the same as platform_device as a stepping stone\nin migrating of_platform_drivers over to the platform bus.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\n\n" }, { "commit": "1636f8ac2b08410df4766449f7c86b912443cd99", "tree": "9c923c017e956779f237d4ffa51d49beb3de6d3e", "parents": [ "2b07be2493681220cac4d185494a4edb0b8efd1e" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Fri Jun 18 11:09:58 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Mon Jun 28 12:41:33 2010 -0700" }, "message": "sparc/of: Move of_device fields into struct pdev_archdata\n\nThis patch moves SPARC architecture specific data members out of\nstruct of_device and into the pdev_archdata structure. The reason\nfor this change is to unify the struct of_device definition amongst\nall the architectures. It also remvoes the .sysdata, .slot, .portid\nand .clock_freq properties because they aren\u0027t actually used by\nanything.\n\nA subsequent patch will replace struct of_device entirely with struct\nplatform_device and the of_platform support code will share common\nroutines with the platform bus (but the bus instances themselves can\nremain separate).\n\nThis patch also adds \u0027struct resources *resource\u0027 and num_resources\nto match the fields defined in struct platform_device. After this\nchange, \u0027struct platform_device\u0027 can be used as a drop-in replacement\nfor \u0027struct of_platform\u0027.\n\nThis change is in preparation for merging the of_platform_bus_type\nwith the platform_bus_type.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\n" }, { "commit": "c67dda14389205f0a223c5089307495290939b3b", "tree": "fad0bb26b28703d02a22ebdd44d94eabac4a2ade", "parents": [ "43bc2db47292a824152145253b1dd2847e7312a3", "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 26 10:27:00 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sat Jun 26 10:27:00 2010 -0700" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n" }, { "commit": "43bc2db47292a824152145253b1dd2847e7312a3", "tree": "435b438e3cc06258211b52e56e03aaf02eec04e8", "parents": [ "b7d45c3f741b114cdda9ee0cd727afaf60a1bf37" ], "author": { "name": "Dongdong Deng", "email": "dongdong.deng@windriver.com", "time": "Fri Jun 25 11:17:57 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 25 11:17:57 2010 -0700" }, "message": "sparc64: fix the build error due to smp_kgdb_capture_client()\n\nSigned-off-by: Dongdong Deng \u003cdongdong.deng@windriver.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b7d45c3f741b114cdda9ee0cd727afaf60a1bf37", "tree": "2712b7f5ddab5af1fbc67555d880216baefe7227", "parents": [ "0d0659c78d7ea29ad6c3c538dcaae0227f31b9d2" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 11:39:02 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Jun 23 11:39:02 2010 -0700" }, "message": "sparc64: Fix maybe_change_configuration() PCR setting.\n\nNeed to mask out the existing event bits before OR\u0027ing in\nthe new ones.\n\nNoticed by Peter Zijlstra.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "646b1db4956ba8bf748b835b5eba211133d91c2e", "tree": "061166d873d9da9cf83044a7593ad111787076c5", "parents": [ "0f2c3de2ba110626515234d5d584fb1b0c0749a2", "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jun 18 10:53:12 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jun 18 10:53:19 2010 +0200" }, "message": "Merge commit \u0027v2.6.35-rc3\u0027 into perf/core\n\nMerge reason: Go from -rc1 base to -rc3 base, merge in fixes.\n" }, { "commit": "f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b", "tree": "c2c130a74be25b0b2dff992e1a195e2728bdaadd", "parents": [ "fd0961ff67727482bb20ca7e8ea97b83e9de2ddb", "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:08:13 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:08:13 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n" }, { "commit": "421f91d21ad6f799dc7b489bb33cc560ccc56f98", "tree": "aaf9f6385233fdf9277e634603156c89ede7f770", "parents": [ "65155b3708137fabee865dc4da822763c0c41208" ], "author": { "name": "Uwe Kleine-König", "email": "u.kleine-koenig@pengutronix.de", "time": "Fri Jun 11 12:17:00 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Jun 16 18:05:05 2010 +0200" }, "message": "fix typos concerning \"initiali[zs]e\"\n\nSigned-off-by: Uwe Kleine-König \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "c726b61c6a5acc54c55ed7a0e7638cc4c5a100a8", "tree": "3f44aa013d31d34951e9610e79ff14c1148ad6ac", "parents": [ "7be7923633a142402266d642ccebf74f556a649b", "018378c55b03f88ff513aba4e0e93b8d4a9cf241" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 09 18:55:20 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 09 18:55:57 2010 +0200" }, "message": "Merge branch \u0027perf/core\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core\n" }, { "commit": "e78505958cf123048fb48cb56b79cebb8edd15fb", "tree": "3688d124cdc906cbe9f6587c8671ba0a14c95262", "parents": [ "a6e6dea68c18f705957573ee5596097c7e82d0e5" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri May 21 14:43:08 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 09 11:12:37 2010 +0200" }, "message": "perf: Convert perf_event to local_t\n\nSince now all modification to event-\u003ecount (and -\u003eprev_count\nand -\u003eperiod_left) are local to a cpu, change then to local64_t so we\navoid the LOCK\u0027ed ops.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "1996bda2a42480c275656233e631ee0966574be4", "tree": "c4c61b6bde252d3d6f1dc0b62d48cf3a3e486ec1", "parents": [ "d57e34fdd60be7ffd0b1d86bfa1a553df86b7172" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri May 21 14:05:13 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 09 11:12:36 2010 +0200" }, "message": "arch: Implement local64_t\n\nOn 64bit, local_t is of size long, and thus we make local64_t an alias.\nOn 32bit, we fall back to atomic64_t. (architecture can provide optimized\n32-bit version)\n\n(This new facility is to be used by perf events optimizations.)\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: linux-arch@vger.kernel.org\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "8d2cacbbb8deadfae78aa16e4e1ee619bdd7019e", "tree": "79fcb319d1c99e348b0a04056e016c85c3666b35", "parents": [ "3af9e859281bda7eb7c20b51879cf43aa788ac2e" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue May 25 17:49:05 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 09 11:12:34 2010 +0200" }, "message": "perf: Cleanup {start,commit,cancel}_txn details\n\nClarify some of the transactional group scheduling API details\nand change it so that a successfull -\u003ecommit_txn also closes\nthe transaction.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nLKML-Reference: \u003c1274803086.5882.1752.camel@twins\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "b0f82b81fe6bbcf78d478071f33e44554726bc81", "tree": "6305c095b927f956a791b9dce687cb94a21718e6", "parents": [ "c9cf4dbb4d9ca715d8fedf13301a53296429abc6" ], "author": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Thu May 20 07:47:21 2010 +0200" }, "committer": { "name": "Frederic Weisbecker", "email": "fweisbec@gmail.com", "time": "Tue Jun 08 23:31:27 2010 +0200" }, "message": "perf: Drop the skip argument from perf_arch_fetch_regs_caller\n\nDrop this argument now that we always want to rewind only to the\nstate of the first caller.\nIt means frame pointers are not necessary anymore to reliably get\nthe source of an event. But this also means we need this helper\nto be a macro now, as an inline function is not an option since\nwe need to know when to provide a default implentation.\n\nSigned-off-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\n" }, { "commit": "0d0659c78d7ea29ad6c3c538dcaae0227f31b9d2", "tree": "4383a16168096e94919c980a2cbcd7a5e81c6492", "parents": [ "0fc251d9a6c9fb841b73f29dd73dcf91afe7883f" ], "author": { "name": "Julia Lawall", "email": "julia@diku.dk", "time": "Fri Jun 04 16:17:37 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Jun 04 16:17:37 2010 -0700" }, "message": "arch/sparc/kernel: Eliminate what looks like a NULL pointer dereference\n\nAt the point of the test, action cannot be NULL, as it has been dereferenced\nin the code just above.\n\nA simplified version of the semantic match that finds this problem is as\nfollows: (http://coccinelle.lip6.fr/)\n\n// \u003csmpl\u003e\n@r exists@\nexpression E,E1;\nidentifier f;\nstatement S1,S2,S3;\n@@\n\nif ((E \u003d\u003d NULL \u0026\u0026 ...) || ...)\n{\n ... when !\u003d if (...) S1 else S2\n when !\u003d E \u003d E1\n* E-\u003ef\n ... when any\n}\nelse S3\n// \u003c/smpl\u003e\n\nSigned-off-by: Julia Lawall \u003cjulia@diku.dk\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "1f73897861b8ef0be64ff4b801f8d6f830f683b5", "tree": "b4bae8f12e1422113910d8cb00a19d010dc4a52f", "parents": [ "b904d7131d116900524bd36ec170dcd97846bfd3", "64ffc9ff424c65adcffe7d590018cc75e2d5d42a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 01 08:55:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 01 08:55:52 2010 -0700" }, "message": "Merge branch \u0027for-35\u0027 of git://repo.or.cz/linux-kbuild\n\n* \u0027for-35\u0027 of git://repo.or.cz/linux-kbuild: (81 commits)\n kbuild: Revert part of e8d400a to resolve a conflict\n kbuild: Fix checking of scm-identifier variable\n gconfig: add support to show hidden options that have prompts\n menuconfig: add support to show hidden options which have prompts\n gconfig: remove show_debug option\n gconfig: remove dbg_print_ptype() and dbg_print_stype()\n kconfig: fix zconfdump()\n kconfig: some small fixes\n add random binaries to .gitignore\n kbuild: Include gen_initramfs_list.sh and the file list in the .d file\n kconfig: recalc symbol value before showing search results\n .gitignore: ignore *.lzo files\n headerdep: perlcritic warning\n scripts/Makefile.lib: Align the output of LZO\n kbuild: Generate modules.builtin in make modules_install\n Revert \"kbuild: specify absolute paths for cscope\"\n kbuild: Do not unnecessarily regenerate modules.builtin\n headers_install: use local file handles\n headers_check: fix perl warnings\n export_report: fix perl warnings\n ...\n" }, { "commit": "c5617b200ac52e35f7e8cf05a17b0a2d50f6b3e9", "tree": "40d5e99660c77c5791392d349a93113c044dbf14", "parents": [ "cad719d86e9dbd06634eaba6401e022c8101d6b2", "49c177461bfbedeccbab22bf3905db2f9da7f1c3" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 15:23:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 15:23:47 2010 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (61 commits)\n tracing: Add __used annotation to event variable\n perf, trace: Fix !x86 build bug\n perf report: Support multiple events on the TUI\n perf annotate: Fix up usage of the build id cache\n x86/mmiotrace: Remove redundant instruction prefix checks\n perf annotate: Add TUI interface\n perf tui: Remove annotate from popup menu after failure\n perf report: Don\u0027t start the TUI if -D is used\n perf: Fix getline undeclared\n perf: Optimize perf_tp_event_match()\n perf: Remove more code from the fastpath\n perf: Optimize the !vmalloc backed buffer\n perf: Optimize perf_output_copy()\n perf: Fix wakeup storm for RO mmap()s\n perf-record: Share per-cpu buffers\n perf-record: Remove -M\n perf: Ensure that IOC_OUTPUT isn\u0027t used to create multi-writer buffers\n perf, trace: Optimize tracepoints by using per-tracepoint-per-cpu hlist to track events\n perf, trace: Optimize tracepoints by removing IRQ-disable from perf/tracepoint interaction\n perf tui: Allow disabling the TUI on a per command basis in ~/.perfconfig\n ...\n" }, { "commit": "1ef04370d823a811d2cca9f237097559a6b99b12", "tree": "9b8d9feaa2fd47df7e42009128803bee78490bc3", "parents": [ "48c7cf4797d04b3ffcb060fa64c3c500b7371e8b" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed May 26 14:44:34 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:54 2010 -0700" }, "message": "asm-generic: remove ARCH_HAS_SG_CHAIN in scatterlist.h\n\nThere are more architectures that don\u0027t support ARCH_HAS_SG_CHAIN than\nthose that support it. This removes removes ARCH_HAS_SG_CHAIN in\nasm-generic/scatterlist.h and lets arhictectures to define it.\n\nIt\u0027s clearer than defining ARCH_HAS_SG_CHAIN asm-generic/scatterlist.h and\nundefing it in arhictectures that don\u0027t support it.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "18e98307de0d746cb0845ebf66535ce2184c25a2", "tree": "eac998f31e3930ffc1f54e524a2a9bbc82b851e0", "parents": [ "204f3a04449a9a775e465f7d87bcab08f170e59e" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed May 26 14:44:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:54 2010 -0700" }, "message": "asm-generic: add NEED_SG_DMA_LENGTH to define sg_dma_len()\n\nThere are only two ways to define sg_dma_len(); use sg-\u003edma_length or\nsg-\u003elength. This patch introduces NEED_SG_DMA_LENGTH that enables\narchitectures to choose sg-\u003edma_length or sg-\u003elength.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "204f3a04449a9a775e465f7d87bcab08f170e59e", "tree": "a28027c04c7f7c5714395d1ebaf39b8c731c26b8", "parents": [ "a48223f9449d0289fc20cd11a98758109830798e" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed May 26 14:44:30 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:54 2010 -0700" }, "message": "asm-generic: remove ISA_DMA_THRESHOLD in scatterlist.h\n\nThis is the first half of the attempt to use asm-generic/scatterlist.h\non every architecture.\n\nThere are only two ways to define scatterlist structure. So it\u0027s easy\nto convert every architecture to use asm-generic/scatterlist.h.\n\nThis patch:\n\nThe trick for ISA_DMA_THRESHOLD in asm-generic/scatterlist.h doesn\u0027t work\nfor powerpc. This lets architectures defin ISA_DMA_THRESHOLD.\n\nHopefully, we can remove ISA_DMA_THRESHOLD in the future; we can do better\nto decide if the bouncing is necessary or not.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Matt Turner \u003cmattst88@gmail.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0fc251d9a6c9fb841b73f29dd73dcf91afe7883f", "tree": "5f2a473f64accac22d64c657e1a22bcfe76608a6", "parents": [ "9616ff434d96303689391af3d6e1c845d233405f" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 26 21:18:23 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed May 26 21:18:23 2010 -0700" }, "message": "sparc64: Update defconfig.\n\nMove from SLUB to SLAB, as this is what the world plans to align\nto, every distribution enables, and thus is what everyone actually\nis testing.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "13da9e200fe4740b02cd51e07ab454627e228920", "tree": "e65f37a59c2a0e1695d5094a8f5509839e1d30cc", "parents": [ "4e89e8f61bcdff82a7b63b80ed83a6725028d61b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 26 08:30:15 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 26 08:30:15 2010 -0700" }, "message": "Revert \"endian: #define __BYTE_ORDER\"\n\nThis reverts commit b3b77c8caef1750ebeea1054e39e358550ea9f55, which was\nalso totally broken (see commit 0d2daf5cc858 that reverted the crc32\nversion of it). As reported by Stephen Rothwell, it causes problems on\nbig-endian machines:\n\n\u003e In file included from fs/jfs/jfs_types.h:33,\n\u003e from fs/jfs/jfs_incore.h:26,\n\u003e from fs/jfs/file.c:22:\n\u003e fs/jfs/endian24.h:36:101: warning: \"__LITTLE_ENDIAN\" is not defined\n\nThe kernel has never had that crazy \"__BYTE_ORDER \u003d\u003d __LITTLE_ENDIAN\"\nmodel. It\u0027s not how we do things, and it isn\u0027t how we _should_ do\nthings. So don\u0027t go there.\n\nRequested-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c87fe1c05d57e3fecd62e56da1b1ac4291116ebf", "tree": "48b6aa47000becb4ba08c1dc230e1471f64b7b02", "parents": [ "b1cdc4670b9508fcd47a15fbd12f70d269880b37" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 23:36:31 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 25 23:36:31 2010 -0700" }, "message": "sparc32: Kill none_mask, it\u0027s bogus.\n\nFor some reason, the pte_none() calculation for srmmu sparc32\nchips was masking out the top 4 bits. That doesn\u0027t make any\nsense, as those are just some of the physical bits of the PTE\nencoding.\n\nFurthermore, this mistake breaks things when the offset of of a swap\nentry has a large enough offset as reported by Тхай Кирилл.\n\nSun4c always set it to zero, so it\u0027s really completely useless,\nkill it.\n\nReported-by: Тхай Кирилл \u003ctkhai@yandex.ru\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "b3b77c8caef1750ebeea1054e39e358550ea9f55", "tree": "9026ca0b3453226434a4ca8878832a4910b48664", "parents": [ "e47103b1af5df52fa69e18b14d3012472f78817d" ], "author": { "name": "Joakim Tjernlund", "email": "Joakim.Tjernlund@transmode.se", "time": "Mon May 24 14:33:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:02 2010 -0700" }, "message": "endian: #define __BYTE_ORDER\n\nLinux does not define __BYTE_ORDER in its endian header files which makes\nsome header files bend backwards to get at the current endian. Lets\n#define __BYTE_ORDER in big_endian.h/litte_endian.h to make it easier for\nheader files that are used in user space too.\n\nIn userspace the convention is that\n\n 1. _both_ __LITTLE_ENDIAN and __BIG_ENDIAN are defined,\n 2. you have to test for e.g. __BYTE_ORDER \u003d\u003d __BIG_ENDIAN.\n\nSigned-off-by: Joakim Tjernlund \u003cJoakim.Tjernlund@transmode.se\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cf9b59e9d3e008591d1f54830f570982bb307a0d", "tree": "113478ce8fd8c832ba726ffdf59b82cb46356476", "parents": [ "44504b2bebf8b5823c59484e73096a7d6574471d", "f4b87dee923342505e1ddba8d34ce9de33e75050" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:36:56 2010 -0600" }, "message": "Merge remote branch \u0027origin\u0027 into secretlab/next-devicetree\n\nMerging in current state of Linus\u0027 tree to deal with merge conflicts and\nbuild failures in vio.c after merge.\n\nConflicts:\n\tdrivers/i2c/busses/i2c-cpm.c\n\tdrivers/i2c/busses/i2c-mpc.c\n\tdrivers/net/gianfar.c\n\nAlso fixed up one line in arch/powerpc/kernel/vio.c to use the\ncorrect node pointer.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "4018294b53d1dae026880e45f174c1cc63b5d435", "tree": "6db3538eaf91b653381720a6d92f4f15634a93d0", "parents": [ "597b9d1e44e9ba69f2454a5318bbe7a6d5e6930a" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:13:02 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Sat May 22 00:10:40 2010 -0600" }, "message": "of: Remove duplicate fields from of_platform_driver\n\n.name, .match_table and .owner are duplicated in both of_platform_driver\nand device_driver. This patch is a removes the extra copies from struct\nof_platform_driver and converts all users to the device_driver members.\n\nThis patch is a pretty mechanical change. The usage model doesn\u0027t change\nand if any drivers have been missed, or if anything has been fixed up\nincorrectly, then it will fail with a compile time error, and the fixup\nwill be trivial. This patch looks big and scary because it touches so\nmany files, but it should be pretty safe.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Sean MacLennan \u003csmaclennan@pikatech.com\u003e\n\n" }, { "commit": "c75fbb05b523571c0fdc48d4b968b73f0e20acbb", "tree": "14f6d3846bbfe434b9d9ff2adf3ee9b51b9131a0", "parents": [ "4063eb5fa4ef514077f84f47a7759ab255eddda5" ], "author": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Thu May 20 21:04:19 2010 -0500" }, "committer": { "name": "Jason Wessel", "email": "jason.wessel@windriver.com", "time": "Thu May 20 21:04:19 2010 -0500" }, "message": "kgdb,sparc: Add in kgdb_arch_set_pc for sparc\n\nThe new debug core api requires all architectures that use to debug\ncore to implement a function to set the program counter.\n\nSigned-off-by: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "f39d01be4c59a61a08d0cb53f615e7016b85d339", "tree": "6777590e3ff2ddf4df1d38444ba7d692cd463b7b", "parents": [ "54291263519ac2c9bdda68b23b02fef3808deed4", "7db82437cfcac4bdfe79a6323eb554fdfa271623" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:20:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:20:59 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)\n vlynq: make whole Kconfig-menu dependant on architecture\n add descriptive comment for TIF_MEMDIE task flag declaration.\n EEPROM: max6875: Header file cleanup\n EEPROM: 93cx6: Header file cleanup\n EEPROM: Header file cleanup\n agp: use NULL instead of 0 when pointer is needed\n rtc-v3020: make bitfield unsigned\n PCI: make bitfield unsigned\n jbd2: use NULL instead of 0 when pointer is needed\n cciss: fix shadows sparse warning\n doc: inode uses a mutex instead of a semaphore.\n uml: i386: Avoid redefinition of NR_syscalls\n fix \"seperate\" typos in comments\n cocbalt_lcdfb: correct sections\n doc: Change urls for sparse\n Powerpc: wii: Fix typo in comment\n i2o: cleanup some exit paths\n Documentation/: it\u0027s -\u003e its where appropriate\n UML: Fix compiler warning due to missing task_struct declaration\n UML: add kernel.h include to signal.c\n ...\n" }, { "commit": "dfacc4d6c98b89609250269f518c1f54c30454ef", "tree": "e7effbee7bdc85d18f7b26ab9cb5c9f700d1481a", "parents": [ "f869097e884d8cb65b2bb7831ca57b7dffb66fdd", "85cb68b27c428d477169f3aa46c72dba103a17bd" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu May 20 14:38:55 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu May 20 14:38:55 2010 +0200" }, "message": "Merge branch \u0027perf/urgent\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core\n" }, { "commit": "7d02093e29de9efc4a72d5e93baae9506969b789", "tree": "a6fc2450132ae419934f6eb9d223baa338b7d782", "parents": [ "6e0b7b2c39b91b467270dd0bc383914f99e1fb28", "e9ddbc075d95b2edf111247cdde16f33c31654a8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:10:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:10:06 2010 -0700" }, "message": "Merge branch \u0027timers-for-linus-cleanups\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-for-linus-cleanups\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n avr32: Fix typo in read_persistent_clock()\n sparc: Convert sparc to use read/update_persistent_clock\n cris: Convert cris to use read/update_persistent_clock\n m68k: Convert m68k to use read/update_persistent_clock\n m32r: Convert m32r to use read/update_peristent_clock\n blackfin: Convert blackfin to use read/update_persistent_clock\n ia64: Convert ia64 to use read/update_persistent_clock\n avr32: Convert avr32 to use read/update_persistent_clock\n h8300: Convert h8300 to use read/update_persistent_clock\n frv: Convert frv to use read/update_persistent_clock\n mn10300: Convert mn10300 to use read/update_persistent_clock\n alpha: Convert alpha to use read/update_persistent_clock\n xtensa: Fix unnecessary setting of xtime\n time: Clean up direct xtime usage in xen\n" }, { "commit": "711f77f53c5ff6aa61dbe8e5f518e50d6306e89d", "tree": "93bc99051b26586916a628b1a276543085f80ff2", "parents": [ "024a6b95181f2df6090975c8a293499d24bf8b28", "273fca0ecad9305247043815e185d1bfd04047d4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 13:34:20 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 13:34:20 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:\n sparc: Define ARCH_SLAB_MINALIGN\n drivers/sbus/char/flash.c: flash_read should update ppos instead of file-\u003ef_pos\n sparc64: Fix stack dumping and tracing when function graph is enabled.\n sparc64: Show stack backtrace from show_regs() just like other platforms.\n" }, { "commit": "273fca0ecad9305247043815e185d1bfd04047d4", "tree": "ea472046a1d4137adcb1f6594f2d7db9b268ccf9", "parents": [ "be94bbb5db4de0f3a2a5405511ea3ebea261f2c8" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 18 15:23:58 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue May 18 15:23:58 2010 -0700" }, "message": "sparc: Define ARCH_SLAB_MINALIGN\n\nBecause SLOB fancies being different, the default minimum alignment is\nonly \"unsigned long\" instead of SLAB/SLUB where the default is\n\"unsigned long long\"\n\nThe inconsistency makes no sense and is asking for trouble, but define\nARCH_SLAB_MINALIGN to get it right in all cases even after they fix\nthe inconsistency.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "58f9b0b02414062eaff46716bc04b47d7e79add5", "tree": "fa5265f4c37c2f4afb42a126f39cccc9602e06a2", "parents": [ "61c7a080a5a061c976988fd4b844dfb468dda255" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:56 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 18 16:10:45 2010 -0600" }, "message": "of: eliminate of_device-\u003enode and dev_archdata-\u003e{of,prom}_node\n\nThis patch eliminates the node pointer from struct of_device and the\nof_node (or prom_node) pointer from struct dev_archdata since the node\npointer is now part of struct device proper when CONFIG_OF is set, and\nall users of the old pointer locations have already been converted over\nto use device-\u003eof_node.\n\nAlso remove dev_archdata_{get,set}_node() as it is no longer used by\nanything.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "61c7a080a5a061c976988fd4b844dfb468dda255", "tree": "8cb492b73f2755c38a6164d770da34d5af6486a0", "parents": [ "d12d42f744f805a9ccc33cd76f04b237cd83ce56" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:29 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue May 18 16:10:44 2010 -0600" }, "message": "of: Always use \u0027struct device.of_node\u0027 to get device node pointer.\n\nThe following structure elements duplicate the information in\n\u0027struct device.of_node\u0027 and so are being eliminated. This patch\nmakes all readers of these elements use device.of_node instead.\n\n(struct of_device *)-\u003enode\n(struct dev_archdata *)-\u003eprom_node (sparc)\n(struct dev_archdata *)-\u003eof_node (powerpc \u0026 microblaze)\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\n" }, { "commit": "a13c3afd9b62b6dace80654964cc4ca7d2db8092", "tree": "b1492c20445ef4eabf288b5e02a04a3136f4fd24", "parents": [ "6d1acfd5c6bfd5231c13a8f2858d7f2afbaa1b62" ], "author": { "name": "Lin Ming", "email": "ming.m.lin@intel.com", "time": "Fri Apr 23 13:56:33 2010 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue May 18 18:59:12 2010 +0200" }, "message": "perf, sparc: Implement group scheduling transactional APIs\n\nConvert to the transactional PMU API and remove the duplication of\ngroup_sched_in().\n\n[cross build only]\n\nSigned-off-by: Lin Ming \u003cming.m.lin@intel.com\u003e\nAcked-by: David Miller \u003cdavem@davemloft.net\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nLKML-Reference: \u003c1272002193.5707.65.camel@minggr.sh.intel.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "cb41838bbc4403f7270a94b93a9a0d9fc9c2e7ea", "tree": "0f359975ccad4ac72e86b8edf1924c076e74bd89", "parents": [ "98f01720cbe3e2eb719682777049b6514e9db556", "c59bd5688299cddb71183e156e7a3c1409b90df2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:17:01 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 18 09:17:01 2010 -0700" }, "message": "Merge branch \u0027core-hweight-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027core-hweight-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n x86, hweight: Use a 32-bit popcnt for __arch_hweight32()\n arch, hweight: Fix compilation errors\n x86: Add optimized popcnt variants\n bitops: Optimize hweight() by making use of compile-time evaluation\n" }, { "commit": "f3d46f9d3194e0329216002a8724d4c0957abc79", "tree": "6d9413e4a448d7b8d342c40297c4fbe0b9c4c2f0", "parents": [ "e40152ee1e1c7a63f4777791863215e3faa37a86" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Mon May 17 14:33:53 2010 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 17 07:57:27 2010 -0700" }, "message": "atomic_t: Cast to volatile when accessing atomic variables\n\nIn preparation for removing volatile from the atomic_t definition, this\npatch adds a volatile cast to all the atomic read functions.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0ddc9324b1a842afd77e8e86698b1d1d2ffed022", "tree": "9247bd1a897cc9ed665782a1b7f7e5fb28068600", "parents": [ "6858d49833b8c2aae74adcb593065797409d376e" ], "author": { "name": "Andreas Dilger", "email": "adilger@dilger.ca", "time": "Fri May 14 11:13:27 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri May 14 11:13:27 2010 +0200" }, "message": "add descriptive comment for TIF_MEMDIE task flag declaration.\n\nSigned-off-by: Andreas Dilger \u003cadilger@dilger.ca\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "d706c1b050274b3bf97d7cb0542c0d070c9ccb8b", "tree": "9104c28f9028589cc4b95d8846dfc3288dcbf289", "parents": [ "efb2e014fc4f2675011b802e1a84bf9a58756004" ], "author": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Tue Apr 13 16:12:28 2010 -0700" }, "committer": { "name": "Grant Likely", "email": "grant.likely@secretlab.ca", "time": "Wed Apr 28 18:20:57 2010 -0600" }, "message": "driver-core: Add device node pointer to struct device\n\nCurrently, platforms using CONFIG_OF add a \u0027struct device_node *of_node\u0027\nto dev-\u003earchdata. However, with CONFIG_OF becoming generic for all\narchitectures, it makes sense for commonality to move it out of archdata\nand into struct device proper.\n\nThis patch adds a struct device_node *of_node member to struct device\nand updates all locations which currently write the device_node pointer\ninto archdata to also update dev-\u003eof_node. Subsequent patches will\nmodify callers to use the archdata location and ultimately remove\nthe archdata member entirely.\n\nSigned-off-by: Grant Likely \u003cgrant.likely@secretlab.ca\u003e\nAcked-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCC: Michal Simek \u003cmonstr@monstr.eu\u003e\nCC: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\nCC: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCC: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCC: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\nCC: Jeremy Kerr \u003cjeremy.kerr@canonical.com\u003e\nCC: microblaze-uclinux@itee.uq.edu.au\nCC: linux-kernel@vger.kernel.org\nCC: linuxppc-dev@ozlabs.org\nCC: sparclinux@vger.kernel.org\n" }, { "commit": "667f0cee3e0321151aa7a1a5222afe67ca4be0ea", "tree": "5f4a7a5c228a21e893f95774ca95f9925abf4b1f", "parents": [ "87e8f0e3e6d0b720a2462ebc5667eaa462752f74" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 03:08:11 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 03:08:11 2010 -0700" }, "message": "sparc64: Fix stack dumping and tracing when function graph is enabled.\n\nLike x86, when the function graph tracer is enabled, emit the ftrace\nstub as well as the program counter it will be transformed back into.\n\nWe duplicate a lot of similar stack walking logic in 3 or 4 spots, so\neventually we should consolidate things like x86 does.\n\nThanks to Frederic Weisbecker for pointing this out.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "87e8f0e3e6d0b720a2462ebc5667eaa462752f74", "tree": "4acba282285d9a749ec7a6dd20ee4da297ba16ce", "parents": [ "28a1f533ae8606020238b840b82ae70a3f87609e" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 02:31:50 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 21 02:31:50 2010 -0700" }, "message": "sparc64: Show stack backtrace from show_regs() just like other platforms.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "28a1f533ae8606020238b840b82ae70a3f87609e", "tree": "aba93c055c8e2cd36b05846ed38173daba44ce53", "parents": [ "baa06775e224e9f74e5c2de894c95cd49678beff" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 20 00:48:37 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 20 00:48:37 2010 -0700" }, "message": "sparc64: Fix hardirq tracing in trap return path.\n\nWe can overflow the hardirq stack if we set the %pil here\nso early, just let the normal control flow do it.\n\nThis is fine as we are allowed to do the actual IRQ enable\nat any point after we call trace_hardirqs_on.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "baa06775e224e9f74e5c2de894c95cd49678beff", "tree": "75f06a56bcb8e82e0a820d33cceb20ec74a18d23", "parents": [ "6c94b1ee0ca2bfb526d779c088ec20da6a3761db" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 19 13:46:48 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 19 13:46:48 2010 -0700" }, "message": "sparc64: Use correct pt_regs in decode_access_size() error paths.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "6c94b1ee0ca2bfb526d779c088ec20da6a3761db", "tree": "c6b141ac6de8cd761c0267aaa09e111f852f17f0", "parents": [ "ec687886de00e1e63f3d821ccade9a61590408ed" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 19 01:30:51 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Apr 19 01:30:51 2010 -0700" }, "message": "sparc64: Fix PREEMPT_ACTIVE value.\n\nIt currently overlaps the NMI bit.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "ec687886de00e1e63f3d821ccade9a61590408ed", "tree": "093e303475754d30b679bd35ae9cc5522832057e", "parents": [ "035df35d968323f6f463c8789553e8589efcbcd4" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 14 02:04:29 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Apr 14 02:04:29 2010 -0700" }, "message": "sparc64: Run NMIs on the hardirq stack.\n\nOtherwise we can overflow the main stack with the function tracer\nenabled.\n\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "035df35d968323f6f463c8789553e8589efcbcd4", "tree": "6932aa9c85e37cf7d2e910a171b46ffacdb834a8", "parents": [ "2e2dc1d755cc5609d0c46d47f7d171318b3bffcd" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 13 18:59:02 2010 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Tue Apr 13 18:59:02 2010 -0700" }, "message": "sparc64: Allocate sufficient stack space in ftrace stubs.\n\n128 bytes is sufficient for the register window save area, but the\ncalling conventions allow the callee to save up to 6 incoming argument\nregisters into the stack frame after the register window save area.\n\nThis means a minimal stack frame is 176 bytes (128 + (6 * 8)).\n\nThis fixes random crashes when using the function tracer.\n\nReported-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" } ], "next": "2e2dc1d755cc5609d0c46d47f7d171318b3bffcd" }