View | Details | Raw Unified | Return to bug 47063
Collapse All | Expand All

(-)patch-4.9.104-105 (-24 / +24 lines)
 Lines 1-24    Link Here 
1 
diff --git a/Makefile b/Makefile
 1 
diff --git a/Makefile b/Makefile
2 
index 780dcc8033b2..7d06dba3fde8 100644
 2 
index 780dcc8033b2..7d06dba3fde8 100644
3 
--- a/Makefile
 3 
--- a/Makefile
4 
+++ b/Makefile
 4 
+++ b/Makefile
5 
@@ -1,6 +1,6 @@
 5 
@@ -1,6 +1,6 @@
6 
 VERSION = 4
 6 
 VERSION = 4
7 
 PATCHLEVEL = 9
 7 
 PATCHLEVEL = 9
8 
-SUBLEVEL = 104
 8 
-SUBLEVEL = 104
9 
+SUBLEVEL = 105
 9 
+SUBLEVEL = 105
10 
 EXTRAVERSION =
 10 
 EXTRAVERSION =
11 
 NAME = Roaring Lionus
 11 
 NAME = Roaring Lionus
12
12
13 
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
 13 
diff --git a/net/ipv4/ip_vti.c b/net/ipv4/ip_vti.c
14 
index 1ac55b116d5a..cbff0d6ff1ac 100644
 14 
index 1ac55b116d5a..cbff0d6ff1ac 100644
15 
--- a/net/ipv4/ip_vti.c
 15 
--- a/net/ipv4/ip_vti.c
16 
+++ b/net/ipv4/ip_vti.c
 16 
+++ b/net/ipv4/ip_vti.c
17 
@@ -396,6 +396,7 @@ static int vti_tunnel_init(struct net_device *dev)
 17 
@@ -396,6 +396,7 @@ static int vti_tunnel_init(struct net_device *dev)
18 
 	memcpy(dev->dev_addr, &iph->saddr, 4);
 18 
 	memcpy(dev->dev_addr, &iph->saddr, 4);
19 
 	memcpy(dev->broadcast, &iph->daddr, 4);
 19 
 	memcpy(dev->broadcast, &iph->daddr, 4);
20
20
21 
+	dev->mtu		= ETH_DATA_LEN;
 21 
+	dev->mtu		= ETH_DATA_LEN;
22 
 	dev->flags		= IFF_NOARP;
 22 
 	dev->flags		= IFF_NOARP;
23 
 	dev->addr_len		= 4;
 23 
 	dev->addr_len		= 4;
24 
 	dev->features		|= NETIF_F_LLTX;
 24 
 	dev->features		|= NETIF_F_LLTX;
(-)patch-4.9.110-111 (-1 / +1 lines)
 Lines 1622-1628    Link Here 
1622 
+ * Processor Family I/O for U Quad Core Platforms Specification Update,
 1622 
+ * Processor Family I/O for U Quad Core Platforms Specification Update,
1623 
+ * August 2017, Revision 002, Document#: 334660-002)[6]
 1623 
+ * August 2017, Revision 002, Document#: 334660-002)[6]
1624 
+ * Device IDs from I/O datasheet: (7th Generation Intel Processor Family I/O
 1624 
+ * Device IDs from I/O datasheet: (7th Generation Intel Processor Family I/O
1625 
+ * for U/Y Platforms and 8th Generation Intel ® Processor Family I/O for U
 1625 
+ * for U/Y Platforms and 8th Generation Intel ® Processor Family I/O for U
1626 
+ * Quad Core Platforms, Vol 1 of 2, August 2017, Document#: 334658-003)[7]
 1626 
+ * Quad Core Platforms, Vol 1 of 2, August 2017, Document#: 334658-003)[7]
1627 
+ *
 1627 
+ *
1628 
+ * 0x9d10-0x9d1b PCI Express Root port #{1-12}
 1628 
+ * 0x9d10-0x9d1b PCI Express Root port #{1-12}
(-)patch-4.9.115-116 (-11 / +11 lines)
 Lines 48-54    Link Here 
48 
index d76cd97a98b6..ee25a69630c3 100644
 48 
index d76cd97a98b6..ee25a69630c3 100644
49 
--- a/drivers/base/dd.c
 49 
--- a/drivers/base/dd.c
50 
+++ b/drivers/base/dd.c
 50 
+++ b/drivers/base/dd.c
51 
@@ -363,14 +363,6 @@ re_probe:
 51 
@@ -363,14 +363,6 @@ static int really_probe(struct device *dev, struct device_driver *drv)
52 
 			goto probe_failed;
 52 
 			goto probe_failed;
53 
 	}
 53 
 	}
