)]}' { "log": [ { "commit": "eb2a2fd91f7c8a53b15063d6f08cf22b9a56cbfb", "tree": "1d910a9460b76fd85ed02e8b9131270e4977f6f7", "parents": [ "c226951b93f7cd7c3a10b17384535b617bd43fd0" ], "author": { "name": "Krzysztof Halasa", "email": "khc@pm.waw.pl", "time": "Tue Sep 26 23:23:45 2006 +0200" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 26 17:40:24 2006 -0400" }, "message": "[PATCH] Modularize generic HDLC\n\nThis patch enables building of individual WAN protocol support\nroutines (parts of generic HDLC) as separate modules.\nAll protocol-private definitions are moved from hdlc.h file\nto protocol drivers. User-space interface and interface\nbetween generic HDLC and underlying low-level HDLC drivers\nare unchanged.\n\nSigned-off-by: Krzysztof Halasa \u003ckhc@pm.waw.pl\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "c226951b93f7cd7c3a10b17384535b617bd43fd0", "tree": "07b8796a5c99fbbf587b8d0dbcbc173cfe5e381e", "parents": [ "b0df3bd1e553e901ec7297267611a5db88240b38", "e8216dee838c09776680a6f1a2e54d81f3cdfa14" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 26 13:13:19 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Tue Sep 26 13:13:19 2006 -0400" }, "message": "Merge branch \u0027master\u0027 into upstream\n" }, { "commit": "e8df8c3304cfc7d68e9a6a7b6df6c64783cd6991", "tree": "19430fa49f774ebeaa7cf8d5d40c58600ad79bf5", "parents": [ "70e0eb8ef143f3729065c504177413ffe165af22" ], "author": { "name": "Jeff Dike", "email": "jdike@addtoit.com", "time": "Mon Sep 25 23:33:10 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:49:10 2006 -0700" }, "message": "[PATCH] Make UML use ptrace-abi.h\n\nInclude the host architecture\u0027s ptrace-abi.h instead of ptrace.h.\n\nThere was some cpp mangling of names around the ptrace.h include to avoid\nsymbol clashes between UML and the host architecture. Most of these can go\naway. The exception is struct pt_regs, which is convenient to have in\nuserspace, but must be renamed in order that UML can define its own.\n\nptrace-x86_64.h needed to have some now-obsolete cpp cruft and a declaration\nremoved.\n\nSigned-off-by: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "70e0eb8ef143f3729065c504177413ffe165af22", "tree": "9bf2f94b51dcf2ab8a0cd0b8df775d3452ea1b74", "parents": [ "b1fc0b1f21c4082d24d1f456a846b4fa7d16a70b" ], "author": { "name": "Jeff Dike", "email": "jdike@addtoit.com", "time": "Mon Sep 25 23:33:09 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:49:10 2006 -0700" }, "message": "[PATCH] Split i386 and x86_64 ptrace.h\n\nThe use of SEGMENT_RPL_MASK in the i386 ptrace.h introduced by\nx86-allow-a-kernel-to-not-be-in-ring-0.patch broke the UML build, as UML\nincludes the underlying architecture\u0027s ptrace.h, but has no easy access to the\nx86 segment definitions.\n\nRather than kludging around this, as in the past, this patch splits the\nuserspace-usable parts, which are the bits that UML needs, of ptrace.h into\nptrace-abi.h, which is included back into ptrace.h. Thus, there is no net\neffect on i386.\n\nAs a side-effect, this creates a ptrace header which is close to being usable\nin /usr/include.\n\nx86_64 is also treated in this way for consistency. There was some trailing\nwhitespace there, which is cleaned up.\n\nSigned-off-by: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "75e29b18d9a46bf3193278e92dc95609a8cca2ab", "tree": "413935160ac2f65c13ec5260a60cdd1d9259fd83", "parents": [ "bf61f50d63b4d9e30d7a86a2d44bb300ae7c1dd4" ], "author": { "name": "Jeff Dike", "email": "jdike@addtoit.com", "time": "Mon Sep 25 23:33:08 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:49:09 2006 -0700" }, "message": "[PATCH] uml: stack usage reduction\n\nThe KSTK_* macros used an inordinate amount of stack. In order to overcome\nan impedance mismatch between their interface, which just returns a single\nregister value, and the interface of get_thread_regs, which took a full\npt_regs, the implementation created an on-stack pt_regs, filled it in, and\nreturned one field. do_task_stat calls KSTK_* twice, resulting in two\nlocal pt_regs, blowing out the stack.\n\nThis patch changes the interface (and name) of get_thread_regs to just\nreturn a single register from a jmp_buf.\n\nThe include of archsetjmp.h\" in registers.h to get the definition of\njmp_buf exposed a bogus include of \u003csetjmp.h\u003e in start_up.c. \u003csetjmp.h\u003e\nshouldn\u0027t be used anywhere any more since UML uses the klibc\nsetjmp/longjmp.\n\nSigned-off-by: Jeff Dike \u003cjdike@addtoit.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "c5c6ba4e08ab9c9e390a0f3a7d9a5c332f5cc6ef", "tree": "4e13a9eebd8f3901dcc187c585369ef843d1e1a7", "parents": [ "7d145aa3abf4d96c91f37c012facd5cfbb9010d1" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Sep 25 23:32:58 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:49:04 2006 -0700" }, "message": "[PATCH] PM: Add pm_trace switch\n\nAdd the pm_trace attribute in /sys/power which has to be explicitly set to\none to really enable the \"PM tracing\" code compiled in when CONFIG_PM_TRACE\nis set (which modifies the machine\u0027s CMOS clock in unpredictable ways).\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "c8eb8b4025175f967af0ba8e933f23aa9954dc35", "tree": "1e7dcfe6472aa0cae05651e375bebb3e7b5b9eb8", "parents": [ "940864ddabdb180e02041c4dcd46ba6f9eee732f" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Sep 25 23:32:56 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:49:03 2006 -0700" }, "message": "[PATCH] PM: make it possible to disable console suspending\n\nChange suspend_console() so that it waits for all consoles to flush the\nremaining messages and make it possible to switch the console suspending off\nwith the help of a Kconfig option.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nCc: Stefan Seyfried \u003cseife@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "940864ddabdb180e02041c4dcd46ba6f9eee732f", "tree": "cee174e45717dce64f7108a1c74182e691c1c8c2", "parents": [ "b788db79896ef2a5817b9395ad63573b254a6d93" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Sep 25 23:32:55 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:49:02 2006 -0700" }, "message": "[PATCH] swsusp: Use memory bitmaps during resume\n\nMake swsusp use memory bitmaps to store its internal information during the\nresume phase of the suspend-resume cycle.\n\nIf the pfns of saveable pages are saved during the suspend phase instead of\nthe kernel virtual addresses of these pages, we can use them during the resume\nphase directly to set the corresponding bits in a memory bitmap. Then, this\nbitmap is used to mark the page frames corresponding to the pages that were\nsaveable before the suspend (aka \"unsafe\" page frames).\n\nNext, we allocate as many page frames as needed to store the entire suspend\nimage and make sure that there will be some extra free \"safe\" page frames for\nthe list of PBEs constructed later. Subsequently, the image is loaded and, if\npossible, the data loaded from it are written into their \"original\" page\nframes (ie. the ones they had occupied before the suspend).\n\nThe image data that cannot be written into their \"original\" page frames are\nloaded into \"safe\" page frames and their \"original\" kernel virtual addresses,\nas well as the addresses of the \"safe\" pages containing their copies, are\nstored in a list of PBEs. Finally, the list of PBEs is used to copy the\nremaining image data into their \"original\" page frames (this is done\natomically, by the architecture-dependent parts of swsusp).\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "dcbb5a54f6e3984efa24772394f2225b11495c55", "tree": "60a3877a9f6b23ae42509773b93256c28329af59", "parents": [ "cd560bb2f9e2cd451bb3942af43da19632ba4a8e" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Sep 25 23:32:51 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:49:00 2006 -0700" }, "message": "[PATCH] swsusp: clean up suspend header\n\nRemove some things that are no longer used or defined elsewhere from suspend.h\nand make the inline version of software_suspend() return the right error code.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "e3920fb42c8ddfe63befb54d95c0e13eabacea9b", "tree": "08371a71e58e6e9d3ec62dfa6a22b3b5e6ff0fd5", "parents": [ "e8eff5ac294e12531c4195e0c15a222d3c9015e5" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Sep 25 23:32:48 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:59 2006 -0700" }, "message": "[PATCH] Disable CPU hotplug during suspend\n\nThe current suspend code has to be run on one CPU, so we use the CPU\nhotplug to take the non-boot CPUs offline on SMP machines. However, we\nshould also make sure that these CPUs will not be enabled by someone else\nafter we have disabled them.\n\nThe functions disable_nonboot_cpus() and enable_nonboot_cpus() are moved to\nkernel/cpu.c, because they now refer to some stuff in there that should\nbetter be static. Also it\u0027s better if disable_nonboot_cpus() returns an\nerror instead of panicking if something goes wrong, and\nenable_nonboot_cpus() has no reason to panic(), because the CPUs may have\nbeen enabled by the userland before it tries to take them online.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nAcked-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "e8eff5ac294e12531c4195e0c15a222d3c9015e5", "tree": "d63a3f26e506c3468e071377fec7aa9944f24764", "parents": [ "fb13a28b0f5ada60861868c4fa48a12bd0cb8dea" ], "author": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Mon Sep 25 23:32:46 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:58 2006 -0700" }, "message": "[PATCH] Make swsusp avoid memory holes and reserved memory regions on x86_64\n\nOn x86_64 machines with more than 2 GB of RAM there are large memory gaps\n(with no corresponding kernel virtual addresses) and reserved memory\nregions between areas of usable physical RAM. Moreover, if CONFIG_FLATMEM\nis set, they appear within the normal zone. swsusp should not try to save\nthem, so the corresponding page structs have to be marked as \u0027nosave\u0027.\n\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nAcked-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "546e0d271941dd1ff6961e2a1f7eac75f1fc277e", "tree": "60c74a9598f7cb4622c1b6acd25df5df67284353", "parents": [ "8c002494b55119a3fd1dddee83b4fb75cfda47e5" ], "author": { "name": "Andrew Morton", "email": "akpm@osdl.org", "time": "Mon Sep 25 23:32:44 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:58 2006 -0700" }, "message": "[PATCH] swsusp: read speedup\n\nImplement async reads for swsusp resuming.\n\nCrufty old PIII testbox:\n\t15.7 MB/s -\u003e 20.3 MB/s\n\nSony Vaio:\n\t14.6 MB/s -\u003e 33.3 MB/s\n\nI didn\u0027t implement the post-resume bio_set_pages_dirty(). I don\u0027t really\nunderstand why resume needs to run set_page_dirty() against these pages.\n\nIt might be a worry that this code modifies PG_Uptodate, PG_Error and\nPG_Locked against the image pages. Can this possibly affect the resumed-into\nkernel? Hopefully not, if we\u0027re atomically restoring its mem_map?\n\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nCc: Jens Axboe \u003caxboe@suse.de\u003e\nCc: Laurent Riffard \u003claurent.riffard@free.fr\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "ab954160350c91c77ae03740ef90458c3ad5412c", "tree": "28f99d765c2c6d497a1f5543b1867875cd6102a5", "parents": [ "3a4f7577c9ef393ca80c783f02ffbc125de771c7" ], "author": { "name": "Andrew Morton", "email": "akpm@osdl.org", "time": "Mon Sep 25 23:32:42 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:58 2006 -0700" }, "message": "[PATCH] swsusp: write speedup\n\nSwitch the swsusp writeout code from 4k-at-a-time to 4MB-at-a-time.\n\nCrufty old PIII testbox:\n\t12.9 MB/s -\u003e 20.9 MB/s\n\nSony Vaio:\n\t14.7 MB/s -\u003e 26.5 MB/s\n\nThe implementation is crude. A better one would use larger BIOs, but wouldn\u0027t\ngain any performance.\n\nThe memcpys will be mostly pipelined with the IO and basically come for free.\n\nThe ENOMEM path has not been tested. It should be.\n\nCc: Pavel Machek \u003cpavel@ucw.cz\u003e\nCc: \"Rafael J. Wysocki\" \u003crjw@sisk.pl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "930631edd4b1fe2781d9fe90edbe35d89dfc94cc", "tree": "24341082c9043742e45f7865f54ad3223e2fd89e", "parents": [ "060ec3d52db417a4fa554b6e14594ca62418c326" ], "author": { "name": "Steven Whitehouse", "email": "swhiteho@redhat.com", "time": "Mon Sep 25 23:32:40 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:58 2006 -0700" }, "message": "[PATCH] add DIV_ROUND_UP()\n\nAdd the DIV_ROUND_UP() helper macro: divide `n\u0027 by `d\u0027, rounding up.\n\nStolen from the gfs2 tree(!) because the swsusp patches need it.\n\nSigned-off-by: Steven Whitehouse \u003cswhiteho@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "a3bc0dbc81d36fd38991b4373f6de8e1a507605a", "tree": "fc7f926365fbdd86fa80b633add01ee4d2f71e18", "parents": [ "eaa70773e750cc09d60938bceacd028bc76b8e3a" ], "author": { "name": "Andrew Morton", "email": "akpm@osdl.org", "time": "Mon Sep 25 23:32:33 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:56 2006 -0700" }, "message": "[PATCH] smp_call_function_single() cleanup\n\nIf we\u0027re going to implement smp_call_function_single() on three architecture\nwith the same prototype then it should have a declaration in a\nnon-arch-specific header file.\n\nMove it into \u003clinux/smp.h\u003e.\n\nCc: Stephane Eranian \u003ceranian@hpl.hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "2965a0e6da0ccd8971ccf2c00a02bfa6e212acdb", "tree": "63bb78c54718a395c76eca372b5fdcd1c8f3164d", "parents": [ "6049742dbcecf170e903638a029f4dc280b9d53d" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Sep 25 23:32:31 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:56 2006 -0700" }, "message": "[PATCH] x86: trivial move of ptep_set_access_flags\n\nMove ptep_set_access_flags to be closer to the other ptep accessors, and make\nthe indentation standard.\n\nSigned-off-by: Zachary Amsden \u003czach@vmware.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "6049742dbcecf170e903638a029f4dc280b9d53d", "tree": "1712d4116a622336f793dc4591b1e2ac85e0aa2e", "parents": [ "673eae8230a192f07b8715b872d6925521e9738d" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Sep 25 23:32:30 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:56 2006 -0700" }, "message": "[PATCH] x86: trivial move of __HAVE macros in i386 pagetable headers\n\nMove the __HAVE_ARCH_PTEP defines to accompany the function definitions.\nAnything else is just a complete nightmare to track through the 2/3-level\npaging code, and this caused duplicate definitions to be needed (pte_same),\nwhich could have easily been taken care of with the asm-generic pgtable\nfunctions.\n\nSigned-off-by: Zachary Amsden \u003czach@vmware.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "673eae8230a192f07b8715b872d6925521e9738d", "tree": "2917c765594015ebfad00bb4fc1feef41286ca1a", "parents": [ "753b9f86e7aef76c2beda32668ce528f90cb1733" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Sep 25 23:32:29 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:56 2006 -0700" }, "message": "[PATCH] x86: trivial pgtable.h __ASSEMBLY__ move\n\nParsing generic pgtable.h in assembler is simply crazy. None of this file is\nneeded in assembler code, and C inline functions and structures routine break\none or more different compiles.\n\nSigned-off-by: Zachary Amsden \u003czach@vmware.com\u003e\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "5091e746848f74c9a2c0579b4ef8d8cd1a6b135d", "tree": "dba54fe198dbcde7a22873705241439859435f22", "parents": [ "9c9b8b388296ad5a306ab238dc677cfe6ff4cb12" ], "author": { "name": "Ian Campbell", "email": "Ian.Campbell@xensource.com", "time": "Mon Sep 25 23:32:28 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:56 2006 -0700" }, "message": "[PATCH] Translate asm version of ELFNOTE macro into preprocessor macro\n\nI\u0027ve come across some problems with the assembly version of the ELFNOTE\nmacro currently in -mm. (in\nx86-put-note-sections-into-a-pt_note-segment-in-vmlinux.patch)\n\nThe first is that older gas does not support :varargs in .macro\ndefinitions (in my testing 2.17 does while 2.15 does not, I don\u0027t know\nwhen it became supported). The Changes file says binutils \u003e\u003d 2.12 so I\nthink we need to avoid using it. There are no other uses in mainline or\n-mm. Old gas appears to just ignore it so you get \"too many arguments\"\ntype errors.\n\nSecondly it seems that passing strings as arguments to assembler macros\nis broken without varargs. It looks like they get unquoted or each\ncharacter is treated as a separate argument or something and this causes\nall manner of grief. I think this is because of the use of -traditional\nwhen compiling assembly files.\n\nTherefore I have translated the assembler macro into a pre-processor\nmacro.\n\nI added the desctype as a separate argument instead of including it with\nthe descdata as the previous version did since -traditional means the\nELFNOTE definition after the #else needs to have the same number of\narguments (I think so anyway, the -traditional CPP semantics are pretty\nfscking strange!).\n\nWith this patch I am able to define elfnotes in assembly like this with\nboth old and new assemblers.\n\n\tELFNOTE(Xen, XEN_ELFNOTE_GUEST_OS, .asciz, \"linux\")\n\tELFNOTE(Xen, XEN_ELFNOTE_GUEST_VERSION, .asciz, \"2.6\")\n\tELFNOTE(Xen, XEN_ELFNOTE_XEN_VERSION, .asciz, \"xen-3.0\")\n\tELFNOTE(Xen, XEN_ELFNOTE_VIRT_BASE, .long, __PAGE_OFFSET)\n\nWhich seems reasonable enough.\n\nSigned-off-by: Ian Campbell \u003cian.campbell@xensource.com\u003e\nAcked-by: Jeremy Fitzhardinge \u003cjeremy@xensource.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "9c9b8b388296ad5a306ab238dc677cfe6ff4cb12", "tree": "997b14216fa77db77052766b38dd0ef4cd829648", "parents": [ "461a9afff5e731d6337c0f5b08a1e727ccd57e0a" ], "author": { "name": "Jeremy Fitzhardinge", "email": "jeremy@xensource.com", "time": "Mon Sep 25 23:32:26 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:55 2006 -0700" }, "message": "[PATCH] x86: put .note.* sections into a PT_NOTE segment in vmlinux\n\nThis patch will pack any .note.* section into a PT_NOTE segment in the output\nfile.\n\nTo do this, we tell ld that we need a PT_NOTE segment. This requires us to\nstart explicitly mapping sections to segments, so we also need to explicitly\ncreate PT_LOAD segments for text and data, and map the sections to them\nappropriately. Fortunately, each section will default to its previous\nsection\u0027s segment, so it doesn\u0027t take many changes to vmlinux.lds.S.\n\nThis only changes i386 for now, but I presume the corresponding changes for\nother architectures will be as simple.\n\nThis change also adds \u003clinux/elfnote.h\u003e, which defines C and Assembler macros\nfor actually creating ELF notes.\n\nSigned-off-by: Jeremy Fitzhardinge \u003cjeremy@xensource.com\u003e\nCc: Eric W. Biederman \u003cebiederm@xmission.com\u003e\nCc: Hollis Blanchard \u003chollisb@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "052e79941a042e5be4feffa03b1fd60d93fb9e9a", "tree": "fd3ac24a05029b50a6c6ddfa486ea441b4091806", "parents": [ "9f093394d75cd9c5df82c7a99c5eb5d7ce7ba199" ], "author": { "name": "Jeremy Fitzhardinge", "email": "jeremy@xensource.com", "time": "Mon Sep 25 23:32:25 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:55 2006 -0700" }, "message": "[PATCH] x86: make __FIXADDR_TOP variable to allow it to make space for a hypervisor\n\nMake __FIXADDR_TOP a variable, so that it can be set to not get in the way of\naddress space a hypervisor may want to reserve.\n\nOriginal patch by Gerd Hoffmann \u003ckraxel@suse.de\u003e\n\nSigned-off-by: Jeremy Fitzhardinge \u003cjeremy@xensource.com\u003e\nSigned-off-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nCc: Gerd Hoffmann \u003ckraxel@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "9f093394d75cd9c5df82c7a99c5eb5d7ce7ba199", "tree": "fd2b12f36300fedf537ed27c7c7268aaf43ad159", "parents": [ "027a8c7e6067a1bcdef6775d1b1c08729dfbae51" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Mon Sep 25 23:32:24 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:55 2006 -0700" }, "message": "[PATCH] x86: roll all the cpuid asm into one __cpuid call\n\nIt\u0027s a little neater, and also means only one place to patch for\nparavirtualization.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Jeremy Fitzhardinge \u003cjeremy@xensource.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "027a8c7e6067a1bcdef6775d1b1c08729dfbae51", "tree": "8c791bb8820d6c0734aded634a045369dd3347cc", "parents": [ "05f4a3ec94281347e05c81eafefcfe5ea545c94c" ], "author": { "name": "Chris Wright", "email": "chrisw@sous-sol.org", "time": "Mon Sep 25 23:32:23 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:55 2006 -0700" }, "message": "[PATCH] x86: implement always-locked bit ops, for memory shared with an SMP hypervisor\n\nAdd \"always lock\u0027d\" implementations of set_bit, clear_bit and change_bit and\nthe corresponding test_and_ functions. Also add \"always lock\u0027d\"\nimplementation of cmpxchg. These give guaranteed strong synchronisation and\nare required for non-SMP kernels running on an SMP hypervisor.\n\nSigned-off-by: Ian Pratt \u003cian.pratt@xensource.com\u003e\nSigned-off-by: Christian Limpach \u003cChristian.Limpach@cl.cam.ac.uk\u003e\nSigned-off-by: Chris Wright \u003cchrisw@sous-sol.org\u003e\nSigned-off-by: Jeremy Fitzhardinge \u003cjeremy@xensource.com\u003e\nCc: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "3a750363e6075a28e5542ce93a69c620c0cfd605", "tree": "4585aa2dbd2a8419ff2d52d5c0148cbb10502b42", "parents": [ "99325326a57b6a56595bb097655bee9fd27d77b0" ], "author": { "name": "Rolf Eike Beer", "email": "eike-kernel@sf-tec.de", "time": "Mon Sep 25 23:32:20 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:55 2006 -0700" }, "message": "[PATCH] Use BUG_ON(foo) instead of \"if (foo) BUG()\" in include/asm-i386/dma-mapping.h\n\nSigned-off-by: Rolf Eike Beer \u003ceike-kernel@sf-tec.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "bc157b75960f1f33566074e820342690216629b9", "tree": "3f494ec585eb4bf3e7def5de2b2455b13b5c42c8", "parents": [ "5f97f7f9400de47ae837170bb274e90ad3934386" ], "author": { "name": "Haavard Skinnemoen", "email": "hskinnemoen@atmel.com", "time": "Mon Sep 25 23:32:16 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:54 2006 -0700" }, "message": "[PATCH] AVR32 MTD: Static Memory Controller driver\n\nThis patchset adds the necessary drivers and infrastructure to access the\nexternal flash on the ATSTK1000 board through the MTD subsystem. With this\nstuff in place, it will be possible to use a jffs2 filesystem stored in the\nexternal flash as a root filesystem. It might also be possible to update the\nboot loader if you drop the write protection of partition 0.\n\nAs suggested by David Woodhouse, I reworked the patches to use the physmap\ndriver instead of introducing a separate mapping driver for the ATSTK1000.\nI\u0027ve also cleaned up the hsmc header by removing useless comments and\nconverting spaces to tabs (my headerfile generator needs some work.)\n\nUnfortunately, I couldn\u0027t unlock the flash in fixup_use_atmel_lock because the\nerase regions hadn\u0027t been set up yet, so I had to do it from cfi_amdstd_setup\ninstead.\n\nThis patch:\n\nThis adds a simple API for configuring the static memory controller along with\nan implementation for the Atmel HSMC.\n\nSigned-off-by: Haavard Skinnemoen \u003chskinnemoen@atmel.com\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "5f97f7f9400de47ae837170bb274e90ad3934386", "tree": "514451e6dc6b46253293a00035d375e77b1c65ed", "parents": [ "53e62d3aaa60590d4a69b4e07c29f448b5151047" ], "author": { "name": "Haavard Skinnemoen", "email": "hskinnemoen@atmel.com", "time": "Mon Sep 25 23:32:13 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:54 2006 -0700" }, "message": "[PATCH] avr32 architecture\n\nThis adds support for the Atmel AVR32 architecture as well as the AT32AP7000\nCPU and the AT32STK1000 development board.\n\nAVR32 is a new high-performance 32-bit RISC microprocessor core, designed for\ncost-sensitive embedded applications, with particular emphasis on low power\nconsumption and high code density. The AVR32 architecture is not binary\ncompatible with earlier 8-bit AVR architectures.\n\nThe AVR32 architecture, including the instruction set, is described by the\nAVR32 Architecture Manual, available from\n\nhttp://www.atmel.com/dyn/resources/prod_documents/doc32000.pdf\n\nThe Atmel AT32AP7000 is the first CPU implementing the AVR32 architecture. It\nfeatures a 7-stage pipeline, 16KB instruction and data caches and a full\nMemory Management Unit. It also comes with a large set of integrated\nperipherals, many of which are shared with the AT91 ARM-based controllers from\nAtmel.\n\nFull data sheet is available from\n\nhttp://www.atmel.com/dyn/resources/prod_documents/doc32003.pdf\n\nwhile the CPU core implementation including caches and MMU is documented by\nthe AVR32 AP Technical Reference, available from\n\nhttp://www.atmel.com/dyn/resources/prod_documents/doc32001.pdf\n\nInformation about the AT32STK1000 development board can be found at\n\nhttp://www.atmel.com/dyn/products/tools_card.asp?tool_id\u003d3918\n\nincluding a BSP CD image with an earlier version of this patch, development\ntools (binaries and source/patches) and a root filesystem image suitable for\nbooting from SD card.\n\nAlternatively, there\u0027s a preliminary \"getting started\" guide available at\nhttp://avr32linux.org/twiki/bin/view/Main/GettingStarted which provides links\nto the sources and patches you will need in order to set up a cross-compiling\nenvironment for avr32-linux.\n\nThis patch, as well as the other patches included with the BSP and the\ntoolchain patches, is actively supported by Atmel Corporation.\n\n[dmccr@us.ibm.com: Fix more pxx_page macro locations]\n[bunk@stusta.de: fix `make defconfig\u0027]\nSigned-off-by: Haavard Skinnemoen \u003chskinnemoen@atmel.com\u003e\nSigned-off-by: Adrian Bunk \u003cbunk@stusta.de\u003e\nSigned-off-by: Dave McCracken \u003cdmccr@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "53e62d3aaa60590d4a69b4e07c29f448b5151047", "tree": "995a43e1dd5760ca4a7a2fb180582d19da7afb01", "parents": [ "cf134483b2cd657039b305777215c531a1009947" ], "author": { "name": "Ralf Baechle", "email": "ralf@linux-mips.org", "time": "Mon Sep 25 23:32:10 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:54 2006 -0700" }, "message": "[PATCH] Alchemy: Delete unused pt_regs * argument from au1xxx_dbdma_chan_alloc\n\nThe third argument of au1xxx_dbdma_chan_alloc\u0027s callback function is not\nused anywhere.\n\nSigned-off-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "cf134483b2cd657039b305777215c531a1009947", "tree": "2dad894d6e916bcf785611ded852151bbea5063b", "parents": [ "a8ad27d03f17e6154c61e81d4a7028c56ca6390d" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon Sep 25 23:32:09 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:54 2006 -0700" }, "message": "[PATCH] FRV: Optimise ffs()\n\nOptimise ffs(x) by using fls(x \u0026 x - 1) which we optimise to use the SCAN\ninstruction.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "a8ad27d03f17e6154c61e81d4a7028c56ca6390d", "tree": "14d0367af1fafa359733b04326a95a4fe39557c5", "parents": [ "92fc707208bb2e601c24b5ab65db37bcb361b658" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon Sep 25 23:32:08 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:54 2006 -0700" }, "message": "[PATCH] FRV: Implement fls64()\n\nImplement fls64() for FRV without recource to conditional jumps.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "92fc707208bb2e601c24b5ab65db37bcb361b658", "tree": "a0b2d56c30ade74946e9edd74f2d516f475c68f5", "parents": [ "af8c65b57aaa4ae321af34dbfc5ca7f5625263fe" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon Sep 25 23:32:07 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:53 2006 -0700" }, "message": "[PATCH] FRV: Fix fls() to handle bit 31 being set correctly\n\nFix FRV fls() to handle bit 31 being set correctly (it should return 32 not 0).\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "af8c65b57aaa4ae321af34dbfc5ca7f5625263fe", "tree": "404b7054e52f8cd0a4347649cae8b5ab82fec357", "parents": [ "88d6e19900366781739df033e9c0e2532e715fa5" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon Sep 25 23:32:07 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:53 2006 -0700" }, "message": "[PATCH] FRV: permit __do_IRQ() to be dispensed with\n\nPermit __do_IRQ() to be dispensed with based on a configuration option.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "1bcbba306048ed86b935d57a95d887c23d52c94b", "tree": "4c6e20b162415c79a177b72b97b6fb4d246a73b0", "parents": [ "8d6b5eeea5eb644232cbbbe1c927fdf051e60fa5" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon Sep 25 23:32:04 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:53 2006 -0700" }, "message": "[PATCH] FRV: Use the generic IRQ stuff\n\nMake the FRV arch use the generic IRQ code rather than having its own\nroutines for doing so.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "9a2f44f01a67a6ecca71515af999895b45a2aeb0", "tree": "badb3047f9a80013ad0d00a413f6ca038ba3f3ce", "parents": [ "1a70cd40cb291c25b67ec0da715a49d76719329d" ], "author": { "name": "Stephen Smalley", "email": "sds@tycho.nsa.gov", "time": "Mon Sep 25 23:31:58 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:52 2006 -0700" }, "message": "[PATCH] selinux: replace ctxid with sid in selinux_audit_rule_match interface\n\nReplace ctxid with sid in selinux_audit_rule_match interface for\nconsistency with other interfaces.\n\nSigned-off-by: Stephen Smalley \u003csds@tycho.nsa.gov\u003e\nAcked-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "1a70cd40cb291c25b67ec0da715a49d76719329d", "tree": "ffb4c6cd3f7ef1b92822ebbda11bd2b035c2bc86", "parents": [ "62bac0185ad3dfef11d9602980445c54d45199c6" ], "author": { "name": "Stephen Smalley", "email": "sds@tycho.nsa.gov", "time": "Mon Sep 25 23:31:57 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:52 2006 -0700" }, "message": "[PATCH] selinux: rename selinux_ctxid_to_string\n\nRename selinux_ctxid_to_string to selinux_sid_to_string to be\nconsistent with other interfaces.\n\nSigned-off-by: Stephen Smalley \u003csds@tycho.nsa.gov\u003e\nAcked-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "62bac0185ad3dfef11d9602980445c54d45199c6", "tree": "8478673a1dccac5f4e7add4ad802a2bf69b269a4", "parents": [ "89fa30242facca249aead2aac03c4c69764f911c" ], "author": { "name": "Stephen Smalley", "email": "sds@tycho.nsa.gov", "time": "Mon Sep 25 23:31:56 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:52 2006 -0700" }, "message": "[PATCH] selinux: eliminate selinux_task_ctxid\n\nEliminate selinux_task_ctxid since it duplicates selinux_task_get_sid.\n\nSigned-off-by: Stephen Smalley \u003csds@tycho.nsa.gov\u003e\nAcked-by: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "89fa30242facca249aead2aac03c4c69764f911c", "tree": "1ac46b4777b819f2a4793d8e37330576ae5089ec", "parents": [ "4415cc8df630b05d3a54267d5f3e5c0b63a4ec05" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:55 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:52 2006 -0700" }, "message": "[PATCH] NUMA: Add zone_to_nid function\n\nThere are many places where we need to determine the node of a zone.\nCurrently we use a difficult to read sequence of pointer dereferencing.\nPut that into an inline function and use throughout VM. Maybe we can find\na way to optimize the lookup in the future.\n\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "0ff38490c836dc379ff7ec45b10a15a662f4e5f6", "tree": "cb42d5d3cace3c8d12f0b304879039c503807981", "parents": [ "972d1a7b140569084439a81265a0f15b74e924e0" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:52 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:51 2006 -0700" }, "message": "[PATCH] zone_reclaim: dynamic slab reclaim\n\nCurrently one can enable slab reclaim by setting an explicit option in\n/proc/sys/vm/zone_reclaim_mode. Slab reclaim is then used as a final\noption if the freeing of unmapped file backed pages is not enough to free\nenough pages to allow a local allocation.\n\nHowever, that means that the slab can grow excessively and that most memory\nof a node may be used by slabs. We have had a case where a machine with\n46GB of memory was using 40-42GB for slab. Zone reclaim was effective in\ndealing with pagecache pages. However, slab reclaim was only done during\nglobal reclaim (which is a bit rare on NUMA systems).\n\nThis patch implements slab reclaim during zone reclaim. Zone reclaim\noccurs if there is a danger of an off node allocation. At that point we\n\n1. Shrink the per node page cache if the number of pagecache\n pages is more than min_unmapped_ratio percent of pages in a zone.\n\n2. Shrink the slab cache if the number of the nodes reclaimable slab pages\n (patch depends on earlier one that implements that counter)\n are more than min_slab_ratio (a new /proc/sys/vm tunable).\n\nThe shrinking of the slab cache is a bit problematic since it is not node\nspecific. So we simply calculate what point in the slab we want to reach\n(current per node slab use minus the number of pages that neeed to be\nallocated) and then repeately run the global reclaim until that is\nunsuccessful or we have reached the limit. I hope we will have zone based\nslab reclaim at some point which will make that easier.\n\nThe default for the min_slab_ratio is 5%\n\nAlso remove the slab option from /proc/sys/vm/zone_reclaim_mode.\n\n[akpm@osdl.org: cleanups]\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "972d1a7b140569084439a81265a0f15b74e924e0", "tree": "e86e676e407503ef3d98020a88bb925235f11434", "parents": [ "8417bba4b151346ed475fcc923693c9e3be89063" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:51 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:51 2006 -0700" }, "message": "[PATCH] ZVC: Support NR_SLAB_RECLAIMABLE / NR_SLAB_UNRECLAIMABLE\n\nRemove the atomic counter for slab_reclaim_pages and replace the counter\nand NR_SLAB with two ZVC counter that account for unreclaimable and\nreclaimable slab pages: NR_SLAB_RECLAIMABLE and NR_SLAB_UNRECLAIMABLE.\n\nChange the check in vmscan.c to refer to to NR_SLAB_RECLAIMABLE. The\nintend seems to be to check for slab pages that could be freed.\n\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "8417bba4b151346ed475fcc923693c9e3be89063", "tree": "93d559e32bc76077c1f837aed09a5df56849c610", "parents": [ "d00bcc98d7ec2c87391c9d9e1cca519ef64d33ef" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:51 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:51 2006 -0700" }, "message": "[PATCH] Replace min_unmapped_ratio by min_unmapped_pages in struct zone\n\n*_pages is a better description of the role of the variable.\n\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "46a82b2d5591335277ed2930611f6acb4ce654ed", "tree": "e90bc1843701af2012bae92564f7109027a8244f", "parents": [ "d2e7b7d0aa021847c59f882b066e7d3812902870" ], "author": { "name": "Dave McCracken", "email": "dmccr@us.ibm.com", "time": "Mon Sep 25 23:31:48 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:51 2006 -0700" }, "message": "[PATCH] Standardize pxx_page macros\n\nOne of the changes necessary for shared page tables is to standardize the\npxx_page macros. pte_page and pmd_page have always returned the struct\npage associated with their entry, while pte_page_kernel and pmd_page_kernel\nhave returned the kernel virtual address. pud_page and pgd_page, on the\nother hand, return the kernel virtual address.\n\nShared page tables needs pud_page and pgd_page to return the actual page\nstructures. There are very few actual users of these functions, so it is\nsimple to standardize their usage.\n\nSince this is basic cleanup, I am submitting these changes as a standalone\npatch. Per Hugh Dickins\u0027 comments about it, I am also changing the\npxx_page_kernel macros to pxx_page_vaddr to clarify their meaning.\n\nSigned-off-by: Dave McCracken \u003cdmccr@us.ibm.com\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "980128f223fa3c75e3ebdde650c9f1bcabd4c0a2", "tree": "b0fa592cf621cebc674b9ec1a4ab4e2558ec7aaf", "parents": [ "fbd98167e653535c5816be154f2149c0efa7757d" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:46 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:50 2006 -0700" }, "message": "[PATCH] Define easier to handle GFP_THISNODE\n\nIn many places we will need to use the same combination of flags. Specify\na single GFP_THISNODE definition for ease of use in gfp.h.\n\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "9b819d204cf602eab1a53a9ec4b8d2ca51e02a1d", "tree": "9442bf01a00a93a8ae54462fb4878588e1b2a6bf", "parents": [ "056c62418cc639bf2fe962c6a6ee56054b838bc7" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:40 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:50 2006 -0700" }, "message": "[PATCH] Add __GFP_THISNODE to avoid fallback to other nodes and ignore cpuset/memory policy restrictions\n\nAdd a new gfp flag __GFP_THISNODE to avoid fallback to other nodes. This\nflag is essential if a kernel component requires memory to be located on a\ncertain node. It will be needed for alloc_pages_node() to force allocation\non the indicated node and for alloc_pages() to force allocation on the\ncurrent node.\n\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nCc: Andy Whitcroft \u003capw@shadowen.org\u003e\nCc: Mel Gorman \u003cmel@csn.ul.ie\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "dbe5e69d2d6e591996ea2b817b887d03b60bb143", "tree": "09e21f2e0da60faef982d02a9224e62c409e776a", "parents": [ "da6052f7b33abe55fbfd7d2213815f58c00a88d4" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Mon Sep 25 23:31:36 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:49 2006 -0700" }, "message": "[PATCH] slab: optimize kmalloc_node the same way as kmalloc\n\n[akpm@osdl.org: export fix]\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nAcked-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "da6052f7b33abe55fbfd7d2213815f58c00a88d4", "tree": "a2deda88ae8e9fc33d9a0ce80f42fde2c55c7bbc", "parents": [ "e5ac9c5aec7c4bc57fa93f2d37d760a22cb7bd33" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Mon Sep 25 23:31:35 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:49 2006 -0700" }, "message": "[PATCH] update some mm/ comments\n\nLet\u0027s try to keep mm/ comments more useful and up to date. This is a start.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "dfd54cbcc0b834652389ce99b5e656ea5f44a3c1", "tree": "7c403a50b42b2809bb9b18122cbd83e8e2c180c9", "parents": [ "b72f160443cb78b2f8addae6e331d2adaa70f869" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon Sep 25 23:31:33 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:49 2006 -0700" }, "message": "[PATCH] bootmem: use MAX_DMA_ADDRESS instead of LOW32LIMIT\n\nIntroduce ARCH_LOW_ADDRESS_LIMIT which can be set per architecture to\noverride the 4GB default limit used by the bootmem allocater within\n__alloc_bootmem_low() and __alloc_bootmem_low_node(). E.g. s390 needs a\n2GB limit instead of 4GB.\n\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "db37648cd6ce9b828abd6d49aa3d269926ee7b7d", "tree": "a0155c7897f4706386d10c8718f98687bc357c82", "parents": [ "28e4d965e6131ace1e813e93aebca89ac6b82dc1" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Mon Sep 25 23:31:24 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:48 2006 -0700" }, "message": "[PATCH] mm: non syncing lock_page()\n\nlock_page needs the caller to have a reference on the page-\u003emapping inode\ndue to sync_page, ergo set_page_dirty_lock is obviously buggy according to\nits comments.\n\nSolve it by introducing a new lock_page_nosync which does not do a sync_page.\n\nakpm: unpleasant solution to an unpleasant problem. If it goes wrong it could\ncause great slowdowns while the lock_page() caller waits for kblockd to\nperform the unplug. And if a filesystem has special sync_page() requirements\n(none presently do), permanent hangs are possible.\n\notoh, set_page_dirty_lock() is usually (always?) called against userspace\npages. They are always up-to-date, so there shouldn\u0027t be any pending read I/O\nagainst these pages.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "7ff6f08295d90ab20d25200ef485ebb45b1b8d71", "tree": "4c3410dcf5191ab574304f3ffbafd675545c2297", "parents": [ "8bc719d3cab8414938f9ea6e33b58d8810d18068" ], "author": { "name": "Martin Peschke", "email": "mp3@de.ibm.com", "time": "Mon Sep 25 23:31:21 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:47 2006 -0700" }, "message": "[PATCH] CPU hotplug compatible alloc_percpu()\n\nThis patch splits alloc_percpu() up into two phases. Likewise for\nfree_percpu(). This allows clients to limit initial allocations to online\ncpu\u0027s, and to populate or depopulate per-cpu data at run time as needed:\n\n struct my_struct *obj;\n\n /* initial allocation for online cpu\u0027s */\n obj \u003d percpu_alloc(sizeof(struct my_struct), GFP_KERNEL);\n\n ...\n\n /* populate per-cpu data for cpu coming online */\n ptr \u003d percpu_populate(obj, sizeof(struct my_struct), GFP_KERNEL, cpu);\n\n ...\n\n /* access per-cpu object */\n ptr \u003d percpu_ptr(obj, smp_processor_id());\n\n ...\n\n /* depopulate per-cpu data for cpu going offline */\n percpu_depopulate(obj, cpu);\n\n ...\n\n /* final removal */\n percpu_free(obj);\n\nSigned-off-by: Martin Peschke \u003cmp3@de.ibm.com\u003e\nCc: Paul Jackson \u003cpj@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "8bc719d3cab8414938f9ea6e33b58d8810d18068", "tree": "1afd4ce7865466bf9578ca746c63c1d351f07cdc", "parents": [ "19655d3487001d7df0e10e9cbfc27c758b77c2b5" ], "author": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Mon Sep 25 23:31:20 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:47 2006 -0700" }, "message": "[PATCH] out of memory notifier\n\nAdd a notifer chain to the out of memory killer. If one of the registered\ncallbacks could release some memory, do not kill the process but return and\nretry the allocation that forced the oom killer to run.\n\nThe purpose of the notifier is to add a safety net in the presence of\nmemory ballooners. If the resource manager inflated the balloon to a size\nwhere memory allocations can not be satisfied anymore, it is better to\ndeflate the balloon a bit instead of killing processes.\n\nThe implementation for the s390 ballooner is included.\n\n[akpm@osdl.org: cleanups]\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "19655d3487001d7df0e10e9cbfc27c758b77c2b5", "tree": "8d0aaa216bd32bd64e3a9652fd34d40bdb9d1075", "parents": [ "2f6726e54a9410e2e4cee864947c05e954051916" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:19 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:47 2006 -0700" }, "message": "[PATCH] linearly index zone-\u003enode_zonelists[]\n\nI wonder why we need this bitmask indexing into zone-\u003enode_zonelists[]?\n\nWe always start with the highest zone and then include all lower zones\nif we build zonelists.\n\nAre there really cases where we need allocation from ZONE_DMA or\nZONE_HIGHMEM but not ZONE_NORMAL? It seems that the current implementation\nof highest_zone() makes that already impossible.\n\nIf we go linear on the index then gfp_zone() \u003d\u003d highest_zone() and a lot\nof definitions fall by the wayside.\n\nWe can now revert back to the use of gfp_zone() in mempolicy.c ;-)\n\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "2f6726e54a9410e2e4cee864947c05e954051916", "tree": "91b1173dead0cfc4a25caacb34b6c80f526bbc59", "parents": [ "4e4785bcf0c8503224fa6c17d8e0228de781bff6" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:18 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:47 2006 -0700" }, "message": "[PATCH] Apply type enum zone_type\n\nAfter we have done this we can now do some typing cleanup.\n\nThe memory policy layer keeps a policy_zone that specifies\nthe zone that gets memory policies applied. This variable\ncan now be of type enum zone_type.\n\nThe check_highest_zone function and the build_zonelists funnctionm must\nthen also take a enum zone_type parameter.\n\nPlus there are a number of loops over zones that also should use\nzone_type.\n\nWe run into some troubles at some points with functions that need a\nzone_type variable to become -1. Fix that up.\n\n[pj@sgi.com: fix set_mempolicy() crash]\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Paul Jackson \u003cpj@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "4e4785bcf0c8503224fa6c17d8e0228de781bff6", "tree": "002c0a051f7f4de4548ca0a8394b664f64c63627", "parents": [ "b9b15780f808efa2c897f337644ba7a2bec03ecc" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:17 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:47 2006 -0700" }, "message": "[PATCH] mempolicies: fix policy_zone check\n\nThere is a check in zonelist_policy that compares pieces of the bitmap\nobtained from a gfp mask via GFP_ZONETYPES with a zone number in function\nzonelist_policy().\n\nThe bitmap is an ORed mask of __GFP_DMA, __GFP_DMA32 and __GFP_HIGHMEM.\nThe policy_zone is a zone number with the possible values of ZONE_DMA,\nZONE_DMA32, ZONE_HIGHMEM and ZONE_NORMAL. These are two different domains\nof values.\n\nFor some reason seemed to work before the zone reduction patchset (It\ndefinitely works on SGI boxes since we just have one zone and the check\ncannot fail).\n\nWith the zone reduction patchset this check definitely fails on systems\nwith two zones if the system actually has memory in both zones.\n\nThis is because ZONE_NORMAL is selected using no __GFP flag at\nall and thus gfp_zone(gfpmask) \u003d\u003d 0. ZONE_DMA is selected when __GFP_DMA\nis set. __GFP_DMA is 0x01. So gfp_zone(gfpmask) \u003d\u003d 1.\n\npolicy_zone is set to ZONE_NORMAL (\u003d\u003d1) if ZONE_NORMAL and ZONE_DMA are\npopulated.\n\nFor ZONE_NORMAL gfp_zone(\u003cno _GFP_DMA\u003e) yields 0 which is \u003c\npolicy_zone(ZONE_NORMAL) and so policy is not applied to regular memory\nallocations!\n\nInstead gfp_zone(__GFP_DMA) \u003d\u003d 1 which results in policy being applied\nto DMA allocations!\n\nWhat we realy want in that place is to establish the highest allowable\nzone for a given gfp_mask. If the highest zone is higher or equal to the\npolicy_zone then memory policies need to be applied. We have such\na highest_zone() function in page_alloc.c.\n\nSo move the highest_zone() function from mm/page_alloc.c into\ninclude/linux/gfp.h. On the way we simplify the function and use the new\nzone_type that was also introduced with the zone reduction patchset plus we\nalso specify the right type for the gfp flags parameter.\n\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "27bf71c2a7e596ed34e9bf2d4a5030321a09a1ad", "tree": "30aca46595486b7a9d69d2d2f58b305cf32f41d9", "parents": [ "e53ef38d05dd59ed281a35590e4a5b64d8ff4c52" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:15 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:47 2006 -0700" }, "message": "[PATCH] reduce MAX_NR_ZONES: remove display of counters for unconfigured zones\n\neventcounters: Do not display counters for zones that are not available on an\narch\n\nDo not define or display counters for the DMA32 and the HIGHMEM zone if such\nzones were not configured.\n\n[akpm@osdl.org: s390 fix]\n[heiko.carstens@de.ibm.com: s390 fix]\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "e53ef38d05dd59ed281a35590e4a5b64d8ff4c52", "tree": "42e525df84454e89abd6cab8d7983a6a0188b6bb", "parents": [ "fb0e7942bdcbbd2f90e61cb4cfa4fa892a873f8a" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:14 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:46 2006 -0700" }, "message": "[PATCH] reduce MAX_NR_ZONES: make ZONE_HIGHMEM optional\n\nMake ZONE_HIGHMEM optional\n\n- ifdef out code and definitions related to CONFIG_HIGHMEM\n\n- __GFP_HIGHMEM falls back to normal allocations if there is no\n ZONE_HIGHMEM\n\n- GFP_ZONEMASK becomes 0x01 if there is no DMA32 and no HIGHMEM\n zone.\n\n[jdike@addtoit.com: build fix]\nSigned-off-by: Jeff Dike \u003cjdike@addtoit.com\u003e\nSigned-off-by: Christoph Lameter \u003cclameter@engr.sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "fb0e7942bdcbbd2f90e61cb4cfa4fa892a873f8a", "tree": "71344e9afafbd631f4ac010bc8c48e0b16737299", "parents": [ "2f1b6248682f8b39ca3c7e549dfc216d26c4109b" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:13 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:46 2006 -0700" }, "message": "[PATCH] reduce MAX_NR_ZONES: make ZONE_DMA32 optional\n\nMake ZONE_DMA32 optional\n\n- Add #ifdefs around ZONE_DMA32 specific code and definitions.\n\n- Add CONFIG_ZONE_DMA32 config option and use that for x86_64\n that alone needs this zone.\n\n- Remove the use of CONFIG_DMA_IS_DMA32 and CONFIG_DMA_IS_NORMAL\n for ia64 and fix up the way per node ZVCs are calculated.\n\n- Fall back to prior GFP_ZONEMASK of 0x03 if there is no\n DMA32 zone.\n\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "2f1b6248682f8b39ca3c7e549dfc216d26c4109b", "tree": "2340347d10fd0e564fb8527efe3ffbcb216e1906", "parents": [ "98d2b0ebda72fc39cdefd3720d50b9b3ce409085" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:13 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:46 2006 -0700" }, "message": "[PATCH] reduce MAX_NR_ZONES: use enum to define zones, reformat and comment\n\nUse enum for zones and reformat zones dependent information\n\nAdd comments explaning the use of zones and add a zones_t type for zone\nnumbers.\n\nLine up information that will be #ifdefd by the following patches.\n\n[akpm@osdl.org: comment cleanups]\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "c1f60a5a419cc60aff27daffb150f5a3a3a79ef4", "tree": "8ae176462d6f220cd744ae6c3454113eebda02a8", "parents": [ "182e8e237349e7b6354f45aee4780b6423fd6a50" ], "author": { "name": "Christoph Lameter", "email": "clameter@sgi.com", "time": "Mon Sep 25 23:31:11 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:46 2006 -0700" }, "message": "[PATCH] reduce MAX_NR_ZONES: move HIGHMEM counters into highmem.c/.h\n\nMove totalhigh_pages and nr_free_highpages() into highmem.c/.h\n\nMove the totalhigh_pages definition into highmem.c/.h. Move the\nnr_free_highpages function into highmem.c\n\n[yoichi_yuasa@tripeaks.co.jp: build fix]\nSigned-off-by: Christoph Lameter \u003cclameter@sgi.com\u003e\nSigned-off-by: Yoichi Yuasa \u003cyoichi_yuasa@tripeaks.co.jp\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "f71bf0cac730ccb5ebcdf21747db75ae0445ccde", "tree": "2ba089be617218753b9d8b8faf05eb97eec42120", "parents": [ "bbc7b92e337ac349ca917f9bf0b6be4743c14f3a" ], "author": { "name": "Franck Bui-Huu", "email": "vagabon.xyz@gmail.com", "time": "Mon Sep 25 23:31:08 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:45 2006 -0700" }, "message": "[PATCH] bootmem: miscellaneous coding style fixes\n\nIt fixes various coding style issues, specially when spaces are useless. For\nexample \u0027*\u0027 go next to the function name.\n\nSigned-off-by: Franck Bui-Huu \u003cvagabon.xyz@gmail.com\u003e\nCc: Dave Hansen \u003chaveblue@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "e786e86a542ccc1133f333402526ad00b9c088ae", "tree": "db08d5e3fd398e9f22128a6867aa12497abe3e7c", "parents": [ "bb0923a66820718f636736b22ce47372f79e3400" ], "author": { "name": "Franck Bui-Huu", "email": "vagabon.xyz@gmail.com", "time": "Mon Sep 25 23:31:06 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:45 2006 -0700" }, "message": "[PATCH] bootmem: remove useless headers inclusions\n\nSigned-off-by: Franck Bui-Huu \u003cvagabon.xyz@gmail.com\u003e\nCc: Dave Hansen \u003chaveblue@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "bb0923a66820718f636736b22ce47372f79e3400", "tree": "56554098cb8cda63a1f805db211f1eea750befae", "parents": [ "71fb2e8f8753b66b1f4295aa264a2eb4e69381e8" ], "author": { "name": "Franck Bui-Huu", "email": "vagabon.xyz@gmail.com", "time": "Mon Sep 25 23:31:05 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:45 2006 -0700" }, "message": "[PATCH] bootmem: limit to 80 columns width\n\nSigned-off-by: Franck Bui-Huu \u003cvagabon.xyz@gmail.com\u003e\nCc: Dave Hansen \u003chaveblue@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "71fb2e8f8753b66b1f4295aa264a2eb4e69381e8", "tree": "c292c4018cfa87f69661a966b3b13c6d84e7e019", "parents": [ "69d49e681d7c7ed864a1ba45efc1e78433df8b9a" ], "author": { "name": "Franck Bui-Huu", "email": "vagabon.xyz@gmail.com", "time": "Mon Sep 25 23:31:05 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:45 2006 -0700" }, "message": "[PATCH] bootmem: remove useless parentheses in bootmem header file\n\nSigned-off-by: Franck Bui-Huu \u003cvagabon.xyz@gmail.com\u003e\nCc: Dave Hansen \u003chaveblue@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "2d1a07d487d8b36658404839cdf03a974968cefd", "tree": "1123ffc446b5e118d93c03d773f8b3815166c4ef", "parents": [ "91023300057e96de7f46e95166a3e02394ae72f9" ], "author": { "name": "Franck Bui-Huu", "email": "vagabon.xyz@gmail.com", "time": "Mon Sep 25 23:31:03 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:45 2006 -0700" }, "message": "[PATCH] bootmem: remove useless __init in header file\n\n__init in headers is pretty useless because the compiler doesn\u0027t check it, and\nthey get out of sync relatively frequently. So if you see an __init in a\nheader file, it\u0027s quite unreliable and you need to check the definition\nanyway.\n\nSigned-off-by: Franck Bui-Huu \u003cvagabon.xyz@gmail.com\u003e\nCc: Dave Hansen \u003chaveblue@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "91023300057e96de7f46e95166a3e02394ae72f9", "tree": "b28306089d7f5631bb023c7657808380359df316", "parents": [ "b221385bc41d6789edde3d2fa0cb20d5045730eb" ], "author": { "name": "keith mannthey", "email": "kmannth@us.ibm.com", "time": "Mon Sep 25 23:31:03 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:45 2006 -0700" }, "message": "[PATCH] convert i386 NUMA KVA space to bootmem\n\nAddress a long standing issue of booting with an initrd on an i386 numa\nsystem. Currently (and always) the numa kva area is mapped into low memory\nby finding the end of low memory and moving that mark down (thus creating\nspace for the kva). The issue with this is that Grub loads initrds into\nthis similar space so when the kernel check the initrd it finds it outside\nmax_low_pfn and disables it (it thinks the initrd is not mapped into usable\nmemory) thus initrd enabled kernels can\u0027t boot i386 numa :(\n\nMy solution to the problem just converts the numa kva area to use the\nbootmem allocator to save it\u0027s area (instead of moving the end of low\nmemory). Using bootmem allows the kva area to be mapped into more diverse\naddresses (not just the end of low memory) and enables the kva area to be\nmapped below the initrd if present.\n\nI have tested this patch on numaq(no initrd) and summit(initrd) i386 numa\nbased systems.\n\n[akpm@osdl.org: cleanups]\nSigned-off-by: Keith Mannthey \u003ckmannth@us.ibm.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "b221385bc41d6789edde3d2fa0cb20d5045730eb", "tree": "93f3317247d587fd011eb9d77cd73a49670d8d5f", "parents": [ "204ec841fbea3e5138168edbc3a76d46747cc987" ], "author": { "name": "Adrian Bunk", "email": "bunk@stusta.de", "time": "Mon Sep 25 23:31:02 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:45 2006 -0700" }, "message": "[PATCH] mm/: make functions static\n\nThis patch makes the following needlessly global functions static:\n - slab.c: kmem_find_general_cachep()\n - swap.c: __page_cache_release()\n - vmalloc.c: __vmalloc_node()\n\nSigned-off-by: Adrian Bunk \u003cbunk@stusta.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "edc79b2a46ed854595e40edcf3f8b37f9f14aa3f", "tree": "c1120bebede9660ab00f9439aa7a84ab9434ac38", "parents": [ "d08b3851da41d0ee60851f2c75b118e1f7a5fc89" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Sep 25 23:30:58 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:44 2006 -0700" }, "message": "[PATCH] mm: balance dirty pages\n\nNow that we can detect writers of shared mappings, throttle them. Avoids OOM\nby surprise.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "d08b3851da41d0ee60851f2c75b118e1f7a5fc89", "tree": "a01f6930a1387e8f66607e2fe16c62bb7044353b", "parents": [ "725d704ecaca4a43f067092c140d4f3271cf2856" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Mon Sep 25 23:30:57 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:44 2006 -0700" }, "message": "[PATCH] mm: tracking shared dirty pages\n\nTracking of dirty pages in shared writeable mmap()s.\n\nThe idea is simple: write protect clean shared writeable pages, catch the\nwrite-fault, make writeable and set dirty. On page write-back clean all the\nPTE dirty bits and write protect them once again.\n\nThe implementation is a tad harder, mainly because the default\nbacking_dev_info capabilities were too loosely maintained. Hence it is not\nenough to test the backing_dev_info for cap_account_dirty.\n\nThe current heuristic is as follows, a VMA is eligible when:\n - its shared writeable\n (vm_flags \u0026 (VM_WRITE|VM_SHARED)) \u003d\u003d (VM_WRITE|VM_SHARED)\n - it is not a \u0027special\u0027 mapping\n (vm_flags \u0026 (VM_PFNMAP|VM_INSERTPAGE)) \u003d\u003d 0\n - the backing_dev_info is cap_account_dirty\n mapping_cap_account_dirty(vma-\u003evm_file-\u003ef_mapping)\n - f_op-\u003emmap() didn\u0027t change the default page protection\n\nPage from remap_pfn_range() are explicitly excluded because their COW\nsemantics are already horrid enough (see vm_normal_page() in do_wp_page()) and\nbecause they don\u0027t have a backing store anyway.\n\nmprotect() is taught about the new behaviour as well. However it overrides\nthe last condition.\n\nCleaning the pages on write-back is done with page_mkclean() a new rmap call.\nIt can be called on any page, but is currently only implemented for mapped\npages, if the page is found the be of a VMA that accounts dirty pages it will\nalso wrprotect the PTE.\n\nFinally, in fs/buffers.c:try_to_free_buffers(); remove clear_page_dirty() from\nunder -\u003eprivate_lock. This seems to be safe, since -\u003eprivate_lock is used to\nserialize access to the buffers, not the page itself. This is needed because\nclear_page_dirty() will call into page_mkclean() and would thereby violate\nlocking order.\n\n[dhowells@redhat.com: Provide a page_mkclean() implementation for NOMMU]\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "725d704ecaca4a43f067092c140d4f3271cf2856", "tree": "320cf8ab5457ac6c01c05da8c30d6026538ee259", "parents": [ "a6ca1b99ed434f3fb41bbed647ed36c0420501e5" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Mon Sep 25 23:30:55 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:44 2006 -0700" }, "message": "[PATCH] mm: VM_BUG_ON\n\nIntroduce a VM_BUG_ON, which is turned on with CONFIG_DEBUG_VM. Use this\nin the lightweight, inline refcounting functions; PageLRU and PageActive\nchecks in vmscan, because they\u0027re pretty well confined to vmscan. And in\npage allocate/free fastpaths which can be the hottest parts of the kernel\nfor kbuilds.\n\nUnlike BUG_ON, VM_BUG_ON must not be used to execute statements with\nside-effects, and should not be used outside core mm code.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nCc: Hugh Dickins \u003chugh@veritas.com\u003e\nCc: Christoph Lameter \u003cclameter@engr.sgi.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "a6ca1b99ed434f3fb41bbed647ed36c0420501e5", "tree": "59bb799e202f912ced4230e6b4c194c9c0097758", "parents": [ "3998b9301d3d55be8373add22b6bc5e11c1d9b71" ], "author": { "name": "James Bottomley", "email": "James.Bottomley@SteelEye.com", "time": "Mon Sep 25 23:30:55 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:44 2006 -0700" }, "message": "[PATCH] update to the kernel kmap/kunmap API\n\nGive non-highmem architectures access to the kmap API for the purposes of\noverriding (this is what the attached patch does).\n\nThe proposal is that we should now require all architectures with coherence\nissues to manage data coherence via the kmap/kunmap API. Thus driver\nwriters never have to write code like\n\n kmap(page)\n modify data in page\n flush_kernel_dcache_page(page)\n kunmap(page)\n\ninstead, kmap/kunmap will manage the coherence and driver (and filesystem)\nwriters don\u0027t need to worry about how to flush between kmap and kunmap.\n\nFor most architectures, the page only needs to be flushed if it was\nactually written to *and* there are user mappings of it, so the best\nimplementation looks to be: clear the page dirty pte bit in the kernel page\ntables on kmap and on kunmap, check page-\u003emappings for user maps, and then\nthe dirty bit, and only flush if it both has user mappings and is dirty.\n\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "632bbfeee4f042c05bc65150b4433a297d3fe387", "tree": "ce67b5fa4bec38610fc0ecb9b20be6aa69763bb3", "parents": [ "0a2966b48fb784e437520e400ddc94874ddbd4e8" ], "author": { "name": "Jan Blunck", "email": "jblunck@suse.de", "time": "Mon Sep 25 23:30:53 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Tue Sep 26 08:48:44 2006 -0700" }, "message": "[PATCH] trigger a syntax error if percpu macros are incorrectly used\n\nget_cpu_var()/per_cpu()/__get_cpu_var() arguments must be simple\nidentifiers. Otherwise the arch dependent implementations might break.\n\nThis patch enforces the correct usage of the macros by producing a syntax\nerror if the variable is not a simple identifier.\n\nSigned-off-by: Jan Blunck \u003cjblunck@suse.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "7e4720201ad44ace85a443f41d668a62a737e7d0", "tree": "8b9118dffcfd9511d9ce31b87776e04095f9acf1", "parents": [ "7b29122f9ec54db5c38a66a11127d94db0817c17", "4cc6773508299377099aa30cf30e6a2196c5872d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon Sep 25 17:39:55 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon Sep 25 17:39:55 2006 -0700" }, "message": "Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\n* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:\n [NetLabel]: update docs with website information\n [NetLabel]: rework the Netlink attribute handling (part 2)\n [NetLabel]: rework the Netlink attribute handling (part 1)\n [Netlink]: add nla_validate_nested()\n [NETLINK]: add nla_for_each_nested() to the interface list\n [NetLabel]: change the SELinux permissions\n [NetLabel]: make the CIPSOv4 cache spinlocks bottom half safe\n [NetLabel]: correct improper handling of non-NetLabel peer contexts\n [TCP]: make cubic the default\n [TCP]: default congestion control menu\n [ATM] he: Fix __init/__devinit conflict\n [NETFILTER]: Add dscp,DSCP headers to header-y\n [DCCP]: Introduce dccp_probe\n [DCCP]: Use constants for CCIDs\n [DCCP]: Introduce constants for CCID numbers\n [DCCP]: Allow default/fallback service code.\n" }, { "commit": "3212fe1594e577463bc8601d28aa008f520c3377", "tree": "6f4270c825c2df9f4a361360dab0963ecaed34c1", "parents": [ "08992986497471ce575f23796268fb1b50b5c2ab" ], "author": { "name": "KAMEZAWA Hiroyuki", "email": "kamezawa.hiroyu@jp.fujitsu.com", "time": "Mon Sep 25 16:25:31 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Mon Sep 25 17:38:36 2006 -0700" }, "message": "[PATCH] cpu to node relationship fixup: map cpu to node\n\nAssume that a cpu is *physically* offlined at boot time...\n\nBecause smpboot.c::smp_boot_cpu_map() canoot find cpu\u0027s sapicid,\nnuma.c::build_cpu_to_node_map() cannot build cpu\u003c-\u003enode map for\nofflined cpu.\n\nFor such cpus, cpu_to_node map should be fixed at cpu-hot-add.\nThis mapping should be done before cpu onlining.\n\nThis patch also handles cpu hotremove case.\n\nSigned-off-by: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "b0df3bd1e553e901ec7297267611a5db88240b38", "tree": "3eceef36f96a6cf187cf8c4072fd83b4f6435315", "parents": [ "cc3afe6f856054a3752ef2b3ccc5eebf33bd5024", "a67ab2bde752b26be75d4b68ecead9a14692eac5" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 25 20:09:14 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 25 20:09:14 2006 -0400" }, "message": "Merge branch \u0027upstream\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into tmp\n" }, { "commit": "f5b2b966f032f22d3a289045a5afd4afa09f09c6", "tree": "cb3c505d8f444438bed09353788f6c96150f68ad", "parents": [ "70298705bb29fb7982b85089adf17cd37b94baa7" ], "author": { "name": "Jay Vosburgh", "email": "fubar@us.ibm.com", "time": "Fri Sep 22 21:54:53 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 25 20:08:09 2006 -0400" }, "message": "[PATCH] bonding: Validate probe replies in ARP monitor\n\n\tAdd logic to check ARP request / reply packets used for ARP\nmonitor link integrity checking.\n\n\tThe current method simply examines the slave device to see if it\nhas sent and received traffic; this can be fooled by extraneous traffic.\nFor example, if multiple hosts running bonding are behind a common\nswitch, the probe traffic from the multiple instances of bonding will\nupdate the tx/rx times on each other\u0027s slave devices.\n\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "0b680e753724d31a9c45f059d1aad29df54584a1", "tree": "02f121ee2804e63d17015907da3b2c51d81223be", "parents": [ "54ef313714070b397d3857289f0fd099b7643631" ], "author": { "name": "Jay Vosburgh", "email": "fubar@us.ibm.com", "time": "Fri Sep 22 21:54:10 2006 -0700" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 25 20:08:09 2006 -0400" }, "message": "[PATCH] bonding: Add priv_flag to avoid event mishandling\n\nAdd priv_flag to specifically identify bonding-involved devices. Needed\nbecause IFF_MASTER is an unreliable identifier (vlan interfaces above bonding\nwill inherit IFF_MASTER). Misidentification of devices would cause\nnotifier events for other devices to be erroneously processed by bonding,\ncausing various havoc.\n\nBug discovered by Martin Papik \u003cmartin.papik@ipsec.info\u003e; this patch is\nmodified from his original.\n\nSigned-off-by: Martin Papik \u003cmartin.papik@ipsec.info\u003e\nSigned-off-by: Jay Vosburgh \u003cfubar@us.ibm.com\u003e\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "fcd48280643e92ec6cb29a04e9079dd7b6b5bfef", "tree": "c594e16a021262e97f8b41493529c95bd616529e", "parents": [ "4fe5d5c07ab615a52fd1b0ceba5aeed7c612821a" ], "author": { "name": "Paul Moore", "email": "paul.moore@hp.com", "time": "Mon Sep 25 15:56:09 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 25 15:56:09 2006 -0700" }, "message": "[NetLabel]: rework the Netlink attribute handling (part 1)\n\nAt the suggestion of Thomas Graf, rewrite NetLabel\u0027s use of Netlink attributes\nto better follow the common Netlink attribute usage.\n\nSigned-off-by: Paul Moore \u003cpaul.moore@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "4fe5d5c07ab615a52fd1b0ceba5aeed7c612821a", "tree": "245e504bb1049e86f9f6dc369b679c5a5ca495ec", "parents": [ "22acb19a91d2b551ea37647747972e5286284b22" ], "author": { "name": "Paul Moore", "email": "paul.moore@hp.com", "time": "Mon Sep 25 15:54:03 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 25 15:54:03 2006 -0700" }, "message": "[Netlink]: add nla_validate_nested()\n\nAdd a new function, nla_validate_nested(), to validate nested Netlink\nattributes.\n\nSigned-off-by: Paul Moore \u003cpaul.moore@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "22acb19a91d2b551ea37647747972e5286284b22", "tree": "c37455de7df838e76b6f4279f084bce95c16e416", "parents": [ "df2115c3134d0d1a18c1f37f5192394e7f64d1e0" ], "author": { "name": "Paul Moore", "email": "paul.moore@hp.com", "time": "Mon Sep 25 15:53:37 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 25 15:53:37 2006 -0700" }, "message": "[NETLINK]: add nla_for_each_nested() to the interface list\n\nAt the top of include/net/netlink.h is a list of Netlink interfaces, however,\nthe nla_for_each_nested() macro was not listed. This patch adds this interface\nto the list at the top of the header file.\n\nSigned-off-by: Paul Moore \u003cpaul.moore@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "14a72f53fb1bb5d5c2bdd8cf172219519664729a", "tree": "95a077fb9289a95c352af77f18f12e5aba3313c6", "parents": [ "597811ec167fa01c926a0957a91d9e39baa30e64" ], "author": { "name": "Paul Moore", "email": "paul.moore@hp.com", "time": "Mon Sep 25 15:52:01 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Sep 25 15:52:01 2006 -0700" }, "message": "[NetLabel]: correct improper handling of non-NetLabel peer contexts\n\nFix a problem where NetLabel would always set the value of \nsk_security_struct-\u003epeer_sid in selinux_netlbl_sock_graft() to the context of\nthe socket, causing problems when users would query the context of the\nconnection. This patch fixes this so that the value in\nsk_security_struct-\u003epeer_sid is only set when the connection is NetLabel based,\notherwise the value is untouched.\n\nSigned-off-by: Paul Moore \u003cpaul.moore@hp.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "baef186519c69b11cf7e48c26e75feb1e6173baa", "tree": "a4a1ac70808443bec2f924e48b8a705050325cdf", "parents": [ "7c250413e5b7c3dfae89354725b70c76d7621395" ], "author": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Fri Sep 08 16:04:05 2006 -0400" }, "committer": { "name": "John W. Linville", "email": "linville@tuxdriver.com", "time": "Mon Sep 25 16:52:14 2006 -0400" }, "message": "[PATCH] WE-21 support (core API)\n\nThis is version 21 of the Wireless Extensions. Changelog :\n\to finishes migrating the ESSID API (remove the +1)\n\to netdev-\u003eget_wireless_stats is no more\n\to long/short retry\n\nThis is a redacted version of a patch originally submitted by Jean\nTourrilhes. I removed most of the additions, in order to minimize\nfuture support requirements for nl80211 (or other WE successor).\n\nCC: Jean Tourrilhes \u003cjt@hpl.hp.com\u003e\nSigned-off-by: John W. Linville \u003clinville@tuxdriver.com\u003e\n" }, { "commit": "a6d967a485c67ec8a1276261f39d81ace6a3e308", "tree": "3e46be7f279342316d4578995dfbfce99728c579", "parents": [ "7c250413e5b7c3dfae89354725b70c76d7621395" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 25 15:33:09 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Mon Sep 25 15:33:09 2006 -0400" }, "message": "[libata] No need for all those arch libata-portmap.h headers\n\nThey all contain the same thing. Instead, have a single generic one in\ninclude/asm-generic, and permit an arch to override as needed.\n\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "3cc27547d6ee2d50ecdd11e9127bc3cd1947e8dd", "tree": "d70857f363fea3f8bc928bd2fd10d9a277c119bd", "parents": [ "855fc73bf81e8f99606d6f5914c5b7c3b079d718" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Sep 25 02:55:40 2006 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 20:07:49 2006 -0700" }, "message": "[PATCH] SCSI gfp_t annotations\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "76a081e5b32fde17f6f6d007e1806744cc848712", "tree": "869a5a0c406fbc71ffb803f57aad147014510f27", "parents": [ "0d6c7ae22d4fadbc83677ea1a6144eea8911e319", "e41542f5167d6b506607f8dd111fa0a3e468ccb8" ], "author": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sun Sep 24 19:29:57 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@sunset.davemloft.net", "time": "Sun Sep 24 19:29:57 2006 -0700" }, "message": "Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6\n" }, { "commit": "0d6c7ae22d4fadbc83677ea1a6144eea8911e319", "tree": "20e8ef57cb366b5b8a9d773fc1b533b2bf9edaf5", "parents": [ "508df253dbefb0385a629370f4244e3db197d3b8" ], "author": { "name": "Yasuyuki Kozakai", "email": "yasuyuki.kozakai@toshiba.co.jp", "time": "Sun Sep 24 19:28:47 2006 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Sep 24 19:28:47 2006 -0700" }, "message": "[NETFILTER]: Add dscp,DSCP headers to header-y\n\nThis patch adds xt_dscp.h and xt_DSCP.h to the kernel headers which are\nexported via \u0027make headers_install\u0027. These are necessary for userspace\nto add rules using dscp match and DSCP target.\n\nSigned-off-by: Yasuyuki Kozakai \u003cyasuyuki.kozakai@toshiba.co.jp\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3e597c6045502dd0fa98a61aa95ba178f8a2cc03", "tree": "61d8994ed00550ae641e2a5743e072a1c02654fb", "parents": [ "1db2ea398ffbfd9ea46d509ff0e4a85bb4b8c0ea" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Sun Sep 24 23:42:20 2006 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 15:55:03 2006 -0700" }, "message": "[PATCH] fix iptables __user misannotations\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "1db2ea398ffbfd9ea46d509ff0e4a85bb4b8c0ea", "tree": "a4c2f7df0133f46c5e92f79e3219462ee9168314", "parents": [ "8abf1064c786ef5435b2d53cc8e9ebee13020de6" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Sun Sep 24 23:41:42 2006 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 15:55:03 2006 -0700" }, "message": "[PATCH] netlabel gfp annotations\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "638b093255e12e066ae16b8750f37383603f7bd8", "tree": "2a95d93f50f855f416dcef1a52585f95471d7e33", "parents": [ "b7a818e4fcd2c3ee8c34c2367d345561c4c76a15" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Sun Sep 24 23:39:25 2006 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 15:55:03 2006 -0700" }, "message": "[PATCH] restore libata build on frv\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@osdl.org\u003e\n" }, { "commit": "b7a818e4fcd2c3ee8c34c2367d345561c4c76a15", "tree": "7d05ad4a8eadd18cce315af47ccd91304c4f72c3", "parents": [ "398477d4bd57cc33792fd93035c2763ad78629c4", "0d5dc6c2dd7a3cd2b2f505b0625c4ec9c0e5b4f0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 15:28:50 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 15:28:50 2006 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2\n\n* \u0027upstream-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2: (28 commits)\n ocfs2: Teach ocfs2_drop_lock() to use -\u003eset_lvb() callback\n ocfs2: Remove -\u003eunblock lockres operation\n ocfs2: move downconvert worker to lockres ops\n ocfs2: Remove unused dlmglue functions\n ocfs2: Have the metadata lock use generic dlmglue functions\n ocfs2: Add -\u003eset_lvb callback in dlmglue\n ocfs2: Add -\u003echeck_downconvert callback in dlmglue\n ocfs2: Check for refreshing locks in generic unblock function\n ocfs2: don\u0027t unconditionally pass LVB flags\n ocfs2: combine inode and generic blocking AST functions\n ocfs2: Add -\u003eget_osb() dlmglue locking operation\n ocfs2: remove -\u003eunlock_ast() callback from ocfs2_lock_res_ops\n ocfs2: combine inode and generic AST functions\n ocfs2: Clean up lock resource refresh flags\n ocfs2: Remove i_generation from inode lock names\n ocfs2: Encode i_generation in the meta data lvb\n ocfs2: Free up some space in the lvb\n ocfs2: Remove special casing for inode creation in ocfs2_dentry_attach_lock()\n ocfs2: manually d_move() during ocfs2_rename()\n [PATCH] Allow file systems to manually d_move() inside of -\u003erename()\n ...\n" }, { "commit": "b4daf69722c49670d355d66439abda5ab5d4c5db", "tree": "4f257adf1af09cdb0e830881da69786d1dd47f7a", "parents": [ "9e72cbf353e259bd30ab472d72d7bdb9be23fb12" ], "author": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Sun Sep 24 22:07:25 2006 +0100" }, "committer": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Sun Sep 24 22:07:25 2006 +0100" }, "message": "[S390] Unexport \u003casm/z90crypt.h\u003e, export \u003casm/zcrypt.h\u003e in its place.\n\nSigned-off-by: David Woodhouse \u003cdwmw2@infradead.org\u003e\n" }, { "commit": "9e72cbf353e259bd30ab472d72d7bdb9be23fb12", "tree": "2a31af40917fcce0f1d3b21a97e8fae5476ce417", "parents": [ "02b25fcff676125a88169c8a78d4c6dd647574ed" ], "author": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Sun Sep 24 22:06:48 2006 +0100" }, "committer": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Sun Sep 24 22:06:48 2006 +0100" }, "message": "Remove dead netfilter_logging.h from include/linux/Kbuild\n\nSigned-off-by: David Woodhouse \u003cdwmw2@infradead.org\u003e\n" }, { "commit": "02b25fcff676125a88169c8a78d4c6dd647574ed", "tree": "372fc8e885be41ba1819b2767c8889ecd97ff948", "parents": [ "1694176a210189312e31b083bac1e1688981219a", "a68aa1cc6f3203b8a332683ebde67a00f39eec43" ], "author": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Sun Sep 24 22:05:59 2006 +0100" }, "committer": { "name": "David Woodhouse", "email": "dwmw2@infradead.org", "time": "Sun Sep 24 22:05:59 2006 +0100" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6\n" }, { "commit": "b83eff641ed39bd631535b9a8971e161b056f541", "tree": "3989df2905034c50f5f035cd884fe33f5c709749", "parents": [ "00e4d116a7ef94eb910be037912b0b2fc09f608b" ], "author": { "name": "Ian McDonald", "email": "ian.mcdonald@jandi.co.nz", "time": "Fri Sep 22 14:25:36 2006 +1200" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@mandriva.com", "time": "Sun Sep 24 17:56:32 2006 -0300" }, "message": "[DCCP]: Introduce constants for CCID numbers\n\nSigned-off-by: Ian McDonald \u003cian.mcdonald@jandi.co.nz\u003e\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@mandriva.com\u003e\n" }, { "commit": "349457ccf2592c14bdf13b6706170ae2e94931b1", "tree": "3670945b5a62617d38cf1f317487387032d3da4d", "parents": [ "1390334b4c697b7588d5661fcf6acaeec409cf4c" ], "author": { "name": "Mark Fasheh", "email": "mark.fasheh@oracle.com", "time": "Fri Sep 08 14:22:21 2006 -0700" }, "committer": { "name": "Mark Fasheh", "email": "mark.fasheh@oracle.com", "time": "Sun Sep 24 13:50:45 2006 -0700" }, "message": "[PATCH] Allow file systems to manually d_move() inside of -\u003erename()\n\nSome file systems want to manually d_move() the dentries involved in a\nrename. We can do this by making use of the FS_ODD_RENAME flag if we just\nhave nfs_rename() unconditionally do the d_move(). While there, we rename\nthe flag to be more descriptive.\n\nOCFS2 uses this to protect that part of the rename operation with a cluster\nlock.\n\nSigned-off-by: Mark Fasheh \u003cmark.fasheh@oracle.com\u003e\nCc: Trond Myklebust \u003ctrond.myklebust@fys.uio.no\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@osdl.org\u003e\n" }, { "commit": "00e4d116a7ef94eb910be037912b0b2fc09f608b", "tree": "81e8a52c7529691b3c07605613da65cae80f41c9", "parents": [ "1ab9dd0902df4f4ff56fbf672220549090ab28ba" ], "author": { "name": "Gerrit Renker", "email": "gerrit@erg.abdn.ac.uk", "time": "Fri Sep 22 09:33:58 2006 +0100" }, "committer": { "name": "Arnaldo Carvalho de Melo", "email": "acme@mandriva.com", "time": "Sun Sep 24 17:49:26 2006 -0300" }, "message": "[DCCP]: Allow default/fallback service code.\n\nThis has been discussed on dccp@vger and removes the necessity for applications\nto supply service codes in each and every case.\n\nIf an application does not want to provide a service code, that\u0027s fine, it will\nbe given 0. Otherwise, service codes can be set via socket options as before.\n\nThis patch has been tested using various client/server configurations\n(including listening on multiple service codes).\n\nSigned-off-by: Gerrit Renker \u003cgerrit@erg.abdn.ac.uk\u003e\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@mandriva.com\u003e\n" }, { "commit": "a68aa1cc6f3203b8a332683ebde67a00f39eec43", "tree": "c05bd86850d8e0d0fb096a4b5f8d9f268b5561e8", "parents": [ "a319a2773a13bab56a0d0b3744ba8703324313b5", "23930fa1cebfea6f79881c588ccd1b0781e49e3f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 10:19:56 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 10:19:56 2006 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev\n\n* \u0027upstream-linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (50 commits)\n [libata] Delete pata_it8172 driver\n [PATCH] libata: improve handling of diagostic fail (and hardware that misreports it)\n [PATCH] libata: fix non-uniform ports handling\n Fix libata resource conflict for legacy mode\n [libata] ata_piix: build fix\n [PATCH] pata_amd: Check enable bits on Nvidia\n [PATCH] Update SiS PATA\n [libata] Add pata_jmicron driver to Kconfig, Makefile\n [libata #pata-drivers] Trim trailing whitespace.\n [libata] Trim trailing whitespace.\n [libata] Add a bunch of PATA drivers.\n Rename libata-bmdma.c to libata-sff.c.\n libata: Grand renaming.\n Clean up drivers/ata/Kconfig a bit.\n [PATCH] CONFIG_PM\u003dn slim: drivers/scsi/sata_sil*\n [PATCH] sata_via: Add SATA support for vt8237a\n [PATCH] libata: change path to libata in libata.tmpl\n [PATCH] libata: s/CONFIG_SCSI_SATA/CONFIG_[S]ATA/g in pci/quirks.c\n libata: Make sure drivers/ata is a separate Kconfig menu\n [libata] ata_piix: add missing kfree()\n ...\n" }, { "commit": "a319a2773a13bab56a0d0b3744ba8703324313b5", "tree": "f02c86acabd1031439fd422a167784007e84ebb1", "parents": [ "e18fa700c9a31360bc8f193aa543b7ef7b39a06b", "183798799216fad36c7219fe8d4d6dee6b8fa755" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 10:15:13 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sun Sep 24 10:15:13 2006 -0700" }, "message": "Merge branch \u0027upstream-linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6\n\n* \u0027upstream-linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits)\n net/ieee80211: fix more crypto-related build breakage\n [PATCH] Spidernet: add ethtool -S (show statistics)\n [NET] GT96100: Delete bitrotting ethernet driver\n [PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM\n [PATCH] Cirrus Logic ep93xx ethernet driver\n r8169: the MMIO region of the 8167 stands behin BAR#1\n e1000, ixgb: Remove pointless wrappers\n [PATCH] Remove powerpc specific parts of 3c509 driver\n [PATCH] s2io: Switch to pci_get_device\n [PATCH] gt96100: move to pci_get_device API\n [PATCH] ehea: bugfix for register access functions\n [PATCH] e1000 disable device on PCI error\n drivers/net/phy/fixed: #if 0 some incomplete code\n drivers/net: const-ify ethtool_ops declarations\n [PATCH] ethtool: allow const ethtool_ops\n [PATCH] sky2: big endian\n [PATCH] sky2: fiber support\n [PATCH] sky2: tx pause bug fix\n drivers/net: Trim trailing whitespace\n [PATCH] ehea: IBM eHEA Ethernet Device Driver\n ...\n\nManually resolved conflicts in drivers/net/ixgb/ixgb_main.c and\ndrivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by\ncommit 84fa7933a33f806bbbaae6775e87459b1ec584c0 that just happened to be\nnext to unrelated changes in this update.\n" }, { "commit": "e18fa700c9a31360bc8f193aa543b7ef7b39a06b", "tree": "1006f53177341c614d4aeb6c96e2e8f3859b5f52", "parents": [ "4f5537de7c1531398e84e18a24f667e49cc94208" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Sun Sep 24 11:13:19 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Sun Sep 24 11:13:19 2006 -0400" }, "message": "Move several *_SUPER_MAGIC symbols to include/linux/magic.h.\n\nSigned-off-by: Jeff Garzik \u003cjeff@garzik.org\u003e\n" }, { "commit": "23930fa1cebfea6f79881c588ccd1b0781e49e3f", "tree": "36d29e3f83661c4f5f45b6f74ac0d5f9886867a8", "parents": [ "36b35a5be0e4b406acd816e2122d153e875105be", "4f5537de7c1531398e84e18a24f667e49cc94208" ], "author": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Sun Sep 24 01:52:47 2006 -0400" }, "committer": { "name": "Jeff Garzik", "email": "jeff@garzik.org", "time": "Sun Sep 24 01:52:47 2006 -0400" }, "message": "Merge branch \u0027master\u0027 into upstream\n" }, { "commit": "1aedf2ccc60fade26c46fae12e28664d0da3f199", "tree": "d91083e3079f1ddb942a382ac2b5a7525570ad59", "parents": [ "dfdc58ba354adb80d67c99f7be84f95a8e02e466", "1ab9dd0902df4f4ff56fbf672220549090ab28ba" ], "author": { "name": "James Bottomley", "email": "jejb@sparkweed.localdomain", "time": "Sat Sep 23 21:03:52 2006 -0500" }, "committer": { "name": "James Bottomley", "email": "jejb@sparkweed.localdomain", "time": "Sat Sep 23 21:03:52 2006 -0500" }, "message": "Merge mulgrave-w:git/linux-2.6\n\nConflicts:\n\n\tinclude/linux/blkdev.h\n\nTrivial merge to incorporate tag prototypes.\n" }, { "commit": "dfdc58ba354adb80d67c99f7be84f95a8e02e466", "tree": "9cbbe31f7d3d5be0029fd7c1a8eeaaa02e53853a", "parents": [ "a07f353701acae77e023f6270e8af353b37af7c4" ], "author": { "name": "James Bottomley", "email": "James.Bottomley@steeleye.com", "time": "Wed Sep 20 12:00:18 2006 -0400" }, "committer": { "name": "James Bottomley", "email": "jejb@mulgrave.il.steeleye.com", "time": "Sat Sep 23 20:53:53 2006 -0500" }, "message": "[SCSI] SPI transport class: misc DV fixes\n\nKey more of the domain validation settings off the inquiry data from\nthe disk (in particular, don\u0027t try IU or DT unless the disk claims to\nsupport them.\n\nAlso add a new dv_in_progress flag to prevent recursive DV.\n\nSigned-off-by: James Bottomley \u003cJames.Bottomley@SteelEye.com\u003e\n" }, { "commit": "f7425b160db500520c33f241edb066fc5c413f03", "tree": "f1f50b935fa49a273f8df685b5fb2fcf6a0f07a6", "parents": [ "9f261e011340bcd22c1dd48b465153bd78caa8c8", "f0063c4489a00ed5395378ef80a7edea4272f20b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sat Sep 23 17:21:12 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sat Sep 23 17:21:12 2006 -0700" }, "message": "Merge branch \u0027linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa\n\n* \u0027linus\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: (148 commits)\n [ALSA] intel8x0m - Free irq in suspend\n [ALSA] Move CONFIG_SND_AC97_POWER_SAVE to pci/Kconfig\n [ALSA] usb-audio: add mixer control names for the Aureon 5.1 MkII\n [ALSA] ES1938: remove duplicate field initialization\n [ALSA] usb-audio: increase number of packets per URB\n [ALSA] hda-codec - Fix headphone auto-toggle on sigmatel codec\n [ALSA] hda-intel - A slight cleanup of timeout check in azx_get_response()\n [ALSA] hda-codec - Fix mic input with STAC92xx codecs\n [ALSA] mixart: Use SEEK_{SET,CUR,END} instead of hardcoded values\n [ALSA] gus: Use SEEK_{SET,CUR,END} instead of hardcoded values\n [ALSA] opl4: Use SEEK_{SET,CUR,END} instead of hardcoded values\n [ALSA] sound core: Use SEEK_{SET,CUR,END} instead of hardcoded values\n [ALSA] hda-codec - Support multiple headphone pins\n [ALSA] hda_intel prefer 24bit instead of 20bit\n [ALSA] hda-codec - Add vendor ids for Motorola and Conexant\n [ALSA] hda-codec - Add device id for Motorola si3054-compatible codec\n [ALSA] Add missing compat ioctls for ALSA control API\n [ALSA] powermac - Fix Oops when conflicting with aoa driver\n [ALSA] aoa: add locking to tas codec\n [ALSA] hda-intel - Fix suspend/resume with MSI\n ...\n" }, { "commit": "9f261e011340bcd22c1dd48b465153bd78caa8c8", "tree": "b1c266ea746a0e8591e6af781aef22854e652ff9", "parents": [ "a4c12d6c5dde48c69464baf7c703e425ee511433", "026ed5c9185dcc4b2df92e98c3d61a01cea19cbf" ], "author": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sat Sep 23 16:58:40 2006 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@g5.osdl.org", "time": "Sat Sep 23 16:58:40 2006 -0700" }, "message": "Merge git://git.linux-nfs.org/pub/linux/nfs-2.6\n\n* git://git.linux-nfs.org/pub/linux/nfs-2.6: (74 commits)\n NFS: unmark NFS direct I/O as experimental\n NFS: add comments clarifying the use of nfs_post_op_update()\n NFSv4: rpc_mkpipe creating socket inodes w/out sk buffers\n NFS: Use SEEK_END instead of hardcoded value\n NFSv4: When mounting with a port\u003d0 argument, substitute port\u003d2049\n NFSv4: Poll more aggressively when handling NFS4ERR_DELAY\n NFSv4: Handle the condition NFS4ERR_FILE_OPEN\n NFSv4: Retry lease recovery if it failed during a synchronous operation.\n NFS: Don\u0027t invalidate the symlink we just stuffed into the cache\n NFS: Make read() return an ESTALE if the file has been deleted\n NFSv4: It\u0027s perfectly legal for clp to be NULL here....\n NFS: nfs_lookup - don\u0027t hash dentry when optimising away the lookup\n SUNRPC: Fix Oops in pmap_getport_done\n SUNRPC: Add refcounting to the struct rpc_xprt\n SUNRPC: Clean up soft task error handling\n SUNRPC: Handle ENETUNREACH, EHOSTUNREACH and EHOSTDOWN socket errors\n SUNRPC: rpc_delay() should not clobber the rpc_task-\u003etk_status\n Fix a referral error Oops\n NFS: NFS_ROOT should use the new rpc_create API\n NFS: Fix up compiler warnings on 64-bit platforms in client.c\n ...\n\nManually resolved conflict in net/sunrpc/xprtsock.c\n" } ], "next": "a4c12d6c5dde48c69464baf7c703e425ee511433" }