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

Commit 6d6b89bd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1341 commits)
  virtio_net: remove forgotten assignment
  be2net: fix tx completion polling
  sis190: fix cable detect via link status poll
  net: fix protocol sk_buff field
  bridge: Fix build error when IGMP_SNOOPING is not enabled
  bnx2x: Tx barriers and locks
  scm: Only support SCM_RIGHTS on unix domain sockets.
  vhost-net: restart tx poll on sk_sndbuf full
  vhost: fix get_user_pages_fast error handling
  vhost: initialize log eventfd context pointer
  vhost: logging thinko fix
  wireless: convert to use netdev_for_each_mc_addr
  ethtool: do not set some flags, if others failed
  ipoib: returned back addrlen check for mc addresses
  netlink: Adding inode field to /proc/net/netlink
  axnet_cs: add new id
  bridge: Make IGMP snooping depend upon BRIDGE.
  bridge: Add multicast count/interval sysfs entries
  bridge: Add hash elasticity/max sysfs entries
  bridge: Add multicast_snooping sysfs toggle
  ...

Trivial conflicts in Documentation/feature-removal-schedule.txt
parents 13dda80e 2507c05f

Documentation/DocBook/mac80211.tmpl

+1 −2
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ usage should require reading the full document. 
        this though and the recommendation to allow only a single

        interface in STA mode at first!

      </para>

!Finclude/net/mac80211.h ieee80211_if_init_conf

!Finclude/net/mac80211.h ieee80211_vif

    </chapter>



    <chapter id="rx-tx">
@@ -234,7 +234,6 @@ usage should require reading the full document. 
      <title>Multiple queues and QoS support</title>

      <para>TBD</para>

!Finclude/net/mac80211.h ieee80211_tx_queue_params

!Finclude/net/mac80211.h ieee80211_tx_queue_stats

    </chapter>



    <chapter id="AP">

Documentation/feature-removal-schedule.txt

+10 −21
Original line number Diff line number Diff line
@@ -84,27 +84,6 @@ 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 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>



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



What:	dev->power.power_state

When:	July 2007

Why:	Broken design for runtime control over driver power states, confusing
@@ -561,3 +540,13 @@ Why: The corgi touchscreen is now deprecated in favour of the generic 
	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:	capifs

When:	February 2011

Files:	drivers/isdn/capi/capifs.*

Why:	udev fully replaces this special file system that only contains CAPI

	NCCI TTY device nodes. User space (pppdcapiplugin) works without

	noticing the difference.

Who:	Jan Kiszka <jan.kiszka@web.de>

Documentation/isdn/INTERFACE.CAPI

+5 −4
Original line number Diff line number Diff line
@@ -149,10 +149,11 @@ char *(*procinfo)(struct capi_ctr *ctrlr) 
	pointer to a callback function returning the entry for the device in

	the CAPI controller info table, /proc/capi/controller



read_proc_t *ctr_read_proc

	pointer to the read_proc callback function for the device's proc file

	system entry, /proc/capi/controllers/<n>; will be called with a

	pointer to the device's capi_ctr structure as the last (data) argument

const struct file_operations *proc_fops

	pointers to callback functions for the device's proc file

	system entry, /proc/capi/controllers/<n>; pointer to the device's

	capi_ctr structure is available from struct proc_dir_entry::data

	which is available from struct inode.



Note: Callback functions except send_message() are never called in interrupt

context.

Documentation/isdn/README.gigaset

+5 −5
Original line number Diff line number Diff line
@@ -292,10 +292,10 @@ GigaSet 307x Device Driver 
        to /etc/modprobe.d/gigaset, /etc/modprobe.conf.local or a similar file.



     Problem:

        Your isdn script aborts with a message about isdnlog.

        The isdnlog program emits error messages or just doesn't work.

     Solution:

        Try deactivating (or commenting out) isdnlog. This driver does not

        support it.

        Isdnlog supports only the HiSax driver. Do not attempt to use it with

	other drivers such as Gigaset.



     Problem:

        You have two or more DECT data adapters (M101/M105) and only the
@@ -321,8 +321,8 @@ GigaSet 307x Device Driver 
     writing an appropriate value to /sys/module/gigaset/parameters/debug, e.g.

        echo 0 > /sys/module/gigaset/parameters/debug

     switches off debugging output completely,

        echo 0x10a020 > /sys/module/gigaset/parameters/debug

     enables the standard set of debugging output messages. These values are

        echo 0x302020 > /sys/module/gigaset/parameters/debug

     enables a reasonable set of debugging output messages. These values are

     bit patterns where every bit controls a certain type of debugging output.

     See the constants DEBUG_* in the source file gigaset.h for details.

Documentation/kernel-parameters.txt

+10 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ parameter is applicable: 
	IMA     Integrity measurement architecture is enabled.

	IOSCHED	More than one I/O scheduler is enabled.

	IP_PNP	IP DHCP, BOOTP, or RARP is enabled.

	IPV6	IPv6 support is enabled.

	ISAPNP	ISA PnP code is enabled.

	ISDN	Appropriate ISDN support is enabled.

	JOY	Appropriate joystick support is enabled.
@@ -356,6 +357,9 @@ and is between 256 and 4096 characters. It is defined in the file 
			Change the amount of debugging information output

			when initialising the APIC and IO-APIC components.



	autoconf=	[IPV6]

			See Documentation/networking/ipv6.txt.



	show_lapic=	[APIC,X86] Advanced Programmable Interrupt Controller

			Limit apic dumping. The parameter defines the maximal

			number of local apics being dumped. Also it is possible
@@ -638,6 +642,12 @@ and is between 256 and 4096 characters. It is defined in the file 
			See drivers/char/README.epca and

			Documentation/serial/digiepca.txt.



	disable=	[IPV6]

			See Documentation/networking/ipv6.txt.



	disable_ipv6=	[IPV6]

			See Documentation/networking/ipv6.txt.



	disable_mtrr_cleanup [X86]

			The kernel tries to adjust MTRR layout from continuous

			to discrete, to make X server driver able to add WB