Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a890b15c authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'upstream'

parents 79fa1b67 26ec634c

CREDITS

+3 −3
Original line number Original line Diff line number Diff line
@@ -3382,7 +3382,7 @@ S: Germany 




N: Geert Uytterhoeven

N: Geert Uytterhoeven

E: geert@linux-m68k.org

E: geert@linux-m68k.org

W: http://home.tvd.be/cr26864/

W: http://users.telenet.be/geertu/

P: 1024/862678A6 C51D 361C 0BD1 4C90 B275  C553 6EEA 11BA 8626 78A6

P: 1024/862678A6 C51D 361C 0BD1 4C90 B275  C553 6EEA 11BA 8626 78A6

D: m68k/Amiga and PPC/CHRP Longtrail coordinator

D: m68k/Amiga and PPC/CHRP Longtrail coordinator

D: Frame buffer device and XF68_FBDev maintainer

D: Frame buffer device and XF68_FBDev maintainer
@@ -3392,8 +3392,8 @@ D: Amiga Buddha and Catweasel chipset IDE 
D: Atari Falcon chipset IDE

D: Atari Falcon chipset IDE

D: Amiga Gayle chipset IDE

D: Amiga Gayle chipset IDE

D: mipsel NEC DDB Vrc-5074

D: mipsel NEC DDB Vrc-5074

S: Emiel Vlieberghlaan 2A/21

S: Haterbeekstraat 55B

S: B-3010 Kessel-Lo

S: B-3200 Aarschot

S: Belgium

S: Belgium





N: Chris Vance

N: Chris Vance

Documentation/DMA-mapping.txt

+2 −2
Original line number Original line Diff line number Diff line
@@ -194,7 +194,7 @@ document for how to handle this case. 
Finally, if your device can only drive the low 24-bits of

Finally, if your device can only drive the low 24-bits of

address during PCI bus mastering you might do something like:

address during PCI bus mastering you might do something like:





	if (pci_set_dma_mask(pdev, 0x00ffffff)) {

	if (pci_set_dma_mask(pdev, DMA_24BIT_MASK)) {

		printk(KERN_WARNING

		printk(KERN_WARNING

		       "mydev: 24-bit DMA addressing not available.\n");

		       "mydev: 24-bit DMA addressing not available.\n");

		goto ignore_this_device;

		goto ignore_this_device;

Documentation/DocBook/libata.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -705,7 +705,7 @@ and other resources, etc. 




	<sect1><title>ata_scsi_error()</title>

	<sect1><title>ata_scsi_error()</title>

	<para>

	<para>

	ata_scsi_error() is the current hostt->eh_strategy_handler()

	ata_scsi_error() is the current transportt->eh_strategy_handler()

	for libata.  As discussed above, this will be entered in two

	for libata.  As discussed above, this will be entered in two

	cases - timeout and ATAPI error completion.  This function

	cases - timeout and ATAPI error completion.  This function

	calls low level libata driver's eng_timeout() callback, the

	calls low level libata driver's eng_timeout() callback, the

Documentation/feature-removal-schedule.txt

+0 −8
Original line number Original line Diff line number Diff line
@@ -71,14 +71,6 @@ Who: Mauro Carvalho Chehab <mchehab@brturbo.com.br> 




---------------------------

---------------------------





What:	remove EXPORT_SYMBOL(panic_timeout)

When:	April 2006

Files:	kernel/panic.c

Why:	No modular usage in the kernel.

Who:	Adrian Bunk <bunk@stusta.de>



---------------------------



What:	remove EXPORT_SYMBOL(insert_resource)

What:	remove EXPORT_SYMBOL(insert_resource)

When:	April 2006

When:	April 2006

Files:	kernel/resource.c

Files:	kernel/resource.c

Documentation/filesystems/vfs.txt

+11 −1
Original line number Original line Diff line number Diff line
@@ -694,7 +694,7 @@ struct file_operations 
----------------------

----------------------





This describes how the VFS can manipulate an open file. As of kernel

This describes how the VFS can manipulate an open file. As of kernel

2.6.13, the following members are defined:

2.6.17, the following members are defined:





struct file_operations {

struct file_operations {

	loff_t (*llseek) (struct file *, loff_t, int);

	loff_t (*llseek) (struct file *, loff_t, int);
@@ -723,6 +723,10 @@ struct file_operations { 
	int (*check_flags)(int);

	int (*check_flags)(int);

	int (*dir_notify)(struct file *filp, unsigned long arg);

	int (*dir_notify)(struct file *filp, unsigned long arg);

	int (*flock) (struct file *, int, struct file_lock *);

	int (*flock) (struct file *, int, struct file_lock *);

	ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, size_t, unsigned 

int);

	ssize_t (*splice_read)(struct file *, struct pipe_inode_info *, size_t, unsigned  

int);

};

};





Again, all methods are called without any locks being held, unless

Again, all methods are called without any locks being held, unless
@@ -790,6 +794,12 @@ otherwise noted. 




  flock: called by the flock(2) system call

  flock: called by the flock(2) system call





  splice_write: called by the VFS to splice data from a pipe to a file. This

		method is used by the splice(2) system call



  splice_read: called by the VFS to splice data from file to a pipe. This

	       method is used by the splice(2) system call



Note that the file operations are implemented by the specific

Note that the file operations are implemented by the specific

filesystem in which the inode resides. When opening a device node

filesystem in which the inode resides. When opening a device node

(character or block special) most filesystems will call special

(character or block special) most filesystems will call special