mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-06-23 11:05:53 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
f5f3b16aae4ace99c330e54afe87f32aad3932dc
linux/drivers
History
Christian König f5f3b16aae drm/amdgpu: fix merge of vcn_v1_0.c v2 
That line got missed during the merge.

v2: fix vcn_v1_0_enc_ring_emit_vm_flush as well

Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
2017-05-24 18:21:29 -04:00
..
accessibility
…
acpi
Merge tag 'acpi-extra-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2017-05-10 09:35:42 -07:00
amba
…
android
…
ata
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2017-05-09 10:01:15 -07:00
atm
…
auxdisplay
…
base
Merge tag 'pm-extra-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
2017-05-10 09:12:30 -07:00
bcma
…
block
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2017-05-10 11:33:08 -07:00
bluetooth
Bluetooth: hci_ldisc: Add protocol check to hci_uart_tx_wakeup()
2017-04-30 12:22:14 +02:00
bus
…
cdrom
scsi: introduce a result field in struct scsi_request
2017-04-20 12:16:10 -06:00
char
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
clk
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
2017-05-10 13:38:18 -07:00
clocksource
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-05-12 10:43:25 -07:00
connector
…
cpufreq
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2017-05-12 09:56:30 -07:00
cpuidle
Merge branches 'pm-domains', 'pm-cpuidle', 'pm-sleep' and 'powercap'
2017-05-09 23:21:46 +02:00
crypto
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2017-05-10 11:33:08 -07:00
dax
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2017-05-12 15:43:10 -07:00
dca
…
devfreq
…
dio
…
dma
Merge tag 'dmaengine-4.12-rc1' of git://git.infradead.org/users/vkoul/slave-dma
2017-05-09 15:40:28 -07:00
dma-buf
dma-buf: Use seq_putc() in two functions
2017-05-08 20:50:21 +05:30
edac
EDAC, ghes: Do not enable it by default
2017-04-27 14:15:38 +02:00
eisa
…
extcon
…
firewire
…
firmware
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2017-05-09 10:01:15 -07:00
fmc
…
fpga
fpga fr br: update supported version numbers
2017-04-26 11:38:56 +02:00
fsi
…
gpio
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
gpu
drm/amdgpu: fix merge of vcn_v1_0.c v2
2017-05-24 18:21:29 -04:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2017-05-02 19:09:35 -07:00
hsi
HSI: ssi_protocol: double free in ssip_pn_xmit()
2017-04-21 17:58:45 +02:00
hv
Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2017-05-04 19:15:35 -07:00
hwmon
hwmon: (twl4030-madc) drop driver
2017-04-30 11:45:31 -07:00
hwspinlock
…
hwtracing
drivers/hwtracing/intel_th/msu.c: use set_memory.h header
2017-05-08 17:15:14 -07:00
i2c
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
ide
ide: don't call memcpy with the same source and destination
2017-05-08 17:36:39 -04:00
idle
x86/intel_idle: add Gemini Lake support
2017-05-01 23:17:37 +02:00
iio
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
infiniband
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2017-05-12 11:44:13 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2017-05-13 10:25:05 -07:00
iommu
Merge tag 'iommu-updates-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
2017-05-09 15:15:47 -07:00
ipack
…
irqchip
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2017-05-12 09:56:30 -07:00
isdn
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
leds
scripts/spelling.txt: add "memory" pattern and fix typos
2017-05-08 17:15:13 -07:00
lguest
…
lightnvm
lightnvm: fix bad back free on error path
2017-05-04 07:53:04 -06:00
macintosh
Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
2017-05-05 19:33:07 -07:00
mailbox
mailbox: handle empty message in tx_tick
2017-04-27 16:20:04 +05:30
mcb
…
md
mm, vmalloc: use __GFP_HIGHMEM implicitly
2017-05-08 17:15:13 -07:00
media
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
memory
Merge tag 'for-linus-20170510' of git://git.infradead.org/linux-mtd
2017-05-11 10:44:22 -07:00
memstick
…
message
scsi: mpt: Move scsi_remove_host() out of mptscsih_remove_host()
2017-04-24 18:21:17 -04:00
mfd
mfd: axp20x: Support AXP803 variant
2017-04-27 11:54:49 +01:00
misc
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
mmc
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
mtd
Merge tag 'upstream-4.12-rc1' of git://git.infradead.org/linux-ubifs
2017-05-13 10:23:12 -07:00
net
Merge tag 'powerpc-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
2017-05-12 10:04:09 -07:00
nfc
nfc: fix get_unaligned_...() misuses
2017-04-17 00:42:22 +02:00
ntb
…
nubus
nubus: Clean up whitespace
2017-04-20 09:54:24 +02:00
nvdimm
Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm
2017-05-12 15:43:10 -07:00
nvme
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
2017-05-11 11:01:56 -07:00
nvmem
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2017-05-09 10:01:15 -07:00
of
Merge tag 'powerpc-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
2017-05-12 10:04:09 -07:00
oprofile
…
parisc
…
parport
Annotate hardware config module parameters in drivers/parport/
2017-04-20 12:02:32 +01:00
pci
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
pcmcia
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
perf
…
phy
…
pinctrl
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2017-05-02 19:09:35 -07:00
platform
Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2017-05-04 19:15:35 -07:00
pnp
…
power
Merge tag 'for-v4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply
2017-05-12 12:02:21 -07:00
powercap
powercap: intel_rapl: Add support for Gemini Lake
2017-04-28 23:56:16 +02:00
pps
…
ps3
…
ptp
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2017-05-01 16:15:18 -07:00
pwm
…
rapidio
Merge tag 'char-misc-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
2017-05-04 19:15:35 -07:00
ras
…
regulator
Merge remote-tracking branch 'regulator/topic/vctrl' into regulator-next
2017-04-30 22:17:44 +09:00
remoteproc
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2017-05-10 11:33:08 -07:00
reset
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2017-05-09 10:01:15 -07:00
rpmsg
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2017-05-10 11:33:08 -07:00
rtc
Merge tag 'rtc-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
2017-05-10 19:37:14 -07:00
s390
Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
2017-05-10 11:33:08 -07:00
sbus
…
scsi
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2017-05-12 11:44:13 -07:00
sfi
…
sh
…
sn
…
soc
Merge tag 'powerpc-4.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
2017-05-12 10:04:09 -07:00
spi
Merge remote-tracking branches 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next
2017-04-26 15:58:22 +01:00
spmi
…
ssb
…
staging
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
target
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2017-05-12 11:44:13 -07:00
tc
…
tee
Merge tag 'armsoc-tee' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2017-05-10 11:20:09 -07:00
thermal
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2017-05-12 11:58:45 -07:00
thunderbolt
…
tty
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
uio
…
usb
Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
2017-05-05 19:33:07 -07:00
uwb
…
vfio
Merge tag 'powerpc-4.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
2017-05-05 11:36:44 -07:00
vhost
mm: support __GFP_REPEAT in kvmalloc_node for >32kB
2017-05-08 17:15:12 -07:00
video
Merge tag 'fbdev-v4.12' of git://github.com/bzolnier/linux
2017-05-11 11:12:26 -07:00
virt
drivers/virt/fsl_hypervisor.c: use get_user_pages_unlocked()
2017-05-08 17:15:10 -07:00
virtio
virtio: allow extra context per descriptor
2017-05-02 23:41:43 +03:00
vlynq
…
vme
…
w1
…
watchdog
Merge tag 'hwparam-20170420' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs
2017-05-10 19:13:03 -07:00
xen
Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2017-05-09 09:12:53 -07:00
zorro
…
Kconfig
…
Makefile
Merge tag 'armsoc-tee' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
2017-05-10 11:20:09 -07:00