54
54
 Lines 857-863    Link Here 
857 
index b8c43be24751..fcd8642ef2d2 100644
 857 
index b8c43be24751..fcd8642ef2d2 100644
858 
--- a/fs/exec.c
 858 
--- a/fs/exec.c
859 
+++ b/fs/exec.c
 859 
+++ b/fs/exec.c
860 
@@ -1228,15 +1228,14 @@ killed:
 860 
@@ -1228,15 +1228,14 @@ static int de_thread(struct task_struct *tsk)
861 
 	return -EAGAIN;
 861 
 	return -EAGAIN;
862 
 }
 862 
 }
863
863
 Lines 950-956    Link Here 
950 
index 8cae7aa4a4ec..84c731aef0d8 100644
 950 
index 8cae7aa4a4ec..84c731aef0d8 100644
951 
--- a/net/core/skbuff.c
 951 
--- a/net/core/skbuff.c
952 
+++ b/net/core/skbuff.c
 952 
+++ b/net/core/skbuff.c
953 
@@ -3253,6 +3253,7 @@ normal:
 953 
@@ -3253,6 +3253,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
954 
 				net_warn_ratelimited(
 954 
 				net_warn_ratelimited(
955 
 					"skb_segment: too many frags: %u %u\n",
 955 
 					"skb_segment: too many frags: %u %u\n",
956 
 					pos, mss);
 956 
 					pos, mss);
 Lines 958-964    Link Here 
958 
 				goto err;
 958 
 				goto err;
959 
 			}
 959 
 			}
960
960
961 
@@ -3289,11 +3290,10 @@ skip_fraglist:
 961 
@@ -3289,11 +3290,10 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
962
962
963 
 perform_csum_check:
 963 
 perform_csum_check:
964 
 		if (!csum) {
 964 
 		if (!csum) {
 Lines 1114-1120    Link Here 
1114
1114
1115 
 /* Send ACKs quickly, if "quick" count is not exhausted
 1115 
 /* Send ACKs quickly, if "quick" count is not exhausted
1116 
  * and the session is not interactive.
 1116 
  * and the session is not interactive.
1117 
@@ -4516,7 +4517,7 @@ coalesce_done:
 1117 
@@ -4516,7 +4517,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)
1118 
 				/* All the bits are present. Drop. */
 1118 
 				/* All the bits are present. Drop. */
1119 
 				NET_INC_STATS(sock_net(sk),
 1119 
 				NET_INC_STATS(sock_net(sk),
1120 
 					      LINUX_MIB_TCPOFOMERGE);
 1120 
 					      LINUX_MIB_TCPOFOMERGE);
 Lines 1123-1129    Link Here 
1123 
 				skb = NULL;
 1123 
 				skb = NULL;
1124 
 				tcp_dsack_set(sk, seq, end_seq);
 1124 
 				tcp_dsack_set(sk, seq, end_seq);
1125 
 				goto add_sack;
 1125 
 				goto add_sack;
1126 
@@ -4535,7 +4536,7 @@ coalesce_done:
 1126 
@@ -4535,7 +4536,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)
1127 
 						 TCP_SKB_CB(skb1)->end_seq);
 1127 
 						 TCP_SKB_CB(skb1)->end_seq);
1128 
 				NET_INC_STATS(sock_net(sk),
 1128 
 				NET_INC_STATS(sock_net(sk),
1129 
 					      LINUX_MIB_TCPOFOMERGE);
 1129 
 					      LINUX_MIB_TCPOFOMERGE);
 Lines 1132-1138    Link Here 
1132 
 				goto merge_right;
 1132 
 				goto merge_right;
1133 
 			}
 1133 
 			}
