Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6 (d250fe91) · Commits · e / devices / android_kernel_xiaomi_markw

Documentation/Changes

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ o oprofile 0.9 # oprofiled --version
		o udev 081 # udevinfo -V
		o grub 0.93 # grub --version
		o mcelog 0.6
		o iptables 1.4.1 # iptables -V
		o iptables 1.4.2 # iptables -V


		Kernel compilation

+8 −10

Original line number	Diff line number	Diff line
		@@ -241,16 +241,6 @@ Who: Thomas Gleixner <tglx@linutronix.de>

		---------------------------

		What (Why):
		- xt_recent: the old ipt_recent proc dir
		(superseded by /proc/net/xt_recent)

		When: January 2009 or Linux 2.7.0, whichever comes first
		Why: Superseded by newer revisions or modules
		Who: Jan Engelhardt <jengelh@computergmbh.de>

		---------------------------

		What: GPIO autorequest on gpio_direction_{input,output}() in gpiolib
		When: February 2010
		Why: All callers should use explicit gpio_request()/gpio_free().
		@@ -628,3 +618,11 @@ Why: Internal alias support has been present in module-init-tools for some
		with no impact.

		Who: Wey-Yi Guy <wey-yi.w.guy@intel.com>

		---------------------------

		What: xt_NOTRACK
		Files: net/netfilter/xt_NOTRACK.c
		When: April 2011
		Why: Superseded by xt_CT
		Who: Netfilter developer team <netfilter-devel@vger.kernel.org>

+1 −0

Original line number	Diff line number	Diff line
		@@ -254,6 +254,7 @@ struct inet6_skb_parm {

		#define IP6SKB_XFRM_TRANSFORMED 1
		#define IP6SKB_FORWARDED 2
		#define IP6SKB_REROUTED 4
		};

		#define IP6CB(skb) ((struct inet6_skb_parm*)((skb)->cb))

+4 −2

Original line number	Diff line number	Diff line
		@@ -4,6 +4,8 @@
		/*
		* 'kernel.h' contains some often-used function prototypes etc
		*/
		#define __ALIGN_KERNEL(x, a) __ALIGN_KERNEL_MASK(x, (typeof(x))(a) - 1)
		#define __ALIGN_KERNEL_MASK(x, mask) (((x) + (mask)) & ~(mask))

		#ifdef __KERNEL__

		@@ -37,8 +39,8 @@ extern const char linux_proc_banner[];

		#define STACK_MAGIC 0xdeadbeef

		#define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1)
		#define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask))
		#define ALIGN(x, a) __ALIGN_KERNEL((x), (a))
		#define __ALIGN_MASK(x, mask) __ALIGN_KERNEL_MASK((x), (mask))
		#define PTR_ALIGN(p, a) ((typeof(p))ALIGN((unsigned long)(p), (a)))
		#define IS_ALIGNED(x, a) (((x) & ((typeof(x))(a) - 1)) == 0)

+1 −0