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

Commit a5d00dc3 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-linus' into for-next 

... for migrating the core changes for USB-audio disconnection fixes
parents 1a8506d4 0914f796

.gitignore

+0 −6
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ 
*.o.*

*.a

*.s

*.ko.unsigned

*.ko.stripped

*.ko.stripped.dig

*.ko.stripped.sig

*.ko

*.so

*.so.dbg
@@ -95,6 +91,4 @@ GTAGS 
extra_certificates

signing_key.priv

signing_key.x509

signing_key.x509.keyid

signing_key.x509.signer

x509.genkey

Documentation/DocBook/media/Makefile

+38 −38
Original line number Diff line number Diff line
@@ -56,15 +56,15 @@ FUNCS = \ 
	write \



IOCTLS = \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/videodev2.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/audio.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/ca.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/dmx.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/frontend.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([A-Z][^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/net.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/dvb/video.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/media.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/linux/v4l2-subdev.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/videodev2.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/audio.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/ca.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/dmx.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/frontend.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([A-Z][^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/net.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/dvb/video.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/media.h) \

	$(shell perl -ne 'print "$$1 " if /\#define\s+([^\s]+)\s+_IO/' $(srctree)/include/uapi/linux/v4l2-subdev.h) \

	VIDIOC_SUBDEV_G_FRAME_INTERVAL \

	VIDIOC_SUBDEV_S_FRAME_INTERVAL \

	VIDIOC_SUBDEV_ENUM_MBUS_CODE \
@@ -74,32 +74,32 @@ IOCTLS = \ 
	VIDIOC_SUBDEV_S_SELECTION \



TYPES = \

	$(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/linux/videodev2.h) \

	$(shell perl -ne 'print "$$1 " if /^}\s+([a-z0-9_]+_t)/' $(srctree)/include/linux/dvb/frontend.h)

	$(shell perl -ne 'print "$$1 " if /^typedef\s+[^\s]+\s+([^\s]+)\;/' $(srctree)/include/uapi/linux/videodev2.h) \

	$(shell perl -ne 'print "$$1 " if /^}\s+([a-z0-9_]+_t)/' $(srctree)/include/uapi/linux/dvb/frontend.h)



ENUMS = \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/audio.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/ca.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/dmx.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/frontend.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/net.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/dvb/video.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h)

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/videodev2.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/audio.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/ca.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/dmx.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/frontend.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/net.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/dvb/video.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/media.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-mediabus.h) \

	$(shell perl -ne 'print "$$1 " if /^enum\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-subdev.h)



STRUCTS = \

	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/videodev2.h) \

	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s\{]+)\s*/)' $(srctree)/include/linux/dvb/audio.h) \

	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/ca.h) \

	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/dmx.h) \

	$(shell perl -ne 'print "$$1 " if (!/dtv\_cmds\_h/ && /^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/frontend.h) \

	$(shell perl -ne 'print "$$1 " if (/^struct\s+([A-Z][^\s]+)\s+/)' $(srctree)/include/linux/dvb/net.h) \

	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/linux/dvb/video.h) \

	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/media.h) \

	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-subdev.h) \

	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/linux/v4l2-mediabus.h)

	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/videodev2.h) \

	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s\{]+)\s*/)' $(srctree)/include/uapi/linux/dvb/audio.h) \

	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/ca.h) \

	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/dmx.h) \

	$(shell perl -ne 'print "$$1 " if (!/dtv\_cmds\_h/ && /^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/frontend.h) \

	$(shell perl -ne 'print "$$1 " if (/^struct\s+([A-Z][^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/net.h) \

	$(shell perl -ne 'print "$$1 " if (/^struct\s+([^\s]+)\s+/)' $(srctree)/include/uapi/linux/dvb/video.h) \

	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/media.h) \

	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-subdev.h) \

	$(shell perl -ne 'print "$$1 " if /^struct\s+([^\s]+)\s+/' $(srctree)/include/uapi/linux/v4l2-mediabus.h)



ERRORS = \

	E2BIG \
@@ -205,7 +205,7 @@ $(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES) 
	@(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/)

	@(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/)



$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml

$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml

	@$($(quiet)gen_xml)

	@(					\

	echo "<programlisting>") > $@
