Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4ab9185 authored by Bharath's avatar Bharath
Browse files

Merge branch 'int/11/fp3' into v1-r 

* int/11/fp3: (281 commits)
  Linux 4.9.332
  can: rcar_canfd: rcar_canfd_handle_global_receive(): fix IRQ storm on global FIFO receive
  net: ehea: fix possible memory leak in ehea_register_port()
  openvswitch: switch from WARN to pr_warn
  ALSA: aoa: Fix I2S device accounting
  ALSA: aoa: i2sbus: fix possible memory leak in i2sbus_add_dev()
  net: ksz884x: fix missing pci_disable_device() on error in pcidev_init()
  i40e: Fix ethtool rx-flow-hash setting for X722
  media: videodev2.h: V4L2_DV_BT_BLANKING_HEIGHT should check 'interlaced'
  media: v4l2-dv-timings: add sanity checks for blanking values
  media: vivid: dev->bitmap_cap wasn't freed in all cases
  media: vivid: s_fbuf: add more sanity checks
  can: mscan: mpc5xxx: mpc5xxx_can_probe(): add missing put_clock() in error path
  tcp: fix indefinite deferral of RTO with SACK reneging
  net: lantiq_etop: don't free skb when returning NETDEV_TX_BUSY
  kcm: annotate data-races around kcm->rx_wait
  kcm: annotate data-races around kcm->rx_psock
  ALSA: ac97: fix possible memory leak in snd_ac97_dev_register()
  arc: iounmap() arg is volatile
  drm/msm: Fix return type of mdp4_lvds_connector_mode_valid
  ...

Change-Id: I4a3740f3c90ad76be5b7b50b7fc745abe552ed71
parents 26af4cd1 6d001f87

Documentation/ABI/testing/sysfs-bus-iio

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ Description: 
		Raw capacitance measurement from channel Y. Units after

		application of scale and offset are nanofarads.



What:		/sys/.../iio:deviceX/in_capacitanceY-in_capacitanceZ_raw

What:		/sys/.../iio:deviceX/in_capacitanceY-capacitanceZ_raw

KernelVersion:	3.2

Contact:	linux-iio@vger.kernel.org

Description:

Documentation/arm64/silicon-errata.txt

+2 −0
Original line number Diff line number Diff line
@@ -53,7 +53,9 @@ stable kernels. 
| ARM            | Cortex-A57      | #832075         | ARM64_ERRATUM_832075        |

| ARM            | Cortex-A57      | #852523         | N/A                         |

| ARM            | Cortex-A57      | #834220         | ARM64_ERRATUM_834220        |

| ARM            | Cortex-A57      | #1742098        | ARM64_ERRATUM_1742098       |

| ARM            | Cortex-A72      | #853709         | N/A                         |

| ARM            | Cortex-A72      | #1655431        | ARM64_ERRATUM_1742098       |

| ARM            | Cortex-A55      | #1024718        | ARM64_ERRATUM_1024718       |

| ARM            | Cortex-A76      | #1188873        | ARM64_ERRATUM_1188873       |

| ARM            | MMU-500         | #841119,#826419 | N/A                         |

Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ Example: 
Use specific request line passing from dma

For example, MMC request line is 5



	sdhci: sdhci@98e00000 {

		compatible = "moxa,moxart-sdhci";

	mmc: mmc@98e00000 {

		compatible = "moxa,moxart-mmc";

		reg = <0x98e00000 0x5C>;

		interrupts = <5 0>;

		clocks = <&clk_apb>;

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 327

SUBLEVEL = 332

EXTRAVERSION =

NAME = Roaring Lionus

arch/arc/include/asm/io.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ static inline void ioport_unmap(void __iomem *addr) 
{

}



extern void iounmap(const void __iomem *addr);

extern void iounmap(const volatile void __iomem *addr);



#define ioremap_nocache(phy, sz)	ioremap(phy, sz)

#define ioremap_wc(phy, sz)		ioremap(phy, sz)