Skip to content

Sync up with Linus #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dabrace merged 1,592 commits into from
Apr 22, 2015
Merged

Sync up with Linus #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1592 commits
Select commit Hold shift + click to select a range
7c15fd4
[media] s5p-jpeg: add 5420 family support
Mar 9, 2015
12b0556
[media] s5p-jpeg: Initialize jpeg_addr fields to zero
janaszewski Mar 5, 2015
c8c7c44
[media] s5p-jpeg: Remove some unused functions
Jan 4, 2015
3937567
clk: qcom: fix driver dependencies
bzolnier Apr 7, 2015
af7f388
[media] cx23885: Always initialise dev->slock spinlock
dhowells Mar 26, 2015
c252990
[media] sur40: fix occasional hard freeze due to buffer queue underrun
floe Mar 31, 2015
d363332
[media] ov2640: add missing consumer.h include
hverkuil Apr 3, 2015
2910366
[media] vivid: add CVT,GTF standards to vivid dv timings caps
Mar 20, 2015
5190931
[media] vivid: add support to set CVT, GTF timings
Mar 21, 2015
b08d8d2
[media] media/v4l2-ctrls: volatiles should not generate CH_VALUE
ribalda Mar 20, 2015
b6e5b8f
[media] media: New flag V4L2_CTRL_FLAG_EXECUTE_ON_WRITE
ribalda Mar 20, 2015
ef66c0c
[media] media/v4l2-ctrls: Add execute flags to write_only controls
ribalda Mar 20, 2015
45f014c
[media] media/v4l2-ctrls: Always execute EXECUTE_ON_WRITE ctrls
ribalda Mar 20, 2015
acd2b67
[media] media/Documentation: New flag EXECUTE_ON_WRITE
ribalda Mar 20, 2015
5ce65d1
[media] videodev2.h/v4l2-dv-timings.h: add V4L2_DV_FL_IS_CE_VIDEO flag
Mar 20, 2015
74d802d
[media] v4l2-dv-timings: log new V4L2_DV_FL_IS_CE_VIDEO flag
Apr 3, 2015
8b44b4e
[media] DocBook media: document the new V4L2_DV_FL_IS_CE_VIDEO flag
Mar 20, 2015
680fee0
[media] adv: use V4L2_DV_FL_IS_CE_VIDEO instead of V4L2_DV_BT_STD_CEA861
Mar 20, 2015
4a20334
[media] vivid: use V4L2_DV_FL_IS_CE_VIDEO instead of V4L2_DV_BT_STD_C…
Mar 20, 2015
b36ae85
[media] media: radio-si4713: improve usage of gpiod API
Mar 26, 2015
eaa80c4
[media] cx18: add support for control events
Apr 2, 2015
3a29a4f
[media] cx18: fix VIDIOC_ENUMINPUT: wrong std value
Apr 2, 2015
55cda4a
[media] cx18: replace cropping ioctls by selection ioctls
Apr 2, 2015
34080bc
[media] cx88: embed video_device
Mar 9, 2015
23fb4c5
[media] bttv: embed video_device
Mar 9, 2015
d4352f3
[media] em28xx: embed video_device
Mar 9, 2015
d8da751
[media] uvc: embed video_device
Mar 9, 2015
021cd2d
[media] mn88472: add ts mode and ts clock to driver
Dec 6, 2014
d03b550
[media] r820t: add settings for SYS_DVBC_ANNEX_C standard
Jan 12, 2015
275350a
[media] r820t: enable flt_ext_wide for SYS_DVBC_ANNEX_A standard
Jan 12, 2015
0ea4bce
[media] sp2: Delete an unnecessary check before the function call "kf…
elfring Feb 3, 2015
5164d6a
[media] V4L2: Delete an unnecessary check before the function call "m…
elfring Feb 3, 2015
e68c2fe
[media] dvb-usb: fix spaces after commas
luisbg Feb 4, 2015
07d0e55
[media] DVB: Delete an unnecessary check before the function call "dv…
elfring Feb 3, 2015
a2bbf5d
[media] DVB: Less function calls in dvb_ca_en50221_init() after error…
elfring Feb 3, 2015
cc4e8c3
[media] rc: img-ir: Add and enable sys clock for img-ir
Feb 4, 2015
5ed1c32
[media] v4l: vb2-memops: use vma slab when vma allocation
pullipcho Feb 5, 2015
51b5b3d
[media] s5k5baf: Add missing error check for devm_kzalloc
KiranPadwal Feb 5, 2015
ec73b9f
[media] si2165: Fix possible leak in si2165_upload_firmware()
Feb 11, 2015
67a260f
[media] dib0700: remove unused macros
luisbg Feb 12, 2015
4f054d4
ARM: mvebu: use 0xf1000000 as internal registers on Armada 370 DB
tpetazzoni Apr 7, 2015
974e08d
[media] cxusb: Use enum to represent table offsets rather than hard-c…
dhowells Feb 17, 2015
80ccf4a
[media] rc: img-ir: fix error in parameters passed to irq_free()
Feb 10, 2015
2035775
[media] rtl2832: remove compiler warning
luisbg Feb 11, 2015
882302c
[media] rtl28xxu: add support for Turbo-X DTT2000
gnulabis Feb 14, 2015
09bf4a8
Revert "[media] v4l: vb2-memops: use vma slab when vma allocation"
mchehab Apr 8, 2015
856260a
[media] xc5000: fix memory corruption when unplugging device
dheitmueller Sep 23, 2014
a87a4d3
[media] si2168: tda10071: m88ds3103: Fix trivial typos
Feb 26, 2015
9b17452
[media] Add and use IS_REACHABLE macro
arndb Feb 18, 2015
00c78a3
dvb-frontends: use IS_REACHABLE() instead of IS_ENABLED()
mchehab Apr 8, 2015
2f272e7
clk: qcom: Fix parent_map translations
Apr 7, 2015
09f5012
[media] WinFast DTV2000 DS Plus
Mar 9, 2015
b6100f1
[media] Add device tree support to adp1653 flash driver
pavelmachek Mar 13, 2015
be8e58d
Revert "[media] Add device tree support to adp1653 flash driver"
mchehab Apr 9, 2015
e52786a
clk: versatile: test returned value
JuliaLawall Apr 4, 2015
99492c3
earlycon: Fix __earlycon_table stride
peterhurley Apr 3, 2015
8751577
earlycon: 8250: Fix command line regression
peterhurley Apr 6, 2015
ca782f1
earlycon: 8250: Document kernel command line options
peterhurley Apr 6, 2015
6a8bc23
serial: 8250_pci: port failed after wakeup from S3
hpeter Apr 1, 2015
f0e3811
sc16is7xx: expose RTS inversion in RS-485 mode
kuba-moo Mar 31, 2015
5dbc32a
n_gsm: Drop unneeded cast on netdev_priv
JuliaLawall Mar 29, 2015
06e7a9b
[media] vb2: split the io_flags member of vb2_queue into a bit field
Feb 23, 2015
f61bf13
[media] vb2: add allow_zero_bytesused flag to the vb2_queue struct
Feb 23, 2015
e4af23d
[media] coda: set allow_zero_bytesused flag for vb2_queue_init
Feb 23, 2015
e6c9dec
[media] s5p-mfc: set allow_zero_bytesused flag for vb2_queue_init
Feb 23, 2015
d5451c1
[media] v4l2-mem2mem: no need to initialize b in v4l2_m2m_next_buf an…
pH5 Mar 11, 2015
92b042e
[media] coda: bitrate can only be set in kbps steps
pH5 Mar 18, 2015
a7f933a
[media] coda: check kasprintf return value in coda_open
pseiderer Mar 24, 2015
d446ec8
[media] coda: fix double call to debugfs_remove
pseiderer Mar 24, 2015
2b76846
[media] coda: bitstream payload is unsigned
pH5 Mar 24, 2015
bf249da
[media] coda: use strlcpy instead of snprintf
pH5 Mar 24, 2015
73751da
[media] coda: allocate per-context buffers from REQBUFS
pH5 Mar 24, 2015
ad532d3
[media] coda: allocate bitstream buffer from REQBUFS, size depends on…
pH5 Mar 24, 2015
650b939
[media] coda: move parameter buffer in together with context buffer a…
pH5 Mar 24, 2015
6ba53b8
[media] coda: remove duplicate error messages for buffer allocations
pH5 Mar 24, 2015
23b6ee5
[media] coda: fail to start streaming if userspace set invalid formats
pH5 Mar 24, 2015
5c76c2c
[media] coda: call SEQ_END when the first queue is stopped
pH5 Mar 24, 2015
582d887
[media] coda: fix fill bitstream errors in nonstreaming case
pH5 Mar 24, 2015
8191919
[media] coda: drop dma_sync_single_for_device in coda_bitstream_queue
pH5 Mar 25, 2015
9a1a8f9
[media] coda: Add tracing support
pH5 Jan 29, 2015
befd25a
[media] media: omap3isp: remove unused clkdev
Apr 3, 2015
1461fe7
[media] uvcvideo: fix cropcap v4l2-compliance failure
hverkuil Apr 3, 2015
e183201
[media] uvcvideo: add support for VIDIOC_QUERY_EXT_CTRL
hverkuil Mar 14, 2015
8106462
clk: tegra: Fix typo tabel -> table
thierryreding Aug 5, 2014
f081c89
clk: tegra: Fix a bunch of sparse warnings
thierryreding Jul 21, 2014
04794d9
clk: tegra: Enable HDA to HDMI clocks on Tegra124
dgreid May 20, 2014
6bb18c5
clk: tegra: Various whitespace cleanups
thierryreding Aug 1, 2014
12cf33c
clk: tegra: Use consistent indentation
thierryreding Jan 23, 2015
44a6f3d
clk: tegra: Remove needless initializations
thierryreding Feb 18, 2015
5e43e25
clk: tegra: Register the proper number of resets
thierryreding Mar 23, 2015
699b477
clk: tegra: Add peripheral registers for bank Y
thierryreding Mar 23, 2015
63cc5a4
clk: tegra: Model oscillator as clock
thierryreding Mar 26, 2015
a84724a
clk: tegra: Use generic tegra_osc_clk_init() on Tegra114
thierryreding Mar 26, 2015
c1d676c
clk: tegra: Use the proper parent for plld_dsi
thierryreding Mar 26, 2015
c7739ae
clk: pxa: pxa3xx: add missing os timer clock
rjarzmik Feb 14, 2015
1ccdd04
clk: Add clock driver for mb86s7x
JassiBrar Mar 4, 2015
9a74ccd
clk: Add PWM clock driver
pH5 Feb 13, 2015
820ad97
clk: clk-gpio-gate: Fix active low
Mar 18, 2015
c14deee
Merge tag 'clk/for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/…
Apr 11, 2015
f619421
clk: at91: change to using endian agnositc IO
bjdooks-ct Mar 26, 2015
692d832
clk: don't use __initconst for non-const arrays
Feb 18, 2015
3a9e9cb
clk: samsung: exynos4: Disable ARMCLK down feature on Exynos4210 SoC
bzolnier Mar 27, 2015
4591243
clk: at91: usb: propagate rate modification to the parent clk
Mar 29, 2015
03bc10a
clk: check ->determine/round_rate() return value in clk_calc_new_rates
Mar 29, 2015
7a4261d
soc/mediatek: Remove unused variables
thierryreding Apr 8, 2015
050e57f
modpost: add strict white-listing when referencing sections.
Apr 13, 2015
157d197
modpost: add .sched.text and .kprobes.text to the TEXT_SECTIONS list.
Apr 13, 2015
644e8f1
modpost: add handler function pointer to sectioncheck.
Apr 13, 2015
356ad53
modpost: factorize symbol pretty print in get_pretty_name().
Apr 13, 2015
c7a65e0
modpost: mismatch_handler: retrieve tosym information only when needed.
Apr 13, 2015
c31e4b8
scripts: add check_extable.sh script.
Apr 13, 2015
52dc059
modpost: handle relocations mismatch in __ex_table.
Apr 13, 2015
e5d8f59
modpost: document the use of struct section_check.
Apr 13, 2015
9e1a27e
virtio_ring: Update weak barriers to use dma_wmb/rmb
Apr 13, 2015
ea5505f
mei: trace: remove unused TRACE_SYSTEM_STRING
Apr 13, 2015
2c13d8c
Revert "ARM: dts: mt8135: Add pinctrl/GPIO/EINT node for mt8135."
arndb Apr 13, 2015
875dac1
Merge tag 'v4.0-next-soc-fix' of https://github.com/mbgg/linux-mediat…
arndb Apr 13, 2015
8b481b0
Merge tag 'arm-soc/for-4.1/soc' of http://github.com/broadcom/stblinu…
arndb Apr 13, 2015
49faf80
Merge tag 'mvebu-fixes-4.0-2' of git://git.infradead.org/linux-mvebu …
arndb Apr 13, 2015
643ee0d
Merge tag 'omap-for-v4.1/prcm-dts' of git://git.kernel.org/pub/scm/li…
arndb Apr 13, 2015
b50c9c2
ARM: multi_v7_defconfig: enable alpine platform
tsahee-anpa Mar 26, 2015
a018bb2
ARM: alpine: add support for generic pci
tsahee-anpa Apr 5, 2015
8b03655
ARM: dts: alpine: add internal pci
tsahee-anpa Apr 5, 2015
9705fea
Merge tag 'imx-dt-4.1' of git://git.kernel.org/pub/scm/linux/kernel/g…
arndb Apr 13, 2015
89522f0
Merge tag 'at91-cleanup4_bis' of git://git.kernel.org/pub/scm/linux/k…
arndb Apr 13, 2015
7415d97
Merge tag 'at91-clocksource-driver2' of git://git.kernel.org/pub/scm/…
arndb Apr 13, 2015
b9bced0
Input: elan_i2c - adjust for newer firmware pressure reporting
dusonlin Apr 12, 2015
8b8be51
Input: add vmmouse driver
thomashvmw Apr 14, 2015
2afebaf
Input: ff-core - use new debug macros
Apr 14, 2015
0604949
Input: xpad - add rumble support for Xbox One controller
medicalwei Apr 14, 2015
df81b29
virtio_balloon: transitional interface
mstsirkin Apr 15, 2015
2343dab
virtio: balloon might not be a legacy device
mstsirkin Apr 15, 2015
2003a7a
virtio_ccw: support non-legacy balloon devices
mstsirkin Apr 15, 2015
a62d547
virtio_mmio: support non-legacy balloon devices
mstsirkin Apr 15, 2015
f71d828
virtio_pci: support non-legacy balloon devices
mstsirkin Apr 15, 2015
9abbfb4
virtio: drop virtio_device_is_legacy_only
mstsirkin Apr 15, 2015
b9cc448
params: handle quotes properly for values not of form foo="bar".
rustyrussell Apr 15, 2015
b99e6fb
pinctrl: fix allmodconfig noise
Apr 15, 2015
4f8d808
Input: atmel_mxt_ts - add support for Google Pixel 2
dtor Apr 7, 2015
2310568
Input: alps - document separate pointstick button bits for V2 devices
jwrdegoede Apr 15, 2015
30ecc84
Merge branch 'omap/dt' into next/late
arndb Apr 15, 2015
ef99b88
tracing: Handle ftrace_dump() atomic context in graph_trace_open()
vitkyrka Apr 13, 2015
84fce9d
tracing: Fix incorrect enabling of trace events by boot cmdline
JoonsooKim Apr 16, 2015
636efbc
mmc: pwrseq: Fix error code propagation in mmc_pwrseq_simple_alloc()
Apr 13, 2015
96541ba
Revert "mmc: core: Convert mmc_driver to device_driver"
storulf Apr 14, 2015
3193899
tracing: Fix possible out of bounds memory access when parsing enums
rostedt Apr 17, 2015
6e6f092
ceph: drop cap releases in requests composed before cap reconnect
ukernel Feb 27, 2015
e2c3de0
ceph: fix dcache/nocache mount option
ukernel Mar 4, 2015
e1eba3e
ceph: remove redundant declaration
Mar 3, 2015
3563dbd
ceph: use msecs_to_jiffies for time conversion
Feb 6, 2015
57e9546
ceph: match wait_for_completion_timeout return type
Mar 10, 2015
cdaa8cf
Merge branch 'fixes' into next/fixes-non-critical
olofj Apr 20, 2015
1fe4802
rbd: be more informative on -ENOENT failures
idryomov Mar 5, 2015
c1d00b2
ceph: properly release page upon error
tsgates Mar 20, 2015
a149bb9
ceph: kstrdup() memory handling
Mar 21, 2015
3ef650d
libceph: osdmap.h: Add missing format newlines
JoePerches Mar 23, 2015
db40cc1
ceph: keep i_snap_realm while there are writers
ukernel Mar 23, 2015
571ade3
ceph: don't mark dirty caps when there is no auth cap
ukernel Mar 24, 2015
a9f6eb6
ceph: don't zero i_wrbuffer_ref when reconnecting is denied
ukernel Mar 24, 2015
1c841a9
ceph: cleanup unsafe requests when reconnecting is denied
ukernel Mar 24, 2015
67c64eb
libceph: don't overwrite specific con error msgs
idryomov Mar 23, 2015
d8a2c89
rbd: mark block queue as non-rotational
idryomov Mar 24, 2015
ff40f9a
libceph, ceph: split ceph_show_options()
idryomov Mar 25, 2015
5cf7bd3
libceph: expose client options through debugfs
idryomov Mar 25, 2015
ff7eeb8
ceph: show non-default options only
idryomov Mar 25, 2015
9571eb4
libceph: simplify our debugfs attr macro
idryomov Mar 25, 2015
32ec439
ceph: hold on to exclusive caps on complete directories
ukernel Mar 26, 2015
8c0776a
Input: elants_i2c - zero-extend hardware ID in firmware name
dtor Apr 18, 2015
090ad32
Input: elan_i2c - report hovering contacts
dusonlin Apr 20, 2015
9f42380
Input: elan_i2c - fix calculating number of x and y traces.
dusonlin Apr 20, 2015
a333a03
Input: cyapa - fix setting suspend scan rate
Apr 20, 2015
c9eeb50
Input: lm8333 - fix broken email address
Apr 20, 2015
da4d814
ARM: OMAP2+: Fix booting with configs that don't have MFD_SYSCON
tmlind Apr 20, 2015
2ab9574
ip_forward: Drop frames with attached skb->sk
pho-enix Apr 20, 2015
b0cc836
iommu-common: fix x86_64 compiler warnings
sowminiv Apr 19, 2015
7b3372d
iommu-common: rename iommu_pool_hash to iommu_hash_common
sowminiv Apr 19, 2015
4113756
Merge branch 'iommu-common-fixes'
davem330 Apr 20, 2015
a068833
pppoe: Lacks DST MAC address check
Apr 20, 2015
4e18b9a
net: add skb_checksum_complete_unset
tomratbert Apr 20, 2015
3dfb053
ppp: call skb_checksum_complete_unset in ppp_receive_frame
tomratbert Apr 20, 2015
91f5bd8
Merge branch 'ppp_csum_unset'
davem330 Apr 21, 2015
614f03f
net: dsa: mv88e6xxx: fix setup of port control 1
vivien Apr 20, 2015
47cf1e6
net: dsa: mv88e6xxx: use PORT_DEFAULT_VLAN
vivien Apr 20, 2015
71cd26e
altera tse: Error-Bit on tx-avalon-stream always set.
oetken Apr 20, 2015
676ee36
Merge branch 'patchwork' into v4l_for_linus
mchehab Apr 21, 2015
64131a8
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airli…
mchehab Apr 21, 2015
8f443e2
Revert "ocfs2: incorrect check for debugfs returns"
torvalds Apr 21, 2015
e98bf5c
Merge tag 'clk-for-linus-4.1' of git://git.kernel.org/pub/scm/linux/k…
torvalds Apr 21, 2015
8d582b9
Merge tag 'pinctrl-v4.1-2' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Apr 21, 2015
41d5e08
Merge tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/…
torvalds Apr 21, 2015
1fc1499
Merge tag 'char-misc-4.1-rc1' of git://git.kernel.org/pub/scm/linux/k…
torvalds Apr 21, 2015
0c8027d
Merge tag 'media/v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Apr 21, 2015
4885338
Merge branch 'next' into for-linus
dtor Apr 21, 2015
1d11437
media: remove unused variable that causes a warning
torvalds Apr 21, 2015
b8ce8d7
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Apr 21, 2015
3c71512
tcp: add memory barriers to write space paths
jbaron-lgtm Apr 20, 2015
8bf8a1d
parisc: Eliminate sg_virt_addr() and private scatterlist.h
Mar 20, 2015
c19edb6
parisc: Replace PT_NLEVELS with CONFIG_PGTABLE_LEVELS
groeck Apr 15, 2015
af539e9
MAINTAINERS: Remove Mohit Kumar (email bounces)
bjorn-helgaas Apr 21, 2015
df38637
sparc64: Use M7 PMC write on all chips T4 and onward.
davem330 Apr 21, 2015
0edfad5
sparc: Use GFP_ATOMIC in ldc_alloc_exp_dring() as it can be called in…
sowminiv Apr 21, 2015
9fbbda5
ia64/PCI: Treat all host bridge Address Space Descriptors (even consu…
bjorn-helgaas Apr 21, 2015
fab9adf
net/mlx4_core: Fix reading HCA max message size in mlx4_QUERY_DEV_CAP
Apr 21, 2015
f614c81
Merge branch 'parisc-4.1-1' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Apr 22, 2015
48c1078
Merge tag 'omap-for-v4.1/prcm-dts-mfd-syscon-fix' of git://git.kernel…
olofj Apr 22, 2015
8aaa51b
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
torvalds Apr 22, 2015
db4fd9c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
torvalds Apr 22, 2015
d7e0abc
modpost: Whitelist .text.fixup and .exception.text
thierryreding Apr 15, 2015
6c730bf
modpost: handle -ffunction-sections
rustyrussell Apr 15, 2015
d3df4de
modpost: fix inverted logic in is_extable_fault_address().
Apr 16, 2015
e84048a
modpost: fix extable entry size calculation.
Apr 16, 2015
c5c3439
modpost: do not try to match the SHT_NUL section.
Apr 16, 2015
09c20c0
modpost: expand pattern matching to support substring matches
Apr 20, 2015
4a3893d
modpost: don't emit section mismatch warnings for compiler optimizations
Apr 20, 2015
e1dbde2
watchdog: bcm281xx: Remove use of seq_printf return value
JoePerches Feb 22, 2015
0dfd582
watchdog: qcom: use timer devicetree binding
Feb 21, 2015
4ba1c98
ARM: qcom: add description of KPSS WDT for IPQ8064
Feb 21, 2015
cf79fb1
ARM: msm: add watchdog entries to DT timer binding doc
Feb 21, 2015
6290d8c
watchdog: cadence: Remove Kconfig dependency on ARCH
Mar 9, 2015
3d588c9
watchdog: octeon: convert to WATCHDOG_CORE API
aakoskin Mar 28, 2015
8692cf0
watchdog: octeon: fix some trivial coding style issues
aakoskin Mar 28, 2015
3a30c07
watchdog: octeon: use fixed length string for register names
aakoskin Mar 28, 2015
e8cc536
watchdog: pnx4008_wdt: fix broken email address
Apr 20, 2015
cf82f52
watchdog: stmp3xxx_rtc_wdt: fix broken email address
Apr 20, 2015
c0bd50e
ceph: fix null pointer dereference in send_mds_reconnect()
ukernel Apr 7, 2015
0ea611a
ceph: rename snapshot support
ukernel Apr 7, 2015
ec137c1
ceph: fix uninline data function
ukernel Apr 13, 2015
9be6df2
crush: drop unnecessary include from mapper.c
idryomov Apr 14, 2015
4500226
crush: ensuring at most num-rep osds are selected
idryomov Apr 14, 2015
958a276
crush: straw2 bucket type with an efficient 64-bit crush_ln()
idryomov Apr 14, 2015
7c1c474
libceph: announce support for straw2 buckets
idryomov Apr 14, 2015
f77303b
rbd: rbd_wq comment is obsolete
idryomov Apr 22, 2015
38eb1db
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Apr 22, 2015
d0440c5
Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Apr 22, 2015
e6c81cc
Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/g…
torvalds Apr 22, 2015
5c73cc4
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/gi…
torvalds Apr 22, 2015
7d2b6ef
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Apr 22, 2015
e5ac320
Merge tag 'armsoc-multiplatform' of git://git.kernel.org/pub/scm/linu…
torvalds Apr 22, 2015
2144de8
Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Apr 22, 2015
d34dc4f
Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Apr 22, 2015
8b3c8ba
Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/…
torvalds Apr 22, 2015
3cfe213
dmaengine: hsu: don't prompt for hsu_core part
Apr 22, 2015
5e6c94a
Merge tag 'mmc-4.1-rc1' of git://git.linaro.org/people/ulf.hansson/mmc
torvalds Apr 22, 2015
f3ca10d
Revert "mm: avoid tail page refcounting on non-THP compound pages"
torvalds Apr 22, 2015
15ce265
Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/li…
torvalds Apr 22, 2015
b9bb6fb
Merge tag 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/lin…
torvalds Apr 22, 2015
7dcca3e
Merge git://www.linux-watchdog.org/linux-watchdog
torvalds Apr 22, 2015
9b60afe
Merge tag 'pci-v4.1-fixes-1' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Apr 22, 2015
4f21123
Merge tag 'trace-v4.1-2' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Apr 22, 2015
1204c46
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Apr 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions CREDITS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2049,6 +2049,10 @@ D: pirq addr, CS5535 alsa audio driver
S: Gurgaon, India
S: Kuala Lumpur, Malaysia

N: Mohit Kumar
D: ST Microelectronics SPEAr13xx PCI host bridge driver
D: Synopsys Designware PCI host bridge driver

N: Gabor Kuti
M: seasons@falcon.sch.bme.hu
M: seasons@makosteszta.sote.hu
Expand Down
2 changes: 1 addition & 1 deletion Documentation/DocBook/media/v4l/compat.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2491,7 +2491,7 @@ that used it. It was originally scheduled for removal in 2.6.35.
</listitem>
<listitem>
<para>Added <constant>V4L2_EVENT_CTRL_CH_RANGE</constant> control event
changes flag. See <xref linkend="changes-flags"/>.</para>
changes flag. See <xref linkend="ctrl-changes-flags"/>.</para>
</listitem>
</orderedlist>
</section>
Expand Down
92 changes: 27 additions & 65 deletions Documentation/DocBook/media/v4l/media-ioc-enum-entities.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,86 +143,28 @@
<row>
<entry></entry>
<entry>struct</entry>
<entry><structfield>v4l</structfield></entry>
<entry><structfield>dev</structfield></entry>
<entry></entry>
<entry>Valid for V4L sub-devices and nodes only.</entry>
<entry>Valid for (sub-)devices that create a single device node.</entry>
</row>
<row>
<entry></entry>
<entry></entry>
<entry>__u32</entry>
<entry><structfield>major</structfield></entry>
<entry>V4L device node major number. For V4L sub-devices with no
device node, set by the driver to 0.</entry>
<entry>Device node major number.</entry>
</row>
<row>
<entry></entry>
<entry></entry>
<entry>__u32</entry>
<entry><structfield>minor</structfield></entry>
<entry>V4L device node minor number. For V4L sub-devices with no
device node, set by the driver to 0.</entry>
</row>
<row>
<entry></entry>
<entry>struct</entry>
<entry><structfield>fb</structfield></entry>
<entry></entry>
<entry>Valid for frame buffer nodes only.</entry>
</row>
<row>
<entry></entry>
<entry></entry>
<entry>__u32</entry>
<entry><structfield>major</structfield></entry>
<entry>Frame buffer device node major number.</entry>
</row>
<row>
<entry></entry>
<entry></entry>
<entry>__u32</entry>
<entry><structfield>minor</structfield></entry>
<entry>Frame buffer device node minor number.</entry>
</row>
<row>
<entry></entry>
<entry>struct</entry>
<entry><structfield>alsa</structfield></entry>
<entry></entry>
<entry>Valid for ALSA devices only.</entry>
</row>
<row>
<entry></entry>
<entry></entry>
<entry>__u32</entry>
<entry><structfield>card</structfield></entry>
<entry>ALSA card number</entry>
</row>
<row>
<entry></entry>
<entry></entry>
<entry>__u32</entry>
<entry><structfield>device</structfield></entry>
<entry>ALSA device number</entry>
</row>
<row>
<entry></entry>
<entry></entry>
<entry>__u32</entry>
<entry><structfield>subdevice</structfield></entry>
<entry>ALSA sub-device number</entry>
</row>
<row>
<entry></entry>
<entry>int</entry>
<entry><structfield>dvb</structfield></entry>
<entry></entry>
<entry>DVB card number</entry>
<entry>Device node minor number.</entry>
</row>
<row>
<entry></entry>
<entry>__u8</entry>
<entry><structfield>raw</structfield>[180]</entry>
<entry><structfield>raw</structfield>[184]</entry>
<entry></entry>
<entry></entry>
</row>
Expand Down Expand Up @@ -253,8 +195,24 @@
<entry>ALSA card</entry>
</row>
<row>
<entry><constant>MEDIA_ENT_T_DEVNODE_DVB</constant></entry>
<entry>DVB card</entry>
<entry><constant>MEDIA_ENT_T_DEVNODE_DVB_FE</constant></entry>
<entry>DVB frontend devnode</entry>
</row>
<row>
<entry><constant>MEDIA_ENT_T_DEVNODE_DVB_DEMUX</constant></entry>
<entry>DVB demux devnode</entry>
</row>
<row>
<entry><constant>MEDIA_ENT_T_DEVNODE_DVB_DVR</constant></entry>
<entry>DVB DVR devnode</entry>
</row>
<row>
<entry><constant>MEDIA_ENT_T_DEVNODE_DVB_CA</constant></entry>
<entry>DVB CAM devnode</entry>
</row>
<row>
<entry><constant>MEDIA_ENT_T_DEVNODE_DVB_NET</constant></entry>
<entry>DVB network devnode</entry>
</row>
<row>
<entry><constant>MEDIA_ENT_T_V4L2_SUBDEV</constant></entry>
Expand Down Expand Up @@ -282,6 +240,10 @@
it in some digital video standard, with appropriate embedded timing
signals.</entry>
</row>
<row>
<entry><constant>MEDIA_ENT_T_V4L2_SUBDEV_TUNER</constant></entry>
<entry>TV and/or radio tuner</entry>
</row>
</tbody>
</tgroup>
</table>
Expand Down
79 changes: 40 additions & 39 deletions Documentation/DocBook/media/v4l/pixfmt-packed-rgb.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,45 +303,6 @@ for a pixel lie next to each other in memory.</para>
<entry>b<subscript>1</subscript></entry>
<entry>b<subscript>0</subscript></entry>
</row>
<row id="V4L2-PIX-FMT-BGR666">
<entry><constant>V4L2_PIX_FMT_BGR666</constant></entry>
<entry>'BGRH'</entry>
<entry></entry>
<entry>b<subscript>5</subscript></entry>
<entry>b<subscript>4</subscript></entry>
<entry>b<subscript>3</subscript></entry>
<entry>b<subscript>2</subscript></entry>
<entry>b<subscript>1</subscript></entry>
<entry>b<subscript>0</subscript></entry>
<entry>g<subscript>5</subscript></entry>
<entry>g<subscript>4</subscript></entry>
<entry></entry>
<entry>g<subscript>3</subscript></entry>
<entry>g<subscript>2</subscript></entry>
<entry>g<subscript>1</subscript></entry>
<entry>g<subscript>0</subscript></entry>
<entry>r<subscript>5</subscript></entry>
<entry>r<subscript>4</subscript></entry>
<entry>r<subscript>3</subscript></entry>
<entry>r<subscript>2</subscript></entry>
<entry></entry>
<entry>r<subscript>1</subscript></entry>
<entry>r<subscript>0</subscript></entry>
<entry></entry>
<entry></entry>
<entry></entry>
<entry></entry>
<entry></entry>
<entry></entry>
<entry></entry>
<entry></entry>
<entry></entry>
<entry></entry>
<entry></entry>
<entry></entry>
<entry></entry>
<entry></entry>
</row>
<row id="V4L2-PIX-FMT-BGR24">
<entry><constant>V4L2_PIX_FMT_BGR24</constant></entry>
<entry>'BGR3'</entry>
Expand Down Expand Up @@ -404,6 +365,46 @@ for a pixel lie next to each other in memory.</para>
<entry>b<subscript>1</subscript></entry>
<entry>b<subscript>0</subscript></entry>
</row>
<row id="V4L2-PIX-FMT-BGR666">
<entry><constant>V4L2_PIX_FMT_BGR666</constant></entry>
<entry>'BGRH'</entry>
<entry></entry>
<entry>b<subscript>5</subscript></entry>
<entry>b<subscript>4</subscript></entry>
<entry>b<subscript>3</subscript></entry>
<entry>b<subscript>2</subscript></entry>
<entry>b<subscript>1</subscript></entry>
<entry>b<subscript>0</subscript></entry>
<entry>g<subscript>5</subscript></entry>
<entry>g<subscript>4</subscript></entry>
<entry></entry>
<entry>g<subscript>3</subscript></entry>
<entry>g<subscript>2</subscript></entry>
<entry>g<subscript>1</subscript></entry>
<entry>g<subscript>0</subscript></entry>
<entry>r<subscript>5</subscript></entry>
<entry>r<subscript>4</subscript></entry>
<entry>r<subscript>3</subscript></entry>
<entry>r<subscript>2</subscript></entry>
<entry></entry>
<entry>r<subscript>1</subscript></entry>
<entry>r<subscript>0</subscript></entry>
<entry>-</entry>
<entry>-</entry>
<entry>-</entry>
<entry>-</entry>
<entry>-</entry>
<entry>-</entry>
<entry></entry>
<entry>-</entry>
<entry>-</entry>
<entry>-</entry>
<entry>-</entry>
<entry>-</entry>
<entry>-</entry>
<entry>-</entry>
<entry>-</entry>
</row>
<row id="V4L2-PIX-FMT-ABGR32">
<entry><constant>V4L2_PIX_FMT_ABGR32</constant></entry>
<entry>'AR24'</entry>
Expand Down
16 changes: 8 additions & 8 deletions Documentation/DocBook/media/v4l/pixfmt-sgrbg8.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ columns and rows.</para>
</row>
<row>
<entry>start&nbsp;+&nbsp;4:</entry>
<entry>R<subscript>10</subscript></entry>
<entry>B<subscript>11</subscript></entry>
<entry>R<subscript>12</subscript></entry>
<entry>B<subscript>13</subscript></entry>
<entry>B<subscript>10</subscript></entry>
<entry>G<subscript>11</subscript></entry>
<entry>B<subscript>12</subscript></entry>
<entry>G<subscript>13</subscript></entry>
</row>
<row>
<entry>start&nbsp;+&nbsp;8:</entry>
Expand All @@ -52,10 +52,10 @@ columns and rows.</para>
</row>
<row>
<entry>start&nbsp;+&nbsp;12:</entry>
<entry>R<subscript>30</subscript></entry>
<entry>B<subscript>31</subscript></entry>
<entry>R<subscript>32</subscript></entry>
<entry>B<subscript>33</subscript></entry>
<entry>B<subscript>30</subscript></entry>
<entry>G<subscript>31</subscript></entry>
<entry>B<subscript>32</subscript></entry>
<entry>G<subscript>33</subscript></entry>
</row>
</tbody>
</tgroup>
Expand Down
2 changes: 1 addition & 1 deletion Documentation/DocBook/media/v4l/pixfmt-srggb10p.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<title>Byte Order.</title>
<para>Each cell is one byte.
<informaltable frame="topbot" colsep="1" rowsep="1">
<tgroup cols="5" align="center" border="1">
<tgroup cols="5" align="center">
<colspec align="left" colwidth="2*" />
<tbody valign="top">
<row>
Expand Down
4 changes: 2 additions & 2 deletions Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ and Cr planes have half as many pad bytes after their rows. In other
words, two Cx rows (including padding) is exactly as long as one Y row
(including padding).</para>

<para><constant>V4L2_PIX_FMT_NV12M</constant> is intended to be
<para><constant>V4L2_PIX_FMT_YUV420M</constant> is intended to be
used only in drivers and applications that support the multi-planar API,
described in <xref linkend="planar-apis"/>. </para>

<example>
<title><constant>V4L2_PIX_FMT_YVU420M</constant> 4 &times; 4
<title><constant>V4L2_PIX_FMT_YUV420M</constant> 4 &times; 4
pixel image</title>

<formalpara>
Expand Down
Loading