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

Commit 285c1a2c authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge branch 'irq/urgent' into irq/core



Reason: Get mainline fixes integrated. Further patches conflict with
        them

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parents 1fb0ef31 a9fe8d5f
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ Andy Adamson <andros@citi.umich.edu>
Arnaud Patard <arnaud.patard@rtp-net.org>
Arnd Bergmann <arnd@arndb.de>
Axel Dyks <xl@xlsigned.net>
Axel Lin <axel.lin@gmail.com>
Ben Gardner <bgardner@wabtec.com>
Ben M Cahill <ben.m.cahill@intel.com>
Björn Steinbrink <B.Steinbrink@gmx.de>
+25 −0
Original line number Diff line number Diff line
What:		/sys/devices/platform/at91_can/net/<iface>/mb0_id
Date:		January 2011
KernelVersion:	2.6.38
Contact:	Marc Kleine-Budde <kernel@pengutronix.de>
Description:
		Value representing the can_id of mailbox 0.

		Default: 0x7ff (standard frame)

		Due to a chip bug (errata 50.2.6.3 & 50.3.5.3 in
		"AT91SAM9263 Preliminary 6249H-ATARM-27-Jul-09") the
		contents of mailbox 0 may be send under certain
		conditions (even if disabled or in rx mode).

		The workaround in the errata suggests not to use the
		mailbox and load it with an unused identifier.

		In order to use an extended can_id add the
		CAN_EFF_FLAG (0x80000000U) to the can_id. Example:

		- standard id 0x7ff:
		echo 0x7ff      > /sys/class/net/can0/mb0_id

		- extended id 0x1fffffff:
		echo 0x9fffffff > /sys/class/net/can0/mb0_id
+2 −2
Original line number Diff line number Diff line
@@ -217,8 +217,8 @@ X!Isound/sound_firmware.c
  <chapter id="uart16x50">
     <title>16x50 UART Driver</title>
!Iinclude/linux/serial_core.h
!Edrivers/serial/serial_core.c
!Edrivers/serial/8250.c
!Edrivers/tty/serial/serial_core.c
!Edrivers/tty/serial/8250.c
  </chapter>

  <chapter id="fbdev">
+16 −0
Original line number Diff line number Diff line
@@ -603,3 +603,19 @@ Why: The adm9240, w83792d and w83793 hardware monitoring drivers have
Who:	Jean Delvare <khali@linux-fr.org>

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

What:	noswapaccount kernel command line parameter
When:	2.6.40
Why:	The original implementation of memsw feature enabled by
	CONFIG_CGROUP_MEM_RES_CTLR_SWAP could be disabled by the noswapaccount
	kernel parameter (introduced in 2.6.29-rc1). Later on, this decision
	turned out to be not ideal because we cannot have the feature compiled
	in and disabled by default and let only interested to enable it
	(e.g. general distribution kernels might need it). Therefore we have
	added swapaccount[=0|1] parameter (introduced in 2.6.37) which provides
	the both possibilities. If we remove noswapaccount we will have
	less command line parameters with the same functionality and we
	can also cleanup the parameter handling a bit ().
Who:	Michal Hocko <mhocko@suse.cz>

----------------------------
+2 −0
Original line number Diff line number Diff line
@@ -460,6 +460,8 @@ Note, a technical ChangeLog aimed at kernel hackers is in fs/ntfs/ChangeLog.
2.1.30:
	- Fix writev() (it kept writing the first segment over and over again
	  instead of moving onto subsequent segments).
	- Fix crash in ntfs_mft_record_alloc() when mapping the new extent mft
	  record failed.
2.1.29:
	- Fix a deadlock when mounting read-write.
2.1.28:
Loading