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

Commit d9530075 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

Merge branch 'master'

parents e12669e7 82984114

Documentation/SubmittingPatches

+20 −4
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ point out some special detail about the sign-off. 


The canonical patch subject line is:



    Subject: [PATCH 001/123] [<area>:] <explanation>

    Subject: [PATCH 001/123] subsystem: summary phrase



The canonical patch message body contains the following:
@@ -330,9 +330,25 @@ alphabetically by subject line - pretty much any email reader will 
support that - since because the sequence number is zero-padded,

the numerical and alphabetic sort is the same.



See further details on how to phrase the "<explanation>" in the

"Subject:" line in Andrew Morton's "The perfect patch", referenced

below.

The "subsystem" in the email's Subject should identify which

area or subsystem of the kernel is being patched.



The "summary phrase" in the email's Subject should concisely

describe the patch which that email contains.  The "summary

phrase" should not be a filename.  Do not use the same "summary

phrase" for every patch in a whole patch series.



Bear in mind that the "summary phrase" of your email becomes

a globally-unique identifier for that patch.  It propagates

all the way into the git changelog.  The "summary phrase" may

later be used in developer discussions which refer to the patch.

People will want to google for the "summary phrase" to read

discussion regarding that patch.



A couple of example Subjects:



    Subject: [patch 2/5] ext2: improve scalability of bitmap searching

    Subject: [PATCHv2 001/207] x86: fix eflags tracking



The "from" line must be the very first line in the message body,

and has the form:

Documentation/networking/ip-sysctl.txt

+7 −3
Original line number Diff line number Diff line
@@ -355,10 +355,14 @@ ip_dynaddr - BOOLEAN 
	Default: 0



icmp_echo_ignore_all - BOOLEAN

	If set non-zero, then the kernel will ignore all ICMP ECHO

	requests sent to it.

	Default: 0



icmp_echo_ignore_broadcasts - BOOLEAN

	If either is set to true, then the kernel will ignore either all

	ICMP ECHO requests sent to it or just those to broadcast/multicast

	addresses, respectively.

	If set non-zero, then the kernel will ignore all ICMP ECHO and

	TIMESTAMP requests sent to it via broadcast/multicast.

	Default: 1



icmp_ratelimit - INTEGER

	Limit the maximal rates for sending ICMP packets whose type matches

arch/arm/kernel/sys_arm.c

+1 −1
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ long execve(const char *filename, char **argv, char **envp) 
		  "Ir" (THREAD_START_SP - sizeof(regs)),

		  "r" (&regs),

		  "Ir" (sizeof(regs))

		: "r0", "r1", "r2", "r3", "ip", "memory");

		: "r0", "r1", "r2", "r3", "ip", "lr", "memory");



 out:

	return ret;

arch/arm/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) 


		bad_access:

		spin_unlock(&mm->page_table_lock);

		/* simulate a read access fault */

		/* simulate a write access fault */

		do_DataAbort(addr, 15 + (1 << 11), regs);

		return -1;

	}

arch/arm/mach-imx/generic.c

+12 −11
Original line number Diff line number Diff line
@@ -28,14 +28,15 @@ 
#include <linux/module.h>

#include <asm/arch/imxfb.h>

#include <asm/hardware.h>

#include <asm/arch/imx-regs.h>



#include <asm/mach/map.h>



void imx_gpio_mode(int gpio_mode)

{

	unsigned int pin = gpio_mode & GPIO_PIN_MASK;

	unsigned int port = (gpio_mode & GPIO_PORT_MASK) >> 5;

	unsigned int ocr = (gpio_mode & GPIO_OCR_MASK) >> 10;

	unsigned int port = (gpio_mode & GPIO_PORT_MASK) >> GPIO_PORT_SHIFT;

	unsigned int ocr = (gpio_mode & GPIO_OCR_MASK) >> GPIO_OCR_SHIFT;

	unsigned int tmp;



	/* Pullup enable */
@@ -57,7 +58,7 @@ void imx_gpio_mode(int gpio_mode) 
		GPR(port) &= ~(1<<pin);



	/* use as gpio? */

	if( ocr == 3 )

	if(gpio_mode &  GPIO_GIUS)

		GIUS(port) |= (1<<pin);

	else

		GIUS(port) &= ~(1<<pin);
@@ -72,20 +73,20 @@ void imx_gpio_mode(int gpio_mode) 
		tmp |= (ocr << (pin*2));

		OCR1(port) = tmp;



		if( gpio_mode &	GPIO_AOUT )

		ICONFA1(port) &= ~( 3<<(pin*2));

		if( gpio_mode &	GPIO_BOUT )

		ICONFA1(port) |= ((gpio_mode >> GPIO_AOUT_SHIFT) & 3) << (pin * 2);

		ICONFB1(port) &= ~( 3<<(pin*2));

		ICONFB1(port) |= ((gpio_mode >> GPIO_BOUT_SHIFT) & 3) << (pin * 2);

	} else {

		tmp = OCR2(port);

		tmp &= ~( 3<<((pin-16)*2));

		tmp |= (ocr << ((pin-16)*2));

		OCR2(port) = tmp;



		if( gpio_mode &	GPIO_AOUT )

		ICONFA2(port) &= ~( 3<<((pin-16)*2));

		if( gpio_mode &	GPIO_BOUT )

		ICONFA2(port) |= ((gpio_mode >> GPIO_AOUT_SHIFT) & 3) << ((pin-16) * 2);

		ICONFB2(port) &= ~( 3<<((pin-16)*2));

		ICONFB2(port) |= ((gpio_mode >> GPIO_BOUT_SHIFT) & 3) << ((pin-16) * 2);

	}

}