)]}' { "log": [ { "commit": "412145947adfca60a4b5b4893fbae82dffa25edd", "tree": "3836b50b2674c351a36f400e0ec0acef05e3f845", "parents": [ "2e2ec952350f25242f2e0539db16b1e46f9eb01b" ], "author": { "name": "Alan Cox", "email": "alan@linux.intel.com", "time": "Thu Oct 29 12:16:22 2009 +0000" }, "committer": { "name": "Greg Kroah-Hartman", "email": "gregkh@suse.de", "time": "Fri Oct 30 14:43:12 2009 -0700" }, "message": "tty: Mark generic_serial users as BROKEN\n\nThere isn\u0027t much else I can do with these. I can find no hardware for any\nof them and no users. The code is broken.\n\nSigned-off-by: Alan Cox \u003calan@linux.intel.com\u003e\nCc: stable \u003cstable@kernel.org\u003e\nSigned-off-by: Greg Kroah-Hartman \u003cgregkh@suse.de\u003e\n" }, { "commit": "a28b3dc90964ed961b6ed2c320885ab8b3a0a8ff", "tree": "ba16d435330bbafae0b61882e32bb89a3fa3dc3a", "parents": [ "b3db4a8ad19173a8fd0ced13d47c97910f1ab14b" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Thu Oct 01 15:43:57 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Oct 01 16:11:11 2009 -0700" }, "message": "revert \"m68k: convert to asm-generic/hardirq.h\"\n\nRevert 45d80eea87c9f8292d2d33173d6866c0ec57238a (\"m68k: convert to\nasm-generic/hardirq.h\") - it fails to compile due to an inclusion tangle:\n\nIn file included from include/linux/irq.h:12,\n from include/asm-generic/hardirq.h:6,\n from /usr/src/devel/arch/m68k/include/asm/hardirq_mm.h:6,\n from /usr/src/devel/arch/m68k/include/asm/hardirq.h:4,\n from include/linux/hardirq.h:10,\n from /usr/src/devel/arch/m68k/include/asm/system_mm.h:69,\n from /usr/src/devel/arch/m68k/include/asm/system.h:4,\n from include/linux/list.h:7,\n from include/linux/preempt.h:11,\n from include/linux/spinlock.h:50,\n from include/linux/seqlock.h:29,\n from include/linux/time.h:8,\n from include/linux/timex.h:56,\n from include/linux/sched.h:56,\n from arch/m68k/kernel/asm-offsets.c:14:\ninclude/linux/smp.h:17: error: field \u0027list\u0027 has incomplete type\n\nCc: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "2bcd57ab61e7cabed626226a3771617981c11ce1", "tree": "687c0c35fb2a632cb8c56b2729f9c3873c9461bd", "parents": [ "95e0d86badc410d525ea7218fd32df7bfbf9c837" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Thu Sep 24 04:22:25 2009 +0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 18:13:10 2009 -0700" }, "message": "headers: utsname.h redux\n\n* remove asm/atomic.h inclusion from linux/utsname.h --\n not needed after kref conversion\n * remove linux/utsname.h inclusion from files which do not need it\n\nNOTE: it looks like fs/binfmt_elf.c do not need utsname.h, however\ndue to some personality stuff it _is_ needed -- cowardly leave ELF-related\nheaders and files alone.\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "c37efa932598de5e30330a1414e34d9e082e0d9e", "tree": "1e3b782d257fa39a54f583af3dc7c32d7cffc67d", "parents": [ "9e12a7e7d89ad813d01092890010cf67d0f914bd", "abe1ee3a221d53778c3e58747bbec6e518e5471b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 15:37:02 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Wed Sep 23 15:37:02 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-next: (30 commits)\n Use macros for .data.page_aligned section.\n Use macros for .bss.page_aligned section.\n Use new __init_task_data macro in arch init_task.c files.\n kbuild: Don\u0027t define ALIGN and ENTRY when preprocessing linker scripts.\n arm, cris, mips, sparc, powerpc, um, xtensa: fix build with bash 4.0\n kbuild: add static to prototypes\n kbuild: fail build if recordmcount.pl fails\n kbuild: set -fconserve-stack option for gcc 4.5\n kbuild: echo the record_mcount command\n gconfig: disable \"typeahead find\" search in treeviews\n kbuild: fix cc1 options check to ensure we do not use -fPIC when compiling\n checkincludes.pl: add option to remove duplicates in place\n markup_oops: use modinfo to avoid confusion with underscored module names\n checkincludes.pl: provide usage helper\n checkincludes.pl: close file as soon as we\u0027re done with it\n ctags: usability fix\n kernel hacking: move STRIP_ASM_SYMS from General\n gitignore usr/initramfs_data.cpio.bz2 and usr/initramfs_data.cpio.lzma\n kbuild: Check if linker supports the -X option\n kbuild: introduce ld-option\n ...\n\nFix trivial conflict in scripts/basic/fixdep.c\n" }, { "commit": "45d80eea87c9f8292d2d33173d6866c0ec57238a", "tree": "2286da07cdadfb600200679cf9d0090278a39230", "parents": [ "4ad4c76b7afb71774b846b322ad2ae42f814331a" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Mon Sep 21 17:04:07 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:44 2009 -0700" }, "message": "m68k: convert to asm-generic/hardirq.h\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "4ad4c76b7afb71774b846b322ad2ae42f814331a", "tree": "eae834caeb70f70c1112113628cf6f94a0bdfd14", "parents": [ "ef187fd799c50e15dbb56a0286c81bf467bd0201" ], "author": { "name": "john stultz", "email": "johnstul@us.ibm.com", "time": "Mon Sep 21 17:04:05 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:43 2009 -0700" }, "message": "m68k: convert to use arch_gettimeoffset()\n\nConvert m68k to use GENERIC_TIME via the arch_getoffset() infrastructure,\nreducing the amount of arch specific code we need to maintain.\n\nI\u0027ve taken my best swing at converting this, but I\u0027m not 100% confident\nI got it right. My cross-compiler is now out of date (gcc4.2) so I\nwasn\u0027t able to check if it compiled. Any assistance from arch\nmaintainers or testers to get this merged would be great.\n\nSigned-off-by: John Stultz \u003cjohnstul@us.ibm.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6e17b17f1fc7b2f24383a693d63550d9e1460081", "tree": "146a9921760755dfd5398c3fd56df918e391fe0d", "parents": [ "94bf5ceac095c7d4cb5e4d40fa7e2dd81d722b75" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Sep 21 17:03:48 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:42 2009 -0700" }, "message": "mm: remove duplicate asm/mman.h files\n\nA number of architectures have identical asm/mman.h files so they can all\nbe merged by using the new generic file.\n\nThe remaining asm/mman.h files are substantially different from each\nother.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "90f72aa58bbf076b68e289fbd71eb829bc505923", "tree": "992e5f59086cc77581fa10b52fb4a46fb3baf3f0", "parents": [ "6bfde05bf5c9682e255c6a2c669dc80f91af6296" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Mon Sep 21 17:03:45 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Sep 22 07:17:41 2009 -0700" }, "message": "mm: add MAP_HUGETLB for mmaping pseudo-anonymous huge page regions\n\nAdd a flag for mmap that will be used to request a huge page region that\nwill look like anonymous memory to user space. This is accomplished by\nusing a file on the internal vfsmount. MAP_HUGETLB is a modifier of\nMAP_ANONYMOUS and so must be specified with it. The region will behave\nthe same as a MAP_ANONYMOUS region using small pages.\n\nThe patch also adds the MAP_STACK flag, which was previously defined only\non some architectures but not on others. Since MAP_STACK is meant to be a\nhint only, architectures can define it without assigning a specific\nmeaning to it.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Eric B Munson \u003cebmunson@us.ibm.com\u003e\nCc: Hugh Dickins \u003chugh.dickins@tiscali.co.uk\u003e\nCc: David Rientjes \u003crientjes@google.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "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": "cdd6c482c9ff9c55475ee7392ec8f672eddb7be6", "tree": "81f98a3ab46c589792057fe2392c1e10f8ad7893", "parents": [ "dfc65094d0313cc48969fa60bcf33d693aeb05a7" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Sep 21 12:02:48 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Sep 21 14:28:04 2009 +0200" }, "message": "perf: Do the big rename: Performance Counters -\u003e Performance Events\n\nBye-bye Performance Counters, welcome Performance Events!\n\nIn the past few months the perfcounters subsystem has grown out its\ninitial role of counting hardware events, and has become (and is\nbecoming) a much broader generic event enumeration, reporting, logging,\nmonitoring, analysis facility.\n\nNaming its core object \u0027perf_counter\u0027 and naming the subsystem\n\u0027perfcounters\u0027 has become more and more of a misnomer. With pending\ncode like hw-breakpoints support the \u0027counter\u0027 name is less and\nless appropriate.\n\nAll in one, we\u0027ve decided to rename the subsystem to \u0027performance\nevents\u0027 and to propagate this rename through all fields, variables\nand API names. (in an ABI compatible fashion)\n\nThe word \u0027event\u0027 is also a bit shorter than \u0027counter\u0027 - which makes\nit slightly more convenient to write/handle as well.\n\nThanks goes to Stephane Eranian who first observed this misnomer and\nsuggested a rename.\n\nUser-space tooling and ABI compatibility is not affected - this patch\nshould be function-invariant. (Also, defconfigs were not touched to\nkeep the size down.)\n\nThis patch has been generated via the following script:\n\n FILES\u003d$(find * -type f | grep -vE \u0027oprofile|[^K]config\u0027)\n\n sed -i \\\n -e \u0027s/PERF_EVENT_/PERF_RECORD_/g\u0027 \\\n -e \u0027s/PERF_COUNTER/PERF_EVENT/g\u0027 \\\n -e \u0027s/perf_counter/perf_event/g\u0027 \\\n -e \u0027s/nb_counters/nb_events/g\u0027 \\\n -e \u0027s/swcounter/swevent/g\u0027 \\\n -e \u0027s/tpcounter_event/tp_event/g\u0027 \\\n $FILES\n\n for N in $(find . -name perf_counter.[ch]); do\n M\u003d$(echo $N | sed \u0027s/perf_counter/perf_event/g\u0027)\n mv $N $M\n done\n\n FILES\u003d$(find . -name perf_event.*)\n\n sed -i \\\n -e \u0027s/COUNTER_MASK/REG_MASK/g\u0027 \\\n -e \u0027s/COUNTER/EVENT/g\u0027 \\\n -e \u0027s/\\\u003cevent\\\u003e/event_id/g\u0027 \\\n -e \u0027s/counter/event/g\u0027 \\\n -e \u0027s/Counter/Event/g\u0027 \\\n $FILES\n\n... to keep it as correct as possible. This script can also be\nused by anyone who has pending perfcounters patches - it converts\na Linux kernel tree over to the new naming. We tried to time this\nchange to the point in time where the amount of pending patches\nis the smallest: the end of the merge window.\n\nNamespace clashes were fixed up in a preparatory patch - and some\nstylistic fallout will be fixed up in a subsequent patch.\n\n( NOTE: \u0027counters\u0027 are still the proper terminology when we deal\n with hardware registers - and these sed scripts are a bit\n over-eager in renaming them. I\u0027ve undone some of that, but\n in case there\u0027s something left where \u0027counter\u0027 would be\n better than \u0027event\u0027 we can undo that on an individual basis\n instead of touching an otherwise nicely automated patch. )\n\nSuggested-by: Stephane Eranian \u003ceranian@google.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nAcked-by: Paul Mackerras \u003cpaulus@samba.org\u003e\nReviewed-by: Arjan van de Ven \u003carjan@linux.intel.com\u003e\nCc: Mike Galbraith \u003cefault@gmx.de\u003e\nCc: Arnaldo Carvalho de Melo \u003cacme@redhat.com\u003e\nCc: Frederic Weisbecker \u003cfweisbec@gmail.com\u003e\nCc: Steven Rostedt \u003crostedt@goodmis.org\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nLKML-Reference: \u003cnew-submission\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "d200c922bc2b1ac88b8d33b6cfff2ed837af186a", "tree": "be5c04605d900380c935de58915787083667a8a2", "parents": [ "42f29a25207dc7b3051d299cc028d4b395d1328d" ], "author": { "name": "Joe Perches", "email": "joe@perches.com", "time": "Sun Sep 20 18:14:13 2009 -0400" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Mon Sep 21 06:27:08 2009 +0200" }, "message": "Use new __init_task_data macro in arch init_task.c files.\n\nSigned-off-by: Joe Perches \u003cjoe@perches.com\u003e\nSigned-off-by: Tim Abbott \u003ctabbott@ksplice.com\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "caa27b66bd7188fd063769eaf4b33533ef0709e6", "tree": "57d9f96ad40712f690763fb205006938885bbc1a", "parents": [ "78f28b7c555359c67c2a0d23f7436e915329421e" ], "author": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Mon Jul 20 21:37:11 2009 +0200" }, "committer": { "name": "Sam Ravnborg", "email": "sam@ravnborg.org", "time": "Sun Sep 20 12:18:14 2009 +0200" }, "message": "kbuild: use INSTALLKERNEL to select customized installkernel script\n\nReplace the use of CROSS_COMPILE to select a customized\ninstallkernel script with the possibility to set INSTALLKERNEL\nto select a custom installkernel script when running make:\n\n make INSTALLKERNEL\u003darm-installkernel install\n\nWith this patch we are now more consistent across\ndifferent architectures - they did not all support use\nof CROSS_COMPILE.\n\nThe use of CROSS_COMPILE was a hack as this really belongs\nto gcc/binutils and the installkernel script does not change\njust because we change toolchain.\n\nThe use of CROSS_COMPILE caused troubles with an upcoming patch\nthat saves CROSS_COMPILE when a kernel is built - it would no\nlonger be installable.\n[Thanks to Peter Z. for this hint]\n\nThis patch undos what Ian did in commit:\n\n 0f8e2d62fa04441cd12c08ce521e84e5bd3f8a46\n (\"use ${CROSS_COMPILE}installkernel in arch/*/boot/install.sh\")\n\nThe patch has been lightly tested on x86 only - but all changes\nlooks obvious.\n\nAcked-by: Peter Zijlstra \u003cpeterz@infradead.org\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e [blackfin]\nAcked-by: Russell King \u003clinux@arm.linux.org.uk\u003e [arm]\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e [sh]\nAcked-by: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e [x86]\nCc: Ian Campbell \u003cicampbell@arcom.com\u003e\nCc: Tony Luck \u003ctony.luck@intel.com\u003e [ia64]\nCc: Fenghua Yu \u003cfenghua.yu@intel.com\u003e [ia64]\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e [m32r]\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e [m68k]\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e [parisc]\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e [powerpc]\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e [s390]\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e [x86]\nCc: Ingo Molnar \u003cmingo@redhat.com\u003e [x86]\nSigned-off-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\n" }, { "commit": "66bc4a6f34a950c7aede597c578352c3eba82017", "tree": "d8005bd9abc0209cff47072d7e48cf19fddc52f5", "parents": [ "96c015b75feaaa67c8744229937bd9c35919d16b", "2985709d7f3078c7609ae7f16affc0fb478d7d7a" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 17 09:52:43 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Sep 17 09:52:43 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (53 commits)\n m68knommu: Make PAGE_SIZE available to assembly files.\n m68knommu: fix ColdFire definition of CLOCK_TICK_RATE\n m68knommu: set multi-function pins for ethernet when enabled\n m68knommu: remove special interrupt handling code for ne2k support\n m68knommu: relax IO_SPACE_LIMIT setting\n m68knommu: remove ColdFire direct interrupt register access\n m68knommu: create a speciailized ColdFire 5272 interrupt controller\n m68knommu: add support for second interrupt controller of ColdFire 5249\n m68knommu: clean up old ColdFire timer irq setup\n m68knommu: map ColdFire interrupts to correct masking bits\n m68knommu: clean up ColdFire 532x CPU timer setup\n m68knommu: simplify ColdFire \"timers\" clock initialization\n m68knommu: support code to mask external interrupts on old ColdFire CPU\u0027s\n m68knommu: merge old ColdFire interrupt controller masking macros\n m68knommu: remove duplicate ColdFire mcf_autovector() code\n m68knommu: move ColdFire INTC definitions to new include file\n m68knommu: mask off all interrupts in ColdFire intc-simr controller\n m68knommu: remove timer device interrupt setup for ColdFire 532x\n m68knommu: remove interrupt masking from ColdFire pit timer\n m68knommu: remove unecessary interrupt level setting in ColdFire 520x setup\n ...\n" }, { "commit": "2985709d7f3078c7609ae7f16affc0fb478d7d7a", "tree": "26ab2bf000bd6a251ae6ab13eaeb9e214199b968", "parents": [ "2756730b798e4f1f8343cf034c33cc730ae3a5d4" ], "author": { "name": "Tim Abbott", "email": "tabbott@ksplice.com", "time": "Mon Sep 07 17:26:49 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:57 2009 +1000" }, "message": "m68knommu: Make PAGE_SIZE available to assembly files.\n\nSigned-off-by: Tim Abbott \u003ctabbott@ksplice.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "2756730b798e4f1f8343cf034c33cc730ae3a5d4", "tree": "81950822aa9652dfae82a1481b6671769ab0add1", "parents": [ "14c16db3906ba9453e9c786323f872e11fd0f48d" ], "author": { "name": "Philippe De Muyter", "email": "phdm@macqel.be", "time": "Wed Aug 12 16:35:28 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:56 2009 +1000" }, "message": "m68knommu: fix ColdFire definition of CLOCK_TICK_RATE\n\nThe good definition of CLOCK_TICK_RATE for coldfires has been lost in the\nmerge of m68k and m68knommu include files. Restore it. Culprit :\ncommit ebafc17468d58bd903c886175ca84a4edc69ae1d\n\nSigned-off-by: Philippe De Muyter \u003cphdm@macqel.be\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "d89395babbe811811e70c6ee3465e3b60c0cdc11", "tree": "d72b9fd1dc591496a2c73d0a0aa5953eff7a99e7", "parents": [ "fe84c1087a6e2e76396cd4003a525c3110354ad0" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Aug 12 11:35:49 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:55 2009 +1000" }, "message": "m68knommu: remove special interrupt handling code for ne2k support\n\nThe improved interrupt support for ColdFire CPU cores means we no\nlonger need all the interrupt setup and ack hacks to support the NE2000\ndriver on ColdFire platforms. Remove all that code.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "fe84c1087a6e2e76396cd4003a525c3110354ad0", "tree": "03f111b3d6095e2da772e97fe3b22c80d253af34", "parents": [ "49802967cb7ec4f36a64e192108babe1c3b67e8e" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue Aug 11 16:33:51 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:55 2009 +1000" }, "message": "m68knommu: relax IO_SPACE_LIMIT setting\n\nThere is really no limit to the addresses which can be used by the\nin*() and out*() family of IO space calls in m68k non-MMU environments.\nSo don\u0027t impose an artificial address limit, allow the full 32bit range.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "9075216d2c8761c91dc268125f6580af3ffc58b5", "tree": "95df9112cacda86d5fc7603b0e83bd88abdfde45", "parents": [ "da3601a5fa664c8d51383fe916d96bd4fbce84b8" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue Jul 07 09:39:11 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:54 2009 +1000" }, "message": "m68knommu: create a speciailized ColdFire 5272 interrupt controller\n\nThe ColdFire 5272 CPU has a very different interrupt controller than\nany of the other ColdFire parts. It needs its own controller code to\ncorrectly setup and ack interrupts.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "da3601a5fa664c8d51383fe916d96bd4fbce84b8", "tree": "83ee5d4e283cfdd11e83bdb7c739b5ccbeb9264a", "parents": [ "3945ca0f84fee3fe564189fe8cf8f02491d19622" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Fri May 22 14:16:39 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:53 2009 +1000" }, "message": "m68knommu: add support for second interrupt controller of ColdFire 5249\n\nThe ColdFire 5249 CPU has a second (compleletly different) interrupt\ncontroller. It is the only ColdFire CPU that has this type. It controlls\nGPIO interrupts amongst a number of interrupts from other internal\nperipherals. Add support code for it.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "39f0fb6a3448cfc316e0d5295ed1b121db50037e", "tree": "657db8073835e8d499708a898a36f1d3a1e39a32", "parents": [ "f6a66276f5fdc018d2a9378c71de3bae13c588d7" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Fri May 22 13:33:35 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:52 2009 +1000" }, "message": "m68knommu: map ColdFire interrupts to correct masking bits\n\nThe older simple ColdFire interrupt controller has no one-to-one mapping\nof interrupt numbers to bits in the interrupt mask register. Create a\nmapping array that each ColdFire CPU type can populate with its available\ninterrupts and the bits that each use in the interrupt mask register.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "f6a66276f5fdc018d2a9378c71de3bae13c588d7", "tree": "5a6148447a9d7b379e31fc4d0b6ddedcc189f80a", "parents": [ "04b75b10dceadf937e3707ecc3dfccf6a076fd29" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue May 19 15:00:01 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:52 2009 +1000" }, "message": "m68knommu: clean up ColdFire 532x CPU timer setup\n\nThe newer ColdFire 532x family of CPU\u0027s uses the old timer, but has a\nnewer interrupt controller. It doesn\u0027t need the special timer setup\nthat was required when using the older interrupt controller. Remove the\ndead timer irq and level setting code, and define the hard coded vector.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "04b75b10dceadf937e3707ecc3dfccf6a076fd29", "tree": "87965d12b8f7eb622efd1d36bebd2a7b8a26452e", "parents": [ "f9311f26434cea3e926f56ca2aa3e5740e962c72" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue May 19 14:52:40 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:51 2009 +1000" }, "message": "m68knommu: simplify ColdFire \"timers\" clock initialization\n\nThe ColdFire \"timers\" clock setup can be simplified. There is really no\nneed for the flexible per-platform setup code. The clock interrupt can be\nhard defined per CPU platform (in CPU include files). This makes the\nactual timer code simpler.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "f2154bef817ac3d0ea67b52526fd8e88898b66f9", "tree": "3ffa5cf5c3ec82a59f75728a580bd9332a32ebee", "parents": [ "5187995f0a9253e915dfee83684eae7b692213e6" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue May 19 14:38:08 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:50 2009 +1000" }, "message": "m68knommu: merge old ColdFire interrupt controller masking macros\n\nCurrently the code that supports setting the old style ColdFire interrupt\ncontroller mask registers is macros in the include files of each of the\nCPU types. Merge all these into a set of real masking functions in the\nold Coldfire interrupt controller code proper. All the macros are basically\nthe same (excepting a register size difference on really early parts).\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "5938084bd8843490a4493d19fb108df70d87df2d", "tree": "9f63d02cf26ae38723a3eb7282ccb84565b3556d", "parents": [ "e47cc3d6acacffdc673779a44c21a4a12b20db23" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue May 19 13:56:44 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:49 2009 +1000" }, "message": "m68knommu: move ColdFire INTC definitions to new include file\n\nCreate an mcfintc.h include file with the definitions for the old style\nColdFire interrupt controller. They are only needed on CPU\u0027s that use\nthis old controller - so isolate them on their own.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "e47cc3d6acacffdc673779a44c21a4a12b20db23", "tree": "c9ee91eaa1dcd12092e56b84deac38eae921e551", "parents": [ "91b1b94f88219ea1b747264f4f6995a1202566cb" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed May 06 14:28:25 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:48 2009 +1000" }, "message": "m68knommu: mask off all interrupts in ColdFire intc-simr controller\n\nThe ColdFire intc-simr interrupt controller should mask off all\ninterrupt sources at init time. Doing it here instead of separately\nin each platform setup.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "f1a59d244abd8d7b94b90f45ee5e0988e5a154cb", "tree": "7e809b6d848ff9a4a9b9618c9e4df338d055c860", "parents": [ "a3d9bf1dfdaf6f7df6c5340521dff1aafe39393f" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed May 06 11:36:00 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:47 2009 +1000" }, "message": "m68knommu: remove interrupt masking from ColdFire pit timer\n\nWith proper interrupt controller code in place there is no need for\ndevices like the timers to have custom interrupt masking code.\nRemove it (and the defines that go along with it).\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "277c5e3e26cac45010f57a581c56476639b2cfa0", "tree": "fbc4465582bba19a2045eb72c870cde044a5f558", "parents": [ "1f946533bb562f5144752ea583cac45e9410fdaa" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Apr 29 12:07:13 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:42 2009 +1000" }, "message": "m68knommu: general interrupt controller for ColdFire 532x parts\n\nThe ColdFire 532x family of parts uses 2 of the same INTC interrupt\ncontrolers used in the ColdFire 520x family. So modify the code to\nsupport both parts. The extra code for the second INTC controler in\nthe case of the 520x is easily optimized away to nothing.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "cd3dd4068db5e1258a14b63e0feaf0332640d896", "tree": "07b28dab223d4a19eedb517d2792aba7753ecb0b", "parents": [ "584320156b7e42e74105ca78bdf895d2b0269251" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Mon Apr 27 15:09:29 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:39 2009 +1000" }, "message": "m68knommu: use general interrupt controller for ColdFire 520x family\n\nCreate general interrupt controller code for the ColdFire 520x family,\nthat does proper masking and unmasking of interrupts. With this in\nplace some of the driver hacks in place to support ColdFire interrupts\ncan finally go away.\n\nWithin the ColdFire family there is a variety of different interrupt\ncontrollers in use. Some are used on multiple parts, some on only one.\nThere is quite some differences in some varients, so much so that\ncommon code for all ColdFire parts would be impossible.\n\nThis commit introduces code to support one of the newer interrupt\ncontrollers in the ColdFire 5208 and 5207 parts. It has very simple\nmask and unmask operations, so is one of the easiest to support.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "584320156b7e42e74105ca78bdf895d2b0269251", "tree": "a4566124db5986158baaedd267230add81014c63", "parents": [ "cba89e231f97139dc6013030210624efd1087f68" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Aug 05 14:02:48 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:38 2009 +1000" }, "message": "m68k: clean up comment delimiters in dma.h\n\nChange C99 style comments to traditional K\u0026R style.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "cba89e231f97139dc6013030210624efd1087f68", "tree": "51a1c248e3188f171526b1df88f86b3dc7cd64f0", "parents": [ "6192c1ea0ac5806592c5c9cc2b2b94b0298df02b" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Fri Jun 12 15:11:17 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:38 2009 +1000" }, "message": "m68k: merge mmu and non-mmu versions of dma.h\n\nThe non-mmu version of dma.h contains a lot of ColdFire specific DMA\nsupport, but also all of the base m68k support. So use the non-mmu\nversion of dma.h for all.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "6192c1ea0ac5806592c5c9cc2b2b94b0298df02b", "tree": "456489cbe5ffa011c294f84558aa1bf5d512a829", "parents": [ "3ddc7e261a990d03fa4e78e37e6623ca45b18d77" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jul 02 16:11:58 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:37 2009 +1000" }, "message": "m68k: merge the mmu and non-mmu versions of checksum.h\n\nThe mmu and non-mmu versions of checksum.h are mostly the same,\nmerge them.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "3ddc7e261a990d03fa4e78e37e6623ca45b18d77", "tree": "95d143a7cf1b8acc0bbb8e442497895caf0b2e54", "parents": [ "633ea5d78b8b01ba903aeaae10297033830a52dd" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Fri Jun 26 16:51:05 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:37 2009 +1000" }, "message": "m68k: merge mmu and non-mmu versions of irq.h\n\nIt is reasonably strait forward to merge the mmu and non-mmu versions\nof irq.h. Most of the defines and structs are not needed on non-mmu.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "633ea5d78b8b01ba903aeaae10297033830a52dd", "tree": "8163ccf61b8fd3d1a22ce8150ed4c3a987a94fb1", "parents": [ "d668bf0a0d73daea4eaaf748435752f52cc077aa" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Apr 23 11:03:20 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:36 2009 +1000" }, "message": "m68k: merge mmu and non-mmu versions of processor.h\n\nThe mmu and non-mmu versions of processor.h have a lot of common code.\nThis is a strait forward merge. start_thread() could be improved, but\nthat is not quite as strait forward, leaving for a follow on change.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "d668bf0a0d73daea4eaaf748435752f52cc077aa", "tree": "2f0d7effbaa82ee6cb11e4f5495001f8e7578e48", "parents": [ "f3aa42c6b26f502f6502ea2e07908d5768a3dd35" ], "author": { "name": "Christoph Hellwig", "email": "hch@lst.de", "time": "Tue Aug 04 16:52:44 2009 +0200" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:36 2009 +1000" }, "message": "m68knommu: convert to asm-generic/hardirq.h\n\nSigned-off-by: Christoph Hellwig \u003chch@lst.de\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "f3aa42c6b26f502f6502ea2e07908d5768a3dd35", "tree": "27e5fad440f0e5e7f71d74683996ea7dae80e1c7", "parents": [ "c573b29baf3e1b71a60ee6de76dd28c9c49fb87f" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Sat Jul 04 00:13:57 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Wed Sep 16 09:43:35 2009 +1000" }, "message": "m68k: remove unused elia.h include file\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "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": "d7e9660ad9d5e0845f52848bce31bcf5cdcdea6b", "tree": "c6c67d145771187b194d79d603742b31090a59d6", "parents": [ "b8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca", "13af7a6ea502fcdd4c0e3d7de6e332b102309491" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 14 10:37:28 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Mon Sep 14 10:37:28 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1623 commits)\n netxen: update copyright\n netxen: fix tx timeout recovery\n netxen: fix file firmware leak\n netxen: improve pci memory access\n netxen: change firmware write size\n tg3: Fix return ring size breakage\n netxen: build fix for INET\u003dn\n cdc-phonet: autoconfigure Phonet address\n Phonet: back-end for autoconfigured addresses\n Phonet: fix netlink address dump error handling\n ipv6: Add IFA_F_DADFAILED flag\n net: Add DEVTYPE support for Ethernet based devices\n mv643xx_eth.c: remove unused txq_set_wrr()\n ucc_geth: Fix hangs after switching from full to half duplex\n ucc_geth: Rearrange some code to avoid forward declarations\n phy/marvell: Make non-aneg speed/duplex forcing work for 88E1111 PHYs\n drivers/net/phy: introduce missing kfree\n drivers/net/wan: introduce missing kfree\n net: force bridge module(s) to be GPL\n Subject: [PATCH] appletalk: Fix skb leak when ipddp interface is not loaded\n ...\n\nFixed up trivial conflicts:\n\n - arch/x86/include/asm/socket.h\n\n converted to \u003casm-generic/socket.h\u003e in the x86 tree. The generic\n header has the same new #define\u0027s, so that works out fine.\n\n - drivers/net/tun.c\n\n fix conflict between 89f56d1e9 (\"tun: reuse struct sock fields\") that\n switched over to using \u0027tun-\u003esocket.sk\u0027 instead of the redundantly\n available (and thus removed) \u0027tun-\u003esk\u0027, and 2b980dbd (\"lsm: Add hooks\n to the TUN driver\") which added a new \u0027tun-\u003esk\u0027 use.\n\n Noted in \u0027next\u0027 by Stephen Rothwell.\n" }, { "commit": "732c611e5bbb76201397297f834dddd5ab684b05", "tree": "395c1a7f4733961544b608ca60cda7a50f7bdbfa", "parents": [ "dca7cf33bb5c98187ffcc849652b1b2c4c8a0c25" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:12 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:24 2009 +1000" }, "message": "generic GPIO support misc files.\n\nThe definition of MCFSIM_PADDR and MCFSIM_PADAT now has MCF_BAR already added in.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "dca7cf33bb5c98187ffcc849652b1b2c4c8a0c25", "tree": "d91d87cbf054a8f02da1cfa3cfb27ab2b14dc52a", "parents": [ "7846fe800a81adae1e28d9d035b5226f75358280" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:11 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:24 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 5407.\n\nAdd support for the 5407.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "7846fe800a81adae1e28d9d035b5226f75358280", "tree": "ef9d2f48acb2bf5c916af71643723bc4f6f420f4", "parents": [ "f7a20ba06435d067247bd50a15a1d550b9b3fc7d" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:10 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:23 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 532x.\n\nAdd support for the 532x.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "f7a20ba06435d067247bd50a15a1d550b9b3fc7d", "tree": "5b92e1f95b6052ffaac959750d6b8d3c520e33be", "parents": [ "6da6e63c96f5fc8a92b6d1d6f12c2bf998588ffe" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:09 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:23 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 5307.\n\nAdd support for the 5307.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "6da6e63c96f5fc8a92b6d1d6f12c2bf998588ffe", "tree": "0245cc03353af24b2c84ac7f8d394ba257592861", "parents": [ "316f2c483c32e9385329303258d12e6e33892af5" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:08 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:23 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 528x.\n\nAdd support for the 528x.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "316f2c483c32e9385329303258d12e6e33892af5", "tree": "dee9cb00d46899a392a62ad3c1c9f003cd631326", "parents": [ "f1554da34f11518bde33776c292c1b58fc20f073" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:07 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:23 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 5272.\n\nAdd support for the 5272.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "f1554da34f11518bde33776c292c1b58fc20f073", "tree": "87e2ff94bbdf9c5172df7f976a581e2aff0d13fd", "parents": [ "9e8ded166dcc7831ee6f31f8a0937cd9b58e83b0" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:06 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:23 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 527x.\n\nAdd support for the 5271 \u0026 5275.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "9e8ded166dcc7831ee6f31f8a0937cd9b58e83b0", "tree": "1cc871251322ea0c426ed084a5a2fef9906ae74d", "parents": [ "a03ce7d9ef05e145ef706f99e68d5ffacf0ad325" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:05 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:22 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 5249.\n\nAdd support for the 5249.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "a03ce7d9ef05e145ef706f99e68d5ffacf0ad325", "tree": "f654f0374276f65f9d61f80204b81949d1845168", "parents": [ "afde8560b4217338c17b7dbc9e9d7676c1b3a5ff" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:04 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:22 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 523x.\n\nAdd support for the 523x.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "afde8560b4217338c17b7dbc9e9d7676c1b3a5ff", "tree": "af262b5b77e26894b4c5a2d814cc3b26847dd334", "parents": [ "24a1836ecd471409aeb5362f63032126ebe7fb10" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:03 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:22 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 520x.\n\nAdd support for the 520x.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "bc25b057fa0a0e4754b7e2524c509874649d11ae", "tree": "40770e923309ff514def91e8e9adcd6d71c4f81b", "parents": [ "af39bb8b07af83b579c90c09ba3943123cdb4132" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:01 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:22 2009 +1000" }, "message": "generic GPIO support for the Freescale Coldfire 5206.\n\nAdd support for the 5206.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "af39bb8b07af83b579c90c09ba3943123cdb4132", "tree": "8c1965a7a7d6ba09344549410e3ee476af8ffb1d", "parents": [ "74fca6a42863ffacaf7ba6f1936a9f228950f657" ], "author": { "name": "sfking@fdwdc.com", "email": "sfking@fdwdc.com", "time": "Fri Jun 19 18:11:00 2009 -0700" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Sep 10 12:01:22 2009 +1000" }, "message": "core generic GPIO support for Freescale Coldfire processors.\n\nThis adds the basic infrastructure used by all of the different Coldfire CPUs.\n\nSigned-off-by: Steven King \u003csfking@fdwdc.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "96910b6dc8a4fdb75e69f09f47b62d41743d36ba", "tree": "8d01dc59f7b4d9fa5d716582fcbbf1e73c4323f5", "parents": [ "b62e180cae6bd82e246d871a1e44e03f8019d421" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon Aug 31 14:43:34 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Tue Sep 01 09:38:03 2009 +0200" }, "message": "locking, m68k/asm-offsets: Rename signal defines\n\nIn order to be able to use asm-offsets.h in C files the\nexisting namespace conflicts must be solved first. In\nasm-offsets.h there are defines for signal constants, so they\ncan be used in assembler files.\n\nUnfortunately the existing defines use a 1:1 mapping for the\nmacro names which results in name space conflicts if the header\nfile would also be used in C files. So rename the created\ndefines and add an \"L\" prefix to each one since that has\nalready been done for the SIGTRAP define in entry_mm.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Horst Hartmann \u003chorsth@linux.vnet.ibm.com\u003e\nCc: Christian Ehrhardt \u003cehrhardt@linux.vnet.ibm.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nLKML-Reference: \u003c20090831124416.998821502@de.ibm.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "0ee000e5e8fa2e5c760250be0d78d5906e3eb94b", "tree": "7c3d253b2e6d89bdae8c1fbe86baa17b080efcce", "parents": [ "f159ee782990aacb5494738c98f13a2aa61dbb4a" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon Aug 31 14:43:35 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 31 18:08:49 2009 +0200" }, "message": "locking, m68k: Calculate thread_info offset with asm offset\n\nm68k has the thread_info structure embedded in its task struct.\nTherefore its not possible to implement current_thread_info()\nby looking at the stack pointer and do some simple calculations\nlike most other architectures do it.\n\nTo return the thread_info pointer for a task two defines are\nused. This works until the spinlock function bodies get moved\ninto an own header file and CONFIG_SPINLOCK_DEBUG is turned on.\nThat results into this compile error:\n\n In file included from include/linux/spinlock.h:378,\n from include/linux/seqlock.h:29,\n from include/linux/time.h:8,\n from include/linux/timex.h:56,\n from include/linux/sched.h:54,\n from arch/m68k/kernel/asm-offsets.c:12:\n include/linux/spinlock_api_smp.h: In function \u0027__spin_unlock_irq\u0027:\n include/linux/spinlock_api_smp.h:371: error: \u0027current\u0027 undeclared (first use in this function)\n include/linux/spinlock_api_smp.h:371: error: (Each undeclared identifier is reported only once\n include/linux/spinlock_api_smp.h:371: error: for each function it appears in.)\n\nIncluding asm/current.h to asm-offsets.c wouldn\u0027t help since\nthe definition of struct task is needed. So we end up with ugly\nheader file include dependencies.\n\nTo solve this calculate the offset of the thread_info structure\ninto the task struct in asm-offsets.h and use the offset in\ntask_thread_info(). This works just like it does for IA64 as\nwell.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Horst Hartmann \u003chorsth@linux.vnet.ibm.com\u003e\nCc: Christian Ehrhardt \u003cehrhardt@linux.vnet.ibm.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nLKML-Reference: \u003c20090831124417.329662275@de.ibm.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "f159ee782990aacb5494738c98f13a2aa61dbb4a", "tree": "e9372adeb764c93c5f89d5ec287647930abc4ee8", "parents": [ "9f34ceb60357a7166c929d7b52bd057ad7ffc54b" ], "author": { "name": "Heiko Carstens", "email": "heiko.carstens@de.ibm.com", "time": "Mon Aug 31 14:43:33 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Mon Aug 31 18:08:49 2009 +0200" }, "message": "locking, m68k/asm-offsets: Rename pt_regs offset defines\n\nIn order to be able to use asm-offsets.h in C files the\nexisting namespace conflicts must be solved first. In\nasm-offsets.h e.g. PT_D0 gets defined which is the offset of\nthe d0 member of the pt_regs structure. However a same define\n(with a different meaning) exists in asm/ptregs.h.\n\nSo rename the defines created with the asm-offset mechanism to\nPT_OFF_D0 etc. There also already exist a few defines with\nthese names that have the same meaning. So remove the existing\ndefines and use the asm-offset generated ones.\n\nSigned-off-by: Heiko Carstens \u003cheiko.carstens@de.ibm.com\u003e\nAcked-by: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Nick Piggin \u003cnickpiggin@yahoo.com.au\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Horst Hartmann \u003chorsth@linux.vnet.ibm.com\u003e\nCc: Christian Ehrhardt \u003cehrhardt@linux.vnet.ibm.com\u003e\nCc: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nCc: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\nCc: David Miller \u003cdavem@davemloft.net\u003e\nCc: Benjamin Herrenschmidt \u003cbenh@kernel.crashing.org\u003e\nCc: Paul Mackerras \u003cpaulus@samba.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nLKML-Reference: \u003c20090831124416.666403991@de.ibm.com\u003e\nSigned-off-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "9848484fad9ddeb18f18f02f9ecdcd330ac9a216", "tree": "886e36a007734c46318dc00e75213271db89a6c4", "parents": [ "9fd926b4ab1e38ac5e3eb3ba0afb56726d90aa88" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Fri Aug 21 22:03:54 2009 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Aug 26 23:14:50 2009 +0200" }, "message": "m68k,m68knommu: Wire up rt_tgsigqueueinfo and perf_counter_open\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "9fd926b4ab1e38ac5e3eb3ba0afb56726d90aa88", "tree": "f40de3049c6d25732dfd844b4cb703629899da32", "parents": [ "dc71c7d5dbd8cd8bb6e3b548ddc0454b64ded5f8" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Thu Jul 09 17:08:38 2009 +0400" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Aug 26 23:14:49 2009 +0200" }, "message": "m68k: Fix redefinition of pgprot_noncached\n\narch/m68k/include/asm/pgtable_mm.h:148:1: warning: \"pgprot_noncached\" redefined\nIn file included from arch/m68k/include/asm/pgtable_mm.h:138,\n from arch/m68k/include/asm/pgtable.h:4,\n from include/linux/mm.h:40,\n from include/linux/pagemap.h:7,\n from include/linux/blkdev.h:12,\n from arch/m68k/emu/nfblock.c:17:\ninclude/asm-generic/pgtable.h:133:1: warning: this is the location of the previous definition\n\npgprot_noncached() should be defined _before_ including asm-generic/pgtable.h\n\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "dc71c7d5dbd8cd8bb6e3b548ddc0454b64ded5f8", "tree": "37d1074eca97e47d9c4f6ae2ca13037019efa095", "parents": [ "dd9b3e84f2095ed19582f4df5d20e1e40c01ca3c" ], "author": { "name": "Andrew Morton", "email": "akpm@linux-foundation.org", "time": "Wed Jun 17 13:13:58 2009 -0700" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Aug 26 23:14:49 2009 +0200" }, "message": "arch/m68k/include/asm/motorola_pgalloc.h: fix kunmap arg\n\narch/m68k/include/asm/motorola_pgalloc.h: In function \u0027pte_alloc_one\u0027:\narch/m68k/include/asm/motorola_pgalloc.h:44: warning: passing argument 1 of \u0027kunmap\u0027 from incompatible pointer type\n\nAlso, remove unneeded test for kmap() failure.\n\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "dd9b3e84f2095ed19582f4df5d20e1e40c01ca3c", "tree": "5c93c30c5c7abc4aecd70cfc2c2bfa61a2b76148", "parents": [ "dac9ff79a8122b30176e23359bb879b3144d7f1f" ], "author": { "name": "Roel Kluin", "email": "roel.kluin@gmail.com", "time": "Wed Jun 17 13:13:57 2009 -0700" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Aug 26 23:14:49 2009 +0200" }, "message": "m68k: cnt reaches -1, not 0\n\nWith the postfix decrement cnt reaches -1 rather than 0.\n\nSigned-off-by: Roel Kluin \u003croel.kluin@gmail.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\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": "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" }, { "commit": "d06063cc221fdefcab86589e79ddfdb7c0e14b63", "tree": "00ccaf8c1992b57a4445d78b9eae25fde0b3ab31", "parents": [ "30c9f3a9fae79517bca595826a19c6855fbb6d32" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 10 09:01:23 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Jun 21 13:08:22 2009 -0700" }, "message": "Move FAULT_FLAG_xyz into handle_mm_fault() callers\n\nThis allows the callers to now pass down the full set of FAULT_FLAG_xyz\nflags to handle_mm_fault(). All callers have been (mechanically)\nconverted to the new calling convention, there\u0027s almost certainly room\nfor architectures to clean up their code and then add FAULT_FLAG_RETRY\nwhen that support is added.\n\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "9d35f8464dd51466e60447625784cf1740f03ff4", "tree": "14f23f6a4492f6c433154ca6da774d988c02ec5f", "parents": [ "bba7fc0a21d76ef951cdac6d11896dc6b5a9ffa7" ], "author": { "name": "Oleg Nesterov", "email": "oleg@redhat.com", "time": "Wed Jun 17 16:27:27 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Jun 18 13:03:48 2009 -0700" }, "message": "ptrace: remove PT_DTRACE from m68k, m68knommu\n\nm68k sets PT_DTRACE in trap_c() but never uses it.\n\nSigned-off-by: Oleg Nesterov \u003coleg@redhat.com\u003e\nAcked-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Greg Ungerer \u003cgerg@snapgear.com\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\nAcked-by: Roland McGrath \u003croland@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": "e4c9dd0fbad60c098a026e9b06d9de1bc98c5e89", "tree": "033fd4035f0bcab64a0215d1a0b0f868c8b4de32", "parents": [ "b8d9a86590fb334d28c5905a4c419ece7d08e37d" ], "author": { "name": "Randy Dunlap", "email": "randy.dunlap@oracle.com", "time": "Tue Jun 16 15:33:47 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:47:51 2009 -0700" }, "message": "kmap_types: make most arches use generic header file\n\nConvert most arches to use asm-generic/kmap_types.h.\n\nMove the KM_FENCE_ macro additions into asm-generic/kmap_types.h,\ncontrolled by __WITH_KM_FENCE from each arch\u0027s kmap_types.h file.\n\nWould be nice to be able to add custom KM_types per arch, but I don\u0027t yet\nsee a nice, clean way to do that.\n\nBuilt on x86_64, i386, mips, sparc, alpha(tonyb), powerpc(tonyb), and\n68k(tonyb).\n\nNote: avr32 should be able to remove KM_PTE2 (since it\u0027s not used) and\nthen just use the generic kmap_types.h file. Get avr32 maintainer\napproval.\n\nSigned-off-by: Randy Dunlap \u003crandy.dunlap@oracle.com\u003e\nCc: \u003clinux-arch@vger.kernel.org\u003e\nAcked-by: Mike Frysinger \u003cvapier@gentoo.org\u003e\nCc: Richard Henderson \u003crth@twiddle.net\u003e\nCc: Ivan Kokshaysky \u003cink@jurassic.park.msu.ru\u003e\nCc: Bryan Wu \u003ccooloney@kernel.org\u003e\nCc: Mikael Starvik \u003cstarvik@axis.com\u003e\nCc: Hirokazu Takata \u003ctakata@linux-m32r.org\u003e\nCc: \"Luck Tony\" \u003ctony.luck@intel.com\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Ralf Baechle \u003cralf@linux-mips.org\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\nCc: Martin Schwidefsky \u003cschwidefsky@de.ibm.com\u003e\nCc: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: \"David S. Miller\" \u003cdavem@davemloft.net\u003e\nCc: Ingo Molnar \u003cmingo@elte.hu\u003e\nCc: Thomas Gleixner \u003ctglx@linutronix.de\u003e\nCc: \"H. Peter Anvin\" \u003chpa@zytor.com\u003e\nCc: Arnd Bergmann \u003carnd@arndb.de\u003e\nCc: Peter Zijlstra \u003ca.p.zijlstra@chello.nl\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "bb1f17b0372de93758653ca3454bc0df18dc2e5c", "tree": "29ef82933cc98b99d29c6c7004c045af22799d70", "parents": [ "3b0fde0fac19c180317eb0601b3504083f4b9bf5" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Tue Jun 16 15:31:18 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Jun 16 19:47:28 2009 -0700" }, "message": "mm: consolidate init_mm definition\n\n* create mm/init-mm.c, move init_mm there\n* remove INIT_MM, initialize init_mm with C99 initializer\n* unexport init_mm on all arches:\n\n init_mm is already unexported on x86.\n\n One strange place is some OMAP driver (drivers/video/omap/) which\n won\u0027t build modular, but it\u0027s already wants get_vm_area() export.\n Somebody should look there.\n\n[akpm@linux-foundation.org: add missing #includes]\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.com\u003e\nCc: Mike Frysinger \u003cvapier.adi@gmail.com\u003e\nCc: Americo Wang \u003cxiyou.wangcong@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "cd166bd0dde265a97dd9aa8e3451a2646d96d04b", "tree": "3a7fb5b8bb8d7676e804845b75977be380b8dcff", "parents": [ "6b702462cbe5b6f372966a53f4465d745d86b65c", "5b02ee3d219f9e01b6e9146e25613822cfc2e5ce" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 12 18:15:51 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Jun 12 18:15:51 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:\n add generic lib/checksum.c\n asm-generic: add a generic uaccess.h\n asm-generic: add generic NOMMU versions of some headers\n asm-generic: add generic atomic.h and io.h\n asm-generic: add legacy I/O header files\n asm-generic: add generic versions of common headers\n asm-generic: make bitops.h usable\n asm-generic: make pci.h usable directly\n asm-generic: make get_rtc_time overridable\n asm-generic: rename page.h and uaccess.h\n asm-generic: rename atomic.h to atomic-long.h\n asm-generic: add a generic unistd.h\n asm-generic: add generic ABI headers\n asm-generic: add generic sysv ipc headers\n asm-generic: introduce asm/bitsperlong.h\n asm-generic: rename termios.h, signal.h and mman.h\n" }, { "commit": "1380a37e3da5d9e14ea5c2a4c6ab2b307a2798ea", "tree": "d3f29c303e4b10180d18b2159b9e04e3b4354d55", "parents": [ "08687aec71bc9134fe336e561f6877bacf74fc0a" ], "author": { "name": "Magnus Damm", "email": "damm@igel.co.jp", "time": "Fri May 15 00:52:00 2009 +0200" }, "committer": { "name": "Rafael J. Wysocki", "email": "rjw@sisk.pl", "time": "Fri Jun 12 21:32:31 2009 +0200" }, "message": "PM: Remove unused asm/suspend.h\n\nThis patch removes unused asm/suspend.h files for\nthe following architectures:\n\n alpha, arm, ia64, m68k, mips, s390, um\n\nSigned-off-by: Magnus Damm \u003cdamm@igel.co.jp\u003e\nAcked-by: Pavel Machek \u003cpavel@ucw.cz\u003e\nSigned-off-by: Rafael J. Wysocki \u003crjw@sisk.pl\u003e\n" }, { "commit": "5933048c69edb546f1e93c26dc93816f0be9f754", "tree": "a051310933342efea5ae64a0bb490aad1e5f1d0f", "parents": [ "ad6561dffa17f17bb68d7207d422c26c381c4313" ], "author": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jun 12 21:47:04 2009 -0600" }, "committer": { "name": "Rusty Russell", "email": "rusty@rustcorp.com.au", "time": "Fri Jun 12 21:47:05 2009 +0930" }, "message": "module: cleanup FIXME comments about trimming exception table entries.\n\nEveryone cut and paste this comment from my original one. We now do\nit generically, so cut the comments.\n\nSigned-off-by: Rusty Russell \u003crusty@rustcorp.com.au\u003e\nCc: Amerigo Wang \u003camwang@redhat.com\u003e\n" }, { "commit": "5b02ee3d219f9e01b6e9146e25613822cfc2e5ce", "tree": "7ce9126738c3cf4b37d67170d0e4b34818c057a9", "parents": [ "26a28fa4fea5b8c65713aa50c124f76a88c7924d", "8ebf975608aaebd7feb33d77f07ba21a6380e086" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 12 09:53:47 2009 +0200" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Fri Jun 12 11:32:58 2009 +0200" }, "message": "asm-generic: merge branch \u0027master\u0027 of torvalds/linux-2.6\n\nFixes a merge conflict against the x86 tree caused by a fix to\natomic.h which I renamed to atomic_long.h.\n\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "5b17e1cd8928ae65932758ce6478ac6d3e9a86b2", "tree": "065b3adc60a74ce0b3e3cd0fc447b8688b6d0332", "parents": [ "72099ed2719fc5829bd79c6ca9d1783ed026eb37" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 13 22:56:30 2009 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@klappe2.(none)", "time": "Thu Jun 11 21:02:17 2009 +0200" }, "message": "asm-generic: rename page.h and uaccess.h\n\nThe current asm-generic/page.h only contains the get_order\nfunction, and asm-generic/uaccess.h only implements\nunaligned accesses. This renames the file to getorder.h\nand uaccess-unaligned.h to make room for new page.h\nand uaccess.h file that will be usable by all simple\n(e.g. nommu) architectures.\n\nSigned-off-by: Remis Lima Baima \u003cremis.developer@googlemail.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "72099ed2719fc5829bd79c6ca9d1783ed026eb37", "tree": "d404ded029707e3ae9146431d6b9fa033f99a64e", "parents": [ "e64a1617eca39d62b248a11699de9c1195369661" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 13 22:56:29 2009 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@klappe2.(none)", "time": "Thu Jun 11 21:02:17 2009 +0200" }, "message": "asm-generic: rename atomic.h to atomic-long.h\n\nThe existing asm-generic/atomic.h only defines the\natomic_long type. This renames it to atomic-long.h\nso we have a place to add a truly generic atomic.h\nthat can be used on all non-SMP systems.\n\nSigned-off-by: Remis Lima Baima \u003cremis.developer@googlemail.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\nAcked-by: Ingo Molnar \u003cmingo@elte.hu\u003e\n" }, { "commit": "c31ae4bb4a9fa4606a74c0a4fb61b74f804e861e", "tree": "7694b1a05bc1ac660ac26eb9997200556ccd3933", "parents": [ "63b852a6b67d0820d388b0ecd0da83ccb4048b8d" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 13 22:56:25 2009 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@klappe2.(none)", "time": "Thu Jun 11 21:02:14 2009 +0200" }, "message": "asm-generic: introduce asm/bitsperlong.h\n\nThis provides a reliable way for asm-generic/types.h and other\nfiles to find out if it is running on a 32 or 64 bit platform.\n\nWe cannot use CONFIG_64BIT for this in headers that are included\nfrom user space because CONFIG symbols are not available there.\nWe also cannot do it inside of asm/types.h because some headers\nneed the word size but cannot include types.h.\n\nThe solution is to introduce a new header \u003casm/bitsperlong.h\u003e\nthat defines both __BITS_PER_LONG for user space and\nBITS_PER_LONG for usage in the kernel. The asm-generic\nversion falls back to 32 bit unless the architecture overrides\nit, which I did for all 64 bit platforms.\n\nSigned-off-by: Remis Lima Baima \u003cremis.developer@googlemail.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "63b852a6b67d0820d388b0ecd0da83ccb4048b8d", "tree": "4f73c46716669c3996280d3dfcee1a56c6cf0d07", "parents": [ "07a2039b8eb0af4ff464efd3dfd95de5c02648c6" ], "author": { "name": "Arnd Bergmann", "email": "arnd@arndb.de", "time": "Wed May 13 22:56:24 2009 +0000" }, "committer": { "name": "Arnd Bergmann", "email": "arnd@klappe2.(none)", "time": "Thu Jun 11 21:01:52 2009 +0200" }, "message": "asm-generic: rename termios.h, signal.h and mman.h\n\nThe existing asm-generic versions are incomplete and included\nby some architectures. New architectures should be able\nto use a generic version, so rename the existing files and\nchange all users, which lets us add the new files.\n\nSigned-off-by: Remis Lima Baima \u003cremis.developer@googlemail.com\u003e\nSigned-off-by: Arnd Bergmann \u003carnd@arndb.de\u003e\n" }, { "commit": "9d4f94135385b565e2ce4a37f71b53d0fd3664e8", "tree": "690ad6fa2fa08793c861745db9d1a35a4648fb34", "parents": [ "4f308e35a9bde9d6b671e8409157edb9065f117c" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jun 11 13:05:00 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jun 11 13:09:11 2009 +1000" }, "message": "m68knommu: enumerate INIT_THREAD fields properly\n\nUse proper field value setting init INIT_THREAD macro.\nFixes this:\n\narch/m68knommu/kernel/init_task.c:27: warning: excess elements in array initializer\narch/m68knommu/kernel/init_task.c:27: warning: (near initialization for ‘init_task.thread.fpstate’)\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "4f308e35a9bde9d6b671e8409157edb9065f117c", "tree": "0355fa1eed1a38d1d0c6c23d052085b966e68ed6", "parents": [ "308e610e8c435d7875842b427dbc99de43a4aec9" ], "author": { "name": "Jaswinder Singh Rajput", "email": "jaswinderrajput@gmail.com", "time": "Wed Jun 10 18:47:47 2009 +0530" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jun 11 13:09:11 2009 +1000" }, "message": "headers_check fix: m68k, swab.h\n\nfix the following \u0027make headers_check\u0027 warnings:\n\n usr/include/asm-m68k/swab.h:4: include of \u003clinux/types.h\u003e is preferred over \u003casm/types.h\u003e\n usr/include/asm-m68k/swab.h:10: found __[us]{8,16,32,64} type without #include \u003clinux/types.h\u003e\n\nSigned-off-by: Jaswinder Singh Rajput \u003cjaswinderrajput@gmail.com\u003e\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "fb29ad7949aeed3d464ba8d2c9772835f456d4c4", "tree": "78618b1667740541d5438959fc83aea9a73deac8", "parents": [ "05728aec8b05ec3fa859add8b22ba46432611e9e" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Fri May 01 16:09:17 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jun 11 13:09:11 2009 +1000" }, "message": "m68knommu: remove obsolete reset code\n\nAll ColdFire and non-MMU 68k code has custom reset routines.\nRemove the obsolete and now un-used reset macros.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "dd65b1de553ddfd85e8fea9d3aa9db7479ccf2aa", "tree": "af2bf7239b3801601c3bf9e92346d8c9bfc5c25c", "parents": [ "4c0b008d49e728735f54419e60446480017bfe1b" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Apr 30 23:15:56 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jun 11 13:09:10 2009 +1000" }, "message": "m68knommu: move CPU reset code for the 528x ColdFire into its platform code\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "4c0b008d49e728735f54419e60446480017bfe1b", "tree": "75640bf74b627aa27677d7dc9bceac5028ed11a3", "parents": [ "55b33f316d25c1ffb13a65de7f846b950b5ef5a6" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Apr 30 23:06:45 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jun 11 13:09:10 2009 +1000" }, "message": "m68knommu: move CPU reset code for the 527x ColdFire into its platform code\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "55b33f316d25c1ffb13a65de7f846b950b5ef5a6", "tree": "ea8b7d9b038bf128199e92de6bcf47edbe53c301", "parents": [ "25ce4a908abebf8c7d2e89908d36050e1de9cbec" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Apr 30 22:58:35 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jun 11 13:09:10 2009 +1000" }, "message": "m68knommu: move CPU reset code for the 523x ColdFire into its platform code\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "25ce4a908abebf8c7d2e89908d36050e1de9cbec", "tree": "7956ac61959bc607c995fac0b1e8761dc9d7c6ff", "parents": [ "384feb91319766298c6358f23f54873d44c9d8cb" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Apr 30 22:39:50 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jun 11 13:09:10 2009 +1000" }, "message": "m68knommu: move CPU reset code for the 520x ColdFire into its platform code\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "384feb91319766298c6358f23f54873d44c9d8cb", "tree": "c5d87c43cd16ae0646f10956aeff7c7f9540b2a7", "parents": [ "6f5aa7ce38dfb9c04eecac1222fc4b2521f02b83" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Apr 30 22:03:43 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jun 11 13:09:10 2009 +1000" }, "message": "m68knommu: add CPU reset code for the 532x ColdFire\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "293ca0f75415dd8373c716bf9755569daca7ba5d", "tree": "6c853bed92928fffe52cfe9f1a765899aa14c46d", "parents": [ "7f72b47cedd1efc301576ff1050ec0a26c57eb48" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue Apr 28 16:56:03 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jun 11 13:09:09 2009 +1000" }, "message": "m68knommu: merge system reset for code ColdFire 523x family\n\nThe sofwtare reset control code for the 523x ColdFire family uses the\nsame Reset unit hardware as the 527x and 528x ColdFire parts. So they\nshould all use the same code. Merge them.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "7f72b47cedd1efc301576ff1050ec0a26c57eb48", "tree": "0bdf8eea894a34430b91291b18657290d1b79353", "parents": [ "769f3e8c384795cc350e2aae27de2a12374d19d4" ], "author": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Tue Apr 28 14:13:21 2009 +1000" }, "committer": { "name": "Greg Ungerer", "email": "gerg@uclinux.org", "time": "Thu Jun 11 13:09:08 2009 +1000" }, "message": "m68knommu: fix system reset for ColdFire 527x family\n\nThe sofwtare reset control for the 527x ColdFire family is based on\nthe same Reset Control Unit as the 528x ColdFire family. So use the\nsame reset code for both.\n\nSigned-off-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "c3dc5bec05a2ae03a72ef82e321d77fb549d951c", "tree": "fc3fa0f7a854dce91d0816cb757244bb62f57bf6", "parents": [ "ba9447198bdd945666a9bac5e556632a7acb235d" ], "author": { "name": "Oskar Schirmer", "email": "os@emlix.com", "time": "Thu May 28 14:34:31 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri May 29 08:40:02 2009 -0700" }, "message": "flat: fix data sections alignment\n\nThe flat loader uses an architecture\u0027s flat_stack_align() to align the\nstack but assumes word-alignment is enough for the data sections.\n\nHowever, on the Xtensa S6000 we have registers up to 128bit width\nwhich can be used from userspace and therefor need userspace stack and\ndata-section alignment of at least this size.\n\nThis patch drops flat_stack_align() and uses the same alignment that\nis required for slab caches, ARCH_SLAB_MINALIGN, or wordsize if it\u0027s\nnot defined by the architecture.\n\nIt also fixes m32r which was obviously kaput, aligning an\nuninitialized stack entry instead of the stack pointer.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Oskar Schirmer \u003cos@emlix.com\u003e\nCc: David Howells \u003cdhowells@redhat.com\u003e\nCc: Russell King \u003crmk@arm.linux.org.uk\u003e\nCc: Bryan Wu \u003ccooloney@kernel.org\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Paul Mundt \u003clethal@linux-sh.org\u003e\nCc: Greg Ungerer \u003cgerg@uclinux.org\u003e\nSigned-off-by: Johannes Weiner \u003cjw@emlix.com\u003e\nAcked-by: Mike Frysinger \u003cvapier.adi@gmail.com\u003e\nSigned-off-by: Andrew Morton \u003cakpm@linux-foundation.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "16752e2ead535c0e616c64d3fee8401ebd0c9f62", "tree": "8acc28898c73d760eb68a9efe8db7352a5076568", "parents": [ "2d04f6b9bc91540b8e931a0700440118161092e0" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Tue Apr 28 21:20:11 2009 +0200" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Tue Apr 28 16:07:18 2009 -0700" }, "message": "m68k: arch/m68k/kernel/sun3-head.S needs \u003clinux/init.h\u003e\n\nFix this:\n\n arch/m68k/kernel/sun3-head.S: Assembler messages:\n arch/m68k/kernel/sun3-head.S:32: Error: Unknown operator -- statement `__head\u0027 ignored\n\nIntroduced by commit 6f335cab0431d5df4995bcd4fd952d4c746d5a86 (\"m68k:\nconvert to use __HEAD and HEAD_TEXT macros.\"), which started using\n__HEAD without adding the appropriate include.\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "6f335cab0431d5df4995bcd4fd952d4c746d5a86", "tree": "fa4bd2c2a79d54b53995c6586cd4c67fb18afbef", "parents": [ "34963696629b6d1e0066a5f2e67993e409c9434b" ], "author": { "name": "Tim Abbott", "email": "tabbott@MIT.EDU", "time": "Sat Apr 25 22:11:03 2009 -0400" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 26 09:20:38 2009 -0700" }, "message": "m68k: convert to use __HEAD and HEAD_TEXT macros.\n\nThis has the consequence of changing the section name use for head\ncode from \".text.head\" to \".head.text\". Since this commit changes all\nusers in the architecture, this change should be harmless.\n\nSigned-off-by: Tim Abbott \u003ctabbott@mit.edu\u003e\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Roman Zippel \u003czippel@linux-m68k.org\u003e\nAcked-by: Sam Ravnborg \u003csam@ravnborg.org\u003e\nSigned-off-by: Linus Torvalds \u003ctorvalds@linux-foundation.org\u003e\n" }, { "commit": "adfe7c69891128f5e238a5e6823709b4bb85b340", "tree": "a4a4d09472006568fa47654ee58b5bbc93c59628", "parents": [ "cc7c0fa3b90a047751f50371639b90dc119e63ea" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Sun Mar 29 14:23:44 2009 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Apr 22 20:55:12 2009 +0200" }, "message": "m68k: Update defconfigs for 2.6.30-rc3\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\n" }, { "commit": "cc7c0fa3b90a047751f50371639b90dc119e63ea", "tree": "be2c946cb62a6199714ffbd3a8a31bcd80100b23", "parents": [ "2d138ae09935cec055f65d18300727a7a46d92b9" ], "author": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Thu Apr 09 22:23:51 2009 +0200" }, "committer": { "name": "Geert Uytterhoeven", "email": "geert@linux-m68k.org", "time": "Wed Apr 22 20:39:49 2009 +0200" }, "message": "m68k,m68knommu: Wire up preadv and pwritev\n\nSigned-off-by: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nAcked-by: Greg Ungerer \u003cgerg@uclinux.org\u003e\n" }, { "commit": "714f83d5d9f7c785f622259dad1f4fad12d64664", "tree": "20563541ae438e11d686b4d629074eb002a481b7", "parents": [ "8901e7ffc2fa78ede7ce9826dbad68a3a25dc2dc", "645dae969c3b8651c5bc7c54a1835ec03820f85f" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 05 11:04:19 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Sun Apr 05 11:04:19 2009 -0700" }, "message": "Merge branch \u0027tracing-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip\n\n* \u0027tracing-for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)\n tracing, net: fix net tree and tracing tree merge interaction\n tracing, powerpc: fix powerpc tree and tracing tree interaction\n ring-buffer: do not remove reader page from list on ring buffer free\n function-graph: allow unregistering twice\n trace: make argument \u0027mem\u0027 of trace_seq_putmem() const\n tracing: add missing \u0027extern\u0027 keywords to trace_output.h\n tracing: provide trace_seq_reserve()\n blktrace: print out BLK_TN_MESSAGE properly\n blktrace: extract duplidate code\n blktrace: fix memory leak when freeing struct blk_io_trace\n blktrace: fix blk_probes_ref chaos\n blktrace: make classic output more classic\n blktrace: fix off-by-one bug\n blktrace: fix the original blktrace\n blktrace: fix a race when creating blk_tree_root in debugfs\n blktrace: fix timestamp in binary output\n tracing, Text Edit Lock: cleanup\n tracing: filter fix for TRACE_EVENT_FORMAT events\n ftrace: Using FTRACE_WARN_ON() to check \"freed record\" in ftrace_release()\n x86: kretprobe-booster interrupt emulation code fix\n ...\n\nFix up trivial conflicts in\n arch/parisc/include/asm/ftrace.h\n include/linux/memory.h\n kernel/extable.c\n kernel/module.c\n" }, { "commit": "bad6a5c08c119572c888d5df2bd7691a4da6b9e8", "tree": "7070d6c17659332caad8f3d8f38b51855b3f05c4", "parents": [ "03c3fa0a3bf48dcb024263a9ea41daecacbc6efa", "0b5f037a4dc495f9c40eed7f076fc6c23af3359b" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 03 09:51:35 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 03 09:51:35 2009 -0700" }, "message": "Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc\n\n* git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc:\n powerpc/ps3: Add rtc-ps3\n powerpc: Hook up rtc-generic, and kill rtc-ppc\n m68k: Hook up rtc-generic\n parisc: rtc: Rename rtc-parisc to rtc-generic\n parisc: rtc: Add missing module alias\n parisc: rtc: platform_driver_probe() fixups\n parisc: rtc: get_rtc_time() returns unsigned int\n" }, { "commit": "5de1ccbe51e89c51a2fe5ab333b7c9c2e7294aff", "tree": "588d68842d6a082828e3a17efa3de6177b712a97", "parents": [ "223cdea4c4b5af5181b2da00ac85711d1e0c737c", "b4d63e8e745b0000ba22f44ff34cd51e8b4d0389" ], "author": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 03 09:44:58 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Fri Apr 03 09:44:58 2009 -0700" }, "message": "Merge branch \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu\n\n* \u0027for-linus\u0027 of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (41 commits)\n m68knommu: improve compile arch switch settings\n m68knommu: fix 5407 ColdFire UART vector setup\n m68knommu: fix 5307 ColdFire UART vector setup\n m68knommu: fix 5249 ColdFire UART vector setup\n m68knommu: fix 5249 ColdFire UART setup\n m68knommu: fix end of uart table marker\n m68knommu: switch to using generic_handle_irq()\n m68k: merge the mmu and non-mmu versions of tlbflush.h\n m68knommu: introduce basic clk infrastructure\n m68k: merge the mmu and non-mmu versions of module.h\n m68knommu: add missing interrupt line definition for UART 2\n m68k: merge the mmu and non-mmu versions of mmu_context.h\n m68k: merge the mmu and non-mmu versions of current.h\n m68k: merge the mmu and non-mmu versions of div64.h\n m68k: merge the mmu and non-mmu versions of bugs.h\n m68k: merge the mmu and non-mmu versions of bug.h\n m68k: use the mmu version of cache.h for m68knommu as well\n m68k: use the mmu version of bootinfo.h for m68knommu as well\n m68k: merge the mmu and non-mmu versions of fb.h\n m68k: merge the mmu and non-mmu versions of segment.h\n ...\n" }, { "commit": "6f2c55b843836d26528c56a0968689accaedbc67", "tree": "17501e29d4b6ef3eb85da9a5d6ad3df7f19ec6a2", "parents": [ "14dd1ff0f9e75dd4ae2f1ff8e48becb76d14f4ab" ], "author": { "name": "Alexey Dobriyan", "email": "adobriyan@gmail.com", "time": "Thu Apr 02 16:56:59 2009 -0700" }, "committer": { "name": "Linus Torvalds", "email": "torvalds@linux-foundation.org", "time": "Thu Apr 02 19:04:51 2009 -0700" }, "message": "Simplify copy_thread()\n\nFirst argument unused since 2.3.11.\n\n[akpm@linux-foundation.org: coding-style fixes]\nSigned-off-by: Alexey Dobriyan \u003cadobriyan@gmail.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": "2ceb3ad705aa1abe6656b038bb9f4a6b1201cc35", "tree": "2ba21ba2d78d98cc442958a429bd602319e650c8", "parents": [ "3afe6d04626f8de87b15150a30b78df492ab68ee" ], "author": { "name": "Geert Uytterhoeven", "email": "Geert.Uytterhoeven@sonycom.com", "time": "Thu Feb 19 16:50:46 2009 +0100" }, "committer": { "name": "Kyle McMartin", "email": "kyle@mcmartin.ca", "time": "Thu Apr 02 01:05:31 2009 +0000" }, "message": "m68k: Hook up rtc-generic\n\nm68k has been a long time user of the generic RTC abstraction, so hook up\nrtc-generic:\n - Create the \"rtc-generic\" platform device if mach_hwclk is set,\n - Add checks for mach_hwclk, in anticipation of RTC chip drivers being moved\n to drivers/rtc/.\n\nSigned-off-by: Geert Uytterhoeven \u003cGeert.Uytterhoeven@sonycom.com\u003e\nAcked-by: Alessandro Zummo \u003ca.zummo@towertech.it\u003e\nSigned-off-by: Kyle McMartin \u003ckyle@mcmartin.ca\u003e\n" }, { "commit": "8302294f43250dc337108c51882a6007f2b1e2e0", "tree": "85acd4440799c46a372df9cad170fa0c21e59096", "parents": [ "4fe70410d9a219dabb47328effccae7e7f2a6e26", "2e572895bf3203e881356a4039ab0fa428ed2639" ], "author": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Wed Apr 01 21:54:19 2009 +0200" }, "committer": { "name": "Ingo Molnar", "email": "mingo@elte.hu", "time": "Thu Apr 02 00:49:02 2009 +0200" }, "message": "Merge branch \u0027tracing/core-v2\u0027 into tracing-for-linus\n\nConflicts:\n\tinclude/linux/slub_def.h\n\tlib/Kconfig.debug\n\tmm/slob.c\n\tmm/slub.c\n" }, { "commit": "f94116aeec7a299640dd692128e1d22178affa8d", "tree": "e73b4ec980f50d3f4aaaa50f58bfc9607507e037", "parents": [ "09a3e79187c56842d509430267ece5b82216baee" ], "author": { "name": "Bartlomiej Zolnierkiewicz", "email": "bzolnier@gmail.com", "time": "Fri Mar 27 12:46:23 2009 +0100" }, "committer": { "name": "Bartlomiej Zolnierkiewicz", "email": "bzolnier@gmail.com", "time": "Fri Mar 27 12:46:23 2009 +0100" }, "message": "ide: cleanup \u003casm-m68k/ide.h\u003e\n\n* Remove superfluous \u003casm/macints.h\u003e include.\n\n* No need to re-define in/out*() macros as they are no longer used\n by m68k host drivers.\n\n* readl() and writel() are not used by core IDE code.\n\n* Use raw_*_swapw() directly in {falcon,q40}ide.c and remove\n {in,out}sw_swapw() macros.\n\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Michael Schmitz \u003cschmitz@debian.org\u003e\nSigned-off-by: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\n" }, { "commit": "e354c1d8033d97a97a38a1b2cffa1bc285b92ad4", "tree": "cd520f7cd4a417c1f78d81e3a3b62936697b35f6", "parents": [ "d15a613ba01ff2b209ecad7a38ccbb23b3b06c92" ], "author": { "name": "Bartlomiej Zolnierkiewicz", "email": "bzolnier@gmail.com", "time": "Fri Mar 27 12:46:22 2009 +0100" }, "committer": { "name": "Bartlomiej Zolnierkiewicz", "email": "bzolnier@gmail.com", "time": "Fri Mar 27 12:46:22 2009 +0100" }, "message": "ide: remove IDE_ARCH_LOCK (v2)\n\n* Add -\u003e{get,release}_lock methods to struct ide_port_info\n and struct ide_host.\n\n* Convert core IDE code, m68k IDE code and falconide support to use\n -\u003e{get,release}_lock methods instead of ide_{get,release}_lock().\n\n* Remove IDE_ARCH_LOCK.\n\nv2:\n* Build fix from Geert updating ide_{get,release}_lock() callers in\n falconide.c.\n\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Michael Schmitz \u003cschmitz@debian.org\u003e\nSigned-off-by: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\n" }, { "commit": "d15a613ba01ff2b209ecad7a38ccbb23b3b06c92", "tree": "3c13ef45f1eae35a2079f04350266f61bfbfa6c8", "parents": [ "088b1b88609ce89b6ab19d114cdbec94a44aa22c" ], "author": { "name": "Bartlomiej Zolnierkiewicz", "email": "bzolnier@gmail.com", "time": "Fri Mar 27 12:46:21 2009 +0100" }, "committer": { "name": "Bartlomiej Zolnierkiewicz", "email": "bzolnier@gmail.com", "time": "Fri Mar 27 12:46:21 2009 +0100" }, "message": "ide: remove IDE_ARCH_INTR (v2)\n\nThis micro-optimization is not worth it. Just always check for\nexistence of -\u003eack_intr method in ide_intr() and ide_timer_expiry().\n\nv2:\nFix brown-paper-bag bug spotted by David D. Kilzer.\n\nCc: Geert Uytterhoeven \u003cgeert@linux-m68k.org\u003e\nCc: Michael Schmitz \u003cschmitz@debian.org\u003e\nCc: \"David D. Kilzer\" \u003cddkilzer@kilzer.net\u003e\nSigned-off-by: Bartlomiej Zolnierkiewicz \u003cbzolnier@gmail.com\u003e\n" } ], "next": "4496d937a518fde0d0e1980e4ab470cedb4b50cd" }