Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev (86373435) · Commits · 戴 / test

Documentation/feature-removal-schedule.txt

+0 −18

Original line number	Diff line number	Diff line
		@@ -206,24 +206,6 @@ Who: Len Brown <len.brown@intel.com>

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

		What: libata spindown skipping and warning
		When: Dec 2008
		Why: Some halt(8) implementations synchronize caches for and spin
		down libata disks because libata didn't use to spin down disk on
		system halt (only synchronized caches).
		Spin down on system halt is now implemented. sysfs node
		/sys/class/scsi_disk/h:c:i:l/manage_start_stop is present if
		spin down support is available.
		Because issuing spin down command to an already spun down disk
		makes some disks spin up just to spin down again, libata tracks
		device spindown status to skip the extra spindown command and
		warn about it.
		This is to give userspace tools the time to get updated and will
		be removed after userspace is reasonably updated.
		Who: Tejun Heo <htejun@gmail.com>

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

		What: i386/x86_64 bzImage symlinks
		When: April 2010

+3 −2

Original line number	Diff line number	Diff line
		@@ -192,13 +192,14 @@ struct pci_raw_ops pci_direct_conf2 = {
		static int __init pci_sanity_check(struct pci_raw_ops *o)
		{
		u32 x = 0;
		int devfn;
		int year, devfn;

		if (pci_probe & PCI_NO_CHECKS)
		return 1;
		/* Assume Type 1 works for newer systems.
		This handles machines that don't have anything on PCI Bus 0. */
		if (dmi_get_year(DMI_BIOS_DATE) >= 2001)
		dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL);
		if (year >= 2001)
		return 1;

		for (devfn = 0; devfn < 0x100; devfn++) {

+3 −2

Original line number	Diff line number	Diff line
		@@ -78,9 +78,10 @@ static struct acpi_blacklist_item acpi_blacklist[] __initdata = {

		static int __init blacklist_by_year(void)
		{
		int year = dmi_get_year(DMI_BIOS_DATE);
		int year;

		/* Doesn't exist? Likely an old system */
		if (year == -1) {
		if (!dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL)) {
		printk(KERN_ERR PREFIX "no DMI BIOS year, "
		"acpi=force is required to enable ACPI\n" );
		return 1;

+21 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,17 @@ config ATA_NONSTANDARD
		bool
		default n

		config ATA_VERBOSE_ERROR
		bool "Verbose ATA error reporting"
		default y
		help
		This option adds parsing of ATA command descriptions and error bits
		in libata kernel output, making it easier to interpret.
		This option will enlarge the kernel by approx. 6KB. Disable it only
		if kernel size is more important than ease of debugging.

		If unsure, say Y.

		config ATA_ACPI
		bool "ATA ACPI Support"
		depends on ACPI && PCI
		@@ -586,6 +597,16 @@ config PATA_RB532

		If unsure, say N.

		config PATA_RDC
		tristate "RDC PATA support"
		depends on PCI
		help
		This option enables basic support for the later RDC PATA controllers
		controllers via the new ATA layer. For the RDC 1010, you need to
		enable the IT821X driver instead.

		If unsure, say N.

		config PATA_RZ1000
		tristate "PC Tech RZ1000 PATA support"
		depends on PCI

+1 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,7 @@ obj-$(CONFIG_PATA_PDC_OLD) += pata_pdc202xx_old.o
		obj-$(CONFIG_PATA_QDI) += pata_qdi.o
		obj-$(CONFIG_PATA_RADISYS) += pata_radisys.o
		obj-$(CONFIG_PATA_RB532) += pata_rb532_cf.o
		obj-$(CONFIG_PATA_RDC) += pata_rdc.o
		obj-$(CONFIG_PATA_RZ1000) += pata_rz1000.o
		obj-$(CONFIG_PATA_SC1200) += pata_sc1200.o
		obj-$(CONFIG_PATA_SERVERWORKS) += pata_serverworks.o