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

Message-ID: <20140908170659.1ec79726@canb.auug.org.au>
Date:	Mon, 8 Sep 2014 17:06:59 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Felipe Balbi <balbi@...com>,
	Yegor Yefremov <yegorslists@...glemail.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Philippe Reynes <tremyfr@...il.com>
Subject: linux-next: manual merge of the usb-gadget tree with Linus' tree

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got conflicts in
drivers/usb/gadget/Makefile, drivers/usb/gadget/legacy/Makefile and
drivers/usb/gadget/function/Makefile between commit 5d19703822da ("usb:
gadget: remove $(PWD) in ccflags-y") from Linus' tree and commit
fa31409a82ee ("usb: gadget: use $(srctree) instead of $(PWD) for
includes") from the usb-gadget tree.

I fixed it up (I used the version from the usb-gadget tree) and can
carry the fix as necessary (no action is required).

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

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