Merge changes from linux-2.6 by hand (98599013) · Commits · e / devices / android_kernel_fairphone_FP3

.gitignore

0 → 100644

+30 −0

Original line number	Diff line number	Diff line
		#
		# NOTE! Don't add files that are generated in specific
		# subdirectories here. Add them in the ".gitignore" file
		# in that subdirectory instead.
		#
		# Normal rules
		#
		.*
		*.o
		*.a
		*.s
		*.ko
		*.mod.c

		#
		# Top-level generic files
		#
		vmlinux*
		System.map
		Module.symvers

		#
		# Generated include files
		#
		include/asm
		include/config
		include/linux/autoconf.h
		include/linux/compile.h
		include/linux/version.h

Documentation/connector/connector.txt

+44 −0

Original line number	Diff line number	Diff line
		@@ -131,3 +131,47 @@ Netlink itself is not reliable protocol, that means that messages can
		be lost due to memory pressure or process' receiving queue overflowed,
		so caller is warned must be prepared. That is why struct cn_msg [main
		connector's message header] contains u32 seq and u32 ack fields.

		/*****************************************/
		Userspace usage.
		/*****************************************/
		2.6.14 has a new netlink socket implementation, which by default does not
		allow to send data to netlink groups other than 1.
		So, if to use netlink socket (for example using connector)
		with different group number userspace application must subscribe to
		that group. It can be achieved by following pseudocode:

		s = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_CONNECTOR);

		l_local.nl_family = AF_NETLINK;
		l_local.nl_groups = 12345;
		l_local.nl_pid = 0;

		if (bind(s, (struct sockaddr *)&l_local, sizeof(struct sockaddr_nl)) == -1) {
		perror("bind");
		close(s);
		return -1;
		}

		{
		int on = l_local.nl_groups;
		setsockopt(s, 270, 1, &on, sizeof(on));
		}

		Where 270 above is SOL_NETLINK, and 1 is a NETLINK_ADD_MEMBERSHIP socket
		option. To drop multicast subscription one should call above socket option
		with NETLINK_DROP_MEMBERSHIP parameter which is defined as 0.

		2.6.14 netlink code only allows to select a group which is less or equal to
		the maximum group number, which is used at netlink_kernel_create() time.
		In case of connector it is CN_NETLINK_USERS + 0xf, so if you want to use
		group number 12345, you must increment CN_NETLINK_USERS to that number.
		Additional 0xf numbers are allocated to be used by non-in-kernel users.

		Due to this limitation, group 0xffffffff does not work now, so one can
		not use add/remove connector's group notifications, but as far as I know,
		only cn_test.c test module used it.

		Some work in netlink area is still being done, so things can be changed in
		2.6.15 timeframe, if it will happen, documentation will be updated for that
		kernel.

MAINTAINERS

+7 −0

Original line number	Diff line number	Diff line
		@@ -1618,6 +1618,13 @@ M: vandrove@vc.cvut.cz
		L: linux-fbdev-devel@lists.sourceforge.net
		S: Maintained

		MEGARAID SCSI DRIVERS
		P: Neela Syam Kolli
		M: Neela.Kolli@engenio.com
		S: linux-scsi@vger.kernel.org
		W: http://megaraid.lsilogic.com
		S: Maintained

		MEMORY TECHNOLOGY DEVICES
		P: David Woodhouse
		M: dwmw2@infradead.org

Makefile

+5 −3

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 14
		EXTRAVERSION =-rc4
		EXTRAVERSION =-rc5
		NAME=Affluent Albatross

		# DOCUMENTATION
		@@ -372,7 +372,7 @@ export MODVERDIR := $(if $(KBUILD_EXTMOD),$(firstword $(KBUILD_EXTMOD))/).tmp_ve
		# Files to ignore in find ... statements

		RCS_FIND_IGNORE := $ -name SCCS -o -name BitKeeper -o -name .svn -o -name CVS -o -name .pc -o -name .hg $ -prune -o
		RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg
		export RCS_TAR_IGNORE := --exclude SCCS --exclude BitKeeper --exclude .svn --exclude CVS --exclude .pc --exclude .hg

		# ===========================================================================
		# Rules shared between *config targets and build targets
		@@ -660,8 +660,10 @@ quiet_cmd_sysmap = SYSMAP
		# Link of vmlinux
		# If CONFIG_KALLSYMS is set .version is already updated
		# Generate System.map and verify that the content is consistent

		# Use + in front of the vmlinux_version rule to silent warning with make -j2
		# First command is ':' to allow us to use + in front of the rule
		define rule_vmlinux__
		:
		$(if $(CONFIG_KALLSYMS),,+$(call cmd,vmlinux_version))

		$(call cmd,vmlinux__)

arch/arm/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ tune-$(CONFIG_CPU_ARM926T) :=-mtune=arm9tdmi
		tune-$(CONFIG_CPU_SA110) :=-mtune=strongarm110
		tune-$(CONFIG_CPU_SA1100) :=-mtune=strongarm1100
		tune-$(CONFIG_CPU_XSCALE) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -Wa,-mcpu=xscale
		tune-$(CONFIG_CPU_V6) :=-mtune=strongarm
		tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)

		# Need -Uarm for gcc < 3.x
		CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)