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

Commit 82268da1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into percpu-cpumask-x86-for-linus-2 



Conflicts:
	arch/sparc/kernel/time_64.c
	drivers/gpu/drm/drm_proc.c

Manual merge to resolve build warning due to phys_addr_t type change
on x86:

	drivers/gpu/drm/drm_info.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 6e15cf04 5d80f8e5

Documentation/DocBook/mac80211.tmpl

+6 −0
Original line number Diff line number Diff line
@@ -227,6 +227,12 @@ usage should require reading the full document. 
!Pinclude/net/mac80211.h Powersave support

    </chapter>



    <chapter id="beacon-filter">

      <title>Beacon filter support</title>

!Pinclude/net/mac80211.h Beacon filter support

!Finclude/net/mac80211.h ieee80211_beacon_loss

    </chapter>



    <chapter id="qos">

      <title>Multiple queues and QoS support</title>

      <para>TBD</para>

Documentation/feature-removal-schedule.txt

+32 −5
Original line number Diff line number Diff line
@@ -6,20 +6,47 @@ be removed from this file. 


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



What:	old static regulatory information and ieee80211_regdom module parameter

When:	2.6.29

What:	The ieee80211_regdom module parameter

When:	March 2010 / desktop catchup



Why:	This was inherited by the CONFIG_WIRELESS_OLD_REGULATORY code,

	and currently serves as an option for users to define an

	ISO / IEC 3166 alpha2 code for the country they are currently

	present in. Although there are userspace API replacements for this

	through nl80211 distributions haven't yet caught up with implementing

	decent alternatives through standard GUIs. Although available as an

	option through iw or wpa_supplicant its just a matter of time before

	distributions pick up good GUI options for this. The ideal solution

	would actually consist of intelligent designs which would do this for

	the user automatically even when travelling through different countries.

	Until then we leave this module parameter as a compromise.



	When userspace improves with reasonable widely-available alternatives for

	this we will no longer need this module parameter. This entry hopes that

	by the super-futuristically looking date of "March 2010" we will have

	such replacements widely available.



Who:	Luis R. Rodriguez <lrodriguez@atheros.com>



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



What:	CONFIG_WIRELESS_OLD_REGULATORY - old static regulatory information

When:	March 2010 / desktop catchup



Why:	The old regulatory infrastructure has been replaced with a new one

	which does not require statically defined regulatory domains. We do

	not want to keep static regulatory domains in the kernel due to the

	the dynamic nature of regulatory law and localization. We kept around

	the old static definitions for the regulatory domains of:



		* US

		* JP

		* EU



	and used by default the US when CONFIG_WIRELESS_OLD_REGULATORY was

	set. We also kept around the ieee80211_regdom module parameter in case

	some applications were relying on it. Changing regulatory domains

	can now be done instead by using nl80211, as is done with iw.

	set. We will remove this option once the standard Linux desktop catches

	up with the new userspace APIs we have implemented.



Who:	Luis R. Rodriguez <lrodriguez@atheros.com>



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

MAINTAINERS

+9 −1
Original line number Diff line number Diff line
@@ -765,6 +765,14 @@ L: linux-wireless@vger.kernel.org 
L:	ath9k-devel@lists.ath9k.org

S:	Supported



ATHEROS AR9170 WIRELESS DRIVER

P:	Christian Lamparter

M:	chunkeey@web.de

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/ar9170

S:	Maintained

F:	drivers/net/wireless/ar9170/



ATI_REMOTE2 DRIVER

P:	Ville Syrjala

M:	syrjala@sci.fi
@@ -3602,7 +3610,7 @@ S: Maintained 
RALINK RT2X00 WIRELESS LAN DRIVER

P:	rt2x00 project

L:	linux-wireless@vger.kernel.org

L:	rt2400-devel@lists.sourceforge.net

L:	users@rt2x00.serialmonkey.com

W:	http://rt2x00.serialmonkey.com/

S:	Maintained

T:	git kernel.org:/pub/scm/linux/kernel/git/ivd/rt2x00.git

arch/alpha/kernel/entry.S

+2 −1
Original line number Diff line number Diff line
@@ -903,8 +903,9 @@ sys_alpha_pipe: 
	stq	$26, 0($sp)

	.prologue 0



	mov	$31, $17

	lda	$16, 8($sp)

	jsr	$26, do_pipe

	jsr	$26, do_pipe_flags



	ldq	$26, 0($sp)

	bne	$0, 1f

arch/alpha/kernel/osf_sys.c

+0 −2
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 
#include <asm/hwrpb.h>

#include <asm/processor.h>



extern int do_pipe(int *);



/*

 * Brk needs to return an error.  Still support Linux's brk(0) query idiom,

 * which OSF programs just shouldn't be doing.  We're still not quite