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

Commit 7e1bd6e3 authored by Len Brown's avatar Len Brown
Browse files

Merge branch 'upstream' into bugfix-video 



Update bugfix-video branch to 2.5-rc1
so I don't have to again resolve the
conflict in these patches vs. upstream.

Conflicts:
	drivers/gpu/drm/gma500/psb_drv.c

	text conflict: add comment vs delete neighboring line

	keep just this:
	/* igd_opregion_init(&dev_priv->opregion_dev); */
	/* acpi_video_register(); */

Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parents 301f33fb f8f5701b

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -113,3 +113,5 @@ Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com> 
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

Yusuke Goda <goda.yusuke@renesas.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>

CREDITS

+2 −2
Original line number Diff line number Diff line
@@ -3814,8 +3814,8 @@ D: INFO-SHEET, former maintainer 
D: Author of the longest-living linux bug



N: Jonathan Woithe

E: jwoithe@physics.adelaide.edu.au

W: http://www.physics.adelaide.edu.au/~jwoithe

E: jwoithe@just42.net

W: http:/www.just42.net/jwoithe

D: ALS-007 sound card extensions to Sound Blaster driver

S: 20 Jordan St

S: Valley View, SA 5093

Documentation/00-INDEX

+0 −2
Original line number Diff line number Diff line
@@ -218,8 +218,6 @@ m68k/ 
	- directory with info about Linux on Motorola 68k architecture.

magic-number.txt

	- list of magic numbers used to mark/protect kernel data structures.

mca.txt

	- info on supporting Micro Channel Architecture (e.g. PS/2) systems.

md.txt

	- info on boot arguments for the multiple devices driver.

memory-barriers.txt

Documentation/ABI/removed/ip_queue

0 → 100644
+9 −0
Original line number Diff line number Diff line 
What:		ip_queue

Date:		finally removed in kernel v3.5.0

Contact:	Pablo Neira Ayuso <pablo@netfilter.org>

Description:

	ip_queue has been replaced by nfnetlink_queue which provides

	more advanced queueing mechanism to user-space. The ip_queue

	module was already announced to become obsolete years ago.



Users:

Documentation/ABI/testing/debugfs-pfo-nx-crypto

0 → 100644
+45 −0
Original line number Diff line number Diff line 
What:		/sys/kernel/debug/nx-crypto/*

Date:		March 2012

KernelVersion:	3.4

Contact:	Kent Yoder <key@linux.vnet.ibm.com>

Description:



  These debugfs interfaces are built by the nx-crypto driver, built in

arch/powerpc/crypto/nx.



Error Detection

===============



errors:

- A u32 providing a total count of errors since the driver was loaded. The

only errors counted here are those returned from the hcall, H_COP_OP.



last_error:

- The most recent non-zero return code from the H_COP_OP hcall. -EBUSY is not

recorded here (the hcall will retry until -EBUSY goes away).



last_error_pid:

- The process ID of the process who received the most recent error from the

hcall.



Device Use

==========



aes_bytes:

- The total number of bytes encrypted using AES in any of the driver's

supported modes.



aes_ops:

- The total number of AES operations submitted to the hardware.



sha256_bytes:

- The total number of bytes hashed by the hardware using SHA-256.



sha256_ops:

- The total number of SHA-256 operations submitted to the hardware.



sha512_bytes:

- The total number of bytes hashed by the hardware using SHA-512.



sha512_ops:

- The total number of SHA-512 operations submitted to the hardware.