Commit 82c8170c authored by Koen Vandeputte's avatar Koen Vandeputte
Browse files

kernel: bump 4.9 to 4.9.219



Refreshed all patches.

Altered patches:
- 0026-NET-multi-phy-support.patch

Fixes:
- CVE-2020-8647
- CVE-2020-8648 (Potentially)
- CVE-2020-8649

Compile-tested on: ar71xx
Runtime-tested on: ar71xx
Signed-off-by: default avatarKoen Vandeputte <koen.vandeputte@ncentric.com>
parent 489fc235
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
LINUX_RELEASE?=1 LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .215 LINUX_VERSION-4.9 = .219
LINUX_VERSION-4.14 = .172 LINUX_VERSION-4.14 = .172
LINUX_KERNEL_HASH-4.9.215 = 236f2f47853700f22b9925cb17917d97ff7120fcc8110ec827c5a030a8129f48 LINUX_KERNEL_HASH-4.9.219 = 6b17238cced3e1c2753d6d5b4f662bd347d4651f07c35506b849eb10aea7bc44
LINUX_KERNEL_HASH-4.14.172 = 2318a1ab937580a079351ed20557c336a3d95b664f667b14e3ba49e3271b217a LINUX_KERNEL_HASH-4.14.172 = 2318a1ab937580a079351ed20557c336a3d95b664f667b14e3ba49e3271b217a
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
......
...@@ -9,7 +9,7 @@ Subject: [PATCH] serial: 8250: Don't crash when nr_uarts is 0 ...@@ -9,7 +9,7 @@ Subject: [PATCH] serial: 8250: Don't crash when nr_uarts is 0
--- a/drivers/tty/serial/8250/8250_core.c --- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c
@@ -509,6 +509,8 @@ static void __init serial8250_isa_init_p @@ -508,6 +508,8 @@ static void __init serial8250_isa_init_p
if (nr_uarts > UART_NR) if (nr_uarts > UART_NR)
nr_uarts = UART_NR; nr_uarts = UART_NR;
......
...@@ -696,7 +696,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> ...@@ -696,7 +696,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
} }
--- a/drivers/usb/core/hub.c --- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c
@@ -5091,7 +5091,7 @@ static void port_event(struct usb_hub *h @@ -5095,7 +5095,7 @@ static void port_event(struct usb_hub *h
if (portchange & USB_PORT_STAT_C_OVERCURRENT) { if (portchange & USB_PORT_STAT_C_OVERCURRENT) {
u16 status = 0, unused; u16 status = 0, unused;
...@@ -174,7 +174,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -174,7 +174,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
--- a/scripts/dtc/dtc-lexer.l --- a/scripts/dtc/dtc-lexer.l
+++ b/scripts/dtc/dtc-lexer.l +++ b/scripts/dtc/dtc-lexer.l
@@ -121,6 +121,11 @@ static void lexical_error(const char *fm @@ -120,6 +120,11 @@ static void lexical_error(const char *fm
return DT_V1; return DT_V1;
} }
...@@ -629,7 +629,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -629,7 +629,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
} ; } ;
static yy_state_type yy_last_accepting_state; static yy_state_type yy_last_accepting_state;
@@ -662,7 +664,7 @@ static int dts_version = 1; @@ -661,7 +663,7 @@ static int dts_version = 1;
static void push_input_file(const char *filename); static void push_input_file(const char *filename);
static bool pop_input_file(void); static bool pop_input_file(void);
static void lexical_error(const char *fmt, ...); static void lexical_error(const char *fmt, ...);
...@@ -638,7 +638,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -638,7 +638,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
#define INITIAL 0 #define INITIAL 0
#define BYTESTRING 1 #define BYTESTRING 1
@@ -704,7 +706,7 @@ FILE *yyget_out (void ); @@ -703,7 +705,7 @@ FILE *yyget_out (void );
void yyset_out (FILE * out_str ); void yyset_out (FILE * out_str );
...@@ -647,7 +647,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -647,7 +647,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
char *yyget_text (void ); char *yyget_text (void );
@@ -853,6 +855,10 @@ YY_DECL @@ -852,6 +854,10 @@ YY_DECL
register char *yy_cp, *yy_bp; register char *yy_cp, *yy_bp;
register int yy_act; register int yy_act;
...@@ -658,7 +658,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -658,7 +658,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
if ( !(yy_init) ) if ( !(yy_init) )
{ {
(yy_init) = 1; (yy_init) = 1;
@@ -879,11 +885,6 @@ YY_DECL @@ -878,11 +884,6 @@ YY_DECL
yy_load_buffer_state( ); yy_load_buffer_state( );
} }
...@@ -670,7 +670,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -670,7 +670,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
while ( 1 ) /* loops until end-of-file is reached */ while ( 1 ) /* loops until end-of-file is reached */
{ {
yy_cp = (yy_c_buf_p); yy_cp = (yy_c_buf_p);
@@ -901,7 +902,7 @@ YY_DECL @@ -900,7 +901,7 @@ YY_DECL
yy_match: yy_match:
do do
{ {
...@@ -679,7 +679,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -679,7 +679,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
if ( yy_accept[yy_current_state] ) if ( yy_accept[yy_current_state] )
{ {
(yy_last_accepting_state) = yy_current_state; (yy_last_accepting_state) = yy_current_state;
@@ -910,13 +911,13 @@ yy_match: @@ -909,13 +910,13 @@ yy_match:
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
...@@ -695,7 +695,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -695,7 +695,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
yy_cp = (yy_last_accepting_cpos); yy_cp = (yy_last_accepting_cpos);
yy_current_state = (yy_last_accepting_state); yy_current_state = (yy_last_accepting_state);
@@ -951,39 +952,31 @@ case 2: @@ -950,39 +951,31 @@ case 2:
YY_RULE_SETUP YY_RULE_SETUP
#line 75 "dtc-lexer.l" #line 75 "dtc-lexer.l"
{ {
...@@ -749,7 +749,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -749,7 +749,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
{ {
if (!pop_input_file()) { if (!pop_input_file()) {
yyterminate(); yyterminate();
@@ -993,7 +986,7 @@ case YY_STATE_EOF(V1): @@ -992,7 +985,7 @@ case YY_STATE_EOF(V1):
case 3: case 3:
/* rule 3 can match eol */ /* rule 3 can match eol */
YY_RULE_SETUP YY_RULE_SETUP
...@@ -758,7 +758,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -758,7 +758,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
{ {
DPRINT("String: %s\n", yytext); DPRINT("String: %s\n", yytext);
yylval.data = data_copy_escape_string(yytext+1, yylval.data = data_copy_escape_string(yytext+1,
@@ -1003,7 +996,7 @@ YY_RULE_SETUP @@ -1002,7 +995,7 @@ YY_RULE_SETUP
YY_BREAK YY_BREAK
case 4: case 4:
YY_RULE_SETUP YY_RULE_SETUP
...@@ -767,7 +767,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -767,7 +767,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
{ {
DPRINT("Keyword: /dts-v1/\n"); DPRINT("Keyword: /dts-v1/\n");
dts_version = 1; dts_version = 1;
@@ -1013,25 +1006,33 @@ YY_RULE_SETUP @@ -1012,25 +1005,33 @@ YY_RULE_SETUP
YY_BREAK YY_BREAK
case 5: case 5:
YY_RULE_SETUP YY_RULE_SETUP
...@@ -806,7 +806,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -806,7 +806,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
{ {
DPRINT("Keyword: /delete-property/\n"); DPRINT("Keyword: /delete-property/\n");
DPRINT("<PROPNODENAME>\n"); DPRINT("<PROPNODENAME>\n");
@@ -1039,9 +1040,9 @@ YY_RULE_SETUP @@ -1038,9 +1039,9 @@ YY_RULE_SETUP
return DT_DEL_PROP; return DT_DEL_PROP;
} }
YY_BREAK YY_BREAK
...@@ -818,7 +818,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -818,7 +818,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
{ {
DPRINT("Keyword: /delete-node/\n"); DPRINT("Keyword: /delete-node/\n");
DPRINT("<PROPNODENAME>\n"); DPRINT("<PROPNODENAME>\n");
@@ -1049,9 +1050,9 @@ YY_RULE_SETUP @@ -1048,9 +1049,9 @@ YY_RULE_SETUP
return DT_DEL_NODE; return DT_DEL_NODE;
} }
YY_BREAK YY_BREAK
...@@ -830,7 +830,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -830,7 +830,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
{ {
DPRINT("Label: %s\n", yytext); DPRINT("Label: %s\n", yytext);
yylval.labelref = xstrdup(yytext); yylval.labelref = xstrdup(yytext);
@@ -1059,9 +1060,9 @@ YY_RULE_SETUP @@ -1058,9 +1059,9 @@ YY_RULE_SETUP
return DT_LABEL; return DT_LABEL;
} }
YY_BREAK YY_BREAK
...@@ -842,7 +842,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -842,7 +842,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
{ {
char *e; char *e;
DPRINT("Integer Literal: '%s'\n", yytext); DPRINT("Integer Literal: '%s'\n", yytext);
@@ -1069,10 +1070,7 @@ YY_RULE_SETUP @@ -1068,10 +1069,7 @@ YY_RULE_SETUP
errno = 0; errno = 0;
yylval.integer = strtoull(yytext, &e, 0); yylval.integer = strtoull(yytext, &e, 0);
...@@ -854,7 +854,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -854,7 +854,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
if (errno == ERANGE) if (errno == ERANGE)
lexical_error("Integer literal '%s' out of range", lexical_error("Integer literal '%s' out of range",
@@ -1084,10 +1082,10 @@ YY_RULE_SETUP @@ -1083,10 +1081,10 @@ YY_RULE_SETUP
return DT_LITERAL; return DT_LITERAL;
} }
YY_BREAK YY_BREAK
...@@ -868,7 +868,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -868,7 +868,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
{ {
struct data d; struct data d;
DPRINT("Character literal: %s\n", yytext); DPRINT("Character literal: %s\n", yytext);
@@ -1109,18 +1107,18 @@ YY_RULE_SETUP @@ -1108,18 +1106,18 @@ YY_RULE_SETUP
return DT_CHAR_LITERAL; return DT_CHAR_LITERAL;
} }
YY_BREAK YY_BREAK
...@@ -891,7 +891,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -891,7 +891,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
{ /* new-style path reference */ { /* new-style path reference */
yytext[yyleng-1] = '\0'; yytext[yyleng-1] = '\0';
DPRINT("Ref: %s\n", yytext+2); DPRINT("Ref: %s\n", yytext+2);
@@ -1128,27 +1126,27 @@ YY_RULE_SETUP @@ -1127,27 +1125,27 @@ YY_RULE_SETUP
return DT_REF; return DT_REF;
} }
YY_BREAK YY_BREAK
...@@ -925,7 +925,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -925,7 +925,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
{ {
DPRINT("PropNodeName: %s\n", yytext); DPRINT("PropNodeName: %s\n", yytext);
yylval.propnodename = xstrdup((yytext[0] == '\\') ? yylval.propnodename = xstrdup((yytext[0] == '\\') ?
@@ -1157,75 +1155,75 @@ YY_RULE_SETUP @@ -1156,75 +1154,75 @@ YY_RULE_SETUP
return DT_PROPNODENAME; return DT_PROPNODENAME;
} }
YY_BREAK YY_BREAK
...@@ -1030,7 +1030,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -1030,7 +1030,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
{ {
DPRINT("Char: %c (\\x%02x)\n", yytext[0], DPRINT("Char: %c (\\x%02x)\n", yytext[0],
(unsigned)yytext[0]); (unsigned)yytext[0]);
@@ -1241,12 +1239,12 @@ YY_RULE_SETUP @@ -1240,12 +1238,12 @@ YY_RULE_SETUP
return yytext[0]; return yytext[0];
} }
YY_BREAK YY_BREAK
...@@ -1046,7 +1046,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -1046,7 +1046,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
case YY_END_OF_BUFFER: case YY_END_OF_BUFFER:
{ {
@@ -1376,7 +1374,6 @@ ECHO; @@ -1375,7 +1373,6 @@ ECHO;
"fatal flex scanner internal error--no action found" ); "fatal flex scanner internal error--no action found" );
} /* end of action switch */ } /* end of action switch */
} /* end of scanning one token */ } /* end of scanning one token */
...@@ -1054,7 +1054,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -1054,7 +1054,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
} /* end of yylex */ } /* end of yylex */
/* yy_get_next_buffer - try to read in a new buffer /* yy_get_next_buffer - try to read in a new buffer
@@ -1432,21 +1429,21 @@ static int yy_get_next_buffer (void) @@ -1431,21 +1428,21 @@ static int yy_get_next_buffer (void)
else else
{ {
...@@ -1079,7 +1079,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -1079,7 +1079,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
if ( new_size <= 0 ) if ( new_size <= 0 )
b->yy_buf_size += b->yy_buf_size / 8; b->yy_buf_size += b->yy_buf_size / 8;
@@ -1477,7 +1474,7 @@ static int yy_get_next_buffer (void) @@ -1476,7 +1473,7 @@ static int yy_get_next_buffer (void)
/* Read in more data. */ /* Read in more data. */
YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]), YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
...@@ -1088,7 +1088,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -1088,7 +1088,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars); YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
} }
@@ -1539,7 +1536,7 @@ static int yy_get_next_buffer (void) @@ -1538,7 +1535,7 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
...@@ -1097,7 +1097,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -1097,7 +1097,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
yy_c = yy_meta[(unsigned int) yy_c]; yy_c = yy_meta[(unsigned int) yy_c];
} }
yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
@@ -1567,13 +1564,13 @@ static int yy_get_next_buffer (void) @@ -1566,13 +1563,13 @@ static int yy_get_next_buffer (void)
while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state )
{ {
yy_current_state = (int) yy_def[yy_current_state]; yy_current_state = (int) yy_def[yy_current_state];
...@@ -1114,7 +1114,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -1114,7 +1114,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
} }
#ifndef YY_NO_INPUT #ifndef YY_NO_INPUT
@@ -1600,7 +1597,7 @@ static int yy_get_next_buffer (void) @@ -1599,7 +1596,7 @@ static int yy_get_next_buffer (void)
else else
{ /* need more input */ { /* need more input */
...@@ -1123,7 +1123,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -1123,7 +1123,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
++(yy_c_buf_p); ++(yy_c_buf_p);
switch ( yy_get_next_buffer( ) ) switch ( yy_get_next_buffer( ) )
@@ -1874,7 +1871,7 @@ void yypop_buffer_state (void) @@ -1873,7 +1870,7 @@ void yypop_buffer_state (void)
*/ */
static void yyensure_buffer_stack (void) static void yyensure_buffer_stack (void)
{ {
...@@ -1132,7 +1132,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -1132,7 +1132,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
if (!(yy_buffer_stack)) { if (!(yy_buffer_stack)) {
@@ -1971,12 +1968,12 @@ YY_BUFFER_STATE yy_scan_string (yyconst @@ -1970,12 +1967,12 @@ YY_BUFFER_STATE yy_scan_string (yyconst
* *
* @return the newly allocated buffer state object. * @return the newly allocated buffer state object.
*/ */
...@@ -1147,7 +1147,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -1147,7 +1147,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
/* Get memory for full buffer, including space for trailing EOB's. */ /* Get memory for full buffer, including space for trailing EOB's. */
n = _yybytes_len + 2; n = _yybytes_len + 2;
@@ -2058,7 +2055,7 @@ FILE *yyget_out (void) @@ -2057,7 +2054,7 @@ FILE *yyget_out (void)
/** Get the length of the current token. /** Get the length of the current token.
* *
*/ */
...@@ -1156,7 +1156,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -1156,7 +1156,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
{ {
return yyleng; return yyleng;
} }
@@ -2206,7 +2203,7 @@ void yyfree (void * ptr ) @@ -2205,7 +2202,7 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables" #define YYTABLES_NAME "yytables"
......
...@@ -279,7 +279,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org> ...@@ -279,7 +279,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-ENDPROC(arm_copy_from_user) -ENDPROC(arm_copy_from_user)
+ENDPROC(__copy_from_user_std) +ENDPROC(__copy_from_user_std)
.pushsection .fixup,"ax" .pushsection .text.fixup,"ax"
.align 0 .align 0
--- /dev/null --- /dev/null
+++ b/arch/arm/lib/exports_rpi.c +++ b/arch/arm/lib/exports_rpi.c
......
...@@ -803,7 +803,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> ...@@ -803,7 +803,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/marvell/mvneta.c --- a/drivers/net/ethernet/marvell/mvneta.c
+++ b/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -2702,11 +2702,9 @@ static int mvneta_poll(struct napi_struc @@ -2701,11 +2701,9 @@ static int mvneta_poll(struct napi_struc
rx_done = mvneta_rx_swbm(pp, budget, &pp->rxqs[rx_queue]); rx_done = mvneta_rx_swbm(pp, budget, &pp->rxqs[rx_queue]);
} }
......
--- a/include/linux/phy.h --- a/include/linux/phy.h
+++ b/include/linux/phy.h +++ b/include/linux/phy.h
@@ -495,6 +495,12 @@ struct phy_driver { @@ -497,6 +497,12 @@ struct phy_driver {
/* Determines the negotiated speed and duplex */ /* Determines the negotiated speed and duplex */
int (*read_status)(struct phy_device *phydev); int (*read_status)(struct phy_device *phydev);
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
--- a/drivers/net/phy/phy_device.c --- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c
@@ -1316,6 +1316,9 @@ int genphy_update_link(struct phy_device @@ -1320,6 +1320,9 @@ int genphy_update_link(struct phy_device
{ {
int status; int status;
......
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
phy_device_free(phydev); phy_device_free(phydev);
--- a/include/linux/phy.h --- a/include/linux/phy.h
+++ b/include/linux/phy.h +++ b/include/linux/phy.h
@@ -870,6 +870,23 @@ void mdio_bus_exit(void); @@ -872,6 +872,23 @@ void mdio_bus_exit(void);
extern struct bus_type mdio_bus_type; extern struct bus_type mdio_bus_type;
......
...@@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ...@@ -55,7 +55,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/ipv4/Kconfig --- a/net/ipv4/Kconfig
+++ b/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig
@@ -408,6 +408,7 @@ config INET_XFRM_MODE_BEET @@ -409,6 +409,7 @@ config INET_XFRM_MODE_BEET
config INET_DIAG config INET_DIAG
tristate "INET: socket monitoring interface" tristate "INET: socket monitoring interface"
......
...@@ -233,7 +233,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ...@@ -233,7 +233,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
return -ENOMEM; return -ENOMEM;
--- a/mm/vmalloc.c --- a/mm/vmalloc.c
+++ b/mm/vmalloc.c +++ b/mm/vmalloc.c
@@ -2727,6 +2727,8 @@ static const struct file_operations proc @@ -2730,6 +2730,8 @@ static const struct file_operations proc
static int __init proc_vmalloc_init(void) static int __init proc_vmalloc_init(void)
{ {
...@@ -339,7 +339,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ...@@ -339,7 +339,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
--- a/net/ipv4/fib_trie.c --- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c
@@ -2677,10 +2677,12 @@ static const struct file_operations fib_ @@ -2680,10 +2680,12 @@ static const struct file_operations fib_
int __net_init fib_proc_init(struct net *net) int __net_init fib_proc_init(struct net *net)
{ {
...@@ -354,7 +354,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> ...@@ -354,7 +354,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
&fib_triestat_fops)) &fib_triestat_fops))
goto out2; goto out2;
@@ -2690,17 +2692,21 @@ int __net_init fib_proc_init(struct net @@ -2693,17 +2695,21 @@ int __net_init fib_proc_init(struct net
return 0; return 0;
out3: out3:
......
...@@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> ...@@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
static void rt_fibinfo_free(struct rtable __rcu **rtp) static void rt_fibinfo_free(struct rtable __rcu **rtp)
--- a/net/ipv4/fib_trie.c --- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c
@@ -2406,6 +2406,7 @@ static const char *const rtn_type_names[ @@ -2409,6 +2409,7 @@ static const char *const rtn_type_names[
[RTN_THROW] = "THROW", [RTN_THROW] = "THROW",
[RTN_NAT] = "NAT", [RTN_NAT] = "NAT",
[RTN_XRESOLVE] = "XRESOLVE", [RTN_XRESOLVE] = "XRESOLVE",
...@@ -181,7 +181,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> ...@@ -181,7 +181,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
cfg->fc_flags |= RTF_REJECT; cfg->fc_flags |= RTF_REJECT;
if (rtm->rtm_type == RTN_LOCAL) if (rtm->rtm_type == RTN_LOCAL)
@@ -3222,6 +3256,9 @@ static int rt6_fill_node(struct net *net @@ -3223,6 +3257,9 @@ static int rt6_fill_node(struct net *net
case -EACCES: case -EACCES:
rtm->rtm_type = RTN_PROHIBIT; rtm->rtm_type = RTN_PROHIBIT;
break; break;
...@@ -191,7 +191,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> ...@@ -191,7 +191,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
case -EAGAIN: