author | Praneeth Bajjuri <praneeth@ti.com> | |
Mon, 6 Jul 2015 22:57:49 +0000 (17:57 -0500) | ||
committer | Praneeth Bajjuri <praneeth@ti.com> | |
Mon, 6 Jul 2015 22:57:49 +0000 (17:57 -0500) |
* p-ti-linux-3.14.y-common: (206 commits)
ARM: dts: dra7xx-jamr3: Enable i2c4 required for radio
Linux 3.14.46
KVM: vgic: return int instead of bool when checking I/O ranges
KVM: ARM/arm64: avoid returning negative error code as bool
KVM: ARM/arm64: fix broken __percpu annotation
KVM: ARM/arm64: fix non-const declaration of function returning const
ARM64: KVM: store kvm_vcpu_fault_info est_el2 as word
ARM: virt: fix wrong HSCTLR.EE bit setting
arm64: KVM: export demux regids as KVM_REG_ARM64
ARM: KVM: user_mem_abort: support stage 2 MMIO page mapping
ARM: KVM: Unmap IPA on memslot delete/move
arm/arm64: KVM: Fix and refactor unmap_range
lpfc: Add iotag memory barrier
pipe: iovec: Fix memory corruption when retrying atomic copy as non-atomic
ath3k: add support of 13d3:3474 AR3012 device
ath3k: Add support of 0489:e076 AR3012 device
drm/mgag200: Reject non-character-cell-aligned mode widths
tracing: Have filter check for balanced ops
crypto: caam - fix RNG buffer cache alignment
Revert "ARM: OMAP: DRA7: change IPU1 clk domain to SWSUP for proper boot"
...
Conflicts:
drivers/media/platform/ti-vpe/vip.c
Change-Id: I033593fb5e2a12fa4df0e518af809ba99e6b8b7e
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
ARM: dts: dra7xx-jamr3: Enable i2c4 required for radio
Linux 3.14.46
KVM: vgic: return int instead of bool when checking I/O ranges
KVM: ARM/arm64: avoid returning negative error code as bool
KVM: ARM/arm64: fix broken __percpu annotation
KVM: ARM/arm64: fix non-const declaration of function returning const
ARM64: KVM: store kvm_vcpu_fault_info est_el2 as word
ARM: virt: fix wrong HSCTLR.EE bit setting
arm64: KVM: export demux regids as KVM_REG_ARM64
ARM: KVM: user_mem_abort: support stage 2 MMIO page mapping
ARM: KVM: Unmap IPA on memslot delete/move
arm/arm64: KVM: Fix and refactor unmap_range
lpfc: Add iotag memory barrier
pipe: iovec: Fix memory corruption when retrying atomic copy as non-atomic
ath3k: add support of 13d3:3474 AR3012 device
ath3k: Add support of 0489:e076 AR3012 device
drm/mgag200: Reject non-character-cell-aligned mode widths
tracing: Have filter check for balanced ops
crypto: caam - fix RNG buffer cache alignment
Revert "ARM: OMAP: DRA7: change IPU1 clk domain to SWSUP for proper boot"
...
Conflicts:
drivers/media/platform/ti-vpe/vip.c
Change-Id: I033593fb5e2a12fa4df0e518af809ba99e6b8b7e
Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
12 files changed:
1 | 2 | |||
---|---|---|---|---|
arch/arm/boot/dts/dra7-evm.dts | patch | | diff1 | | diff2 | | blob | history |
arch/arm/boot/dts/dra72-evm.dts | patch | | diff1 | | diff2 | | blob | history |
block/genhd.c | patch | | diff1 | | diff2 | | blob | history |
drivers/media/platform/ti-vpe/vip.c | patch | | diff1 | | diff2 | | blob | history |
drivers/usb/gadget/configfs.c | patch | | diff1 | | diff2 | | blob | history |
drivers/video/fbdev/omap2/dss/hdmi4.c | patch | | diff1 | | diff2 | | blob | history |
drivers/video/fbdev/omap2/dss/hdmi5.c | patch | | diff1 | | diff2 | | blob | history |
mm/mempolicy.c | patch | | diff1 | | diff2 | | blob | history |
net/ipv4/route.c | patch | | diff1 | | diff2 | | blob | history |
net/ipv4/udp.c | patch | | diff1 | | diff2 | | blob | history |
net/ipv6/tcp_ipv6.c | patch | | diff1 | | diff2 | | blob | history |
net/ipv6/udp.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc arch/arm/boot/dts/dra7-evm.dts
Simple merge
diff --cc arch/arm/boot/dts/dra72-evm.dts
Simple merge
diff --cc block/genhd.c
Simple merge
diff --cc drivers/media/platform/ti-vpe/vip.c
index bd141b3b9dde990a1e77f5cfb65d40ea75dd22c1,50f4b1bbddc624e96d6d41e6b13bdbf98089d34e..72b837c397dccdb4bfd727e8aac37e4c57ff0177
{
.name = "YUYV 422 packed",
.fourcc = V4L2_PIX_FMT_YUYV,
- .code = V4L2_MBUS_FMT_YUYV8_2X8,
+ .code = V4L2_MBUS_FMT_UYVY8_2X8,
.colorspace = V4L2_COLORSPACE_SMPTE170M,
.coplanar = 0,
+ /* bus order is reversed so flip Y and UV bytes */
.vpdma_fmt = { &vpdma_yuv_fmts[VPDMA_DATA_FMT_YCB422],
},
},
diff --cc drivers/usb/gadget/configfs.c
Simple merge
diff --cc drivers/video/fbdev/omap2/dss/hdmi4.c
Simple merge
diff --cc drivers/video/fbdev/omap2/dss/hdmi5.c
Simple merge
diff --cc mm/mempolicy.c
Simple merge
diff --cc net/ipv4/route.c
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
diff --cc net/ipv6/tcp_ipv6.c
Simple merge
diff --cc net/ipv6/udp.c
Simple merge