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

Commit cf7a2b4f authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900' into devel

parents b736b89f 8c3cbd5a 57a473f2 af1057ab c1cb6b7f 65cec8e3 8e22676e

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
*.gz

*.lzma

*.patch

*.gcno



#

# Top-level generic files

Documentation/DocBook/mac80211.tmpl

+0 −2
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ usage should require reading the full document. 
!Finclude/net/mac80211.h ieee80211_ctstoself_get

!Finclude/net/mac80211.h ieee80211_ctstoself_duration

!Finclude/net/mac80211.h ieee80211_generic_frame_duration

!Finclude/net/mac80211.h ieee80211_get_hdrlen_from_skb

!Finclude/net/mac80211.h ieee80211_hdrlen

!Finclude/net/mac80211.h ieee80211_wake_queue

!Finclude/net/mac80211.h ieee80211_stop_queue

!Finclude/net/mac80211.h ieee80211_wake_queues

Documentation/block/data-integrity.txt

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ encouraged them to allow separation of the data and integrity metadata 
scatter-gather lists.



The controller will interleave the buffers on write and split them on

read.  This means that the Linux can DMA the data buffers to and from

read.  This means that Linux can DMA the data buffers to and from

host memory without changes to the page cache.



Also, the 16-bit CRC checksum mandated by both the SCSI and SATA specs
@@ -66,7 +66,7 @@ software RAID5). 


The IP checksum is weaker than the CRC in terms of detecting bit

errors.  However, the strength is really in the separation of the data

buffers and the integrity metadata.  These two distinct buffers much

buffers and the integrity metadata.  These two distinct buffers must

match up for an I/O to complete.



The separation of the data and integrity metadata buffers as well as

Documentation/cgroups/cpusets.txt

+12 −0
Original line number Diff line number Diff line
@@ -777,6 +777,18 @@ in cpuset directories: 
# /bin/echo 1-4 > cpus		-> set cpus list to cpus 1,2,3,4

# /bin/echo 1,2,3,4 > cpus	-> set cpus list to cpus 1,2,3,4



To add a CPU to a cpuset, write the new list of CPUs including the

CPU to be added. To add 6 to the above cpuset:



# /bin/echo 1-4,6 > cpus	-> set cpus list to cpus 1,2,3,4,6



Similarly to remove a CPU from a cpuset, write the new list of CPUs

without the CPU to be removed.



To remove all the CPUs:



# /bin/echo "" > cpus		-> clear cpus list



2.3 Setting flags

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

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/";