iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
Daniel Vetter d808097627 drm/i915: Fix up broken merge 
Maxime didn't really compile-test this :-/

We need to re-apply

commit e4fa8457b2197118538a1400b75c898f9faaf164
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Fri Jun 14 22:35:25 2019 +0200

    drm/prime: Align gem_prime_export with obj_funcs.export

plus make sure i915_gem_dma_buf.c doesn't get zombie-resurrect. It
moved in

commit 10be98a77c558f8cfb823cd2777171fbb35040f6
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Tue May 28 10:29:49 2019 +0100

    drm/i915: Move more GEM objects under gem/

v2: Remember the selftests (Chris).

Fixes: 03b0f2ce735e ("Merge v5.3-rc1 into drm-misc-next")
Cc: Maxime Ripard <maxime.ripard@bootlin.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190722213759.26612-1-daniel.vetter@ffwll.ch
2019-07-22 23:43:15 +02:00
..
accessibility
…
acpi
Merge branch 'akpm' (patches from Andrew)
2019-07-19 09:45:58 -07:00
amba
Driver Core and debugfs changes for 5.3-rc1
2019-07-12 12:24:03 -07:00
android
…
ata
for-5.3/libata-20190708
2019-07-09 10:59:26 -07:00
atm
atm: idt77252: Remove call to memset after dma_alloc_coherent
2019-07-15 11:06:27 -07:00
auxdisplay
It's been a relatively busy cycle for docs:
2019-07-09 12:34:26 -07:00
base
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
bcma
…
block
Lots of exciting things this time!
2019-07-18 11:05:25 -07:00
bluetooth
Bluetooth: btusb: Add protocol support for MediaTek MT7663U USB devices
2019-07-06 21:44:25 +02:00
bus
ARM: SoC-related driver updates
2019-07-19 17:13:56 -07:00
cdrom
…
char
docs: admin-guide: add a series of orphaned documents
2019-07-15 11:03:02 -03:00
clk
This round of clk driver and framework updates is heavy on the driver update
2019-07-17 10:07:48 -07:00
clocksource
clocksource/drivers/npcm: Fix misuse of GENMASK macro
2019-07-10 11:05:26 +02:00
connector
…
counter
Staging / IIO driver update for 5.3-rc1
2019-07-11 15:36:02 -07:00
cpufreq
Merge branch 'pm-cpufreq'
2019-07-18 09:49:30 +02:00
cpuidle
Merge branch 'pm-cpufreq'
2019-07-18 09:49:30 +02:00
crypto
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2019-07-19 12:23:37 -07:00
dax
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
dca
…
devfreq
…
dio
…
dma
dmaengine updates for v5.3-rc1
2019-07-17 09:55:43 -07:00
dma-buf
Linus 5.3-rc1
2019-07-22 21:24:10 +02:00
edac
…
eisa
…
extcon
…
firewire
…
firmware
ARM: SoC-related driver updates
2019-07-19 17:13:56 -07:00
fpga
mm: add account_locked_vm utility function
2019-07-16 19:23:25 -07:00
fsi
…
gnss
…
gpio
GPIO fixes for the v5.3 merge window:
2019-07-17 13:05:21 -07:00
gpu
drm/i915: Fix up broken merge
2019-07-22 23:43:15 +02:00
hid
Linux 5.2
2019-07-15 09:42:32 -07:00
hsi
…
hv
proc/sysctl: add shared variables for range check
2019-07-18 17:08:07 -07:00
hwmon
ARM: SoC-related driver updates
2019-07-19 17:13:56 -07:00
hwspinlock
…
hwtracing
coresight: Make the coresight_device_fwnode_match declaration's fwnode parameter const
2019-07-12 14:42:05 -07:00
i2c
Merge branch 'i2c/for-5.3' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
2019-07-15 21:10:39 -07:00
i3c
* Drop support for 10-bit I2C addresses
2019-07-09 09:04:31 -07:00
ide
It's been a relatively busy cycle for docs:
2019-07-09 12:34:26 -07:00
idle
…
iio
Driver Core and debugfs changes for 5.3-rc1
2019-07-12 12:24:03 -07:00
infiniband
SCSI fixes on 20190720
2019-07-20 10:04:58 -07:00
input
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2019-07-20 12:22:30 -07:00
interconnect
…
iommu
iommu/amd: fix a crash in iova_magazine_free_pfns
2019-07-21 09:57:13 -07:00
ipack
TTY / Serial driver updates for 5.3-rc1
2019-07-11 15:38:21 -07:00
irqchip
irqchip/gic-v3-its: Fix misuse of GENMASK macro
2019-07-10 11:04:17 +02:00
isdn
ISDN: hfcsusb: checking idx of ep configuration
2019-07-15 11:10:31 -07:00
leds
LED updates for 5.3-rc1
2019-07-09 08:59:39 -07:00
lightnvm
…
macintosh
powerpc updates for 5.3
2019-07-13 16:08:36 -07:00
mailbox
- stm32: race fix by adding a spinlock
2019-07-14 16:36:51 -07:00
mcb
…
md
- Fix zone state management race in DM zoned target by eliminating
2019-07-18 14:49:33 -07:00
media
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2019-07-11 10:55:49 -07:00
memory
Kbuild updates for v5.3 (2nd)
2019-07-20 09:34:55 -07:00
memstick
MMC core:
2019-07-11 18:11:21 -07:00
message
SCSI misc on 20190709
2019-07-11 15:14:01 -07:00
mfd
- Core Frameworks
2019-07-15 20:18:40 -07:00
misc
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
mmc
MMC core:
2019-07-11 18:11:21 -07:00
mtd
docs: mtd: move it to the driver-api book
2019-07-15 09:20:28 -03:00
mux
…
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2019-07-19 10:06:06 -07:00
nfc
nfc: st-nci: remove redundant assignment to variable r
2019-07-02 12:00:50 -07:00
ntb
New feature to add support for NTB virtual MSI interrupts, the ability
2019-07-21 09:46:59 -07:00
nubus
…
nvdimm
Merge branch 'akpm' (patches from Andrew)
2019-07-19 09:45:58 -07:00
nvme
for-linus-20190715
2019-07-15 21:20:52 -07:00
nvmem
Driver Core and debugfs changes for 5.3-rc1
2019-07-12 12:24:03 -07:00
of
virtio, vhost: fixes, features, performance
2019-07-17 11:26:09 -07:00
opp
pci-v5.3-changes
2019-07-15 20:44:49 -07:00
oprofile
vfs: Convert oprofilefs to use the new mount API
2019-07-04 22:01:59 -04:00
parisc
…
parport
It's been a relatively busy cycle for docs:
2019-07-09 12:34:26 -07:00
pci
New feature to add support for NTB virtual MSI interrupts, the ability
2019-07-21 09:46:59 -07:00
pcmcia
It's been a relatively busy cycle for docs:
2019-07-09 12:34:26 -07:00
perf
docs: perf: move to the admin-guide
2019-07-15 09:20:27 -03:00
phy
…
pinctrl
This is the bulk of pin control changes for the v5.3 kernel
2019-07-13 15:02:27 -07:00
platform
platform/x86: asus: Rename "fan mode" to "fan boost mode"
2019-07-17 19:07:58 +03:00
pnp
docs: driver-api: add a series of orphaned documents
2019-07-15 11:03:02 -03:00
power
power supply and reset changes for the v5.3 series
2019-07-15 21:06:15 -07:00
powercap
powercap/rapl: Add Ice Lake NNPI support to RAPL driver
2019-07-11 15:08:58 +02:00
pps
drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl
2019-07-16 19:23:24 -07:00
ps3
…
ptp
…
pwm
pwm: Changes for v5.3-rc1
2019-07-09 08:57:45 -07:00
rapidio
Merge branch 'akpm' (patches from Andrew)
2019-07-17 08:58:04 -07:00
ras
…
regulator
- Core Frameworks
2019-07-15 20:18:40 -07:00
remoteproc
remoteproc updates for v5.3
2019-07-17 11:44:41 -07:00
reset
ARM: SoC-related driver updates
2019-07-19 17:13:56 -07:00
rpmsg
…
rtc
RTC for 5.3
2019-07-17 10:03:50 -07:00
s390
SCSI fixes on 20190720
2019-07-20 10:04:58 -07:00
sbus
…
scsi
SCSI fixes on 20190720
2019-07-20 10:04:58 -07:00
sfi
…
sh
…
siox
…
slimbus
…
sn
…
soc
ARM: Device-tree updates
2019-07-19 17:19:24 -07:00
soundwire
soundwire updates for v5.3-rc1
2019-07-05 08:15:08 +02:00
spi
Driver Core and debugfs changes for 5.3-rc1
2019-07-12 12:24:03 -07:00
spmi
…
ssb
…
staging
docs conversion for v5.3-rc1
2019-07-16 12:21:41 -07:00
target
SCSI misc on 20190709
2019-07-11 15:14:01 -07:00
tc
…
tee
…
thermal
More power management updates for 5.3-rc1
2019-07-18 09:32:28 -07:00
thunderbolt
Driver Core and debugfs changes for 5.3-rc1
2019-07-12 12:24:03 -07:00
tty
ARM: SoC platform updates
2019-07-19 17:05:08 -07:00
uio
…
usb
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
uwb
…
vfio
VFIO updates for v5.3-rc1
2019-07-17 11:23:13 -07:00
vhost
virtio, vhost: fixes, features, performance
2019-07-17 11:26:09 -07:00
video
- New Functionality
2019-07-16 09:25:04 -07:00
virt
…
virtio
Merge branch 'work.mount0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2019-07-19 10:42:02 -07:00
visorbus
…
vlynq
…
vme
…
w1
docs: driver-api: add a series of orphaned documents
2019-07-15 11:03:02 -03:00
watchdog
watchdog: digicolor_wdt: Remove unused variable in dc_wdt_probe
2019-07-15 08:49:11 +02:00
xen
xen: fixes and features for 5.3-rc1
2019-07-19 11:41:26 -07:00
zorro
…
Kconfig
…
Makefile
…