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

Merge commit '67dd8f35' into patchwork 

* .: (268 commits)
  Linux 3.16-rc6
  um: segv: Save regs only in case of a kernel mode fault
  um: Fix hung task in fix_range_common()
  um: Ensure that a stub page cannot get unmapped
  Revert "um: Fix wait_stub_done() error handling"
  btrfs: test for valid bdev before kobj removal in btrfs_rm_device
  Btrfs: fix abnormal long waiting in fsync
  random: check for increase of entropy_count because of signed conversion
  ARM: EXYNOS: Fix core ID used by platsmp and hotplug code
  ahci: add support for the Promise FastTrak TX8660 SATA HBA (ahci mode)
  ARM: at91/dt: add missing clocks property to pwm node in sam9x5.dtsi
  ARM: at91/dt: fix usb0 clocks definition in sam9n12 dtsi
  ARM: at91: at91sam9x5: correct typo error for ohci clock
  irqchip: gic: Fix core ID calculation when topology is read from DT
  GFS2: fs/gfs2/rgrp.c: kernel-doc warning fixes
  GFS2: memcontrol: Spelling s/invlidate/invalidate/
  GFS2: Allow caching of glocks for flock
  GFS2: Allow flocks to use normal glock dq rather than dq_wait
  GFS2: replace count*size kzalloc by kcalloc
  GFS2: Use GFP_NOFS when allocating glocks
  ...

Conflicts:
	drivers/media/dvb-frontends/si2168.c
	drivers/media/dvb-frontends/si2168_priv.h
	drivers/media/tuners/si2157.c
parents d352bcc9 67dd8f35

Documentation/acpi/enumeration.txt

+0 −6
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ If the driver needs to perform more complex initialization like getting and 
configuring GPIOs it can get its ACPI handle and extract this information

from ACPI tables.



Currently the kernel is not able to automatically determine from which ACPI

device it should make the corresponding platform device so we need to add

the ACPI device explicitly to acpi_platform_device_ids list defined in

drivers/acpi/acpi_platform.c. This limitation is only for the platform

devices, SPI and I2C devices are created automatically as described below.



DMA support

~~~~~~~~~~~

DMA controllers enumerated via ACPI should be registered in the system to

Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt

+4 −2
Original line number Diff line number Diff line
@@ -8,10 +8,12 @@ Both required and optional properties listed below must be defined 
under node /cpus/cpu@0.



Required properties:

- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt

  for details

- None



Optional properties:

- operating-points: Refer to Documentation/devicetree/bindings/power/opp.txt for

  details. OPPs *must* be supplied either via DT, i.e. this property, or

  populated at runtime.

- clock-latency: Specify the possible maximum transition latency for clock,

  in unit of nanoseconds.

- voltage-tolerance: Specify the CPU voltage tolerance in percentage.

Documentation/kernel-parameters.txt

+7 −1
Original line number Diff line number Diff line
@@ -2790,6 +2790,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			leaf rcu_node structure.  Useful for very large

			systems.



	rcutree.jiffies_till_sched_qs= [KNL]

			Set required age in jiffies for a

			given grace period before RCU starts

			soliciting quiescent-state help from

			rcu_note_context_switch().



	rcutree.jiffies_till_first_fqs= [KNL]

			Set delay from grace-period initialization to

			first attempt to force quiescent states.
@@ -3526,7 +3532,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			the allocated input device; If set to 0, video driver

			will only send out the event without touching backlight

			brightness level.

			default: 0

			default: 1



	virtio_mmio.device=

			[VMMIO] Memory mapped virtio (platform) device.

MAINTAINERS

+11 −3
Original line number Diff line number Diff line
@@ -156,7 +156,6 @@ F: drivers/net/hamradio/6pack.c 


8169 10/100/1000 GIGABIT ETHERNET DRIVER

M:	Realtek linux nic maintainers <nic_swsd@realtek.com>

M:	Francois Romieu <romieu@fr.zoreil.com>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/realtek/r8169.c
@@ -4521,8 +4520,7 @@ S: Supported 
F:	drivers/idle/i7300_idle.c



IEEE 802.15.4 SUBSYSTEM

M:	Alexander Smirnov <alex.bluesman.smirnov@gmail.com>

M:	Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

M:	Alexander Aring <alex.aring@gmail.com>

L:	linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers)

W:	http://apps.sourceforge.net/trac/linux-zigbee

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git
@@ -8032,6 +8030,16 @@ F: drivers/ata/ 
F:	include/linux/ata.h

F:	include/linux/libata.h



SERIAL ATA AHCI PLATFORM devices support

M:	Hans de Goede <hdegoede@redhat.com>

M:	Tejun Heo <tj@kernel.org>

L:	linux-ide@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git

S:	Supported

F:	drivers/ata/ahci_platform.c

F:	drivers/ata/libahci_platform.c

F:	include/linux/ahci_platform.h



SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER

M:	Jayamohan Kallickal <jayamohan.kallickal@emulex.com>

L:	linux-scsi@vger.kernel.org

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 16

SUBLEVEL = 0

EXTRAVERSION = -rc5

EXTRAVERSION = -rc6

NAME = Shuffling Zombie Juror



# *DOCUMENTATION*

CRA Git | Maintained and supported by SUSTech CRA and CCSE