Commit b4d48c94 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge tag 'v3.2-rc7' into staging/for_v3.3 

Linux 3.2-rc7

* tag 'v3.2-rc7': (1304 commits)
  Linux 3.2-rc7
  netfilter: xt_connbytes: handle negation correctly
  Btrfs: call d_instantiate after all ops are setup
  Btrfs: fix worker lock misuse in find_worker
  net: relax rcvbuf limits
  rps: fix insufficient bounds checking in store_rps_dev_flow_table_cnt()
  net: introduce DST_NOPEER dst flag
  mqprio: Avoid panic if no options are provided
  bridge: provide a mtu() method for fake_dst_ops
  md/bitmap: It is OK to clear bits during recovery.
  md: don't give up looking for spares on first failure-to-add
  md/raid5: ensure correct assessment of drives during degraded reshape.
  md/linear: fix hot-add of devices to linear arrays.
  sparc64: Fix MSIQ HV call ordering in pci_sun4v_msiq_build_irq().
  pata_of_platform: Add missing CONFIG_OF_IRQ dependency.
  ipv4: using prefetch requires including prefetch.h
  VFS: Fix race between CPU hotplug and lglocks
  vfs: __read_cache_page should use gfp argument rather than GFP_KERNEL
  USB: Fix usb/isp1760 build on sparc
  net: Add a flow_cache_flush_deferred function
  ...

Conflicts:
	drivers/media/common/tuners/tda18218.c
	drivers/media/video/omap3isp/ispccdc.c
	drivers/staging/media/as102/as102_drv.h
parents 1a5cd296 5f0a6e2d

CREDITS

+6 −3
Original line number Diff line number Diff line
@@ -688,10 +688,13 @@ S: Oxfordshire, UK. 


N: Kees Cook

E: kees@outflux.net

W: http://outflux.net/

P: 1024D/17063E6D 9FA3 C49C 23C9 D1BC 2E30  1975 1FFF 4BA9 1706 3E6D

D: Minor updates to SCSI types, added /proc/pid/maps protection

E: kees@ubuntu.com

E: keescook@chromium.org

W: http://outflux.net/blog/

P: 4096R/DC6DC026 A5C3 F68F 229D D60F 723E  6E13 8972 F4DF DC6D C026

D: Various security things, bug fixes, and documentation.

S: (ask for current address)

S: Portland, Oregon

S: USA



N: Robin Cornelius

Documentation/ABI/testing/sysfs-block

+0 −13
Original line number Diff line number Diff line
@@ -206,16 +206,3 @@ Description: 
		when a discarded area is read the discard_zeroes_data

		parameter will be set to one. Otherwise it will be 0 and

		the result of reading a discarded area is undefined.
 
What:		/sys/block/<disk>/alias

Date:		Aug 2011

Contact:	Nao Nishijima <nao.nishijima.xt@hitachi.com>

Description:

		A raw device name of a disk does not always point a same disk

		each boot-up time. Therefore, users have to use persistent

		device names, which udev creates when the kernel finds a disk,

		instead of raw device name. However, kernel doesn't show those

		persistent names on its messages (e.g. dmesg).

		This file can store an alias of the disk and it would be

		appeared in kernel messages if it is set. A disk can have an

		alias which length is up to 255bytes. Users can use alphabets,

		numbers, "-" and "_" in alias name. This file is writeonce.

Documentation/ABI/testing/sysfs-bus-rbd

+0 −7
Original line number Diff line number Diff line
@@ -57,13 +57,6 @@ create_snap 


	 $ 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

Documentation/DocBook/uio-howto.tmpl

+6 −1
Original line number Diff line number Diff line
@@ -520,6 +520,11 @@ Here's a description of the fields of <varname>struct uio_mem</varname>: 
</para>



<itemizedlist>

<listitem><para>

<varname>const char *name</varname>: Optional. Set this to help identify

the memory region, it will show up in the corresponding sysfs node.

</para></listitem>



<listitem><para>

<varname>int memtype</varname>: Required if the mapping is used. Set this to

<varname>UIO_MEM_PHYS</varname> if you you have physical memory on your
@@ -553,7 +558,7 @@ instead to remember such an address. 
</itemizedlist>



<para>

Please do not touch the <varname>kobj</varname> element of

Please do not touch the <varname>map</varname> element of

<varname>struct uio_mem</varname>! It is used by the UIO framework

to set up sysfs files for this mapping. Simply leave it alone.

</para>

Documentation/blockdev/cciss.txt

+6 −8
Original line number Diff line number Diff line
@@ -98,14 +98,12 @@ You must enable "SCSI tape drive support for Smart Array 5xxx" and 
"SCSI support" in your kernel configuration to be able to use SCSI

tape drives with your Smart Array 5xxx controller.



Additionally, note that the driver will not engage the SCSI core at init 

time.  The driver must be directed to dynamically engage the SCSI core via 

the /proc filesystem entry which the "block" side of the driver creates as 

/proc/driver/cciss/cciss* at runtime.  This is because at driver init time, 

the SCSI core may not yet be initialized (because the driver is a block 

driver) and attempting to register it with the SCSI core in such a case 

would cause a hang.  This is best done via an initialization script 

(typically in /etc/init.d, but could vary depending on distribution). 

Additionally, note that the driver will engage the SCSI core at init

time if any tape drives or medium changers are detected.  The driver may

also be directed to dynamically engage the SCSI core via the /proc filesystem

entry which the "block" side of the driver creates as

/proc/driver/cciss/cciss* at runtime.  This is best done via a script.



For example:



	for x in /proc/driver/cciss/cciss[0-9]*

CRA Git | Maintained and supported by SUSTech CRA and CCSE