Commit Graph

769 Commits

Author SHA1 Message Date
Linus Torvalds ab396e91bf Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Fix up some trivial conflicts in {i386|ia64}/Makefile
2006-01-10 08:21:33 -08:00
Jesper Juhl e48e99093c [PATCH] Docs update: small fixes to stable_kernel_rules.txt
Small spelling, formating & similar fixes to stable_kernel_rules.txt

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 08:01:55 -08:00
Jesper Juhl 5dd94ed249 [PATCH] Docs update: remove obsolete patch from locks.txt
Remove obsolete patch from Documentation/locks.txt

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 08:01:54 -08:00
Jesper Juhl c63ca3c8b0 [PATCH] Docs update: small spelling, formating etc fixes for filesystems/ext3.txt
Spelling fixes, formating changes and corrections for
 Documentation/filesystems/ext3.txt

Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 08:01:54 -08:00
Randy Dunlap c594a50db4 [PATCH] Docs update: typos, corrections and additions to applying-patches.txt
Typos/corrections.

A few extra additions on top of Randy's fixes.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 08:01:54 -08:00
Martin Waitz be217ff21c [PATCH] DocBook: add .gitignore file
when ignoring all DocBook output files git-status output becomes meaningful
again.

Signed-off-by: Martin Waitz <tali@admingilde.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 08:01:52 -08:00
Jesper Juhl dc3d28d02e [PATCH] CodingStyle correction
Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 08:01:52 -08:00
Thomas Gleixner df78488de7 [PATCH] hrtimer: hrtimer documentation
add hrtimer docbook and design document

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 08:01:37 -08:00
Maneesh Soni a7e670d828 [PATCH] Kdump documentation update
Update the kdump documentation to reflect the changes due to recent kernel
config option changes for kexec and kdump.

Signed-off-by: Maneesh Soni <maneesh@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 08:01:29 -08:00
Vivek Goyal aac04b32f3 [PATCH] kdump: x86_64: add elfcorehdr command line option
- elfcorehdr= specifies the location of elf core header stored by the
  crashed kernel.  This command line option will be passed by the kexec-tools
  to capture kernel.

Changes in this version :

- Added more comments in kernel-parameters.txt and in code.

Signed-off-by: Murali M Chakravarthy <muralim@in.ibm.com>
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 08:01:27 -08:00
akpm@osdl.org 69cda7b1f0 [PATCH] kdump: x86_64: add memmmap command line option
)

From: Vivek Goyal <vgoyal@in.ibm.com>

- This patch introduces the memmap option for x86_64 similar to i386.

- memmap=exactmap enables setting of an exact E820 memory map, as specified
  by the user.

Changes in this version:

- Used e820_end_of_ram() to find the max_pfn as suggested by Andi kleen.

- removed PFN_UP & PFN_DOWN macros

- Printing the user defined map also.

Signed-off-by: Murali M Chakravarthy <muralim@in.ibm.com>
Signed-off-by: Hariprasad Nellitheertha <nharipra@gmail.com>
Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-10 08:01:27 -08:00
Linus Torvalds 977127174a Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6 2006-01-09 18:41:42 -08:00
Linus Torvalds 80c0531514 Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6 2006-01-09 17:31:38 -08:00
Linus Torvalds a457aa6c2b Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 2006-01-09 17:06:53 -08:00
Ingo Molnar f3f54ffa70 [PATCH] mutex subsystem, documentation
Add mutex design related documentation.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
2006-01-09 15:59:20 -08:00
Adrian Bunk e82443c092 Documentation/filesystems/proc.txt: indentation fix
Signed-off-by: Adrian Bunk <bunk@stusta.de>
2006-01-10 00:20:30 +01:00
Adrian Bunk 943ffb587c spelling: s/retreive/retrieve/
Signed-off-by: Adrian Bunk <bunk@stusta.de>
2006-01-10 00:10:13 +01:00
Linus Torvalds 0581445007 Merge master.kernel.org:/home/rmk/linux-2.6-serial 2006-01-09 15:09:03 -08:00
Adrian Bunk a58a414fd5 spelling: s/usefull/useful/
Signed-off-by: Adrian Bunk <bunk@stusta.de>
2006-01-10 00:08:17 +01:00
Linus Torvalds f17578decc Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb 2006-01-09 13:03:58 -08:00
Alexey Dobriyan 682e852e26 [PATCH] Fix more "if ((err = foo() < 0))" typos
Another reason to use:

	ret = foo();
	if (ret < 0)
		goto out;

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-09 13:02:51 -08:00
Michael Krufky cec418346e V4L/DVB (3336): Bluebird firmware hosting moved to common dvb firmware dir on linuxtv.org
- Get_dvb_firmware script updated accordingly:
- my $url = "http://www.linuxtv.org/~mkrufky/dvb-usb-bluebird-01.fw";
+ my $url = "http://www.linuxtv.org/download/dvb/firmware/dvb-usb-blue$

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:40 -02:00
Chris Pascoe 43eabb4e22 V4L/DVB (3311): DViCO FusionHDTV DVB-T Dual Digital PCI support
- Support for DVB reception on the PCI half of the DViCO DVB-T Dual Digital.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 18:21:28 -02:00
linas@austin.ibm.com 065c635907 [PATCH] PCI Error Recovery: documentation
Various PCI bus errors can be signaled by newer PCI controllers.
Recovering from those errors requires an infrastructure to notify
affected device drivers of the error, and a way of walking through
a reset sequence.  This patch adds documentation describing the
current error recovery proposal.

Signed-off-by: Linas Vepstas <linas@austin.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-01-09 12:13:21 -08:00
Jesse Barnes 5d135dff53 [PATCH] PCI: document sysfs rom file interface
idr gently pointed out today that not only is the sysfs rom file
interface somewhat unintuitive (despite my efforts and initial
implementation), but it's also undocumented!  This patch to
Documentation/filesystems/sysfs-pci.txt corrects the latter problem; the
former is a userland ABI now though, so we're stuck with it for awhile
at least.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2006-01-09 12:13:19 -08:00
Linus Torvalds 6150c32589 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge 2006-01-09 10:03:44 -08:00
Knut Petersen 44637a12f8 [PATCH] Update cyblafb driver
This is a major update to the cyblafb framebuffer driver. Most
of the stuff has been tested in the mm tree.

Main advantages:
============
  - vxres > xres support
  - ywrap and xpan support
  - much faster for almost all modes (e.g. 1280x1024-16bpp
     draws more than 41 full screens of text instead of about 25
     full screens of text per second on authors Epia 5000)
  - module init/exit code fixed
  - bugs triggered by console rotation fixed
  - lots of minor improvements
  - startup modes suitable for high performance scrolling
     in all directions

This diff  also contains a lot of white space fixes.

No side effects are possible, only one single graphics core is affected.

Signed-off-by: Knut Petersen <Knut_Petersen@t-online.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-09 10:00:36 -08:00
Peter Missel 4aa6ba513e V4L/DVB (3295): Add analog support for LifeView FlyDVB Trio.
- Add support for LifeView FlyDVB Trio.
- all analog inputs are supported and working, including FM radio
- TO DO: dvb & remote control

Signed-off-by: Peter Missel <peter.missel@onlinehome.de>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:45 -02:00
Manenti Marco f39624fda0 V4L/DVB (3294): Add Kworld/Vstream Xpert DVB-T card with cx22702 tuner.
- Add Kworld/Vstream Xpert DVB-T card with cx22702 tuner.

Signed-off-by: Manenti Marco <marco_manenti@colman.it>
Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:45 -02:00
Michael Krufky d8e6acf2ec V4L/DVB (3287): Add DViCO Bluebird firmware to dvb_get_firmware script
- Add DViCO Bluebird firmware to dvb_get_firmware script,
for FusionHDTV USB devices.
- Use usb alt setting 0 for EP4 transfer (dvb-t),
- Use usb alt setting 7 for EP2 transfer (atsc)
- Added comment to lgdt330x.c to indicate support for
DViCO FusionHDTV5 USB Gold.
Thanks to: Jeff Lee <JeffLee@dvico.com>

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:32:42 -02:00
Ville Skytt\ 12e66f6573 V4L/DVB (3242): make the firmware dir docs consistent in the v4l-dvb tree.
- make the firmware dir documentation and comments consistent in the v4l-dvb tree.

Signed-off-by: Ville Skytt <ville.skytta@iki.fi>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:25:38 -02:00
Chris Pascoe fc40b261db V4L/DVB (3220): Add support for VP-3054 HDTV board
- Added support for VP-3054 (aka DigitalNow DNTV Live! DVB-T Pro!).
- This board has a secondary I2C bus and remote control.
- Added a new module to handle secondary I2C bus on this board.

