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

Commit 492b057c authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

Merge commit 'origin/master' into next

parents 31348517 300df7dc
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -1253,6 +1253,10 @@ S: 8124 Constitution Apt. 7
S: Sterling Heights, Michigan 48313
S: USA

N: Wolfgang Grandegger
E: wg@grandegger.com
D: Controller Area Network (device drivers)

N: William Greathouse
E: wgreathouse@smva.com
E: wgreathouse@myfavoritei.com
+0 −1
Original line number Diff line number Diff line
@@ -145,7 +145,6 @@ usage should require reading the full document.
        interface in STA mode at first!
      </para>
!Finclude/net/mac80211.h ieee80211_if_init_conf
!Finclude/net/mac80211.h ieee80211_if_conf
    </chapter>

    <chapter id="rx-tx">
+7 −0
Original line number Diff line number Diff line
@@ -438,6 +438,13 @@ Why: Superseded by tdfxfb. I2C/DDC support used to live in a separate
Who:	Jean Delvare <khali@linux-fr.org>
	Krzysztof Helt <krzysztof.h1@wp.pl>

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

What:	CONFIG_RFKILL_INPUT
When:	2.6.33
Why:	Should be implemented in userspace, policy daemon.
Who:	Johannes Berg <johannes@sipsolutions.net>

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

What:	CONFIG_X86_OLD_MCE
+2 −3
Original line number Diff line number Diff line
@@ -39,9 +39,8 @@ Features which NILFS2 does not support yet:
	- extended attributes
	- POSIX ACLs
	- quotas
	- writable snapshots
	- remote backup (CDP)
	- data integrity
	- fsck
	- resize
	- defragmentation

Mount options
+5 −0
Original line number Diff line number Diff line
@@ -132,6 +132,11 @@ rodir -- FAT has the ATTR_RO (read-only) attribute. On Windows,
		 If you want to use ATTR_RO as read-only flag even for
		 the directory, set this option.

errors=panic|continue|remount-ro
	      -- specify FAT behavior on critical errors: panic, continue
		 without doing anything or remount the partition in
		 read-only mode (default behavior).

<bool>: 0,1,yes,no,true,false

TODO
Loading