Merge branch 'master' into upstream (26e27cd4) · Commits · e / devices / android_kernel_fairphone_FP5

Documentation/dvb/get_dvb_firmware

+4 −4

Original line number	Diff line number	Diff line
		@@ -259,9 +259,9 @@ sub dibusb {
		}

		sub nxt2002 {
		my $sourcefile = "Broadband4PC_4_2_11.zip";
		my $sourcefile = "Technisat_DVB-PC_4_4_COMPACT.zip";
		my $url = "http://www.bbti.us/download/windows/$sourcefile";
		my $hash = "c6d2ea47a8f456d887ada0cfb718ff2a";
		my $hash = "476befae8c7c1bb9648954060b1eec1f";
		my $outfile = "dvb-fe-nxt2002.fw";
		my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);

		@@ -269,8 +269,8 @@ sub nxt2002 {

		wgetfile($sourcefile, $url);
		unzip($sourcefile, $tmpdir);
		verify("$tmpdir/SkyNETU.sys", $hash);
		extract("$tmpdir/SkyNETU.sys", 375832, 5908, $outfile);
		verify("$tmpdir/SkyNET.sys", $hash);
		extract("$tmpdir/SkyNET.sys", 331624, 5908, $outfile);

		$outfile;
		}

Documentation/firmware_class/README

+0 −17

Original line number	Diff line number	Diff line
		@@ -105,20 +105,3 @@
		on the setup, so I think that the choice on what firmware to make
		persistent should be left to userspace.

		- Why register_firmware()+__init can be useful:
		- For boot devices needing firmware.
		- To make the transition easier:
		The firmware can be declared __init and register_firmware()
		called on module_init. Then the firmware is warranted to be
		there even if "firmware hotplug userspace" is not there yet or
		it doesn't yet provide the needed firmware.
		Once the firmware is widely available in userspace, it can be
		removed from the kernel. Or made optional (CONFIG_.*_FIRMWARE).

		In either case, if firmware hotplug support is there, it can move the
		firmware out of kernel memory into the real filesystem for later
		usage.

		Note: If persistence is implemented on top of initramfs,
		register_firmware() may not be appropriate.

Documentation/firmware_class/firmware_sample_driver.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -5,8 +5,6 @@
		*
		* Sample code on how to use request_firmware() from drivers.
		*
		* Note that register_firmware() is currently useless.
		*
		*/

		#include <linux/module.h>
		@@ -17,11 +15,6 @@

		#include "linux/firmware.h"

		#define WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
		#ifdef WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
		char __init inkernel_firmware[] = "let's say that this is firmware\n";
		#endif

		static struct device ghost_device = {
		.bus_id = "ghost0",
		};
		@@ -104,10 +97,6 @@ static void sample_probe_async(void)

		static int sample_init(void)
		{
		#ifdef WE_CAN_NEED_FIRMWARE_BEFORE_USERSPACE_IS_AVAILABLE
		register_firmware("sample_driver_fw", inkernel_firmware,
		sizeof(inkernel_firmware));
		#endif
		device_initialize(&ghost_device);
		/* since there is no real hardware insertion I just call the
		* sample probe functions here */

MAINTAINERS

+27 −2

Original line number	Diff line number	Diff line
		@@ -40,11 +40,20 @@ trivial patch so apply some common sense.
		PLEASE document known bugs. If it doesn't work for everything
		or does something very odd once a month document it.

		PLEASE remember that submissions must be made under the terms
		of the OSDL certificate of contribution
		(http://www.osdl.org/newsroom/press_releases/2004/2004_05_24_dco.html)
		and should include a Signed-off-by: line.

		6. Make sure you have the right to send any changes you make. If you
		do changes at work you may find your employer owns the patch
		not you.

		7. Happy hacking.
		7. When sending security related changes or reports to a maintainer
		please Cc: security@kernel.org, especially if the maintainer
		does not respond.

		8. Happy hacking.

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

		@@ -969,7 +978,7 @@ S: Maintained
		EXT3 FILE SYSTEM
		P: Stephen Tweedie, Andrew Morton
		M: sct@redhat.com, akpm@osdl.org, adilger@clusterfs.com
		L: ext3-users@redhat.com
		L: ext2-devel@lists.sourceforge.net
		S: Maintained

		F71805F HARDWARE MONITORING DRIVER
		@@ -1530,12 +1539,28 @@ W: http://jfs.sourceforge.net/
		T: git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
		S: Supported

		JOURNALLING LAYER FOR BLOCK DEVICS (JBD)
		P: Stephen Tweedie, Andrew Morton
		M: sct@redhat.com, akpm@osdl.org
		L: ext2-devel@lists.sourceforge.net
		S: Maintained

		KCONFIG
		P: Roman Zippel
		M: zippel@linux-m68k.org
		L: kbuild-devel@lists.sourceforge.net
		S: Maintained

		KDUMP
		P: Vivek Goyal
		M: vgoyal@in.ibm.com
		P: Haren Myneni
		M: hbabu@us.ibm.com
		L: fastboot@lists.osdl.org
		L: linux-kernel@vger.kernel.org
		W: http://lse.sourceforge.net/kdump/
		S: Maintained

		KERNEL AUTOMOUNTER (AUTOFS)
		P: H. Peter Anvin
		M: hpa@zytor.com

arch/i386/kernel/apic.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -1341,6 +1341,14 @@ int __init APIC_init_uniprocessor (void)

		connect_bsp_APIC();

		/*
		* Hack: In case of kdump, after a crash, kernel might be booting
		* on a cpu with non-zero lapic id. But boot_cpu_physical_apicid
		* might be zero if read from MP tables. Get it from LAPIC.
		*/
		#ifdef CONFIG_CRASH_DUMP
		boot_cpu_physical_apicid = GET_APIC_ID(apic_read(APIC_ID));
		#endif
		phys_cpu_present_map = physid_mask_of_physid(boot_cpu_physical_apicid);

		setup_local_APIC();