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
| ||
|
Date: Mon, 7 Jun 2010 11:03:35 -0600 From: Grant Likely <grant.likely@...retlab.ca> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: linux-next: manual merge of the devicetree tree with Linus' tree On Sun, Jun 6, 2010 at 8:53 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote: > Hi Grant, > > Today's linux-next merge of the devicetree tree got a conflict in > drivers/usb/host/ehci-hcd.c between commit > 1f23b2d98c11fed43c552a5dbd00c793f81a8736 ("usb: fix ehci_hcd build > failure when both generic-OF and xilinx is selected") from the tree and > commit 4c018c4ab1edd8f4154848868960ebe132c3d138 ("usb/of: fix build > errors") from the devicetree tree. > > They look like two version of the same fix. I used the version from > Linus' tree. Yup, that's right. The commit in my devicetree-next branch is stale and has been superseeded. I just hadn't pushed out the new tree yet. I'm refresh it today. Cheers, g. > -- > Cheers, > Stephen Rothwell sfr@...b.auug.org.au > http://www.canb.auug.org.au/~sfr/ > -- Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd. -- 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/
Powered by blists - more mailing lists