linux-kernel - linux-next: manual merge of the usb tree with the acpi 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-next>] [day] [month] [year] [list]

Message-Id: <20120924164916.faeb0225ef2b0732762d8aac@canb.auug.org.au>
Date:	Mon, 24 Sep 2012 16:49:16 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Feng Tang <feng.tang@...el.com>, Len Brown <lenb@...nel.org>,
	Lan Tianyu <tianyu.lan@...el.com>,
	Sarah Sharp <sarah.a.sharp@...ux.intel.com>
Subject: linux-next: manual merge of the usb tree with the acpi tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/core/usb-acpi.c between commit 59e6423ba8aa ("usb-acpi:
Comply with the ACPI API change") from the acpi tree and commit
05f916894a69 ("usb/acpi: Store info on device removability") from the usb
tree.

The latter removed the function changed by the former, so I just did that
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped