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

Commit bb798169 authored by James Morris's avatar James Morris
Browse files

Merge branch 'master' of... 

Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
parents a106cbfd 5d80f8e5

Documentation/DocBook/genericirq.tmpl

+1 −0
Original line number Diff line number Diff line
@@ -440,6 +440,7 @@ desc->chip->end(); 
     used in the generic IRQ layer.

     </para>

!Iinclude/linux/irq.h

!Iinclude/linux/interrupt.h

  </chapter>



  <chapter id="pubfunctions">

Documentation/DocBook/mac80211.tmpl

+14 −4
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ 
    </authorgroup>



    <copyright>

      <year>2007</year>

      <year>2008</year>

      <year>2007-2009</year>

      <holder>Johannes Berg</holder>

    </copyright>
@@ -165,8 +164,8 @@ usage should require reading the full document. 
!Pinclude/net/mac80211.h Frame format

      </sect1>

      <sect1>

        <title>Alignment issues</title>

        <para>TBD</para>

        <title>Packet alignment</title>

!Pnet/mac80211/rx.c Packet alignment

      </sect1>

      <sect1>

        <title>Calling into mac80211 from interrupts</title>
@@ -223,6 +222,17 @@ usage should require reading the full document. 
!Finclude/net/mac80211.h ieee80211_key_flags

    </chapter>



    <chapter id="powersave">

      <title>Powersave support</title>

!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/block/switching-sched.txt

+0 −6
Original line number Diff line number Diff line
@@ -35,9 +35,3 @@ noop anticipatory deadline [cfq] 
# echo anticipatory > /sys/block/hda/queue/scheduler

# cat /sys/block/hda/queue/scheduler

noop [anticipatory] deadline cfq
 


Each io queue has a set of io scheduler tunables associated with it. These

tunables control how the io scheduler works. You can find these entries

in:



/sys/block/<device>/queue/iosched

Documentation/dontdiff

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ aic7*reg_print.c* 
aic7*seq.h*

aicasm

aicdb.h*

asm

asm-offsets.h

asm_offsets.h

autoconf.h*

Documentation/feature-removal-schedule.txt

+52 −6
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>



---------------------------
@@ -229,7 +256,9 @@ Who: Jan Engelhardt <jengelh@computergmbh.de> 
---------------------------



What:	b43 support for firmware revision < 410

When:	July 2008

When:	The schedule was July 2008, but it was decided that we are going to keep the

        code as long as there are no major maintanance headaches.

	So it _could_ be removed _any_ time now, if it conflicts with something new.

Why:	The support code for the old firmware hurts code readability/maintainability

	and slightly hurts runtime performance. Bugfixes for the old firmware

	are not provided by Broadcom anymore.
@@ -344,3 +373,20 @@ Why: See commits 129f8ae9b1b5be94517da76009ea956e89104ce8 and 
	Removal is subject to fixing any remaining bugs in ACPI which may

	cause the thermal throttling not to happen at the right time.

Who:	Dave Jones <davej@redhat.com>, Matthew Garrett <mjg@redhat.com>



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



What:	__do_IRQ all in one fits nothing interrupt handler

When:	2.6.32

Why:	__do_IRQ was kept for easy migration to the type flow handlers.

	More than two years of migration time is enough.

Who:	Thomas Gleixner <tglx@linutronix.de>



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



What:	obsolete generic irq defines and typedefs

When:	2.6.30

Why:	The defines and typedefs (hw_interrupt_type, no_irq_type, irq_desc_t)

	have been kept around for migration reasons. After more than two years

	it's time to remove them finally

Who:	Thomas Gleixner <tglx@linutronix.de>