Merge branch 'v3.19-next/non-critical-fixes' into for-next
Merge branch 'v3.19-samsung-defconfig' into for-next
Merge branch 'v3.19-next/dt-samsung-2' into for-next
Merge branch 'v3.19-next/mach-exynos' into for-next
kvm: x86: move ioapic.c and irq_comm.c back to arch/x86/

ia64 does not need them anymore.  Ack notifiers become x86-specific
too.

Suggested-by: Gleb Natapov <gleb@kernel.org>
Reviewed-by: Radim Krcmar <rkrcmar@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
kvm: remove CONFIG_X86 #ifdefs from files formerly shared with ia64

Signed-off-by: Radim Krcmar <rkrcmar@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
kvm: remove IA64 ioctls

KVM ia64 is no longer present so new applications shouldn't use them.
The main problem is that they most likely didn't work even before,
because of a conflict in the #defines:

  #define KVM_SET_GUEST_DEBUG       _IOW(KVMIO,  0x9b, struct kvm_guest_debug)
  #define KVM_IA64_VCPU_SET_STACK   _IOW(KVMIO,  0x9b, void *)

The argument to KVM_SET_GUEST_DEBUG is:

  struct kvm_guest_debug {
  	__u32 control;
  	__u32 pad;
  	struct kvm_guest_debug_arch arch;
  };

  struct kvm_guest_debug_arch {
  };

meaning that sizeof(struct kvm_guest_debug) == sizeof(void *) == 8
and KVM_SET_GUEST_DEBUG == KVM_IA64_VCPU_SET_STACK.

KVM_SET_GUEST_DEBUG is handled in virt/kvm/kvm_main.c before even calling
kvm_arch_vcpu_ioctl (which would have handled KVM_IA64_VCPU_SET_STACK),
so KVM_IA64_VCPU_SET_STACK would just return -EINVAL.

Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
i2c: at91: enable probe deferring on dma channel request

If dma controller is not probed, defer i2c probe.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Merge branch 'i2c/for-current' into i2c/for-next

Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Merge branch 'patchwork' into to_next

* patchwork:
  [media] rtl28xxu: add SDR module for devices having R828D tuner
  [media] rtl28xxu: remove unused SDR attach logic
  [media] rtl28xxu: rename tuner I2C client pointer
  [media] rtl28xxu: add support for Panasonic MN88473 slave demod
  [media] rtl28xxu: add support for Panasonic MN88472 slave demod
  [media] rtl2832: implement option to bypass slave demod TS
  [media] omap24xx/tcm825x: remove deprecated omap2 camera drivers.
  [media] mach-omap2: remove deprecated VIDEO_OMAP2 support
Merge branch 'v4l_for_linus' into to_next

* v4l_for_linus:
  [media] rc-core: fix toggle handling in the rc6 decoder
  MAINTAINERS: Update mchehab's addresses
  [media] cx23885: use sg = sg_next(sg) instead of sg++
  [media] s2255drv: fix payload size for JPG, MJPEG
  [media] Update MAINTAINERS for solo6x10
  [media] solo6x10: fix a race in IRQ handler
Merge branch 'patchwork' into to_next

* patchwork:
  [media] staging: media: bcm2048: fix coding style error
  [media] em28xx: initialize si2168_config struct
  [media] af9035: initialize si2168_config struct
  [media] cxusb: initialize si2168_config struct
  [media] media: pci: smipcie: Fix dependency for DVB_SMIPCIE
Merge branch 'work-fixes' into work-next

Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
Merge branch 'for-3.19/wacom' into for-next
Merge branch 'for-3.19/drivers' into for-next
Merge branch 'v3.19-next/drivers-samsung' into v3.19-next/dt-samsung-64
i2c: rk3x: handle dynamic clock rate changes correctly

The i2c input clock can change dynamically, e.g. on the RK3066 where
pclk_i2c0 and pclk_i2c1 are connected to the armclk, which changes
rate on cpu frequency scaling.

Until now, we incorrectly called clk_get_rate() while holding the
i2c->lock in rk3x_i2c_xfer() to adapt to clock rate changes.
Thanks to Huang Tao for reporting this issue.

Do it properly now using the clk notifier framework. The callback
logic was taken from i2c-cadence.c.

Also rename all misleading "i2c_rate" variables to "clk_rate", as they
describe the *input* clk rate.

Signed-off-by: Max Schwarz <max.schwarz@online.de>
Tested-by: Doug Anderson <dianders@chromium.org> on RK3288
Reviewed-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
ARM: exynos_defconfig: Enable LM90 driver

multi_v7_defconfig has it as Y already, so build it in here, too, for
consistency, and therefore build in HWMON as well.

Signed-off-by: Andreas Faerber <afaerber@suse.de>
Reviewed-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Merge branch 'v3.19-next/dt-samsung-3' into for-next
Merge branch 'v3.19-next/pm-samsung-3' into for-next