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

Commit c3eaa1a7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.4.175 (08d58678) into msm-4.4"

parents ed990c4e 119c4358

Documentation/networking/ip-sysctl.txt

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ ipfrag_high_thresh - LONG INTEGER 
	Maximum memory used to reassemble IP fragments.



ipfrag_low_thresh - LONG INTEGER

	(Obsolete since linux-4.17)

	(Obsolete since linux-4.4.174, backported from linux-4.17)

	Maximum memory used to reassemble IP fragments before the kernel

	begins to remove incomplete fragment queues to free up resources.

	The kernel still accepts new fragments for defragmentation.

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 174

SUBLEVEL = 175

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/alpha/include/asm/irq.h

+3 −3
Original line number Diff line number Diff line
@@ -55,15 +55,15 @@ 


#elif defined(CONFIG_ALPHA_DP264) || \

      defined(CONFIG_ALPHA_LYNX)  || \

      defined(CONFIG_ALPHA_SHARK) || \

      defined(CONFIG_ALPHA_EIGER)

      defined(CONFIG_ALPHA_SHARK)

# define NR_IRQS	64



#elif defined(CONFIG_ALPHA_TITAN)

#define NR_IRQS		80



#elif defined(CONFIG_ALPHA_RAWHIDE) || \

	defined(CONFIG_ALPHA_TAKARA)

      defined(CONFIG_ALPHA_TAKARA) || \

      defined(CONFIG_ALPHA_EIGER)

# define NR_IRQS	128



#elif defined(CONFIG_ALPHA_WILDFIRE)

arch/alpha/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ __load_new_mm_context(struct mm_struct *next_mm) 
/* Macro for exception fixup code to access integer registers.  */

#define dpf_reg(r)							\

	(((unsigned long *)regs)[(r) <= 8 ? (r) : (r) <= 15 ? (r)-16 :	\

				 (r) <= 18 ? (r)+8 : (r)-10])

				 (r) <= 18 ? (r)+10 : (r)-10])



asmlinkage void

do_page_fault(unsigned long address, unsigned long mmcsr,

arch/arm/boot/dts/da850-evm.dts

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ 


	sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "DA850/OMAP-L138 EVM";

		simple-audio-card,name = "DA850-OMAPL138 EVM";

		simple-audio-card,widgets =

			"Line", "Line In",

			"Line", "Line Out";