linux-kernel - linux-next: manual merge of the usb-gadget tree with the usb-gadget-fixes 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:	Sat, 23 Aug 2014 05:57:23 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Felipe Balbi <balbi@...com>, Felipe Balbi <balbi@...com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jingoo Han <jg1.han@...sung.com>
Subject: linux-next: manual merge of the usb-gadget tree with the
 usb-gadget-fixes tree

Hi Felipe,

Today's linux-next merge of the usb-gadget tree got a conflict in
drivers/usb/phy/phy-samsung-usb.h between commit bbc66e140bab ("usb:
phy: samsung: Fix wrong bit mask for PHYPARAM1_PCS_TXDEEMPH") from the
usb-gadget-fixes tree and commit 0dafc3d94596 ("usb: phy: samsung:
Remove unnecessary lines of register bit definitions") from the
usb-gadget tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

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

diff --cc drivers/usb/phy/phy-samsung-usb.h
index 80eedd45a20a,4eef45555971..000000000000
--- a/drivers/usb/phy/phy-samsung-usb.h
+++ b/drivers/usb/phy/phy-samsung-usb.h
@@@ -215,8 -185,7 +185,7 @@@
  #define PHYPARAM0_REF_LOSLEVEL			(0x9 << 26)

  #define EXYNOS5_DRD_PHYPARAM1			(0x20)
- 
 -#define PHYPARAM1_PCS_TXDEEMPH_MASK		(0x1f << 0)
 +#define PHYPARAM1_PCS_TXDEEMPH_MASK		(0x3f << 0)
  #define PHYPARAM1_PCS_TXDEEMPH			(0x1c)

  #define EXYNOS5_DRD_PHYTERM			(0x24)

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