linux-kernel - linux-next: manual merge of the usb tree with the usb.current 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: <20120305170004.9c81f2d148cc179f42a39ade@canb.auug.org.au>
Date:	Mon, 5 Mar 2012 17:00:04 +1100
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,
	Shengzhou Liu <Shengzhou.Liu@...escale.com>
Subject: linux-next: manual merge of the usb tree with the usb.current tree

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/host/ehci-fsl.h between commit 71919403dc86 ("Revert
"powerpc/usb: fix issue of CPU halt when missing USB PHY clock"") from
the usb.current tree and commit 28c56ea14314 ("powerpc/usb: fix bug of
kernel hang when initializing usb") from the usb tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc drivers/usb/host/ehci-fsl.h
index 4918062,863fb0c..0000000
--- a/drivers/usb/host/ehci-fsl.h
+++ b/drivers/usb/host/ehci-fsl.h
@@@ -45,5 -47,7 +47,6 @@@
  #define FSL_SOC_USB_PRICTRL	0x40c	/* NOTE: big-endian */
  #define FSL_SOC_USB_SICTRL	0x410	/* NOTE: big-endian */
  #define FSL_SOC_USB_CTRL	0x500	/* NOTE: big-endian */
+ #define CTRL_UTMI_PHY_EN	(1<<9)
 -#define CTRL_PHY_CLK_VALID	(1 << 17)
  #define SNOOP_SIZE_2GB		0x1e
  #endif				/* _EHCI_FSL_H */

Content of type "application/pgp-signature" skipped