1134 
 		} else if (tcp_try_coalesce(sk, skb1, skb, &fragstolen)) {
 1134 
 		} else if (tcp_try_coalesce(sk, skb1, skb, &fragstolen)) {
1135 
@@ -4917,6 +4918,7 @@ end:
 1135 
@@ -4917,6 +4918,7 @@ tcp_collapse(struct sock *sk, struct sk_buff_head *list, struct rb_root *root,
1136 
 static void tcp_collapse_ofo_queue(struct sock *sk)
 1136 
 static void tcp_collapse_ofo_queue(struct sock *sk)
1137 
 {
 1137 
 {
1138 
 	struct tcp_sock *tp = tcp_sk(sk);
 1138 
 	struct tcp_sock *tp = tcp_sk(sk);
 Lines 1140-1146    Link Here 
1140 
 	struct sk_buff *skb, *head;
 1140 
 	struct sk_buff *skb, *head;
1141 
 	struct rb_node *p;
 1141 
 	struct rb_node *p;
1142 
 	u32 start, end;
 1142 
 	u32 start, end;
1143 
@@ -4935,6 +4937,7 @@ new_range:
 1143 
@@ -4935,6 +4937,7 @@ static void tcp_collapse_ofo_queue(struct sock *sk)
1144 
 	}
 1144 
 	}
1145 
 	start = TCP_SKB_CB(skb)->seq;
 1145 
 	start = TCP_SKB_CB(skb)->seq;
1146 
 	end = TCP_SKB_CB(skb)->end_seq;
 1146 
 	end = TCP_SKB_CB(skb)->end_seq;
 Lines 1148-1154    Link Here 
1148
1148
1149 
 	for (head = skb;;) {
 1149 
 	for (head = skb;;) {
1150 
 		skb = tcp_skb_next(skb, NULL);
 1150 
 		skb = tcp_skb_next(skb, NULL);
1151 
@@ -4945,11 +4948,20 @@ new_range:
 1151 
@@ -4945,11 +4948,20 @@ static void tcp_collapse_ofo_queue(struct sock *sk)
1152 
 		if (!skb ||
 1152 
 		if (!skb ||
1153 
 		    after(TCP_SKB_CB(skb)->seq, end) ||
 1153 
 		    after(TCP_SKB_CB(skb)->seq, end) ||
1154 
 		    before(TCP_SKB_CB(skb)->end_seq, start)) {
 1154 
 		    before(TCP_SKB_CB(skb)->end_seq, start)) {
 Lines 1171-1177    Link Here 
1171 
 		if (unlikely(before(TCP_SKB_CB(skb)->seq, start)))
 1171 
 		if (unlikely(before(TCP_SKB_CB(skb)->seq, start)))
1172 
 			start = TCP_SKB_CB(skb)->seq;
 1172 
 			start = TCP_SKB_CB(skb)->seq;
1173 
 		if (after(TCP_SKB_CB(skb)->end_seq, end))
 1173 
 		if (after(TCP_SKB_CB(skb)->end_seq, end))
1174 
@@ -4964,6 +4976,7 @@ new_range:
 1174 
@@ -4964,6 +4976,7 @@ static void tcp_collapse_ofo_queue(struct sock *sk)
1175 
  * 2) not add too big latencies if thousands of packets sit there.
 1175 
  * 2) not add too big latencies if thousands of packets sit there.
1176 
  *    (But if application shrinks SO_RCVBUF, we could still end up
 1176 
  *    (But if application shrinks SO_RCVBUF, we could still end up
1177 
  *     freeing whole queue here)
 1177 
  *     freeing whole queue here)
 Lines 1239-1245    Link Here 
1239 
 	tcp_dec_quickack_mode(sk, pkts);
 1239 
 	tcp_dec_quickack_mode(sk, pkts);
1240 
 	inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK);
 1240 
 	inet_csk_clear_xmit_timer(sk, ICSK_TIME_DACK);
1241 
 }
 1241 
 }
1242 
@@ -905,8 +910,8 @@ out:
 1242 
@@ -905,8 +910,8 @@ void tcp_wfree(struct sk_buff *skb)
1243 
  * We are working here with either a clone of the original
 1243 
  * We are working here with either a clone of the original
1244 
  * SKB, or a fresh unique copy made by the retransmit engine.
 1244 
  * SKB, or a fresh unique copy made by the retransmit engine.
1245 
  */
 1245 
  */
(-)patch-4.9.116-117 (-12 / +12 lines)
 Lines 814-820    Link Here 
814 
 				  struct drm_display_mode *mode)
 814 
 				  struct drm_display_mode *mode)
815 
 {
 815 
 {
816 
 	struct drm_device *dev = connector->dev;
 816 
 	struct drm_device *dev = connector->dev;
817 
@@ -1798,7 +1798,7 @@ out:
 817 
@@ -1798,7 +1798,7 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
818 
 	return ret;
 818 
 	return ret;
819 
 }
 819 
 }
