Commit acc6f112 authored by Steve French's avatar Steve French
Browse files

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 

Conflicts:
	fs/cifs/dir.c
parents 7e12eddb 0c21e3aa

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -105,3 +105,4 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de> 
Uwe Kleine-König <ukl@pengutronix.de>

Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>

Valdis Kletnieks <Valdis.Kletnieks@vt.edu>

Takashi YOSHII <takashi.yoshii.zj@renesas.com>

CREDITS

+0 −2
Original line number Diff line number Diff line
@@ -2365,8 +2365,6 @@ E: acme@redhat.com 
W: http://oops.ghostprotocols.net:81/blog/

P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD  841A B6AB 4681 9224 DF01

D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks

S: R. Brasílio Itiberê, 4270/1010 - Água Verde

S: 80240-060 - Curitiba - Paraná

S: Brazil



N: Karsten Merker

Documentation/ABI/testing/sysfs-class-net-batman-adv

0 → 100644
+14 −0
Original line number Diff line number Diff line 


What:           /sys/class/net/<iface>/batman-adv/mesh_iface

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                The /sys/class/net/<iface>/batman-adv/mesh_iface file

                displays the batman mesh interface this <iface>

                currently is associated with.



What:           /sys/class/net/<iface>/batman-adv/iface_status

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Indicates the status of <iface> as it is seen by batman.

Documentation/ABI/testing/sysfs-class-net-mesh

0 → 100644
+69 −0
Original line number Diff line number Diff line 


What:           /sys/class/net/<mesh_iface>/mesh/aggregated_ogms

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Indicates whether the batman protocol messages of the

                mesh <mesh_iface> shall be aggregated or not.



What:           /sys/class/net/<mesh_iface>/mesh/bonding

Date:           June 2010

Contact:        Simon Wunderlich <siwu@hrz.tu-chemnitz.de>

Description:

                Indicates whether the data traffic going through the

                mesh will be sent using multiple interfaces at the

                same time (if available).



What:           /sys/class/net/<mesh_iface>/mesh/fragmentation

Date:           October 2010

Contact:        Andreas Langer <an.langer@gmx.de>

Description:

                Indicates whether the data traffic going through the

                mesh will be fragmented or silently discarded if the

                packet size exceeds the outgoing interface MTU.



What:           /sys/class/net/<mesh_iface>/mesh/gw_bandwidth

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Defines the bandwidth which is propagated by this

                node if gw_mode was set to 'server'.



What:           /sys/class/net/<mesh_iface>/mesh/gw_mode

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Defines the state of the gateway features. Can be

                either 'off', 'client' or 'server'.



What:           /sys/class/net/<mesh_iface>/mesh/gw_sel_class

Date:           October 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Defines the selection criteria this node will use

                to choose a gateway if gw_mode was set to 'client'.



What:           /sys/class/net/<mesh_iface>/mesh/orig_interval

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Defines the interval in milliseconds in which batman

                sends its protocol messages.



What:           /sys/class/net/<mesh_iface>/mesh/hop_penalty

Date:           Oct 2010

Contact:        Linus Lüssing <linus.luessing@web.de>

Description:

		Defines the penalty which will be applied to an

		originator message's tq-field on every hop.



What:           /sys/class/net/<mesh_iface>/mesh/vis_mode

Date:           May 2010

Contact:        Marek Lindner <lindner_marek@yahoo.de>

Description:

                Each batman node only maintains information about its

                own local neighborhood, therefore generating graphs

                showing the topology of the entire mesh is not easily

                feasible without having a central instance to collect

                the local topologies from all nodes. This file allows

                to activate the collecting (server) mode.

Documentation/ABI/testing/sysfs-tty

0 → 100644
+19 −0
Original line number Diff line number Diff line 
What:		/sys/class/tty/console/active

Date:		Nov 2010

Contact:	Kay Sievers <kay.sievers@vrfy.org>

Description:

		 Shows the list of currently configured

		 console devices, like 'tty1 ttyS0'.

		 The last entry in the file is the active

		 device connected to /dev/console.

		 The file supports poll() to detect virtual

		 console switches.



What:		/sys/class/tty/tty0/active

Date:		Nov 2010

Contact:	Kay Sievers <kay.sievers@vrfy.org>

Description:

		 Shows the currently active virtual console

		 device, like 'tty1'.

		 The file supports poll() to detect virtual

		 console switches.