linux-kernel - linux-next: manual merge of the usb-gadget 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]

Date:	Thu, 10 Oct 2013 22:20:30 +0100
From:	Mark Brown <broonie@...nel.org>
To:	Russell King <rmk+kernel@....linux.org.uk>,
	Sergei Shtylyov <sergei.shtylyov@...entembedded.com>,
	Felipe Balbi <balbi@...com>
Cc:	linux-usb@...r.kernel.org, linux-next@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	Thierry Reding <thierry.reding@...il.com>
Subject: linux-next: manual merge of the usb-gadget tree

Today's linux-next merge of the usb-gadget tree got conflicts in
drivers/usb/musb/davinci.c caused by an add in ea78201e2 (usb: musb:
davinci: fix resources passed to MUSB driver for DM6467) adjacent to
the modification of the device registration in 4c9ad1059 (DMA-API: usb:
musb: use platform_device_register_full() to avoid directly messing with
dma masks) from the ARM tree.

I've fixed trivially and can carry as required.

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)