Merge remote-tracking branch 'percpu/for-next'

Merge remote-tracking branch 'xen-tip/linux-next'

Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next'

Merge remote-tracking branch 'kvm-arm/kvm-arm-next'

Merge remote-tracking branch 'kvm/linux-next'

Merge remote-tracking branch 'rcu/rcu/next'

Merge remote-tracking branch 'edac-amd/for-next'

Merge remote-tracking branch 'tip/auto-latest'

Merge remote-tracking branch 'spi/for-next'

Merge remote-tracking branch 'dt-rh/for-next'

Merge remote-tracking branch 'audit/master'

Merge remote-tracking branch 'trivial/for-next'

Merge remote-tracking branch 'iommu/next'

Merge remote-tracking branch 'watchdog/master'

Merge remote-tracking branch 'selinux/master'

Merge remote-tracking branch 'regulator/for-next'

Merge remote-tracking branch 'battery/master'

Merge remote-tracking branch 'mfd-lj/for-mfd-next'

Merge remote-tracking branch 'slab/for-next'

Merge remote-tracking branch 'kgdb/kgdb-next'

Conflicts:
kernel/debug/debug_core.h

Merge remote-tracking branch 'device-mapper/for-next'

Merge remote-tracking branch 'block/for-next'

Conflicts:
block/blk-flush.c
fs/btrfs/check-integrity.c
fs/btrfs/extent_io.c
fs/btrfs/scrub.c
fs/f2fs/data.c
fs/f2fs/segment.c
fs/logfs/dev_bdev.c
include/trace/events/f2fs.h

Merge remote-tracking branch 'cgroup/for-next'

Merge remote-tracking branch 'input/next'

Merge remote-tracking branch 'virtio/virtio-next'

Merge remote-tracking branch 'modules/modules-next'

Merge remote-tracking branch 'sound-asoc/for-next'

Conflicts:
sound/soc/fsl/fsl_ssi.c

Merge remote-tracking branch 'sound/for-next'

Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
drivers/gpu/drm/i915/intel_ddi.c
drivers/gpu/drm/i915/intel_display.c

Merge remote-tracking branch 'crypto/master'

Merge remote-tracking branch 'l2-mtd/master'

Merge remote-tracking branch 'infiniband/for-next'

Merge remote-tracking branch 'bluetooth/master'

Merge remote-tracking branch 'wireless-next/master'

Merge remote-tracking branch 'ipsec-next/master'

Merge remote-tracking branch 'net-next/master'

Conflicts:
drivers/net/macvtap.c

Merge remote-tracking branch 'dmaengine/next'

Merge remote-tracking branch 'slave-dma/next'

Conflicts:
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi

Merge remote-tracking branch 'dlm/next'

Merge remote-tracking branch 'idle/next'

Merge remote-tracking branch 'pm/linux-next'

Merge remote-tracking branch 'libata/for-next'

Merge remote-tracking branch 'kbuild/for-next'

Merge remote-tracking branch 'v4l-dvb/master'

Merge remote-tracking branch 'hwmon-staging/hwmon-next'

Merge branch 'jdelvare-hwmon/master'

Merge remote-tracking branch 'i2c/i2c/for-next'

Merge remote-tracking branch 'hid/for-next'

Merge remote-tracking branch 'pci/next'

Merge remote-tracking branch 'xfs/for-next'

Merge remote-tracking branch 'v9fs/for-next'

Merge remote-tracking branch 'nfsd/nfsd-next'

Merge remote-tracking branch 'nfs/linux-next'

Merge remote-tracking branch 'logfs/master'

Merge remote-tracking branch 'gfs2/master'

Merge remote-tracking branch 'fscache/fscache'

Merge remote-tracking branch 'f2fs/dev'

Merge remote-tracking branch 'ext4/dev'

Merge remote-tracking branch 'ext3/for_next'

Merge remote-tracking branch 'cifs/for-next'

Merge remote-tracking branch 'ceph/master'