Signed-off-by: Chris Pascoe <c.pascoe@itee.uq.edu.au>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:25:35 -02:00
Michael Krufky 50c25fff53 V4L/DVB (3218): Whitespace cleanups
- minor whitespace cleanups

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:25:34 -02:00
Ricardo Cerqueira 41d70c26c6 V4L/DVB (3216): saa7134 card #58 has a newer revision with a new subsystem ID
- Added new ID for different revision of card #58. It's the same card,
but with a tda8275a instead of a tda8275

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:25:34 -02:00
Michael Krufky 83ac8722be V4L/DVB (3196): correct Thomson DTT 761x frequency ranges
- Corrected Thomson DTT 7611 tuner programming, based on spec sheet
- renamed to Thomson DTT 761x
- applies to DTT 7611 7611A 7612 7613 7613A 7614 7615 7615A
(DTT 7610 is similar, but slightly different programming)
- corrected frequency ranges for analog and digital modes

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:25:29 -02:00
Michael Krufky 5ea892f156 V4L/DVB (3166): "Philips 1236D ATSC/NTSC dual in" - fix typo.
- "Philips 1236D ATSC/NTSC dual in" - fix typo.

Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:25:26 -02:00
Steven Toth c432a072b6 V4L/DVB (3092): Add support for another Nova-T-PCI PCI subdevice 0x9001
- Add support for another Nova-T-PCI PCI subdevice 0x9001

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:25:13 -02:00
Steven Toth 611900c185 V4L/DVB (3089): Adding support for the Hauppauge HVR1100 and HVR1100-LP products.
- Add support for the Hauppauge HVR1100 and HVR1100-LP products.
- Add i2c_gate_ctrl callback function to dvb_frontend_ops struct.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:25:12 -02:00
Vadim Catana 0e0351e370 V4L (1007): Add support for KWorld DVB-S 100
- Add support for KWorld DVB-S 100, based on the same chips as Hauppauge
Nova-S Plus (CX23883/CX24123/CX24109), without the Intersil ISL6421,
which is used for LNB control.
- LNB voltage and tone are controled by LNBDC and LNBTone bits from
register 0x29 of the CX24123 demodulator.
- The MO_GP0_IO register from CX23883 is used to turn LNB power on and off.

Signed-off-by: Vadim Catana <skystar@moldova.cc>
Acked-by: Johannes Stezenbach <js@linuxtv.org>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:25:02 -02:00
Steven Toth fb56cb65e4 V4L (0990): Enable IR support for the Nova-S-Plus
- Enable IR support for the Nova-S-Plus.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:25:02 -02:00
Steven Toth 0fa14aa621 V4L (0979): Added V4L support for the Nova-S-Plus and Nova-SE2 DVB-S products
- Added V4L support for the Nova-S-Plus and Nova-SE2 DVB-S products.
- Basic DVB-S support is working, analog video inputs work.
- It has one or two fixme comments, primarily analog GPIOs (audio) and eeprom parsing.
- CX24123 code (in cx88-dvb.c) disabled until the
- cx24123 module is added to dvb-kernel cvs.

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:25:02 -02:00
Steven Toth cd1257d860 V4L (1023): Added Hauppauge ImpactVCB board
- Modifications to bttv to support the Hauppauge ImpactVCB product
(Model #64900).

Signed-off-by: Steven Toth <stoth@hauppauge.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:25:01 -02:00
Jrg Schummer f639c9b21b V4L (1019): Added basic support (tv + radio) for TerraTec Cinergy 250 PCI
- Added "TerraTec Cinergy 250 PCI" board (tv and radio).
- svideo not tested
- IR yet not working

Signed-off-by: Jrg Schummer <joerg.schummer@web.de>
Signed-off-by:  Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:25:01 -02:00
Mauro Carvalho Chehab 17cbe2e583 V4L (963): Explicit compat_ioctl32 handler to em28xx
- Included explicit compat_ioctl32 handler.
- removed extra line on cardlist.


Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
2006-01-09 15:24:58 -02:00
Eric Paris 8fad6939af [PATCH] update bonding.txt to not show ip address on slaves
ifenslave, as of abi version 2, does not set the ip address on the slave
interfaces.  The documentation example however still shows that the
ensalved interfaces should have the same IP as the master.  The patch
simply removes the lines from the example which should no longer appear.

Signed-off-by: Eric Paris <eparis@redhat.com>

 bonding.txt |    2 --
 1 files changed, 2 deletions(-)
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
2006-01-09 10:48:09 -05:00
Arjan van de Ven a771f2b82a [PATCH] Add a section about inlining to Documentation/CodingStyle
Adds a bit of text to Documentation/Codingstyle to state that inlining
everything "just because" is a bad idea

Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-08 20:14:06 -08:00
Randy Dunlap 58591e8a1f [PATCH] SubmittingPatches: diffstat options
Add desired 'diffstat' options to use for kernel patches.

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-08 20:14:04 -08:00
Andrew Morton a136564702 [PATCH] remove gcc-2 checks
Remove various things which were checking for gcc-1.x and gcc-2.x compilers.

From: Adrian Bunk <bunk@stusta.de>

    Some documentation updates and removes some code paths for gcc < 3.2.

Acked-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-08 20:14:02 -08:00
Andy Isaacson 37a327957e [PATCH] block/stat.txt
I couldn't find any docs explaining the contents of /sys/block/<dev>/stat,
so I wrote up the following.  I'm not completely sure it's accurate - Jens,
could you give a yea or nay on this?

In particular, the counts of read/write IOs and read/write sectors are
incremented in different places - it looks like they both increment as the
request is being finished, but I'm not completely sure of that.

Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-08 20:14:01 -08:00
Rob Landley 99aef427e2 [PATCH] update to the initramfs docs
Based on questions people have asked me.  Repeatedly.

Signed-off-by: Rob Landley <rob@landley.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2006-01-08 20:14:00 -08:00