Pawel Osciak 07dc8fde53 CHROMIUM: videodev2.h: rename reserved2 to config_store in v4l2_buffer. ...

When queuing buffers allow for passing the configuration store ID that
should be associated with this buffer. Use the 'reserved2' field for this.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>

BUG=chrome-os-partner:33728
TEST=build

Signed-off-by: Pawel Osciak <posciak@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/232583
Trybot-Ready: Tomasz Figa <tfiga@chromium.org>
Tested-by: Tomasz Figa <tfiga@chromium.org>
Reviewed-by: Wu-cheng Li <wuchengli@chromium.org>
Commit-Queue: Tomasz Figa <tfiga@chromium.org>

Conflicts:
	drivers/media/v4l2-core/videobuf2-core.c

[rebase44(groeck): fixed conflicts; structural changes to match v4.4]
Signed-off-by: Guenter Roeck <groeck@chromium.org>

Conflicts:
	drivers/media/v4l2-core/v4l2-compat-ioctl32.c

Change-Id: Ibb823e9369bec79645e09651b0dda006ed53ecc5
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Yakir Yang <ykk@rock-chips.com>

2016-06-30 19:36:55 +08:00

..

acpi

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

asm-generic

Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

2016-05-13 12:20:56 +08:00

clocksource

rk: revert to v3.10

2015-11-11 15:57:28 +08:00

crypto

crypto: af_alg - Allow af_af_alg_release_parent to be called on nokey path

2016-02-17 12:31:03 -08:00

drm

FIXUP: drm/bridge: analogix_dp: misc update to upstream version

2016-06-28 18:40:56 +08:00

dt-bindings

clk: rockchip: add clock ids for i2s_src on RK3366

2016-06-28 18:40:57 +08:00

keys

KEYS: Merge the type-specific data with the payload data

2015-10-21 15:18:36 +01:00

kvm

KVM: arm/arm64: arch_timer: Preserve physical dist. active state on LR.active

2015-11-24 18:07:40 +01:00

linux

soc: rockchip: add rk fiq debugger platform driver

2016-06-21 17:40:11 +08:00

math-emu

…

media

CHROMIUM: videodev2.h: rename reserved2 to config_store in v4l2_buffer.

2016-06-30 19:36:55 +08:00

memory

…

misc

misc: rockchip-scr: add rockchip SOC smart card reader controller driver.

2016-03-21 11:03:15 +08:00

net

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2016-05-20 12:16:40 +08:00

pcmcia

…

ras

tracing: add trace event for memory-failure

2015-06-24 17:49:43 -07:00

rdma

IB/security: Restrict use of the write() interface

2016-05-04 14:48:48 -07:00

rxrpc

…

scsi

Merge branch 'mkp-fixes' into fixes

2015-12-03 09:32:33 -08:00

soc

Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2015-11-10 15:00:03 -08:00

sound

UPSTREAM: ASoC: hdmi-codec: Add hdmi-codec for external HDMI-encoders

2016-06-23 11:11:20 +08:00

target

target: Fix WRITE_SAME/DISCARD conversion to linux 512b sectors

2016-03-09 15:34:51 -08:00

trace

Merge branch 'lsk-v4.4-eas-v5.2' of git://git.linaro.org/arm/eas/kernel.git

2016-06-08 14:09:19 +08:00

uapi

CHROMIUM: videodev2.h: rename reserved2 to config_store in v4l2_buffer.

2016-06-30 19:36:55 +08:00

video

video: rockchip: fb: add parse screen physical size

2016-05-25 15:18:53 +08:00

xen

xen: Fix page <-> pfn conversion on 32 bit systems

2016-05-11 11:21:14 +02:00

Kbuild

…