)]}' { "log": [ { "commit": "ba2e1c5f25a99dec3873745031ad23ce3fd79bff", "tree": "ebcc8e9b0f395033e8ba1db8e30fb6ea78edc442", "parents": [ "7d32c0aca4fbd0319c860d12af5fae3e88c760e6", "92183b346f02773dae09182c65f16b013f295d80" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 17 13:54:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 17 13:54:29 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:\n m68k: amiga - Floppy platform device conversion\n m68k: amiga - Sound platform device conversion\n m68k: amiga - Frame buffer platform device conversion\n m68k: amiga - Zorro host bridge platform device conversion\n m68k: amiga - Zorro bus modalias support\n platform: Make platform resource input parameters const\n m68k: invoke oom-killer from page fault\n serial167: Kill unused variables\n m68k: Implement generic_find_next_{zero_,}le_bit()\n m68k: hp300 - Checkpatch cleanup\n m68k: Remove trailing spaces in messages\n m68k: Simplify param.h by using \u003casm-generic/param.h\u003e\n m68k: Remove BKL from rtc implementations\n" }, { "commit": "b52dd0077cde89111c00efc73a8db07f50ebb3e8", "tree": "80b35c6bf243e63f615e600163bcf2fed09b9dbc", "parents": [ "9881bbb269e8f287d0e55ae3384e48b26f1872f7" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Feb 28 13:06:27 2010 +0100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Mon May 17 21:15:40 2010 +0200" }, "message": "m68k: Implement generic_find_next_{zero_,}le_bit()\n\nlinux-next:\nfs/udf/balloc.c: In function \u0027udf_bitmap_new_block\u0027:\nfs/udf/balloc.c:274: error: implicit declaration of function \u0027generic_find_next_le_bit\u0027\n\nConvert ext2_find_next_{zero_,}bit() into generic_find_next_{zero_,}le_bit(),\nand wrap the ext2_find_next_{zero_,}bit() around the latter.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "291d7e9553fef2e18825b1ef1345fbd316dff98f", "tree": "ef93033c432a92a941f8b4191b3fe2063c65549f", "parents": [ "b1f3bb494e8acddeb972331c2ac642b3c7bceeb9" ], "author": { "name": "Robert P. J. Day", "email": "rpjday@crashcourse.ca", "time": "Thu Dec 31 15:35:44 2009 -0500" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Mon May 17 21:15:39 2010 +0200" }, "message": "m68k: Simplify param.h by using \u003casm-generic/param.h\u003e\n\nSigned-off-by: Robert P. J. Day \u003crpjday@crashcourse.ca\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "f3d46f9d3194e0329216002a8724d4c0957abc79", "tree": "6d9413e4a448d7b8d342c40297c4fbe0b9c4c2f0", "parents": [ "e40152ee1e1c7a63f4777791863215e3faa37a86" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Mon May 17 14:33:53 2010 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 17 07:57:27 2010 -0700" }, "message": "atomic_t: Cast to volatile when accessing atomic variables\n\nIn preparation for removing volatile from the atomic_t definition, this\npatch adds a volatile cast to all the atomic read functions.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3732b68f22857201fa09cb82b128f295096a2375", "tree": "14584810aee0a110704fa0c6f5b858b67d32afab", "parents": [ "6ecaf44e62274cd3496341ee0189bbbc0ae00976" ], "author": { "name": "Philippe De Muyter", "email": "phdm@macqel.be", "time": "Fri Apr 02 17:56:08 2010 +0200" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Apr 21 13:43:06 2010 +1000" }, "message": "m68knommu: fix coldfire tcdrain\n\nFix tcdrain on coldfire uarts.\nCurrently with coldfire uarts tcdrain returns without waiting for txempty,\nbecause (tx)fifosize is 0. Fix that and call uart_update_timeout when\nsetting the baud rate, otherwise tcdrain will wait for an half our :)\nAlso constify mcf_uart_ops.\n\nSigned-off-by: Philippe De Muyter \u003cphdm@macqel.be\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "b560177f3e1c6b2d75b220d41ae72636243475c4", "tree": "857756185f30db4f28db6099e74f4cf2933a7553", "parents": [ "1aac4effad4ea52da94eb13b12e0ca1731407ee4" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Mar 21 10:52:21 2010 +0100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Apr 14 19:45:37 2010 +0200" }, "message": "m68k: Fix asm constraints for atomic_sub_and_test() and atomic_add_negative()\n\nRecently, we started seeing this on allmodconfig builds:\n\n CC mm/memcontrol.o\n{standard input}: Assembler messages:\n{standard input}:4076: Error: operands mismatch -- statement `subl 12(%fp),170(%a0)\u0027 ignored\n\nCorrect the asm constraint, like done for m68knommu.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "1aac4effad4ea52da94eb13b12e0ca1731407ee4", "tree": "4ea993ba66949e3239841f29b4a7d485cfaa9d6c", "parents": [ "2ba3abd8186f24c7fb418927025b4e2120e3a362" ], "author": { "name": "Maxim Kuvyrkov", "email": "maxim@codesourcery.com", "time": "Wed Mar 03 16:53:45 2010 +0300" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Apr 14 19:45:37 2010 +0200" }, "message": "m68k: Fix `struct sigcontext\u0027 for ColdFire\n\nLibSegFault uses piggybacks sc_fpstate field of the `struct sigcontext\u0027\nand this patch avoids LibSegFault overflowing this field. Also this\nremoves an unnecessary divergence from classic m68k.\n\nSigned-off-by: Maxim Kuvyrkov \u003cmaxim@codesourcery.com\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "c32da02342b7521df25fefc2ef20aee0e61cf887", "tree": "7e38f664fa3e13602c357d37f77d8adcf82fccc2", "parents": [ "dca1d9f6d7ae428c193f32bd3e9a4ca13176648b", "318ae2edc3b29216abd8a2510f3f80b764f06858" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits)\n doc: fix typo in comment explaining rb_tree usage\n Remove fs/ntfs/ChangeLog\n doc: fix console doc typo\n doc: cpuset: Update the cpuset flag file\n Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed\n Remove drivers/parport/ChangeLog\n Remove drivers/char/ChangeLog\n doc: typo - Table 1-2 should refer to \"status\", not \"statm\"\n tree-wide: fix typos \"ass?o[sc]iac?te\" -\u003e \"associate\" in comments\n No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h\n devres/irq: Fix devm_irq_match comment\n Remove reference to kthread_create_on_cpu\n tree-wide: Assorted spelling fixes\n tree-wide: fix \u0027lenght\u0027 typo in comments and code\n drm/kms: fix spelling in error message\n doc: capitalization and other minor fixes in pnp doc\n devres: typo fix s/dev/devm/\n Remove redundant trailing semicolons from macros\n fix typo \"definetly\" -\u003e \"definitely\" in comment\n tree-wide: s/widht/width/g typo in comments\n ...\n\nFix trivial conflict in Documentation/laptops/00-INDEX\n" }, { "commit": "dacbe41f776db0a5a9aee1e41594f405c95778a5", "tree": "f6cb1436bd50a2572b7c5b44d44044be0e8005bd", "parents": [ "b3c1e01a09d6af2dd7811a066ffcfc5171be2bed" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Wed Mar 10 15:22:46 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:38 2010 -0800" }, "message": "ptrace: move user_enable_single_step \u0026 co prototypes to linux/ptrace.h\n\nWhile in theory user_enable_single_step/user_disable_single_step/\nuser_enable_blockstep could also be provided as an inline or macro there\u0027s\nno good reason to do so, and having the prototype in one places keeps code\nsize and confusion down.\n\nRoland said:\n\n The original thought there was that user_enable_single_step() et al\n might well be only an instruction or three on a sane machine (as if we\n have any of those!), and since there is only one call site inlining\n would be beneficial. But I agree that there is no strong reason to care\n about inlining it.\n\n As to the arch changes, there is only one thought I\u0027d add to the\n record. It was always my thinking that for an arch where\n PTRACE_SINGLESTEP does text-modifying breakpoint insertion,\n user_enable_single_step() should not be provided. That is,\n arch_has_single_step()\u003d\u003etrue means that there is an arch facility with\n \"pure\" semantics that does not have any unexpected side effects.\n Inserting a breakpoint might do very unexpected strange things in\n multi-threaded situations. Aside from that, it is a peculiar side\n effect that user_{enable,disable}_single_step() should cause COW\n de-sharing of text pages and so forth. For PTRACE_SINGLESTEP, all these\n peculiarities are the status quo ante for that arch, so having\n arch_ptrace() itself do those is one thing. But for building other\n things in the future, it is nicer to have a uniform \"pure\" semantics\n that arch-independent code can expect.\n\n OTOH, all such arch issues are really up to the arch maintainer. As\n of today, there is nothing but ptrace using user_enable_single_step() et\n al so it\u0027s a distinction without a practical difference. If/when there\n are other facilities that use user_enable_single_step() and might care,\n the affected arch\u0027s can revisit the question when someone cares about\n the quality of the arch support for said new facility.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "baed7fc9b580bd3fb8252ff1d9b36eaf1f86b670", "tree": "38f23cd9888b92de3f73ed1f4ce48cd83e940e0e", "parents": [ "a4679373cf4ee0e7792dc56205365732b725c2c1" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Wed Mar 10 15:21:18 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:32 2010 -0800" }, "message": "Add generic sys_ipc wrapper\n\nAdd a generic implementation of the ipc demultiplexer syscall. Except for\ns390 and sparc64 all implementations of the sys_ipc are nearly identical.\n\nThere are slight differences in the types of the parameters, where mips\nand powerpc as the only 64-bit architectures with sys_ipc use unsigned\nlong for the \"third\" argument as it gets casted to a pointer later, while\nit traditionally is an \"int\" like most other paramters. frv goes even\nfurther and uses unsigned long for all parameters execept for \"ptr\" which\nis a pointer type everywhere. The change from int to unsigned long for\n\"third\" and back to \"int\" for the others on frv should be fine due to the\nin-register calling conventions for syscalls (we already had a similar\nissue with the generic sys_ptrace), but I\u0027d prefer to have the arch\nmaintainers looks over this in details.\n\nExcept for that h8300, m68k and m68knommu lack an impplementation of the\nsemtimedop sub call which this patch adds, and various architectures have\ngets used - at least on i386 it seems superflous as the compat code on\nx86-64 and ia64 doesn\u0027t even bother to implement it.\n\n[akpm@linux-foundation.org: add sys_ipc to sys_ni.c]\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nReviewed-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nAcked-by: Jesper Nilsson \u003cjesper.nilsson@axis.com\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a4679373cf4ee0e7792dc56205365732b725c2c1", "tree": "6cf8040f608ad46ae7c605284af1ca585fb50eaa", "parents": [ "5d0e52830e9ae09b872567f4aca3dfb5b5918079" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Wed Mar 10 15:21:15 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:32 2010 -0800" }, "message": "Add generic sys_old_mmap()\n\nAdd a generic implementation of the old mmap() syscall, which expects its\nargument in a memory block and switch all architectures over to use it.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nReviewed-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nCc: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nAcked-by: Jesper Nilsson \u003cjesper.nilsson@axis.com\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5d0e52830e9ae09b872567f4aca3dfb5b5918079", "tree": "55a199575058da551ccc837ab35a1f4826a8c5b4", "parents": [ "724ee626f38feaea215a11790e1a0cb5d83b0628" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Wed Mar 10 15:21:13 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:32 2010 -0800" }, "message": "Add generic sys_old_select()\n\nAdd a generic implementation of the old select() syscall, which expects\nits argument in a memory block and switch all architectures over to use\nit.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nReviewed-by: H. Peter Anvin \u003chpa@zytor.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nAcked-by: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "318ae2edc3b29216abd8a2510f3f80b764f06858", "tree": "ce595adde342f57f379d277b25e4dd206988a052", "parents": [ "25cf84cf377c0aae5dbcf937ea89bc7893db5176", "3e58974027b04e84f68b964ef368a6cd758e2f84" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\tDocumentation/filesystems/proc.txt\n\tarch/arm/mach-u300/include/mach/debug-macro.S\n\tdrivers/net/qlge/qlge_ethtool.c\n\tdrivers/net/qlge/qlge_main.c\n\tdrivers/net/typhoon.c\n" }, { "commit": "ac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9", "tree": "816e5ac643b15c2050c64a7075f0f7e13d86ea09", "parents": [ "b1bf9368407ae7e89d8a005bb40beb70a41df539", "9f33be2c3a80bdc2cc08342dd77fac87652e0548" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 01 09:15:15 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 01 09:15:15 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm\n\n* \u0027for-linus\u0027 of master.kernel.org:/home/rmk/linux-2.6-arm: (100 commits)\n ARM: Eliminate decompressor -Dstatic\u003d PIC hack\n ARM: 5958/1: ARM: U300: fix inverted clk round rate\n ARM: 5956/1: misplaced parentheses\n ARM: 5955/1: ep93xx: move timer defines into core.c and document\n ARM: 5954/1: ep93xx: move gpio interrupt support to gpio.c\n ARM: 5953/1: ep93xx: fix broken build of clock.c\n ARM: 5952/1: ARM: MM: Add ARM_L1_CACHE_SHIFT_6 for handle inside each ARCH Kconfig\n ARM: 5949/1: NUC900 add gpio virtual memory map\n ARM: 5948/1: Enable timer0 to time4 clock support for nuc910\n ARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk\n ARM: make_coherent(): fix problems with highpte, part 2\n MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself\n ARM: 5945/1: ep93xx: include correct irq.h in core.c\n ARM: 5933/1: amba-pl011: support hardware flow control\n ARM: 5930/1: Add PKMAP area description to memory.txt.\n ARM: 5929/1: Add checks to detect overlap of memory regions.\n ARM: 5928/1: Change type of VMALLOC_END to unsigned long.\n ARM: 5927/1: Make delimiters of DMA area globally visibly.\n ARM: 5926/1: Add \"Virtual kernel memory...\" printout.\n ARM: 5920/1: OMAP4: Enable L2 Cache\n ...\n\nFix up trivial conflict in arch/arm/mach-mx25/clock.c\n" }, { "commit": "00ebfe58b002f0ff387f60c7cd23bc2b274fce1a", "tree": "2e88877140ddcb97cf2b5a01bbf0b3c443bf3ef9", "parents": [ "a58f75349063f60949614de39390df594ba1418d" ], "author": { "name": "Maxim Kuvyrkov", "email": "maxim@codesourcery.com", "time": "Wed Sep 23 01:22:43 2009 +0400" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Feb 27 18:44:10 2010 +0100" }, "message": "m68k: Define sigcontext ABI of ColdFire\n\nThe following patch defines sigcontext ABI of ColdFire. Due to ISA\nrestrictions ColdFire needs different rt_sigreturn trampoline.\n\nAnd due to ColdFire FP registers being 8-bytes instead of 12-bytes on\nm68k, sigcontext and fpregset structures should be updated.\n\nRegarding the sc_fpstate[16+6*8] field, it would\u0027ve been enough 16\nbytes to store ColdFire\u0027s FP state. To accomodate GLIBC\u0027s libSegFault\nit would\u0027be been enough 6*8 bytes (room for the 6 non-call-clobbered\nFP registers). I set it to 16+6*8 to provide some extra space for any\nfuture changes in the ColdFire FPU.\n\nSigned-off-by: Maxim Kuvyrkov \u003cmaxim@codesourcery.com\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "a58f75349063f60949614de39390df594ba1418d", "tree": "b0fec4508132df99cfa81e5d9f080028fe234b91", "parents": [ "9674cdc74d63f346870943ef966a034f8c71ee57" ], "author": { "name": "Maxim Kuvyrkov", "email": "maxim@codesourcery.com", "time": "Sun Dec 06 10:08:14 2009 -0800" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Feb 27 18:35:22 2010 +0100" }, "message": "m68knommu: NPTL support for uClinux\n\nPort syscalls for NPTL support to m68knommu.\n\nSigned-off-by: Maxim Kuvyrkov \u003cmaxim@codesourcery.com\u003e\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "9674cdc74d63f346870943ef966a034f8c71ee57", "tree": "c590640335983c5b1a7f5c9589478bf90fb68d03", "parents": [ "f54bcdc2b81558a2b7e624cfeb4992422d9265f9" ], "author": { "name": "Maxim Kuvyrkov", "email": "maxim@codesourcery.com", "time": "Mon Dec 07 00:24:27 2009 -0800" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Feb 27 18:31:19 2010 +0100" }, "message": "m68k: Add NPTL support\n\nThis patch adds several syscalls, that provide necessary\nfunctionality to support NPTL on m68k/ColdFire.\nThe syscalls are get_thread_area, set_thread_area, atomic_cmpxchg_32 and\natomic_barrier.\nThe cmpxchg syscall is required for ColdFire as it doesn\u0027t support \u0027cas\u0027\ninstruction.\n\nAlso a ptrace call PTRACE_GET_THREAD_AREA is added to allow debugger to\ninspect the TLS storage.\n\nSigned-off-by: Maxim Kuvyrkov \u003cmaxim@codesourcery.com\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "f54bcdc2b81558a2b7e624cfeb4992422d9265f9", "tree": "20b420dd35e4b70fdd898c7c12c6007c4c0bc722", "parents": [ "5da3a65d2d1ba333d61999640ef241f150c69c6b" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Jan 12 08:32:18 2010 +0100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Feb 27 18:31:18 2010 +0100" }, "message": "m68k: Eliminate unused variable in page_to_phys()\n\n\"pgdat\" is unused, so we can eliminate it and turn page_to_phys()\ninto a single-line macro.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "5da3a65d2d1ba333d61999640ef241f150c69c6b", "tree": "f991cfea478322ecf6608456855376ba6fdfa0ad", "parents": [ "99e11ab20b26b3236490ae687ab309c2601d180b" ], "author": { "name": "Maxim Kuvyrkov", "email": "maxim@codesourcery.com", "time": "Wed Dec 23 11:28:42 2009 -0800" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Feb 27 18:31:17 2010 +0100" }, "message": "m68k: Switch to generic siginfo layout\n\nThis patch switches m68k to generic siginfo layout. The custom layout\nof m68k\u0027s `struct siginfo\u0027 had several issues due to not considering\naliasing of members in the union, e.g., _uid32 was at different offsets\nin ._kill, ._rt and ._sigchld.\n\nSigned-off-by: Maxim Kuvyrkov \u003cmaxim@codesourcery.com\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "80614e5ab1458ff3ccced4d6ba2fa386575c8d5c", "tree": "e34007d1ce2abb0c8c451764107973909798cac3", "parents": [ "ec9cbe09899e36b5f216c3232215520dcf0320ab" ], "author": { "name": "Finn Thain", "email": "fthain@telegraphics.com.au", "time": "Tue Nov 17 20:06:48 2009 +1100" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Feb 27 18:31:09 2010 +0100" }, "message": "mac68k: replace mac68k SCC code with platform device\n\nRemove the old 68k Mac serial port code and a lot of related cruft. Add\nnew SCC platform devices to mac 68k platform.\n\nSigned-off-by: Finn Thain \u003cfthain@telegraphics.com.au\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "145452649d035e4e5152f6c4e6798c41960cad3e", "tree": "89b02d000f00f30149beec12ac534fd5c59dce97", "parents": [ "06a79b82b2a3e4bebb9a20638ca208c780e9e507" ], "author": { "name": "Maxim Kuvyrkov", "email": "maxim@codesourcery.com", "time": "Fri Oct 02 12:32:18 2009 +0400" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sat Feb 27 18:27:13 2010 +0100" }, "message": "m68k: Fix asm/swab.h for ColdFire\n\nMake asm/swab.h compatible with ColdFire ISA_B CPUs.\n\nSigned-off-by: Maxim Kuvyrkov \u003cmaxim@codesourcery.com\u003e\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "4b3073e1c53a256275f1079c0fbfbe85883d9275", "tree": "a0fa98cb75edbbc58c43bbe38ac4c6da0913ae6d", "parents": [ "ed42acaef1a9d51631a31b55e9ed52d400430492" ], "author": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Fri Dec 18 16:40:18 2009 +0000" }, "committer": { "name": "Russell King", "email": "rmk+kernel@arm.linux.org.uk", "time": "Sat Feb 20 16:41:46 2010 +0000" }, "message": "MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself\n\nOn VIVT ARM, when we have multiple shared mappings of the same file\nin the same MM, we need to ensure that we have coherency across all\ncopies. We do this via make_coherent() by making the pages\nuncacheable.\n\nThis used to work fine, until we allowed highmem with highpte - we\nnow have a page table which is mapped as required, and is not available\nfor modification via update_mmu_cache().\n\nRalf Beache suggested getting rid of the PTE value passed to\nupdate_mmu_cache():\n\n On MIPS update_mmu_cache() calls __update_tlb() which walks pagetables\n to construct a pointer to the pte again. Passing a pte_t * is much\n more elegant. Maybe we might even replace the pte argument with the\n pte_t?\n\nBen Herrenschmidt would also like the pte pointer for PowerPC:\n\n Passing the ptep in there is exactly what I want. I want that\n -instead- of the PTE value, because I have issue on some ppc cases,\n for I$/D$ coherency, where set_pte_at() may decide to mask out the\n _PAGE_EXEC.\n\nSo, pass in the mapped page table pointer into update_mmu_cache(), and\nremove the PTE value, updating all implementations and call sites to\nsuit.\n\nIncludes a fix from Stephen Rothwell:\n\n sparc: fix fallout from update_mmu_cache API change\n\n Signed-off-by: Stephen Rothwell \u003csfr@canb.auug.org.au\u003e\n\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\n" }, { "commit": "3ad2f3fbb961429d2aa627465ae4829758bc7e07", "tree": "f365c513e8f5b477a61336a600ff54f32b7ad6e1", "parents": [ "1537a3638cbf741d3826c1002026cce487a6bee0" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Wed Feb 03 08:01:28 2010 +0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Feb 09 11:13:56 2010 +0100" }, "message": "tree-wide: Assorted spelling fixes\n\nIn particular, several occurances of funny versions of \u0027success\u0027,\n\u0027unknown\u0027, \u0027therefore\u0027, \u0027acknowledge\u0027, \u0027argument\u0027, \u0027achieve\u0027, \u0027address\u0027,\n\u0027beginning\u0027, \u0027desirable\u0027, \u0027separate\u0027 and \u0027necessary\u0027 are fixed.\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Junio C Hamano \u003cgitster@pobox.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "551e378ca1852dc51609b722014416d4da0770c6", "tree": "c94a78f3a2452a6064bb503e2bd92d7c36ad4fc4", "parents": [ "d9a5f04b6a8e0e681ae37fde84016a57ca17371f" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Thu Jan 28 16:11:51 2010 +0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Feb 05 12:22:42 2010 +0100" }, "message": "tree-wide: s/widht/width/g typo in comments\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Jiri Kosina \u003ctrivial@kernel.org\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "682137f7e6bc78e3c324874c0c213123ddc5e261", "tree": "dc7abee5b6ac11bb3819f6e8432566651998afe6", "parents": [ "066000dd856709b6980123eb39b957fe26993f7b" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Jan 13 10:42:05 2010 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jan 12 20:51:45 2010 -0800" }, "message": "m68knommu: fix definitions of __pa() and __va()\n\nFix compilation breakage of all m68knommu targets:\n\n CC arch/m68knommu/kernel/asm-offsets.s\nIn file included from include/linux/sched.h:77,\n from arch/m68knommu/kernel/asm-offsets.c:12:\ninclude/linux/percpu.h: In function \u0027per_cpu_ptr_to_phys\u0027:\ninclude/linux/percpu.h:161: error: implicit declaration of function \u0027virt_to_phy\n\nThis is broken in linux-2.6.33-rc3.\n\nChange the definitions of __pa() and __va() to not use virt_to_phys()\nand phys_to_virt(). Trivial 1:1 conversion required for the non-MMU case.\n\nA side effect if this is that the m68knommu can now use asm/virtconvert.h\nfor the definition of virt_to_phys() and phys_to_virt().\n\nAlso cleaned up the definition of page_to_phys() when moving into\nvirtconvert.h.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5a865c0606eb44d5d12cabb429751c83712183de", "tree": "726d6eaf3b20f30900304bd0cbb6339b423a071f", "parents": [ "331d9d5958277de27e6ce42247e1cbec54fd1c7e", "46e75f66677f5094bb51e91f9473128c4e907c7d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 17 07:23:42 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Dec 17 07:23:42 2009 -0800" }, "message": "Merge branch \u0027for-33\u0027 of git://repo.or.cz/linux-kbuild\n\n* \u0027for-33\u0027 of git://repo.or.cz/linux-kbuild: (29 commits)\n net: fix for utsrelease.h moving to generated\n gen_init_cpio: fixed fwrite warning\n kbuild: fix make clean after mismerge\n kbuild: generate modules.builtin\n genksyms: properly consider EXPORT_UNUSED_SYMBOL{,_GPL}()\n score: add asm/asm-offsets.h wrapper\n unifdef: update to upstream revision 1.190\n kbuild: specify absolute paths for cscope\n kbuild: create include/generated in silentoldconfig\n scripts/package: deb-pkg: use fakeroot if available\n scripts/package: add KBUILD_PKG_ROOTCMD variable\n scripts/package: tar-pkg: use tar --owner\u003droot\n Kbuild: clean up marker\n net: add net_tstamp.h to headers_install\n kbuild: move utsrelease.h to include/generated\n kbuild: move autoconf.h to include/generated\n drop explicit include of autoconf.h\n kbuild: move compile.h to include/generated\n kbuild: drop include/asm\n kbuild: do not check for include/asm-$ARCH\n ...\n\nFixed non-conflicting clean merge of modpost.c as per comments from\nStephen Rothwell (modpost.c had grown an include of linux/autoconf.h\nthat needed to be changed to generated/autoconf.h)\n" }, { "commit": "698ba7b5a3a7be772922340fade365c675b8243f", "tree": "3e251d4ee8cbd8489d75e7570b2d821395021d59", "parents": [ "d1da96aada79fd1d29ae4e3157120d1ce1e77594" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Tue Dec 15 16:47:37 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 07:20:12 2009 -0800" }, "message": "elf: kill USE_ELF_CORE_DUMP\n\nCurrently all architectures but microblaze unconditionally define\nUSE_ELF_CORE_DUMP. The microblaze omission seems like an error to me, so\nlet\u0027s kill this ifdef and make sure we are the same everywhere.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nAcked-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nCc: Michal Simek \u003cmichal.simek@petalogix.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d0316554d3586cbea60592a41391b5def2553d6f", "tree": "5e7418f0bacbc68cec5dfd1541e03eb56870aa02", "parents": [ "fb0bbb92d42d5bd0ab224605444efdfed06d6934", "51e99be00ce2713cbb841cedc997cafa6e26c7f4" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 14 09:58:24 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Dec 14 09:58:24 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (34 commits)\n m68k: rename global variable vmalloc_end to m68k_vmalloc_end\n percpu: add missing per_cpu_ptr_to_phys() definition for UP\n percpu: Fix kdump failure if booted with percpu_alloc\u003dpage\n percpu: make misc percpu symbols unique\n percpu: make percpu symbols in ia64 unique\n percpu: make percpu symbols in powerpc unique\n percpu: make percpu symbols in x86 unique\n percpu: make percpu symbols in xen unique\n percpu: make percpu symbols in cpufreq unique\n percpu: make percpu symbols in oprofile unique\n percpu: make percpu symbols in tracer unique\n percpu: make percpu symbols under kernel/ and mm/ unique\n percpu: remove some sparse warnings\n percpu: make alloc_percpu() handle array types\n vmalloc: fix use of non-existent percpu variable in put_cpu_var()\n this_cpu: Use this_cpu_xx in trace_functions_graph.c\n this_cpu: Use this_cpu_xx for ftrace\n this_cpu: Use this_cpu_xx in nmi handling\n this_cpu: Use this_cpu operations in RCU\n this_cpu: Use this_cpu ops for VM statistics\n ...\n\nFix up trivial (famous last words) global per-cpu naming conflicts in\n\tarch/x86/kvm/svm.c\n\tmm/slab.c\n" }, { "commit": "559df2e0210352f83926d178c40c51142292a18c", "tree": "f63a3466f23a243b1335b42ec5423144beddaba7", "parents": [ "01fc0ac198eabcbf460e1ed058860a935b6c2c9a" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sun Apr 19 22:35:10 2009 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Dec 12 13:08:14 2009 +0100" }, "message": "kbuild: move asm-offsets.h to include/generated\n\nThe simplest method was to add an extra asm-offsets.h\nfile in arch/$ARCH/include/asm that references the generated file.\n\nWe can now migrate the architectures one-by-one to reference\nthe generated file direct - and when done we can delete the\ntemporary arch/$ARCH/include/asm/asm-offsets.h file.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "4ef58d4e2ad1fa2a3e5bbf41af2284671fca8cf8", "tree": "856ba96302a36014736747e8464f80eeb827bbdd", "parents": [ "f6c4c8195b5e7878823caa1181be404d9e86d369", "d014d043869cdc591f3a33243d3481fa4479c2d0" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:43:33 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (42 commits)\n tree-wide: fix misspelling of \"definition\" in comments\n reiserfs: fix misspelling of \"journaled\"\n doc: Fix a typo in slub.txt.\n inotify: remove superfluous return code check\n hdlc: spelling fix in find_pvc() comment\n doc: fix regulator docs cut-and-pasteism\n mtd: Fix comment in Kconfig\n doc: Fix IRQ chip docs\n tree-wide: fix assorted typos all over the place\n drivers/ata/libata-sff.c: comment spelling fixes\n fix typos/grammos in Documentation/edac.txt\n sysctl: add missing comments\n fs/debugfs/inode.c: fix comment typos\n sgivwfb: Make use of ARRAY_SIZE.\n sky2: fix sky2_link_down copy/paste comment error\n tree-wide: fix typos \"couter\" -\u003e \"counter\"\n tree-wide: fix typos \"offest\" -\u003e \"offset\"\n fix kerneldoc for set_irq_msi()\n spidev: fix double \"of of\" in comment\n comment typo fix: sybsystem -\u003e subsystem\n ...\n" }, { "commit": "701791cc3c8fc6dd83f6ec8af7e2541b4a316606", "tree": "3a8fce994dc9ca0fb5401f0d3aeb0ff8b9a2a821", "parents": [ "4ba152596de23038e5bca413d23c3fe6fa92ff45", "96c612427edab65dddd88ad61d732501cc5f128d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:09:42 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 19:09:42 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:\n m68knommu: export clk_* symbols in clk.c\n m68knommu: Split the .init section into INIT_TEXT_SECTION and INIT_DATA_SECTION.\n m68knommu: Move __init_end out of the .init section.\n m68knommu: Move __init_begin out of the .init section.\n m68knommu: Use more macros inside the .init section.\n m68knommu: Use INIT_TASK_DATA and CACHELINE_ALIGNED_DATA.\n m68knommu: Make THREAD_SIZE available to assembly files.\n m68knommu: Don\u0027t hardcode the value of PAGE_SIZE in the linker script.\n m68knommu: rename BSS define in linker script\n m68knommu: add a task_pt_regs() macro\n m68knommu: define arch_has_single_step() and friends\n m68knommu: add uboot commandline argument passing support\n m68knommu: Coldfire GPIO corrections\n m68knommu: move mcf_remove to .devexit.text\n\nFixed up (?) conflict in arch/m68k/include/asm/ptrace.h\n" }, { "commit": "51e99be00ce2713cbb841cedc997cafa6e26c7f4", "tree": "0e49ba8d6f9c061650950e241de01089bb79ab26", "parents": [ "50de1a8ef18da0cfff97543315b4e042e8bb7c83" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Dec 09 17:43:19 2009 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Dec 09 17:43:19 2009 +0900" }, "message": "m68k: rename global variable vmalloc_end to m68k_vmalloc_end\n\nOn SUN3, m68k defines macro VMALLOC_END as unsigned long variable\nvmalloc_end which is adjusted from mmu_emu_init(). This becomes\nproblematic if a local variables vmalloc_end is defined in some\nfunction (not very unlikely) and VMALLOC_END is used in the function -\nthe function thinks its referencing the global VMALLOC_END value but\nwould be referencing its own local vmalloc_end variable.\n\nRename the global variable to m68k_vmlloc_end which is much less\nlikely to be used as local variable name.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\n" }, { "commit": "6035ccd8e9e40bb654fbfdef325902ab531679a5", "tree": "c1810d8a4d4ef150cdf14af72e6087dfc3f4b6e0", "parents": [ "23eb3b64b5e44680c867e165fe1cd18e57fba255", "878eaddd05d251cefa9632c2b8046833c5eead66" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:19:16 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:19:16 2009 -0800" }, "message": "Merge branch \u0027for-2.6.33\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.33\u0027 of git://git.kernel.dk/linux-2.6-block: (113 commits)\n cfq-iosched: Do not access cfqq after freeing it\n block: include linux/err.h to use ERR_PTR\n cfq-iosched: use call_rcu() instead of doing grace period stall on queue exit\n blkio: Allow CFQ group IO scheduling even when CFQ is a module\n blkio: Implement dynamic io controlling policy registration\n blkio: Export some symbols from blkio as its user CFQ can be a module\n block: Fix io_context leak after failure of clone with CLONE_IO\n block: Fix io_context leak after clone with CLONE_IO\n cfq-iosched: make nonrot check logic consistent\n io controller: quick fix for blk-cgroup and modular CFQ\n cfq-iosched: move IO controller declerations to a header file\n cfq-iosched: fix compile problem with !CONFIG_CGROUP\n blkio: Documentation\n blkio: Wait on sync-noidle queue even if rq_noidle \u003d 1\n blkio: Implement group_isolation tunable\n blkio: Determine async workload length based on total number of queues\n blkio: Wait for cfq queue to get backlogged if group is empty\n blkio: Propagate cgroup weight updation to cfq groups\n blkio: Drop the reference to queue once the task changes cgroup\n blkio: Provide some isolation between groups\n ...\n" }, { "commit": "adf9904dc774f23f04a5425f0198483ea61f878b", "tree": "dfe0527c7f3877eb4d155ddb20fd303c1d8328c0", "parents": [ "bb592cf474404e51cbf3c419fb72fda83c4b7d72", "49966bae8446f5ba7e8afbd01bde82af4e00628a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:13:35 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 08:13:35 2009 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:\n m68k: parport_mfc3 - Not makes it a bool before the comparison.\n m68k: don\u0027t export static inline functions\n fbdev: atafb - add palette register check\n m68k: Remove the BKL from sys_execve\n m68k: Cleanup linker scripts using new linker script macros.\n m68k: Make thread_info.h usable from assembly.\n m68knommu: define arch_has_single_step() and friends\n m68k: ptrace fixes\n m68k: use generic code for ptrace requests\n rtc: Add an RTC driver for the Ricoh RP5C01\n rtc: Add an RTC driver for the Oki MSM6242\n" }, { "commit": "5cdef24b2ab44ca587d46d212468b0cfb5b83a59", "tree": "0ed097e75f36f2bdf42bf36a29eea3fcec3b6ec6", "parents": [ "f60a5572679ef8508b62bd82063b05ffbe838716" ], "author": { "name": "Tim Abbott", "email": "tabbott@ksplice.com", "time": "Wed Sep 16 12:44:25 2009 -0400" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Dec 06 11:18:24 2009 +0100" }, "message": "m68k: Make thread_info.h usable from assembly.\n\n[Geert] \u003casm/thread_info_mm.h\u003e pulls in \u003casm/current.h\u003e, which contains C only.\nSo the include must be moved inside #ifndef __ASSEMBLY__.\n\nSigned-off-by: Tim Abbott \u003ctabbott@ksplice.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\nCc: linux-m68k@lists.linux-m68k.org\nCc: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "f60a5572679ef8508b62bd82063b05ffbe838716", "tree": "73f8b9d774df1e700b132f4283758515090d8435", "parents": [ "f195e2bff3000b8bc251ee6f685e0f027eec6f25" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue Jul 07 15:54:54 2009 +1000" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Dec 06 11:18:23 2009 +0100" }, "message": "m68knommu: define arch_has_single_step() and friends\n\nTowards adding CONFIG_UTRACE support for non-mmu m68k add\narch_has_single_step, and its support functions user_enable_single_step()\nand user_disable_single_step().\n[Geert] m68k conflict resolution from linux-next\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "faa47b466935e73251b18b17d51455b06ed65764", "tree": "0b4618676fa11f566e7f5a7b802fbe985b74492c", "parents": [ "4f672ce298e1b53a2f16571ef87810d0f73bfb1f" ], "author": { "name": "Andreas Schwab", "email": "schwab@linux-m68k.org", "time": "Sun May 10 21:14:52 2009 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Fri Dec 04 21:22:35 2009 +0100" }, "message": "m68k: use generic code for ptrace requests\n\nRemove all but PTRACE_{PEEK,POKE}USR and PTRACE_{GET,SET}{REGS,FPREGS}\nfrom arch_ptrace and let the rest be handled by generic code. Define\nPTRACE_SINGLEBLOCK to enable singleblock tracing.\n[Geert] Not yet applicable for m68knommu\n\nSigned-off-by: Andreas Schwab \u003cschwab@linux-m68k.org\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "af901ca181d92aac3a7dc265144a9081a86d8f39", "tree": "380054af22521144fbe1364c3bcd55ad24c9bde4", "parents": [ "972b94ffb90ea6d20c589d9a47215df103388ddd" ], "author": { "name": "André Goddard Rosa", "email": "andre.goddard@gmail.com", "time": "Sat Nov 14 13:09:05 2009 -0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri Dec 04 15:39:55 2009 +0100" }, "message": "tree-wide: fix assorted typos all over the place\n\nThat is \"success\", \"unknown\", \"through\", \"performance\", \"[re|un]mapping\"\n, \"access\", \"default\", \"reasonable\", \"[con]currently\", \"temperature\"\n, \"channel\", \"[un]used\", \"application\", \"example\",\"hierarchy\", \"therefore\"\n, \"[over|under]flow\", \"contiguous\", \"threshold\", \"enough\" and others.\n\nSigned-off-by: André Goddard Rosa \u003candre.goddard@gmail.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "d6cd1f0c38c9820472fb898cb6fa1b3fc42a85a8", "tree": "9076f23b79fa377ee2b280082165bf5dc6d4d52c", "parents": [ "f4bed4fb17417085d00e4fd1dc285db0330e5945" ], "author": { "name": "Tim Abbott", "email": "tabbott@ksplice.com", "time": "Sun Oct 18 13:23:50 2009 -0400" }, "committer": { "name": "Greg Ungerer", "email": "gerg@goober.(none)", "time": "Fri Dec 04 11:45:31 2009 +1000" }, "message": "m68knommu: Make THREAD_SIZE available to assembly files.\n\nSigned-off-by: Tim Abbott \u003ctabbott@ksplice.com\u003e\nCc: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "c23b6538d08c8da5e401b8d7c912b322e8ec9c26", "tree": "9c1f0e3ef76661fa2cfa6f63899b21d7097790ac", "parents": [ "193f087d492c566a211d01942c0f6b395f34f2ab" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue Jul 07 15:32:08 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@goober.(none)", "time": "Fri Dec 04 11:45:30 2009 +1000" }, "message": "m68knommu: add a task_pt_regs() macro\n\nAdd a task_pt_regs() macro as per the CONFIG_UTRACE requirements.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "193f087d492c566a211d01942c0f6b395f34f2ab", "tree": "a87beb68a5b7c25b9b209425de789db5e984822b", "parents": [ "588baeac38829304390b690142376d2c71ac5c9f" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue Jul 07 15:54:54 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@goober.(none)", "time": "Fri Dec 04 11:45:30 2009 +1000" }, "message": "m68knommu: define arch_has_single_step() and friends\n\nTowards adding CONFIG_UTRACE support for non-mmu m68k add\narch_has_single_step, and its support functions user_enable_single_step()\nand user_disable_single_step().\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "2d4dc890b5c8fabd818a8586607e6843c4375e62", "tree": "9976ed7b0eed0056f8289aeb6a2b0abf8c940454", "parents": [ "3586e917f2c7df769d173c4ec99554cb40a911e5" ], "author": { "name": "Ilya Loginov", "email": "isloginov@gmail.com", "time": "Thu Nov 26 09:16:19 2009 +0100" }, "committer": { "name": "Jens Axboe", "email": "jens.axboe@oracle.com", "time": "Thu Nov 26 09:16:19 2009 +0100" }, "message": "block: add helpers to run flush_dcache_page() against a bio and a request\u0027s pages\n\nMtdblock driver doesn\u0027t call flush_dcache_page for pages in request. So,\nthis causes problems on architectures where the icache doesn\u0027t fill from\nthe dcache or with dcache aliases. The patch fixes this.\n\nThe ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE symbol was introduced to avoid\npointless empty cache-thrashing loops on architectures for which\nflush_dcache_page() is a no-op. Every architecture was provided with this\nflush pages on architectires where ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE is\nequal 1 or do nothing otherwise.\n\nSee \"fix mtd_blkdevs problem with caches on some architectures\" discussion\non LKML for more information.\n\nSigned-off-by: Ilya Loginov \u003cisloginov@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: David Woodhouse \u003cdwmw2@infradead.org\u003e\nCc: Peter Horton \u003cphorton@bitbox.co.uk\u003e\nCc: \"Ed L. Cashin\" \u003cecashin@coraid.com\u003e\nSigned-off-by: Jens Axboe \u003cjens.axboe@oracle.com\u003e\n" }, { "commit": "3b885787ea4112eaa80945999ea0901bf742707f", "tree": "06fc15f8e8083d5652ccb4d06653d9812dce9c0b", "parents": [ "d5e63bded6e819ca77ee1a1d97c783a31f6caf30" ], "author": { "name": "Neil Horman", "email": "nhorman@tuxdriver.com", "time": "Mon Oct 12 13:26:31 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 12 13:26:31 2009 -0700" }, "message": "net: Generalize socket rx gap / receive queue overflow cmsg\n\nCreate a new socket level option to report number of queue overflows\n\nRecently I augmented the AF_PACKET protocol to report the number of frames lost\non the socket receive queue between any two enqueued frames. This value was\nexported via a SOL_PACKET level cmsg. AFter I completed that work it was\nrequested that this feature be generalized so that any datagram oriented socket\ncould make use of this option. As such I\u0027ve created this patch, It creates a\nnew SOL_SOCKET level option called SO_RXQ_OVFL, which when enabled exports a\nSOL_SOCKET level cmsg that reports the nubmer of times the sk_receive_queue\noverflowed between any two given frames. It also augments the AF_PACKET\nprotocol to take advantage of this new feature (as it previously did not touch\nsk-\u003esk_drops, which this patch uses to record the overflow count). Tested\nsuccessfully by me.\n\nNotes:\n\n1) Unlike my previous patch, this patch simply records the sk_drops value, which\nis not a number of drops between packets, but rather a total number of drops.\nDeltas must be computed in user space.\n\n2) While this patch currently works with datagram oriented protocols, it will\nalso be accepted by non-datagram oriented protocols. I\u0027m not sure if thats\nagreeable to everyone, but my argument in favor of doing so is that, for those\nprotocols which aren\u0027t applicable to this option, sk_drops will always be zero,\nand reporting no drops on a receive queue that isn\u0027t used for those\nnon-participating protocols seems reasonable to me. This also saves us having\nto code in a per-protocol opt in mechanism.\n\n3) This applies cleanly to net-next assuming that commit\n977750076d98c7ff6cbda51858bb5a5894a9d9ab (my af packet cmsg patch) is reverted\n\nSigned-off-by: Neil Horman \u003cnhorman@tuxdriver.com\u003e\nSigned-off-by: Eric Dumazet \u003ceric.dumazet@gmail.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "a28b3dc90964ed961b6ed2c320885ab8b3a0a8ff", "tree": "ba16d435330bbafae0b61882e32bb89a3fa3dc3a", "parents": [ "b3db4a8ad19173a8fd0ced13d47c97910f1ab14b" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Thu Oct 01 15:43:57 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 01 16:11:11 2009 -0700" }, "message": "revert \"m68k: convert to asm-generic/hardirq.h\"\n\nRevert 45d80eea87c9f8292d2d33173d6866c0ec57238a (\"m68k: convert to\nasm-generic/hardirq.h\") - it fails to compile due to an inclusion tangle:\n\nIn file included from include/linux/irq.h:12,\n from include/asm-generic/hardirq.h:6,\n from /usr/src/devel/arch/m68k/include/asm/hardirq_mm.h:6,\n from /usr/src/devel/arch/m68k/include/asm/hardirq.h:4,\n from include/linux/hardirq.h:10,\n from /usr/src/devel/arch/m68k/include/asm/system_mm.h:69,\n from /usr/src/devel/arch/m68k/include/asm/system.h:4,\n from include/linux/list.h:7,\n from include/linux/preempt.h:11,\n from include/linux/spinlock.h:50,\n from include/linux/seqlock.h:29,\n from include/linux/time.h:8,\n from include/linux/timex.h:56,\n from include/linux/sched.h:56,\n from arch/m68k/kernel/asm-offsets.c:14:\ninclude/linux/smp.h:17: error: field \u0027list\u0027 has incomplete type\n\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "45d80eea87c9f8292d2d33173d6866c0ec57238a", "tree": "2286da07cdadfb600200679cf9d0090278a39230", "parents": [ "4ad4c76b7afb71774b846b322ad2ae42f814331a" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Mon Sep 21 17:04:07 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:44 2009 -0700" }, "message": "m68k: convert to asm-generic/hardirq.h\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6e17b17f1fc7b2f24383a693d63550d9e1460081", "tree": "146a9921760755dfd5398c3fd56df918e391fe0d", "parents": [ "94bf5ceac095c7d4cb5e4d40fa7e2dd81d722b75" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Sep 21 17:03:48 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:42 2009 -0700" }, "message": "mm: remove duplicate asm/mman.h files\n\nA number of architectures have identical asm/mman.h files so they can all\nbe merged by using the new generic file.\n\nThe remaining asm/mman.h files are substantially different from each\nother.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "90f72aa58bbf076b68e289fbd71eb829bc505923", "tree": "992e5f59086cc77581fa10b52fb4a46fb3baf3f0", "parents": [ "6bfde05bf5c9682e255c6a2c669dc80f91af6296" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Sep 21 17:03:45 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:41 2009 -0700" }, "message": "mm: add MAP_HUGETLB for mmaping pseudo-anonymous huge page regions\n\nAdd a flag for mmap that will be used to request a huge page region that\nwill look like anonymous memory to user space. This is accomplished by\nusing a file on the internal vfsmount. MAP_HUGETLB is a modifier of\nMAP_ANONYMOUS and so must be specified with it. The region will behave\nthe same as a MAP_ANONYMOUS region using small pages.\n\nThe patch also adds the MAP_STACK flag, which was previously defined only\non some architectures but not on others. Since MAP_STACK is meant to be a\nhint only, architectures can define it without assigning a specific\nmeaning to it.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Eric B Munson \u003cebmunson@us.ibm.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cdd6c482c9ff9c55475ee7392ec8f672eddb7be6", "tree": "81f98a3ab46c589792057fe2392c1e10f8ad7893", "parents": [ "dfc65094d0313cc48969fa60bcf33d693aeb05a7" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Sep 21 12:02:48 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Sep 21 14:28:04 2009 +0200" }, "message": "perf: Do the big rename: Performance Counters -\u003e Performance Events\n\nBye-bye Performance Counters, welcome Performance Events!\n\nIn the past few months the perfcounters subsystem has grown out its\ninitial role of counting hardware events, and has become (and is\nbecoming) a much broader generic event enumeration, reporting, logging,\nmonitoring, analysis facility.\n\nNaming its core object \u0027perf_counter\u0027 and naming the subsystem\n\u0027perfcounters\u0027 has become more and more of a misnomer. With pending\ncode like hw-breakpoints support the \u0027counter\u0027 name is less and\nless appropriate.\n\nAll in one, we\u0027ve decided to rename the subsystem to \u0027performance\nevents\u0027 and to propagate this rename through all fields, variables\nand API names. (in an ABI compatible fashion)\n\nThe word \u0027event\u0027 is also a bit shorter than \u0027counter\u0027 - which makes\nit slightly more convenient to write/handle as well.\n\nThanks goes to Stephane Eranian who first observed this misnomer and\nsuggested a rename.\n\nUser-space tooling and ABI compatibility is not affected - this patch\nshould be function-invariant. (Also, defconfigs were not touched to\nkeep the size down.)\n\nThis patch has been generated via the following script:\n\n FILES\u003d$(find * -type f | grep -vE \u0027oprofile|[^K]config\u0027)\n\n sed -i \\\n -e \u0027s/PERF_EVENT_/PERF_RECORD_/g\u0027 \\\n -e \u0027s/PERF_COUNTER/PERF_EVENT/g\u0027 \\\n -e \u0027s/perf_counter/perf_event/g\u0027 \\\n -e \u0027s/nb_counters/nb_events/g\u0027 \\\n -e \u0027s/swcounter/swevent/g\u0027 \\\n -e \u0027s/tpcounter_event/tp_event/g\u0027 \\\n $FILES\n\n for N in $(find . -name perf_counter.[ch]); do\n M\u003d$(echo $N | sed \u0027s/perf_counter/perf_event/g\u0027)\n mv $N $M\n done\n\n FILES\u003d$(find . -name perf_event.*)\n\n sed -i \\\n -e \u0027s/COUNTER_MASK/REG_MASK/g\u0027 \\\n -e \u0027s/COUNTER/EVENT/g\u0027 \\\n -e \u0027s/\\\u003cevent\\\u003e/event_id/g\u0027 \\\n -e \u0027s/counter/event/g\u0027 \\\n -e \u0027s/Counter/Event/g\u0027 \\\n $FILES\n\n... to keep it as correct as possible. This script can also be\nused by anyone who has pending perfcounters patches - it converts\na Linux kernel tree over to the new naming. We tried to time this\nchange to the point in time where the amount of pending patches\nis the smallest: the end of the merge window.\n\nNamespace clashes were fixed up in a preparatory patch - and some\nstylistic fallout will be fixed up in a subsequent patch.\n\n( NOTE: \u0027counters\u0027 are still the proper terminology when we deal\n with hardware registers - and these sed scripts are a bit\n over-eager in renaming them. I\u0027ve undone some of that, but\n in case there\u0027s something left where \u0027counter\u0027 would be\n better than \u0027event\u0027 we can undo that on an individual basis\n instead of touching an otherwise nicely automated patch. )\n\nSuggested-by: Stephane Eranian \u003ceranian@google.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nReviewed-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "66bc4a6f34a950c7aede597c578352c3eba82017", "tree": "d8005bd9abc0209cff47072d7e48cf19fddc52f5", "parents": [ "96c015b75feaaa67c8744229937bd9c35919d16b", "2985709d7f3078c7609ae7f16affc0fb478d7d7a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 17 09:52:43 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 17 09:52:43 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (53 commits)\n m68knommu: Make PAGE_SIZE available to assembly files.\n m68knommu: fix ColdFire definition of CLOCK_TICK_RATE\n m68knommu: set multi-function pins for ethernet when enabled\n m68knommu: remove special interrupt handling code for ne2k support\n m68knommu: relax IO_SPACE_LIMIT setting\n m68knommu: remove ColdFire direct interrupt register access\n m68knommu: create a speciailized ColdFire 5272 interrupt controller\n m68knommu: add support for second interrupt controller of ColdFire 5249\n m68knommu: clean up old ColdFire timer irq setup\n m68knommu: map ColdFire interrupts to correct masking bits\n m68knommu: clean up ColdFire 532x CPU timer setup\n m68knommu: simplify ColdFire \"timers\" clock initialization\n m68knommu: support code to mask external interrupts on old ColdFire CPU\u0027s\n m68knommu: merge old ColdFire interrupt controller masking macros\n m68knommu: remove duplicate ColdFire mcf_autovector() code\n m68knommu: move ColdFire INTC definitions to new include file\n m68knommu: mask off all interrupts in ColdFire intc-simr controller\n m68knommu: remove timer device interrupt setup for ColdFire 532x\n m68knommu: remove interrupt masking from ColdFire pit timer\n m68knommu: remove unecessary interrupt level setting in ColdFire 520x setup\n ...\n" }, { "commit": "2985709d7f3078c7609ae7f16affc0fb478d7d7a", "tree": "26ab2bf000bd6a251ae6ab13eaeb9e214199b968", "parents": [ "2756730b798e4f1f8343cf034c33cc730ae3a5d4" ], "author": { "name": "Tim Abbott", "email": "tabbott@ksplice.com", "time": "Mon Sep 07 17:26:49 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:57 2009 +1000" }, "message": "m68knommu: Make PAGE_SIZE available to assembly files.\n\nSigned-off-by: Tim Abbott \u003ctabbott@ksplice.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "2756730b798e4f1f8343cf034c33cc730ae3a5d4", "tree": "81950822aa9652dfae82a1481b6671769ab0add1", "parents": [ "14c16db3906ba9453e9c786323f872e11fd0f48d" ], "author": { "name": "Philippe De Muyter", "email": "phdm@macqel.be", "time": "Wed Aug 12 16:35:28 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:56 2009 +1000" }, "message": "m68knommu: fix ColdFire definition of CLOCK_TICK_RATE\n\nThe good definition of CLOCK_TICK_RATE for coldfires has been lost in the\nmerge of m68k and m68knommu include files. Restore it. Culprit :\ncommit ebafc17468d58bd903c886175ca84a4edc69ae1d\n\nSigned-off-by: Philippe De Muyter \u003cphdm@macqel.be\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "d89395babbe811811e70c6ee3465e3b60c0cdc11", "tree": "d72b9fd1dc591496a2c73d0a0aa5953eff7a99e7", "parents": [ "fe84c1087a6e2e76396cd4003a525c3110354ad0" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Aug 12 11:35:49 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:55 2009 +1000" }, "message": "m68knommu: remove special interrupt handling code for ne2k support\n\nThe improved interrupt support for ColdFire CPU cores means we no\nlonger need all the interrupt setup and ack hacks to support the NE2000\ndriver on ColdFire platforms. Remove all that code.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "fe84c1087a6e2e76396cd4003a525c3110354ad0", "tree": "03f111b3d6095e2da772e97fe3b22c80d253af34", "parents": [ "49802967cb7ec4f36a64e192108babe1c3b67e8e" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue Aug 11 16:33:51 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:55 2009 +1000" }, "message": "m68knommu: relax IO_SPACE_LIMIT setting\n\nThere is really no limit to the addresses which can be used by the\nin*() and out*() family of IO space calls in m68k non-MMU environments.\nSo don\u0027t impose an artificial address limit, allow the full 32bit range.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "9075216d2c8761c91dc268125f6580af3ffc58b5", "tree": "95df9112cacda86d5fc7603b0e83bd88abdfde45", "parents": [ "da3601a5fa664c8d51383fe916d96bd4fbce84b8" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue Jul 07 09:39:11 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:54 2009 +1000" }, "message": "m68knommu: create a speciailized ColdFire 5272 interrupt controller\n\nThe ColdFire 5272 CPU has a very different interrupt controller than\nany of the other ColdFire parts. It needs its own controller code to\ncorrectly setup and ack interrupts.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "da3601a5fa664c8d51383fe916d96bd4fbce84b8", "tree": "83ee5d4e283cfdd11e83bdb7c739b5ccbeb9264a", "parents": [ "3945ca0f84fee3fe564189fe8cf8f02491d19622" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Fri May 22 14:16:39 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:53 2009 +1000" }, "message": "m68knommu: add support for second interrupt controller of ColdFire 5249\n\nThe ColdFire 5249 CPU has a second (compleletly different) interrupt\ncontroller. It is the only ColdFire CPU that has this type. It controlls\nGPIO interrupts amongst a number of interrupts from other internal\nperipherals. Add support code for it.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "39f0fb6a3448cfc316e0d5295ed1b121db50037e", "tree": "657db8073835e8d499708a898a36f1d3a1e39a32", "parents": [ "f6a66276f5fdc018d2a9378c71de3bae13c588d7" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Fri May 22 13:33:35 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:52 2009 +1000" }, "message": "m68knommu: map ColdFire interrupts to correct masking bits\n\nThe older simple ColdFire interrupt controller has no one-to-one mapping\nof interrupt numbers to bits in the interrupt mask register. Create a\nmapping array that each ColdFire CPU type can populate with its available\ninterrupts and the bits that each use in the interrupt mask register.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "f6a66276f5fdc018d2a9378c71de3bae13c588d7", "tree": "5a6148447a9d7b379e31fc4d0b6ddedcc189f80a", "parents": [ "04b75b10dceadf937e3707ecc3dfccf6a076fd29" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue May 19 15:00:01 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:52 2009 +1000" }, "message": "m68knommu: clean up ColdFire 532x CPU timer setup\n\nThe newer ColdFire 532x family of CPU\u0027s uses the old timer, but has a\nnewer interrupt controller. It doesn\u0027t need the special timer setup\nthat was required when using the older interrupt controller. Remove the\ndead timer irq and level setting code, and define the hard coded vector.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "04b75b10dceadf937e3707ecc3dfccf6a076fd29", "tree": "87965d12b8f7eb622efd1d36bebd2a7b8a26452e", "parents": [ "f9311f26434cea3e926f56ca2aa3e5740e962c72" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue May 19 14:52:40 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:51 2009 +1000" }, "message": "m68knommu: simplify ColdFire \"timers\" clock initialization\n\nThe ColdFire \"timers\" clock setup can be simplified. There is really no\nneed for the flexible per-platform setup code. The clock interrupt can be\nhard defined per CPU platform (in CPU include files). This makes the\nactual timer code simpler.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "f2154bef817ac3d0ea67b52526fd8e88898b66f9", "tree": "3ffa5cf5c3ec82a59f75728a580bd9332a32ebee", "parents": [ "5187995f0a9253e915dfee83684eae7b692213e6" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue May 19 14:38:08 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:50 2009 +1000" }, "message": "m68knommu: merge old ColdFire interrupt controller masking macros\n\nCurrently the code that supports setting the old style ColdFire interrupt\ncontroller mask registers is macros in the include files of each of the\nCPU types. Merge all these into a set of real masking functions in the\nold Coldfire interrupt controller code proper. All the macros are basically\nthe same (excepting a register size difference on really early parts).\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "5938084bd8843490a4493d19fb108df70d87df2d", "tree": "9f63d02cf26ae38723a3eb7282ccb84565b3556d", "parents": [ "e47cc3d6acacffdc673779a44c21a4a12b20db23" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue May 19 13:56:44 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:49 2009 +1000" }, "message": "m68knommu: move ColdFire INTC definitions to new include file\n\nCreate an mcfintc.h include file with the definitions for the old style\nColdFire interrupt controller. They are only needed on CPU\u0027s that use\nthis old controller - so isolate them on their own.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "e47cc3d6acacffdc673779a44c21a4a12b20db23", "tree": "c9ee91eaa1dcd12092e56b84deac38eae921e551", "parents": [ "91b1b94f88219ea1b747264f4f6995a1202566cb" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed May 06 14:28:25 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:48 2009 +1000" }, "message": "m68knommu: mask off all interrupts in ColdFire intc-simr controller\n\nThe ColdFire intc-simr interrupt controller should mask off all\ninterrupt sources at init time. Doing it here instead of separately\nin each platform setup.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "f1a59d244abd8d7b94b90f45ee5e0988e5a154cb", "tree": "7e809b6d848ff9a4a9b9618c9e4df338d055c860", "parents": [ "a3d9bf1dfdaf6f7df6c5340521dff1aafe39393f" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed May 06 11:36:00 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:47 2009 +1000" }, "message": "m68knommu: remove interrupt masking from ColdFire pit timer\n\nWith proper interrupt controller code in place there is no need for\ndevices like the timers to have custom interrupt masking code.\nRemove it (and the defines that go along with it).\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "277c5e3e26cac45010f57a581c56476639b2cfa0", "tree": "fbc4465582bba19a2045eb72c870cde044a5f558", "parents": [ "1f946533bb562f5144752ea583cac45e9410fdaa" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Apr 29 12:07:13 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:42 2009 +1000" }, "message": "m68knommu: general interrupt controller for ColdFire 532x parts\n\nThe ColdFire 532x family of parts uses 2 of the same INTC interrupt\ncontrolers used in the ColdFire 520x family. So modify the code to\nsupport both parts. The extra code for the second INTC controler in\nthe case of the 520x is easily optimized away to nothing.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "cd3dd4068db5e1258a14b63e0feaf0332640d896", "tree": "07b28dab223d4a19eedb517d2792aba7753ecb0b", "parents": [ "584320156b7e42e74105ca78bdf895d2b0269251" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Mon Apr 27 15:09:29 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:39 2009 +1000" }, "message": "m68knommu: use general interrupt controller for ColdFire 520x family\n\nCreate general interrupt controller code for the ColdFire 520x family,\nthat does proper masking and unmasking of interrupts. With this in\nplace some of the driver hacks in place to support ColdFire interrupts\ncan finally go away.\n\nWithin the ColdFire family there is a variety of different interrupt\ncontrollers in use. Some are used on multiple parts, some on only one.\nThere is quite some differences in some varients, so much so that\ncommon code for all ColdFire parts would be impossible.\n\nThis commit introduces code to support one of the newer interrupt\ncontrollers in the ColdFire 5208 and 5207 parts. It has very simple\nmask and unmask operations, so is one of the easiest to support.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "584320156b7e42e74105ca78bdf895d2b0269251", "tree": "a4566124db5986158baaedd267230add81014c63", "parents": [ "cba89e231f97139dc6013030210624efd1087f68" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Aug 05 14:02:48 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:38 2009 +1000" }, "message": "m68k: clean up comment delimiters in dma.h\n\nChange C99 style comments to traditional K\u0026R style.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "cba89e231f97139dc6013030210624efd1087f68", "tree": "51a1c248e3188f171526b1df88f86b3dc7cd64f0", "parents": [ "6192c1ea0ac5806592c5c9cc2b2b94b0298df02b" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Fri Jun 12 15:11:17 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:38 2009 +1000" }, "message": "m68k: merge mmu and non-mmu versions of dma.h\n\nThe non-mmu version of dma.h contains a lot of ColdFire specific DMA\nsupport, but also all of the base m68k support. So use the non-mmu\nversion of dma.h for all.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "6192c1ea0ac5806592c5c9cc2b2b94b0298df02b", "tree": "456489cbe5ffa011c294f84558aa1bf5d512a829", "parents": [ "3ddc7e261a990d03fa4e78e37e6623ca45b18d77" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jul 02 16:11:58 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:37 2009 +1000" }, "message": "m68k: merge the mmu and non-mmu versions of checksum.h\n\nThe mmu and non-mmu versions of checksum.h are mostly the same,\nmerge them.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "3ddc7e261a990d03fa4e78e37e6623ca45b18d77", "tree": "95d143a7cf1b8acc0bbb8e442497895caf0b2e54", "parents": [ "633ea5d78b8b01ba903aeaae10297033830a52dd" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Fri Jun 26 16:51:05 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:37 2009 +1000" }, "message": "m68k: merge mmu and non-mmu versions of irq.h\n\nIt is reasonably strait forward to merge the mmu and non-mmu versions\nof irq.h. Most of the defines and structs are not needed on non-mmu.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "633ea5d78b8b01ba903aeaae10297033830a52dd", "tree": "8163ccf61b8fd3d1a22ce8150ed4c3a987a94fb1", "parents": [ "d668bf0a0d73daea4eaaf748435752f52cc077aa" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Apr 23 11:03:20 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:36 2009 +1000" }, "message": "m68k: merge mmu and non-mmu versions of processor.h\n\nThe mmu and non-mmu versions of processor.h have a lot of common code.\nThis is a strait forward merge. start_thread() could be improved, but\nthat is not quite as strait forward, leaving for a follow on change.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "d668bf0a0d73daea4eaaf748435752f52cc077aa", "tree": "2f0d7effbaa82ee6cb11e4f5495001f8e7578e48", "parents": [ "f3aa42c6b26f502f6502ea2e07908d5768a3dd35" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Tue Aug 04 16:52:44 2009 +0200" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:36 2009 +1000" }, "message": "m68knommu: convert to asm-generic/hardirq.h\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "f3aa42c6b26f502f6502ea2e07908d5768a3dd35", "tree": "27e5fad440f0e5e7f71d74683996ea7dae80e1c7", "parents": [ "c573b29baf3e1b71a60ee6de76dd28c9c49fb87f" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Sat Jul 04 00:13:57 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:35 2009 +1000" }, "message": "m68k: remove unused elia.h include file\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "d7e9660ad9d5e0845f52848bce31bcf5cdcdea6b", "tree": "c6c67d145771187b194d79d603742b31090a59d6", "parents": [ "b8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca", "13af7a6ea502fcdd4c0e3d7de6e332b102309491" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 14 10:37:28 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 14 10:37:28 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits)\n netxen: update copyright\n netxen: fix tx timeout recovery\n netxen: fix file firmware leak\n netxen: improve pci memory access\n netxen: change firmware write size\n tg3: Fix return ring size breakage\n netxen: build fix for INET\u003dn\n cdc-phonet: autoconfigure Phonet address\n Phonet: back-end for autoconfigured addresses\n Phonet: fix netlink address dump error handling\n ipv6: Add IFA_F_DADFAILED flag\n net: Add DEVTYPE support for Ethernet based devices\n mv643xx_eth.c: remove unused txq_set_wrr()\n ucc_geth: Fix hangs after switching from full to half duplex\n ucc_geth: Rearrange some code to avoid forward declarations\n phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs\n drivers/net/phy: introduce missing kfree\n drivers/net/wan: introduce missing kfree\n net: force bridge module(s) to be GPL\n Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded\n ...\n\nFixed up trivial conflicts:\n\n - arch/x86/include/asm/socket.h\n\n converted to \u003casm-generic/socket.h\u003e in the x86 tree. The generic\n header has the same new #define\u0027s, so that works out fine.\n\n - drivers/net/tun.c\n\n fix conflict between 89f56d1e9 (\"tun: reuse struct sock fields\") that\n switched over to using \u0027tun-\u003esocket.sk\u0027 instead of the redundantly\n available (and thus removed) \u0027tun-\u003esk\u0027, and 2b980dbd (\"lsm: Add hooks\n to the TUN driver\") which added a new \u0027tun-\u003esk\u0027 use.\n\n Noted in \u0027next\u0027 by Stephen Rothwell.\n" }, { "commit": "732c611e5bbb76201397297f834dddd5ab684b05", "tree": "395c1a7f4733961544b608ca60cda7a50f7bdbfa", "parents": [ "dca7cf33bb5c98187ffcc849652b1b2c4c8a0c25" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:12 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:24 2009 +1000" }, "message": "generic GPIO support misc files.\n\nThe definition of MCFSIM_PADDR and MCFSIM_PADAT now has MCF_BAR already added in.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "dca7cf33bb5c98187ffcc849652b1b2c4c8a0c25", "tree": "d91d87cbf054a8f02da1cfa3cfb27ab2b14dc52a", "parents": [ "7846fe800a81adae1e28d9d035b5226f75358280" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:11 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:24 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 5407.\n\nAdd support for the 5407.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "7846fe800a81adae1e28d9d035b5226f75358280", "tree": "ef9d2f48acb2bf5c916af71643723bc4f6f420f4", "parents": [ "f7a20ba06435d067247bd50a15a1d550b9b3fc7d" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:10 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:23 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 532x.\n\nAdd support for the 532x.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "f7a20ba06435d067247bd50a15a1d550b9b3fc7d", "tree": "5b92e1f95b6052ffaac959750d6b8d3c520e33be", "parents": [ "6da6e63c96f5fc8a92b6d1d6f12c2bf998588ffe" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:09 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:23 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 5307.\n\nAdd support for the 5307.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "6da6e63c96f5fc8a92b6d1d6f12c2bf998588ffe", "tree": "0245cc03353af24b2c84ac7f8d394ba257592861", "parents": [ "316f2c483c32e9385329303258d12e6e33892af5" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:08 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:23 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 528x.\n\nAdd support for the 528x.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "316f2c483c32e9385329303258d12e6e33892af5", "tree": "dee9cb00d46899a392a62ad3c1c9f003cd631326", "parents": [ "f1554da34f11518bde33776c292c1b58fc20f073" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:07 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:23 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 5272.\n\nAdd support for the 5272.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "f1554da34f11518bde33776c292c1b58fc20f073", "tree": "87e2ff94bbdf9c5172df7f976a581e2aff0d13fd", "parents": [ "9e8ded166dcc7831ee6f31f8a0937cd9b58e83b0" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:06 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:23 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 527x.\n\nAdd support for the 5271 \u0026 5275.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "9e8ded166dcc7831ee6f31f8a0937cd9b58e83b0", "tree": "1cc871251322ea0c426ed084a5a2fef9906ae74d", "parents": [ "a03ce7d9ef05e145ef706f99e68d5ffacf0ad325" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:05 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:22 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 5249.\n\nAdd support for the 5249.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "a03ce7d9ef05e145ef706f99e68d5ffacf0ad325", "tree": "f654f0374276f65f9d61f80204b81949d1845168", "parents": [ "afde8560b4217338c17b7dbc9e9d7676c1b3a5ff" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:04 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:22 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 523x.\n\nAdd support for the 523x.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "afde8560b4217338c17b7dbc9e9d7676c1b3a5ff", "tree": "af262b5b77e26894b4c5a2d814cc3b26847dd334", "parents": [ "24a1836ecd471409aeb5362f63032126ebe7fb10" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:03 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:22 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 520x.\n\nAdd support for the 520x.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "bc25b057fa0a0e4754b7e2524c509874649d11ae", "tree": "40770e923309ff514def91e8e9adcd6d71c4f81b", "parents": [ "af39bb8b07af83b579c90c09ba3943123cdb4132" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:01 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:22 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 5206.\n\nAdd support for the 5206.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "af39bb8b07af83b579c90c09ba3943123cdb4132", "tree": "8c1965a7a7d6ba09344549410e3ee476af8ffb1d", "parents": [ "74fca6a42863ffacaf7ba6f1936a9f228950f657" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:00 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:22 2009 +1000" }, "message": "core generic GPIO support for Freescale Coldfire processors.\n\nThis adds the basic infrastructure used by all of the different Coldfire CPUs.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "96910b6dc8a4fdb75e69f09f47b62d41743d36ba", "tree": "8d01dc59f7b4d9fa5d716582fcbbf1e73c4323f5", "parents": [ "b62e180cae6bd82e246d871a1e44e03f8019d421" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon Aug 31 14:43:34 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Sep 01 09:38:03 2009 +0200" }, "message": "locking, m68k/asm-offsets: Rename signal defines\n\nIn order to be able to use asm-offsets.h in C files the\nexisting namespace conflicts must be solved first. In\nasm-offsets.h there are defines for signal constants, so they\ncan be used in assembler files.\n\nUnfortunately the existing defines use a 1:1 mapping for the\nmacro names which results in name space conflicts if the header\nfile would also be used in C files. So rename the created\ndefines and add an \"L\" prefix to each one since that has\nalready been done for the SIGTRAP define in entry_mm.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Horst Hartmann \u003chorsth@linux.vnet.ibm.com\u003e\nCc: Christian Ehrhardt \u003cehrhardt@linux.vnet.ibm.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nLKML-Reference: \u003c20090831124416.998821502@de.ibm.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0ee000e5e8fa2e5c760250be0d78d5906e3eb94b", "tree": "7c3d253b2e6d89bdae8c1fbe86baa17b080efcce", "parents": [ "f159ee782990aacb5494738c98f13a2aa61dbb4a" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon Aug 31 14:43:35 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 31 18:08:49 2009 +0200" }, "message": "locking, m68k: Calculate thread_info offset with asm offset\n\nm68k has the thread_info structure embedded in its task struct.\nTherefore its not possible to implement current_thread_info()\nby looking at the stack pointer and do some simple calculations\nlike most other architectures do it.\n\nTo return the thread_info pointer for a task two defines are\nused. This works until the spinlock function bodies get moved\ninto an own header file and CONFIG_SPINLOCK_DEBUG is turned on.\nThat results into this compile error:\n\n In file included from include/linux/spinlock.h:378,\n from include/linux/seqlock.h:29,\n from include/linux/time.h:8,\n from include/linux/timex.h:56,\n from include/linux/sched.h:54,\n from arch/m68k/kernel/asm-offsets.c:12:\n include/linux/spinlock_api_smp.h: In function \u0027__spin_unlock_irq\u0027:\n include/linux/spinlock_api_smp.h:371: error: \u0027current\u0027 undeclared (first use in this function)\n include/linux/spinlock_api_smp.h:371: error: (Each undeclared identifier is reported only once\n include/linux/spinlock_api_smp.h:371: error: for each function it appears in.)\n\nIncluding asm/current.h to asm-offsets.c wouldn\u0027t help since\nthe definition of struct task is needed. So we end up with ugly\nheader file include dependencies.\n\nTo solve this calculate the offset of the thread_info structure\ninto the task struct in asm-offsets.h and use the offset in\ntask_thread_info(). This works just like it does for IA64 as\nwell.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Horst Hartmann \u003chorsth@linux.vnet.ibm.com\u003e\nCc: Christian Ehrhardt \u003cehrhardt@linux.vnet.ibm.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nLKML-Reference: \u003c20090831124417.329662275@de.ibm.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "f159ee782990aacb5494738c98f13a2aa61dbb4a", "tree": "e9372adeb764c93c5f89d5ec287647930abc4ee8", "parents": [ "9f34ceb60357a7166c929d7b52bd057ad7ffc54b" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon Aug 31 14:43:33 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 31 18:08:49 2009 +0200" }, "message": "locking, m68k/asm-offsets: Rename pt_regs offset defines\n\nIn order to be able to use asm-offsets.h in C files the\nexisting namespace conflicts must be solved first. In\nasm-offsets.h e.g. PT_D0 gets defined which is the offset of\nthe d0 member of the pt_regs structure. However a same define\n(with a different meaning) exists in asm/ptregs.h.\n\nSo rename the defines created with the asm-offset mechanism to\nPT_OFF_D0 etc. There also already exist a few defines with\nthese names that have the same meaning. So remove the existing\ndefines and use the asm-offset generated ones.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Horst Hartmann \u003chorsth@linux.vnet.ibm.com\u003e\nCc: Christian Ehrhardt \u003cehrhardt@linux.vnet.ibm.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nLKML-Reference: \u003c20090831124416.666403991@de.ibm.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9848484fad9ddeb18f18f02f9ecdcd330ac9a216", "tree": "886e36a007734c46318dc00e75213271db89a6c4", "parents": [ "9fd926b4ab1e38ac5e3eb3ba0afb56726d90aa88" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Fri Aug 21 22:03:54 2009 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Aug 26 23:14:50 2009 +0200" }, "message": "m68k,m68knommu: Wire up rt_tgsigqueueinfo and perf_counter_open\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "9fd926b4ab1e38ac5e3eb3ba0afb56726d90aa88", "tree": "f40de3049c6d25732dfd844b4cb703629899da32", "parents": [ "dc71c7d5dbd8cd8bb6e3b548ddc0454b64ded5f8" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Thu Jul 09 17:08:38 2009 +0400" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Aug 26 23:14:49 2009 +0200" }, "message": "m68k: Fix redefinition of pgprot_noncached\n\narch/m68k/include/asm/pgtable_mm.h:148:1: warning: \"pgprot_noncached\" redefined\nIn file included from arch/m68k/include/asm/pgtable_mm.h:138,\n from arch/m68k/include/asm/pgtable.h:4,\n from include/linux/mm.h:40,\n from include/linux/pagemap.h:7,\n from include/linux/blkdev.h:12,\n from arch/m68k/emu/nfblock.c:17:\ninclude/asm-generic/pgtable.h:133:1: warning: this is the location of the previous definition\n\npgprot_noncached() should be defined _before_ including asm-generic/pgtable.h\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "dc71c7d5dbd8cd8bb6e3b548ddc0454b64ded5f8", "tree": "37d1074eca97e47d9c4f6ae2ca13037019efa095", "parents": [ "dd9b3e84f2095ed19582f4df5d20e1e40c01ca3c" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Jun 17 13:13:58 2009 -0700" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Aug 26 23:14:49 2009 +0200" }, "message": "arch/m68k/include/asm/motorola_pgalloc.h: fix kunmap arg\n\narch/m68k/include/asm/motorola_pgalloc.h: In function \u0027pte_alloc_one\u0027:\narch/m68k/include/asm/motorola_pgalloc.h:44: warning: passing argument 1 of \u0027kunmap\u0027 from incompatible pointer type\n\nAlso, remove unneeded test for kmap() failure.\n\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "aa11d958d1a6572eda08214d7c6a735804fe48a5", "tree": "d025b05270ad1e010660d17eeadc6ac3c1abbd7d", "parents": [ "07f6642ee9418e962e54cbc07471cfe2e559c568", "9799218ae36910af50f002a5db1802d576fffb43" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 12 17:44:53 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 12 17:44:53 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tarch/microblaze/include/asm/socket.h\n" }, { "commit": "0d6038ee76f2e06b79d0465807f67e86bf4025de", "tree": "ffb88e2f817ae2a76fece58a7f7d0de3fd37fbaf", "parents": [ "49c794e94649020248e37b78db16cd25bad38b4f" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue Aug 04 07:28:29 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 05 13:02:57 2009 -0700" }, "message": "net: implement a SO_DOMAIN getsockoption\n\nThis sockopt goes in line with SO_TYPE and SO_PROTOCOL. It makes it\npossible for userspace programs to pass around file descriptors — I\nam referring to arguments-to-functions, but it may even work for the\nfd passing over UNIX sockets — without needing to also pass the\nauxiliary information (PF_INET6/IPPROTO_TCP).\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "49c794e94649020248e37b78db16cd25bad38b4f", "tree": "76c455522d37fa0fa88c7466bb494523cb320fab", "parents": [ "c1c00ab8626298ac784ea344bf10e94b5bd9bcb5" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue Aug 04 07:28:28 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 05 13:02:56 2009 -0700" }, "message": "net: implement a SO_PROTOCOL getsockoption\n\nSimilar to SO_TYPE returning the socket type, SO_PROTOCOL allows to\nretrieve the protocol used with a given socket.\n\nI am not quite sure why we have that-many copies of socket.h, and why\nthe values are not the same on all arches either, but for where hex\nnumbers dominate, I use 0x1029 for SO_PROTOCOL as that seems to be\nthe next free unused number across a bunch of operating systems, or\nso Google results make me want to believe. SO_PROTOCOL for others\njust uses the next free Linux number, 38.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e1b32caa525cb236e80e9c671e179bcecccc657", "tree": "8a1f0abf5291b23047cfdf099d5cfc96cc9d9253", "parents": [ "4be3bd7849165e7efa6b0b35a23d6a3598d97465" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 22 15:44:28 2009 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 27 12:10:38 2009 -0700" }, "message": "mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()\n\nmm: Pass virtual address to [__]p{te,ud,md}_free_tlb()\n\nUpcoming paches to support the new 64-bit \"BookE\" powerpc architecture\nwill need to have the virtual address corresponding to PTE page when\nfreeing it, due to the way the HW table walker works.\n\nBasically, the TLB can be loaded with \"large\" pages that cover the whole\nvirtual space (well, sort-of, half of it actually) represented by a PTE\npage, and which contain an \"indirect\" bit indicating that this TLB entry\nRPN points to an array of PTEs from which the TLB can then create direct\nentries. Thus, in order to invalidate those when PTE pages are deleted,\nwe need the virtual address to pass to tlbilx or tlbivax instructions.\n\nThe old trick of sticking it somewhere in the PTE page struct page sucks\ntoo much, the address is almost readily available in all call sites and\nalmost everybody implemets these as macros, so we may as well add the\nargument everywhere. I added it to the pmd and pud variants for consistency.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e [MN10300 \u0026 FRV]\nAcked-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nAcked-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e [s390]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c99e6efe1ba04561e7d93a81f0be07e37427e835", "tree": "8a1743463ef9676e68b9c3971f0bbeea04111bdd", "parents": [ "2a6f86bc5ed4af2ff04bc927eb77789c70e53a1e" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Jul 10 14:57:56 2009 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 10 14:24:05 2009 -0700" }, "message": "sched: INIT_PREEMPT_COUNT\n\nPull the initial preempt_count value into a single\ndefinition site.\n\nMaintainers for: alpha, ia64 and m68k, please have a look,\nyour arch code is funny.\n\nThe header magic is a bit odd, but similar to the KERNEL_DS\none, CPP waits with expanding these macros until the\nINIT_THREAD_INFO macro itself is expanded, which is in\narch/*/kernel/init_task.c where we\u0027ve already included\nsched.h so we\u0027re good.\n\nCc: tony.luck@intel.com\nCc: rth@twiddle.net\nCc: geert@linux-m68k.org\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e4c9dd0fbad60c098a026e9b06d9de1bc98c5e89", "tree": "033fd4035f0bcab64a0215d1a0b0f868c8b4de32", "parents": [ "b8d9a86590fb334d28c5905a4c419ece7d08e37d" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Jun 16 15:33:47 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:47:51 2009 -0700" }, "message": "kmap_types: make most arches use generic header file\n\nConvert most arches to use asm-generic/kmap_types.h.\n\nMove the KM_FENCE_ macro additions into asm-generic/kmap_types.h,\ncontrolled by __WITH_KM_FENCE from each arch\u0027s kmap_types.h file.\n\nWould be nice to be able to add custom KM_types per arch, but I don\u0027t yet\nsee a nice, clean way to do that.\n\nBuilt on x86_64, i386, mips, sparc, alpha(tonyb), powerpc(tonyb), and\n68k(tonyb).\n\nNote: avr32 should be able to remove KM_PTE2 (since it\u0027s not used) and\nthen just use the generic kmap_types.h file. Get avr32 maintainer\napproval.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Bryan Wu \u003ccooloney@kernel.org\u003e\nCc: Mikael Starvik \u003cstarvik@axis.com\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: \"Luck Tony\" \u003ctony.luck@intel.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cd166bd0dde265a97dd9aa8e3451a2646d96d04b", "tree": "3a7fb5b8bb8d7676e804845b75977be380b8dcff", "parents": [ "6b702462cbe5b6f372966a53f4465d745d86b65c", "5b02ee3d219f9e01b6e9146e25613822cfc2e5ce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 12 18:15:51 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 12 18:15:51 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:\n add generic lib/checksum.c\n asm-generic: add a generic uaccess.h\n asm-generic: add generic NOMMU versions of some headers\n asm-generic: add generic atomic.h and io.h\n asm-generic: add legacy I/O header files\n asm-generic: add generic versions of common headers\n asm-generic: make bitops.h usable\n asm-generic: make pci.h usable directly\n asm-generic: make get_rtc_time overridable\n asm-generic: rename page.h and uaccess.h\n asm-generic: rename atomic.h to atomic-long.h\n asm-generic: add a generic unistd.h\n asm-generic: add generic ABI headers\n asm-generic: add generic sysv ipc headers\n asm-generic: introduce asm/bitsperlong.h\n asm-generic: rename termios.h, signal.h and mman.h\n" }, { "commit": "1380a37e3da5d9e14ea5c2a4c6ab2b307a2798ea", "tree": "d3f29c303e4b10180d18b2159b9e04e3b4354d55", "parents": [ "08687aec71bc9134fe336e561f6877bacf74fc0a" ], "author": { "name": "Magnus Damm", "email": "damm@igel.co.jp", "time": "Fri May 15 00:52:00 2009 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Jun 12 21:32:31 2009 +0200" }, "message": "PM: Remove unused asm/suspend.h\n\nThis patch removes unused asm/suspend.h files for\nthe following architectures:\n\n alpha, arm, ia64, m68k, mips, s390, um\n\nSigned-off-by: Magnus Damm \u003cdamm@igel.co.jp\u003e\nAcked-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "5b02ee3d219f9e01b6e9146e25613822cfc2e5ce", "tree": "7ce9126738c3cf4b37d67170d0e4b34818c057a9", "parents": [ "26a28fa4fea5b8c65713aa50c124f76a88c7924d", "8ebf975608aaebd7feb33d77f07ba21a6380e086" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 12 09:53:47 2009 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 12 11:32:58 2009 +0200" }, "message": "asm-generic: merge branch \u0027master\u0027 of torvalds/linux-2.6\n\nFixes a merge conflict against the x86 tree caused by a fix to\natomic.h which I renamed to atomic_long.h.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "5b17e1cd8928ae65932758ce6478ac6d3e9a86b2", "tree": "065b3adc60a74ce0b3e3cd0fc447b8688b6d0332", "parents": [ "72099ed2719fc5829bd79c6ca9d1783ed026eb37" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 13 22:56:30 2009 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@klappe2.(none)", "time": "Thu Jun 11 21:02:17 2009 +0200" }, "message": "asm-generic: rename page.h and uaccess.h\n\nThe current asm-generic/page.h only contains the get_order\nfunction, and asm-generic/uaccess.h only implements\nunaligned accesses. This renames the file to getorder.h\nand uaccess-unaligned.h to make room for new page.h\nand uaccess.h file that will be usable by all simple\n(e.g. nommu) architectures.\n\nSigned-off-by: Remis Lima Baima \u003cremis.developer@googlemail.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" } ], "next": "72099ed2719fc5829bd79c6ca9d1783ed026eb37" }