Merge tag 'v2.6.35-rc4' into drm-testing (6dbe7465) · Commits · e / devices / android_kernel_fairphone_FP4

MAINTAINERS

+8 −1

Original line number	Diff line number	Diff line
		@@ -2111,11 +2111,18 @@ F: drivers/edac/i5000_edac.c

		EDAC-I5400
		M: Mauro Carvalho Chehab <mchehab@redhat.com>
		L: bluesmoke-devel@lists.sourceforge.net (moderated for non-subscribers)
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Maintained
		F: drivers/edac/i5400_edac.c

		EDAC-I7CORE
		M: Mauro Carvalho Chehab <mchehab@redhat.com>
		L: linux-edac@vger.kernel.org
		W: bluesmoke.sourceforge.net
		S: Maintained
		F: drivers/edac/i7core_edac.c linux/edac_mce.h drivers/edac/edac_mce.c

		EDAC-I82975X
		M: Ranganathan Desikan <ravi@jetztechnologies.com>
		M: "Arvind R." <arvind@jetztechnologies.com>

Makefile

+2 −72

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 35
		EXTRAVERSION = -rc3
		EXTRAVERSION = -rc4
		NAME = Sheep on Meth

		# DOCUMENTATION
		@@ -883,80 +883,10 @@ PHONY += $(vmlinux-dirs)
		$(vmlinux-dirs): prepare scripts
		$(Q)$(MAKE) $(build)=$@

		# Build the kernel release string
		#
		# The KERNELRELEASE value built here is stored in the file
		# include/config/kernel.release, and is used when executing several
		# make targets, such as "make install" or "make modules_install."
		#
		# The eventual kernel release string consists of the following fields,
		# shown in a hierarchical format to show how smaller parts are concatenated
		# to form the larger and final value, with values coming from places like
		# the Makefile, kernel config options, make command line options and/or
		# SCM tag information.
		#
		# $(KERNELVERSION)
		# $(VERSION) eg, 2
		# $(PATCHLEVEL) eg, 6
		# $(SUBLEVEL) eg, 18
		# $(EXTRAVERSION) eg, -rc6
		# $(localver-full)
		# $(localver)
		# localversion* (files without backups, containing '~')
		# $(CONFIG_LOCALVERSION) (from kernel config setting)
		# $(LOCALVERSION) (from make command line, if provided)
		# $(localver-extra)
		# $(scm-identifier) (unique SCM tag, if one exists)
		# ./scripts/setlocalversion (only with CONFIG_LOCALVERSION_AUTO)
		# .scmversion (only with CONFIG_LOCALVERSION_AUTO)
		# + (only without CONFIG_LOCALVERSION_AUTO
		# and without LOCALVERSION= and
		# repository is at non-tagged commit)
		#
		# For kernels without CONFIG_LOCALVERSION_AUTO compiled from an SCM that has
		# been revised beyond a tagged commit, `+' is appended to the version string
		# when not overridden by using "make LOCALVERSION=". This indicates that the
		# kernel is not a vanilla release version and has been modified.

		pattern = "./localversion[^~]"
		string = $(shell cat /dev/null \
		`find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) \| sort -u`)

		localver = $(subst $(space),, $(string) \
		$(patsubst "%",%,$(CONFIG_LOCALVERSION)))

		# scripts/setlocalversion is called to create a unique identifier if the source
		# is managed by a known SCM and the repository has been revised since the last
		# tagged (release) commit. The format of the identifier is determined by the
		# SCM's implementation.
		#
		# .scmversion is used when generating rpm packages so we do not loose
		# the version information from the SCM when we do the build of the kernel
		# from the copied source
		ifeq ($(wildcard .scmversion),)
		scm-identifier = $(shell $(CONFIG_SHELL) \
		$(srctree)/scripts/setlocalversion $(srctree))
		else
		scm-identifier = $(shell cat .scmversion 2> /dev/null)
		endif

		ifdef CONFIG_LOCALVERSION_AUTO
		localver-extra = $(scm-identifier)
		else
		ifneq ($(scm-identifier),)
		ifeq ("$(origin LOCALVERSION)", "undefined")
		localver-extra = +
		endif
		endif
		endif

		localver-full = $(localver)$(LOCALVERSION)$(localver-extra)

		# Store (new) KERNELRELASE string in include/config/kernel.release
		kernelrelease = $(KERNELVERSION)$(localver-full)
		include/config/kernel.release: include/config/auto.conf FORCE
		$(Q)rm -f $@
		$(Q)echo $(kernelrelease) > $@
		$(Q)echo "$(KERNELVERSION)$$($(CONFIG_SHELL) scripts/setlocalversion $(srctree))" > $@


		# Things we need to do before we recursively start building the kernel

arch/arm/Kconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -955,7 +955,8 @@ config XSCALE_PMU
		default y

		config CPU_HAS_PMU
		depends on CPU_V6 \|\| CPU_V7 \|\| XSCALE_PMU
		depends on (CPU_V6 \|\| CPU_V7 \|\| XSCALE_PMU) && \
		(!ARCH_OMAP3 \|\| OMAP3_EMU)
		default y
		bool

arch/arm/include/asm/mach/udc_pxa2xx.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -21,8 +21,8 @@ struct pxa2xx_udc_mach_info {
		* here. Note that sometimes the signals go through inverters...
		*/
		bool gpio_vbus_inverted;
		u16 gpio_vbus; /* high == vbus present */
		int gpio_vbus; /* high == vbus present */
		bool gpio_pullup_inverted;
		u16 gpio_pullup; /* high == pullup activated */
		int gpio_pullup; /* high == pullup activated */
		};

arch/arm/include/asm/processor.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -91,7 +91,11 @@ extern void release_thread(struct task_struct *);

		unsigned long get_wchan(struct task_struct *p);

		#if __LINUX_ARM_ARCH__ == 6
		#define cpu_relax() smp_mb()
		#else
		#define cpu_relax() barrier()
		#endif

		/*
		* Create a new kernel thread