820
820
 Lines 1160-1166    Link Here 
1160 
index 0321d84addc7..15a86bb4e61c 100644
 1160 
index 0321d84addc7..15a86bb4e61c 100644
1161 
--- a/drivers/media/platform/omap3isp/isp.c
 1161 
--- a/drivers/media/platform/omap3isp/isp.c
1162 
+++ b/drivers/media/platform/omap3isp/isp.c
 1162 
+++ b/drivers/media/platform/omap3isp/isp.c
1163 
@@ -1941,6 +1941,7 @@ error_csiphy:
 1163 
@@ -1941,6 +1941,7 @@ static int isp_initialize_modules(struct isp_device *isp)
1164
1164
1165 
 static void isp_detach_iommu(struct isp_device *isp)
 1165 
 static void isp_detach_iommu(struct isp_device *isp)
1166 
 {
 1166 
 {
 Lines 2188-2194    Link Here 
2188
2188
2189 
 	lock->l_req_mode = mode;
 2189 
 	lock->l_req_mode = mode;
2190 
 	lock->l_ast_data = data;
 2190 
 	lock->l_ast_data = data;
2191 
@@ -1533,6 +1535,8 @@ out:
 2191 
@@ -1533,6 +1535,8 @@ struct ldlm_lock *ldlm_lock_create(struct ldlm_namespace *ns,
2192 
 	return ERR_PTR(rc);
 2192 
 	return ERR_PTR(rc);
2193 
 }
 2193 
 }
2194
2194
 Lines 2437-2443    Link Here 
2437
2437
2438 
 	btrfs_item_key_to_cpu(path->nodes[0], &found,
 2438 
 	btrfs_item_key_to_cpu(path->nodes[0], &found,
2439 
 			      btrfs_header_nritems(path->nodes[0]) - 1);
 2439 
 			      btrfs_header_nritems(path->nodes[0]) - 1);
2440 
@@ -2323,6 +2340,8 @@ out:
 2440 
@@ -2323,6 +2340,8 @@ qgroup_rescan_leaf(struct btrfs_fs_info *fs_info, struct btrfs_path *path,
2441 
 	}
 2441 
 	}
2442 
 	btrfs_put_tree_mod_seq(fs_info, &tree_mod_seq_elem);
 2442 
 	btrfs_put_tree_mod_seq(fs_info, &tree_mod_seq_elem);
2443
2443
 Lines 2450-2456    Link Here 
2450 
index 44d34923de9c..44966fd00790 100644
 2450 
index 44d34923de9c..44966fd00790 100644
2451 
--- a/fs/btrfs/tree-log.c
 2451 
--- a/fs/btrfs/tree-log.c
2452 
+++ b/fs/btrfs/tree-log.c
 2452 
+++ b/fs/btrfs/tree-log.c
2453 
@@ -2979,8 +2979,11 @@ out_wake_log_root:
 2453 
@@ -2979,8 +2979,11 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
2454 
 	mutex_unlock(&log_root_tree->log_mutex);
 2454 
 	mutex_unlock(&log_root_tree->log_mutex);
