aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAge
* Revert "kconfig: tristate choices with mixed tristate and boolean values"Linus Torvalds2007-10-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a5bf3d891a6a0fb5aa122792d965e3774108b923. David Brownell notes that this causes a regression visible in the drivers/usb/gadget Kconfig file: "That Kconfig hasn't changed (other than adding new drivers), and it's worked that way for several years now ... so the issue seems to be changes in menuconfig/kconfig/etc semantics. The issue is that when USB_GADGET=m, it's no longer possible to configure peripheral controller drivers as modules ... the controller drivers can now only be configured for static linkage. It should be making a choice of one of the controller drivers which could work on the target system, and allow that driver to be linked either as a module (ok iff USB_GADGET=m) or statically." Reverting this commit resolves the problem, and also fixes a second problem that David noticed: various dependent options couldn't be enabled. Tested-and-reported-by: David Brownell <david-b@pacbell.net> Cc: Randy Dunlap <rdunlap@xenotime.net> Cc: Jan Beulich <jbeulich@novell.com>, Cc: Andrew Morton <akpm@linux-foundation.org>, Cc: Sam Ravnborg <sam@ravnborg.org>, Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2007-10-19
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (74 commits) fix do_sys_open() prototype sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistake Documentation: Fix typo in SubmitChecklist. Typo: depricated -> deprecated Add missing profile=kvm option to Documentation/kernel-parameters.txt fix typo about TBI in e1000 comment proc.txt: Add /proc/stat field small documentation fixes Fix compiler warning in smount example program from sharedsubtree.txt docs/sysfs: add missing word to sysfs attribute explanation documentation/ext3: grammar fixes Documentation/java.txt: typo and grammar fixes Documentation/filesystems/vfs.txt: typo fix include/asm-*/system.h: remove unused set_rmb(), set_wmb() macros trivial copy_data_pages() tidy up Fix typo in arch/x86/kernel/tsc_32.c file link fix for Pegasus USB net driver help remove unused return within void return function Typo fixes retrun -> return x86 hpet.h: remove broken links ...
| * fix do_sys_open() prototypeJason Uhlenkott2007-10-19
| | | | | | | | | | | | | | Fix an argument name in do_sys_open()'s prototype. Signed-off-by: Jason Uhlenkott <juhlenko@akamai.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * sysfs: trivial: fix sysfs_create_file kerneldoc spelling mistakeChris Malley2007-10-19
| | | | | | | | | | | | | | Spelling error in sysfs_create_file kerneldoc. Signed-off-by: Chris Malley <mail@chrismalley.co.uk> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * Documentation: Fix typo in SubmitChecklist.James Bowes2007-10-19
| | | | | | | | | | Signed-off-by: James Bowes <jbowes@dangerouslyinc.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * Typo: depricated -> deprecatedRolf Eike Beer2007-10-19
| | | | | | | | | | | | | | Typo: depricated -> deprecated Signed-off-by: Rolf Eike Beer <eike-kernel@sf-tec.de> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * Add missing profile=kvm option to Documentation/kernel-parameters.txtDave Jones2007-10-19
| | | | | | | | | | | | | | | | | | Whilst looking up what profile=sleep did, I noticed that we missed adding docs for the most recent addition to the profiler. Signed-off-by: Dave Jones <davej@redhat.com> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * fix typo about TBI in e1000 commentMasatake YAMATO2007-10-19
| | | | | | | | | | Signed-off-by: Masatake YAMATO <jet@gyve.org> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * proc.txt: Add /proc/stat fieldLeonardo Chiquitto2007-10-19
| | | | | | | | | | | | | | This patch updates the "cat /proc/stat" output found in Documentation/filesystems/proc.txt. Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * small documentation fixesPhilipp Marek2007-10-19
| | | | | | | | Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * Fix compiler warning in smount example program from sharedsubtree.txtJesper Juhl2007-10-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If one compiles the example smount program, found in Documentation/sharedsubtree.txt, with -Wall then there's a small compiler warning rearing its ugly head : smount.c: In function 'main': smount.c:45: warning: implicit declaration of function 'strcmp' Easily fixed by just including string.h Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * docs/sysfs: add missing word to sysfs attribute explanationShaun Zinck2007-10-19
| | | | | | | | | | | | | | Add the obvious missing word. Signed-off-by: Shaun Zinck <shaun.zinck@gmail.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * documentation/ext3: grammar fixesShaun Zinck2007-10-19
| | | | | | | | | | | | | | | | Fix some grammar in the explanation of the Journal Block Device layer. Signed-off-by: Shaun Zinck <shaun.zinck@gmail.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * Documentation/java.txt: typo and grammar fixesShaun Zinck2007-10-19
| | | | | | | | | | | | | | This fixes a typo and rearranges the sentence to make more sense. Signed-off-by: Shaun Zinck <shaun.zinck@gmail.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * Documentation/filesystems/vfs.txt: typo fixShaun Zinck2007-10-19
| | | | | | | | | | Signed-off-by: Shaun Zinck <shaun.zinck@gmail.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * include/asm-*/system.h: remove unused set_rmb(), set_wmb() macrosStefan Richter2007-10-19
| | | | | | | | | | | | | | | | | | These don't appear anywhere else in the kernel anymore. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de> Acked-by: Paul Mundt <lethal@linux-sh.org> Acked-by: Greg Ungerer <gerg@uclinux.org> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * trivial copy_data_pages() tidy upFengguang Wu2007-10-19
| | | | | | | | | | | | | | | | Change the loop style of copy_data_pages() to remove a duplicate condition. Signed-off-by: Fengguang Wu <wfg@mail.ustc.edu.cn> Acked-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * Fix typo in arch/x86/kernel/tsc_32.cJosh Triplett2007-10-19
| | | | | | | | | | Signed-off-by: Josh Triplett <josh@kernel.org> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * file link fix for Pegasus USB net driver helpCal Peake2007-10-19
| | | | | | | | | | | | | | Update the file link in the Pegasus USB network driver's help text. Signed-off-by: Cal Peake <cp@absolutedigital.net> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * remove unused return within void return functionDenis Cheng2007-10-19
| | | | | | | | | | Signed-off-by: Denis Cheng <crquan@gmail.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * Typo fixes retrun -> returnGabriel Craciunescu2007-10-19
| | | | | | | | | | | | | | Typo fixes retrun -> return Signed-off-by: Gabriel Craciunescu <nix.or.die@googlemail.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * x86 hpet.h: remove broken linksDave Young2007-10-19
| | | | | | | | | | | | Signed-off-by: Dave Young <hidave.darkstar@gmail.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * Update 2.4 maintainer in documentLi Yang2007-10-19
| | | | | | | | | | | | | | Update the maintainer of 2.4 kernel in Documentations/SubmittingPatches. Signed-off-by: Li Yang <leo@zh-kernel.org> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * fix comment: unlock_hrtimer_base is the counterpart of lock_hrtimer_baseUwe Kleine-König2007-10-19
| | | | | | | | | | Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * fix typo "sort" -> "short"Uwe Kleine-König2007-10-19
| | | | | | | | | | Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * fix typo "insted" -> "instead"Uwe Kleine-König2007-10-19
| | | | | | | | | | Signed-off-by: Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * Documentation/filesystems/files.txt: remove rcuref_inc_lf() reverencesEric Dumazet2007-10-19
| | | | | | | | | | | | | | rcuref_inc_lf() is not used anymore. Replace it by atomic_inc_not_zero() Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * kernel/sched.c: remove bogus comment from account_user_timeMichael Neuling2007-10-19
| | | | | | | | | | | | | | hardirq_offset is no longer needed. Signed-off-by: Michael Neuling <mikey@neuling.org> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * typo fixesMatt LaPlante2007-10-19
| | | | | | | | | | | | | | | | | | | | | | | | Most of these fixes were already submitted for old kernel versions, and were approved, but for some reason they never made it into the releases. Because this is a consolidation of a couple old missed patches, it touches both Kconfigs and documentation texts. Signed-off-by: Matt LaPlante <kernel1@cyberdogtech.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: Documentation/Simon Arlott2007-10-19
| | | | | | | | | | | | | | Spelling fixes in Documentation/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: lib/Simon Arlott2007-10-19
| | | | | | | | | | | | | | Spelling fix in lib/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: init/Simon Arlott2007-10-19
| | | | | | | | | | | | | | Spelling fix in init/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: mm/Simon Arlott2007-10-19
| | | | | | | | | | | | | | Spelling fixes in mm/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: arch/x86_64/Simon Arlott2007-10-19
| | | | | | | | | | | | | | Spelling fixes in arch/x86_64/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: arch/v850/Simon Arlott2007-10-19
| | | | | | | | | | | | | | Spelling fixes in arch/v850/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: arch/um/Simon Arlott2007-10-19
| | | | | | | | | | | | | | | | Spelling fixes in arch/um/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Acked-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: arch/m68k/Simon Arlott2007-10-19
| | | | | | | | | | | | | | | | Spelling fixes in arch/m68k/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: arch/m32r/Simon Arlott2007-10-19
| | | | | | | | | | | | | | Spelling fixes in arch/m32r/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: arch/i386/Simon Arlott2007-10-19
| | | | | | | | | | | | | | Spelling fixes in arch/i386/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: arch/h8300/Simon Arlott2007-10-19
| | | | | | | | | | | | | | Spelling fixes in arch/h8300/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: arch/frv/Simon Arlott2007-10-19
| | | | | | | | | | | | | | | | Spelling fixes in arch/frv/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Acked-By: David Howells <dhowells@redhat.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: arch/cris/Simon Arlott2007-10-19
| | | | | | | | | | | | | | Spelling fixes in arch/cris/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * spelling fixes: arch/alpha/Simon Arlott2007-10-19
| | | | | | | | | | | | | | Spelling fixes in arch/alpha/. Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * pata_cmd64x.c typo fixAdrian Bunk2007-10-19
| | | | | | | | | | | | Spotted by David Miller <davem@davemloft.net>. Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * remove duplicate MMAPPER Kconfig optionAdrian Bunk2007-10-19
| | | | | | | | | | | | | | This option is already in arch/um/Kconfig.char Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Jeff Dike <jdike@addtoit.com>
| * fix up security_socket_getpeersec_* documentationSerge Hallyn2007-10-19
| | | | | | | | | | | | | | | | | | Update the security_socket_peersec documentation in include/linux/security.h. security_socket_peersec has been split into two functions - _stream and _dgram, with new capabilities. Signed-off-by: Serge Hallyn <serue@us.ibm.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * changed emailJohann Deneux2007-10-19
| | | | | | | | | | | | | | | | Changed email address of Johann Deneux (myself) Also removed CVS tags in comments (no longer using cvs) Signed-off-by: Johann Deneux <johann.deneux@gmail.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * powerpc: Remove obsolete prototypeJulio M. Merino Vidal2007-10-19
| | | | | | | | | | | | | | | | | | | | The include/asm-powerpc/paca.h file has a prototype for a function that does not exist any more; its name is setup_boot_paca. This function was removed in commit 4ba99b97dadd35b9ce1438b2bc7c992a4a14a8b1, so its prototype should have been removed at that time too. Signed-off-by: Julio M. Merino Vidal <jmerino@ac.upc.edu> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * trivial comment wording/typo fix regarding taint flagsDaniel Roesen2007-10-19
| | | | | | | | | | Signed-off-by: Daniel Roesen <dr@cluenet.de> Signed-off-by: Adrian Bunk <bunk@kernel.org>
| * LIB: Replace inappropriate include of <linux/bug.h>Robert P. J. Day2007-10-19
| | | | | | | | | | | | | | | | | | | | | | | | | | Replace an irrelevant include of bug.h with the more appropriate includes of slab.h and module.h. it's not as if the original inclusion is an error, it's simply not related to the contents of that source file, while the other two are. compile-tested on i386. Signed-off-by: Robert P. J. Day <rpjday@mindspring.com> Signed-off-by: Adrian Bunk <bunk@kernel.org>
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-25 06:32:35 -0500