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

Commit aa11d958 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 

Conflicts:
	arch/microblaze/include/asm/socket.h
parents 07f6642e 9799218a

CREDITS

+6 −0
Original line number Diff line number Diff line
@@ -2006,6 +2006,9 @@ E: paul@laufernet.com 
D: Soundblaster driver fixes, ISAPnP quirk

S: California, USA



N: Jonathan Layes

D: ARPD support



N: Tom Lees

E: tom@lpsg.demon.co.uk

W: http://www.lpsg.demon.co.uk/
@@ -3802,6 +3805,9 @@ S: van Bronckhorststraat 12 
S: 2612 XV Delft

S: The Netherlands



N: Thomas Woller

D: CS461x Cirrus Logic sound driver



N: David Woodhouse

E: dwmw2@infradead.org

D: JFFS2 file system, Memory Technology Device subsystem,

Documentation/ABI/testing/sysfs-block

+23 −14
Original line number Diff line number Diff line
@@ -94,28 +94,37 @@ What: /sys/block/<disk>/queue/physical_block_size 
Date:		May 2009

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		This is the smallest unit the storage device can write

		without resorting to read-modify-write operation.  It is

		usually the same as the logical block size but may be

		bigger.  One example is SATA drives with 4KB sectors

		that expose a 512-byte logical block size to the

		operating system.

		This is the smallest unit a physical storage device can

		write atomically.  It is usually the same as the logical

		block size but may be bigger.  One example is SATA

		drives with 4KB sectors that expose a 512-byte logical

		block size to the operating system.  For stacked block

		devices the physical_block_size variable contains the

		maximum physical_block_size of the component devices.



What:		/sys/block/<disk>/queue/minimum_io_size

Date:		April 2009

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Storage devices may report a preferred minimum I/O size,

		which is the smallest request the device can perform

		without incurring a read-modify-write penalty.  For disk

		drives this is often the physical block size.  For RAID

		arrays it is often the stripe chunk size.

		Storage devices may report a granularity or preferred

		minimum I/O size which is the smallest request the

		device can perform without incurring a performance

		penalty.  For disk drives this is often the physical

		block size.  For RAID arrays it is often the stripe

		chunk size.  A properly aligned multiple of

		minimum_io_size is the preferred request size for

		workloads where a high number of I/O operations is

		desired.



What:		/sys/block/<disk>/queue/optimal_io_size

Date:		April 2009

Contact:	Martin K. Petersen <martin.petersen@oracle.com>

Description:

		Storage devices may report an optimal I/O size, which is

		the device's preferred unit of receiving I/O.  This is

		rarely reported for disk drives.  For RAID devices it is

		usually the stripe width or the internal block size.
 
		the device's preferred unit for sustained I/O.  This is

		rarely reported for disk drives.  For RAID arrays it is

		usually the stripe width or the internal track size.  A

		properly aligned multiple of optimal_io_size is the

		preferred request size for workloads where sustained

		throughput is desired.  If no optimal I/O size is

		reported this file contains 0.

Documentation/arm/memory.txt

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ ffff8000 ffffffff copy_user_page / clear_user_page use. 
				For SA11xx and Xscale, this is used to

				setup a minicache mapping.



ffff4000	ffffffff	cache aliasing on ARMv6 and later CPUs.



ffff1000	ffff7fff	Reserved.

				Platforms must not use this address range.

Documentation/driver-model/driver.txt

+2 −2
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ Attributes 
~~~~~~~~~~

struct driver_attribute {

        struct attribute        attr;

        ssize_t (*show)(struct device_driver *, char * buf, size_t count, loff_t off);

        ssize_t (*store)(struct device_driver *, const char * buf, size_t count, loff_t off);

        ssize_t (*show)(struct device_driver *driver, char *buf);

        ssize_t (*store)(struct device_driver *, const char * buf, size_t count);

};



Device drivers can export attributes via their sysfs directories.

Documentation/dvb/get_dvb_firmware

+52 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ use IO::Handle; 
		"tda10046lifeview", "av7110", "dec2000t", "dec2540t",

		"dec3000s", "vp7041", "dibusb", "nxt2002", "nxt2004",

		"or51211", "or51132_qam", "or51132_vsb", "bluebird",

		"opera1", "cx231xx", "cx18", "cx23885", "pvrusb2" );

		"opera1", "cx231xx", "cx18", "cx23885", "pvrusb2", "mpc718" );



# Check args

syntax() if (scalar(@ARGV) != 1);
@@ -381,6 +381,57 @@ sub cx18 { 
    $allfiles;

}



sub mpc718 {

    my $archive = 'Yuan MPC718 TV Tuner Card 2.13.10.1016.zip';

    my $url = "ftp://ftp.work.acer-euro.com/desktop/aspire_idea510/vista/Drivers/$archive";

    my $fwfile = "dvb-cx18-mpc718-mt352.fw";

    my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);



    checkstandard();

    wgetfile($archive, $url);

    unzip($archive, $tmpdir);



    my $sourcefile = "$tmpdir/Yuan MPC718 TV Tuner Card 2.13.10.1016/mpc718_32bit/yuanrap.sys";

    my $found = 0;



    open IN, '<', $sourcefile or die "Couldn't open $sourcefile to extract $fwfile data\n";

    binmode IN;

    open OUT, '>', $fwfile;

    binmode OUT;

    {

	# Block scope because we change the line terminator variable $/

	my $prevlen = 0;

	my $currlen;



	# Buried in the data segment are 3 runs of almost identical

	# register-value pairs that end in 0x5d 0x01 which is a "TUNER GO"

	# command for the MT352.

	# Pull out the middle run (because it's easy) of register-value

	# pairs to make the "firmware" file.



	local $/ = "\x5d\x01"; # MT352 "TUNER GO"



	while (<IN>) {

	    $currlen = length($_);

	    if ($prevlen == $currlen && $currlen <= 64) {

		chop; chop; # Get rid of "TUNER GO"

		s/^\0\0//;  # get rid of leading 00 00 if it's there

		printf OUT "$_";

		$found = 1;

		last;

	    }

	    $prevlen = $currlen;

	}

    }

    close OUT;

    close IN;

    if (!$found) {

	unlink $fwfile;

	die "Couldn't find valid register-value sequence in $sourcefile for $fwfile\n";

    }

    $fwfile;

}



sub cx23885 {

    my $url = "http://linuxtv.org/downloads/firmware/";