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

Commit 0f2df9ea authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into merge

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/net/wireless/ath/ath5k/phy.c
	drivers/net/wireless/iwlwifi/iwl-4965.c
	drivers/net/wireless/iwlwifi/iwl-agn.c
	drivers/net/wireless/iwlwifi/iwl-core.c
	drivers/net/wireless/iwlwifi/iwl-core.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
parents 8c11e4ab 11446011

Documentation/ABI/testing/sysfs-block

+14 −0
Original line number Diff line number Diff line
@@ -128,3 +128,17 @@ Description: 
		preferred request size for workloads where sustained

		throughput is desired.  If no optimal I/O size is

		reported this file contains 0.



What:		/sys/block/<disk>/queue/nomerges

Date:		January 2010

Contact:

Description:

		Standard I/O elevator operations include attempts to

		merge contiguous I/Os. For known random I/O loads these

		attempts will always fail and result in extra cycles

		being spent in the kernel. This allows one to turn off

		this behavior on one of two ways: When set to 1, complex

		merge checks are disabled, but the simple one-shot merges

		with the previous I/O request are enabled. When set to 2,

		all merge tries are disabled. The default value is 0 -

		which enables all types of merge tries.

Documentation/arm/memory.txt

+5 −1
Original line number Diff line number Diff line
@@ -59,7 +59,11 @@ PAGE_OFFSET high_memory-1 Kernel direct-mapped RAM region. 
				This maps the platforms RAM, and typically

				maps all platform RAM in a 1:1 relationship.



TASK_SIZE	PAGE_OFFSET-1	Kernel module space

PKMAP_BASE	PAGE_OFFSET-1	Permanent kernel mappings

				One way of mapping HIGHMEM pages into kernel

				space.



MODULES_VADDR	MODULES_END-1	Kernel module space

				Kernel modules inserted via insmod are

				placed here using dynamic mappings.

Documentation/block/queue-sysfs.txt

+5 −5
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ size allowed by the hardware. 


nomerges (RW)

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

This enables the user to disable the lookup logic involved with IO merging

requests in the block layer. Merging may still occur through a direct

1-hit cache, since that comes for (almost) free. The IO scheduler will not

waste cycles doing tree/hash lookups for merges if nomerges is 1. Defaults

to 0, enabling all merges.

This enables the user to disable the lookup logic involved with IO

merging requests in the block layer. By default (0) all merges are

enabled. When set to 1 only simple one-hit merges will be tried. When

set to 2 no merge algorithms will be tried (including one-hit or more

complex tree/hash lookups).



nr_requests (RW)

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

Documentation/cachetlb.txt

+3 −3
Original line number Diff line number Diff line
@@ -88,12 +88,12 @@ changes occur: 
	This is used primarily during fault processing.



5) void update_mmu_cache(struct vm_area_struct *vma,

			 unsigned long address, pte_t pte)

			 unsigned long address, pte_t *ptep)



	At the end of every page fault, this routine is invoked to

	tell the architecture specific code that a translation

	described by "pte" now exists at virtual address "address"

	for address space "vma->vm_mm", in the software page tables.

	now exists at virtual address "address" for address space

	"vma->vm_mm", in the software page tables.



	A port may use this information in any way it so chooses.

	For example, it could use this event to pre-load TLB

Documentation/feature-removal-schedule.txt

+23 −0
Original line number Diff line number Diff line
@@ -520,6 +520,29 @@ Who: Hans de Goede <hdegoede@redhat.com> 


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



What:	corgikbd, spitzkbd, tosakbd driver

When:	2.6.35

Files:	drivers/input/keyboard/{corgi,spitz,tosa}kbd.c

Why:	We now have a generic GPIO based matrix keyboard driver that

	are fully capable of handling all the keys on these devices.

	The original drivers manipulate the GPIO registers directly

	and so are difficult to maintain.

Who:	Eric Miao <eric.y.miao@gmail.com>



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



What:	corgi_ssp and corgi_ts driver

When:	2.6.35

Files:	arch/arm/mach-pxa/corgi_ssp.c, drivers/input/touchscreen/corgi_ts.c

Why:	The corgi touchscreen is now deprecated in favour of the generic

	ads7846.c driver. The noise reduction technique used in corgi_ts.c,

	that's to wait till vsync before ADC sampling, is also integrated into

	ads7846 driver now. Provided that the original driver is not generic

	and is difficult to maintain, it will be removed later.

Who:	Eric Miao <eric.y.miao@gmail.com>



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



What:	sysfs-class-rfkill state file

When:	Feb 2014

Files:	net/rfkill/core.c