Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bcec5f0 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2013-10-21' of... 

Merge tag 'drm-intel-fixes-2013-10-21' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes

Just an lvds clock gating fix and a pte clearing hack for hsw to avoid
memory corruption when hibernating - something doesn't seem to switch off
properly, we're still investigating.

* tag 'drm-intel-fixes-2013-10-21' of git://people.freedesktop.org/~danvet/drm-intel: (96 commits)
  drm/i915: Disable GGTT PTEs on GEN6+ suspend
  drm/i915: Make PTE valid encoding optional
  drm/i915: disable LVDS clock gating on CPT v2
parents bc5bd37c 828c7908

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ ALC269/270/275/276/28x/29x 
  alc269-dmic		Enable ALC269(VA) digital mic workaround

  alc271-dmic		Enable ALC271X digital mic workaround

  inv-dmic		Inverted internal mic workaround

  headset-mic		Indicates a combined headset (headphone+mic) jack

  lenovo-dock   	Enables docking station I/O for some Lenovos

  dell-headset-multi	Headset jack, which can also be used as mic-in

  dell-headset-dock	Headset jack (without mic-in), and also dock I/O

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 12

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = One Giant Leap for Frogkind



# *DOCUMENTATION*

arch/arc/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int genregs_set(struct task_struct *target, 
	REG_IGNORE_ONE(pad2);

	REG_IN_CHUNK(callee, efa, cregs);	/* callee_regs[r25..r13] */

	REG_IGNORE_ONE(efa);			/* efa update invalid */

	REG_IN_ONE(stop_pc, &ptregs->ret);	/* stop_pc: PC update */

	REG_IGNORE_ONE(stop_pc);			/* PC updated via @ret */



	return ret;

}

arch/arm/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -296,10 +296,15 @@ archprepare: 
# Convert bzImage to zImage

bzImage: zImage



zImage Image xipImage bootpImage uImage: vmlinux

BOOT_TARGETS	= zImage Image xipImage bootpImage uImage

INSTALL_TARGETS	= zinstall uinstall install



PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)



$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@



zinstall uinstall install: vmlinux

$(INSTALL_TARGETS):

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@



%.dtb: | scripts

arch/arm/boot/Makefile

+8 −8
Original line number Diff line number Diff line
@@ -95,24 +95,24 @@ initrd: 
	@test "$(INITRD)" != "" || \

	(echo You must specify INITRD; exit -1)



install: $(obj)/Image

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

install:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/Image System.map "$(INSTALL_PATH)"



zinstall: $(obj)/zImage

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

zinstall:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/zImage System.map "$(INSTALL_PATH)"



uinstall: $(obj)/uImage

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

uinstall:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/uImage System.map "$(INSTALL_PATH)"



zi:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/zImage System.map "$(INSTALL_PATH)"



i:

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh $(KERNELRELEASE) \

	$(CONFIG_SHELL) $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" \

	$(obj)/Image System.map "$(INSTALL_PATH)"



subdir-	    := bootp compressed dts