Merge remote-tracking branch 'xtensa/for_next'

Merge remote-tracking branch 'sh/sh-latest'

Conflicts:
arch/sh/kernel/cpu/sh2a/Makefile
drivers/tty/serial/sh-sci.c
include/linux/serial_sci.h

Merge remote-tracking branch 's390/features'

Merge remote-tracking branch 'mpc5xxx/next'

Merge remote-tracking branch 'powerpc/next'

Merge remote-tracking branch 'openrisc/for-upstream'

Merge remote-tracking branch 'mips/mips-for-linux-next'

Merge remote-tracking branch 'microblaze/next'

Merge remote-tracking branch 'metag/for-next'

Merge remote-tracking branch 'm68knommu/for-next'

Merge remote-tracking branch 'm68k/for-next'

Merge remote-tracking branch 'ia64/next'

Merge remote-tracking branch 'c6x/for-linux-next'

Merge remote-tracking branch 'tegra/for-next'

Merge remote-tracking branch 'samsung/for-next'

Merge remote-tracking branch 'renesas/next'

Merge remote-tracking branch 'mvebu/for-next'

Merge remote-tracking branch 'imx-mxs/for-next'

Merge remote-tracking branch 'ep93xx/ep93xx-for-next'

Merge remote-tracking branch 'cortex-m/for-next'

Merge remote-tracking branch 'bcm2835/for-next'

Merge remote-tracking branch 'arm-soc/for-next'

Merge remote-tracking branch 'arm/for-next'

Merge remote-tracking branch 'arc/for-next'

Merge remote-tracking branch 'drm-intel-fixes/for-linux-next-fixes'

Merge remote-tracking branch 'mfd-fixes/master'

Merge remote-tracking branch 'rr-fixes/fixes'

Merge remote-tracking branch 'usb.current/usb-linus'

Merge remote-tracking branch 'driver-core.current/driver-core-linus'

Merge remote-tracking branch 'pci-current/for-linus'

Merge remote-tracking branch 'net/master'

Merge remote-tracking branch 'sparc/master'

Merge remote-tracking branch 'arm-current/fixes'

Merge remote-tracking branch 'arc-current/for-curr'

hwmon: (it87) Print proper names for the IT8771E and IT8772E

The driver prints IT8771F and IT8772F instead of IT8771E and IT8772E
respectively when the driver is loaded. This is a cosmetic only bug
but let's fix it.

Signed-off-by: Jean Delvare <khali@linux-fr.org>

hwmon: (it87) Add support for the ITE IT8603E

Add support for IT8603E.

This closes bug #57861:
https://bugzilla.kernel.org/show_bug.cgi?id=57861

[JD: Fixes and clean-ups.]

Signed-off-by: Rudolf Marek <r.marek@assembler.cz>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

hwmon: Prevent some divide by zeros in FAN_TO_REG()

The "rpm * div" operations can overflow here, so this patch adds an
upper limit to rpm to prevent that.  Jean Delvare helped me with this
patch.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Roger Lucas <vt8231@hiddenengine.co.uk>
Cc: stable@vger.kernel.org
Signed-off-by: Jean Delvare <khali@linux-fr.org>

hwmon: (w83l768ng) Fix fan speed control range

The W83L786NG stores the fan speed on 4 bits while the sysfs interface
uses a 0-255 range. Thus the driver should scale the user input down
to map it to the device range, and scale up the value read from the
device before presenting it to the user. The reserved register nibble
should be left unchanged.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: stable@vger.kernel.org
Reviewed-by: Guenter Roeck <linux@roeck-us.net>

hwmon: (w83l786ng) Fix fan speed control mode setting and reporting

The wrong mask is used, which causes some fan speed control modes
(pwmX_enable) to be incorrectly reported, and some modes to be
impossible to set.

[JD: add subject and description.]

Signed-off-by: Brian Carnes <bmcarnes@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jean Delvare <khali@linux-fr.org>