)]}' { "log": [ { "commit": "6a108a14fa356ef607be308b68337939e56ea94e", "tree": "1bf260572bd8f95ed867307a2bcf5d881c8ae4a6", "parents": [ "12fcdba1b7ae8b25696433f420b775aeb556d89b" ], "author": { "name": "David Rientjes", "email": "rientjes@google.com", "time": "Thu Jan 20 14:44:16 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 20 17:02:05 2011 -0800" }, "message": "kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT\n\nThe meaning of CONFIG_EMBEDDED has long since been obsoleted; the option\nis used to configure any non-standard kernel with a much larger scope than\nonly small devices.\n\nThis patch renames the option to CONFIG_EXPERT in init/Kconfig and fixes\nreferences to the option throughout the kernel. A new CONFIG_EMBEDDED\noption is added that automatically selects CONFIG_EXPERT when enabled and\ncan be used in the future to isolate options that should only be\nconsidered for embedded systems (RISC architectures, SLOB, etc).\n\nCalling the option \"EXPERT\" more accurately represents its intention: only\nexpert users who understand the impact of the configuration changes they\nare making should enable it.\n\nReviewed-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: David Woodhouse \u003cdavid.woodhouse@intel.com\u003e\nSigned-off-by: David Rientjes \u003crientjes@google.com\u003e\nCc: Greg KH \u003cgregkh@suse.de\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jens Axboe \u003caxboe@kernel.dk\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Robin Holt \u003cholt@sgi.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": "1ddd6db43a08cba56c7ee920800980862086f1c3", "tree": "696b6d3c44832b08a55de8724b8539dacd96bd4c", "parents": [ "37c2ac7872a9387542616f658d20ac25f5bdb32e" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Thu Jan 13 15:47:17 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 17:32:47 2011 -0800" }, "message": "thp: mm: define MADV_NOHUGEPAGE\n\nDefine MADV_NOHUGEPAGE.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@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": "a826e422420b461a6247137c292ff83c4800354a", "tree": "803e3aeb39606e2fe58daa238c454b335aa25cbc", "parents": [ "1c9bf22c09ae14d65225d9b9619b2eb357350cd7" ], "author": { "name": "Andrea Arcangeli", "email": "aarcange@redhat.com", "time": "Thu Jan 13 15:46:31 2011 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jan 13 17:32:38 2011 -0800" }, "message": "thp: mm: define MADV_HUGEPAGE\n\nDefine MADV_HUGEPAGE.\n\nSigned-off-by: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nAcked-by: Rik van Riel \u003criel@redhat.com\u003e\nAcked-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Mel Gorman \u003cmel@csn.ul.ie\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "b7b8de087384cc1954a8cd075af3f9e5977caa2e", "tree": "e362fe2c886c610caa9bd45fead9c4ae4789529e", "parents": [ "fbc92a3455577ab17615cbcb91826399061bd789" ], "author": { "name": "Werner Fink", "email": "werner@suse.de", "time": "Fri Dec 03 12:48:23 2010 +0100" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Thu Dec 16 16:18:28 2010 -0800" }, "message": "TTY: Add tty ioctl to figure device node of the system console.\n\nThis has been in the SuSE kernels for a very long time.\n\nSigned-off-by: Werner Fink \u003cwerner@suse.de\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\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": "5ef45079dd9c8f2e9c7aa788dc3121835ae52863", "tree": "47f8cd54f6663ea960f78404fe29cef5c250dc68", "parents": [ "0a3d763f1a68c97daae57e40c6d698986d1b38f4" ], "author": { "name": "Namhyung Kim", "email": "namhyung@gmail.com", "time": "Wed Oct 27 15:34:06 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Oct 27 18:03:12 2010 -0700" }, "message": "ptrace: cleanup arch_ptrace() on xtensa\n\nUse new \u0027datap\u0027 variable in order to remove unnecessary castings.\n\nSigned-off-by: Namhyung Kim \u003cnamhyung@gmail.com\u003e\nCc: Chris Zankel \u003cchris@zankel.net\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": "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": "229aebb873e29726b91e076161649cf45154b0bf", "tree": "acc02a3702215bce8d914f4c8cc3d7a1382b1c67", "parents": [ "8de547e1824437f3c6af180d3ed2162fa4b3f389", "50a23e6eec6f20d55a3a920e47adb455bff6046e" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 24 13:41:39 2010 -0700" }, "message": "Merge branch \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-next\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)\n Update broken web addresses in arch directory.\n Update broken web addresses in the kernel.\n Revert \"drivers/usb: Remove unnecessary return\u0027s from void functions\" for musb gadget\n Revert \"Fix typo: configuation \u003d\u003e configuration\" partially\n ida: document IDA_BITMAP_LONGS calculation\n ext2: fix a typo on comment in ext2/inode.c\n drivers/scsi: Remove unnecessary casts of private_data\n drivers/s390: Remove unnecessary casts of private_data\n net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data\n drivers/infiniband: Remove unnecessary casts of private_data\n drivers/gpu/drm: Remove unnecessary casts of private_data\n kernel/pm_qos_params.c: Remove unnecessary casts of private_data\n fs/ecryptfs: Remove unnecessary casts of private_data\n fs/seq_file.c: Remove unnecessary casts of private_data\n arm: uengine.c: remove C99 comments\n arm: scoop.c: remove C99 comments\n Fix typo configue \u003d\u003e configure in comments\n Fix typo: configuation \u003d\u003e configuration\n Fix typo interrest[ing|ed] \u003d\u003e interest[ing|ed]\n Fix various typos of valid in comments\n ...\n\nFix up trivial conflicts in:\n\tdrivers/char/ipmi/ipmi_si_intf.c\n\tdrivers/usb/gadget/rndis.c\n\tnet/irda/irnet/irnet_ppp.c\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": "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": "d1ea13c6e2cce0106531852daaa93dd97aec9580", "tree": "9a49b1029af4e63e08267d2b4d6e2f66396be0aa", "parents": [ "a800c7cc5380fbb6b4f2f3bd89f6776eb3da2242" ], "author": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Sep 23 18:40:07 2010 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Thu Sep 23 19:12:26 2010 +0200" }, "message": "genirq: Cleanup irq_chip-\u003etypename leftovers\n\n3 years transition phase is enough. Cleanup the last users and remove\nthe cruft.\n\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Leo Chen \u003cleochen@broadcom.com\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: Chris Metcalf \u003ccmetcalf@tilera.com\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Chris Zankel \u003cchris@zankel.net\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": "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": "6396fc3b3ff3f6b942992b653a62df11dcef9bea", "tree": "db3c7cbe833b43c653adc99f70941431c5ff7c4e", "parents": [ "4785879e4d340e24e54f6de2ccfc42728b912808", "3d30701b58970425e1d45994d6cb82f828924fdd" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 11 09:36:51 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Wed Aug 11 09:36:51 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nConflicts:\n\tfs/exofs/inode.c\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": "fb8231a8b139035476f2a8aaac837d0099b66dad", "tree": "2875806beb96ea0cdab292146767a5085721dc6a", "parents": [ "426d31071ac476ea62c62656b242930c17b58c00", "f6cec0ae58c17522a7bc4e2f39dae19f199ab534" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Aug 10 13:22:08 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Aug 10 13:22:08 2010 +0200" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nConflicts:\n\tarch/arm/mach-omap1/board-nokia770.c\n" }, { "commit": "eef35c2d41ddcc653c20d26b977acaa45c811e1f", "tree": "616db0eb06b6a3881902db59a0a5bd590277b5a1", "parents": [ "3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4" ], "author": { "name": "Stefan Weil", "email": "weil@mail.berlios.de", "time": "Fri Aug 06 21:11:15 2010 +0200" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Aug 09 11:22:49 2010 +0200" }, "message": "Fix spelling fuction -\u003e function in comments\n\nTo avoid more patches, I also fixed other spelling\nand grammar bugs when they were in the same or\nfollowing line:\n\nsuccessfull -\u003e successful\nparse -\u003e parses\ncontroler -\u003e controller\ncontrolers -\u003e controllers\n\nCc: Jiri Kosina \u003ctrivial@kernel.org\u003e\nCc: linux-kernel@vger.kernel.org\nSigned-off-by: Stefan Weil \u003cweil@mail.berlios.de\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\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": "66630f71e23a3b5fe778d38aea2f0c6d017602bf", "tree": "4aa52e15d68ce870fc8e7dbc140eeb16cd99ef79", "parents": [ "9fe6206f400646a2322096b56c59891d530e8d51", "ecd53497b706b235a10c70d4fc639768d7235c5f" ], "author": { "name": "Chris Zankel", "email": "czankel@speedy.(none)", "time": "Tue Aug 03 00:38:00 2010 -0700" }, "committer": { "name": "Chris Zankel", "email": "czankel@speedy.(none)", "time": "Tue Aug 03 00:38:00 2010 -0700" }, "message": "Merge remote branch \u0027origin/master\u0027\n" }, { "commit": "ecd53497b706b235a10c70d4fc639768d7235c5f", "tree": "32ec66556bd472dfdd2bb4dac1f2a450e37dc450", "parents": [ "d1eca29e7adc5e50165b9856cbb00014c274c5c7" ], "author": { "name": "Chris Zankel", "email": "czankel@speedy.(none)", "time": "Tue Aug 03 00:18:38 2010 -0700" }, "committer": { "name": "Chris Zankel", "email": "czankel@speedy.(none)", "time": "Tue Aug 03 00:18:38 2010 -0700" }, "message": "xtensa: Disable PCI and nfsroot on simulation target\n\nThe ISS platform is a pure simulation target and doesn\u0027t support PCI,\nso disable it in the default configuration.\n\nSigned-off-by: Chris Zankel \u003cchris@zankel.net\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": "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": "f76f5d71048e116f76d2eb02226b01d50890e2f4", "tree": "04e0abc99d61e8beb4d35149d303bda0068dd68d", "parents": [ "c421b08ef52f38049c6f591c5d260a97af7b0000" ], "author": { "name": "Nick Piggin", "email": "npiggin@suse.de", "time": "Fri Jun 04 14:14:51 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 04 15:21:44 2010 -0700" }, "message": "xtensa: 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 Rientjes \u003crientjes@google.com\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6ba686711122462e26a6b355712a321297a2e6d0", "tree": "944be856ef2daefe866f704d4d5c84f64959aacc", "parents": [ "d904c5bf8fa8bf8be6fb312baa9fa1cd5e86a83e" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed May 26 14:44:41 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu May 27 09:12:55 2010 -0700" }, "message": "xtensa: use use asm-generic/scatterlist.h\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "1f0a738868cbfe20ae53a00b7c302c04ef7ab8fc", "tree": "50f4eb77f1facf04cb27d5f09b99e3b1a2e9e6e7", "parents": [ "e520c410854bab763be24e0fce7ba89dc252efee" ], "author": { "name": "Jaswinder Singh Rajput", "email": "jaswinder@kernel.org", "time": "Mon May 24 14:31:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:56 2010 -0700" }, "message": "xtensa: includecheck fix: vectors.S\n\nfix the following \u0027make includecheck\u0027 warnings:\n\n arch/xtensa/kernel/vectors.S: asm/processor.h is included more than once.\n arch/xtensa/kernel/vectors.S: asm/ptrace.h is included more than once.\n\nSigned-off-by: Jaswinder Singh Rajput \u003cjaswinderrajput@gmail.com\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "e520c410854bab763be24e0fce7ba89dc252efee", "tree": "6beaa5a9c76eb007f89ba0a8424004ded46d26d1", "parents": [ "498900fc9cd1adbad1ba6b55ed9d8f2f5d655ca3" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Mon May 24 14:31:46 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:56 2010 -0700" }, "message": "xtensa: convert to asm-generic/hardirq.h\n\nAlso remove lots of unused irq_cpustat fields.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "498900fc9cd1adbad1ba6b55ed9d8f2f5d655ca3", "tree": "f99c1a1917f7d5f51977af9459bcc63d637ee209", "parents": [ "7e125f7b9cbfce4101191b8076d606c517a73066" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Mon May 24 14:31:45 2010 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue May 25 08:06:56 2010 -0700" }, "message": "xtensa: 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\nCc: Chris Zankel \u003cchris@zankel.net\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": "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": "d1eca29e7adc5e50165b9856cbb00014c274c5c7", "tree": "a0291628fcde413875e8d819fb3ff49cfd141aab", "parents": [ "0a972468ec3f8a5f86193a8f124f7b04cf600c3c" ], "author": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Mon May 03 01:06:43 2010 -0700" }, "committer": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Mon May 03 01:06:43 2010 -0700" }, "message": "xtensa: Add missing include in coprocessor.h\n\nCoprocessor.h depends on variant settings.\n\nSigned-off-by: Chris Zankel \u003cchris@zankel.net\u003e\n" }, { "commit": "0a972468ec3f8a5f86193a8f124f7b04cf600c3c", "tree": "541a5e8fb18c93427a81544b92a5556a7c9fdb21", "parents": [ "4573e398d591a2fe6c600908578fd31401746529" ], "author": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Sun May 02 08:37:20 2010 -0700" }, "committer": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Sun May 02 08:37:20 2010 -0700" }, "message": "xtensa: Fix the network driver for the simulator target\n\nNetwork methods have moved to the net_device_ops structure.\n\nSigned-off-by: Chris Zankel \u003cchris@zankel.net\u003e\n" }, { "commit": "4573e398d591a2fe6c600908578fd31401746529", "tree": "f74ae1023b753cc0ca986af1a3d79535858a8821", "parents": [ "cf1c0aaf816ecc90106d997c0af3f7cdde6c2a71" ], "author": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Sun May 02 01:05:13 2010 -0700" }, "committer": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Sun May 02 01:05:13 2010 -0700" }, "message": "xtensa: Shuffle include statements to fix linker script\n\nThe linker script was including assembly macros from the coprocessor\nheader file that is not otherwise used by the script.\n\nSigned-off-by: Chris Zankel \u003cchris@zankel.net\u003e\n" }, { "commit": "cf1c0aaf816ecc90106d997c0af3f7cdde6c2a71", "tree": "01675289e91831767de41522dbecbc8b807a2e6a", "parents": [ "8b307f9c471c7d198070227be26007258b43140e" ], "author": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Sun May 02 01:00:22 2010 -0700" }, "committer": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Sun May 02 01:00:22 2010 -0700" }, "message": "xtensa: Add -mforce-no-pic option is supported\n\nGCC is configured to always compile with PIC enabled for the Xtensa\narchitecture. This fails when nfsroot is enabled as the code uses a\nnon-conformant segment that mismatches in permissione with a read-only\nsegment.\nA patch has been submitted to GCC to add the machine-option \u0027force-no-pic\u0027\nthat disables PIC.\n\nSigned-off-by: Chris Zankel \u003cchris@zankel.net\u003e\n" }, { "commit": "8b307f9c471c7d198070227be26007258b43140e", "tree": "ce154e92b3ab9da1f67924d103af6e8fbeea3440", "parents": [ "ed5010ea469baa8c0038d027c3b79a600da36811" ], "author": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Sat May 01 23:05:29 2010 -0700" }, "committer": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Sat May 01 23:05:29 2010 -0700" }, "message": "xtensa: Fixes due to bss boundary symbol name changes.\n\nThe bss start and end symbols have changed to __bss_start and __bss_stop.\n\nSigned-off-by: Chris Zankel \u003cchris@zankel.net\u003e\n" }, { "commit": "ed5010ea469baa8c0038d027c3b79a600da36811", "tree": "ba70a250d2ea286f4eae0d2822ac3bf975f8a9b3", "parents": [ "91e080633221cadece6c1c37786ef8a18a9d1a5e" ], "author": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Sat May 01 23:00:07 2010 -0700" }, "committer": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Sat May 01 23:00:07 2010 -0700" }, "message": "xtensa: Fix linker script patch-up\n\nThe Xtensa architecture requires to patch the generated linker script\nto insert precede certain sections with a .literal section. Ammend the\nsed script to fix-up only sequences that start with a \u0027*\u0027:\n\u0027*(.init.text)\u0027 -\u003e \u0027*(.init.literal .init.text)\u0027\n\nSigned-off-by: Chris Zankel \u003cchris@zankel.net\u003e\n" }, { "commit": "91e080633221cadece6c1c37786ef8a18a9d1a5e", "tree": "bf692d1036d806152f27c693373d0276e74eed1e", "parents": [ "66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8" ], "author": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Sat May 01 22:55:21 2010 -0700" }, "committer": { "name": "Chris Zankel", "email": "chris@zankel.net", "time": "Sat May 01 22:55:21 2010 -0700" }, "message": "xtensa: Fix FLUSH_DCACHE macro for some variants.\n\nDefine ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE also for processor configurations\nthat don\u0027t have cache-aliasing.\n\nSigned-off-by: Chris Zankel \u003cchris@zankel.net\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": "c32da02342b7521df25fefc2ef20aee0e61cf887", "tree": "7e38f664fa3e13602c357d37f77d8adcf82fccc2", "parents": [ "dca1d9f6d7ae428c193f32bd3e9a4ca13176648b", "318ae2edc3b29216abd8a2510f3f80b764f06858" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 16:04:50 2010 -0800" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (56 commits)\n doc: fix typo in comment explaining rb_tree usage\n Remove fs/ntfs/ChangeLog\n doc: fix console doc typo\n doc: cpuset: Update the cpuset flag file\n Fix of spelling in arch/sparc/kernel/leon_kernel.c no longer needed\n Remove drivers/parport/ChangeLog\n Remove drivers/char/ChangeLog\n doc: typo - Table 1-2 should refer to \"status\", not \"statm\"\n tree-wide: fix typos \"ass?o[sc]iac?te\" -\u003e \"associate\" in comments\n No need to patch AMD-provided drivers/gpu/drm/radeon/atombios.h\n devres/irq: Fix devm_irq_match comment\n Remove reference to kthread_create_on_cpu\n tree-wide: Assorted spelling fixes\n tree-wide: fix \u0027lenght\u0027 typo in comments and code\n drm/kms: fix spelling in error message\n doc: capitalization and other minor fixes in pnp doc\n devres: typo fix s/dev/devm/\n Remove redundant trailing semicolons from macros\n fix typo \"definetly\" -\u003e \"definitely\" in comment\n tree-wide: s/widht/width/g typo in comments\n ...\n\nFix trivial conflict in Documentation/laptops/00-INDEX\n" }, { "commit": "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": "479ea1e90c2b052de793a80ecc5eceab480f44ff", "tree": "3a239dd73d1b9935fa5594fa1ec5b949940c96bd", "parents": [ "d15b51be6f3a04762522c8ee9ac6a3a02752c0ed" ], "author": { "name": "FUJITA Tomonori", "email": "fujita.tomonori@lab.ntt.co.jp", "time": "Wed Mar 10 15:23:28 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:41 2010 -0800" }, "message": "pci-dma: xtensa: use include/linux/pci-dma.h\n\nSigned-off-by: FUJITA Tomonori \u003cfujita.tomonori@lab.ntt.co.jp\u003e\nCc: Chris Zankel \u003cchris@zankel.net\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": "6d75ca10225be4c7509026f9b61c740b22e734e4", "tree": "3a57ab05345bb25aff05e5da913468ee2897b45f", "parents": [ "1bd095083558928cc3b36b826422d69bcd743dca" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Wed Mar 10 15:22:57 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Mar 12 15:52:39 2010 -0800" }, "message": "xtensa: use generic ptrace_resume code\n\nUse the generic ptrace_resume code for PTRACE_SYSCALL, PTRACE_CONT,\nPTRACE_KILL and PTRACE_SINGLESTEP. This implies defining\narch_has_single_step in \u003casm/ptrace.h\u003e and implementing the\nuser_enable_single_step and user_disable_single_step functions, which also\ncauses the breakpoint information to be cleared on fork, which could be\nconsidered a bug fix.\n\nAlso the TIF_SYSCALL_TRACE thread flag is now cleared on PTRACE_KILL which\nit previously wasn\u0027t which is consistent with all architectures using the\nmodern ptrace code.\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Oleg Nesterov \u003coleg@redhat.com\u003e\nCc: Roland McGrath \u003croland@redhat.com\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "104f9c471ffb425fd081074ef31521b38d77592a", "tree": "abb978c84b51caf6c15cabab5641c983f1e0064c", "parents": [ "c4507257764ae0387f0d8c2ca57808f37e4c9439" ], "author": { "name": "John Stultz", "email": "johnstul@us.ibm.com", "time": "Thu Mar 11 14:11:39 2010 -0800" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Mar 13 00:36:37 2010 +0100" }, "message": "xtensa: Fix unnecessary setting of xtime\n\nxtensa supports read_persisitent_clock(), so there is no reason for\nthe arch specific code to be setting xtime. Setting xtime will be\ndone by the generic timekeeping code.\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "318ae2edc3b29216abd8a2510f3f80b764f06858", "tree": "ce595adde342f57f379d277b25e4dd206988a052", "parents": [ "25cf84cf377c0aae5dbcf937ea89bc7893db5176", "3e58974027b04e84f68b964ef368a6cd758e2f84" ], "author": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Mon Mar 08 16:55:37 2010 +0100" }, "message": "Merge branch \u0027for-next\u0027 into for-linus\n\nConflicts:\n\tDocumentation/filesystems/proc.txt\n\tarch/arm/mach-u300/include/mach/debug-macro.S\n\tdrivers/net/qlge/qlge_ethtool.c\n\tdrivers/net/qlge/qlge_main.c\n\tdrivers/net/typhoon.c\n" }, { "commit": "6d6b89bd2e316b78d668f761d380837b81fa71ef", "tree": "7e63c58611fc6181153526abbdafdd846ed1a19d", "parents": [ "13dda80e48439b446d0bc9bab34b91484bc8f533", "2507c05ff55fbf38326b08ed27eaed233bc75042" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 02 07:55:08 2010 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Mar 02 07:55:08 2010 -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: (1341 commits)\n virtio_net: remove forgotten assignment\n be2net: fix tx completion polling\n sis190: fix cable detect via link status poll\n net: fix protocol sk_buff field\n bridge: Fix build error when IGMP_SNOOPING is not enabled\n bnx2x: Tx barriers and locks\n scm: Only support SCM_RIGHTS on unix domain sockets.\n vhost-net: restart tx poll on sk_sndbuf full\n vhost: fix get_user_pages_fast error handling\n vhost: initialize log eventfd context pointer\n vhost: logging thinko fix\n wireless: convert to use netdev_for_each_mc_addr\n ethtool: do not set some flags, if others failed\n ipoib: returned back addrlen check for mc addresses\n netlink: Adding inode field to /proc/net/netlink\n axnet_cs: add new id\n bridge: Make IGMP snooping depend upon BRIDGE.\n bridge: Add multicast count/interval sysfs entries\n bridge: Add hash elasticity/max sysfs entries\n bridge: Add multicast_snooping sysfs toggle\n ...\n\nTrivial conflicts in Documentation/feature-removal-schedule.txt\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": "47871889c601d8199c51a4086f77eebd77c29b0b", "tree": "40cdcac3bff0ee40cc33dcca61d0577cdf965f77", "parents": [ "c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3", "30ff056c42c665b9ea535d8515890857ae382540" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 28 19:23:06 2010 -0800" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Feb 28 19:23:06 2010 -0800" }, "message": "Merge branch \u0027master\u0027 of /home/davem/src/GIT/linux-2.6/\n\nConflicts:\n\tdrivers/firmware/iscsi_ibft.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": "4cd24eaf0c6ee7f0242e34ee77ec899f255e66b5", "tree": "99f57f6374a58022e1e5ed1cbc12699288c7eae1", "parents": [ "8e5574211d96c0552f84c757718475fdb4021be7" ], "author": { "name": "Jiri Pirko", "email": "jpirko@redhat.com", "time": "Mon Feb 08 04:30:35 2010 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Fri Feb 12 11:38:58 2010 -0800" }, "message": "net: use netdev_mc_count and netdev_mc_empty when appropriate\n\nThis patch replaces dev-\u003emc_count in all drivers (hopefully I didn\u0027t miss\nanything). Used spatch and did small tweaks and conding style changes when\nit was suitable.\n\nJirka\n\nSigned-off-by: Jiri Pirko \u003cjpirko@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "3ad2f3fbb961429d2aa627465ae4829758bc7e07", "tree": "f365c513e8f5b477a61336a600ff54f32b7ad6e1", "parents": [ "1537a3638cbf741d3826c1002026cce487a6bee0" ], "author": { "name": "Daniel Mack", "email": "daniel@caiaq.de", "time": "Wed Feb 03 08:01:28 2010 +0800" }, "committer": { "name": "Jiri Kosina", "email": "jkosina@suse.cz", "time": "Tue Feb 09 11:13:56 2010 +0100" }, "message": "tree-wide: Assorted spelling fixes\n\nIn particular, several occurances of funny versions of \u0027success\u0027,\n\u0027unknown\u0027, \u0027therefore\u0027, \u0027acknowledge\u0027, \u0027argument\u0027, \u0027achieve\u0027, \u0027address\u0027,\n\u0027beginning\u0027, \u0027desirable\u0027, \u0027separate\u0027 and \u0027necessary\u0027 are fixed.\n\nSigned-off-by: Daniel Mack \u003cdaniel@caiaq.de\u003e\nCc: Joe Perches \u003cjoe@perches.com\u003e\nCc: Junio C Hamano \u003cgitster@pobox.com\u003e\nSigned-off-by: Jiri Kosina \u003cjkosina@suse.cz\u003e\n" }, { "commit": "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": "bac5e54c29f352d962a2447d22735316b347b9f1", "tree": "7642993fa93164835ffaa2dacd341388193f1979", "parents": [ "529e89430d6c0d64db8ac474cb95e68e2527c79a", "c05c4edd876b7ae92787d1295868afcb89b6a348" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 12:04:02 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Dec 16 12:04:02 2009 -0800" }, "message": "Merge branch \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6\n\n* \u0027master\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: (38 commits)\n direct I/O fallback sync simplification\n ocfs: stop using do_sync_mapping_range\n cleanup blockdev_direct_IO locking\n make generic_acl slightly more generic\n sanitize xattr handler prototypes\n libfs: move EXPORT_SYMBOL for d_alloc_name\n vfs: force reval of target when following LAST_BIND symlinks (try #7)\n ima: limit imbalance msg\n Untangling ima mess, part 3: kill dead code in ima\n Untangling ima mess, part 2: deal with counters\n Untangling ima mess, part 1: alloc_file()\n O_TRUNC open shouldn\u0027t fail after file truncation\n ima: call ima_inode_free ima_inode_free\n IMA: clean up the IMA counts updating code\n ima: only insert at inode creation time\n ima: valid return code from ima_inode_alloc\n fs: move get_empty_filp() deffinition to internal.h\n Sanitize exec_permission_lite()\n Kill cached_lookup() and real_lookup()\n Kill path_lookup_open()\n ...\n\nTrivial conflicts in fs/direct-io.c\n" }, { "commit": "853b3da10d617f08340e5fe569c99e7b54f2a568", "tree": "1c89150faf505825989026dd12641cedaadd6bb8", "parents": [ "8bea8672edfca7ec5f661cafb218f1205863b343" ], "author": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Dec 16 00:34:13 2009 -0500" }, "committer": { "name": "Al Viro", "email": "viro@zeniv.linux.org.uk", "time": "Wed Dec 16 12:16:40 2009 -0500" }, "message": "sanitize do_pipe_flags() callers in arch\n\n* hpux_pipe() - no need to take BKL\n* sys32_pipe() in arch/x86/ia32 and xtensa_pipe() in arch/xtensa -\n\tno need at all, since both functions are open-coded sys_pipe()\n\nSigned-off-by: Al Viro \u003cviro@zeniv.linux.org.uk\u003e\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": "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": "0f4974c439dd7826c85bae4e6a8088ce2db0f498", "tree": "fdabc7d9bb7d7bc49aad547c0aac3a633ce01f09", "parents": [ "3126c136bc30225d7a43af741778aa50e95e467a", "36ba782e9674cdc29ec7003757df0b375e99fa96" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 11 15:34:40 2009 -0800" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Dec 11 15:34:40 2009 -0800" }, "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: (58 commits)\n tty: split the lock up a bit further\n tty: Move the leader test in disassociate\n tty: Push the bkl down a bit in the hangup code\n tty: Push the lock down further into the ldisc code\n tty: push the BKL down into the handlers a bit\n tty: moxa: split open lock\n tty: moxa: Kill the use of lock_kernel\n tty: moxa: Fix modem op locking\n tty: moxa: Kill off the throttle method\n tty: moxa: Locking clean up\n tty: moxa: rework the locking a bit\n tty: moxa: Use more tty_port ops\n tty: isicom: fix deadlock on shutdown\n tty: mxser: Use the new locking rules to fix setserial properly\n tty: mxser: use the tty_port_open method\n tty: isicom: sort out the board init logic\n tty: isicom: switch to the new tty_port_open helper\n tty: tty_port: Add a kref object to the tty port\n tty: istallion: tty port open/close methods\n tty: stallion: Convert to the tty_port_open/close methods\n ...\n" }, { "commit": "1cceefd3a28e54c0777fe544e1fd32253b2a1de5", "tree": "0f5e7903750cd5c511beb4ae801989308681629f", "parents": [ "e6bdf24cf2992e1775fc095ed021f6b886707c41" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Sat Oct 03 00:12:06 2009 +0400" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Dec 11 15:18:03 2009 -0800" }, "message": "tty: const: constify remaining tty_operations\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n\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": "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": "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": "a2e2725541fad72416326798c2d7fa4dafb7d337", "tree": "6174be11da607e83eb8efb3775114ad4d6e0ca3a", "parents": [ "c05e85a06e376f6b6d59e71e5333d707e956d78b" ], "author": { "name": "Arnaldo Carvalho de Melo", "email": "acme@redhat.com", "time": "Mon Oct 12 23:40:10 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Mon Oct 12 23:40:10 2009 -0700" }, "message": "net: Introduce recvmmsg socket syscall\n\nMeaning receive multiple messages, reducing the number of syscalls and\nnet stack entry/exit operations.\n\nNext patches will introduce mechanisms where protocols that want to\noptimize this operation will provide an unlocked_recvmsg operation.\n\nThis takes into account comments made by:\n\n. Paul Moore: sock_recvmsg is called only for the first datagram,\n sock_recvmsg_nosec is used for the rest.\n\n. Caitlin Bestler: recvmmsg now has a struct timespec timeout, that\n works in the same fashion as the ppoll one.\n\n If the underlying protocol returns a datagram with MSG_OOB set, this\n will make recvmmsg return right away with as many datagrams (+ the OOB\n one) it has received so far.\n\n. Rémi Denis-Courmont \u0026 Steven Whitehouse: If we receive N \u003c vlen\n datagrams and then recvmsg returns an error, recvmmsg will return\n the successfully received datagrams, store the error and return it\n in the next call.\n\nThis paves the way for a subsequent optimization, sk_prot-\u003eunlocked_recvmsg,\nwhere we will be able to acquire the lock only at batch start and end, not at\nevery underlying recvmsg call.\n\nSigned-off-by: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\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": "d43c36dc6b357fa1806800f18aa30123c747a6d1", "tree": "339ce510073ecbe9b3592008f7dece7b277035ef", "parents": [ "69585dd69e663a40729492c7b52eb82477a2027a" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Wed Oct 07 17:09:06 2009 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Oct 11 11:20:58 2009 -0700" }, "message": "headers: remove sched.h from interrupt.h\n\nAfter m68k\u0027s task_thread_info() doesn\u0027t refer to current,\nit\u0027s possible to remove sched.h from interrupt.h and not break m68k!\nMany thanks to Heiko Carstens for allowing this.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\n" }, { "commit": "cd3db323eb88514c45d25db51335a522560af702", "tree": "fca5bd7dd12909a2ea22845de0e87634e6aedb74", "parents": [ "ab635e7d499f23a5791e69e2ebbc9a40c9983d89" ], "author": { "name": "Tim Abbott", "email": "tabbott@ksplice.com", "time": "Thu Sep 24 10:36:19 2009 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 24 17:16:21 2009 -0700" }, "message": "xtensa: Cleanup linker script using new linker script macros.\n\nSigned-off-by: Tim Abbott \u003ctabbott@ksplice.com\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nAcked-by: Sam Ravnborg \u003csam@ravnborg.org\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": "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": "cc013a88906bad9d2832d6316de1c7dbc1c2a794", "tree": "c47d1bc76cf9bbf94c328ca6e15ac99ddbab7603", "parents": [ "73d7c33e81aed92ac185950a20407c1a2ea65a83" ], "author": { "name": "Geert Uytterhoeven", "email": "Geert.Uytterhoeven@sonycom.com", "time": "Mon Sep 21 17:02:36 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:34 2009 -0700" }, "message": "arches: drop superfluous casts in nr_free_pages() callers\n\nCommit 96177299416dbccb73b54e6b344260154a445375 (\"Drop free_pages()\")\nmodified nr_free_pages() to return \u0027unsigned long\u0027 instead of \u0027unsigned\nint\u0027. This made the casts to \u0027unsigned long\u0027 in most callers superfluous,\nso remove them.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Geert Uytterhoeven \u003cGeert.Uytterhoeven@sonycom.com\u003e\nReviewed-by: Christoph Lameter \u003ccl@linux-foundation.org\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: Russell King \u003crmk+kernel@arm.linux.org.uk\u003e\nAcked-by: David S. Miller \u003cdavem@davemloft.net\u003e\nAcked-by: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nAcked-by: WANG Cong \u003cxiyou.wangcong@gmail.com\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@atmel.com\u003e\nCc: Mikael Starvik \u003cstarvik@axis.com\u003e\nCc: \"Luck, Tony\" \u003ctony.luck@intel.com\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nAcked-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Chris Zankel \u003czankel@tensilica.com\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "d19f352484467a5e518639ddff0554669c10ffab", "tree": "87c31fff63fd3dccb2e47ddfee878a11228b7777", "parents": [ "3866ea90d3635ddddcd77ce51087222ac7de85f2" ], "author": { "name": "Hugh Dickins", "email": "hugh.dickins@tiscali.co.uk", "time": "Mon Sep 21 17:01:53 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:31 2009 -0700" }, "message": "ksm: define MADV_MERGEABLE and MADV_UNMERGEABLE\n\nThe out-of-tree KSM used ioctls on fds cloned from /dev/ksm to register a\nmemory area for merging: we prefer now to use an madvise(2) interface.\n\nThis patch just defines MADV_MERGEABLE (to tell KSM it may merge pages in\nthis area found identical to pages in other mergeable areas) and\nMADV_UNMERGEABLE (to undo that).\n\nMost architectures use asm-generic, but alpha, mips, parisc, xtensa need\ntheir own definitions: included here for mmotm convenience, but we\u0027ll\nprobably want to split this and feed pieces to arch maintainers.\n\nBased upon earlier patches by Chris Wright and Izik Eidus.\n\nSigned-off-by: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nSigned-off-by: Chris Wright \u003cchrisw@redhat.com\u003e\nSigned-off-by: Izik Eidus \u003cieidus@redhat.com\u003e\nCc: Michael Kerrisk \u003cmtk.manpages@gmail.com\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Helge Deller \u003cdeller@gmx.de\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nCc: Andrea Arcangeli \u003caarcange@redhat.com\u003e\nCc: Rik van Riel \u003criel@redhat.com\u003e\nCc: Wu Fengguang \u003cfengguang.wu@intel.com\u003e\nCc: Balbir Singh \u003cbalbir@in.ibm.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: KAMEZAWA Hiroyuki \u003ckamezawa.hiroyu@jp.fujitsu.com\u003e\nCc: Lee Schermerhorn \u003clee.schermerhorn@hp.com\u003e\nCc: Avi Kivity \u003cavi@redhat.com\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "02b7da37f7acd49277dea1481dc0c5c246c09732", "tree": "0544bfe6df222e4a3999116db3b691d6621e1977", "parents": [ "d200c922bc2b1ac88b8d33b6cfff2ed837af186a" ], "author": { "name": "Tim Abbott", "email": "tabbott@ksplice.com", "time": "Sun Sep 20 18:14:14 2009 -0400" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Mon Sep 21 06:27:08 2009 +0200" }, "message": "Use macros for .bss.page_aligned section.\n\nThis patch changes the remaining direct references to\n.bss.page_aligned in C and assembly code to use the macros in\ninclude/linux/linkage.h.\n\nSigned-off-by: Tim Abbott \u003ctabbott@ksplice.com\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e\nCc: H. Peter Anvin \u003chpa@zytor.com\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\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": "51b563fc93c8cb5bff1d67a0a71c374e4a4ea049", "tree": "38c6a6d185183b30b8dbe59d5b8fa78815a1fdd4", "parents": [ "4356f4890792a678936c93c9196e8f7742e04535" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sun Sep 20 12:28:22 2009 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sun Sep 20 12:28:22 2009 +0200" }, "message": "arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0\n\nAlbin Tonnerre \u003calbin.tonnerre@free-electrons.com\u003e reported:\n\n Bash 4 filters out variables which contain a dot in them.\n This happends to be the case of CPPFLAGS_vmlinux.lds.\n This is rather unfortunate, as it now causes\n build failures when using SHELL\u003d/bin/bash to compile,\n or when bash happens to be used by make (eg when it\u0027s /bin/sh)\n\nRemove the common definition of CPPFLAGS_vmlinux.lds by\npushing relevant stuff to either Makefile.build or the\narch specific kernel/Makefile where we build the linker script.\n\nThis is also nice cleanup as we move the information out where\nit is used.\n\nNotes for the different architectures touched:\n\narm - we use an already exported symbol\ncris - we use a config symbol aleady available\n [Not build tested]\nmips - the jiffies complexity has moved to vmlinux.lds.S where we need it.\n Added a few variables to CPPFLAGS - they are only used by\n the linker script.\n [Not build tested]\npowerpc - removed assignment that is not needed\n [not build tested]\nsparc - simplified it using $(BITS)\num - introduced a few new exported variables to deal with this\nxtensa - added options to CPP invocation\n [not build tested]\n\nCc: Albin Tonnerre \u003calbin.tonnerre@free-electrons.com\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Mikael Starvik \u003cstarvik@axis.com\u003e\nCc: Jesper Nilsson \u003cjesper.nilsson@axis.com\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "a03fdb7612874834d6847107198712d18b5242c7", "tree": "9ae81170509fd8b1c23d1b7e8edfa7a2203ffce3", "parents": [ "202c4675c55ddf6b443c7e057d2dff6b42ef71aa", "12e09337fe238981cb0c87543306e23775d1a143" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 18 09:15:24 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Sep 18 09:15:24 2009 -0700" }, "message": "Merge branch \u0027timers-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027timers-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (34 commits)\n time: Prevent 32 bit overflow with set_normalized_timespec()\n clocksource: Delay clocksource down rating to late boot\n clocksource: clocksource_select must be called with mutex locked\n clocksource: Resolve cpu hotplug dead lock with TSC unstable, fix crash\n timers: Drop a function prototype\n clocksource: Resolve cpu hotplug dead lock with TSC unstable\n timer.c: Fix S/390 comments\n timekeeping: Fix invalid getboottime() value\n timekeeping: Fix up read_persistent_clock() breakage on sh\n timekeeping: Increase granularity of read_persistent_clock(), build fix\n time: Introduce CLOCK_REALTIME_COARSE\n x86: Do not unregister PIT clocksource on PIT oneshot setup/shutdown\n clocksource: Avoid clocksource watchdog circular locking dependency\n clocksource: Protect the watchdog rating changes with clocksource_mutex\n clocksource: Call clocksource_change_rating() outside of watchdog_lock\n timekeeping: Introduce read_boot_clock\n timekeeping: Increase granularity of read_persistent_clock()\n timekeeping: Update clocksource with stop_machine\n timekeeping: Add timekeeper read_clock helper functions\n timekeeping: Move NTP adjusted clock multiplier to struct timekeeper\n ...\n\nFix trivial conflict due to MIPS lemote -\u003e loongson renaming.\n" }, { "commit": "ada3fa15057205b7d3f727bba5cd26b5912e350f", "tree": "60962fc9e4021b92f484d1a58e72cd3906d4f3db", "parents": [ "2f82af08fcc7dc01a7e98a49a5995a77e32a2925", "5579fd7e6aed8860ea0c8e3f11897493153b10ad" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:39:44 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 15 09:39:44 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (46 commits)\n powerpc64: convert to dynamic percpu allocator\n sparc64: use embedding percpu first chunk allocator\n percpu: kill lpage first chunk allocator\n x86,percpu: use embedding for 64bit NUMA and page for 32bit NUMA\n percpu: update embedding first chunk allocator to handle sparse units\n percpu: use group information to allocate vmap areas sparsely\n vmalloc: implement pcpu_get_vm_areas()\n vmalloc: separate out insert_vmalloc_vm()\n percpu: add chunk-\u003ebase_addr\n percpu: add pcpu_unit_offsets[]\n percpu: introduce pcpu_alloc_info and pcpu_group_info\n percpu: move pcpu_lpage_build_unit_map() and pcpul_lpage_dump_cfg() upward\n percpu: add @align to pcpu_fc_alloc_fn_t\n percpu: make @dyn_size mandatory for pcpu_setup_first_chunk()\n percpu: drop @static_size from first chunk allocators\n percpu: generalize first chunk allocator selection\n percpu: build first chunk allocators selectively\n percpu: rename 4k first chunk allocator to page\n percpu: improve boot messages\n percpu: fix pcpu_reclaim() locking\n ...\n\nFix trivial conflict as by Tejun Heo in kernel/sched.c\n" }, { "commit": "d4f587c67fc39e0030ddd718675e252e208da4d7", "tree": "2222681c57966cc6b8404afdff3ab1a09ac7ea69", "parents": [ "75c5158f70c065b9704b924503d96e8297838f79" ], "author": { "name": "Martin Schwidefsky", "email": "schwidefsky@de.ibm.com", "time": "Fri Aug 14 15:47:31 2009 +0200" }, "committer": { "name": "Thomas Gleixner", "email": "tglx@linutronix.de", "time": "Sat Aug 15 10:55:46 2009 +0200" }, "message": "timekeeping: Increase granularity of read_persistent_clock()\n\nThe persistent clock of some architectures (e.g. s390) have a\nbetter granularity than seconds. To reduce the delta between the\nhost clock and the guest clock in a virtualized system change the \nread_persistent_clock function to return a struct timespec.\n\nSigned-off-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nAcked-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Daniel Walker \u003cdwalker@fifo99.com\u003e\nLKML-Reference: \u003c20090814134811.013873340@de.ibm.com\u003e\nSigned-off-by: Thomas Gleixner \u003ctglx@linutronix.de\u003e\n" }, { "commit": "384be2b18a5f9475eab9ca2bdfa95cc1a04ef59c", "tree": "04c93f391a1b65c8bf8d7ba8643c07d26c26590a", "parents": [ "a76761b621bcd8336065c4fe3a74f046858bc34c", "142d44b0dd6741a64a7bdbe029110e7c1dcf1d23" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Aug 14 14:41:02 2009 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Fri Aug 14 14:45:31 2009 +0900" }, "message": "Merge branch \u0027percpu-for-linus\u0027 into percpu-for-next\n\nConflicts:\n\tarch/sparc/kernel/smp_64.c\n\tarch/x86/kernel/cpu/perf_counter.c\n\tarch/x86/kernel/setup_percpu.c\n\tdrivers/cpufreq/cpufreq_ondemand.c\n\tmm/percpu.c\n\nConflicts in core and arch percpu codes are mostly from commit\ned78e1e078dd44249f88b1dd8c76dafb39567161 which substituted many\nnum_possible_cpus() with nr_cpu_ids. As for-next branch has moved all\nthe first chunk allocators into mm/percpu.c, the changes are moved\nfrom arch code to mm/percpu.c.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\n" }, { "commit": "aa11d958d1a6572eda08214d7c6a735804fe48a5", "tree": "d025b05270ad1e010660d17eeadc6ac3c1abbd7d", "parents": [ "07f6642ee9418e962e54cbc07471cfe2e559c568", "9799218ae36910af50f002a5db1802d576fffb43" ], "author": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 12 17:44:53 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 12 17:44:53 2009 -0700" }, "message": "Merge branch \u0027master\u0027 of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6\n\nConflicts:\n\tarch/microblaze/include/asm/socket.h\n" }, { "commit": "0d6038ee76f2e06b79d0465807f67e86bf4025de", "tree": "ffb88e2f817ae2a76fece58a7f7d0de3fd37fbaf", "parents": [ "49c794e94649020248e37b78db16cd25bad38b4f" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue Aug 04 07:28:29 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 05 13:02:57 2009 -0700" }, "message": "net: implement a SO_DOMAIN getsockoption\n\nThis sockopt goes in line with SO_TYPE and SO_PROTOCOL. It makes it\npossible for userspace programs to pass around file descriptors — I\nam referring to arguments-to-functions, but it may even work for the\nfd passing over UNIX sockets — without needing to also pass the\nauxiliary information (PF_INET6/IPPROTO_TCP).\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "49c794e94649020248e37b78db16cd25bad38b4f", "tree": "76c455522d37fa0fa88c7466bb494523cb320fab", "parents": [ "c1c00ab8626298ac784ea344bf10e94b5bd9bcb5" ], "author": { "name": "Jan Engelhardt", "email": "jengelh@medozas.de", "time": "Tue Aug 04 07:28:28 2009 +0000" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Wed Aug 05 13:02:56 2009 -0700" }, "message": "net: implement a SO_PROTOCOL getsockoption\n\nSimilar to SO_TYPE returning the socket type, SO_PROTOCOL allows to\nretrieve the protocol used with a given socket.\n\nI am not quite sure why we have that-many copies of socket.h, and why\nthe values are not the same on all arches either, but for where hex\nnumbers dominate, I use 0x1029 for SO_PROTOCOL as that seems to be\nthe next free unused number across a bunch of operating systems, or\nso Google results make me want to believe. SO_PROTOCOL for others\njust uses the next free Linux number, 38.\n\nSigned-off-by: Jan Engelhardt \u003cjengelh@medozas.de\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "9e1b32caa525cb236e80e9c671e179bcecccc657", "tree": "8a1f0abf5291b23047cfdf099d5cfc96cc9d9253", "parents": [ "4be3bd7849165e7efa6b0b35a23d6a3598d97465" ], "author": { "name": "Benjamin Herrenschmidt", "email": "benh@kernel.crashing.org", "time": "Wed Jul 22 15:44:28 2009 +1000" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Jul 27 12:10:38 2009 -0700" }, "message": "mm: Pass virtual address to [__]p{te,ud,md}_free_tlb()\n\nmm: Pass virtual address to [__]p{te,ud,md}_free_tlb()\n\nUpcoming paches to support the new 64-bit \"BookE\" powerpc architecture\nwill need to have the virtual address corresponding to PTE page when\nfreeing it, due to the way the HW table walker works.\n\nBasically, the TLB can be loaded with \"large\" pages that cover the whole\nvirtual space (well, sort-of, half of it actually) represented by a PTE\npage, and which contain an \"indirect\" bit indicating that this TLB entry\nRPN points to an array of PTEs from which the TLB can then create direct\nentries. Thus, in order to invalidate those when PTE pages are deleted,\nwe need the virtual address to pass to tlbilx or tlbivax instructions.\n\nThe old trick of sticking it somewhere in the PTE page struct page sucks\ntoo much, the address is almost readily available in all call sites and\nalmost everybody implemets these as macros, so we may as well add the\nargument everywhere. I added it to the pmd and pud variants for consistency.\n\nSigned-off-by: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nAcked-by: David Howells \u003cdhowells@redhat.com\u003e [MN10300 \u0026 FRV]\nAcked-by: Nick Piggin \u003cnpiggin@suse.de\u003e\nAcked-by: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e [s390]\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c99e6efe1ba04561e7d93a81f0be07e37427e835", "tree": "8a1743463ef9676e68b9c3971f0bbeea04111bdd", "parents": [ "2a6f86bc5ed4af2ff04bc927eb77789c70e53a1e" ], "author": { "name": "Peter Zijlstra", "email": "a.p.zijlstra@chello.nl", "time": "Fri Jul 10 14:57:56 2009 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jul 10 14:24:05 2009 -0700" }, "message": "sched: INIT_PREEMPT_COUNT\n\nPull the initial preempt_count value into a single\ndefinition site.\n\nMaintainers for: alpha, ia64 and m68k, please have a look,\nyour arch code is funny.\n\nThe header magic is a bit odd, but similar to the KERNEL_DS\none, CPP waits with expanding these macros until the\nINIT_THREAD_INFO macro itself is expanded, which is in\narch/*/kernel/init_task.c where we\u0027ve already included\nsched.h so we\u0027re good.\n\nCc: tony.luck@intel.com\nCc: rth@twiddle.net\nCc: geert@linux-m68k.org\nSigned-off-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Matt Mackall \u003cmpm@selenic.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "023bf6f1b8bf58dc4da7f0dc1cf4787b0d5297c1", "tree": "780331cadf207ced67dfcdf36a6479dc0e3d3c04", "parents": [ "1dcdd0911b5553f0282ce8525773955b59a56919" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Jul 09 11:27:40 2009 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Thu Jul 09 11:27:40 2009 +0900" }, "message": "linker script: unify usage of discard definition\n\nDiscarded sections in different archs share some commonality but have\nconsiderable differences. This led to linker script for each arch\nimplementing its own /DISCARD/ definition, which makes maintaining\ntedious and adding new entries error-prone.\n\nThis patch makes all linker scripts to move discard definitions to the\nend of the linker script and use the common DISCARDS macro. As ld\nuses the first matching section definition, archs can include default\ndiscarded sections by including them earlier in the linker script.\n\nia64 is notable because it first throws away some ia64 specific\nsubsections and then include the rest of the sections into the final\nimage, so those sections must be discarded before the inclusion.\n\ndefconfig compile tested for x86, x86-64, powerpc, powerpc64, ia64,\nalpha, sparc, sparc64 and s390. Michal Simek tested microblaze.\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nTested-by: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: linux-arch@vger.kernel.org\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: microblaze-uclinux@itee.uq.edu.au\nCc: Sam Ravnborg \u003csam@ravnborg.org\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\n" }, { "commit": "ad361c9884e809340f6daca80d56a9e9c871690a", "tree": "7ec02c9934964fecdc791a0df0fc722d3bda5c53", "parents": [ "e3288775ff63900fbb7db505f2b9a1bee98f07df" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Mon Jul 06 13:05:40 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Jul 08 10:30:03 2009 -0700" }, "message": "Remove multiple KERN_ prefixes from printk formats\n\nCommit 5fd29d6ccbc98884569d6f3105aeca70858b3e0f (\"printk: clean up\nhandling of log-levels and newlines\") changed printk semantics. printk\nlines with multiple KERN_\u003clevel\u003e prefixes are no longer emitted as\nbefore the patch.\n\n\u003clevel\u003e is now included in the output on each additional use.\n\nRemove all uses of multiple KERN_\u003clevel\u003es in formats.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "ec634fe328182a1a098585bfc7b69e5042bdb08d", "tree": "02883aaee743af10d78d6d8fe9181944b4dd4529", "parents": [ "a73e76e23c20c05cb8c0b7ba8bc9daa04b05c80f" ], "author": { "name": "Patrick McHardy", "email": "kaber@trash.net", "time": "Sun Jul 05 19:23:38 2009 -0700" }, "committer": { "name": "David S. Miller", "email": "davem@davemloft.net", "time": "Sun Jul 05 19:23:38 2009 -0700" }, "message": "net: convert remaining non-symbolic return values in ndo_start_xmit() functions\n\nThis patch converts the remaining occurences of raw return values to their\nsymbolic counterparts in ndo_start_xmit() functions that were missed by the\nprevious automatic conversion.\n\nAdditionally code that assumed the symbolic value of NETDEV_TX_OK to be zero\nis changed to explicitly use NETDEV_TX_OK.\n\nSigned-off-by: Patrick McHardy \u003ckaber@trash.net\u003e\nSigned-off-by: David S. Miller \u003cdavem@davemloft.net\u003e\n" }, { "commit": "c43768cbb7655ea5ff782ae250f6e2ef4297cf98", "tree": "3982e41dde3eecaa3739a5d1a8ed18d04bd74f01", "parents": [ "1a8dd307cc0a2119be4e578c517795464e6dabba", "746a99a5af60ee676afa2ba469ccd1373493c7e7" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Jul 04 07:13:18 2009 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Sat Jul 04 07:13:18 2009 +0900" }, "message": "Merge branch \u0027master\u0027 into for-next\n\nPull linus#master to merge PER_CPU_DEF_ATTRIBUTES and alpha build fix\nchanges. As alpha in percpu tree uses \u0027weak\u0027 attribute instead of\ninline assembly, there\u0027s no need for __used attribute.\n\nConflicts:\n\tarch/alpha/include/asm/percpu.h\n\tarch/mn10300/kernel/vmlinux.lds.S\n\tinclude/linux/percpu-defs.h\n" }, { "commit": "405d967dc70002991f8fc35c20e0d3cbc7614f63", "tree": "ace31796327e9035488310d42e06acbab3a28656", "parents": [ "e74e396204bfcb67570ba4517b08f5918e69afea" ], "author": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jun 24 15:13:38 2009 +0900" }, "committer": { "name": "Tejun Heo", "email": "tj@kernel.org", "time": "Wed Jun 24 15:13:38 2009 +0900" }, "message": "linker script: throw away .discard section\n\nx86 throws away .discard section but no other archs do. Also,\n.discard is not thrown away while linking modules. Make every arch\nand module linking throw it away. This will be used to define dummy\nvariables for percpu declarations and definitions.\n\nThis patch is based on Ivan Kokshaysky\u0027s alpha percpu patch.\n\n[ Impact: always throw away everything in .discard ]\n\nSigned-off-by: Tejun Heo \u003ctj@kernel.org\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Russell King \u003clinux@arm.linux.org.uk\u003e\nCc: Haavard Skinnemoen \u003chskinnemoen@atmel.com\u003e\nCc: Bryan Wu \u003ccooloney@kernel.org\u003e\nCc: Mikael Starvik \u003cstarvik@axis.com\u003e\nCc: Jesper Nilsson \u003cjesper.nilsson@axis.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Yoshinori Sato \u003cysato@users.sourceforge.jp\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Michal Simek \u003cmonstr@monstr.eu\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: David S. Miller \u003cdavem@davemloft.net\u003e\nCc: Jeff Dike \u003cjdike@addtoit.com\u003e\nCc: Chris Zankel \u003cchris@zankel.net\u003e\nCc: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\n" } ], "next": "aafd1255d08fb26cab87d1b28ff35a15bdb2ed68" }