Mauro Carvalho Chehab
64131a87f2
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
...
* 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits)
media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format
hexdump: avoid warning in test function
fs: take i_mutex during prepare_binprm for set[ug]id executables
smp: Fix error case handling in smp_call_function_*()
iommu-common: Fix PARISC compile-time warnings
sparc: Make LDC use common iommu poll management functions
sparc: Make sparc64 use scalable lib/iommu-common.c functions
Break up monolithic iommu table/lock into finer graularity pools and lock
sparc: Revert generic IOMMU allocator.
tools/power turbostat: correct dumped pkg-cstate-limit value
tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
tools/power turbostat: Initial Skylake support
tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
tools/power turbostat: modprobe msr, if needed
tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
Bluetooth: hidp: Fix regression with older userspace and flags validation
config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()
...
That solves several merge conflicts:
Documentation/DocBook/media/v4l/subdev-formats.xml
Documentation/devicetree/bindings/vendor-prefixes.txt
drivers/staging/media/mn88473/mn88473.c
include/linux/kconfig.h
include/uapi/linux/media-bus-format.h
The ones at subdev-formats.xml and media-bus-format.h are not trivial.
That's why we opted to merge from DRM.
2015-04-21 09:44:55 -03:00
..
accessibility
acpi
ACPICA updates for v4.1-rc1
2015-04-17 15:01:29 -04:00
amba
android
ata
powerpc updates for 4.1
2015-04-16 13:53:32 -05:00
atm
auxdisplay
base
power: wakeup: remove use of seq_printf return value
2015-04-15 16:35:24 -07:00
bcma
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-04-17 15:50:54 -04:00
block
Merge branch 'x86-pmem-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-04-18 11:42:49 -04:00
bluetooth
Bluetooth: btusb: Use proper data structures for Intel vendor events
2015-04-09 10:42:18 +03:00
bus
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-04-17 15:50:54 -04:00
cdrom
char
xen: features and fixes for 4.1-rc0
2015-04-16 14:01:03 -05:00
clk
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-04-17 15:50:54 -04:00
clocksource
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-04-17 15:50:54 -04:00
connector
coresight
cpufreq
intel_pstate: Knights Landing support
2015-04-11 02:13:29 +02:00
cpuidle
cpuidle: menu: use DIV_ROUND_CLOSEST_ULL()
2015-04-17 09:03:55 -04:00
crypto
crypto: sahara - fix AES descriptor create
2015-04-08 22:20:06 +08:00
dca
devfreq
dio
dma
sound updates for 4.1-rc1
2015-04-15 15:41:41 -07:00
dma-buf
edac
eisa
extcon
firewire
firmware
Merge branch 'core-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-04-13 10:22:30 -07:00
fmc
gpio
This is the bulk of GPIO changes for the v4.1 development
2015-04-18 08:22:10 -04:00
gpu
Merge Linus master into drm-next
2015-04-20 13:05:20 +10:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2015-04-14 18:25:15 -07:00
hsi
hv
hwmon
hwmon: (w83795) use find_closest_descending() in pwm_freq_to_reg()
2015-04-17 09:03:55 -04:00
hwspinlock
i2c
i2c: core: Export bus recovery functions
2015-04-15 21:02:07 +02:00
ide
ide: remove deprecated use of pci api
2015-04-17 15:32:07 -04:00
idle
Power management and ACPI updates for v4.1-rc1
2015-04-14 20:21:54 -07:00
iio
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2015-04-14 09:50:27 -07:00
infiniband
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-17 16:31:08 -04:00
input
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
2015-04-21 09:44:55 -03:00
iommu
Power management and ACPI updates for v4.1-rc1
2015-04-14 20:21:54 -07:00
ipack
irqchip
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-04-17 15:50:54 -04:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2015-04-15 09:00:47 -07:00
leds
This is the bulk of GPIO changes for the v4.1 development
2015-04-18 08:22:10 -04:00
lguest
macintosh
mailbox
mcb
md
- Most extensive changes this cycle are the DM core improvements to add
2015-04-18 08:14:18 -04:00
media
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
2015-04-21 09:44:55 -03:00
memory
memstick
memstick: mspro_block: add missing curly braces
2015-04-17 09:04:09 -04:00
message
mfd
== Changes to existing drivers ==
2015-04-14 17:29:55 -07:00
misc
Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-04-14 15:31:03 -07:00
mmc
SCSI misc on 20150416
2015-04-16 19:02:04 -04:00
mtd
This pull request includes the following UBI/UBIFS changes:
2015-04-15 13:43:40 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-04-17 16:31:08 -04:00
nfc
ntb
nubus
of
Devicetree changes for v4.1
2015-04-18 08:30:10 -04:00
oprofile
oprofile: reduce mmap_sem hold for mm->exe_file
2015-04-17 09:04:11 -04:00
parisc
parisc: remove use of seq_printf return value
2015-04-15 16:35:25 -07:00
parport
pci
xen: features and fixes for 4.1-rc0
2015-04-16 14:01:03 -05:00
pcmcia
phy
USB patches for 4.1-rc1
2015-04-13 17:07:21 -07:00
pinctrl
This is the bulk of pin control changes for the v4.1 development
2015-04-14 17:58:15 -07:00
platform
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-04-17 15:50:54 -04:00
pnp
Power management and ACPI updates for v4.1-rc1
2015-04-14 20:21:54 -07:00
power
powercap
powercap / RAPL: mark rapl_ids array as __initconst
2015-04-11 02:21:15 +02:00
pps
ps3
ptp
pwm
rapidio
ras
regulator
== Changes to existing drivers ==
2015-04-14 17:29:55 -07:00
remoteproc
reset
rpmsg
rtc
drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic
2015-04-17 09:04:12 -04:00
s390
s390: remove use of seq_printf return value
2015-04-15 16:35:25 -07:00
sbus
drivers/sbus/char/envctrl.c: ignore orderly_poweroff return value
2015-04-15 16:35:23 -07:00
scsi
Merge branch 'akpm' (patches from Andrew)
2015-04-17 09:04:38 -04:00
sfi
sh
sn
soc
spi
Merge remote-tracking branches 'spi/topic/spidev' and 'spi/topic/spidev-test' into spi-next
2015-04-11 23:09:31 +01:00
spmi
ssb
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-04-17 15:50:54 -04:00
staging
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
2015-04-21 09:44:55 -03:00
target
iscsi target: fix oops when adding reject pdu
2015-04-10 12:33:55 -07:00
tc
thermal
drivers: thermal: st: remove several sparse warnings
2015-04-07 13:43:28 -07:00
thunderbolt
tty
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-04-17 15:50:54 -04:00
uio
usb
Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
2015-04-21 09:44:55 -03:00
uwb
vfio
vfio-pci: Fix use after free
2015-04-08 08:11:51 -06:00
vhost
new helper: msg_data_left()
2015-04-11 15:53:35 -04:00
video
Devicetree changes for v4.1
2015-04-18 08:30:10 -04:00
virt
virtio
vlynq
vme
w1
watchdog
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2015-04-14 20:51:44 -07:00
xen
xen: features and fixes for 4.1-rc0
2015-04-16 14:01:03 -05:00
zorro
Kconfig
Makefile