Daniel Vetter dc257cf154 Linux 3.4-rc6 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJPpvY9AAoJEHm+PkMAQRiGpEoIAJgbu+Y8gITnBK/wh9O6zy3S 5jie5KK4YWdbJsvO58WbNr3CyVIwGIqQ2dUZLiU59aBVLarlGw8xor0MmW+cZwhp 6fBHaf0qDYAV0MZjD+mnnExOiCRyISa2lPmsfu9dAWywh5KGe6/oAP6/qcXIyok3 KZyl3qQf4ENpaZPHwZPXCEkUvtuyHgNiszN+QXEadA3s19Ot4VGe9A3VGw+GNrSm JqFIq3acQAbKa5BYaqf7TQC02v2FI7//eqt6QHxTqbE6a7LGbTvLfX3HlJ2mnfqa 1R6QHhM4y4OZDHbaMT2raHZ8WuLXzhehJzhP8Co7AHFOKwVKOb5XbcUr2RrukMU= =HkMd -----END PGP SIGNATURE----- Merge tag 'v3.4-rc6' into drm-intel-next Conflicts: drivers/gpu/drm/i915/intel_display.c Ok, this is a fun story of git totally messing things up. There /shouldn't/ be any conflict in here, because the fixes in -rc6 do only touch functions that have not been changed in -next. The offending commits in drm-next are 14415745b2..1fa611065 which simply move a few functions from intel_display.c to intel_pm.c. The problem seems to be that git diff gets completely confused: $ git diff 14415745b2..1fa611065 is a nice mess in intel_display.c, and the diff leaks into totally unrelated functions, whereas $git diff --minimal 14415745b2..1fa611065 is exactly what we want. Unfortunately there seems to be no way to teach similar smarts to the merge diff and conflict generation code, because with the minimal diff there really shouldn't be any conflicts. For added hilarity, every time something in that area changes the + and - lines in the diff move around like crazy, again resulting in new conflicts. So I fear this mess will stay with us for a little longer (and might result in another backmerge down the road). Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>		2012-05-07 14:02:14 +02:00
..
hotplug	PCI: make acpihp use __pci_remove_bus_device instead	2012-02-27 12:17:16 -08:00
pcie	ASPM: Fix pcie devices with non-pcie children	2012-03-31 12:49:56 -07:00
.gitignore
access.c
ats.c
bus.c	PCI: add struct pci_host_bridge_window with CPU/bus address offset	2012-02-23 20:19:00 -07:00
hotplug-pci.c
hotplug.c
htirq.c
ioapic.c
iov.c	PCI: Rename pci_remove_bus_device to pci_stop_and_remove_bus_device	2012-02-27 12:12:18 -08:00
irq.c
Kconfig	PCI: add a PCI resource reallocation config option	2012-02-24 09:38:59 -08:00
Makefile	pci: frv architecture needs generic setup-bus infrastructure	2012-04-26 14:46:17 -04:00
msi.c
msi.h
of.c
pci-acpi.c	ACPI: Fix D3hot v D3cold confusion	2012-05-05 01:19:52 -04:00
pci-driver.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-03-23 14:02:12 -07:00
pci-label.c
pci-stub.c
pci-sysfs.c	vgaarb: Add support for setting the default video device (v2)	2012-04-24 09:50:15 +01:00
pci.c	PCI: Retry BARs restoration for Type 0 headers only	2012-04-16 18:33:35 -07:00
pci.h	PCI: Move "pci reassigndev resource alignment" out of quirks.c	2012-02-24 14:37:26 -08:00
probe.c	PCI: fix bridge I/O window bus-to-resource conversion	2012-03-20 10:41:27 -07:00
proc.c
quirks.c	Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci	2012-03-23 14:02:12 -07:00
remove.c	PCI: export __pci_remove_bus_device	2012-02-27 12:16:55 -08:00
rom.c
search.c
setup-bus.c	Merge branch 'pci-next+probe_only+bus2res-fb127cb' of git://github.com/bjorn-helgaas/linux into linux-next	2012-02-24 14:25:33 -08:00
setup-irq.c
setup-res.c	PCI: Move "pci reassigndev resource alignment" out of quirks.c	2012-02-24 14:37:26 -08:00
slot.c
syscall.c
vpd.c
xen-pcifront.c	Two fixes for regressions:	2012-04-06 17:54:53 -07:00