Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 007d00d4 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'for-next/dwc3' of... 

Merge branch 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-next

* 'for-next/dwc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb: (392 commits)
  usb: dwc3: ep0: fix for possible early delayed_status
  usb: dwc3: gadget: fix stream enable bit
  usb: dwc3: ep0: fix GetStatus handling (again)
  usb: dwc3: ep0: use dwc3_request for ep0 requsts instead of usb_request
  usb: dwc3: use correct hwparam register for power mgm check
  usb: dwc3: omap: move to module_platform_driver
  usb: dwc3: workaround: missing disconnect event
  usb: dwc3: workaround: missing USB3 Reset event
  usb: dwc3: workaround: U1/U2 -> U0 transiton
  usb: dwc3: gadget: return early in dwc3_cleanup_done_reqs()
  usb: dwc3: ep0: handle delayed_status again
  usb: dwc3: ep0: push ep0state into xfernotready processing
  usb: dwc3: fix sparse errors
  usb: dwc3: fix few coding style problems
  usb: dwc3: move generic dwc3 code from gadget into core
  usb: dwc3: use a helper function for operation mode setting
  usb: dwc3: ep0: don't use ep0in for transfers
  usb: dwc3: ep0: use proper endianess in SetFeature for wIndex
  usb: dwc3: core: drop DWC3_EVENT_BUFFERS_MAX
  usb: dwc3: omap: add multiple instances support to OMAP
  ...
parents c91043ad 68d3e668

CREDITS

+6 −3
Original line number Diff line number Diff line
@@ -688,10 +688,13 @@ S: Oxfordshire, UK. 


N: Kees Cook

E: kees@outflux.net

W: http://outflux.net/

P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30  1975 1FFF 4BA9 1706 3E6D

D: Minor updates to SCSI types, added /proc/pid/maps protection

E: kees@ubuntu.com

E: keescook@chromium.org

W: http://outflux.net/blog/

P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E  6E13 8972 F4DF DC6D C026

D: Various security things, bug fixes, and documentation.

S: (ask for current address)

S: Portland, Oregon

S: USA



N: Robin Cornelius

Documentation/kernel-parameters.txt

+3 −3
Original line number Diff line number Diff line
@@ -315,12 +315,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			CPU-intensive style benchmark, and it can vary highly in

			a microbenchmark depending on workload and compiler.



			1: only for 32-bit processes

			2: only for 64-bit processes

			32: only for 32-bit processes

			64: only for 64-bit processes

			on: enable for both 32- and 64-bit processes

			off: disable for both 32- and 64-bit processes



	amd_iommu=	[HW,X86-84]

	amd_iommu=	[HW,X86-64]

			Pass parameters to the AMD IOMMU driver in the system.

			Possible values are:

			fullflush - enable flushing of IO/TLB entries when

Documentation/networking/ip-sysctl.txt

+5 −5
Original line number Diff line number Diff line
@@ -282,11 +282,11 @@ tcp_max_ssthresh - INTEGER 
	Default: 0 (off)



tcp_max_syn_backlog - INTEGER

	Maximal number of remembered connection requests, which are

	still did not receive an acknowledgment from connecting client.

	Default value is 1024 for systems with more than 128Mb of memory,

	and 128 for low memory machines. If server suffers of overload,

	try to increase this number.

	Maximal number of remembered connection requests, which have not

	received an acknowledgment from connecting client.

	The minimal value is 128 for low memory machines, and it will

	increase in proportion to the memory of machine.

	If server suffers from overload, try increasing this number.



tcp_max_tw_buckets - INTEGER

	Maximal number of timewait sockets held by system simultaneously.

Documentation/sound/alsa/soc/machine.txt

+2 −4
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ Machine DAI Configuration 
The machine DAI configuration glues all the codec and CPU DAIs together. It can

also be used to set up the DAI system clock and for any machine related DAI

initialisation e.g. the machine audio map can be connected to the codec audio

map, unconnected codec pins can be set as such. Please see corgi.c, spitz.c

for examples.

map, unconnected codec pins can be set as such.



struct snd_soc_dai_link is used to set up each DAI in your machine. e.g.
@@ -83,8 +82,7 @@ Machine Power Map 
The machine driver can optionally extend the codec power map and to become an

audio power map of the audio subsystem. This allows for automatic power up/down

of speaker/HP amplifiers, etc. Codec pins can be connected to the machines jack

sockets in the machine init function. See soc/pxa/spitz.c and dapm.txt for

details.

sockets in the machine init function.





Machine Controls

Documentation/usb/linux-cdc-acm.inf

+2 −2
Original line number Diff line number Diff line
@@ -90,10 +90,10 @@ ServiceBinary=%12%\USBSER.sys 
[SourceDisksFiles]

[SourceDisksNames]

[DeviceList]

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02, USB\VID_1D6B&PID_0106&MI_00



[DeviceList.NTamd64]

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02

%DESCRIPTION%=DriverInstall, USB\VID_0525&PID_A4A7, USB\VID_1D6B&PID_0104&MI_02, USB\VID_1D6B&PID_0106&MI_00





;------------------------------------------------------------------------------