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

Commit 3fcd7323 authored by Matt Wagantall's avatar Matt Wagantall
Browse files

Merge tag 'v3.18.10' into msm-3.18 



Linux 3.18.10

Resolve a trivial context conflict in xhci-plat.c as part
of the merge resolution.

Conflicts:
	drivers/usb/host/xhci-plat.c

Change-Id: Iff692eb9712e91db4697318640d208d2dade43ec
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parents a606b0f1 96e199f1

Documentation/stable_kernel_rules.txt

+34 −10
Original line number Diff line number Diff line
@@ -32,18 +32,42 @@ Procedure for submitting patches to the -stable tree: 
 - If the patch covers files in net/ or drivers/net please follow netdev stable

   submission guidelines as described in

   Documentation/networking/netdev-FAQ.txt

 - Send the patch, after verifying that it follows the above rules, to

   stable@vger.kernel.org.  You must note the upstream commit ID in the

   changelog of your submission, as well as the kernel version you wish

   it to be applied to.

 - To have the patch automatically included in the stable tree, add the tag

 - Security patches should not be handled (solely) by the -stable review

   process but should follow the procedures in Documentation/SecurityBugs.



For all other submissions, choose one of the following procedures:



   --- Option 1 ---



   To have the patch automatically included in the stable tree, add the tag

     Cc: stable@vger.kernel.org

   in the sign-off area. Once the patch is merged it will be applied to

   the stable tree without anything else needing to be done by the author

   or subsystem maintainer.

 - If the patch requires other patches as prerequisites which can be

   cherry-picked, then this can be specified in the following format in

   the sign-off area:



   --- Option 2 ---



   After the patch has been merged to Linus' tree, send an email to

   stable@vger.kernel.org containing the subject of the patch, the commit ID,

   why you think it should be applied, and what kernel version you wish it to

   be applied to.



   --- Option 3 ---



   Send the patch, after verifying that it follows the above rules, to

   stable@vger.kernel.org.  You must note the upstream commit ID in the

   changelog of your submission, as well as the kernel version you wish

   it to be applied to.



Option 1 is probably the easiest and most common. Options 2 and 3 are more

useful if the patch isn't deemed worthy at the time it is applied to a public

git tree (for instance, because it deserves more regression testing first).

Option 3 is especially useful if the patch needs some special handling to apply

to an older kernel (e.g., if API's have changed in the meantime).



Additionally, some patches submitted via Option 1 may have additional patch

prerequisites which can be cherry-picked. This can be specified in the following

format in the sign-off area:



     Cc: <stable@vger.kernel.org> # 3.3.x: a1f84a3: sched: Check for idle

     Cc: <stable@vger.kernel.org> # 3.3.x: 1b9508f: sched: Rate-limit newidle
@@ -57,13 +81,13 @@ Procedure for submitting patches to the -stable tree: 
     git cherry-pick fd21073

     git cherry-pick <this commit>



Following the submission:



 - The sender will receive an ACK when the patch has been accepted into the

   queue, or a NAK if the patch is rejected.  This response might take a few

   days, according to the developer's schedules.

 - If accepted, the patch will be added to the -stable queue, for review by

   other developers and by the relevant subsystem maintainer.

 - Security patches should not be sent to this alias, but instead to the

   documented security@kernel.org address.





Review cycle:

Makefile

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

PATCHLEVEL = 18

SUBLEVEL = 9

SUBLEVEL = 10

EXTRAVERSION =

NAME = Shuffling Zombie Juror

arch/arc/include/asm/processor.h

+5 −4
Original line number Diff line number Diff line
@@ -75,18 +75,19 @@ unsigned long thread_saved_pc(struct task_struct *t); 
#define release_segments(mm)        do { } while (0)



#define KSTK_EIP(tsk)   (task_pt_regs(tsk)->ret)

#define KSTK_ESP(tsk)   (task_pt_regs(tsk)->sp)



/*

 * Where abouts of Task's sp, fp, blink when it was last seen in kernel mode.

 * Look in process.c for details of kernel stack layout

 */

#define KSTK_ESP(tsk)   (tsk->thread.ksp)

#define TSK_K_ESP(tsk)		(tsk->thread.ksp)



#define KSTK_REG(tsk, off)	(*((unsigned int *)(KSTK_ESP(tsk) + \

#define TSK_K_REG(tsk, off)	(*((unsigned int *)(TSK_K_ESP(tsk) + \

					sizeof(struct callee_regs) + off)))



#define KSTK_BLINK(tsk) KSTK_REG(tsk, 4)

#define KSTK_FP(tsk)    KSTK_REG(tsk, 0)

#define TSK_K_BLINK(tsk)	TSK_K_REG(tsk, 4)

#define TSK_K_FP(tsk)		TSK_K_REG(tsk, 0)



extern void start_thread(struct pt_regs * regs, unsigned long pc,

			 unsigned long usp);

arch/arc/kernel/stacktrace.c

+3 −3
Original line number Diff line number Diff line
@@ -64,9 +64,9 @@ static void seed_unwind_frame_info(struct task_struct *tsk, 


		frame_info->task = tsk;



		frame_info->regs.r27 = KSTK_FP(tsk);

		frame_info->regs.r28 = KSTK_ESP(tsk);

		frame_info->regs.r31 = KSTK_BLINK(tsk);

		frame_info->regs.r27 = TSK_K_FP(tsk);

		frame_info->regs.r28 = TSK_K_ESP(tsk);

		frame_info->regs.r31 = TSK_K_BLINK(tsk);

		frame_info->regs.r63 = (unsigned int)__switch_to;



		/* In the prologue of __switch_to, first FP is saved on stack

arch/mips/kvm/trace.h

+3 −3
Original line number Diff line number Diff line
@@ -24,18 +24,18 @@ TRACE_EVENT(kvm_exit, 
	    TP_PROTO(struct kvm_vcpu *vcpu, unsigned int reason),

	    TP_ARGS(vcpu, reason),

	    TP_STRUCT__entry(

			__field(struct kvm_vcpu *, vcpu)

			__field(unsigned long, pc)

			__field(unsigned int, reason)

	    ),



	    TP_fast_assign(

			__entry->vcpu = vcpu;

			__entry->pc = vcpu->arch.pc;

			__entry->reason = reason;

	    ),



	    TP_printk("[%s]PC: 0x%08lx",

		      kvm_mips_exit_types_str[__entry->reason],

		      __entry->vcpu->arch.pc)

		      __entry->pc)

);



#endif /* _TRACE_KVM_H */