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

Commit a1e66dd0 authored by Matthew Garrett's avatar Matthew Garrett
Browse files

Merge branch 'x86-platform-next' into x86-platform

parents d89d63a9 6c62673c
Loading
Loading
Loading
Loading
+23 −0
Original line number Diff line number Diff line
@@ -589,3 +589,26 @@ Why: Useful in 2003, implementation is a hack.
	Generally invoked by accident today.
	Seen as doing more harm than good.
Who:	Len Brown <len.brown@intel.com>

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

What:	video4linux /dev/vtx teletext API support
When:	2.6.35
Files:	drivers/media/video/saa5246a.c drivers/media/video/saa5249.c
	include/linux/videotext.h
Why:	The vtx device nodes have been superseded by vbi device nodes
	for many years. No applications exist that use the vtx support.
	Of the two i2c drivers that actually support this API the saa5249
	has been impossible to use for a year now and no known hardware
	that supports this device exists. The saa5246a is theoretically
	supported by the old mxb boards, but it never actually worked.

	In summary: there is no hardware that can use this API and there
	are no applications actually implementing this API.

	The vtx support still reserves minors 192-223 and we would really
	like to reuse those for upcoming new functionality. In the unlikely
	event that new hardware appears that wants to use the functionality
	provided by the vtx API, then that functionality should be build
	around the sliced VBI API instead.
Who:	Hans Verkuil <hverkuil@xs4all.nl>
+1 −2
Original line number Diff line number Diff line
@@ -316,7 +316,7 @@ address perms offset dev inode pathname
08049000-0804a000 rw-p 00001000 03:00 8312       /opt/test
0804a000-0806b000 rw-p 00000000 00:00 0          [heap]
a7cb1000-a7cb2000 ---p 00000000 00:00 0
a7cb2000-a7eb2000 rw-p 00000000 00:00 0          [threadstack:001ff4b4]
a7cb2000-a7eb2000 rw-p 00000000 00:00 0
a7eb2000-a7eb3000 ---p 00000000 00:00 0
a7eb3000-a7ed5000 rw-p 00000000 00:00 0
a7ed5000-a8008000 r-xp 00000000 03:00 4222       /lib/libc.so.6
@@ -352,7 +352,6 @@ is not associated with a file:
 [stack]                  = the stack of the main process
 [vdso]                   = the "virtual dynamic shared object",
                            the kernel system call handler
 [threadstack:xxxxxxxx]   = the stack of the thread, xxxxxxxx is the stack size

 or if empty, the mapping is anonymous.

+1 −1
Original line number Diff line number Diff line
@@ -5492,7 +5492,7 @@ S: Maintained
F:	drivers/mmc/host/tmio_mmc.*

TMPFS (SHMEM FILESYSTEM)
M:	Hugh Dickins <hugh.dickins@tiscali.co.uk>
M:	Hugh Dickins <hughd@google.com>
L:	linux-mm@kvack.org
S:	Maintained
F:	include/linux/shmem_fs.h
+1 −1
Original line number Diff line number Diff line
VERSION = 2
PATCHLEVEL = 6
SUBLEVEL = 34
EXTRAVERSION = -rc6
EXTRAVERSION =
NAME = Sheep on Meth

# *DOCUMENTATION*
+2 −8
Original line number Diff line number Diff line
@@ -685,8 +685,8 @@ proc_types:
		W(b)	__armv4_mmu_cache_off
		W(b)	__armv4_mmu_cache_flush

		.word	0x56056930
		.word	0xff0ffff0		@ PXA935
		.word	0x56056900
		.word	0xffffff00		@ PXA9xx
		W(b)	__armv4_mmu_cache_on
		W(b)	__armv4_mmu_cache_off
		W(b)	__armv4_mmu_cache_flush
@@ -697,12 +697,6 @@ proc_types:
		W(b)	__armv4_mmu_cache_off
		W(b)	__armv5tej_mmu_cache_flush

		.word	0x56056930
		.word	0xff0ffff0		@ PXA935
		W(b)	__armv4_mmu_cache_on
		W(b)	__armv4_mmu_cache_off
		W(b)	__armv4_mmu_cache_flush

		.word	0x56050000		@ Feroceon
		.word	0xff0f0000
		W(b)	__armv4_mmu_cache_on
Loading