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

Commit bd8879fa authored by Jiri Kosina's avatar Jiri Kosina
Browse files

Merge branches 'for-4.20/upstream-fixes', 'for-4.21/core',...

Merge branches 'for-4.20/upstream-fixes', 'for-4.21/core', 'for-4.21/hid-asus', 'for-4.21/hid-core', 'for-4.21/hid-cougar', 'for-4.21/hidraw', 'for-4.21/highres-wheel' and 'for-4.21/ish' into for-linus
Loading
+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ Peter Oruba <peter@oruba.de>
Peter Oruba <peter.oruba@amd.com>
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
Praveen BP <praveenbp@ti.com>
Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
+16 −0
Original line number Diff line number Diff line
@@ -2138,6 +2138,10 @@ E: paul@laufernet.com
D: Soundblaster driver fixes, ISAPnP quirk
S: California, USA

N: Jarkko Lavinen
E: jarkko.lavinen@nokia.com
D: OMAP MMC support

N: Jonathan Layes
D: ARPD support

@@ -2200,6 +2204,10 @@ S: Post Office Box 371
S: North Little Rock, Arkansas 72115
S: USA

N: Christopher Li
E: sparse@chrisli.org
D: Sparse maintainer 2009 - 2018

N: Stephan Linz
E: linz@mazet.de
E: Stephan.Linz@gmx.de
@@ -2533,6 +2541,10 @@ S: Ormond
S: Victoria 3163
S: Australia

N: Eric Miao
E: eric.y.miao@gmail.com
D: MMP support

N: Pauline Middelink
E: middelin@polyware.nl
D: General low-level bug fixes, /proc fixes, identd support
@@ -4107,6 +4119,10 @@ S: 1507 145th Place SE #B5
S: Bellevue, Washington 98007
S: USA

N: Haojian Zhuang
E: haojian.zhuang@gmail.com
D: MMP support

N: Richard Zidlicky
E: rz@linux-m68k.org, rdzidlic@geocities.com
W: http://www.geocities.com/rdzidlic
+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ Description:
		  0-|   /             \/             \/
		    +---0----1----2----3----4----5----6------------> time (s)

		2. To make the LED go instantly from one brigntess value to another,
		we should use use zero-time lengths (the brightness must be same as
		2. To make the LED go instantly from one brightness value to another,
		we should use zero-time lengths (the brightness must be same as
		the previous tuple's). So the format should be:
		"brightness_1 duration_1 brightness_1 0 brightness_2 duration_2
		brightness_2 0 ...". For example:
+1 −1
Original line number Diff line number Diff line
What:		/sys/class/net/<iface>/tagging
What:		/sys/class/net/<iface>/dsa/tagging
Date:		August 2018
KernelVersion:	4.20
Contact:	netdev@vger.kernel.org
+3 −5
Original line number Diff line number Diff line
@@ -1879,10 +1879,8 @@ following two functions.

  wbc_init_bio(@wbc, @bio)
	Should be called for each bio carrying writeback data and
	associates the bio with the inode's owner cgroup and the
	corresponding request queue.  This must be called after
	a queue (device) has been associated with the bio and
	before submission.
	associates the bio with the inode's owner cgroup.  Can be
	called anytime between bio allocation and submission.

  wbc_account_io(@wbc, @page, @bytes)
	Should be called for each data segment being written out.
@@ -1901,7 +1899,7 @@ the configuration, the bio may be executed at a lower priority and if
the writeback session is holding shared resources, e.g. a journal
entry, may lead to priority inversion.  There is no one easy solution
for the problem.  Filesystems can try to work around specific problem
cases by skipping wbc_init_bio() or using bio_associate_create_blkg()
cases by skipping wbc_init_bio() or using bio_associate_blkcg()
directly.


Loading