Merge branch 'topic/kbuild-fixes-for-next' of git://git.kernel.org/pub/scm/linux...

Pull media build fixes from Mauro Carvalho Chehab:
 "A series of patches that fix compilation on non-x86 archs.

  While most of them are just build fixes, there are some fixes for real
  bugs, as there are a number of drivers using dynamic stack allocation.
  A few of those might be considered a security risk, if the i2c-dev
  module is loaded, as someone could be sending very long I2C data that
  could potentially overflow the Kernel stack.  Ok, as using /dev/i2c-*
  devnodes usually requires root on usual distros, and exploiting it
  would require a DVB board or USB stick, the risk is not high"

* 'topic/kbuild-fixes-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (28 commits)
  [media] platform drivers: Fix build on frv arch
  [media] lirc_zilog: Don't use dynamic static allocation
  [media] mxl111sf: Don't use dynamic static allocation
  [media] af9035: Don't use dynamic static allocation
  [media] af9015: Don't use dynamic static allocation
  [media] dw2102: Don't use dynamic static allocation
  [media] dibusb-common: Don't use dynamic static allocation
  [media] cxusb: Don't use dynamic static allocation
  [media] v4l2-async: Don't use dynamic static allocation
  [media] cimax2: Don't use dynamic static allocation
  [media] tuner-xc2028: Don't use dynamic static allocation
  [media] tuners: Don't use dynamic static allocation
  [media] av7110_hw: Don't use dynamic static allocation
  [media] stv090x: Don't use dynamic static allocation
  [media] stv0367: Don't use dynamic static allocation
  [media] stb0899_drv: Don't use dynamic static allocation
  [media] dvb-frontends: Don't use dynamic static allocation
  [media] dvb-frontends: Don't use dynamic static allocation
  [media] s5h1420: Don't use dynamic static allocation
  [media] uvc/lirc_serial: Fix some warnings on parisc arch
  ...

diff --cc drivers/media/rc/iguanair.c
Simple merge

diff --cc drivers/media/tuners/e4000.c
index 6c96e4898777f29f5c9ae4457d488e9424b32f2b,c9cc1232f2e5d89f21973dd437392ec1edcb44fa..72971a8d3c37978ef1c42b6a2523bb4cb8e92f4a
--- 1/drivers/media/tuners/e4000.c
--- 2/drivers/media/tuners/e4000.c
+++ b/drivers/media/tuners/e4000.c
@@@ -19,8 -19,10 +19,11 @@@
   */
  
  #include "e4000_priv.h"
 +#include <linux/math64.h>
  
+ /* Max transfer size done by I2C transfer functions */
+ #define MAX_XFER_SIZE  64
+ 
  /* write multiple registers */
  static int e4000_wr_regs(struct e4000_priv *priv, u8 reg, u8 *val, int len)
  {

diff --cc drivers/staging/media/lirc/lirc_serial.c
Simple merge