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

Commit 0134e89c authored by Patrick McHardy's avatar Patrick McHardy
Browse files

Merge branch 'master' of git://1984.lsi.us.es/net-next-2.6 



Conflicts:
	net/ipv4/route.c

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parents c7066f70 6faee60a

.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/obsolete/proc-pid-oom_adj

0 → 100644
+22 −0
Original line number Diff line number Diff line 
What:	/proc/<pid>/oom_adj

When:	August 2012

Why:	/proc/<pid>/oom_adj allows userspace to influence the oom killer's

	badness heuristic used to determine which task to kill when the kernel

	is out of memory.



	The badness heuristic has since been rewritten since the introduction of

	this tunable such that its meaning is deprecated.  The value was

	implemented as a bitshift on a score generated by the badness()

	function that did not have any precise units of measure.  With the

	rewrite, the score is given as a proportion of available memory to the

	task allocating pages, so using a bitshift which grows the score

	exponentially is, thus, impossible to tune with fine granularity.



	A much more powerful interface, /proc/<pid>/oom_score_adj, was

	introduced with the oom killer rewrite that allows users to increase or

	decrease the badness() score linearly.  This interface will replace

	/proc/<pid>/oom_adj.



	A warning will be emitted to the kernel log if an application uses this

	deprecated interface.  After it is printed once, future warnings will be

	suppressed until the kernel is rebooted.

Documentation/ABI/testing/sysfs-bus-rbd

0 → 100644
+83 −0
Original line number Diff line number Diff line 
What:		/sys/bus/rbd/

Date:		November 2010

Contact:	Yehuda Sadeh <yehuda@hq.newdream.net>,

		Sage Weil <sage@newdream.net>

Description:



Being used for adding and removing rbd block devices.



Usage: <mon ip addr> <options> <pool name> <rbd image name> [snap name]



 $ echo "192.168.0.1 name=admin rbd foo" > /sys/bus/rbd/add



The snapshot name can be "-" or omitted to map the image read/write. A <dev-id>

will be assigned for any registered block device. If snapshot is used, it will

be mapped read-only.



Removal of a device:



  $ echo <dev-id> > /sys/bus/rbd/remove



Entries under /sys/bus/rbd/devices/<dev-id>/

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



client_id



	The ceph unique client id that was assigned for this specific session.



major



	The block device major number.



name



	The name of the rbd image.



pool



	The pool where this rbd image resides. The pool-name pair is unique

	per rados system.



size



	The size (in bytes) of the mapped block device.



refresh



	Writing to this file will reread the image header data and set

	all relevant datastructures accordingly.



current_snap



	The current snapshot for which the device is mapped.



create_snap



	Create a snapshot:



	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_create



rollback_snap



	Rolls back data to the specified snapshot. This goes over the entire

	list of rados blocks and sends a rollback command to each.



	 $ echo <snap-name> > /sys/bus/rbd/devices/<dev-id>/snap_rollback



snap_*



	A directory per each snapshot





Entries under /sys/bus/rbd/devices/<dev-id>/snap_<snap-name>

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



id



	The rados internal snapshot id assigned for this snapshot



size



	The size of the image when this snapshot was taken.

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.