2455
2455
2456 
 	/*
 2456 
 	/*
 Lines 2463-2469    Link Here 
2463 
 	if (waitqueue_active(&log_root_tree->log_commit_wait[index2]))
 2463 
 	if (waitqueue_active(&log_root_tree->log_commit_wait[index2]))
2464 
 		wake_up(&log_root_tree->log_commit_wait[index2]);
 2464 
 		wake_up(&log_root_tree->log_commit_wait[index2]);
2465 
 out:
 2465 
 out:
2466 
@@ -2991,8 +2994,11 @@ out:
 2466 
@@ -2991,8 +2994,11 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,
2467 
 	mutex_unlock(&root->log_mutex);
 2467 
 	mutex_unlock(&root->log_mutex);
2468
2468
2469 
 	/*
 2469 
 	/*
 Lines 2573-2579    Link Here 
2573 
 out:
 2573 
 out:
2574 
 	return copied;
 2574 
 	return copied;
2575 
 }
 2575 
 }
2576 
@@ -895,7 +900,6 @@ retry_journal:
 2576 
@@ -895,7 +900,6 @@ int ext4_da_write_inline_data_begin(struct address_space *mapping,
2577 
 		goto out;
 2577 
 		goto out;
2578 
 	}
 2578 
 	}
2579
2579
 Lines 2581-2587    Link Here 
2581 
 	page = grab_cache_page_write_begin(mapping, 0, flags);
 2581 
 	page = grab_cache_page_write_begin(mapping, 0, flags);
2582 
 	if (!page) {
 2582 
 	if (!page) {
2583 
 		ret = -ENOMEM;
 2583 
 		ret = -ENOMEM;
2584 
@@ -913,6 +917,9 @@ retry_journal:
 2584 
@@ -913,6 +917,9 @@ int ext4_da_write_inline_data_begin(struct address_space *mapping,
2585 
 		if (ret < 0)
 2585 
 		if (ret < 0)
2586 
 			goto out_release_page;
 2586 
 			goto out_release_page;
2587 
 	}
 2587 
 	}
 Lines 2735-2741    Link Here 
2735 
index 17ab23f64bba..ad4dfd29d923 100644
 2735 
index 17ab23f64bba..ad4dfd29d923 100644
2736 
--- a/fs/f2fs/gc.c
 2736 
--- a/fs/f2fs/gc.c
2737 
+++ b/fs/f2fs/gc.c
 2737 
+++ b/fs/f2fs/gc.c
2738 
@@ -688,9 +688,14 @@ retry:
 2738 
@@ -688,9 +688,14 @@ static void move_data_page(struct inode *inode, block_t bidx, int gc_type)
2739 
 		set_cold_data(page);
 2739 
 		set_cold_data(page);
2740
2740
2741 
 		err = do_write_data_page(&fio);
 2741 
 		err = do_write_data_page(&fio);
 Lines 3022-3028    Link Here 
3022 
 			 */
 3022 
 			 */
3023 
 			map = bpf_map_inc(map, false);
 3023 
 			map = bpf_map_inc(map, false);