@@ -216,7 +216,7 @@ $(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/linux/videodev2.h $(MEDIA_O 
	@(					\

	echo "</programlisting>") >> $@



$(MEDIA_OBJ_DIR)/audio.h.xml: $(srctree)/include/linux/dvb/audio.h $(MEDIA_OBJ_DIR)/v4l2.xml

$(MEDIA_OBJ_DIR)/audio.h.xml: $(srctree)/include/uapi/linux/dvb/audio.h $(MEDIA_OBJ_DIR)/v4l2.xml

	@$($(quiet)gen_xml)

	@(					\

	echo "<programlisting>") > $@
@@ -227,7 +227,7 @@ $(MEDIA_OBJ_DIR)/audio.h.xml: $(srctree)/include/linux/dvb/audio.h $(MEDIA_OBJ_D 
	@(					\

	echo "</programlisting>") >> $@



$(MEDIA_OBJ_DIR)/ca.h.xml: $(srctree)/include/linux/dvb/ca.h $(MEDIA_OBJ_DIR)/v4l2.xml

$(MEDIA_OBJ_DIR)/ca.h.xml: $(srctree)/include/uapi/linux/dvb/ca.h $(MEDIA_OBJ_DIR)/v4l2.xml

	@$($(quiet)gen_xml)

	@(					\

	echo "<programlisting>") > $@
@@ -238,7 +238,7 @@ $(MEDIA_OBJ_DIR)/ca.h.xml: $(srctree)/include/linux/dvb/ca.h $(MEDIA_OBJ_DIR)/v4 
	@(					\

	echo "</programlisting>") >> $@



$(MEDIA_OBJ_DIR)/dmx.h.xml: $(srctree)/include/linux/dvb/dmx.h $(MEDIA_OBJ_DIR)/v4l2.xml

$(MEDIA_OBJ_DIR)/dmx.h.xml: $(srctree)/include/uapi/linux/dvb/dmx.h $(MEDIA_OBJ_DIR)/v4l2.xml

	@$($(quiet)gen_xml)

	@(					\

	echo "<programlisting>") > $@
@@ -249,7 +249,7 @@ $(MEDIA_OBJ_DIR)/dmx.h.xml: $(srctree)/include/linux/dvb/dmx.h $(MEDIA_OBJ_DIR)/ 
	@(					\

	echo "</programlisting>") >> $@



$(MEDIA_OBJ_DIR)/frontend.h.xml: $(srctree)/include/linux/dvb/frontend.h $(MEDIA_OBJ_DIR)/v4l2.xml

$(MEDIA_OBJ_DIR)/frontend.h.xml: $(srctree)/include/uapi/linux/dvb/frontend.h $(MEDIA_OBJ_DIR)/v4l2.xml

	@$($(quiet)gen_xml)

	@(					\

	echo "<programlisting>") > $@
@@ -260,7 +260,7 @@ $(MEDIA_OBJ_DIR)/frontend.h.xml: $(srctree)/include/linux/dvb/frontend.h $(MEDIA 
	@(					\

	echo "</programlisting>") >> $@



$(MEDIA_OBJ_DIR)/net.h.xml: $(srctree)/include/linux/dvb/net.h $(MEDIA_OBJ_DIR)/v4l2.xml

$(MEDIA_OBJ_DIR)/net.h.xml: $(srctree)/include/uapi/linux/dvb/net.h $(MEDIA_OBJ_DIR)/v4l2.xml

	@$($(quiet)gen_xml)

	@(					\

	echo "<programlisting>") > $@
@@ -271,7 +271,7 @@ $(MEDIA_OBJ_DIR)/net.h.xml: $(srctree)/include/linux/dvb/net.h $(MEDIA_OBJ_DIR)/ 
	@(					\

	echo "</programlisting>") >> $@



$(MEDIA_OBJ_DIR)/video.h.xml: $(srctree)/include/linux/dvb/video.h $(MEDIA_OBJ_DIR)/v4l2.xml

$(MEDIA_OBJ_DIR)/video.h.xml: $(srctree)/include/uapi/linux/dvb/video.h $(MEDIA_OBJ_DIR)/v4l2.xml

	@$($(quiet)gen_xml)

	@(					\

	echo "<programlisting>") > $@

Documentation/DocBook/networking.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ 
!Enet/core/filter.c

     </sect1>

     <sect1><title>Generic Network Statistics</title>

!Iinclude/linux/gen_stats.h

!Iinclude/uapi/linux/gen_stats.h

!Enet/core/gen_stats.c

!Enet/core/gen_estimator.c

     </sect1>
@@ -80,7 +80,7 @@ 
!Enet/wimax/op-rfkill.c

!Enet/wimax/stack.c

!Iinclude/net/wimax.h

!Iinclude/linux/wimax.h

!Iinclude/uapi/linux/wimax.h

     </sect1>

  </chapter>

Documentation/IPMI.txt

+3 −62
Original line number Diff line number Diff line
@@ -42,13 +42,7 @@ The driver interface depends on your hardware. If your system 
properly provides the SMBIOS info for IPMI, the driver will detect it

and just work.  If you have a board with a standard interface (These

will generally be either "KCS", "SMIC", or "BT", consult your hardware

manual), choose the 'IPMI SI handler' option.  A driver also exists

for direct I2C access to the IPMI management controller.  Some boards

support this, but it is unknown if it will work on every board.  For

this, choose 'IPMI SMBus handler', but be ready to try to do some

figuring to see if it will work on your system if the SMBIOS/APCI

information is wrong or not present.  It is fairly safe to have both

these enabled and let the drivers auto-detect what is present.

manual), choose the 'IPMI SI handler' option.



You should generally enable ACPI on your system, as systems with IPMI

can have ACPI tables describing them.
@@ -58,8 +52,7 @@ their job correctly, the IPMI controller should be automatically 
detected (via ACPI or SMBIOS tables) and should just work.  Sadly,

many boards do not have this information.  The driver attempts

standard defaults, but they may not work.  If you fall into this

situation, you need to read the section below named 'The SI Driver' or

"The SMBus Driver" on how to hand-configure your system.

situation, you need to read the section below named 'The SI Driver'.



IPMI defines a standard watchdog timer.  You can enable this with the

'IPMI Watchdog Timer' config option.  If you compile the driver into
@@ -104,12 +97,7 @@ driver, each open file for this device ties in to the message handler 
as an IPMI user.



ipmi_si - A driver for various system interfaces.  This supports KCS,

SMIC, and BT interfaces.  Unless you have an SMBus interface or your

own custom interface, you probably need to use this.



ipmi_smb - A driver for accessing BMCs on the SMBus. It uses the

I2C kernel driver's SMBus interfaces to send and receive IPMI messages

over the SMBus.

SMIC, and BT interfaces.



ipmi_watchdog - IPMI requires systems to have a very capable watchdog

timer.  This driver implements the standard Linux watchdog timer
@@ -482,53 +470,6 @@ for specifying an interface. Note that when removing an interface, 
only the first three parameters (si type, address type, and address)

are used for the comparison.  Any options are ignored for removing.



The SMBus Driver

----------------



The SMBus driver allows up to 4 SMBus devices to be configured in the

system.  By default, the driver will register any SMBus interfaces it finds

in the I2C address range of 0x20 to 0x4f on any adapter.  You can change this

at module load time (for a module) with:



  modprobe ipmi_smb.o

	addr=<adapter1>,<i2caddr1>[,<adapter2>,<i2caddr2>[,...]]

	dbg=<flags1>,<flags2>...

	[defaultprobe=1] [dbg_probe=1]



The addresses are specified in pairs, the first is the adapter ID and the

second is the I2C address on that adapter.



The debug flags are bit flags for each BMC found, they are:

IPMI messages: 1, driver state: 2, timing: 4, I2C probe: 8



Setting smb_defaultprobe to zero disabled the default probing of SMBus

interfaces at address range 0x20 to 0x4f.  This means that only the

BMCs specified on the smb_addr line will be detected.



Setting smb_dbg_probe to 1 will enable debugging of the probing and

detection process for BMCs on the SMBusses.



Discovering the IPMI compliant BMC on the SMBus can cause devices

on the I2C bus to fail. The SMBus driver writes a "Get Device ID" IPMI

message as a block write to the I2C bus and waits for a response.

This action can be detrimental to some I2C devices. It is highly recommended

that the known I2c address be given to the SMBus driver in the smb_addr

parameter. The default address range will not be used when a smb_addr

parameter is provided.



When compiled into the kernel, the addresses can be specified on the

kernel command line as:



  ipmb_smb.addr=<adapter1>,<i2caddr1>[,<adapter2>,<i2caddr2>[,...]]

	ipmi_smb.dbg=<flags1>,<flags2>...

	ipmi_smb.defaultprobe=0 ipmi_smb.dbg_probe=1



These are the same options as on the module command line.



Note that you might need some I2C changes if CONFIG_IPMI_PANIC_EVENT

is enabled along with this, so the I2C driver knows to run to

completion during sending a panic event.





Other Pieces

------------

Documentation/hwmon/coretemp

+1 −0
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ Process Processor TjMax(C) 
		330/230						125

		E680/660/640/620				90

		E680T/660T/640T/620T				110

		CE4170/4150/4110				110



45nm		Core2 Processors

		Solo ULV SU3500/3300				100