)]}' { "log": [ { "commit": "451a3c24b0135bce54542009b5fde43846c7cf67", "tree": "f0fbbcc155aef2a1ffcb8aa593fe7a966d0e6900", "parents": [ "55f6561c6941713ab5ae9180525b026dd40b7d14" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed Nov 17 16:26:55 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Nov 17 08:59:32 2010 -0800" }, "message": "BKL: remove extraneous #include \u003csmp_lock.h\u003e\n\nThe big kernel lock has been removed from all these files at some point,\nleaving only the #include.\n\nRemove this too as a cleanup.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "51399a391940e676877c7a791138081f13a0bab7", "tree": "6caefb858ee4b31172b85ec7bcedb826a29a551b", "parents": [ "b779b332d0e1ef68f40867948ae5526a3e925163", "df4d303647ebe5e2f7e473e32ccef9f8549e9d45" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 28 16:16:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 28 16:16:39 2010 -0700" }, "message": "Merge branch \u0027kconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6\n\n* \u0027kconfig\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (38 commits)\n kbuild: convert `arch/tile\u0027 to the kconfig mainmenu upgrade\n README: cite nconfig\n Revert \"kconfig: Temporarily disable dependency warnings\"\n kconfig: Use PATH_MAX instead of 128 for path buffer sizes.\n kconfig: Fix realloc usage()\n kconfig: Propagate const\n kconfig: Don\u0027t go out from read config loop when you read new symbol\n kconfig: fix menuconfig on debian lenny\n kbuild: migrate all arch to the kconfig mainmenu upgrade\n kconfig: expand file names\n kconfig: use the file\u0027s name of sourced file\n kconfig: constify file name\n kconfig: don\u0027t emit warning upon rootmenu\u0027s prompt redefinition\n kconfig: replace KERNELVERSION usage by the mainmenu\u0027s prompt\n kconfig: delay gconf window initialization\n kconfig: expand by default the rootmenu\u0027s prompt\n kconfig: add a symbol string expansion helper\n kconfig: regen parser\n kconfig: implement the `mainmenu\u0027 directive\n kconfig: allow PACKAGE to be defined on the compiler\u0027s command-line\n ...\n\nFix up trivial conflict in arch/mn10300/Kconfig\n" }, { "commit": "81d3285c96dd90044ffe2c2c5d56405a5423d753", "tree": "4b592e4d2f4d51b3a89a95d77bebb0fbc77133ab", "parents": [ "475a4b813816fe9af4cdf7833799036b679f46d0" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Wed Oct 27 15:33:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 27 18:03:10 2010 -0700" }, "message": "ptrace: cleanup arch_ptrace() on frv\n\nUse new \u0027regno\u0027, \u0027datap\u0027 variables in order to remove duplicated\nexpressions and unnecessary castings. Alse remove checking @addr\nless than 0 because addr is now unsigned.\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: \"Daniel K.\" \u003cdk@uw.no\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9b05a69e0534ec70bc94921936ffa05b330507cb", "tree": "4116a7b7db286edf9486a29a7742d47fa67baa68", "parents": [ "9fed81dc40f5a1ac2783bcc78d4029873be72894" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Wed Oct 27 15:33:47 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 27 18:03:10 2010 -0700" }, "message": "ptrace: change signature of arch_ptrace()\n\nFix up the arguments to arch_ptrace() to take account of the fact that\n@addr and @data are now unsigned long rather than long as of a preceding\npatch in this series.\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "20273941f2129aa5a432796d98a276ed73d60782", "tree": "85da0d951ac10f239f81ad7f69559fdeb692095b", "parents": [ "a8e23a291852cd7c4fb5ca696dbb93912185ad10" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Wed Oct 27 15:32:58 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 27 18:03:05 2010 -0700" }, "message": "mm: fix race in kunmap_atomic()\n\nChristoph reported a nice splat which illustrated a race in the new stack\nbased kmap_atomic implementation.\n\nThe problem is that we pop our stack slot before we\u0027re completely done\nresetting its state -- in particular clearing the PTE (sometimes that\u0027s\nCONFIG_DEBUG_HIGHMEM). If an interrupt happens before we actually clear\nthe PTE used for the last slot, that interrupt can reuse the slot in a\ndirty state, which triggers a BUG in kmap_atomic().\n\nFix this by introducing kmap_atomic_idx() which reports the current slot\nindex without actually releasing it and use that to find the PTE and delay\nthe _pop() until after we\u0027re completely done.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nReported-by: Christoph Hellwig \u003chch@infradead.org\u003e\nAcked-by: Rik van Riel \u003criel@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": "ece0e2b6406a995c371e0311190631ea34ad851a", "tree": "726a516a91f5f7efe9dbb247ba28d019981d456e", "parents": [ "3e4d3af501cccdc8a8cca41bdbe57d54ad7e7e73" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Oct 26 14:21:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 26 16:52:08 2010 -0700" }, "message": "mm: remove pte_*map_nested()\n\nSince we no longer need to provide KM_type, the whole pte_*map_nested()\nAPI is now redundant, remove it.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3e4d3af501cccdc8a8cca41bdbe57d54ad7e7e73", "tree": "2ce507f7ec7275563653e52f18606aba4f99b7f1", "parents": [ "61ecdb801ef2cd28e32442383106d7837d76deac" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Tue Oct 26 14:21:51 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Oct 26 16:52:08 2010 -0700" }, "message": "mm: stack based kmap_atomic()\n\nKeep the current interface but ignore the KM_type and use a stack based\napproach.\n\nThe advantage is that we get rid of crappy code like:\n\n\t#define __KM_PTE\t\t\t\\\n\t\t(in_nmi() ? KM_NMI_PTE : \t\\\n\t\t in_irq() ? KM_IRQ_PTE :\t\\\n\t\t KM_PTE0)\n\nand in general can stop worrying about what context we\u0027re in and what kmap\nslots might be appropriate for that.\n\nThe downside is that FRV kmap_atomic() gets more expensive.\n\nFor now we use a CPP trick suggested by Andrew:\n\n #define kmap_atomic(page, args...) __kmap_atomic(page)\n\nto avoid having to touch all kmap_atomic() users in a single patch.\n\n[ not compiled on:\n - mn10300: the arch doesn\u0027t actually build with highmem to begin with ]\n\n[akpm@linux-foundation.org: coding-style fixes]\n[akpm@linux-foundation.org: fix up drivers/gpu/drm/i915/intel_overlay.c]\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Hugh Dickins \u003chughd@google.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Dave Airlie \u003cairlied@linux.ie\u003e\nCc: Li Zefan \u003clizf@cn.fujitsu.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "73ecf3a6e3f0206bf56a0fefe3b3eda042fb7034", "tree": "866f0ebb2b148479e93b5ac955097b1cc94ceb4e", "parents": [ "b9da0571050c09863e59f94d0b8594a290d61b88", "cd3ecad19aea8debae9a48b53de2ec7a571f24e9" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 19:59:04 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Oct 22 19:59:04 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6: (49 commits)\n serial8250: ratelimit \"too much work\" error\n serial: bfin_sport_uart: speed up sport RX sample rate to be 3% faster\n serial: abstraction for 8250 legacy ports\n serial/imx: check that the buffer is non-empty before sending it out\n serial: mfd: add more baud rates support\n jsm: Remove the uart port on errors\n Alchemy: Add UART PM methods.\n 8250: allow platforms to override PM hook.\n altera_uart: Don\u0027t use plain integer as NULL pointer\n altera_uart: Fix missing prototype for registering an early console\n altera_uart: Fixup type usage of port flags\n altera_uart: Make it possible to use Altera UART and 8250 ports together\n altera_uart: Add support for different address strides\n altera_uart: Add support for getting mapbase and IRQ from resources\n altera_uart: Add support for polling mode (IRQ-less)\n serial: Factor out uart_poll_timeout() from 8250 driver\n serial: mark the 8250 driver as maintained\n serial: 8250: Don\u0027t delay after transmitter is ready.\n tty: MAINTAINERS: add drivers/serial/jsm/ as maintained driver\n vcs: invoke the vt update callback when /dev/vcs* is written to\n ...\n" }, { "commit": "4735d234954342b8f0f6cb20ce9aa35ffe83e712", "tree": "b61255bac8d6653c587fe3536ada6184d84e7289", "parents": [ "8bc3372d9e57db3c65cf00cea6cf14969875b055" ], "author": { "name": "Jeff Mahoney", "email": "jeffm@suse.com", "time": "Fri Aug 20 17:14:05 2010 -0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Oct 22 10:20:00 2010 -0700" }, "message": "ioctl: Use asm-generic/ioctls.h on frv (enables termiox)\n\nThis patch converts frv to use asm-generic/ioctls.h instead of its\nown version.\n\nThe differences between the arch-specific version and the generic\nversion are as follows:\n\n- FRV defines its own value for FIOQSIZE, asm-generic/ioctls.h keeps it\n- FRV defines TIOCTTYGSTRUCT, kept in arch-specific version\n- The generic version provides TIOCGRS485 and TIOCSRS485 but they\n are unused by any driver available for this architecture.\n- The generic version adds support for termiox\n\nCc: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Jeff Mahoney \u003cjeffm@suse.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n" }, { "commit": "e36f561a2c88394ef2708f1ab300fe8a79e9f651", "tree": "385f378c4240955e4356d49686a8ef606a82a7c1", "parents": [ "70ada77920723fbc2b35e9b301022fb1e166b41b", "df9ee29270c11dba7d0fe0b83ce47a4d8e8d2101" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 21 14:37:27 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 21 14:37:27 2010 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-irqflags:\n Fix IRQ flag handling naming\n MIPS: Add missing #inclusions of \u003clinux/irq.h\u003e\n smc91x: Add missing #inclusion of \u003clinux/irq.h\u003e\n Drop a couple of unnecessary asm/system.h inclusions\n SH: Add missing consts to sys_execve() declaration\n Blackfin: Rename IRQ flags handling functions\n Blackfin: Add missing dep to asm/irqflags.h\n Blackfin: Rename DES PC2() symbol to avoid collision\n Blackfin: Split the BF532 BFIN_*_FIO_FLAG() functions to their own header\n Blackfin: Split PLL code from mach-specific cdef headers\n" }, { "commit": "e360adbe29241a0194e10e20595360dd7b98a2b3", "tree": "ef5fa5f50a895096bfb25bc11b25949603158238", "parents": [ "8e5fc1a7320baf6076391607515dceb61319b36a" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Thu Oct 14 14:01:34 2010 +0800" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Oct 18 19:58:50 2010 +0200" }, "message": "irq_work: Add generic hardirq context callbacks\n\nProvide a mechanism that allows running code in IRQ context. It is\nmost useful for NMI code that needs to interact with the rest of the\nsystem -- like wakeup a task to drain buffers.\n\nPerf currently has such a mechanism, so extract that and provide it as\na generic feature, independent of perf so that others may also\nbenefit.\n\nThe IRQ context callback is generated through self-IPIs where\npossible, or on architectures like powerpc the decrementer (the\nbuilt-in timer facility) is set to generate an interrupt immediately.\n\nArchitectures that don\u0027t have anything like this get to do with a\ncallback from the timer tick. These architectures can call\nirq_work_run() at the tail of any IRQ handlers that might enqueue such\nwork (like the perf IRQ handler) to avoid undue latencies in\nprocessing the work.\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nAcked-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\n[ various fixes ]\nSigned-off-by: Huang Ying \u003cying.huang@intel.com\u003e\nLKML-Reference: \u003c1287036094.7768.291.camel@yhuang-dev\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "239060b93bb30a4ad55f1ecaa512464a035cc5ba", "tree": "77f79810e57d4fc24356eca0cd6db463e8994128", "parents": [ "1408b15b98635a13bad2e2a50b3c2ae2ccdf625b", "e9203c988234aa512bd45ca32b52e21c7bbfc414" ], "author": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Tue Oct 12 15:09:06 2010 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Tue Oct 12 15:09:06 2010 +0200" }, "message": "Merge branch \u0027kbuild/rc-fixes\u0027 into kbuild/kconfig\n\nWe need to revert the temporary hack in 71ebc01, hence the merge.\n" }, { "commit": "df9ee29270c11dba7d0fe0b83ce47a4d8e8d2101", "tree": "0c9a87ef1ea042c4432f122c3d03614d21156fc1", "parents": [ "ca4d3e6746bdcfccb517349bce2d2c5b5614fb6f" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Oct 07 14:08:55 2010 +0100" }, "committer": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Oct 07 14:08:55 2010 +0100" }, "message": "Fix IRQ flag handling naming\n\nFix the IRQ flag handling naming. In linux/irqflags.h under one configuration,\nit maps:\n\n\tlocal_irq_enable() -\u003e raw_local_irq_enable()\n\tlocal_irq_disable() -\u003e raw_local_irq_disable()\n\tlocal_irq_save() -\u003e raw_local_irq_save()\n\t...\n\nand under the other configuration, it maps:\n\n\traw_local_irq_enable() -\u003e local_irq_enable()\n\traw_local_irq_disable() -\u003e local_irq_disable()\n\traw_local_irq_save() -\u003e local_irq_save()\n\t...\n\nThis is quite confusing. There should be one set of names expected of the\narch, and this should be wrapped to give another set of names that are expected\nby users of this facility.\n\nChange this to have the arch provide:\n\n\tflags \u003d arch_local_save_flags()\n\tflags \u003d arch_local_irq_save()\n\tarch_local_irq_restore(flags)\n\tarch_local_irq_disable()\n\tarch_local_irq_enable()\n\tarch_irqs_disabled_flags(flags)\n\tarch_irqs_disabled()\n\tarch_safe_halt()\n\nThen linux/irqflags.h wraps these to provide:\n\n\traw_local_save_flags(flags)\n\traw_local_irq_save(flags)\n\traw_local_irq_restore(flags)\n\traw_local_irq_disable()\n\traw_local_irq_enable()\n\traw_irqs_disabled_flags(flags)\n\traw_irqs_disabled()\n\traw_safe_halt()\n\nwith type checking on the flags \u0027arguments\u0027, and then wraps those to provide:\n\n\tlocal_save_flags(flags)\n\tlocal_irq_save(flags)\n\tlocal_irq_restore(flags)\n\tlocal_irq_disable()\n\tlocal_irq_enable()\n\tirqs_disabled_flags(flags)\n\tirqs_disabled()\n\tsafe_halt()\n\nwith tracing included if enabled.\n\nThe arch functions can now all be inline functions rather than some of them\nhaving to be macros.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e [X86, FRV, MN10300]\nSigned-off-by: Chris Metcalf \u003ccmetcalf@tilera.com\u003e [Tile]\nSigned-off-by: Michal Simek \u003cmonstr@monstr.eu\u003e [Microblaze]\nTested-by: Catalin Marinas \u003ccatalin.marinas@arm.com\u003e [ARM]\nAcked-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Haavard Skinnemoen \u003chaavard.skinnemoen@atmel.com\u003e [AVR]\nAcked-by: Tony Luck \u003ctony.luck@intel.com\u003e [IA-64]\nAcked-by: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e [M32R]\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e [M68K/M68KNOMMU]\nAcked-by: Ralf Baechle \u003cralf@linux-mips.org\u003e [MIPS]\nAcked-by: Kyle McMartin \u003ckyle@mcmartin.ca\u003e [PA-RISC]\nAcked-by: Paul Mackerras \u003cpaulus@samba.org\u003e [PowerPC]\nAcked-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e [S390]\nAcked-by: Chen Liqin \u003cliqin.chen@sunplusct.com\u003e [Score]\nAcked-by: Matt Fleming \u003cmatt@console-pimps.org\u003e [SH]\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e [Sparc]\nAcked-by: Chris Zankel \u003cchris@zankel.net\u003e [Xtensa]\nReviewed-by: Richard Henderson \u003crth@twiddle.net\u003e [Alpha]\nReviewed-by: Yoshinori Sato \u003cysato@users.sourceforge.jp\u003e [H8300]\nCc: starvik@axis.com [CRIS]\nCc: jesper.nilsson@axis.com [CRIS]\nCc: linux-cris-kernel@axis.com\n" }, { "commit": "ed1cde68365c1251b920900c51e73675ff38dc66", "tree": "7f43fcfef76bc3d715db22ab575efadeefaf8739", "parents": [ "44c7afffa429a7cdcd1755019ab76566ff41e66d" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Sep 20 15:13:25 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 20 10:44:38 2010 -0700" }, "message": "frv: double syscall restarts, syscall restart in sigreturn()\n\nWe need to make sure that only the first do_signal() to be handled on\nthe way out syscall will bother with syscall restarts; additionally, the\ncheck on the \"signal has user handler\" path had been wrong - compare\nwith restart prevention in sigreturn()...\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "44c7afffa429a7cdcd1755019ab76566ff41e66d", "tree": "6d7f1b59dfe72db861f6164323ba96a7129d05da", "parents": [ "ad0acab4557a91a60251b3ffe3478fad572d6f61" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Sep 20 15:13:19 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 20 10:44:38 2010 -0700" }, "message": "frv: handling of restart into restart_syscall is fscked\n\ndo_signal() should place the syscall number in gr7, not gr8 when\nhandling ERESTART_WOULDBLOCK.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ad0acab4557a91a60251b3ffe3478fad572d6f61", "tree": "15800a89d6a04a0f0d72df2056f779a8755a5f97", "parents": [ "5f4ad04a1e805d14de080ff9d5384b4d20518a9a" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Sep 20 15:13:14 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 20 10:44:37 2010 -0700" }, "message": "frv: avoid infinite loop of SIGSEGV delivery\n\nUse force_sigsegv() rather than force_sig(SIGSEGV, ...) as the former\nresets the SEGV handler pointer which will kill the process, rather than\nleaving it open to an infinite loop if the SEGV handler itself caused a\nSEGV signal.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5f4ad04a1e805d14de080ff9d5384b4d20518a9a", "tree": "63252b79b48b7dfd29d9a8081a34c858dab1de74", "parents": [ "20cd514d0f3d288d968217028ca67b70e707d896" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Sep 20 15:13:09 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 20 10:44:37 2010 -0700" }, "message": "frv: fix address verification holes in setup_frame/setup_rt_frame\n\na) sa_handler might be maliciously set to point to kernel memory;\n blindly dereferencing it in FDPIC case is a Bad Idea(tm).\n\nb) I\u0027m not sure you need that set_fs(USER_DS) there at all, but if you\n do, you\u0027d better do it *before* checking the frame you\u0027ve decided to\n use with access_ok(), lest sigaltstack() becomes a convenient\n roothole.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "20cd514d0f3d288d968217028ca67b70e707d896", "tree": "e6f01aab0ab568ca28fc11a9fbb575d91bafd3bd", "parents": [ "31c4a3d3a0f84a5847665f8aa0552d188389f791" ], "author": { "name": "Al Viro", "email": "viro@ftp.linux.org.uk", "time": "Mon Sep 20 15:13:04 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 20 10:44:37 2010 -0700" }, "message": "frv: restart_block.fn needs to be reset on sigreturn\n\nReset restart_block.fn on executing a sigreturn such that any currently\npending system call restarts will be forced to return -EINTR.\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "838a2e55e6a4e9e8a10451ed2ef0f7a08dabdb04", "tree": "b4d1e0b8dc63ce2832e16a9408190e44ee0ee79c", "parents": [ "c7abe8630ae63e90c2267c2c385a682e729e08be" ], "author": { "name": "Arnaud Lacombe", "email": "lacombar@gmail.com", "time": "Sat Sep 04 17:10:20 2010 -0400" }, "committer": { "name": "Arnaud Lacombe", "email": "lacombar@gmail.com", "time": "Sun Sep 19 22:54:11 2010 -0400" }, "message": "kbuild: migrate all arch to the kconfig mainmenu upgrade\n\nSigned-off-by: Arnaud Lacombe \u003clacombar@gmail.com\u003e\nReviewed-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nReviewed-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "d7627467b7a8dd6944885290a03a07ceb28c10eb", "tree": "a18c83468418e878cfb2d44e4310d81b8db84ad7", "parents": [ "da5cabf80e2433131bf0ed8993abc0f7ea618c73" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Aug 17 23:52:56 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 17 18:07:43 2010 -0700" }, "message": "Make do_execve() take a const filename pointer\n\nMake do_execve() take a const filename pointer so that kernel_execve() compiles\ncorrectly on ARM:\n\narch/arm/kernel/sys_arm.c:88: warning: passing argument 1 of \u0027do_execve\u0027 discards qualifiers from pointer target type\n\nThis also requires the argv and envp arguments to be consted twice, once for\nthe pointer array and once for the strings the array points to. This is\nbecause do_execve() passes a pointer to the filename (now const) to\ncopy_strings_kernel(). A simpler alternative would be to cast the filename\npointer in do_execve() when it\u0027s passed to copy_strings_kernel().\n\ndo_execve() may not change any of the strings it is passed as part of the argv\nor envp lists as they are some of them in .rodata, so marking these strings as\nconst should be fine.\n\nFurther kernel_execve() and sys_execve() need to be changed to match.\n\nThis has been test built on x86_64, frv, arm and mips.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nTested-by: Ralf Baechle \u003cralf@linux-mips.org\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8b1bb90701f9a51f10ce8a990bcc1e237cb3b1c7", "tree": "20607f7e67bf9bceab68e5b91030231de993ff51", "parents": [ "7cfddeef357aac78179ea804b11cffb5fbba8288" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:05:58 2010 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:26:53 2010 +0200" }, "message": "defconfig reduction\n\nUse the defconfig files generated by \"make savedefconfig\" for\nremaining defconfig files.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "bf56fba6703592149e1bcd19220c60eb42dff9b7", "tree": "45908384005037b96ef4561345ded09da1798f14", "parents": [ "60641aa1f379820e99ac7f45a38b43795670c741" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 10:20:19 2010 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sat Aug 14 22:26:51 2010 +0200" }, "message": "archs: replace unifdef-y with header-y\n\nunifdef-y and header-y have same semantic, so drop unifdef-y\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "c7887325230aec47d47a32562a6e26014a0fafca", "tree": "10535943dace59ddb01d3440aa582bc4640e8016", "parents": [ "b84ae4a1401a731ef5fee987c0cb08743838dda7" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Aug 11 11:26:22 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 13 16:53:13 2010 -0700" }, "message": "Mark arguments to certain syscalls as being const\n\nMark arguments to certain system calls as being const where they should be but\naren\u0027t. The list includes:\n\n (*) The filename arguments of various stat syscalls, execve(), various utimes\n syscalls and some mount syscalls.\n\n (*) The filename arguments of some syscall helpers relating to the above.\n\n (*) The buffer argument of various write syscalls.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3b9c6c11f519718d618f5d7c9508daf78b207f6f", "tree": "6c99992e25b9305fbe3977dff30f5eeb445f25e0", "parents": [ "d80e0d96a328cc864a1cb359f545a6ed0c61812d" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Tue Aug 10 18:03:25 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:21 2010 -0700" }, "message": "dma-mapping: remove dma_is_consistent API\n\nArchitectures implement dma_is_consistent() in different ways (some\nmisinterpret the definition of API in DMA-API.txt). So it hasn\u0027t been so\nuseful for drivers. We have only one user of the API in tree. Unlikely\nout-of-tree drivers use the API.\n\nEven if we fix dma_is_consistent() in some architectures, it doesn\u0027t look\nuseful at all. It was invented long ago for some old systems that can\u0027t\nallocate coherent memory at all. It\u0027s better to export only APIs that are\ndefinitely necessary for drivers.\n\nLet\u0027s remove this API.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: James Bottomley \u003cJames.Bottomley@HansenPartnership.com\u003e\nReviewed-by: Konrad Rzeszutek Wilk \u003ckonrad.wilk@oracle.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4565f0170dfc849b3629c27d769db800467baa62", "tree": "a2c70fb6f2f4826749b704ed83557623ca95bca5", "parents": [ "a6eb9fe105d5de0053b261148cee56c94b4720ca" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Tue Aug 10 18:03:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:21 2010 -0700" }, "message": "dma-mapping: unify dma_get_cache_alignment implementations\n\ndma_get_cache_alignment returns the minimum DMA alignment. Architectures\ndefines it as ARCH_DMA_MINALIGN (formally ARCH_KMALLOC_MINALIGN). So we\ncan unify dma_get_cache_alignment implementations.\n\nNote that some architectures implement dma_get_cache_alignment wrongly.\ndma_get_cache_alignment() should return the minimum DMA alignment. So\nfully-coherent architectures should return 1. This patch also fixes this\nissue.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "a6eb9fe105d5de0053b261148cee56c94b4720ca", "tree": "36e3f324a6a768397ef398674176c0f5f5365bff", "parents": [ "cd1542c8197fc3c2eb3a8301505d5d9738fab1e4" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Tue Aug 10 18:03:22 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Aug 11 08:59:21 2010 -0700" }, "message": "dma-mapping: rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN\n\nNow each architecture has the own dma_get_cache_alignment implementation.\n\ndma_get_cache_alignment returns the minimum DMA alignment. Architectures\ndefine it as ARCH_KMALLOC_MINALIGN (it\u0027s used to make sure that malloc\u0027ed\nbuffer is DMA-safe; the buffer doesn\u0027t share a cache with the others). So\nwe can unify dma_get_cache_alignment implementations.\n\nThis patch:\n\ndma_get_cache_alignment() needs to know if an architecture defines\nARCH_KMALLOC_MINALIGN or not (needs to know if architecture has DMA\nalignment restriction). However, slab.h define ARCH_KMALLOC_MINALIGN if\narchitectures doesn\u0027t define it.\n\nLet\u0027s rename ARCH_KMALLOC_MINALIGN to ARCH_DMA_MINALIGN.\nARCH_KMALLOC_MINALIGN is used only in the internals of slab/slob/slub\n(except for crypto).\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2f9e825d3e0e2b407ae8f082de5c00afcf7378fb", "tree": "f8b3ee40674ce4acd5508a0a0bf52a30904caf6c", "parents": [ "7ae0dea900b027cd90e8a3e14deca9a19e17638b", "de75d60d5ea235e6e09f4962ab22541ce0fe176a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 10 15:22:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Aug 10 15:22:42 2010 -0700" }, "message": "Merge branch \u0027for-2.6.36\u0027 of git://git.kernel.dk/linux-2.6-block\n\n* \u0027for-2.6.36\u0027 of git://git.kernel.dk/linux-2.6-block: (149 commits)\n block: make sure that REQ_* types are seen even with CONFIG_BLOCK\u003dn\n xen-blkfront: fix missing out label\n blkdev: fix blkdev_issue_zeroout return value\n block: update request stacking methods to support discards\n block: fix missing export of blk_types.h\n writeback: fix bad _bh spinlock nesting\n drbd: revert \"delay probes\", feature is being re-implemented differently\n drbd: Initialize all members of sync_conf to their defaults [Bugz 315]\n drbd: Disable delay probes for the upcomming release\n writeback: cleanup bdi_register\n writeback: add new tracepoints\n writeback: remove unnecessary init_timer call\n writeback: optimize periodic bdi thread wakeups\n writeback: prevent unnecessary bdi threads wakeups\n writeback: move bdi threads exiting logic to the forker thread\n writeback: restructure bdi forker loop a little\n writeback: move last_active to bdi\n writeback: do not remove bdi from bdi_list\n writeback: simplify bdi code a little\n writeback: do not lose wake-ups in bdi threads\n ...\n\nFixed up pretty trivial conflicts in drivers/block/virtio_blk.c and\ndrivers/scsi/scsi_error.c as per Jens.\n" }, { "commit": "26df6d13406d1a53b0bda08bd712f1924affd7cd", "tree": "db17328acbd7cac9dc20bc854509527c1c89ca01", "parents": [ "a3c8ed693da9782f924223f65da9261da796e49b" ], "author": { "name": "hyc@symas.com", "email": "hyc@symas.com", "time": "Tue Jun 22 10:14:49 2010 -0700" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Tue Aug 10 13:47:39 2010 -0700" }, "message": "tty: Add EXTPROC support for LINEMODE\n\nThis patch is against the 2.6.34 source.\n\nParaphrased from the 1989 BSD patch by David Borman @ cray.com:\n\n These are the changes needed for the kernel to support\n LINEMODE in the server.\n\n There is a new bit in the termios local flag word, EXTPROC.\n When this bit is set, several aspects of the terminal driver\n are disabled. Input line editing, character echo, and mapping\n of signals are all disabled. This allows the telnetd to turn\n off these functions when in linemode, but still keep track of\n what state the user wants the terminal to be in.\n\n New ioctl:\n TIOCSIG Generate a signal to processes in the\n current process group of the pty.\n\n There is a new mode for packet driver, the TIOCPKT_IOCTL bit.\n When packet mode is turned on in the pty, and the EXTPROC bit\n is set, then whenever the state of the pty is changed, the\n next read on the master side of the pty will have the TIOCPKT_IOCTL\n bit set. This allows the process on the server side of the pty\n to know when the state of the terminal has changed; it can then\n issue the appropriate ioctl to retrieve the new state.\n\nSince the original BSD patches accompanied the source code for telnet\nI\u0027ve left that reference here, but obviously the feature is useful for\nany remote terminal protocol, including ssh.\n\nThe corresponding feature has existed in the BSD tty driver since 1989.\nFor historical reference, a good copy of the relevant files can be found\nhere:\n\nhttp://anonsvn.mit.edu/viewvc/krb5/trunk/src/appl/telnet/?pathrev\u003d17741\n\nSigned-off-by: Howard Chu \u003chyc@symas.com\u003e\nCc: Alan Cox \u003calan@lxorguk.ukuu.org.uk\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\n\n" }, { "commit": "597781f3e51f48ef8e67be772196d9e9673752c4", "tree": "6e1974bc899889da40f2fde47b04a5ece0bd3399", "parents": [ "3edd4fc9537d95e460d502987c63a90d6b9a7a82" ], "author": { "name": "Cesar Eduardo Barros", "email": "cesarb@cesarb.net", "time": "Mon Aug 09 17:18:32 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Aug 09 20:44:54 2010 -0700" }, "message": "kmap_atomic: make kunmap_atomic() harder to misuse\n\nkunmap_atomic() is currently at level -4 on Rusty\u0027s \"Hard To Misuse\"\nlist[1] (\"Follow common convention and you\u0027ll get it wrong\"), except in\nsome architectures when CONFIG_DEBUG_HIGHMEM is set[2][3].\n\nkunmap() takes a pointer to a struct page; kunmap_atomic(), however, takes\ntakes a pointer to within the page itself. This seems to once in a while\ntrip people up (the convention they are following is the one from\nkunmap()).\n\nMake it much harder to misuse, by moving it to level 9 on Rusty\u0027s list[4]\n(\"The compiler/linker won\u0027t let you get it wrong\"). This is done by\nrefusing to build if the type of its first argument is a pointer to a\nstruct page.\n\nThe real kunmap_atomic() is renamed to kunmap_atomic_notypecheck()\n(which is what you would call in case for some strange reason calling it\nwith a pointer to a struct page is not incorrect in your code).\n\nThe previous version of this patch was compile tested on x86-64.\n\n[1] http://ozlabs.org/~rusty/index.cgi/tech/2008-04-01.html\n[2] In these cases, it is at level 5, \"Do it right or it will always\n break at runtime.\"\n[3] At least mips and powerpc look very similar, and sparc also seems to\n share a common ancestor with both; there seems to be quite some\n degree of copy-and-paste coding here. The include/asm/highmem.h file\n for these three archs mention x86 CPUs at its top.\n[4] http://ozlabs.org/~rusty/index.cgi/tech/2008-03-30.html\n[5] As an aside, could someone tell me why mn10300 uses unsigned long as\n the first parameter of kunmap_atomic() instead of void *?\n\nSigned-off-by: Cesar Eduardo Barros \u003ccesarb@cesarb.net\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e (arch/arm)\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e (arch/mips)\nCc: David Howells \u003cdhowells@redhat.com\u003e (arch/frv, arch/mn10300)\nCc: Koichi Yasutake \u003cyasutake.koichi@jp.panasonic.com\u003e (arch/mn10300)\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e (arch/parisc)\nCc: Helge Deller \u003cdeller@gmx.de\u003e (arch/parisc)\nCc: \"James E.J. Bottomley\" \u003cjejb@parisc-linux.org\u003e (arch/parisc)\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e (arch/powerpc)\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e (arch/powerpc)\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e (arch/sparc)\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e (arch/x86)\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e (arch/x86)\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e (arch/x86)\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e (include/asm-generic)\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e (\"Hard To Misuse\" list)\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7e005f79791dcd58436c88ded4a7f5aed1b82147", "tree": "3dfed83c36d9627ceffdedd783d1d02dadb7d436", "parents": [ "bfe172310e58225f0d07f9354b683abacbd6a0d8" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Mon May 31 15:59:04 2010 +0900" }, "committer": { "name": "Jens Axboe", "email": "jaxboe@fusionio.com", "time": "Sat Aug 07 18:15:50 2010 +0200" }, "message": "remove needless ISA_DMA_THRESHOLD\n\nArchitectures don\u0027t need to define ISA_DMA_THRESHOLD anymore.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: James Bottomley \u003cJames.Bottomley@suse.de\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Jens Axboe \u003cjaxboe@fusionio.com\u003e\n" }, { "commit": "b62ad9ab181a67207a4c8c373461b587c4861a68", "tree": "ace1572964d81f5f9bbc10b7960c1f742832d744", "parents": [ "af390084359a5de20046c901529b2b6a50b941cb", "b29230769e3482bbd62a07d6d9485371ee66a18f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:18:29 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 13:18:29 2010 -0700" }, "message": "Merge branch \u0027timers-timekeeping-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-timekeeping-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n um: Fix read_persistent_clock fallout\n kgdb: Do not access xtime directly\n powerpc: Clean up obsolete code relating to decrementer and timebase\n powerpc: Rework VDSO gettimeofday to prevent time going backwards\n clocksource: Add __clocksource_updatefreq_hz/khz methods\n x86: Convert common clocksources to use clocksource_register_hz/khz\n timekeeping: Make xtime and wall_to_monotonic static\n hrtimer: Cleanup direct access to wall_to_monotonic\n um: Convert to use read_persistent_clock\n timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset\n powerpc: Cleanup xtime usage\n powerpc: Simplify update_vsyscall\n time: Kill off CONFIG_GENERIC_TIME\n time: Implement timespec_add\n x86: Fix vtime/file timestamp inconsistencies\n\nTrivial conflicts in Documentation/feature-removal-schedule.txt\n\nMuch less trivial conflicts in arch/powerpc/kernel/time.c resolved as\nper Thomas\u0027 earlier merge commit 47916be4e28c (\"Merge branch\n\u0027powerpc.cherry-picks\u0027 into timers/clocksource\")\n" }, { "commit": "4aed2fd8e3181fea7c09ba79cf64e7e3f4413bf9", "tree": "1f69733e5daab4915a76a41de0e4d1dc61e12cfb", "parents": [ "3a3527b6461b1298cc53ce72f336346739297ac8", "fc9ea5a1e53ee54f681e226d735008e2a6f8f470" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 09:30:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Aug 06 09:30:52 2010 -0700" }, "message": "Merge branch \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027perf-core-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (162 commits)\n tracing/kprobes: unregister_trace_probe needs to be called under mutex\n perf: expose event__process function\n perf events: Fix mmap offset determination\n perf, powerpc: fsl_emb: Restore setting perf_sample_data.period\n perf, powerpc: Convert the FSL driver to use local64_t\n perf tools: Don\u0027t keep unreferenced maps when unmaps are detected\n perf session: Invalidate last_match when removing threads from rb_tree\n perf session: Free the ref_reloc_sym memory at the right place\n x86,mmiotrace: Add support for tracing STOS instruction\n perf, sched migration: Librarize task states and event headers helpers\n perf, sched migration: Librarize the GUI class\n perf, sched migration: Make the GUI class client agnostic\n perf, sched migration: Make it vertically scrollable\n perf, sched migration: Parameterize cpu height and spacing\n perf, sched migration: Fix key bindings\n perf, sched migration: Ignore unhandled task states\n perf, sched migration: Handle ignored migrate out events\n perf: New migration tool overview\n tracing: Drop cpparg() macro\n perf: Use tracepoint_synchronize_unregister() to flush any pending tracepoint call\n ...\n\nFix up trivial conflicts in Makefile and drivers/cpufreq/cpufreq.c\n" }, { "commit": "772320e84588dcbe1600ffb83e5f328f2209ac2a", "tree": "a7de21b79340aeaa17c58126f6b801b82c77b53a", "parents": [ "1ce53adf13a54375d2a5c7cdbe341b2558389615", "9fe6206f400646a2322096b56c59891d530e8d51" ], "author": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Wed Aug 04 13:59:13 2010 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Wed Aug 04 13:59:13 2010 +0200" }, "message": "Merge commit \u0027v2.6.35\u0027 into kbuild/kbuild\n\nConflicts:\n\tarch/powerpc/Makefile\n" }, { "commit": "c9575dc680dffa26411e9aed32b4a1e12609428d", "tree": "9bfcd0c2bc4b7395028e01697c5ecc0769bbcc1f", "parents": [ "80c00ba942ee39c9a95c06959223560400bbb86e" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Wed Jul 28 19:33:00 2010 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Tue Aug 03 14:09:45 2010 +0200" }, "message": "frv: clean up arch/frv/Makefile\n\n- removed a lot of unused variable assignmnets\n- removed unused bootstrap target\n- replaced ARCHMODFLAGS with proper KBUILD_{A,C}FLAGS_MODULE assignmnets\n\nThe resuting Makefile has not been tested due to lack of toolchain,\nbut these were all trivial changes.\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "592913ecb87a9e06f98ddb55b298f1a66bf94c6b", "tree": "0f63f5535fe517faf418e0f7e69800fcf1e4d8db", "parents": [ "ce3bf7ab22527183634a76512d9854a38615e4d5" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Tue Jul 13 17:56:20 2010 -0700" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Jul 27 12:40:54 2010 +0200" }, "message": "time: Kill off CONFIG_GENERIC_TIME\n\nNow that all arches have been converted over to use generic time via\nclocksources or arch_gettimeoffset(), we can remove the GENERIC_TIME\nconfig option and simplify the generic code.\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nLKML-Reference: \u003c1279068988-21864-4-git-send-email-johnstul@us.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "646b1db4956ba8bf748b835b5eba211133d91c2e", "tree": "061166d873d9da9cf83044a7593ad111787076c5", "parents": [ "0f2c3de2ba110626515234d5d584fb1b0c0749a2", "7e27d6e778cd87b6f2415515d7127eba53fe5d02" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jun 18 10:53:12 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Fri Jun 18 10:53:19 2010 +0200" }, "message": "Merge commit \u0027v2.6.35-rc3\u0027 into perf/core\n\nMerge reason: Go from -rc1 base to -rc3 base, merge in fixes.\n" }, { "commit": "a7f5378e2449fc8ae3f92739a6cc2239748ef86a", "tree": "e9eecb629fa9f5b2dd55e281821e87c01d8a790f", "parents": [ "9aad9c0d939e97c144388630a2d3f6918e61f672" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Jun 09 19:52:22 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jun 09 12:42:44 2010 -0700" }, "message": "FRV: Reinstate null behaviour for the GDB remote protocol \u0027p\u0027 command\n\nReinstate the null behaviour that the in-kernel gdbstub had for the GDB\nremote protocol \u0027p\u0027 command (retrieve a single register value) prior to\ncommit 7ca8b9c0dafd (\"frv: extend gdbstub to support more features of\ngdb\").\n\nBefore that, the \u0027p\u0027 command just returned an empty reply, which causes\ngdb to then go and use the \u0027g\u0027 command. However, since that commit, the\n\u0027p\u0027 command returns an error string, which causes gdb to abort its\nconnection to the target.\n\nNot all gdb versions are affected, some use try \u0027g\u0027 first, and if that\nworks, don\u0027t bother with \u0027p\u0027, and so don\u0027t see the error.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1996bda2a42480c275656233e631ee0966574be4", "tree": "c4c61b6bde252d3d6f1dc0b62d48cf3a3e486ec1", "parents": [ "d57e34fdd60be7ffd0b1d86bfa1a553df86b7172" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri May 21 14:05:13 2010 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Jun 09 11:12:36 2010 +0200" }, "message": "arch: Implement local64_t\n\nOn 64bit, local_t is of size long, and thus we make local64_t an alias.\nOn 32bit, we fall back to atomic64_t. (architecture can provide optimized\n32-bit version)\n\n(This new facility is to be used by perf events optimizations.)\n\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: linux-arch@vger.kernel.org\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "f9c497c4aea28be826b8450a5339952f2ffc705e", "tree": "810d6b4d03a8ad0ed5458606b9ac26f3c3d75ef2", "parents": [ "b7e5d1f04104d98895945ecb463d750320dcd6cf" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Fri Jun 04 14:14:49 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 04 15:21:44 2010 -0700" }, "message": "frv: invoke oom-killer from page fault\n\nAs explained in commit 1c0fe6e3bd (\"mm: invoke oom-killer from page\nfault\") , we want to call the architecture independent oom killer when\ngetting an unexplained OOM from handle_mm_fault, rather than simply\nkilling current.\n\nSigned-off-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: David Rientjes \u003crientjes@google.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1f73897861b8ef0be64ff4b801f8d6f830f683b5", "tree": "b4bae8f12e1422113910d8cb00a19d010dc4a52f", "parents": [ "b904d7131d116900524bd36ec170dcd97846bfd3", "64ffc9ff424c65adcffe7d590018cc75e2d5d42a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 01 08:55:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 01 08:55:52 2010 -0700" }, "message": "Merge branch \u0027for-35\u0027 of git://repo.or.cz/linux-kbuild\n\n* \u0027for-35\u0027 of git://repo.or.cz/linux-kbuild: (81 commits)\n kbuild: Revert part of e8d400a to resolve a conflict\n kbuild: Fix checking of scm-identifier variable\n gconfig: add support to show hidden options that have prompts\n menuconfig: add support to show hidden options which have prompts\n gconfig: remove show_debug option\n gconfig: remove dbg_print_ptype() and dbg_print_stype()\n kconfig: fix zconfdump()\n kconfig: some small fixes\n add random binaries to .gitignore\n kbuild: Include gen_initramfs_list.sh and the file list in the .d file\n kconfig: recalc symbol value before showing search results\n .gitignore: ignore *.lzo files\n headerdep: perlcritic warning\n scripts/Makefile.lib: Align the output of LZO\n kbuild: Generate modules.builtin in make modules_install\n Revert \"kbuild: specify absolute paths for cscope\"\n kbuild: Do not unnecessarily regenerate modules.builtin\n headers_install: use local file handles\n headers_check: fix perl warnings\n export_report: fix perl warnings\n ...\n" }, { "commit": "8507bb0062bff1431bbcce921efe5cd1186fcff2", "tree": "439c0436112ac225e7b2dbd020fc2083c4b45044", "parents": [ "29d03fa12bc02c0f8085cd6bb06d11359a4bccaf" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Fri May 28 10:41:16 2010 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 28 10:17:21 2010 -0700" }, "message": "FRV: ARCH_KMALLOC_MINALIGN was already defined\n\nARCH_KMALLOC_MINALIGN was already defined in asm/mem-layout.h and so shouldn\u0027t\nhave been added to asm/cache.h as well, but rather altered in place.\n\nThe commit that added it to asm/cache.h was:\n\n\tcommit 69dcf3db03626c4f18de624e8632454ea12ff260\n\tAuthor: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\n\tDate: Mon May 24 14:32:54 2010 -0700\n\n\t frv: set ARCH_KMALLOC_MINALIGN\n\n\t Architectures that handle DMA-non-coherent memory need to set\n\t ARCH_KMALLOC_MINALIGN to make sure that kmalloc\u0027ed buffer is\n\t DMA-safe: the buffer doesn\u0027t share a cache with the others.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\ncc: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "fc2444756acab1e2265a5053618f78c8c9633f8f", "tree": "f3034077260b60c6308ab0cdf0b783a974828d88", "parents": [ "e1c54b64027b52ba43b86fe6219910a9e9a88b73" ], "author": { "name": "Jan Blunck", "email": "jblunck@suse.de", "time": "Wed May 26 14:44:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:56 2010 -0700" }, "message": "frv: remove \"struct file *\" argument from sysctl -\u003eproc_handler\n\nSigned-off-by: Jan Blunck \u003cjblunck@suse.de\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "3e6e3da8d5eafb5f849a14272ed725f85bed5dc8", "tree": "b88695b3672a9d326d43c11028b7de78122ce830", "parents": [ "459d42b72c1fa76928ff92623ce785a55ee87095" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed May 26 14:44:42 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:55 2010 -0700" }, "message": "frv: use asm-generic/scatterlist.h\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: 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": "9c1a125921d146f22cf28ff366ff69fd602a0e9b", "tree": "37df1b2ae74c23371de7e8b46427fc0a16727cdb", "parents": [ "0ac0c0d0f837c499afd02a802f9cf52d3027fa3b" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Wed May 26 14:42:52 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:44 2010 -0700" }, "message": "ptrace: unify FDPIC implementations\n\nThe Blackfin/FRV/SuperH guys all have the same exact FDPIC ptrace code in\ntheir arch handlers (since they were probably copied \u0026 pasted). Since\nthese ptrace interfaces are an arch independent aspect of the FDPIC code,\nunify them in the common ptrace code so new FDPIC ports don\u0027t need to copy\nand paste this fundamental stuff yet again.\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nAcked-by: Roland McGrath \u003croland@redhat.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Oleg Nesterov \u003coleg@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": "69dcf3db03626c4f18de624e8632454ea12ff260", "tree": "615c72af11acf7153bd60808e970e55398f19593", "parents": [ "7ca8b9c0dafd1cb36289aa4c92c7beae7adcd34f" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Mon May 24 14:32:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:02 2010 -0700" }, "message": "frv: set ARCH_KMALLOC_MINALIGN\n\nArchitectures that handle DMA-non-coherent memory need to set\nARCH_KMALLOC_MINALIGN to make sure that kmalloc\u0027ed buffer is DMA-safe: the\nbuffer doesn\u0027t share a cache with the others.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Pekka Enberg \u003cpenberg@cs.helsinki.fi\u003e\nCc: \u003cstable@kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "7ca8b9c0dafd1cb36289aa4c92c7beae7adcd34f", "tree": "a762d0b8bbb090b423eafae7f009839592e23290", "parents": [ "c6f6b596a5a73e63e5e930c414375c0c389199ab" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Mon May 24 14:32:54 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:07:02 2010 -0700" }, "message": "frv: extend gdbstub to support more features of gdb\n\nExtend gdbstub to support more features of gdb remote protocol to keep\ngdb-7 and emacs gud mode happy:\n\n (*) The D command. Detach debugger.\n\n (*) The H command. Handle setting the target thread by ignoring it.\n\n (*) The qAttached command. Indicate we \u0027attached\u0027 to an existing process.\n\n (*) The qC command. Indicate that the current thread ID is 0.\n\n (*) The qOffsets command. Indicate that no relocation has been done.\n\n (*) The qSymbol:: command. Indicate that we\u0027re not interested in looking up\n any symbol addresses.\n\n (*) The qSupported command. Indicate the maximum packet size and the fact\n that reverse step and continue aren\u0027t supported.\n\n (*) The vCont? command. Indicate that we don\u0027t support any of its variants.\n\nAlso make it possible to trace the commands and replies without tracing\nthe individual character I/O.\n\n[akpm@linux-foundation.org: make gdbstub_handle_query() static]\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: Jason Wessel \u003cjason.wessel@windriver.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f39d01be4c59a61a08d0cb53f615e7016b85d339", "tree": "6777590e3ff2ddf4df1d38444ba7d692cd463b7b", "parents": [ "54291263519ac2c9bdda68b23b02fef3808deed4", "7db82437cfcac4bdfe79a6323eb554fdfa271623" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:20:59 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 20 09:20:59 2010 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)\n vlynq: make whole Kconfig-menu dependant on architecture\n add descriptive comment for TIF_MEMDIE task flag declaration.\n EEPROM: max6875: Header file cleanup\n EEPROM: 93cx6: Header file cleanup\n EEPROM: Header file cleanup\n agp: use NULL instead of 0 when pointer is needed\n rtc-v3020: make bitfield unsigned\n PCI: make bitfield unsigned\n jbd2: use NULL instead of 0 when pointer is needed\n cciss: fix shadows sparse warning\n doc: inode uses a mutex instead of a semaphore.\n uml: i386: Avoid redefinition of NR_syscalls\n fix \"seperate\" typos in comments\n cocbalt_lcdfb: correct sections\n doc: Change urls for sparse\n Powerpc: wii: Fix typo in comment\n i2o: cleanup some exit paths\n Documentation/: it\u0027s -\u003e its where appropriate\n UML: Fix compiler warning due to missing task_struct declaration\n UML: add kernel.h include to signal.c\n ...\n" }, { "commit": "7d02093e29de9efc4a72d5e93baae9506969b789", "tree": "a6fc2450132ae419934f6eb9d223baa338b7d782", "parents": [ "6e0b7b2c39b91b467270dd0bc383914f99e1fb28", "e9ddbc075d95b2edf111247cdde16f33c31654a8" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:10:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed May 19 17:10:06 2010 -0700" }, "message": "Merge branch \u0027timers-for-linus-cleanups\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-for-linus-cleanups\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n avr32: Fix typo in read_persistent_clock()\n sparc: Convert sparc to use read/update_persistent_clock\n cris: Convert cris to use read/update_persistent_clock\n m68k: Convert m68k to use read/update_persistent_clock\n m32r: Convert m32r to use read/update_peristent_clock\n blackfin: Convert blackfin to use read/update_persistent_clock\n ia64: Convert ia64 to use read/update_persistent_clock\n avr32: Convert avr32 to use read/update_persistent_clock\n h8300: Convert h8300 to use read/update_persistent_clock\n frv: Convert frv to use read/update_persistent_clock\n mn10300: Convert mn10300 to use read/update_persistent_clock\n alpha: Convert alpha to use read/update_persistent_clock\n xtensa: Fix unnecessary setting of xtime\n time: Clean up direct xtime usage in xen\n" }, { "commit": "f3d46f9d3194e0329216002a8724d4c0957abc79", "tree": "6d9413e4a448d7b8d342c40297c4fbe0b9c4c2f0", "parents": [ "e40152ee1e1c7a63f4777791863215e3faa37a86" ], "author": { "name": "Anton Blanchard", "email": "anton@samba.org", "time": "Mon May 17 14:33:53 2010 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon May 17 07:57:27 2010 -0700" }, "message": "atomic_t: Cast to volatile when accessing atomic variables\n\nIn preparation for removing volatile from the atomic_t definition, this\npatch adds a volatile cast to all the atomic read functions.\n\nSigned-off-by: Anton Blanchard \u003canton@samba.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "0ddc9324b1a842afd77e8e86698b1d1d2ffed022", "tree": "9247bd1a897cc9ed665782a1b7f7e5fb28068600", "parents": [ "6858d49833b8c2aae74adcb593065797409d376e" ], "author": { "name": "Andreas Dilger", "email": "adilger@dilger.ca", "time": "Fri May 14 11:13:27 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Fri May 14 11:13:27 2010 +0200" }, "message": "add descriptive comment for TIF_MEMDIE task flag declaration.\n\nSigned-off-by: Andreas Dilger \u003cadilger@dilger.ca\u003e\nAcked-by: KOSAKI Motohiro \u003ckosaki.motohiro@jp.fujitsu.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "08dc179b9b00cfbed006ae6f5d0e471ef79dc69c", "tree": "e16cc9ee894fdd78e6a427abc68060067c34f0fc", "parents": [ "ea56f411ec2d4d8689eb7f3bcd24e860acf87c47" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Tue Apr 06 14:35:09 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Apr 07 08:38:05 2010 -0700" }, "message": "frv: fix kernel/user segment handling in NOMMU mode\n\nIn NOMMU mode, the FRV segment handling is broken because KERNEL_DS \u003d\u003d\nUSER_DS. This causes tests of the following sort:\n\n\t/* don\u0027t pin down non-user-based iovecs */\n\tif (segment_eq(get_fs(), KERNEL_DS))\n\t\treturn NULL;\n\nto malfunction.\n\nTo fix this, make USER_DS the top of RAM instead of the top of the non-IO\naddress space, and make KERNEL_DS one more than the top of the non-IO\naddress space.\n\nAlso get rid of FRV\u0027s __addr_ok() as nothing uses it.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "5a0e3ad6af8660be21ca98a971cd00f331318c05", "tree": "5bfb7be11a03176a87296a43ac6647975c00a1d1", "parents": [ "ed391f4ebf8f701d3566423ce8f17e614cde9806" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Mar 24 17:04:11 2010 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Tue Mar 30 22:02:32 2010 +0900" }, "message": "include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h\n\npercpu.h is included by sched.h and module.h and thus ends up being\nincluded when building most .c files. percpu.h includes slab.h which\nin turn includes gfp.h making everything defined by the two files\nuniversally available and complicating inclusion dependencies.\n\npercpu.h -\u003e slab.h dependency is about to be removed. Prepare for\nthis change by updating users of gfp and slab facilities include those\nheaders directly instead of assuming availability. As this conversion\nneeds to touch large number of source files, the following script is\nused as the basis of conversion.\n\n http://userweb.kernel.org/~tj/misc/slabh-sweep.py\n\nThe script does the followings.\n\n* Scan files for gfp and slab usages and update includes such that\n only the necessary includes are there. ie. if only gfp is used,\n gfp.h, if slab is used, slab.h.\n\n* When the script inserts a new include, it looks at the include\n blocks and try to put the new include such that its order conforms\n to its surrounding. It\u0027s put in the include block which contains\n core kernel includes, in the same order that the rest are ordered -\n alphabetical, Christmas tree, rev-Xmas-tree or at the end if there\n doesn\u0027t seem to be any matching order.\n\n* If the script can\u0027t find a place to put a new include (mostly\n because the file doesn\u0027t have fitting include block), it prints out\n an error message indicating which .h file needs to be added to the\n file.\n\nThe conversion was done in the following steps.\n\n1. The initial automatic conversion of all .c files updated slightly\n over 4000 files, deleting around 700 includes and adding ~480 gfp.h\n and ~3000 slab.h inclusions. The script emitted errors for ~400\n files.\n\n2. Each error was manually checked. Some didn\u0027t need the inclusion,\n some needed manual addition while adding it to implementation .h or\n embedding .c file was more appropriate for others. This step added\n inclusions to around 150 files.\n\n3. The script was run again and the output was compared to the edits\n from #2 to make sure no file was left behind.\n\n4. Several build tests were done and a couple of problems were fixed.\n e.g. lib/decompress_*.c used malloc/free() wrappers around slab\n APIs requiring slab.h to be added manually.\n\n5. The script was run on all .h files but without automatically\n editing them as sprinkling gfp.h and slab.h inclusions around .h\n files could easily lead to inclusion dependency hell. Most gfp.h\n inclusion directives were ignored as stuff from gfp.h was usually\n wildly available and often used in preprocessor macros. Each\n slab.h inclusion directive was examined and added manually as\n necessary.\n\n6. percpu.h was updated not to include slab.h.\n\n7. Build test were done on the following configurations and failures\n were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my\n distributed build env didn\u0027t work with gcov compiles) and a few\n more options had to be turned off depending on archs to make things\n build (like ipr on powerpc/64 which failed due to missing writeq).\n\n * x86 and x86_64 UP and SMP allmodconfig and a custom test config.\n * powerpc and powerpc64 SMP allmodconfig\n * sparc and sparc64 SMP allmodconfig\n * ia64 SMP allmodconfig\n * s390 SMP allmodconfig\n * alpha SMP allmodconfig\n * um on x86_64 SMP allmodconfig\n\n8. percpu.h modifications were reverted so that it could be applied as\n a separate patch and serve as bisection point.\n\nGiven the fact that I had only a couple of failures from tests on step\n6, I\u0027m fairly confident about the coverage of this conversion patch.\nIf there is a breakage, it\u0027s likely to be something in one of the arch\nheaders which should be easily discoverable easily on most builds of\nthe specific arch.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nGuess-its-ok-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: Lee Schermerhorn \u003cLee.Schermerhorn@hp.com\u003e\n" }, { "commit": "f7454c5d5c33b84fdbb957b7ad4a432e333b2550", "tree": "dd9891d44bf96d9727ccbe252af3039c40d3ef8a", "parents": [ "a53f4f9efaeb1d87cfae066346979d4d70e1abe9" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Wed Mar 24 16:59:36 2010 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Mar 29 09:37:14 2010 -0700" }, "message": "frv/chris: fix lines with a missing semicolons\n\nCommit b26b2d494b659f9 (\"resource/PCI: align functions now return start\nof resource\") added lines with missing semicolons.\n\nAdd the missing semicolons to the FRV and CRIS arch code.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: linux@dominikbrodowski.net\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "99f4692e13ba22b228bdd155473f24ae9bdec1dc", "tree": "ae090a1e0564234429e42ab1cc297006ea91b415", "parents": [ "c9c9b564717e5b6b2ae8b770da1c73a348c84cce" ], "author": { "name": "Bjorn Helgaas", "email": "bjorn.helgaas@hp.com", "time": "Mon Mar 22 16:34:15 2010 -0600" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Thu Mar 25 08:51:40 2010 -0700" }, "message": "frv/PCI: remove redundant warnings\n\npci_claim_resource() already prints more detailed error messages, so these\nare really redundant.\n\nSigned-off-by: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "739b27116a0e6903d6c85d6769e69f43d8fa4128", "tree": "8ab72706065125cb409e014d1c4576d32f08536b", "parents": [ "f7a56575fa4e62e94a644f72ef8c5d423c073982" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Wed Mar 03 19:57:18 2010 -0800" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Mar 13 01:14:09 2010 +0100" }, "message": "frv: Convert frv to use read/update_persistent_clock\n\nThis patch converts the frv architecture to use the generic\nread_persistent_clock and update_persistent_clock interfaces, reducing\nthe amount of arch specific code we have to maintain, and allowing for\nfurther cleanups in the future.\n\nI have not built or tested this patch, so help from arch maintainers\nwould be appreciated.\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nLKML-Reference: \u003c1267675049-12337-4-git-send-email-johnstul@us.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "027491f4b2ff15fe5cc36c900cb2d1fdb35cefdd", "tree": "79dccedcd50e2bd0935c05185bf5c75d48fe9c63", "parents": [ "0acedc124aca35f5cce9d4ee288dc372bf517e09" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed Mar 10 15:23:32 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:42 2010 -0800" }, "message": "dma-mapping: frv: remove the obsolete and unnecessary DMA API comments\n\npci_dma_sync_single was obsoleted long ago.\n\nAll the comments are generic, not architecture specific, simply describes\nsome of the DMA-API (and frv has the same comments in three files).\nDocumentation/DMA-API.txt have more detailed descriptions.\n\nThis removes the above obsolete and unnecessary DMA API comments. Let\u0027s\ndescribe the DMA API in only Documentation/DMA-API.txt.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "f41b177157718abe9a93868bb76e47d4a6f3681d", "tree": "555d8608a2fe320483c8761dcb2e80cc37b5e822", "parents": [ "c7e67ac1f329fa28b6a411335787c786de618cba" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed Mar 10 15:23:30 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:42 2010 -0800" }, "message": "pci-dma: add linux/pci-dma.h to linux/pci.h\n\nAll the architectures properly set NEED_DMA_MAP_STATE now so we can safely\nadd linux/pci-dma.h to linux/pci.h and remove the linux/pci-dma.h\ninclusion in arch\u0027s asm/pci.h\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "272ecbe5919d057388bbbea751fad5471aaf3f02", "tree": "c0162fc9be8b9cbd5a0e70bdf0ddbd00820eecaa", "parents": [ "ccd7ab7f7efb4cb94b4a000ba220a0aeefe9bc11" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed Mar 10 15:23:24 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:41 2010 -0800" }, "message": "pci-dma: frv: use include/linux/pci-dma.h\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nCc: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\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": "6822190882ce02ae8ae135026c2b3f17c006960b", "tree": "a8617167c9575106355d802321eccb7da121784c", "parents": [ "08259d58e4fa12ceaece82193c5816152f638cca" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Fri Mar 05 13:42:26 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sat Mar 06 11:26:27 2010 -0800" }, "message": "frv: remove pci_dma_sync_single() and pci_dma_sync_sg()\n\nNo architecture except for frv has pci_dma_sync_single() and\npci_dma_sync_sg(). The APIs are deprecated.\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\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": "b6f4e451de78547a369a8dbb7bcb56c1919a6b79", "tree": "dd2b937fd3607fba9b84c049065ae45d79bf8e1b", "parents": [ "a7df554ea095da4f60ff7f7b90a94c2df91942e4" ], "author": { "name": "Denys Vlasenko", "email": "vda.linux@googlemail.com", "time": "Sat Feb 20 01:03:56 2010 +0100" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Wed Mar 03 11:26:01 2010 +0100" }, "message": "Rename special text sections in arch/frv from .text.XXX to .text..XXX.\n\nSigned-off-by: Denys Vlasenko \u003cvda.linux@googlemail.com\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\n" }, { "commit": "1360e0707090c763d0d06cbc74b04f9c9588b582", "tree": "5d72637c91edafd3f0b36b82b4f7bbaa4e6e7bfb", "parents": [ "7c74df07f90cabe61d700727bca04682b4e477f3" ], "author": { "name": "Denys Vlasenko", "email": "vda.linux@googlemail.com", "time": "Sat Feb 20 01:03:39 2010 +0100" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Wed Mar 03 11:25:59 2010 +0100" }, "message": "Rename .bss.stack to .bss..stack.\n\nSigned-off-by: Denys Vlasenko \u003cvda.linux@googlemail.com\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\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": "3b7a17fcdae532d29dffab9d564a28be08960988", "tree": "64ac96e997751e34fcd237485fac9b868d1e0614", "parents": [ "b26b2d494b659f988b4d75eb394dfa0ddac415c9" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jan 01 17:40:50 2010 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Feb 22 16:16:57 2010 -0800" }, "message": "resource/PCI: mark struct resource as const\n\nNow that we return the new resource start position, there is no\nneed to update \"struct resource\" inside the align function.\nTherefore, mark the struct resource as const.\n\nCc: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nCc: Yinghai Lu \u003cyhlu.kernel@gmail.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.org\u003e\n" }, { "commit": "b26b2d494b659f988b4d75eb394dfa0ddac415c9", "tree": "d262f333e529a21017dc072e604a626b38520515", "parents": [ "93da6202264ce1256b04db8008a43882ae62d060" ], "author": { "name": "Dominik Brodowski", "email": "linux@dominikbrodowski.net", "time": "Fri Jan 01 17:40:49 2010 +0100" }, "committer": { "name": "Jesse Barnes", "email": "jbarnes@virtuousgeek.org", "time": "Mon Feb 22 16:16:56 2010 -0800" }, "message": "resource/PCI: align functions now return start of resource\n\nAs suggested by Linus, align functions should return the start\nof a resource, not void. An update of \"res-\u003estart\" is no longer\nnecessary.\n\nCc: Bjorn Helgaas \u003cbjorn.helgaas@hp.com\u003e\nCc: Yinghai Lu \u003cyhlu.kernel@gmail.com\u003e\nSigned-off-by: Dominik Brodowski \u003clinux@dominikbrodowski.net\u003e\nSigned-off-by: Jesse Barnes \u003cjbarnes@virtuousgeek.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": "04e4f2b18c8de1389d1e00fef0f42a8099910daf", "tree": "cd1ae20d055552a7ea9b9a21ee01a052589a66f5", "parents": [ "93939f4e5df30e6229a0b5257fdcaf3faf88471c" ], "author": { "name": "Mike Frysinger", "email": "vapier@gentoo.org", "time": "Wed Jan 06 17:23:17 2010 +0000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jan 06 18:16:02 2010 -0800" }, "message": "FDPIC: Respect PT_GNU_STACK exec protection markings when creating NOMMU stack\n\nThe current code will load the stack size and protection markings, but\nthen only use the markings in the MMU code path. The NOMMU code path\nalways passes PROT_EXEC to the mmap() call. While this doesn\u0027t matter\nto most people whilst the code is running, it will cause a pointless\nicache flush when starting every FDPIC application. Typically this\nicache flush will be of a region on the order of 128KB in size, or may\nbe the entire icache, depending on the facilities available on the CPU.\n\nIn the case where the arch default behaviour seems to be desired\n(EXSTACK_DEFAULT), we probe VM_STACK_FLAGS for VM_EXEC to determine\nwhether we should be setting PROT_EXEC or not.\n\nFor arches that support an MPU (Memory Protection Unit - an MMU without\nthe virtual mapping capability), setting PROT_EXEC or not will make an\nimportant difference.\n\nIt should be noted that this change also affects the executability of\nthe brk region, since ELF-FDPIC has that share with the stack. However,\nthis is probably irrelevant as NOMMU programs aren\u0027t likely to use the\nbrk region, preferring instead allocation via mmap().\n\nSigned-off-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\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": "239007b8440abff689632f50cdf0f2b9e895b534", "tree": "569cab843af4a999d6d868ec9a824530d2bfa733", "parents": [ "9f5a5621e78cf48d86682a71ceb3fcdbde38b222" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Tue Nov 17 16:46:45 2009 +0100" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Mon Dec 14 23:55:33 2009 +0100" }, "message": "genirq: Convert irq_desc.lock to raw_spinlock\n\nConvert locks which cannot be sleeping locks in preempt-rt to\nraw_spinlocks.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "273b281fa22c293963ee3e6eec418f5dda2dbc83", "tree": "1503005f5b106c0293a5eba1fb9ff90a9c91e4c9", "parents": [ "264a26838056fc2d759f58bec2e720e01fcb1bdb" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sun Oct 18 00:52:28 2009 +0200" }, "committer": { "name": "Michal Marek", "email": "mmarek@suse.cz", "time": "Sat Dec 12 13:08:15 2009 +0100" }, "message": "kbuild: move utsrelease.h to include/generated\n\nFix up all users of utsrelease.h\n\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: Michal Marek \u003cmmarek@suse.cz\u003e\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": "f8b7256096a20436f6d0926747e3ac3d64c81d24", "tree": "18bcabd1de263bd2d0f8d6b763bde8b037716c5c", "parents": [ "0067bd8a55862ac9dd212bd1c4f6f5bff1ca1301" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Mon Nov 30 17:37:04 2009 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Fri Dec 11 06:44:29 2009 -0500" }, "message": "Unify sys_mmap*\n\nNew helper - sys_mmap_pgoff(); switch syscalls to using it.\n\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\n" }, { "commit": "2588465badb648a50cd19623f0dd0063c90d4e31", "tree": "d114566c6b0c1d5b0958493a7a2ae5f1f2c6838c", "parents": [ "18821b0408efc92ec2804128ba9382a3bcebf132", "8c0daee204f794d095ae301f408c5f9f40e4547d" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 08:07:51 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 09 08:07:51 2009 -0800" }, "message": "Merge branch \u0027bkl-arch-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027bkl-arch-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:\n mn10300: Remove the BKL from sys_execve\n m68knommu: Remove the BKL from sys_execve\n m68k: Remove the BKL from sys_execve\n h83000: Remove BKL from sys_execve\n frv: Remove the BKL from sys_execve\n blackfin: Remove the BKL from sys_execve\n um: Remove BKL from mmapper\n um: Remove BKL from random\n s390: Remove BKL from prng\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": "d7fc02c7bae7b1cf69269992cf880a43a350cdaa", "tree": "a43d56fa72913a1cc98a0bbebe054d08581b3a7c", "parents": [ "ee1262dbc65ce0b6234a915d8432171e8d77f518", "28b4d5cc17c20786848cdc07b7ea237a309776bb" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 07:55:01 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Dec 08 07:55:01 2009 -0800" }, "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: (1815 commits)\n mac80211: fix reorder buffer release\n iwmc3200wifi: Enable wimax core through module parameter\n iwmc3200wifi: Add wifi-wimax coexistence mode as a module parameter\n iwmc3200wifi: Coex table command does not expect a response\n iwmc3200wifi: Update wiwi priority table\n iwlwifi: driver version track kernel version\n iwlwifi: indicate uCode type when fail dump error/event log\n iwl3945: remove duplicated event logging code\n b43: fix two warnings\n ipw2100: fix rebooting hang with driver loaded\n cfg80211: indent regulatory messages with spaces\n iwmc3200wifi: fix NULL pointer dereference in pmkid update\n mac80211: Fix TX status reporting for injected data frames\n ath9k: enable 2GHz band only if the device supports it\n airo: Fix integer overflow warning\n rt2x00: Fix padding bug on L2PAD devices.\n WE: Fix set events not propagated\n b43legacy: avoid PPC fault during resume\n b43: avoid PPC fault during resume\n tcp: fix a timewait refcnt race\n ...\n\nFix up conflicts due to sysctl cleanups (dead sysctl_check code and\nCTL_UNNUMBERED removed) in\n\tkernel/sysctl_check.c\n\tnet/ipv4/sysctl_net_ipv4.c\n\tnet/ipv6/addrconf.c\n\tnet/sctp/sysctl.c\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": "3505d1a9fd65e2d3e00827857b6795d9d8983658", "tree": "941cfafdb57c427bb6b7ebf6354ee93b2a3693b5", "parents": [ "dfef948ed2ba69cf041840b5e860d6b4e16fa0b1", "66b00a7c93ec782d118d2c03bd599cfd041e80a1" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 18 22:19:03 2009 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Nov 18 22:19:03 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tdrivers/net/sfc/sfe4001.c\n\tdrivers/net/wireless/libertas/cmd.c\n\tdrivers/staging/Kconfig\n\tdrivers/staging/Makefile\n\tdrivers/staging/rtl8187se/Kconfig\n\tdrivers/staging/rtl8192e/Kconfig\n" }, { "commit": "6d4561110a3e9fa742aeec6717248a491dfb1878", "tree": "689e2abf19940416ce597ba56ed31026ff59bd21", "parents": [ "86926d0096279b9739ceeff40f68d3c33b9119a9" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Mon Nov 16 03:11:48 2009 -0800" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Nov 18 08:37:40 2009 -0800" }, "message": "sysctl: Drop \u0026 in front of every proc_handler.\n\nFor consistency drop \u0026 in front of every proc_handler. Explicity\ntaking the address is unnecessary and it prevents optimizations\nlike stubbing the proc_handlers to NULL.\n\nCc: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n" }, { "commit": "67a7e4f8bdfdff4b47c4a64bbc1fdbb3dfbd16c6", "tree": "c6175ba10bbb262992e9a9a575ce8b5c85ce3ee5", "parents": [ "163931922220e4cb5effd5af1e105038c2f0ab7a" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Fri Apr 03 03:53:38 2009 -0700" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Nov 12 02:05:00 2009 -0800" }, "message": "sysctl frv: Remove dead binary sysctl support\n\nNow that sys_sysctl is a generic wrapper around /proc/sys .ctl_name\nand .strategy members of sysctl tables are dead code. Remove them.\n\nCc: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n" }, { "commit": "961303c44d8384a872d7eee069701b044ef1abc5", "tree": "3fe1d59cfed90ba0fac61cdd379a3d9787d3755d", "parents": [ "757010f026ab3044c594003e216d00a33ed95c56" ], "author": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Wed Apr 01 04:46:38 2009 -0700" }, "committer": { "name": "Eric W. Biederman", "email": "ebiederm@xmission.com", "time": "Thu Nov 12 02:04:53 2009 -0800" }, "message": "sysctl: Remove the unused frv sysctl unumbers\n\nThe frv sysctl tables can only be used from proc so kill\nthe sysctl numbers.\n\nCc: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Eric W. Biederman \u003cebiederm@xmission.com\u003e\n" }, { "commit": "c896a2e0d80bbd5731f76609625a0cb7c9864a44", "tree": "1784d8030f500d213c644ebcbc359d3cfaba90b5", "parents": [ "c36987e2ef32e1bb7850379515f21187cba44754" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Mon Oct 26 16:50:23 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 29 07:39:32 2009 -0700" }, "message": "frv: fix check on unsigned in do_signal()\n\nsyscallno is unsigned\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b69975a35a7332624b6977a5676a6fc320070360", "tree": "b89000cbee4e605e3a98ec2fbb66b7d875024529", "parents": [ "25708a5fe7467dcc69d9b92c1701aad4a0c71887" ], "author": { "name": "John Kacur", "email": "jkacur@redhat.com", "time": "Mon Oct 12 22:53:25 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Wed Oct 14 17:18:14 2009 +0200" }, "message": "frv: Remove the BKL from sys_execve\n\nsys_execve for frv seems to be a copy-and-paste of sys_execve that no\nlonger requires the bkl. Just remove it.\n\nSigned-off-by: John Kacur \u003cjkacur@redhat.com\u003e\nReviewed-by: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nLKML-Reference: \u003calpine.LFD.2.00.0910130008320.3658@localhost.localdomain\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\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": "c775197d59995228909957e9f0ec128de2590682", "tree": "740a471323a2a7d90a81de90ada991ebfe661e20", "parents": [ "9d93f00580243cc059510d9d6ac4d2f5e97e5b83" ], "author": { "name": "David Howells", "email": "dhowells@redhat.com", "time": "Thu Sep 24 15:12:00 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 17:18:38 2009 -0700" }, "message": "FRV: Flash mappings for the MB93090-MB00 motherboard\n\nFlash mappings for the MB93090-MB00 evaluation motherboard.\n\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "8d65af789f3e2cf4cfbdbf71a0f7a61ebcd41d38", "tree": "121df3bfffc7853ac6d2c514ad514d4a748a0933", "parents": [ "c0d0787b6d47d9f4d5e8bd321921104e854a9135" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Wed Sep 23 15:57:19 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 07:21:04 2009 -0700" }, "message": "sysctl: remove \"struct file *\" argument of -\u003eproc_handler\n\nIt\u0027s unused.\n\nIt isn\u0027t needed -- read or write flag is already passed and sysctl\nshouldn\u0027t care about the rest.\n\nIt _was_ used in two places at arch/frv for some reason.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: \"Eric W. Biederman\" \u003cebiederm@xmission.com\u003e\nCc: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: James Morris \u003cjmorris@namei.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2bcd57ab61e7cabed626226a3771617981c11ce1", "tree": "687c0c35fb2a632cb8c56b2729f9c3873c9461bd", "parents": [ "95e0d86badc410d525ea7218fd32df7bfbf9c837" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Thu Sep 24 04:22:25 2009 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 18:13:10 2009 -0700" }, "message": "headers: utsname.h redux\n\n* remove asm/atomic.h inclusion from linux/utsname.h --\n not needed after kref conversion\n * remove linux/utsname.h inclusion from files which do not need it\n\nNOTE: it looks like fs/binfmt_elf.c do not need utsname.h, however\ndue to some personality stuff it _is_ needed -- cowardly leave ELF-related\nheaders and files alone.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c37efa932598de5e30330a1414e34d9e082e0d9e", "tree": "1e3b782d257fa39a54f583af3dc7c32d7cffc67d", "parents": [ "9e12a7e7d89ad813d01092890010cf67d0f914bd", "abe1ee3a221d53778c3e58747bbec6e518e5471b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 15:37:02 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 15:37:02 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (30 commits)\n Use macros for .data.page_aligned section.\n Use macros for .bss.page_aligned section.\n Use new __init_task_data macro in arch init_task.c files.\n kbuild: Don\u0027t define ALIGN and ENTRY when preprocessing linker scripts.\n arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0\n kbuild: add static to prototypes\n kbuild: fail build if recordmcount.pl fails\n kbuild: set -fconserve-stack option for gcc 4.5\n kbuild: echo the record_mcount command\n gconfig: disable \"typeahead find\" search in treeviews\n kbuild: fix cc1 options check to ensure we do not use -fPIC when compiling\n checkincludes.pl: add option to remove duplicates in place\n markup_oops: use modinfo to avoid confusion with underscored module names\n checkincludes.pl: provide usage helper\n checkincludes.pl: close file as soon as we\u0027re done with it\n ctags: usability fix\n kernel hacking: move STRIP_ASM_SYMS from General\n gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma\n kbuild: Check if linker supports the -X option\n kbuild: introduce ld-option\n ...\n\nFix trivial conflict in scripts/basic/fixdep.c\n" }, { "commit": "a70770998c1d99e86eea97294ae3cce059a18d7e", "tree": "a8c43c965cee862c2bf77f75a6297ad3e4f30c46", "parents": [ "d19110baaf20d5183689287bdbcf91e26e40cb79" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Wed Sep 23 10:04:02 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 10:15:21 2009 -0700" }, "message": "FRV: Use asm/generic-hardirq.h\n\nUse asm/generic-hardirq.h to build asm/hardirq.h and also remove the unused\nidle_timestamp field in irq_cpustat whilst we\u0027re at it.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cf63ff5fa4399e215cc5ef322ccd8bddfff9afa6", "tree": "edd5aedf961528321b01d6b9f474f32a9fd48563", "parents": [ "fd8b327ee46593ccc5230bfd053287fbf7c38a69" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Wed Sep 23 10:33:54 2009 +0100" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 10:05:22 2009 -0700" }, "message": "misc: remove redundant start_kernel prototypes\n\nImpact: cleanup\n\nNo need for redeclaration.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "342ff1a1b558ebbdb8cbd55ab6a63eca8b2473ca", "tree": "1f967f283dade6e03897169bb29513354f49f910", "parents": [ "50223e486cabdcf7e540e519da1f26bab3084e5d", "24ed7a97464db44592495f98cff8bcee02f92bc2" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:51:45 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:51:45 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (34 commits)\n trivial: fix typo in aic7xxx comment\n trivial: fix comment typo in drivers/ata/pata_hpt37x.c\n trivial: typo in kernel-parameters.txt\n trivial: fix typo in tracing documentation\n trivial: add __init/__exit macros in drivers/gpio/bt8xxgpio.c\n trivial: add __init macro/ fix of __exit macro location in ipmi_poweroff.c\n trivial: remove unnecessary semicolons\n trivial: Fix duplicated word \"options\" in comment\n trivial: kbuild: remove extraneous blank line after declaration of usage()\n trivial: improve help text for mm debug config options\n trivial: doc: hpfall: accept disk device to unload as argument\n trivial: doc: hpfall: reduce risk that hpfall can do harm\n trivial: SubmittingPatches: Fix reference to renumbered step\n trivial: fix typos \"man[ae]g?ment\" -\u003e \"management\"\n trivial: media/video/cx88: add __init/__exit macros to cx88 drivers\n trivial: fix typo in CONFIG_DEBUG_FS in gcov doc\n trivial: fix missing printk space in amd_k7_smp_check\n trivial: fix typo s/ketymap/keymap/ in comment\n trivial: fix typo \"to to\" in multiple files\n trivial: fix typos in comments s/DGBU/DBGU/\n ...\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": "3dbda77e6f3375f87090cfce97b2551d3723521b", "tree": "2029181fa4663ccab8c3afe00c61443ccbb59311", "parents": [ "31d0f84591b3bf49801a7e3f905a6089d857aa87" ], "author": { "name": "Uwe Kleine-Koenig", "email": "u.kleine-koenig@pengutronix.de", "time": "Thu Jul 23 08:31:31 2009 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Sep 21 15:14:56 2009 +0200" }, "message": "trivial: fix typos \"man[ae]g?ment\" -\u003e \"management\"\n\nSigned-off-by: Uwe Kleine-Koenig \u003cu.kleine-koenig@pengutronix.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\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": "d200c922bc2b1ac88b8d33b6cfff2ed837af186a", "tree": "be5c04605d900380c935de58915787083667a8a2", "parents": [ "42f29a25207dc7b3051d299cc028d4b395d1328d" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Sep 20 18:14:13 2009 -0400" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Mon Sep 21 06:27:08 2009 +0200" }, "message": "Use new __init_task_data macro in arch init_task.c files.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Tim Abbott \u003ctabbott@ksplice.com\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "9c88b25bcfde51eccf2cca13d933a2948d0ca4eb", "tree": "01802b8aaeba42f5a4435eb6b0a39e924bc5fc72", "parents": [ "88ddb81e0f56cc7b603174d9666ecc80237425a0" ], "author": { "name": "Nelson Elhage", "email": "nelhage@ksplice.com", "time": "Fri Sep 18 15:52:08 2009 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 18 13:57:18 2009 -0700" }, "message": "frv: clean up linker script using new linker script macros.\n\nThis is largely a straightforward conversion. The patch results in\nfewer output sections, and some data being reordered, but should have\nno functional impact.\n\nAlso, note that this patch moves some data (namely, init_task and\ncacheline-aligned) inside [_sdata,_edata].\n\nBecause frv already builds using -ffunction-sections -fdata-sections,\nwe can\u0027t use BSS_SECTION or RW_DATA_SECTION yet, since they do not\ncurrently include the required .bss.* and .data.* sections.\n\nSigned-off-by: Nelson Elhage \u003cnelhage@ksplice.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Tim Abbott \u003ctabbott@ksplice.com\u003e\nAcked-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "88ddb81e0f56cc7b603174d9666ecc80237425a0", "tree": "30efad7858e628cd86edc1ad8b6d3421abbe5a52", "parents": [ "3530c1886291df061e3972c55590777ef1cb67f8" ], "author": { "name": "Nelson Elhage", "email": "nelhage@ksplice.com", "time": "Fri Sep 18 15:52:07 2009 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 18 13:57:18 2009 -0700" }, "message": "frv: remove unused .altinstructions code\n\nIt appears that frv copied the .altinstructions definitions in its linker\nscript from x86. Since frv doesn\u0027t put anything in those sections, this\nis just dead code.\n\nSigned-off-by: Nelson Elhage \u003cnelhage@ksplice.com\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e\nSigned-off-by: Tim Abbott \u003ctabbott@ksplice.com\u003e\nAcked-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4406c56d0a4da7a37b9180abeaece6cd00bcc874", "tree": "65a85fa73a25d24cbed6d163fdcf8df1b934a0be", "parents": [ "6b7b352f2102e21f9d8f38e932f01d9c5705c073", "5e3573db2bd5db6925159279d99576a4635bdb66" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 16 07:49:54 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 16 07:49:54 2009 -0700" }, "message": "Merge branch \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6\n\n* \u0027linux-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (75 commits)\n PCI hotplug: clean up acpi_run_hpp()\n PCI hotplug: acpiphp: use generic pci_configure_slot()\n PCI hotplug: shpchp: use generic pci_configure_slot()\n PCI hotplug: pciehp: use generic pci_configure_slot()\n PCI hotplug: add pci_configure_slot()\n PCI hotplug: clean up acpi_get_hp_params_from_firmware() interface\n PCI hotplug: acpiphp: don\u0027t cache hotplug_params in acpiphp_bridge\n PCI hotplug: acpiphp: remove superfluous _HPP/_HPX evaluation\n PCI: Clear saved_state after the state has been restored\n PCI PM: Return error codes from pci_pm_resume()\n PCI: use dev_printk in quirk messages\n PCI / PCIe portdrv: Fix pcie_portdrv_slot_reset()\n PCI Hotplug: convert acpi_pci_detect_ejectable() to take an acpi_handle\n PCI Hotplug: acpiphp: find bridges the easy way\n PCI: pcie portdrv: remove unused variable\n PCI / ACPI PM: Propagate wake-up enable for devices w/o ACPI support\n ACPI PM: Replace wakeup.prepared with reference counter\n PCI PM: Introduce device flag wakeup_prepared\n PCI / ACPI PM: Rework some debug messages\n PCI PM: Simplify PCI wake-up code\n ...\n\nFixed up conflict in arch/powerpc/kernel/pci_64.c due to OF device tree\nscanning having been moved and merged for the 32- and 64-bit cases. The\n\u0027needs_freset\u0027 initialization added in 6e19314cc (\"PCI/powerpc: support\nPCIe fundamental reset\") is now in arch/powerpc/kernel/pci_of_scan.c.\n" } ], "next": "ada3fa15057205b7d3f727bba5cd26b5912e350f" }