3024 
 			if (IS_ERR(map)) {
 3024 
 			if (IS_ERR(map)) {
3025 
@@ -3629,7 +3629,7 @@ free_log_buf:
 3025 
@@ -3629,7 +3629,7 @@ int bpf_check(struct bpf_prog **prog, union bpf_attr *attr)
3026 
 		vfree(log_buf);
 3026 
 		vfree(log_buf);
3027 
 	if (!env->prog->aux->used_maps)
 3027 
 	if (!env->prog->aux->used_maps)
3028 
 		/* if we didn't copy map pointers into bpf_prog_info, release
 3028 
 		/* if we didn't copy map pointers into bpf_prog_info, release
 Lines 3105-3111    Link Here 
3105
3105
3106 
 	err = -ENOENT;
 3106 
 	err = -ENOENT;
3107 
 	if (!stopper1->enabled || !stopper2->enabled)
 3107 
 	if (!stopper1->enabled || !stopper2->enabled)
3108 
@@ -255,8 +255,8 @@ retry:
 3108 
@@ -255,8 +255,8 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1,
3109 
 	__cpu_stop_queue_work(stopper1, work1);
 3109 
 	__cpu_stop_queue_work(stopper1, work1);
3110 
 	__cpu_stop_queue_work(stopper2, work2);
 3110 
 	__cpu_stop_queue_work(stopper2, work2);
3111 
 unlock:
 3111 
 unlock:
 Lines 3373-3379    Link Here 
3373 
index 4f1f69be1865..8c778fa33031 100644
 3373 
index 4f1f69be1865..8c778fa33031 100644
3374 
--- a/sound/pci/emu10k1/memory.c
 3374 
--- a/sound/pci/emu10k1/memory.c
3375 
+++ b/sound/pci/emu10k1/memory.c
 3375 
+++ b/sound/pci/emu10k1/memory.c
3376 
@@ -237,13 +237,13 @@ __found_pages:
 3376 
@@ -237,13 +237,13 @@ search_empty(struct snd_emu10k1 *emu, int size)
3377 
 static int is_valid_page(struct snd_emu10k1 *emu, dma_addr_t addr)
 3377 
 static int is_valid_page(struct snd_emu10k1 *emu, dma_addr_t addr)
3378 
 {
 3378 
 {
3379 
 	if (addr & ~emu->dma_mask) {
 3379 
 	if (addr & ~emu->dma_mask) {
(-)patch-4.9.117-118 (-5 / +5 lines)
 Lines 279-285    Link Here 
279 
index 0a5f62e0efcc..487bf5b8f545 100644
 279 
index 0a5f62e0efcc..487bf5b8f545 100644
280 
--- a/drivers/net/phy/mdio-mux-bcm-iproc.c
 280 
--- a/drivers/net/phy/mdio-mux-bcm-iproc.c
281 
+++ b/drivers/net/phy/mdio-mux-bcm-iproc.c
 281 
+++ b/drivers/net/phy/mdio-mux-bcm-iproc.c
282 
@@ -218,7 +218,7 @@ out:
 282 
@@ -218,7 +218,7 @@ static int mdio_mux_iproc_probe(struct platform_device *pdev)
283
283
284 
 static int mdio_mux_iproc_remove(struct platform_device *pdev)
 284 
 static int mdio_mux_iproc_remove(struct platform_device *pdev)
285 
 {
 285 
 {
 Lines 445-451    Link Here 
445 
 	TRACE("Number of ids %d\n", le16_to_cpu(sblk->no_ids));
 445 
 	TRACE("Number of ids %d\n", le16_to_cpu(sblk->no_ids));
446 
 	TRACE("sblk->inode_table_start %llx\n", msblk->inode_table);
 446 
 	TRACE("sblk->inode_table_start %llx\n", msblk->inode_table);
447 
 	TRACE("sblk->directory_table_start %llx\n", msblk->directory_table);
 447 
 	TRACE("sblk->directory_table_start %llx\n", msblk->directory_table);
448 
@@ -272,7 +273,7 @@ allocate_id_index_table:
 448 
@@ -272,7 +273,7 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent)
449 
 	sb->s_export_op = &squashfs_export_ops;
 449 
 	sb->s_export_op = &squashfs_export_ops;
450
450
451 
 handle_fragments:
 451 
 handle_fragments:
 Lines 573-579    Link Here 
573 
index 4bf3b8af0257..752711cd4834 100644
 573 
index 4bf3b8af0257..752711cd4834 100644
574 
--- a/net/ipv4/ip_fragment.c
 574 
--- a/net/ipv4/ip_fragment.c
575 
+++ b/net/ipv4/ip_fragment.c
 575 
+++ b/net/ipv4/ip_fragment.c
576 
@@ -446,11 +446,16 @@ found:
 576 
@@ -446,11 +446,16 @@ static int ip_frag_queue(struct ipq *qp, struct sk_buff *skb)
577 
 		int i = end - FRAG_CB(next)->offset; /* overlap is 'i' bytes */
 577 
 		int i = end - FRAG_CB(next)->offset; /* overlap is 'i' bytes */
578
578
579 
 		if (i < next->len) {
 579 
 		if (i < next->len) {
 Lines 755-761    Link Here 
755
755
756 
 	if (unlikely(tcp_try_rmem_schedule(sk, skb, skb->truesize))) {
 756 
 	if (unlikely(tcp_try_rmem_schedule(sk, skb, skb->truesize))) {
757 
 		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFODROP);
 757 
 		NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPOFODROP);
758 
@@ -4734,7 +4738,7 @@ queue_and_out:
 758 
@@ -4734,7 +4738,7 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
759 
 		tcp_dsack_set(sk, TCP_SKB_CB(skb)->seq, TCP_SKB_CB(skb)->end_seq);
 759 
 		tcp_dsack_set(sk, TCP_SKB_CB(skb)->seq, TCP_SKB_CB(skb)->end_seq);
760
760
761 
 out_of_window:
 761 
 out_of_window:
 Lines 764-770    Link Here 
764 
 		inet_csk_schedule_ack(sk);
 764 
 		inet_csk_schedule_ack(sk);
765 
 drop:
 765 
 drop:
766 
 		tcp_drop(sk, skb);
 766 
 		tcp_drop(sk, skb);
767 
@@ -4745,8 +4749,6 @@ drop:
 767 
@@ -4745,8 +4749,6 @@ static void tcp_data_queue(struct sock *sk, struct sk_buff *skb)
768 
 	if (!before(TCP_SKB_CB(skb)->seq, tp->rcv_nxt + tcp_receive_window(tp)))
 768 
 	if (!before(TCP_SKB_CB(skb)->seq, tp->rcv_nxt + tcp_receive_window(tp)))
769 
 		goto out_of_window;
 769 
 		goto out_of_window;
770
770
(-)patch-4.9.118-119 (-1 / +1 lines)
 Lines 420-426    Link Here 
420 
 coalesce_done:
 420 
 coalesce_done:
421 
 		tcp_grow_window(sk, skb);
 421 
 		tcp_grow_window(sk, skb);
422 
 		kfree_skb_partial(skb, fragstolen);
 422 
 		kfree_skb_partial(skb, fragstolen);
423 
@@ -4543,7 +4561,8 @@ coalesce_done:
 423 
@@ -4543,7 +4561,8 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb)
424 
 				tcp_drop(sk, skb1);
 424 
 				tcp_drop(sk, skb1);
425 
 				goto merge_right;
 425 
 				goto merge_right;
426 
 			}
 426 
 			}
(-)patch-4.9.119-120 (-6 / +6 lines)
 Lines 2027-2033    Link Here 
2027 
 static void __init spectre_v2_select_mitigation(void)
 2027 
 static void __init spectre_v2_select_mitigation(void)
2028 
 {
 2028 
 {
2029 
 	enum spectre_v2_mitigation_cmd cmd = spectre_v2_parse_cmdline();
 2029 
 	enum spectre_v2_mitigation_cmd cmd = spectre_v2_parse_cmdline();
2030 
@@ -387,22 +381,15 @@ retpoline_auto:
 2030 
@@ -387,22 +381,15 @@ static void __init spectre_v2_select_mitigation(void)
2031 
 	pr_info("%s\n", spectre_v2_strings[mode]);
 2031 
 	pr_info("%s\n", spectre_v2_strings[mode]);
2032
2032
2033 
 	/*
 2033 
 	/*
 Lines 2700-2706    Link Here 
2700
2700
2701 
 /* representing HT siblings of each logical CPU */
 2701 
 /* representing HT siblings of each logical CPU */
2702 
 DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_map);
 2702 
 DEFINE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_sibling_map);
2703 
@@ -295,6 +289,23 @@ found:
 2703 
@@ -295,6 +289,23 @@ int topology_update_package_map(unsigned int pkg, unsigned int cpu)
2704 
 	return 0;
 2704 
 	return 0;
2705 
 }
 2705 
 }
