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

Commit 6356bb0a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'please-pull-mce-f-bit' of... 

Merge tag 'please-pull-mce-f-bit' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras

 into x86/ras

Pull MCE-uncorrected-error fix from Tony Luck:

 "Bit 12 may or may not be set in MCi_STATUS.MCACOD when
  an uncorrected error is reported. Ignore it when checking
  error signatures."

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 7781544e 0ca06c08

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ modules.builtin 
*.bz2

*.lzma

*.xz

*.lz4

*.lzo

*.patch

*.gcno

Documentation/DocBook/device-drivers.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ X!Iinclude/linux/kobject.h 


     <sect1><title>Kernel utility functions</title>

!Iinclude/linux/kernel.h

!Ekernel/printk.c

!Ekernel/printk/printk.c

!Ekernel/panic.c

!Ekernel/sys.c

!Ekernel/rcupdate.c

Documentation/sysctl/net.txt

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ Default: 64 


busy_read

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

Low latency busy poll timeout for socket reads. (needs CONFIG_NET_LL_RX_POLL)

Low latency busy poll timeout for socket reads. (needs CONFIG_NET_RX_BUSY_POLL)

Approximate time in us to busy loop waiting for packets on the device queue.

This sets the default value of the SO_BUSY_POLL socket option.

Can be set or overridden per socket by setting socket option SO_BUSY_POLL,
@@ -63,7 +63,7 @@ Default: 0 (off) 


busy_poll

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

Low latency busy poll timeout for poll and select. (needs CONFIG_NET_LL_RX_POLL)

Low latency busy poll timeout for poll and select. (needs CONFIG_NET_RX_BUSY_POLL)

Approximate time in us to busy loop waiting for events.

Recommended value depends on the number of sockets you poll on.

For several sockets 50, for several hundreds 100.

MAINTAINERS

+11 −3
Original line number Diff line number Diff line
@@ -1406,7 +1406,7 @@ ATHEROS ATH6KL WIRELESS DRIVER 
M:	Kalle Valo <kvalo@qca.qualcomm.com>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/ath6kl

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath6kl.git

T:	git git://github.com/kvalo/ath.git

S:	Supported

F:	drivers/net/wireless/ath/ath6kl/
@@ -2871,7 +2871,7 @@ F: drivers/media/usb/dvb-usb-v2/dvb_usb* 
F:	drivers/media/usb/dvb-usb-v2/usb_urb.c



DYNAMIC DEBUG

M:	Jason Baron <jbaron@redhat.com>

M:	Jason Baron <jbaron@akamai.com>

S:	Maintained

F:	lib/dynamic_debug.c

F:	include/linux/dynamic_debug.h
@@ -6726,6 +6726,14 @@ T: git git://linuxtv.org/anttip/media_tree.git 
S:	Maintained

F:	drivers/media/tuners/qt1010*



QUALCOMM ATHEROS ATH10K WIRELESS DRIVER

M:	Kalle Valo <kvalo@qca.qualcomm.com>

L:	ath10k@lists.infradead.org

W:	http://wireless.kernel.org/en/users/Drivers/ath10k

T:	git git://github.com/kvalo/ath.git

S:	Supported

F:	drivers/net/wireless/ath/ath10k/



QUALCOMM HEXAGON ARCHITECTURE

M:	Richard Kuo <rkuo@codeaurora.org>

L:	linux-hexagon@vger.kernel.org
@@ -8270,7 +8278,7 @@ S: Maintained 
F:	sound/soc/codecs/twl4030*



TI WILINK WIRELESS DRIVERS

M:	Luciano Coelho <coelho@ti.com>

M:	Luciano Coelho <luca@coelho.fi>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/wl12xx

W:	http://wireless.kernel.org/en/users/Drivers/wl1251

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 11

SUBLEVEL = 0

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Linux for Workgroups



# *DOCUMENTATION*