linux-kernel - Re: linux-next: manual merge of the spi tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 14 Oct 2013 19:44:35 +0300
From:	Mika Westerberg <mika.westerberg@...ux.intel.com>
To:	Thierry Reding <thierry.reding@...il.com>
Cc:	Mark Brown <broonie@...nel.org>,
	"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>,
	Jarkko Nikula <jarkko.nikula@...ux.intel.com>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: manual merge of the spi tree

On Mon, Oct 14, 2013 at 04:48:08PM +0200, Thierry Reding wrote:
> Today's linux-next merge of the spi tree got a conflict in
> 
> 	drivers/spi/spi.c
> 
> Caused by commits cf9eb39 (spi: Fix modalias for ACPI enumerated SPI devices)
> and 33cf00e (spi: attach/detach SPI device to the ACPI power domain).
> 
> I fixed it up (see below). Please verify that the resolution looks good.
> 
> Thanks,
> Thierry
> ---
> diff --cc drivers/spi/spi.c
> index 740f9dd,2d29dee..8a0fc92
> --- a/drivers/spi/spi.c
> +++ b/drivers/spi/spi.c
> @@@ -1037,10 -1143,8 +1155,10 @@@ static acpi_status acpi_spi_add_device(
>   		return AE_OK;
>   	}
>   
>  +	adev->power.flags.ignore_parent = true;
> - 	strlcpy(spi->modalias, dev_name(&adev->dev), sizeof(spi->modalias));
> + 	strlcpy(spi->modalias, acpi_device_hid(adev), sizeof(spi->modalias));
>   	if (spi_add_device(spi)) {
>  +		adev->power.flags.ignore_parent = false;
>   		dev_err(&master->dev, "failed to add SPI device %s from ACPI\n",
>   			dev_name(&adev->dev));
>   		spi_dev_put(spi);

Looks good to me, thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/