2706
2706
 Lines 3298-3304    Link Here 
3298 
 	asm(
 3298 
 	asm(
3299 
 		/* Store host registers */
 3299 
 		/* Store host registers */
3300 
 		"push %%" _ASM_DX "; push %%" _ASM_BP ";"
 3300 
 		"push %%" _ASM_DX "; push %%" _ASM_BP ";"
3301 
@@ -9298,6 +9549,37 @@ free_vcpu:
 3301 
@@ -9298,6 +9549,37 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
3302 
 	return ERR_PTR(err);
 3302 
 	return ERR_PTR(err);
3303 
 }
 3303 
 }
3304
3304
 Lines 4123-4129    Link Here 
4123 
index ae41623e0f13..0d4878efd643 100644
 4123 
index ae41623e0f13..0d4878efd643 100644
4124 
--- a/drivers/infiniband/hw/mlx4/mr.c
 4124 
--- a/drivers/infiniband/hw/mlx4/mr.c
4125 
+++ b/drivers/infiniband/hw/mlx4/mr.c
 4125 
+++ b/drivers/infiniband/hw/mlx4/mr.c
4126 
@@ -131,6 +131,40 @@ out:
 4126 
@@ -131,6 +131,40 @@ int mlx4_ib_umem_write_mtt(struct mlx4_ib_dev *dev, struct mlx4_mtt *mtt,
4127 
 	return err;
 4127 
 	return err;
4128 
 }
 4128 
 }
4129
4129
 Lines 4630-4636    Link Here 
4630
4630
4631 
 	inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
 4631 
 	inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
4632 
 	inode->i_mode = table->mode;
 4632 
 	inode->i_mode = table->mode;
4633 
@@ -466,6 +506,15 @@ out:
 4633 
@@ -466,6 +506,15 @@ static struct inode *proc_sys_make_inode(struct super_block *sb,
4634 
 	return inode;
 4634 
 	return inode;
4635 
 }
 4635 
 }
4636
4636
 Lines 4936-4942    Link Here 
4936
4936
4937 
 	/*
 4937 
 	/*
4938 
 	 * Prevent irq alloc/free while the dying cpu reorganizes the
 4938 
 	 * Prevent irq alloc/free while the dying cpu reorganizes the
4939 
@@ -956,20 +1045,19 @@ out:
 4939 
@@ -956,20 +1045,19 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
4940 
 	return ret;
 4940 
 	return ret;
4941 
 }
 4941 
 }
4942
4942

Return to bug 47063