diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-05-21 13:52:34 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-05-21 13:52:34 -0400 |
| commit | 015a5d6a3f22e81212709af9c5dac2ac83e37caf (patch) | |
| tree | e501dbf120a43be8665cdfef5a4dc217bcb5a164 | |
| parent | c6e842292cdf340081140fe390135d9d149fc356 (diff) | |
| download | longterm-queue-4.8-015a5d6a3f22e81212709af9c5dac2ac83e37caf.tar.gz | |
re-export patches to get all remaining SOB lines
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
165 files changed, 652 insertions, 512 deletions
diff --git a/queue/ACPI-blacklist-Make-Dell-Latitude-3350-ethernet-work.patch b/queue/ACPI-blacklist-Make-Dell-Latitude-3350-ethernet-work.patch index f873b96..67c42be 100644 --- a/queue/ACPI-blacklist-Make-Dell-Latitude-3350-ethernet-work.patch +++ b/queue/ACPI-blacklist-Make-Dell-Latitude-3350-ethernet-work.patch @@ -1,4 +1,4 @@ -From 708f5dcc21ae9b35f395865fc154b0105baf4de4 Mon Sep 17 00:00:00 2001 +From 5dc3221302af642709f7e89da713720125e50a25 Mon Sep 17 00:00:00 2001 From: Michael Pobega <mpobega@neverware.com> Date: Fri, 11 Nov 2016 22:29:14 -0500 Subject: [PATCH] ACPI / blacklist: Make Dell Latitude 3350 ethernet work @@ -13,6 +13,7 @@ Adding it to acpi_rev_dmi_table[] helps to work around this problem. Signed-off-by: Michael Pobega <mpobega@neverware.com> [ rjw: Changelog ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index 4f87fd748303..4421f7c9981c 100644 diff --git a/queue/ACPI-blacklist-add-_REV-quirks-for-Dell-Precision-55.patch b/queue/ACPI-blacklist-add-_REV-quirks-for-Dell-Precision-55.patch index 9823540..2d051a7 100644 --- a/queue/ACPI-blacklist-add-_REV-quirks-for-Dell-Precision-55.patch +++ b/queue/ACPI-blacklist-add-_REV-quirks-for-Dell-Precision-55.patch @@ -1,4 +1,4 @@ -From 9523b9bf6dceef6b0215e90b2348cd646597f796 Mon Sep 17 00:00:00 2001 +From 5a28d8bb5c6d2d6d63ffecc76804354467fa5bba Mon Sep 17 00:00:00 2001 From: Alex Hung <alex.hung@canonical.com> Date: Fri, 28 Oct 2016 11:54:04 -0700 Subject: [PATCH] ACPI / blacklist: add _REV quirks for Dell Precision 5520 and @@ -14,6 +14,7 @@ around those issues. Signed-off-by: Alex Hung <alex.hung@canonical.com> [ rjw: Changelog ] Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index bdc67bad61a7..4f87fd748303 100644 diff --git a/queue/Bluetooth-Add-another-AR3012-04ca-3018-device.patch b/queue/Bluetooth-Add-another-AR3012-04ca-3018-device.patch index dedeb3e..5545c33 100644 --- a/queue/Bluetooth-Add-another-AR3012-04ca-3018-device.patch +++ b/queue/Bluetooth-Add-another-AR3012-04ca-3018-device.patch @@ -1,4 +1,4 @@ -From 441ad62d6c3f131f1dbd7dcdd9cbe3f74dbd8501 Mon Sep 17 00:00:00 2001 +From 4839038cab02e51d097180bc10d6e7d2d319dd44 Mon Sep 17 00:00:00 2001 From: Dmitry Tunin <hanipouspilot@gmail.com> Date: Thu, 5 Jan 2017 13:19:53 +0300 Subject: [PATCH] Bluetooth: Add another AR3012 04ca:3018 device @@ -15,6 +15,7 @@ I: If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb Signed-off-by: Dmitry Tunin <hanipouspilot@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/bluetooth/ath3k.c b/drivers/bluetooth/ath3k.c index fadba88745dc..b793853ff05f 100644 @@ -37,10 +38,10 @@ index fadba88745dc..b793853ff05f 100644 { USB_DEVICE(0x0930, 0x021c), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x0930, 0x0220), .driver_info = BTUSB_ATH3012 }, diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c -index 0fe1c62d9345..1c8094ef3f22 100644 +index d4d55f60cd81..8c199c393662 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c -@@ -219,6 +219,7 @@ static const struct usb_device_id blacklist_table[] = { +@@ -208,6 +208,7 @@ static const struct usb_device_id blacklist_table[] = { { USB_DEVICE(0x04ca, 0x300f), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3010), .driver_info = BTUSB_ATH3012 }, { USB_DEVICE(0x04ca, 0x3014), .driver_info = BTUSB_ATH3012 }, diff --git a/queue/Drivers-hv-ring_buffer-count-on-wrap-around-mappings.patch b/queue/Drivers-hv-ring_buffer-count-on-wrap-around-mappings.patch index 7357921..e6c6a48 100644 --- a/queue/Drivers-hv-ring_buffer-count-on-wrap-around-mappings.patch +++ b/queue/Drivers-hv-ring_buffer-count-on-wrap-around-mappings.patch @@ -1,4 +1,4 @@ -From fa32ff6576623616c1751562edaed8c164ca5199 Mon Sep 17 00:00:00 2001 +From 0b4dcd31ca39e5af0ec5d9b1014aadcc6d3b1abe Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov <vkuznets@redhat.com> Date: Sun, 6 Nov 2016 13:14:05 -0800 Subject: [PATCH] Drivers: hv: ring_buffer: count on wrap around mappings in @@ -17,12 +17,13 @@ Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> Tested-by: Dexuan Cui <decui@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h -index 6824556d37ed..42ae6a5a2538 100644 +index b10954a66939..25d14df0e798 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h -@@ -1526,31 +1526,23 @@ static inline struct vmpacket_descriptor * +@@ -1431,31 +1431,23 @@ static inline struct vmpacket_descriptor * get_next_pkt_raw(struct vmbus_channel *channel) { struct hv_ring_buffer_info *ring_info = &channel->inbound; @@ -64,7 +65,7 @@ index 6824556d37ed..42ae6a5a2538 100644 } /* -@@ -1562,16 +1554,14 @@ static inline void put_pkt_raw(struct vmbus_channel *channel, +@@ -1467,16 +1459,14 @@ static inline void put_pkt_raw(struct vmbus_channel *channel, struct vmpacket_descriptor *desc) { struct hv_ring_buffer_info *ring_info = &channel->inbound; diff --git a/queue/IB-SRP-Avoid-using-IB_MR_TYPE_SG_GAPS.patch b/queue/IB-SRP-Avoid-using-IB_MR_TYPE_SG_GAPS.patch index 771f4f7..9939418 100644 --- a/queue/IB-SRP-Avoid-using-IB_MR_TYPE_SG_GAPS.patch +++ b/queue/IB-SRP-Avoid-using-IB_MR_TYPE_SG_GAPS.patch @@ -1,4 +1,4 @@ -From ab03cf46c9d3cb6b9278dc877a743b5f3ad6b8dc Mon Sep 17 00:00:00 2001 +From 68459692806a6df99b4337140aee9c4f1e610f19 Mon Sep 17 00:00:00 2001 From: Bart Van Assche <bart.vanassche@sandisk.com> Date: Tue, 14 Feb 2017 10:56:29 -0800 Subject: [PATCH] IB/SRP: Avoid using IB_MR_TYPE_SG_GAPS diff --git a/queue/IB-ipoib-Fix-deadlock-between-rmmod-and-set_mode.patch b/queue/IB-ipoib-Fix-deadlock-between-rmmod-and-set_mode.patch index 59e0e5d..66893fb 100644 --- a/queue/IB-ipoib-Fix-deadlock-between-rmmod-and-set_mode.patch +++ b/queue/IB-ipoib-Fix-deadlock-between-rmmod-and-set_mode.patch @@ -1,4 +1,4 @@ -From 0a0007f28304cb9fc87809c86abb80ec71317f20 Mon Sep 17 00:00:00 2001 +From efeea55ebe3ae1bf068d6975d612ba5666be2e44 Mon Sep 17 00:00:00 2001 From: Feras Daoud <ferasda@mellanox.com> Date: Wed, 28 Dec 2016 14:47:23 +0200 Subject: [PATCH] IB/ipoib: Fix deadlock between rmmod and set_mode @@ -58,12 +58,13 @@ Signed-off-by: Feras Daoud <ferasda@mellanox.com> Signed-off-by: Erez Shitrit <erezsh@mellanox.com> Signed-off-by: Leon Romanovsky <leon@kernel.org> Signed-off-by: Doug Ledford <dledford@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c -index 096c4f6fbd65..1c7a9a16efc7 100644 +index 81a8080c18b3..0616a65f0d78 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c -@@ -1507,12 +1507,14 @@ static ssize_t set_mode(struct device *d, struct device_attribute *attr, +@@ -1511,12 +1511,14 @@ static ssize_t set_mode(struct device *d, struct device_attribute *attr, ret = ipoib_set_mode(dev, buf); @@ -84,10 +85,10 @@ index 096c4f6fbd65..1c7a9a16efc7 100644 static DEVICE_ATTR(mode, S_IWUSR | S_IRUGO, show_mode, set_mode); diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c -index cbd06a882a60..045f844d7f4a 100644 +index 823a528ef4eb..8ca4df70c418 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c -@@ -492,8 +492,7 @@ int ipoib_set_mode(struct net_device *dev, const char *buf) +@@ -468,8 +468,7 @@ int ipoib_set_mode(struct net_device *dev, const char *buf) priv->tx_wr.wr.send_flags &= ~IB_SEND_IP_CSUM; ipoib_flush_paths(dev); @@ -97,7 +98,7 @@ index cbd06a882a60..045f844d7f4a 100644 } if (!strcmp(buf, "datagram\n")) { -@@ -502,8 +501,7 @@ int ipoib_set_mode(struct net_device *dev, const char *buf) +@@ -478,8 +477,7 @@ int ipoib_set_mode(struct net_device *dev, const char *buf) dev_set_mtu(dev, min(priv->mcast_mtu, dev->mtu)); rtnl_unlock(); ipoib_flush_paths(dev); diff --git a/queue/IB-mlx5-Fix-out-of-bound-access.patch b/queue/IB-mlx5-Fix-out-of-bound-access.patch index 44a9c82..52eda19 100644 --- a/queue/IB-mlx5-Fix-out-of-bound-access.patch +++ b/queue/IB-mlx5-Fix-out-of-bound-access.patch @@ -1,4 +1,4 @@ -From 0fd27a88c2e4f548937fd7d93fc6e65c4ad7c278 Mon Sep 17 00:00:00 2001 +From dfd95186902759043f491974a094bdf69d5c5341 Mon Sep 17 00:00:00 2001 From: Leon Romanovsky <leonro@mellanox.com> Date: Wed, 18 Jan 2017 14:10:30 +0200 Subject: [PATCH] IB/mlx5: Fix out-of-bound access @@ -15,12 +15,13 @@ Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Reviewed-by: Eli Cohen <eli@mellanox.com> Signed-off-by: Leon Romanovsky <leon@kernel.org> Signed-off-by: Doug Ledford <dledford@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c -index 6f4397ee1ed6..7cb145f9a6db 100644 +index 7d078a4bade9..e132267aab27 100644 --- a/drivers/infiniband/hw/mlx5/srq.c +++ b/drivers/infiniband/hw/mlx5/srq.c -@@ -165,8 +165,6 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq, +@@ -166,8 +166,6 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq, int err; int i; struct mlx5_wqe_srq_next_seg *next; @@ -29,7 +30,7 @@ index 6f4397ee1ed6..7cb145f9a6db 100644 err = mlx5_db_alloc(dev->mdev, &srq->db); if (err) { -@@ -179,7 +177,6 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq, +@@ -180,7 +178,6 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq, err = -ENOMEM; goto err_db; } @@ -37,7 +38,7 @@ index 6f4397ee1ed6..7cb145f9a6db 100644 srq->head = 0; srq->tail = srq->msrq.max - 1; -@@ -191,10 +188,8 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq, +@@ -192,10 +189,8 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq, cpu_to_be16((i + 1) & (srq->msrq.max - 1)); } @@ -50,7 +51,7 @@ index 6f4397ee1ed6..7cb145f9a6db 100644 if (!in->pas) { err = -ENOMEM; goto err_buf; -@@ -208,7 +203,7 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq, +@@ -211,7 +206,7 @@ static int create_srq_kernel(struct mlx5_ib_dev *dev, struct mlx5_ib_srq *srq, } srq->wq_sig = !!srq_signature; diff --git a/queue/IB-mlx5-Verify-that-Q-counters-are-supported.patch b/queue/IB-mlx5-Verify-that-Q-counters-are-supported.patch index d9ae0e2..f85df79 100644 --- a/queue/IB-mlx5-Verify-that-Q-counters-are-supported.patch +++ b/queue/IB-mlx5-Verify-that-Q-counters-are-supported.patch @@ -1,4 +1,4 @@ -From 976301d7327640809d0d61c19fa1ba069eea3587 Mon Sep 17 00:00:00 2001 +From 03be4e50d62c97cdf424966190f2643fecfad01a Mon Sep 17 00:00:00 2001 From: Kamal Heib <kamalh@mellanox.com> Date: Wed, 18 Jan 2017 14:10:32 +0200 Subject: [PATCH] IB/mlx5: Verify that Q counters are supported diff --git a/queue/IB-srp-Avoid-that-duplicate-responses-trigger-a-kern.patch b/queue/IB-srp-Avoid-that-duplicate-responses-trigger-a-kern.patch index d42bf81..e8708c8 100644 --- a/queue/IB-srp-Avoid-that-duplicate-responses-trigger-a-kern.patch +++ b/queue/IB-srp-Avoid-that-duplicate-responses-trigger-a-kern.patch @@ -1,4 +1,4 @@ -From 6cb72bc1b40bb2c1750ee7a5ebade93bed49a5fb Mon Sep 17 00:00:00 2001 +From f478535aa655e4339d98684130aa4bf10628ceac Mon Sep 17 00:00:00 2001 From: Bart Van Assche <bart.vanassche@sandisk.com> Date: Tue, 14 Feb 2017 10:56:30 -0800 Subject: [PATCH] IB/srp: Avoid that duplicate responses trigger a kernel bug @@ -34,12 +34,13 @@ Cc: Steve Feeley <Steve.Feeley@sandisk.com> Cc: <stable@vger.kernel.org> Reviewed-by: Leon Romanovsky <leonro@mellanox.com> Signed-off-by: Doug Ledford <dledford@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c -index 6e4467150049..a49289f600b1 100644 +index 092fb0481d45..3f02ffcc155e 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c -@@ -1892,9 +1892,11 @@ static void srp_process_rsp(struct srp_rdma_ch *ch, struct srp_rsp *rsp) +@@ -1877,9 +1877,11 @@ static void srp_process_rsp(struct srp_rdma_ch *ch, struct srp_rsp *rsp) complete(&ch->tsk_mgmt_done); } else { scmnd = scsi_host_find_tag(target->scsi_host, rsp->tag); diff --git a/queue/IB-srp-Fix-race-conditions-related-to-task-managemen.patch b/queue/IB-srp-Fix-race-conditions-related-to-task-managemen.patch index 1f08b54..5f5ed11 100644 --- a/queue/IB-srp-Fix-race-conditions-related-to-task-managemen.patch +++ b/queue/IB-srp-Fix-race-conditions-related-to-task-managemen.patch @@ -1,4 +1,4 @@ -From 0a6fdbdeb1c25e31763c1fb333fa2723a7d2aba6 Mon Sep 17 00:00:00 2001 +From 416d997d126d88ed36c43ec47ff69abefd710ecc Mon Sep 17 00:00:00 2001 From: Bart Van Assche <bart.vanassche@sandisk.com> Date: Tue, 14 Feb 2017 10:56:31 -0800 Subject: [PATCH] IB/srp: Fix race conditions related to task management @@ -39,12 +39,13 @@ Cc: Laurence Oberman <loberman@redhat.com> Cc: Steve Feeley <Steve.Feeley@sandisk.com> Cc: <stable@vger.kernel.org> Signed-off-by: Doug Ledford <dledford@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c -index a49289f600b1..d9b57f5958b5 100644 +index 3f02ffcc155e..e63840fb534d 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.c +++ b/drivers/infiniband/ulp/srp/ib_srp.c -@@ -1884,12 +1884,17 @@ static void srp_process_rsp(struct srp_rdma_ch *ch, struct srp_rsp *rsp) +@@ -1869,12 +1869,17 @@ static void srp_process_rsp(struct srp_rdma_ch *ch, struct srp_rsp *rsp) if (unlikely(rsp->tag & SRP_TAG_TSK_MGMT)) { spin_lock_irqsave(&ch->lock, flags); ch->req_lim += be32_to_cpu(rsp->req_lim_delta); @@ -67,7 +68,7 @@ index a49289f600b1..d9b57f5958b5 100644 } else { scmnd = scsi_host_find_tag(target->scsi_host, rsp->tag); if (scmnd && scmnd->host_scribble) { -@@ -2528,19 +2533,18 @@ srp_change_queue_depth(struct scsi_device *sdev, int qdepth) +@@ -2513,19 +2518,18 @@ srp_change_queue_depth(struct scsi_device *sdev, int qdepth) } static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag, u64 lun, @@ -89,7 +90,7 @@ index a49289f600b1..d9b57f5958b5 100644 /* * Lock the rport mutex to avoid that srp_create_ch_ib() is * invoked while a task management function is being sent. -@@ -2563,10 +2567,16 @@ static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag, u64 lun, +@@ -2548,10 +2552,16 @@ static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag, u64 lun, tsk_mgmt->opcode = SRP_TSK_MGMT; int_to_scsilun(lun, &tsk_mgmt->lun); @@ -107,7 +108,7 @@ index a49289f600b1..d9b57f5958b5 100644 ib_dma_sync_single_for_device(dev, iu->dma, sizeof *tsk_mgmt, DMA_TO_DEVICE); if (srp_post_send(ch, iu, sizeof(*tsk_mgmt))) { -@@ -2575,13 +2585,15 @@ static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag, u64 lun, +@@ -2560,13 +2570,15 @@ static int srp_send_tsk_mgmt(struct srp_rdma_ch *ch, u64 req_tag, u64 lun, return -1; } @@ -127,7 +128,7 @@ index a49289f600b1..d9b57f5958b5 100644 } static int srp_abort(struct scsi_cmnd *scmnd) -@@ -2607,7 +2619,7 @@ static int srp_abort(struct scsi_cmnd *scmnd) +@@ -2592,7 +2604,7 @@ static int srp_abort(struct scsi_cmnd *scmnd) shost_printk(KERN_ERR, target->scsi_host, "Sending SRP abort for tag %#x\n", tag); if (srp_send_tsk_mgmt(ch, tag, scmnd->device->lun, @@ -136,7 +137,7 @@ index a49289f600b1..d9b57f5958b5 100644 ret = SUCCESS; else if (target->rport->state == SRP_RPORT_LOST) ret = FAST_IO_FAIL; -@@ -2625,14 +2637,15 @@ static int srp_reset_device(struct scsi_cmnd *scmnd) +@@ -2610,14 +2622,15 @@ static int srp_reset_device(struct scsi_cmnd *scmnd) struct srp_target_port *target = host_to_target(scmnd->device->host); struct srp_rdma_ch *ch; int i; @@ -155,10 +156,10 @@ index a49289f600b1..d9b57f5958b5 100644 for (i = 0; i < target->ch_count; i++) { diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h -index 21c69695f9d4..32ed40db3ca2 100644 +index 26bb9b0a7a63..71a4c355e447 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.h +++ b/drivers/infiniband/ulp/srp/ib_srp.h -@@ -163,6 +163,7 @@ struct srp_rdma_ch { +@@ -164,6 +164,7 @@ struct srp_rdma_ch { int max_ti_iu_len; int comp_vector; diff --git a/queue/KVM-VMX-use-correct-vmcs_read-write-for-guest-segmen.patch b/queue/KVM-VMX-use-correct-vmcs_read-write-for-guest-segmen.patch index 6fe8764..e54aef4 100644 --- a/queue/KVM-VMX-use-correct-vmcs_read-write-for-guest-segmen.patch +++ b/queue/KVM-VMX-use-correct-vmcs_read-write-for-guest-segmen.patch @@ -1,4 +1,4 @@ -From 96794e4ed4d758272c486e1529e431efb7045265 Mon Sep 17 00:00:00 2001 +From a60fada65e5f7bba504fc14adba1837981b020a0 Mon Sep 17 00:00:00 2001 From: Chao Peng <chao.p.peng@linux.intel.com> Date: Tue, 21 Feb 2017 03:50:01 -0500 Subject: [PATCH] KVM: VMX: use correct vmcs_read/write for guest segment @@ -14,12 +14,13 @@ Without this patch, build fails when aggressive inlining is used with ICC. Cc: stable@vger.kernel.org Signed-off-by: Chao Peng <chao.p.peng@linux.intel.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c -index acf6013a0caf..ef4ba71dbb66 100644 +index 7a72db5350aa..fbc958ae7007 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c -@@ -3905,7 +3905,7 @@ static void fix_rmode_seg(int seg, struct kvm_segment *save) +@@ -3706,7 +3706,7 @@ static void fix_rmode_seg(int seg, struct kvm_segment *save) } vmcs_write16(sf->selector, var.selector); @@ -28,7 +29,7 @@ index acf6013a0caf..ef4ba71dbb66 100644 vmcs_write32(sf->limit, var.limit); vmcs_write32(sf->ar_bytes, vmx_segment_access_rights(&var)); } -@@ -8270,7 +8270,7 @@ static void kvm_flush_pml_buffers(struct kvm *kvm) +@@ -8158,7 +8158,7 @@ static void kvm_flush_pml_buffers(struct kvm *kvm) static void vmx_dump_sel(char *name, uint32_t sel) { pr_err("%s sel=0x%04x, attr=0x%05x, limit=0x%08x, base=0x%016lx\n", diff --git a/queue/KVM-arm-arm64-Let-vcpu-thread-modify-its-own-active-.patch b/queue/KVM-arm-arm64-Let-vcpu-thread-modify-its-own-active-.patch index 74103f8..388eef0 100644 --- a/queue/KVM-arm-arm64-Let-vcpu-thread-modify-its-own-active-.patch +++ b/queue/KVM-arm-arm64-Let-vcpu-thread-modify-its-own-active-.patch @@ -1,4 +1,4 @@ -From 370a0ec1819990f8e2a93df7cc9c0146980ed45f Mon Sep 17 00:00:00 2001 +From 805b437a442ba05c6d518675bd324e65bef7377b Mon Sep 17 00:00:00 2001 From: Jintack Lim <jintack@cs.columbia.edu> Date: Mon, 6 Mar 2017 05:42:37 -0800 Subject: [PATCH] KVM: arm/arm64: Let vcpu thread modify its own active state @@ -16,12 +16,13 @@ Reviewed-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Jintack Lim <jintack@cs.columbia.edu> Signed-off-by: Christoffer Dall <cdall@linaro.org> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/virt/kvm/arm/vgic/vgic-mmio.c b/virt/kvm/arm/vgic/vgic-mmio.c -index 3654b4c835ef..2a5db1352722 100644 +index d1b080ca8dc9..6519772dd55a 100644 --- a/virt/kvm/arm/vgic/vgic-mmio.c +++ b/virt/kvm/arm/vgic/vgic-mmio.c -@@ -180,21 +180,37 @@ unsigned long vgic_mmio_read_active(struct kvm_vcpu *vcpu, +@@ -187,21 +187,37 @@ unsigned long vgic_mmio_read_active(struct kvm_vcpu *vcpu, static void vgic_mmio_change_active(struct kvm_vcpu *vcpu, struct vgic_irq *irq, bool new_active_state) { diff --git a/queue/KVM-s390-Disable-dirty-log-retrieval-for-UCONTROL-gu.patch b/queue/KVM-s390-Disable-dirty-log-retrieval-for-UCONTROL-gu.patch index 3ae0f02..3648eef 100644 --- a/queue/KVM-s390-Disable-dirty-log-retrieval-for-UCONTROL-gu.patch +++ b/queue/KVM-s390-Disable-dirty-log-retrieval-for-UCONTROL-gu.patch @@ -1,4 +1,4 @@ -From e1e8a9624f7ba8ead4f056ff558ed070e86fa747 Mon Sep 17 00:00:00 2001 +From 09566f38ebe6ba634beb7a03d97f3f0755cb874b Mon Sep 17 00:00:00 2001 From: Janosch Frank <frankja@linux.vnet.ibm.com> Date: Thu, 2 Feb 2017 16:39:31 +0100 Subject: [PATCH] KVM: s390: Disable dirty log retrieval for UCONTROL guests @@ -22,12 +22,13 @@ Signed-off-by: Janosch Frank <frankja@linux.vnet.ibm.com> Reported-by: Martin Schwidefsky <schwidefsky@de.ibm.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c -index dabd3b15bf11..502de74ea984 100644 +index 31fc6408b374..080d210f2788 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c -@@ -442,6 +442,9 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, +@@ -432,6 +432,9 @@ int kvm_vm_ioctl_get_dirty_log(struct kvm *kvm, struct kvm_memory_slot *memslot; int is_dirty = 0; diff --git a/queue/KVM-s390-Fix-guest-migration-for-huge-guests-resulti.patch b/queue/KVM-s390-Fix-guest-migration-for-huge-guests-resulti.patch index a2d15ea..49b771f 100644 --- a/queue/KVM-s390-Fix-guest-migration-for-huge-guests-resulti.patch +++ b/queue/KVM-s390-Fix-guest-migration-for-huge-guests-resulti.patch @@ -1,4 +1,4 @@ -From 2e4d88009f57057df7672fa69a32b5224af54d37 Mon Sep 17 00:00:00 2001 +From 0fb93a77c839db06fb6776fd3920a94babb976f2 Mon Sep 17 00:00:00 2001 From: Janosch Frank <frankja@linux.vnet.ibm.com> Date: Thu, 2 Mar 2017 15:23:42 +0100 Subject: [PATCH] KVM: s390: Fix guest migration for huge guests resulting in @@ -21,12 +21,13 @@ Cc: <stable@vger.kernel.org> # 3.16+ Signed-off-by: Janosch Frank <frankja@linux.vnet.ibm.com> Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c -index b48dc5f1900b..463e5ef02304 100644 +index 38b70a3a0248..cd106a483e71 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c -@@ -608,12 +608,29 @@ void ptep_zap_key(struct mm_struct *mm, unsigned long addr, pte_t *ptep) +@@ -606,12 +606,29 @@ void ptep_zap_key(struct mm_struct *mm, unsigned long addr, pte_t *ptep) bool test_and_clear_guest_dirty(struct mm_struct *mm, unsigned long addr) { spinlock_t *ptl; diff --git a/queue/Linux-4.8.23.patch b/queue/Linux-4.8.23.patch index 5238496..c84bc69 100644 --- a/queue/Linux-4.8.23.patch +++ b/queue/Linux-4.8.23.patch @@ -1,4 +1,4 @@ -From e5683b668b3ab23a8e226fa56272be807fae3d8d Mon Sep 17 00:00:00 2001 +From 09840ec30e8ad541132f03108675def467ac58e7 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Sun, 21 May 2017 01:35:39 -0400 Subject: [PATCH] Linux 4.8.23 diff --git a/queue/MIPS-Update-ip27_defconfig-for-SCSI_DH-change.patch b/queue/MIPS-Update-ip27_defconfig-for-SCSI_DH-change.patch index f333801..d9b86b4 100644 --- a/queue/MIPS-Update-ip27_defconfig-for-SCSI_DH-change.patch +++ b/queue/MIPS-Update-ip27_defconfig-for-SCSI_DH-change.patch @@ -1,4 +1,4 @@ -From ea58fca1842a5dc410cae4167b01643db971a4e2 Mon Sep 17 00:00:00 2001 +From f7ccff68d86a96a55e386dc413ec2d0871847b56 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Wed, 11 Jan 2017 15:29:50 +0100 Subject: [PATCH] MIPS: Update ip27_defconfig for SCSI_DH change @@ -18,9 +18,10 @@ Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/15001/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig -index 2b74aee320a1..18f024967dcd 100644 +index a7979fd22ee3..e582069b44fd 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig @@ -133,7 +133,7 @@ CONFIG_LIBFC=m diff --git a/queue/MIPS-Update-lemote2f_defconfig-for-CPU_FREQ_STAT-cha.patch b/queue/MIPS-Update-lemote2f_defconfig-for-CPU_FREQ_STAT-cha.patch index b2d8f34..87eb2c2 100644 --- a/queue/MIPS-Update-lemote2f_defconfig-for-CPU_FREQ_STAT-cha.patch +++ b/queue/MIPS-Update-lemote2f_defconfig-for-CPU_FREQ_STAT-cha.patch @@ -1,4 +1,4 @@ -From b3f6046186ef45acfeebc5a59c9fb45cefc685e7 Mon Sep 17 00:00:00 2001 +From cb47f165880de90345814b79435acafc649e29d4 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Wed, 11 Jan 2017 15:29:49 +0100 Subject: [PATCH] MIPS: Update lemote2f_defconfig for CPU_FREQ_STAT change @@ -18,6 +18,7 @@ Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/15000/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/configs/lemote2f_defconfig b/arch/mips/configs/lemote2f_defconfig index 5da76e0e120f..0cdb431bff80 100644 diff --git a/queue/MIPS-ip22-Fix-ip28-build-for-modern-gcc.patch b/queue/MIPS-ip22-Fix-ip28-build-for-modern-gcc.patch index 48c8a8f..8549d2d 100644 --- a/queue/MIPS-ip22-Fix-ip28-build-for-modern-gcc.patch +++ b/queue/MIPS-ip22-Fix-ip28-build-for-modern-gcc.patch @@ -1,4 +1,4 @@ -From 23ca9b522383d3b9b7991d8586db30118992af4a Mon Sep 17 00:00:00 2001 +From 08424d146c9f6a9204d4391a2f6a3be51237f1cc Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Tue, 17 Jan 2017 16:18:46 +0100 Subject: [PATCH] MIPS: ip22: Fix ip28 build for modern gcc @@ -20,6 +20,7 @@ Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/15049/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/sgi-ip22/Platform b/arch/mips/sgi-ip22/Platform index b7a4b7e04c38..e8f6b3a42a48 100644 diff --git a/queue/MIPS-ip27-Disable-qlge-driver-in-defconfig.patch b/queue/MIPS-ip27-Disable-qlge-driver-in-defconfig.patch index 5f9d1e7..0e596cc 100644 --- a/queue/MIPS-ip27-Disable-qlge-driver-in-defconfig.patch +++ b/queue/MIPS-ip27-Disable-qlge-driver-in-defconfig.patch @@ -1,4 +1,4 @@ -From b617649468390713db1515ea79fc772d2eb897a8 Mon Sep 17 00:00:00 2001 +From 98479bccf891748d928157a31e867526176617d5 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Fri, 3 Feb 2017 17:43:50 +0100 Subject: [PATCH] MIPS: ip27: Disable qlge driver in defconfig @@ -25,9 +25,10 @@ Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/15197/ Signed-off-by: James Hogan <james.hogan@imgtec.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig -index 18f024967dcd..e582069b44fd 100644 +index 2b74aee320a1..a7979fd22ee3 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig @@ -205,7 +205,6 @@ CONFIG_MLX4_EN=m diff --git a/queue/MIPS-ralink-Cosmetic-change-to-prom_init.patch b/queue/MIPS-ralink-Cosmetic-change-to-prom_init.patch index 45f53be..0d7367c 100644 --- a/queue/MIPS-ralink-Cosmetic-change-to-prom_init.patch +++ b/queue/MIPS-ralink-Cosmetic-change-to-prom_init.patch @@ -1,4 +1,4 @@ -From 9c48568b3692f1a56cbf1935e4eea835e6b185b1 Mon Sep 17 00:00:00 2001 +From 566e2f8cfa1250f200a042fa5c4f68e6b812a7fc Mon Sep 17 00:00:00 2001 From: John Crispin <john@phrozen.org> Date: Tue, 20 Dec 2016 19:12:46 +0100 Subject: [PATCH] MIPS: ralink: Cosmetic change to prom_init(). @@ -13,6 +13,7 @@ Signed-off-by: John Crispin <john@phrozen.org> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/14902/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/ralink/prom.c b/arch/mips/ralink/prom.c index 5a73c5e14221..23198c9050e5 100644 diff --git a/queue/MIPS-ralink-Remove-unused-rt-_wdt_reset-functions.patch b/queue/MIPS-ralink-Remove-unused-rt-_wdt_reset-functions.patch index 6331184..f27b557 100644 --- a/queue/MIPS-ralink-Remove-unused-rt-_wdt_reset-functions.patch +++ b/queue/MIPS-ralink-Remove-unused-rt-_wdt_reset-functions.patch @@ -1,4 +1,4 @@ -From 886f9c69fc68f56ddea34d3de51ac1fc2ac8dfbc Mon Sep 17 00:00:00 2001 +From 0eb23e8d5035b75f543cc9aeadf7980e181fb357 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Tue, 17 Jan 2017 16:18:43 +0100 Subject: [PATCH] MIPS: ralink: Remove unused rt*_wdt_reset functions @@ -21,9 +21,10 @@ Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/15044/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/ralink/rt288x.c b/arch/mips/ralink/rt288x.c -index eeabd5119891..40d3a69c7016 100644 +index 285796e6d75c..2b76e3643869 100644 --- a/arch/mips/ralink/rt288x.c +++ b/arch/mips/ralink/rt288x.c @@ -40,16 +40,6 @@ static struct rt2880_pmx_group rt2880_pinmux_data_act[] = { @@ -44,7 +45,7 @@ index eeabd5119891..40d3a69c7016 100644 { unsigned long cpu_rate, wmac_rate = 40000000; diff --git a/arch/mips/ralink/rt305x.c b/arch/mips/ralink/rt305x.c -index f0b5ac444556..01f7cd38d631 100644 +index c8a28c4bf29e..e778e0b54ffb 100644 --- a/arch/mips/ralink/rt305x.c +++ b/arch/mips/ralink/rt305x.c @@ -89,17 +89,6 @@ static struct rt2880_pmx_group rt5350_pinmux_data[] = { @@ -66,7 +67,7 @@ index f0b5ac444556..01f7cd38d631 100644 { void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE); diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c -index f869052e4a0d..252b64114b48 100644 +index 4cef9162bd9b..3e0aa09c6b55 100644 --- a/arch/mips/ralink/rt3883.c +++ b/arch/mips/ralink/rt3883.c @@ -63,16 +63,6 @@ static struct rt2880_pmx_group rt3883_pinmux_data[] = { diff --git a/queue/PCI-Add-comments-about-ROM-BAR-updating.patch b/queue/PCI-Add-comments-about-ROM-BAR-updating.patch index 11c8958..a8950c5 100644 --- a/queue/PCI-Add-comments-about-ROM-BAR-updating.patch +++ b/queue/PCI-Add-comments-about-ROM-BAR-updating.patch @@ -1,4 +1,4 @@ -From 0b457dde3cf8b7c76a60f8e960f21bbd4abdc416 Mon Sep 17 00:00:00 2001 +From 9e6d27653c99760e74ef6c30f231eee31c0586c6 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bhelgaas@google.com> Date: Mon, 28 Nov 2016 16:17:41 -0600 Subject: [PATCH] PCI: Add comments about ROM BAR updating @@ -24,6 +24,7 @@ setup") and 8085ce084c0f ("[PATCH] Fix PCI ROM mapping"). Link: https://lkml.org/lkml/2005/8/30/138 Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c index 06663d391b39..b6edb187d160 100644 @@ -42,10 +43,10 @@ index 06663d391b39..b6edb187d160 100644 pci_read_config_dword(pdev, pdev->rom_base_reg, &rom_addr); rom_addr &= ~PCI_ROM_ADDRESS_MASK; diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c -index 99c9e32775ee..045427336e11 100644 +index 182d0f065a42..bd6fca91c736 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c -@@ -72,6 +72,12 @@ static void pci_std_update_resource(struct pci_dev *dev, int resno) +@@ -68,6 +68,12 @@ static void pci_std_update_resource(struct pci_dev *dev, int resno) if (resno < PCI_ROM_RESOURCE) { reg = PCI_BASE_ADDRESS_0 + 4 * resno; } else if (resno == PCI_ROM_RESOURCE) { diff --git a/queue/PCI-Decouple-IORESOURCE_ROM_ENABLE-and-PCI_ROM_ADDRE.patch b/queue/PCI-Decouple-IORESOURCE_ROM_ENABLE-and-PCI_ROM_ADDRE.patch index 068ab5f..5521853 100644 --- a/queue/PCI-Decouple-IORESOURCE_ROM_ENABLE-and-PCI_ROM_ADDRE.patch +++ b/queue/PCI-Decouple-IORESOURCE_ROM_ENABLE-and-PCI_ROM_ADDRE.patch @@ -1,4 +1,4 @@ -From 7a6d312b50e63f598f5b5914c4fd21878ac2b595 Mon Sep 17 00:00:00 2001 +From 2151cf8cd2948e417278ee80babf2fef106e8728 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bhelgaas@google.com> Date: Mon, 28 Nov 2016 17:21:02 -0600 Subject: [PATCH] PCI: Decouple IORESOURCE_ROM_ENABLE and @@ -13,9 +13,10 @@ IORESOURCE_ROM_ENABLE is a corresponding bit in struct resource flags. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c -index ab002671fa60..cf7670e81979 100644 +index 91699dbca446..6d7bab5c3c6f 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -227,7 +227,8 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, diff --git a/queue/PCI-Do-any-VF-BAR-updates-before-enabling-the-BARs.patch b/queue/PCI-Do-any-VF-BAR-updates-before-enabling-the-BARs.patch index 71e5483..5d49fc7 100644 --- a/queue/PCI-Do-any-VF-BAR-updates-before-enabling-the-BARs.patch +++ b/queue/PCI-Do-any-VF-BAR-updates-before-enabling-the-BARs.patch @@ -1,4 +1,4 @@ -From f40ec3c748c6912f6266c56a7f7992de61b255ed Mon Sep 17 00:00:00 2001 +From d730c408f6f8d4178df0af901c4255bf3d81206f Mon Sep 17 00:00:00 2001 From: Gavin Shan <gwshan@linux.vnet.ibm.com> Date: Wed, 26 Oct 2016 12:15:35 +1100 Subject: [PATCH] PCI: Do any VF BAR updates before enabling the BARs @@ -21,12 +21,13 @@ happen while the VF BARs are disabled. Tested-by: Carol Soto <clsoto@us.ibm.com> Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c -index e30f05c8517f..d41ec29be60b 100644 +index cd924b9b874d..479e35966a65 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c -@@ -306,13 +306,6 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) +@@ -303,13 +303,6 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) return rc; } @@ -40,7 +41,7 @@ index e30f05c8517f..d41ec29be60b 100644 iov->initial_VFs = initial; if (nr_virtfn < initial) initial = nr_virtfn; -@@ -323,6 +316,13 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) +@@ -320,6 +313,13 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn) goto err_pcibios; } diff --git a/queue/PCI-Don-t-update-VF-BARs-while-VF-memory-space-is-en.patch b/queue/PCI-Don-t-update-VF-BARs-while-VF-memory-space-is-en.patch index ca2fc46..aea8d88 100644 --- a/queue/PCI-Don-t-update-VF-BARs-while-VF-memory-space-is-en.patch +++ b/queue/PCI-Don-t-update-VF-BARs-while-VF-memory-space-is-en.patch @@ -1,4 +1,4 @@ -From 546ba9f8f22f71b0202b6ba8967be5cc6dae4e21 Mon Sep 17 00:00:00 2001 +From edbc201bd2bd85e1b4e8ab217e60bc0b5c7da0e9 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bhelgaas@google.com> Date: Mon, 28 Nov 2016 16:43:06 -0600 Subject: [PATCH] PCI: Don't update VF BARs while VF memory space is enabled @@ -20,12 +20,13 @@ programming error, so use dev_WARN() to get a backtrace. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c -index aa499543473f..2480b3879182 100644 +index f591b8fb029b..cd924b9b874d 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c -@@ -584,6 +584,7 @@ void pci_iov_update_resource(struct pci_dev *dev, int resno) +@@ -563,6 +563,7 @@ void pci_iov_update_resource(struct pci_dev *dev, int resno) struct resource *res = dev->resource + resno; int vf_bar = resno - PCI_IOV_RESOURCES; struct pci_bus_region region; @@ -33,7 +34,7 @@ index aa499543473f..2480b3879182 100644 u32 new; int reg; -@@ -595,6 +596,13 @@ void pci_iov_update_resource(struct pci_dev *dev, int resno) +@@ -574,6 +575,13 @@ void pci_iov_update_resource(struct pci_dev *dev, int resno) if (!iov) return; diff --git a/queue/PCI-Ignore-BAR-updates-on-virtual-functions.patch b/queue/PCI-Ignore-BAR-updates-on-virtual-functions.patch index 1994a75..353d212 100644 --- a/queue/PCI-Ignore-BAR-updates-on-virtual-functions.patch +++ b/queue/PCI-Ignore-BAR-updates-on-virtual-functions.patch @@ -1,4 +1,4 @@ -From bb4c01aed1a74fbc83d3d3cd2e8284bbbab653f5 Mon Sep 17 00:00:00 2001 +From 522e7c56f8bd4ea94f066b6c27d3956196933d32 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bhelgaas@google.com> Date: Mon, 28 Nov 2016 11:19:27 -0600 Subject: [PATCH] PCI: Ignore BAR updates on virtual functions diff --git a/queue/PCI-Prevent-VPD-access-for-QLogic-ISP2722.patch b/queue/PCI-Prevent-VPD-access-for-QLogic-ISP2722.patch index 5b59ba1..4af0f7d 100644 --- a/queue/PCI-Prevent-VPD-access-for-QLogic-ISP2722.patch +++ b/queue/PCI-Prevent-VPD-access-for-QLogic-ISP2722.patch @@ -1,4 +1,4 @@ -From 0d5370d1d85251e5893ab7c90a429464de2e140b Mon Sep 17 00:00:00 2001 +From 4bc01cf183fd54a081432d80816f465b41422071 Mon Sep 17 00:00:00 2001 From: Ethan Zhao <ethan.zhao@oracle.com> Date: Mon, 27 Feb 2017 17:08:44 +0900 Subject: [PATCH] PCI: Prevent VPD access for QLogic ISP2722 @@ -60,12 +60,13 @@ So blacklist the access to its VPD. Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: stable@vger.kernel.org # v4.6+ +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index f754453fe754..673683660b5c 100644 +index 8f04d511843f..2a4b682cb861 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -2174,6 +2174,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_LSI_LOGIC, 0x005d, quirk_blacklist_vpd); +@@ -2162,6 +2162,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_LSI_LOGIC, 0x005d, quirk_blacklist_vpd); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_LSI_LOGIC, 0x005f, quirk_blacklist_vpd); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATTANSIC, PCI_ANY_ID, quirk_blacklist_vpd); diff --git a/queue/PCI-Remove-pci_resource_bar-and-pci_iov_resource_bar.patch b/queue/PCI-Remove-pci_resource_bar-and-pci_iov_resource_bar.patch index b19e2be..fb13f5a 100644 --- a/queue/PCI-Remove-pci_resource_bar-and-pci_iov_resource_bar.patch +++ b/queue/PCI-Remove-pci_resource_bar-and-pci_iov_resource_bar.patch @@ -1,4 +1,4 @@ -From f855fc1c72b39a681f4946e31c612b96b8f05e75 Mon Sep 17 00:00:00 2001 +From 988b9dee5ef3d10af32dc6653675863f8ba887a1 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bhelgaas@google.com> Date: Mon, 28 Nov 2016 16:51:19 -0600 Subject: [PATCH] PCI: Remove pci_resource_bar() and pci_iov_resource_bar() diff --git a/queue/PCI-Separate-VF-BAR-updates-from-standard-BAR-update.patch b/queue/PCI-Separate-VF-BAR-updates-from-standard-BAR-update.patch index ad66545..133a17c 100644 --- a/queue/PCI-Separate-VF-BAR-updates-from-standard-BAR-update.patch +++ b/queue/PCI-Separate-VF-BAR-updates-from-standard-BAR-update.patch @@ -1,4 +1,4 @@ -From 6ffa2489c51da77564a0881a73765ea2169f955d Mon Sep 17 00:00:00 2001 +From 0bb2e52b39477c99cd9b4280b79fd9d2dda84d95 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bhelgaas@google.com> Date: Mon, 28 Nov 2016 09:15:52 -0600 Subject: [PATCH] PCI: Separate VF BAR updates from standard BAR updates @@ -22,12 +22,13 @@ No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c -index d41ec29be60b..aa499543473f 100644 +index 2194b447201d..f72968508a0d 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c -@@ -571,6 +571,56 @@ int pci_iov_resource_bar(struct pci_dev *dev, int resno) +@@ -568,6 +568,56 @@ int pci_iov_resource_bar(struct pci_dev *dev, int resno) 4 * (resno - PCI_IOV_RESOURCES); } @@ -85,10 +86,10 @@ index d41ec29be60b..aa499543473f 100644 int resno) { diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h -index 451856210e18..5bfcb922f7f7 100644 +index 9730c474b016..517bc2677489 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h -@@ -290,6 +290,7 @@ static inline void pci_restore_ats_state(struct pci_dev *dev) +@@ -287,6 +287,7 @@ static inline void pci_restore_ats_state(struct pci_dev *dev) int pci_iov_init(struct pci_dev *dev); void pci_iov_release(struct pci_dev *dev); int pci_iov_resource_bar(struct pci_dev *dev, int resno); @@ -97,7 +98,7 @@ index 451856210e18..5bfcb922f7f7 100644 void pci_restore_iov_state(struct pci_dev *dev); int pci_iov_bus_range(struct pci_bus *bus); diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c -index 53bc0638cac6..5ddeb6737f99 100644 +index 9526e341988b..695f32daf466 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c @@ -25,8 +25,7 @@ @@ -110,7 +111,7 @@ index 53bc0638cac6..5ddeb6737f99 100644 { struct pci_bus_region region; bool disable; -@@ -114,6 +113,16 @@ void pci_update_resource(struct pci_dev *dev, int resno) +@@ -110,6 +109,16 @@ void pci_update_resource(struct pci_dev *dev, int resno) pci_write_config_word(dev, PCI_COMMAND, cmd); } diff --git a/queue/PCI-Update-BARs-using-property-bits-appropriate-for-.patch b/queue/PCI-Update-BARs-using-property-bits-appropriate-for-.patch index 5b1c150..d7a845a 100644 --- a/queue/PCI-Update-BARs-using-property-bits-appropriate-for-.patch +++ b/queue/PCI-Update-BARs-using-property-bits-appropriate-for-.patch @@ -1,4 +1,4 @@ -From 1b13cc4e45b11c2271ef08a779b58b0bad63636d Mon Sep 17 00:00:00 2001 +From 5a8965f50079233ca525aa965a493d20eede67b7 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bhelgaas@google.com> Date: Tue, 29 Nov 2016 08:14:47 -0600 Subject: [PATCH] PCI: Update BARs using property bits appropriate for type diff --git a/queue/USB-iowarrior-fix-NULL-deref-at-probe.patch b/queue/USB-iowarrior-fix-NULL-deref-at-probe.patch index fbdfef2..bbe4dc9 100644 --- a/queue/USB-iowarrior-fix-NULL-deref-at-probe.patch +++ b/queue/USB-iowarrior-fix-NULL-deref-at-probe.patch @@ -1,4 +1,4 @@ -From b7321e81fc369abe353cf094d4f0dc2fe11ab95f Mon Sep 17 00:00:00 2001 +From 6fb61edb12519ff231fb8db34829a70d32ff1e3a Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Tue, 7 Mar 2017 16:11:03 +0100 Subject: [PATCH] USB: iowarrior: fix NULL-deref at probe @@ -18,12 +18,13 @@ Fixes: 946b960d13c1 ("USB: add driver for iowarrior devices.") Cc: stable <stable@vger.kernel.org> # 2.6.21 Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c -index 095778ff984d..3ad058cbe6ca 100644 +index 1950e87b4219..e4d17878743e 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c -@@ -781,12 +781,6 @@ static int iowarrior_probe(struct usb_interface *interface, +@@ -787,12 +787,6 @@ static int iowarrior_probe(struct usb_interface *interface, iface_desc = interface->cur_altsetting; dev->product_id = le16_to_cpu(udev->descriptor.idProduct); @@ -36,7 +37,7 @@ index 095778ff984d..3ad058cbe6ca 100644 /* set up the endpoint information */ for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) { endpoint = &iface_desc->endpoint[i].desc; -@@ -797,6 +791,13 @@ static int iowarrior_probe(struct usb_interface *interface, +@@ -803,6 +797,13 @@ static int iowarrior_probe(struct usb_interface *interface, /* this one will match for the IOWarrior56 only */ dev->int_out_endpoint = endpoint; } diff --git a/queue/USB-iowarrior-fix-NULL-deref-in-write.patch b/queue/USB-iowarrior-fix-NULL-deref-in-write.patch index 4e72546..84f5c04 100644 --- a/queue/USB-iowarrior-fix-NULL-deref-in-write.patch +++ b/queue/USB-iowarrior-fix-NULL-deref-in-write.patch @@ -1,4 +1,4 @@ -From de46e56653de7b3b54baa625bd582635008b8d05 Mon Sep 17 00:00:00 2001 +From 863b6850d8e8428e5fd5a21ef02609d6254439d3 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Tue, 7 Mar 2017 16:11:04 +0100 Subject: [PATCH] USB: iowarrior: fix NULL-deref in write @@ -13,12 +13,13 @@ Fixes: 946b960d13c1 ("USB: add driver for iowarrior devices.") Cc: stable <stable@vger.kernel.org> # 2.6.21 Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c -index 3ad058cbe6ca..37c63cb39714 100644 +index e4d17878743e..775690bed4c0 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c -@@ -798,6 +798,14 @@ static int iowarrior_probe(struct usb_interface *interface, +@@ -804,6 +804,14 @@ static int iowarrior_probe(struct usb_interface *interface, goto error; } diff --git a/queue/USB-serial-digi_acceleport-fix-OOB-data-sanity-check.patch b/queue/USB-serial-digi_acceleport-fix-OOB-data-sanity-check.patch index 74cead8..cd02588 100644 --- a/queue/USB-serial-digi_acceleport-fix-OOB-data-sanity-check.patch +++ b/queue/USB-serial-digi_acceleport-fix-OOB-data-sanity-check.patch @@ -1,4 +1,4 @@ -From 2d380889215fe20b8523345649dee0579821800c Mon Sep 17 00:00:00 2001 +From f4ef71028b5707e8d7acca89aaa4bf7a85b685c0 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Tue, 31 Jan 2017 17:17:27 +0100 Subject: [PATCH] USB: serial: digi_acceleport: fix OOB data sanity check @@ -16,6 +16,7 @@ Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable <stable@vger.kernel.org> # v2.6.30 Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Johan Hovold <johan@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index 6a1df9e824ca..3b610f1e3f7c 100644 diff --git a/queue/USB-serial-io_ti-fix-NULL-deref-in-interrupt-callbac.patch b/queue/USB-serial-io_ti-fix-NULL-deref-in-interrupt-callbac.patch index 7608d66..c8ceeb0 100644 --- a/queue/USB-serial-io_ti-fix-NULL-deref-in-interrupt-callbac.patch +++ b/queue/USB-serial-io_ti-fix-NULL-deref-in-interrupt-callbac.patch @@ -1,4 +1,4 @@ -From 0b1d250afb8eb9d65afb568bac9b9f9253a82b49 Mon Sep 17 00:00:00 2001 +From 26a6fcb4dea0bb89a4bc26807aecb33a852d7412 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Mon, 6 Mar 2017 17:36:37 +0100 Subject: [PATCH] USB: serial: io_ti: fix NULL-deref in interrupt callback @@ -12,9 +12,10 @@ missing sanity check. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable <stable@vger.kernel.org> Signed-off-by: Johan Hovold <johan@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c -index ceaeebaa6f90..4561dd4cde8b 100644 +index c02808a30436..67d68b502a51 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c @@ -1674,6 +1674,12 @@ static void edge_interrupt_callback(struct urb *urb) diff --git a/queue/USB-serial-io_ti-fix-information-leak-in-completion-.patch b/queue/USB-serial-io_ti-fix-information-leak-in-completion-.patch index 42c0b96..d8612cd 100644 --- a/queue/USB-serial-io_ti-fix-information-leak-in-completion-.patch +++ b/queue/USB-serial-io_ti-fix-information-leak-in-completion-.patch @@ -1,4 +1,4 @@ -From 654b404f2a222f918af9b0cd18ad469d0c941a8e Mon Sep 17 00:00:00 2001 +From d8ba906847ab628f0ede67cadd9c4c855a662d20 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Mon, 6 Mar 2017 17:36:40 +0100 Subject: [PATCH] USB: serial: io_ti: fix information leak in completion @@ -16,9 +16,10 @@ Fixes: 8c209e6782ca ("USB: make actual_length in struct urb field u32") Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable <stable@vger.kernel.org> # 2.6.30 Signed-off-by: Johan Hovold <johan@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/serial/io_ti.c b/drivers/usb/serial/io_ti.c -index 4561dd4cde8b..a76b95d32157 100644 +index 67d68b502a51..f1a8fdcd8674 100644 --- a/drivers/usb/serial/io_ti.c +++ b/drivers/usb/serial/io_ti.c @@ -1761,7 +1761,7 @@ static void edge_bulk_in_callback(struct urb *urb) diff --git a/queue/USB-serial-omninet-fix-reference-leaks-at-open.patch b/queue/USB-serial-omninet-fix-reference-leaks-at-open.patch index cb62605..7a77d7d 100644 --- a/queue/USB-serial-omninet-fix-reference-leaks-at-open.patch +++ b/queue/USB-serial-omninet-fix-reference-leaks-at-open.patch @@ -1,4 +1,4 @@ -From 30572418b445d85fcfe6c8fe84c947d2606767d8 Mon Sep 17 00:00:00 2001 +From 864e9f46045ec43e1e8f36f5dca34cad2da6a475 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Mon, 6 Mar 2017 17:36:38 +0100 Subject: [PATCH] USB: serial: omninet: fix reference leaks at open @@ -13,6 +13,7 @@ driver from being unloaded after a port had once been opened. Fixes: 4a90f09b20f4 ("tty: usb-serial krefs") Cc: stable <stable@vger.kernel.org> # 2.6.28 Signed-off-by: Johan Hovold <johan@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/serial/omninet.c b/drivers/usb/serial/omninet.c index a180b17d2432..76564b3bebb9 100644 diff --git a/queue/USB-serial-safe_serial-fix-information-leak-in-compl.patch b/queue/USB-serial-safe_serial-fix-information-leak-in-compl.patch index 28dc585..f8a778e 100644 --- a/queue/USB-serial-safe_serial-fix-information-leak-in-compl.patch +++ b/queue/USB-serial-safe_serial-fix-information-leak-in-compl.patch @@ -1,4 +1,4 @@ -From 8c76d7cd520ebffc1ea9ea0850d87a224a50c7f2 Mon Sep 17 00:00:00 2001 +From e37e54513f05d81def171ed2a4c3920c29c79732 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Mon, 6 Mar 2017 17:36:41 +0100 Subject: [PATCH] USB: serial: safe_serial: fix information leak in completion @@ -15,6 +15,7 @@ user space. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable <stable@vger.kernel.org> Signed-off-by: Johan Hovold <johan@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/serial/safe_serial.c b/drivers/usb/serial/safe_serial.c index 93c6c9b08daa..8a069aa154ed 100644 diff --git a/queue/act_connmark-avoid-crashing-on-malformed-nlattrs-wit.patch b/queue/act_connmark-avoid-crashing-on-malformed-nlattrs-wit.patch index 5dbaf12..0862546 100644 --- a/queue/act_connmark-avoid-crashing-on-malformed-nlattrs-wit.patch +++ b/queue/act_connmark-avoid-crashing-on-malformed-nlattrs-wit.patch @@ -1,4 +1,4 @@ -From 52491c7607c5527138095edf44c53169dc1ddb82 Mon Sep 17 00:00:00 2001 +From 8538e7c3f5abf45261e86cf6988ec227c4dc92a3 Mon Sep 17 00:00:00 2001 From: Etienne Noss <etienne.noss@wifirst.fr> Date: Fri, 10 Mar 2017 16:55:32 +0100 Subject: [PATCH] act_connmark: avoid crashing on malformed nlattrs with null @@ -39,9 +39,10 @@ Signed-off-by: Étienne Noss <etienne.noss@wifirst.fr> Signed-off-by: Victorien Molle <victorien.molle@wifirst.fr> Acked-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/sched/act_connmark.c b/net/sched/act_connmark.c -index ab8062909962..f9bb43c25697 100644 +index eae07a2e774d..1191179c0341 100644 --- a/net/sched/act_connmark.c +++ b/net/sched/act_connmark.c @@ -113,6 +113,9 @@ static int tcf_connmark_init(struct net *net, struct nlattr *nla, diff --git a/queue/block-allow-WRITE_SAME-commands-with-the-SG_IO-ioctl.patch b/queue/block-allow-WRITE_SAME-commands-with-the-SG_IO-ioctl.patch index e11aaf5..45e2ecb 100644 --- a/queue/block-allow-WRITE_SAME-commands-with-the-SG_IO-ioctl.patch +++ b/queue/block-allow-WRITE_SAME-commands-with-the-SG_IO-ioctl.patch @@ -1,4 +1,4 @@ -From 25cdb64510644f3e854d502d69c73f21c6df88a9 Mon Sep 17 00:00:00 2001 +From ad0eb9ac8a859ca2f02fdd4767b9ca0712ed4277 Mon Sep 17 00:00:00 2001 From: Mauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com> Date: Thu, 15 Dec 2016 11:48:18 -0600 Subject: [PATCH] block: allow WRITE_SAME commands with the SG_IO ioctl @@ -57,6 +57,7 @@ Signed-off-by: Brahadambal Srinivasan <latha@linux.vnet.ibm.com> Reported-by: Manjunatha H R <manjuhr1@in.ibm.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Jens Axboe <axboe@fb.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 0774799942e0..c6fee7437be4 100644 diff --git a/queue/brcmfmac-fix-incorrect-event-channel-deduction.patch b/queue/brcmfmac-fix-incorrect-event-channel-deduction.patch index 3875718..4dc83c8 100644 --- a/queue/brcmfmac-fix-incorrect-event-channel-deduction.patch +++ b/queue/brcmfmac-fix-incorrect-event-channel-deduction.patch @@ -1,4 +1,4 @@ -From 8e290cecdd0178f3d4cf7d463c51dc7e462843b4 Mon Sep 17 00:00:00 2001 +From 61a83a6fe62742914e388a647932290adcebee09 Mon Sep 17 00:00:00 2001 From: Gavin Li <git@thegavinli.com> Date: Tue, 17 Jan 2017 15:24:05 -0800 Subject: [PATCH] brcmfmac: fix incorrect event channel deduction @@ -19,12 +19,13 @@ Cc: <stable@vger.kernel.org> # 4.7+ Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com> [kvalo@codeaurora.org: improve commit logs based on email discussion] Signed-off-by: Kalle Valo <kvalo@codeaurora.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -index dfb0658713d9..d2219885071f 100644 +index 68ab3ac15650..1bc79632fd40 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c -@@ -1661,7 +1661,7 @@ static u8 brcmf_sdio_rxglom(struct brcmf_sdio *bus, u8 rxseq) +@@ -1653,7 +1653,7 @@ static u8 brcmf_sdio_rxglom(struct brcmf_sdio *bus, u8 rxseq) pfirst->len, pfirst->next, pfirst->prev); skb_unlink(pfirst, &bus->glom); diff --git a/queue/bridge-drop-netfilter-fake-rtable-unconditionally.patch b/queue/bridge-drop-netfilter-fake-rtable-unconditionally.patch index 0eda90a..fd44284 100644 --- a/queue/bridge-drop-netfilter-fake-rtable-unconditionally.patch +++ b/queue/bridge-drop-netfilter-fake-rtable-unconditionally.patch @@ -1,4 +1,4 @@ -From a13b2082ece95247779b9995c4e91b4246bed023 Mon Sep 17 00:00:00 2001 +From 59461216d0cf93b0df5c8a30668c5cf4591aebea Mon Sep 17 00:00:00 2001 From: Florian Westphal <fw@strlen.de> Date: Mon, 13 Mar 2017 17:38:17 +0100 Subject: [PATCH] bridge: drop netfilter fake rtable unconditionally @@ -25,12 +25,13 @@ Debugged-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: Florian Westphal <fw@strlen.de> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c -index 236f34244dbe..013f2290bfa5 100644 +index abe11f085479..7708fa408b03 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -30,6 +30,7 @@ EXPORT_SYMBOL(br_should_route_hook); +@@ -29,6 +29,7 @@ EXPORT_SYMBOL(br_should_route_hook); static int br_netif_receive_skb(struct net *net, struct sock *sk, struct sk_buff *skb) { @@ -39,10 +40,10 @@ index 236f34244dbe..013f2290bfa5 100644 } diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c -index 95087e6e8258..fa87fbd62bb7 100644 +index 77e7f69bf80d..7690bc0f7bb8 100644 --- a/net/bridge/br_netfilter_hooks.c +++ b/net/bridge/br_netfilter_hooks.c -@@ -521,21 +521,6 @@ static unsigned int br_nf_pre_routing(void *priv, +@@ -523,21 +523,6 @@ static unsigned int br_nf_pre_routing(void *priv, } diff --git a/queue/ceph-remove-req-from-unsafe-list-when-unregistering-.patch b/queue/ceph-remove-req-from-unsafe-list-when-unregistering-.patch index d591c9f..0d7cd85 100644 --- a/queue/ceph-remove-req-from-unsafe-list-when-unregistering-.patch +++ b/queue/ceph-remove-req-from-unsafe-list-when-unregistering-.patch @@ -1,4 +1,4 @@ -From df963ea8a082d31521a120e8e31a29ad8a1dc215 Mon Sep 17 00:00:00 2001 +From 0a1bb866df4ad0e6d9611d9b2d3f51d7af4b864e Mon Sep 17 00:00:00 2001 From: Jeff Layton <jlayton@redhat.com> Date: Tue, 14 Feb 2017 10:09:40 -0500 Subject: [PATCH] ceph: remove req from unsafe list when unregistering it @@ -13,12 +13,13 @@ Link: http://tracker.ceph.com/issues/18474 Signed-off-by: Jeff Layton <jlayton@redhat.com> Reviewed-by: Yan, Zheng <zyan@redhat.com> Signed-off-by: Ilya Dryomov <idryomov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c -index 52521f339745..fdbc3544e41c 100644 +index fe11afc15cdc..2f470b604a17 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c -@@ -628,6 +628,9 @@ static void __unregister_request(struct ceph_mds_client *mdsc, +@@ -627,6 +627,9 @@ static void __unregister_request(struct ceph_mds_client *mdsc, { dout("__unregister_request %p tid %lld\n", req, req->r_tid); @@ -28,7 +29,7 @@ index 52521f339745..fdbc3544e41c 100644 if (req->r_tid == mdsc->oldest_tid) { struct rb_node *p = rb_next(&req->r_node); mdsc->oldest_tid = 0; -@@ -1058,7 +1061,6 @@ static void cleanup_session_requests(struct ceph_mds_client *mdsc, +@@ -1035,7 +1038,6 @@ static void cleanup_session_requests(struct ceph_mds_client *mdsc, while (!list_empty(&session->s_unsafe)) { req = list_first_entry(&session->s_unsafe, struct ceph_mds_request, r_unsafe_item); @@ -36,7 +37,7 @@ index 52521f339745..fdbc3544e41c 100644 pr_warn_ratelimited(" dropping unsafe request %llu\n", req->r_tid); __unregister_request(mdsc, req); -@@ -2469,7 +2471,6 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) +@@ -2419,7 +2421,6 @@ static void handle_reply(struct ceph_mds_session *session, struct ceph_msg *msg) * useful we could do with a revised return value. */ dout("got safe reply %llu, mds%d\n", tid, mds); diff --git a/queue/clk-bcm2835-Fix-fixed_divider-of-pllh_aux.patch b/queue/clk-bcm2835-Fix-fixed_divider-of-pllh_aux.patch index 233503b..124ea18 100644 --- a/queue/clk-bcm2835-Fix-fixed_divider-of-pllh_aux.patch +++ b/queue/clk-bcm2835-Fix-fixed_divider-of-pllh_aux.patch @@ -1,4 +1,4 @@ -From f2a46926aba1f0c33944901d2420a6a887455ddc Mon Sep 17 00:00:00 2001 +From 7f02e07706c0501847a14eac8d9cb95474361754 Mon Sep 17 00:00:00 2001 From: Boris Brezillon <boris.brezillon@free-electrons.com> Date: Tue, 22 Nov 2016 12:45:28 -0800 Subject: [PATCH] clk: bcm2835: Fix ->fixed_divider of pllh_aux @@ -11,12 +11,13 @@ Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Eric Anholt <eric@anholt.net> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c -index 8c7763fd9efc..836d07550be3 100644 +index 3250694fd793..da13ff04982a 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c -@@ -1596,7 +1596,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { +@@ -1584,7 +1584,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .a2w_reg = A2W_PLLH_AUX, .load_mask = CM_PLLH_LOADAUX, .hold_mask = 0, diff --git a/queue/cpmac-remove-hopeless-warning.patch b/queue/cpmac-remove-hopeless-warning.patch index 39c0a2c..3def9d2 100644 --- a/queue/cpmac-remove-hopeless-warning.patch +++ b/queue/cpmac-remove-hopeless-warning.patch @@ -1,4 +1,4 @@ -From d43e6fb4ac4abfe4ef7c102833ed02330ad701e0 Mon Sep 17 00:00:00 2001 +From 30aa5608d8c66ebed4475d987471461850902d0a Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Mon, 16 Jan 2017 14:20:54 +0100 Subject: [PATCH] cpmac: remove hopeless #warning @@ -15,12 +15,13 @@ noise. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/ti/cpmac.c b/drivers/net/ethernet/ti/cpmac.c -index 77c88fcf2b86..9b8a30bf939b 100644 +index d300d536d06f..2f5956189f0b 100644 --- a/drivers/net/ethernet/ti/cpmac.c +++ b/drivers/net/ethernet/ti/cpmac.c -@@ -1210,7 +1210,7 @@ int cpmac_init(void) +@@ -1209,7 +1209,7 @@ int cpmac_init(void) goto fail_alloc; } diff --git a/queue/crypto-improve-gcc-optimization-flags-for-serpent-an.patch b/queue/crypto-improve-gcc-optimization-flags-for-serpent-an.patch index 93f8dfb..e52d994 100644 --- a/queue/crypto-improve-gcc-optimization-flags-for-serpent-an.patch +++ b/queue/crypto-improve-gcc-optimization-flags-for-serpent-an.patch @@ -1,4 +1,4 @@ -From bf9949ba5894e80befe7bb8c6375260764af311b Mon Sep 17 00:00:00 2001 +From c011a44425ad421621b289f6b75a118ebf96b641 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Fri, 3 Feb 2017 23:33:23 +0100 Subject: [PATCH] crypto: improve gcc optimization flags for serpent and wp512 diff --git a/queue/crypto-powerpc-Fix-initialisation-of-crc32c-context.patch b/queue/crypto-powerpc-Fix-initialisation-of-crc32c-context.patch index 3a28a2e..21b458e 100644 --- a/queue/crypto-powerpc-Fix-initialisation-of-crc32c-context.patch +++ b/queue/crypto-powerpc-Fix-initialisation-of-crc32c-context.patch @@ -1,4 +1,4 @@ -From aa2be9b3d6d2d699e9ca7cbfc00867c80e5da213 Mon Sep 17 00:00:00 2001 +From 5f493404265a7e663fde51cdeffcc63cbe897c73 Mon Sep 17 00:00:00 2001 From: Daniel Axtens <dja@axtens.net> Date: Fri, 3 Mar 2017 17:56:55 +1100 Subject: [PATCH] crypto: powerpc - Fix initialisation of crc32c context @@ -27,6 +27,7 @@ Cc: stable@vger.kernel.org Signed-off-by: Daniel Axtens <dja@axtens.net> Acked-by: Anton Blanchard <anton@samba.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/crypto/crc32c-vpmsum_glue.c b/arch/powerpc/crypto/crc32c-vpmsum_glue.c index 9fa046d56eba..411994551afc 100644 diff --git a/queue/cxl-Prevent-read-write-to-AFU-config-space-while-AFU.patch b/queue/cxl-Prevent-read-write-to-AFU-config-space-while-AFU.patch index b2efabb..f99c0f8 100644 --- a/queue/cxl-Prevent-read-write-to-AFU-config-space-while-AFU.patch +++ b/queue/cxl-Prevent-read-write-to-AFU-config-space-while-AFU.patch @@ -1,4 +1,4 @@ -From 14a3ae34bfd0bcb1cc12d55b06a8584c11fac6fc Mon Sep 17 00:00:00 2001 +From 7f19f9df0eedd1dd01cb7ac0a807a117004299b8 Mon Sep 17 00:00:00 2001 From: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Date: Fri, 9 Dec 2016 17:18:50 +1100 Subject: [PATCH] cxl: Prevent read/write to AFU config space while AFU not @@ -24,12 +24,13 @@ Cc: stable@vger.kernel.org # v4.9+ Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Signed-off-by: Vaibhav Jain <vaibhav@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h -index b24d76723fb0..b4a43fd14b99 100644 +index 19aa2aca9683..f9d15b04e068 100644 --- a/drivers/misc/cxl/cxl.h +++ b/drivers/misc/cxl/cxl.h -@@ -418,6 +418,8 @@ struct cxl_afu { +@@ -415,6 +415,8 @@ struct cxl_afu { struct dentry *debugfs; struct mutex contexts_lock; spinlock_t afu_cntl_lock; @@ -53,7 +54,7 @@ index 62e0dfb5f15b..2a6bf1d0a3a4 100644 afu->irqs_max = afu->adapter->user_irqs; diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c -index 73432e7d925d..cca938845ffd 100644 +index 8ad4e4f6ff77..f270cc264b86 100644 --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c @@ -1129,6 +1129,7 @@ static int pci_configure_afu(struct cxl_afu *afu, struct cxl *adapter, struct pc diff --git a/queue/dccp-Unlock-sock-before-calling-sk_free.patch b/queue/dccp-Unlock-sock-before-calling-sk_free.patch index 5cc89f2..12c87df 100644 --- a/queue/dccp-Unlock-sock-before-calling-sk_free.patch +++ b/queue/dccp-Unlock-sock-before-calling-sk_free.patch @@ -1,4 +1,4 @@ -From d5afb6f9b6bb2c57bd0c05e76e12489dc0d037d9 Mon Sep 17 00:00:00 2001 +From 363e141ae74c10a3f38064d2a2f65cbc11c15df4 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo <acme@redhat.com> Date: Wed, 1 Mar 2017 16:35:07 -0300 Subject: [PATCH] dccp: Unlock sock before calling sk_free() @@ -61,6 +61,7 @@ Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20170301153510.GE15145@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c index 53eddf99e4f6..d20d948a98ed 100644 diff --git a/queue/dccp-fix-memory-leak-during-tear-down-of-unsuccessfu.patch b/queue/dccp-fix-memory-leak-during-tear-down-of-unsuccessfu.patch index 2294e33..549d724 100644 --- a/queue/dccp-fix-memory-leak-during-tear-down-of-unsuccessfu.patch +++ b/queue/dccp-fix-memory-leak-during-tear-down-of-unsuccessfu.patch @@ -1,4 +1,4 @@ -From 72ef9c4125c7b257e3a714d62d778ab46583d6a3 Mon Sep 17 00:00:00 2001 +From baa6f5125ec0e4814b82b73b2ec8b5bcfb2499eb Mon Sep 17 00:00:00 2001 From: Hannes Frederic Sowa <hannes@stressinduktion.org> Date: Mon, 13 Mar 2017 00:01:30 +0100 Subject: [PATCH] dccp: fix memory leak during tear-down of unsuccessful @@ -14,6 +14,7 @@ list of ack vectors. Reported-by: Jianwen Ji <jiji@redhat.com> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/dccp/ccids/ccid2.c b/net/dccp/ccids/ccid2.c index f053198e730c..5e3a7302f774 100644 diff --git a/queue/dccp-fix-use-after-free-in-dccp_feat_activate_values.patch b/queue/dccp-fix-use-after-free-in-dccp_feat_activate_values.patch index b317eaf..73861b4 100644 --- a/queue/dccp-fix-use-after-free-in-dccp_feat_activate_values.patch +++ b/queue/dccp-fix-use-after-free-in-dccp_feat_activate_values.patch @@ -1,4 +1,4 @@ -From 62f8f4d9066c1c6f2474845d1ca7e2891f2ae3fd Mon Sep 17 00:00:00 2001 +From 9bb273086c90b1c044878fc2ec651f1b01fd9411 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Sun, 5 Mar 2017 10:52:16 -0800 Subject: [PATCH] dccp: fix use-after-free in dccp_feat_activate_values @@ -155,6 +155,7 @@ Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Dmitry Vyukov <dvyukov@google.com> Tested-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/dccp.h b/include/linux/dccp.h index 61d042bbbf60..68449293c4b6 100644 @@ -169,10 +170,10 @@ index 61d042bbbf60..68449293c4b6 100644 __u32 dreq_timestamp_echo; __u32 dreq_timestamp_time; diff --git a/net/dccp/minisocks.c b/net/dccp/minisocks.c -index e267e6f4c9a5..abd07a443219 100644 +index d20d948a98ed..39e7e2bca8db 100644 --- a/net/dccp/minisocks.c +++ b/net/dccp/minisocks.c -@@ -142,6 +142,13 @@ struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb, +@@ -146,6 +146,13 @@ struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb, struct dccp_request_sock *dreq = dccp_rsk(req); bool own_req; @@ -186,7 +187,7 @@ index e267e6f4c9a5..abd07a443219 100644 /* Check for retransmitted REQUEST */ if (dccp_hdr(skb)->dccph_type == DCCP_PKT_REQUEST) { -@@ -156,7 +163,7 @@ struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb, +@@ -160,7 +167,7 @@ struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb, inet_rtx_syn_ack(sk, req); } /* Network Duplicate, discard packet */ @@ -195,7 +196,7 @@ index e267e6f4c9a5..abd07a443219 100644 } DCCP_SKB_CB(skb)->dccpd_reset_code = DCCP_RESET_CODE_PACKET_ERROR; -@@ -182,20 +189,20 @@ struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb, +@@ -186,20 +193,20 @@ struct sock *dccp_check_req(struct sock *sk, struct sk_buff *skb, child = inet_csk(sk)->icsk_af_ops->syn_recv_sock(sk, skb, req, NULL, req, &own_req); @@ -223,7 +224,7 @@ index e267e6f4c9a5..abd07a443219 100644 } EXPORT_SYMBOL_GPL(dccp_check_req); -@@ -246,6 +253,7 @@ int dccp_reqsk_init(struct request_sock *req, +@@ -250,6 +257,7 @@ int dccp_reqsk_init(struct request_sock *req, { struct dccp_request_sock *dreq = dccp_rsk(req); diff --git a/queue/dccp-tcp-fix-routing-redirect-race.patch b/queue/dccp-tcp-fix-routing-redirect-race.patch index c83aca9..2c30a74 100644 --- a/queue/dccp-tcp-fix-routing-redirect-race.patch +++ b/queue/dccp-tcp-fix-routing-redirect-race.patch @@ -1,4 +1,4 @@ -From 45caeaa5ac0b4b11784ac6f932c0ad4c6b67cda0 Mon Sep 17 00:00:00 2001 +From 7f7eba70383efc174b221f2cca1835035d2a3b12 Mon Sep 17 00:00:00 2001 From: Jon Maxwell <jmaxwell37@gmail.com> Date: Fri, 10 Mar 2017 16:40:33 +1100 Subject: [PATCH] dccp/tcp: fix routing redirect race @@ -90,9 +90,10 @@ Cc: Eric Garver <egarver@redhat.com> Cc: Hannes Sowa <hsowa@redhat.com> Signed-off-by: Jon Maxwell <jmaxwell37@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c -index 409d0cfd3447..b99168b0fabf 100644 +index edbe59d203ef..86b0933ecd45 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c @@ -289,7 +289,8 @@ static void dccp_v4_err(struct sk_buff *skb, u32 info) @@ -106,7 +107,7 @@ index 409d0cfd3447..b99168b0fabf 100644 case ICMP_SOURCE_QUENCH: /* Just silently ignore these. */ diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c -index 233b57367758..d9b6a4e403e7 100644 +index 715e5d1dc107..ea5c728b6a48 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c @@ -122,10 +122,12 @@ static void dccp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, @@ -126,10 +127,10 @@ index 233b57367758..d9b6a4e403e7 100644 } diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c -index 8f3ec1365497..575e19dcc017 100644 +index 7c9531d4eb72..ac073c428577 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c -@@ -431,7 +431,8 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info) +@@ -422,7 +422,8 @@ void tcp_v4_err(struct sk_buff *icmp_skb, u32 info) switch (type) { case ICMP_REDIRECT: @@ -140,10 +141,10 @@ index 8f3ec1365497..575e19dcc017 100644 case ICMP_SOURCE_QUENCH: /* Just silently ignore these. */ diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c -index 60a5295a7de6..49fa2e8c3fa9 100644 +index c8ed64694b4d..9c0c4253c203 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c -@@ -391,10 +391,12 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, +@@ -375,10 +375,12 @@ static void tcp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, np = inet6_sk(sk); if (type == NDISC_REDIRECT) { diff --git a/queue/dm-flush-queued-bios-when-process-blocks-to-avoid-de.patch b/queue/dm-flush-queued-bios-when-process-blocks-to-avoid-de.patch index add75b8..cbca224 100644 --- a/queue/dm-flush-queued-bios-when-process-blocks-to-avoid-de.patch +++ b/queue/dm-flush-queued-bios-when-process-blocks-to-avoid-de.patch @@ -1,4 +1,4 @@ -From d67a5f4b5947aba4bfe9a80a2b86079c215ca755 Mon Sep 17 00:00:00 2001 +From 0aa31f08e453340f04ac7c7012ed8784c5a4bd23 Mon Sep 17 00:00:00 2001 From: Mikulas Patocka <mpatocka@redhat.com> Date: Wed, 15 Feb 2017 11:26:10 -0500 Subject: [PATCH] dm: flush queued bios when process blocks to avoid deadlock @@ -35,9 +35,10 @@ Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1267650 Depends-on: df2cb6daa4 ("block: Avoid deadlocks with bio allocation by stacking drivers") Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/dm.c b/drivers/md/dm.c -index 3086da5664f3..0ff5469c03d2 100644 +index eeef575fb54b..a29bb54f84d3 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c @@ -972,10 +972,61 @@ void dm_accept_partial_bio(struct bio *bio, unsigned n_sectors) diff --git a/queue/dmaengine-iota-ioat_alloc_chan_resources-should-not-.patch b/queue/dmaengine-iota-ioat_alloc_chan_resources-should-not-.patch index 50913f1..d653385 100644 --- a/queue/dmaengine-iota-ioat_alloc_chan_resources-should-not-.patch +++ b/queue/dmaengine-iota-ioat_alloc_chan_resources-should-not-.patch @@ -1,4 +1,4 @@ -From 21d25f6a4217e755906cb548b55ddab39d0e88b9 Mon Sep 17 00:00:00 2001 +From 530aaecdb69716c0c30cf6aac1a73f2669227c6b Mon Sep 17 00:00:00 2001 From: Krister Johansen <kjlx@templeofstupid.com> Date: Wed, 4 Jan 2017 01:22:52 -0800 Subject: [PATCH] dmaengine: iota: ioat_alloc_chan_resources should not perform @@ -24,12 +24,13 @@ spinlocks. Signed-off-by: Krister Johansen <kjlx@templeofstupid.com> Acked-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Vinod Koul <vinod.koul@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/dma/ioat/init.c b/drivers/dma/ioat/init.c -index ace5cb2cb12f..cc5259b881d4 100644 +index 7145f7716a92..340de42d3455 100644 --- a/drivers/dma/ioat/init.c +++ b/drivers/dma/ioat/init.c -@@ -700,7 +700,7 @@ static int ioat_alloc_chan_resources(struct dma_chan *c) +@@ -691,7 +691,7 @@ static int ioat_alloc_chan_resources(struct dma_chan *c) /* doing 2 32bit writes to mmio since 1 64b write doesn't work */ ioat_chan->completion = dma_pool_zalloc(ioat_chan->ioat_dma->completion_pool, @@ -38,7 +39,7 @@ index ace5cb2cb12f..cc5259b881d4 100644 if (!ioat_chan->completion) return -ENOMEM; -@@ -710,7 +710,7 @@ static int ioat_alloc_chan_resources(struct dma_chan *c) +@@ -701,7 +701,7 @@ static int ioat_alloc_chan_resources(struct dma_chan *c) ioat_chan->reg_base + IOAT_CHANCMP_OFFSET_HIGH); order = IOAT_MAX_ORDER; diff --git a/queue/drm-Cancel-drm_fb_helper_dirty_work-on-unload.patch b/queue/drm-Cancel-drm_fb_helper_dirty_work-on-unload.patch index e77e619..f3d7367 100644 --- a/queue/drm-Cancel-drm_fb_helper_dirty_work-on-unload.patch +++ b/queue/drm-Cancel-drm_fb_helper_dirty_work-on-unload.patch @@ -1,4 +1,4 @@ -From 179551141072b328096788ff9341458f6932d4c5 Mon Sep 17 00:00:00 2001 +From 8a8c679bfb3f549ad9ea821a22133971efb7621d Mon Sep 17 00:00:00 2001 From: Chris Wilson <chris@chris-wilson.co.uk> Date: Tue, 7 Feb 2017 12:49:55 +0000 Subject: [PATCH] drm: Cancel drm_fb_helper_dirty_work on unload diff --git a/queue/drm-amdgpu-add-more-cases-to-DCE11-possible-crtc-mas.patch b/queue/drm-amdgpu-add-more-cases-to-DCE11-possible-crtc-mas.patch index d31c70f..87fc1cd 100644 --- a/queue/drm-amdgpu-add-more-cases-to-DCE11-possible-crtc-mas.patch +++ b/queue/drm-amdgpu-add-more-cases-to-DCE11-possible-crtc-mas.patch @@ -1,4 +1,4 @@ -From 4ce3bd45b351633f2a0512c587f7fcba2ce044e8 Mon Sep 17 00:00:00 2001 +From 764015bc4707db4ae605ac2e05865aa3933d0ad2 Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexander.deucher@amd.com> Date: Fri, 10 Feb 2017 00:00:52 -0500 Subject: [PATCH] drm/amdgpu: add more cases to DCE11 possible crtc mask setup @@ -18,12 +18,13 @@ Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> Reviewed-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c -index 1cf1d9d1aec1..5b24e89552ec 100644 +index 67c7c05a751c..0b20eb4b4778 100644 --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c -@@ -3737,9 +3737,15 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev, +@@ -3772,9 +3772,15 @@ static void dce_v11_0_encoder_add(struct amdgpu_device *adev, default: encoder->possible_crtcs = 0x3; break; diff --git a/queue/drm-ast-Call-open_key-before-enable_mmio-in-POST-cod.patch b/queue/drm-ast-Call-open_key-before-enable_mmio-in-POST-cod.patch index 3d95e86..2bf95ef 100644 --- a/queue/drm-ast-Call-open_key-before-enable_mmio-in-POST-cod.patch +++ b/queue/drm-ast-Call-open_key-before-enable_mmio-in-POST-cod.patch @@ -1,4 +1,4 @@ -From 6704a89361d56916d79839c0a975106dc098a134 Mon Sep 17 00:00:00 2001 +From f6aa5bf4af14eedf9a911804f3d724e4659e2846 Mon Sep 17 00:00:00 2001 From: "Y.C. Chen" <yc_chen@aspeedtech.com> Date: Wed, 22 Feb 2017 15:14:19 +1100 Subject: [PATCH] drm/ast: Call open_key before enable_mmio in POST code diff --git a/queue/drm-ast-Fix-AST2400-POST-failure-without-BMC-FW-or-V.patch b/queue/drm-ast-Fix-AST2400-POST-failure-without-BMC-FW-or-V.patch index f7e8c97..22243cf 100644 --- a/queue/drm-ast-Fix-AST2400-POST-failure-without-BMC-FW-or-V.patch +++ b/queue/drm-ast-Fix-AST2400-POST-failure-without-BMC-FW-or-V.patch @@ -1,4 +1,4 @@ -From 3856081eede297b617560b85e948cfb00bb395ec Mon Sep 17 00:00:00 2001 +From 2c201b886317451b3d5fc1b01547f9c46720e4c4 Mon Sep 17 00:00:00 2001 From: "Y.C. Chen" <yc_chen@aspeedtech.com> Date: Thu, 23 Feb 2017 15:52:33 +0800 Subject: [PATCH] drm/ast: Fix AST2400 POST failure without BMC FW or VBIOS @@ -15,12 +15,13 @@ Tested-by: Y.C. Chen <yc_chen@aspeedtech.com> Acked-by: Joel Stanley <joel@jms.id.au> Cc: <stable@vger.kernel.org> Signed-off-by: Dave Airlie <airlied@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c -index 5331ee1df086..6c5391cb90eb 100644 +index 50836e549867..30672a3df8a9 100644 --- a/drivers/gpu/drm/ast/ast_post.c +++ b/drivers/gpu/drm/ast/ast_post.c -@@ -1638,12 +1638,44 @@ static void ast_init_dram_2300(struct drm_device *dev) +@@ -1626,12 +1626,44 @@ static void ast_init_dram_2300(struct drm_device *dev) temp |= 0x73; ast_write32(ast, 0x12008, temp); diff --git a/queue/drm-ast-Fix-test-for-VGA-enabled.patch b/queue/drm-ast-Fix-test-for-VGA-enabled.patch index e271455..cc2208e 100644 --- a/queue/drm-ast-Fix-test-for-VGA-enabled.patch +++ b/queue/drm-ast-Fix-test-for-VGA-enabled.patch @@ -1,4 +1,4 @@ -From 905f21a49d388de3e99438235f3301cabf0c0ef4 Mon Sep 17 00:00:00 2001 +From e4faa4fa6a05e346fd26045cecda3078f9d1257b Mon Sep 17 00:00:00 2001 From: "Y.C. Chen" <yc_chen@aspeedtech.com> Date: Wed, 22 Feb 2017 15:10:50 +1100 Subject: [PATCH] drm/ast: Fix test for VGA enabled @@ -15,12 +15,13 @@ Cc: <stable@vger.kernel.org> Acked-by: Joel Stanley <joel@jms.id.au> Tested-by: Y.C. Chen <yc_chen@aspeedtech.com> Signed-off-by: Dave Airlie <airlied@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/ast/ast_post.c b/drivers/gpu/drm/ast/ast_post.c -index c15f643915af..a5a780921553 100644 +index 810c51d92b99..4e8aaab5dd52 100644 --- a/drivers/gpu/drm/ast/ast_post.c +++ b/drivers/gpu/drm/ast/ast_post.c -@@ -59,13 +59,9 @@ bool ast_is_vga_enabled(struct drm_device *dev) +@@ -58,13 +58,9 @@ bool ast_is_vga_enabled(struct drm_device *dev) /* TODO 1180 */ } else { ch = ast_io_read8(ast, AST_IO_VGA_ENABLE_PORT); diff --git a/queue/drm-atomic-fix-an-error-code-in-mode_fixup.patch b/queue/drm-atomic-fix-an-error-code-in-mode_fixup.patch index 8a9fc67..9e81231 100644 --- a/queue/drm-atomic-fix-an-error-code-in-mode_fixup.patch +++ b/queue/drm-atomic-fix-an-error-code-in-mode_fixup.patch @@ -1,4 +1,4 @@ -From f9ad86e42d0303eeb8e0d41bb208153022ebd9d2 Mon Sep 17 00:00:00 2001 +From 70f6244b57db06ea0d6f97524a72747d5120a858 Mon Sep 17 00:00:00 2001 From: Dan Carpenter <dan.carpenter@oracle.com> Date: Wed, 8 Feb 2017 02:46:01 +0300 Subject: [PATCH] drm/atomic: fix an error code in mode_fixup() @@ -18,12 +18,13 @@ Cc: stable@vger.kernel.org Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/20170207234601.GA23981@mwanda +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c -index 9a08445a7a7a..01d936b7be43 100644 +index c55771fcc9f3..8f5a3eab9389 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c -@@ -369,7 +369,7 @@ mode_fixup(struct drm_atomic_state *state) +@@ -362,7 +362,7 @@ mode_fixup(struct drm_atomic_state *state) struct drm_connector *connector; struct drm_connector_state *conn_state; int i; diff --git a/queue/drm-edid-Add-EDID_QUIRK_FORCE_8BPC-quirk-for-Rotel-R.patch b/queue/drm-edid-Add-EDID_QUIRK_FORCE_8BPC-quirk-for-Rotel-R.patch index 2643413..be7f359 100644 --- a/queue/drm-edid-Add-EDID_QUIRK_FORCE_8BPC-quirk-for-Rotel-R.patch +++ b/queue/drm-edid-Add-EDID_QUIRK_FORCE_8BPC-quirk-for-Rotel-R.patch @@ -1,4 +1,4 @@ -From 36fc579761b50784b63dafd0f2e796b659e0f5ee Mon Sep 17 00:00:00 2001 +From f5f12c0f20c71064b6d23a5f0f120f57fa98d031 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso <tomeu.vizoso@collabora.com> Date: Mon, 20 Feb 2017 16:25:45 +0100 Subject: [PATCH] drm/edid: Add EDID_QUIRK_FORCE_8BPC quirk for Rotel RSX-1058 @@ -30,12 +30,13 @@ Tested-by: Matt Horan <matt@matthoran.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99869 Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c -index c8baab9bee0d..ba58f1b11d1e 100644 +index 637a0aa4d3a0..bab1a9405e02 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c -@@ -148,6 +148,9 @@ static const struct edid_quirk { +@@ -145,6 +145,9 @@ static struct edid_quirk { /* Panel in Samsung NP700G7A-S01PL notebook reports 6bpc */ { "SEC", 0xd033, EDID_QUIRK_FORCE_8BPC }, diff --git a/queue/drm-i915-Fix-not-finding-the-VBT-when-it-overlaps-wi.patch b/queue/drm-i915-Fix-not-finding-the-VBT-when-it-overlaps-wi.patch index a061f52..f4f79d0 100644 --- a/queue/drm-i915-Fix-not-finding-the-VBT-when-it-overlaps-wi.patch +++ b/queue/drm-i915-Fix-not-finding-the-VBT-when-it-overlaps-wi.patch @@ -1,4 +1,4 @@ -From 998d75730b40afc218c059d811869abe9676b305 Mon Sep 17 00:00:00 2001 +From 114076cdd96cca3d0284c7cf7c86c7ce305e45e1 Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede@redhat.com> Date: Tue, 14 Feb 2017 18:12:38 +0200 Subject: [PATCH] drm/i915: Fix not finding the VBT when it overlaps with @@ -19,12 +19,13 @@ Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1487088758-30050-1-git-send-email-jani.nikula@intel.com (cherry picked from commit dfb65e71ea2c1d97ac373cc0587dc60b3307581a) Signed-off-by: Jani Nikula <jani.nikula@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c -index f4429f67a4e3..4a862a358c70 100644 +index 7acbbbf97833..4534e4cadccf 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c -@@ -982,7 +982,18 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv) +@@ -1031,7 +1031,18 @@ int intel_opregion_setup(struct drm_i915_private *dev_priv) opregion->vbt_size = vbt_size; } else { vbt = base + OPREGION_VBT_OFFSET; diff --git a/queue/drm-i915-gvt-Disable-access-to-stolen-memory-as-a-gu.patch b/queue/drm-i915-gvt-Disable-access-to-stolen-memory-as-a-gu.patch index 4954c3c..f0ea2dc 100644 --- a/queue/drm-i915-gvt-Disable-access-to-stolen-memory-as-a-gu.patch +++ b/queue/drm-i915-gvt-Disable-access-to-stolen-memory-as-a-gu.patch @@ -1,4 +1,4 @@ -From 57bf4792b660ad8de53b1eb9e0c7c62b403b74da Mon Sep 17 00:00:00 2001 +From 75c59791e9dd57fd70594f6128eac5c7a5d48623 Mon Sep 17 00:00:00 2001 From: Chris Wilson <chris@chris-wilson.co.uk> Date: Wed, 9 Nov 2016 10:39:05 +0000 Subject: [PATCH] drm/i915/gvt: Disable access to stolen memory as a guest diff --git a/queue/drm-imx-imx-tve-Do-not-set-the-regulator-voltage.patch b/queue/drm-imx-imx-tve-Do-not-set-the-regulator-voltage.patch index aa8547f..c1a99c8 100644 --- a/queue/drm-imx-imx-tve-Do-not-set-the-regulator-voltage.patch +++ b/queue/drm-imx-imx-tve-Do-not-set-the-regulator-voltage.patch @@ -1,4 +1,4 @@ -From fc12bccda8b6f5c38139eceec9e369ed78091b2b Mon Sep 17 00:00:00 2001 +From 07049221c5e8c985208be6e7b865bd912f8c9d5c Mon Sep 17 00:00:00 2001 From: Fabio Estevam <fabio.estevam@nxp.com> Date: Wed, 8 Feb 2017 10:47:49 -0200 Subject: [PATCH] drm/imx: imx-tve: Do not set the regulator voltage @@ -25,9 +25,10 @@ Cc: <stable@vger.kernel.org> # 4.8+ Suggested-by: Lucas Stach <l.stach@pengutronix.de> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c -index 3b602ee33c44..0c6bf12d45b1 100644 +index 5e875944ffa2..a85aa3e05277 100644 --- a/drivers/gpu/drm/imx/imx-tve.c +++ b/drivers/gpu/drm/imx/imx-tve.c @@ -98,6 +98,8 @@ @@ -39,7 +40,7 @@ index 3b602ee33c44..0c6bf12d45b1 100644 enum { TVE_MODE_TVOUT, TVE_MODE_VGA, -@@ -621,9 +623,8 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data) +@@ -628,9 +630,8 @@ static int imx_tve_bind(struct device *dev, struct device *master, void *data) tve->dac_reg = devm_regulator_get(dev, "dac"); if (!IS_ERR(tve->dac_reg)) { diff --git a/queue/drm-nouveau-disp-gp102-fix-cursor-overlay-immediate-.patch b/queue/drm-nouveau-disp-gp102-fix-cursor-overlay-immediate-.patch index 45c043b..bc1b2e6 100644 --- a/queue/drm-nouveau-disp-gp102-fix-cursor-overlay-immediate-.patch +++ b/queue/drm-nouveau-disp-gp102-fix-cursor-overlay-immediate-.patch @@ -1,4 +1,4 @@ -From e50fcff15fe120ef2103a9e18af6644235c2b14d Mon Sep 17 00:00:00 2001 +From bda8c73f7fdd77a91bed3553dfcc30b9ca1602cb Mon Sep 17 00:00:00 2001 From: Ben Skeggs <bskeggs@redhat.com> Date: Wed, 16 Nov 2016 14:53:08 +1000 Subject: [PATCH] drm/nouveau/disp/gp102: fix cursor/overlay immediate channel @@ -7,6 +7,7 @@ Subject: [PATCH] drm/nouveau/disp/gp102: fix cursor/overlay immediate channel commit e50fcff15fe120ef2103a9e18af6644235c2b14d upstream. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild b/drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild index 77a52b54a31e..70f0344c508c 100644 @@ -25,10 +26,10 @@ index 77a52b54a31e..70f0344c508c 100644 nvkm-y += nvkm/engine/disp/oimmgk104.o +nvkm-y += nvkm/engine/disp/oimmgp102.o diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h -index 1897e5b674a8..737b38f6fbd2 100644 +index f5f683d9fd20..04a7e582a8bc 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h -@@ -121,6 +121,8 @@ extern const struct nv50_disp_pioc_oclass gf119_disp_curs_oclass; +@@ -114,6 +114,8 @@ extern const struct nv50_disp_pioc_oclass gf119_disp_curs_oclass; extern const struct nv50_disp_pioc_oclass gk104_disp_oimm_oclass; extern const struct nv50_disp_pioc_oclass gk104_disp_curs_oclass; diff --git a/queue/drm-nouveau-disp-nv50-specify-ctrl-user-separately-w.patch b/queue/drm-nouveau-disp-nv50-specify-ctrl-user-separately-w.patch index 4a3ad06..005923e 100644 --- a/queue/drm-nouveau-disp-nv50-specify-ctrl-user-separately-w.patch +++ b/queue/drm-nouveau-disp-nv50-specify-ctrl-user-separately-w.patch @@ -1,4 +1,4 @@ -From 2a32b9b1866a2ee9f01fbf2a48d99012f0120739 Mon Sep 17 00:00:00 2001 +From 6d5f39779bb3b8bd2960044030173873b28590f6 Mon Sep 17 00:00:00 2001 From: Ben Skeggs <bskeggs@redhat.com> Date: Wed, 16 Nov 2016 14:49:35 +1000 Subject: [PATCH] drm/nouveau/disp/nv50-: specify ctrl/user separately when @@ -7,9 +7,10 @@ Subject: [PATCH] drm/nouveau/disp/nv50-: specify ctrl/user separately when commit 2a32b9b1866a2ee9f01fbf2a48d99012f0120739 upstream. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c -index 566d2d1b8cb2..524a24eae1a0 100644 +index 376f2c6132a5..9d90d8b4b7e6 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c @@ -263,7 +263,7 @@ nv50_disp_chan = { @@ -50,7 +51,7 @@ index 566d2d1b8cb2..524a24eae1a0 100644 + head, oclass, chan); } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h -index de8db9cfe87d..1897e5b674a8 100644 +index 7b5a2eaff174..737b38f6fbd2 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h @@ -29,11 +29,11 @@ struct nv50_disp_chan_func { @@ -86,7 +87,7 @@ index de8db9cfe87d..1897e5b674a8 100644 }; extern const struct nv50_disp_pioc_oclass nv50_disp_oimm_oclass; -@@ -121,12 +124,12 @@ extern const struct nv50_disp_pioc_oclass gk104_disp_curs_oclass; +@@ -123,12 +126,12 @@ extern const struct nv50_disp_pioc_oclass gp102_disp_curs_oclass; int nv50_disp_curs_new(const struct nv50_disp_chan_func *, const struct nv50_disp_chan_mthd *, @@ -261,10 +262,10 @@ index 3940b9c966ec..07540f3d32dc 100644 + .chid = { 5, 5 }, }; diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c -index c1158b22a721..e70dc6a9ff7d 100644 +index 2f9cecd81d04..05c829a603d1 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c -@@ -250,8 +250,8 @@ nv50_disp_root_pioc_new_(const struct nvkm_oclass *oclass, +@@ -207,8 +207,8 @@ nv50_disp_root_pioc_new_(const struct nvkm_oclass *oclass, { const struct nv50_disp_pioc_oclass *sclass = oclass->priv; struct nv50_disp_root *root = nv50_disp_root(oclass->parent); diff --git a/queue/drm-nouveau-disp-nv50-split-chid-into-chid.ctrl-and-.patch b/queue/drm-nouveau-disp-nv50-split-chid-into-chid.ctrl-and-.patch index b480037..8b272b8 100644 --- a/queue/drm-nouveau-disp-nv50-split-chid-into-chid.ctrl-and-.patch +++ b/queue/drm-nouveau-disp-nv50-split-chid-into-chid.ctrl-and-.patch @@ -1,4 +1,4 @@ -From 4391d7f5c79a9fe6fa11cf6c160ca7f7bdb49d2a Mon Sep 17 00:00:00 2001 +From 071805e3ef7f8e495eadec1e94f7d2d16b4d4f47 Mon Sep 17 00:00:00 2001 From: Ben Skeggs <bskeggs@redhat.com> Date: Wed, 16 Nov 2016 14:38:44 +1000 Subject: [PATCH] drm/nouveau/disp/nv50-: split chid into chid.ctrl and @@ -10,9 +10,10 @@ GP102/GP104 make life difficult by redefining the channel indices for some registers, but not others. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c -index 26990d44ae75..566d2d1b8cb2 100644 +index dd2953bc9264..376f2c6132a5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c @@ -82,7 +82,7 @@ nv50_disp_chan_mthd(struct nv50_disp_chan *chan, int debug) @@ -92,7 +93,7 @@ index 26990d44ae75..566d2d1b8cb2 100644 } diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h -index f5f683d9fd20..de8db9cfe87d 100644 +index 04a7e582a8bc..7b5a2eaff174 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.h @@ -7,7 +7,11 @@ struct nv50_disp_chan { diff --git a/queue/drm-ttm-Make-sure-BOs-being-swapped-out-are-cacheabl.patch b/queue/drm-ttm-Make-sure-BOs-being-swapped-out-are-cacheabl.patch index bf64353..a0d6bbc 100644 --- a/queue/drm-ttm-Make-sure-BOs-being-swapped-out-are-cacheabl.patch +++ b/queue/drm-ttm-Make-sure-BOs-being-swapped-out-are-cacheabl.patch @@ -1,4 +1,4 @@ -From 239ac65fa5ffab71adf66e642750f940e7241d99 Mon Sep 17 00:00:00 2001 +From aae478a69336a0db7a6dba444e71f5b387ecb94f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> Date: Wed, 25 Jan 2017 17:21:31 +0900 Subject: [PATCH] drm/ttm: Make sure BOs being swapped out are cacheable @@ -22,12 +22,13 @@ Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Christian König <christian.koenig@amd.com>. Reviewed-by: Sinclair Yeh <syeh@vmware.com> Signed-off-by: Christian König <christian.koenig@amd.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/ttm/ttm_bo.c b/drivers/gpu/drm/ttm/ttm_bo.c -index d5063618efa7..86e3b233b722 100644 +index 42c074a9c955..6fb7c010320e 100644 --- a/drivers/gpu/drm/ttm/ttm_bo.c +++ b/drivers/gpu/drm/ttm/ttm_bo.c -@@ -1670,7 +1670,6 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink) +@@ -1656,7 +1656,6 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink) struct ttm_buffer_object *bo; int ret = -EBUSY; int put_count; @@ -35,7 +36,7 @@ index d5063618efa7..86e3b233b722 100644 spin_lock(&glob->lru_lock); list_for_each_entry(bo, &glob->swap_lru, swap) { -@@ -1701,7 +1700,8 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink) +@@ -1687,7 +1686,8 @@ static int ttm_bo_swapout(struct ttm_mem_shrink *shrink) * Move to system cached */ diff --git a/queue/drm-vc4-Fix-clock_select-setting-for-the-VEC-encoder.patch b/queue/drm-vc4-Fix-clock_select-setting-for-the-VEC-encoder.patch index b9ef754..84ff7b2 100644 --- a/queue/drm-vc4-Fix-clock_select-setting-for-the-VEC-encoder.patch +++ b/queue/drm-vc4-Fix-clock_select-setting-for-the-VEC-encoder.patch @@ -1,4 +1,4 @@ -From 852c6985a3e504444dd6be7ef03306ef55ca0ef9 Mon Sep 17 00:00:00 2001 +From 68cf3cc4ee7704472bf7f0ee4ad0dc71241ea0fa Mon Sep 17 00:00:00 2001 From: Boris Brezillon <boris.brezillon@free-electrons.com> Date: Fri, 2 Dec 2016 14:48:07 +0100 Subject: [PATCH] drm/vc4: Fix ->clock_select setting for the VEC encoder diff --git a/queue/drm-vc4-Fix-race-between-page-flip-completion-event-.patch b/queue/drm-vc4-Fix-race-between-page-flip-completion-event-.patch index 236ce3e..8a22b6c 100644 --- a/queue/drm-vc4-Fix-race-between-page-flip-completion-event-.patch +++ b/queue/drm-vc4-Fix-race-between-page-flip-completion-event-.patch @@ -1,4 +1,4 @@ -From 26fc78f6fef39b9d7a15def5e7e9826ff68303f4 Mon Sep 17 00:00:00 2001 +From cc7c974173a186a62c835402d89b800c1bdc4fef Mon Sep 17 00:00:00 2001 From: Derek Foreman <derekf@osg.samsung.com> Date: Thu, 24 Nov 2016 12:11:55 -0600 Subject: [PATCH] drm/vc4: Fix race between page flip completion event and @@ -14,12 +14,13 @@ Signed-off-by: Derek Foreman <derekf@osg.samsung.com> Signed-off-by: Eric Anholt <eric@anholt.net> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Daniel Stone <daniels@collabora.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c -index 7f08d681a74b..82f914af4156 100644 +index e8ffabbab9e8..7c4873c1dabc 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c -@@ -669,6 +669,14 @@ void vc4_disable_vblank(struct drm_device *dev, unsigned int crtc_id) +@@ -636,6 +636,14 @@ void vc4_disable_vblank(struct drm_device *dev, unsigned int crtc_id) CRTC_WRITE(PV_INTEN, 0); } @@ -35,10 +36,10 @@ index 7f08d681a74b..82f914af4156 100644 { struct drm_crtc *crtc = &vc4_crtc->base; diff --git a/drivers/gpu/drm/vc4/vc4_drv.h b/drivers/gpu/drm/vc4/vc4_drv.h -index fef172804345..b3064e2e79c1 100644 +index f696b752886b..e1afc0204991 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.h +++ b/drivers/gpu/drm/vc4/vc4_drv.h -@@ -442,6 +442,7 @@ int vc4_bo_stats_debugfs(struct seq_file *m, void *arg); +@@ -443,6 +443,7 @@ int vc4_bo_stats_debugfs(struct seq_file *m, void *arg); extern struct platform_driver vc4_crtc_driver; int vc4_enable_vblank(struct drm_device *dev, unsigned int crtc_id); void vc4_disable_vblank(struct drm_device *dev, unsigned int crtc_id); @@ -47,7 +48,7 @@ index fef172804345..b3064e2e79c1 100644 int vc4_crtc_get_scanoutpos(struct drm_device *dev, unsigned int crtc_id, unsigned int flags, int *vpos, int *hpos, diff --git a/drivers/gpu/drm/vc4/vc4_kms.c b/drivers/gpu/drm/vc4/vc4_kms.c -index c1f65c6c8e60..67af2af70af0 100644 +index 4ac894d993cd..a6c1af171996 100644 --- a/drivers/gpu/drm/vc4/vc4_kms.c +++ b/drivers/gpu/drm/vc4/vc4_kms.c @@ -119,17 +119,34 @@ static int vc4_atomic_commit(struct drm_device *dev, diff --git a/queue/efi-arm-Fix-boot-crash-with-CONFIG_CPUMASK_OFFSTACK-.patch b/queue/efi-arm-Fix-boot-crash-with-CONFIG_CPUMASK_OFFSTACK-.patch index 9bd01ea..3a0f5ce 100644 --- a/queue/efi-arm-Fix-boot-crash-with-CONFIG_CPUMASK_OFFSTACK-.patch +++ b/queue/efi-arm-Fix-boot-crash-with-CONFIG_CPUMASK_OFFSTACK-.patch @@ -1,4 +1,4 @@ -From d1eb98143c56f24fef125f5bbed49ae0b52fb7d6 Mon Sep 17 00:00:00 2001 +From c2e079a15eea387d64dfe8b46e1bfcb5f55720bf Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel <ard.biesheuvel@linaro.org> Date: Wed, 1 Mar 2017 19:05:54 +0000 Subject: [PATCH] efi/arm: Fix boot crash with CONFIG_CPUMASK_OFFSTACK=y @@ -40,12 +40,13 @@ Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-efi@vger.kernel.org Link: http://lkml.kernel.org/r/1488395154-29786-1-git-send-email-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/firmware/efi/arm-runtime.c b/drivers/firmware/efi/arm-runtime.c -index 349dc3e1e52e..974c5a31a005 100644 +index c394b81fe452..b4dd8b5ad516 100644 --- a/drivers/firmware/efi/arm-runtime.c +++ b/drivers/firmware/efi/arm-runtime.c -@@ -65,6 +65,7 @@ static bool __init efi_virtmap_init(void) +@@ -45,6 +45,7 @@ static bool __init efi_virtmap_init(void) bool systab_found; efi_mm.pgd = pgd_alloc(&efi_mm); diff --git a/queue/ext4-don-t-BUG-when-truncating-encrypted-inodes-on-t.patch b/queue/ext4-don-t-BUG-when-truncating-encrypted-inodes-on-t.patch index 1cdd968..417ddef 100644 --- a/queue/ext4-don-t-BUG-when-truncating-encrypted-inodes-on-t.patch +++ b/queue/ext4-don-t-BUG-when-truncating-encrypted-inodes-on-t.patch @@ -1,4 +1,4 @@ -From 0d06863f903ac5f4f6efb0273079d27de3e53a28 Mon Sep 17 00:00:00 2001 +From 7cd7b1d4a6eca08bfdc6752671771a7c03e1e77c Mon Sep 17 00:00:00 2001 From: Theodore Ts'o <tytso@mit.edu> Date: Tue, 14 Feb 2017 11:31:15 -0500 Subject: [PATCH] ext4: don't BUG when truncating encrypted inodes on the @@ -77,12 +77,13 @@ encrypted inodes). Addresses-Google-Bug: #35209576 Signed-off-by: Theodore Ts'o <tytso@mit.edu> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c -index bc282f9d0969..f622d4a577e3 100644 +index 00ece902a3ff..b99d1335eb26 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c -@@ -3944,6 +3944,10 @@ static int ext4_block_truncate_page(handle_t *handle, +@@ -3828,6 +3828,10 @@ static int ext4_block_truncate_page(handle_t *handle, unsigned blocksize; struct inode *inode = mapping->host; diff --git a/queue/fat-fix-using-uninitialized-fields-of-fat_inode-fsin.patch b/queue/fat-fix-using-uninitialized-fields-of-fat_inode-fsin.patch index 95b3844..74202dd 100644 --- a/queue/fat-fix-using-uninitialized-fields-of-fat_inode-fsin.patch +++ b/queue/fat-fix-using-uninitialized-fields-of-fat_inode-fsin.patch @@ -1,4 +1,4 @@ -From c0d0e351285161a515396b7b1ee53ec9ffd97e3c Mon Sep 17 00:00:00 2001 +From f13171572deb9172c0cd0fc216d2928dbc6fc669 Mon Sep 17 00:00:00 2001 From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp> Date: Thu, 9 Mar 2017 16:17:37 -0800 Subject: [PATCH] fat: fix using uninitialized fields of fat_inode/fsinfo_inode @@ -20,9 +20,10 @@ Tested-by: Moreno Bartalucci <moreno.bartalucci@tecnorama.it> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/fat/inode.c b/fs/fat/inode.c -index 338d2f73eb29..a2c05f2ada6d 100644 +index da04c0298fab..5924ace62594 100644 --- a/fs/fat/inode.c +++ b/fs/fat/inode.c @@ -1359,6 +1359,16 @@ out: diff --git a/queue/fs-Better-permission-checking-for-submounts.patch b/queue/fs-Better-permission-checking-for-submounts.patch index cb50901..e053401 100644 --- a/queue/fs-Better-permission-checking-for-submounts.patch +++ b/queue/fs-Better-permission-checking-for-submounts.patch @@ -1,4 +1,4 @@ -From 72c723b01f4394db3064ad2267c03e6611f4d7da Mon Sep 17 00:00:00 2001 +From 6ebd08afe027068012e85fb2a39277535fb3595a Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" <ebiederm@xmission.com> Date: Wed, 1 Feb 2017 06:06:16 +1300 Subject: [PATCH] fs: Better permission checking for submounts diff --git a/queue/futex-Add-missing-error-handling-to-FUTEX_REQUEUE_PI.patch b/queue/futex-Add-missing-error-handling-to-FUTEX_REQUEUE_PI.patch index 8f4b037..1086c51 100644 --- a/queue/futex-Add-missing-error-handling-to-FUTEX_REQUEUE_PI.patch +++ b/queue/futex-Add-missing-error-handling-to-FUTEX_REQUEUE_PI.patch @@ -1,4 +1,4 @@ -From 9bbb25afeb182502ca4f2c4f3f88af0681b34cae Mon Sep 17 00:00:00 2001 +From 2a98fe177507925d2b4ecea334b8367fd0ae6e75 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra <peterz@infradead.org> Date: Sat, 4 Mar 2017 10:27:19 +0100 Subject: [PATCH] futex: Add missing error handling to FUTEX_REQUEUE_PI @@ -22,12 +22,13 @@ Cc: bristot@redhat.com Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20170304093558.867401760@infradead.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/futex.c b/kernel/futex.c -index 3a4775fd7468..45858ec73941 100644 +index ec5edbf6539e..58b71a197342 100644 --- a/kernel/futex.c +++ b/kernel/futex.c -@@ -2898,6 +2898,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, +@@ -2887,6 +2887,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, if (q.pi_state && (q.pi_state->owner != current)) { spin_lock(q.lock_ptr); ret = fixup_pi_state_owner(uaddr2, &q, current); diff --git a/queue/futex-Fix-potential-use-after-free-in-FUTEX_REQUEUE_.patch b/queue/futex-Fix-potential-use-after-free-in-FUTEX_REQUEUE_.patch index 847bb87..c374e80 100644 --- a/queue/futex-Fix-potential-use-after-free-in-FUTEX_REQUEUE_.patch +++ b/queue/futex-Fix-potential-use-after-free-in-FUTEX_REQUEUE_.patch @@ -1,4 +1,4 @@ -From c236c8e95a3d395b0494e7108f0d41cf36ec107c Mon Sep 17 00:00:00 2001 +From 49e31dcd319be0dd78c86f8aa2d62fe155c48b08 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra <peterz@infradead.org> Date: Sat, 4 Mar 2017 10:27:18 +0100 Subject: [PATCH] futex: Fix potential use-after-free in FUTEX_REQUEUE_PI @@ -29,12 +29,13 @@ Cc: bristot@redhat.com Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20170304093558.801744246@infradead.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/futex.c b/kernel/futex.c -index 229a744b1781..3a4775fd7468 100644 +index e3b9561e9f8e..ec5edbf6539e 100644 --- a/kernel/futex.c +++ b/kernel/futex.c -@@ -2815,7 +2815,6 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, +@@ -2804,7 +2804,6 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, { struct hrtimer_sleeper timeout, *to = NULL; struct rt_mutex_waiter rt_waiter; @@ -42,7 +43,7 @@ index 229a744b1781..3a4775fd7468 100644 struct futex_hash_bucket *hb; union futex_key key2 = FUTEX_KEY_INIT; struct futex_q q = futex_q_init; -@@ -2907,6 +2906,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, +@@ -2896,6 +2895,8 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, spin_unlock(q.lock_ptr); } } else { @@ -51,7 +52,7 @@ index 229a744b1781..3a4775fd7468 100644 /* * We have been woken up by futex_unlock_pi(), a timeout, or a * signal. futex_unlock_pi() will not destroy the lock_ptr nor -@@ -2930,18 +2931,19 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, +@@ -2919,18 +2920,19 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags, if (res) ret = (res < 0) ? res : 0; diff --git a/queue/i2c-add-missing-of_node_put-in-i2c_mux_del_adapters.patch b/queue/i2c-add-missing-of_node_put-in-i2c_mux_del_adapters.patch index 798b6fe..6ebf5fb 100644 --- a/queue/i2c-add-missing-of_node_put-in-i2c_mux_del_adapters.patch +++ b/queue/i2c-add-missing-of_node_put-in-i2c_mux_del_adapters.patch @@ -1,4 +1,4 @@ -From 2e1e4949f9dfb053122785cd73540bb1e61f768b Mon Sep 17 00:00:00 2001 +From 21f6657762956884946257170c5f52b3c28aee79 Mon Sep 17 00:00:00 2001 From: Qi Hou <qi.hou@windriver.com> Date: Fri, 3 Mar 2017 15:57:11 +0800 Subject: [PATCH] i2c: add missing of_node_put in i2c_mux_del_adapters @@ -12,12 +12,13 @@ Cc: stable@vger.kernel.org Signed-off-by: Qi Hou <qi.hou@windriver.com> Reviewed-by: Zhang Xiao <xiao.zhang@windriver.com> Signed-off-by: Peter Rosin <peda@axentia.se> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/i2c/i2c-mux.c b/drivers/i2c/i2c-mux.c -index 83768e85a919..2178266bca79 100644 +index 8eee98634cda..560dccf2973e 100644 --- a/drivers/i2c/i2c-mux.c +++ b/drivers/i2c/i2c-mux.c -@@ -429,6 +429,7 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc) +@@ -394,6 +394,7 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc) while (muxc->num_adapters) { struct i2c_adapter *adap = muxc->adapter[--muxc->num_adapters]; struct i2c_mux_priv *priv = adap->algo_data; @@ -25,7 +26,7 @@ index 83768e85a919..2178266bca79 100644 muxc->adapter[muxc->num_adapters] = NULL; -@@ -438,6 +439,7 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc) +@@ -403,6 +404,7 @@ void i2c_mux_del_adapters(struct i2c_mux_core *muxc) sysfs_remove_link(&priv->adap.dev.kobj, "mux_device"); i2c_del_adapter(adap); diff --git a/queue/igb-Workaround-for-igb-i210-firmware-issue.patch b/queue/igb-Workaround-for-igb-i210-firmware-issue.patch index 0d00ee1..96ee8e8 100644 --- a/queue/igb-Workaround-for-igb-i210-firmware-issue.patch +++ b/queue/igb-Workaround-for-igb-i210-firmware-issue.patch @@ -1,4 +1,4 @@ -From 4e684f59d760a2c7c716bb60190783546e2d08a1 Mon Sep 17 00:00:00 2001 +From cf1460b219d60586618f07660bd05c693641e0da Mon Sep 17 00:00:00 2001 From: Chris J Arges <christopherarges@gmail.com> Date: Wed, 2 Nov 2016 09:13:42 -0500 Subject: [PATCH] igb: Workaround for igb i210 firmware issue @@ -14,6 +14,7 @@ Thanks for Jochen Henneberg for the idea and original patch. Signed-off-by: Chris J Arges <christopherarges@gmail.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c index 5b54254aed4f..569ee25642b4 100644 diff --git a/queue/igb-add-i211-to-i210-PHY-workaround.patch b/queue/igb-add-i211-to-i210-PHY-workaround.patch index 118ad4f..4cdc255 100644 --- a/queue/igb-add-i211-to-i210-PHY-workaround.patch +++ b/queue/igb-add-i211-to-i210-PHY-workaround.patch @@ -1,4 +1,4 @@ -From 5bc8c230e2a993b49244f9457499f17283da9ec7 Mon Sep 17 00:00:00 2001 +From 94fa0ea817e76f78aabf1fb0a0fbca91aea87bba Mon Sep 17 00:00:00 2001 From: Todd Fujinaka <todd.fujinaka@intel.com> Date: Mon, 28 Nov 2016 09:09:57 -0800 Subject: [PATCH] igb: add i211 to i210 PHY workaround @@ -11,6 +11,7 @@ forget i211 for any i210 workarounds. Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c index 569ee25642b4..2788a5409023 100644 diff --git a/queue/ipv4-mask-tos-for-input-route.patch b/queue/ipv4-mask-tos-for-input-route.patch index 2e43d8b..3b6ff8a 100644 --- a/queue/ipv4-mask-tos-for-input-route.patch +++ b/queue/ipv4-mask-tos-for-input-route.patch @@ -1,4 +1,4 @@ -From 6e28099d38c0e50d62c1afc054e37e573adf3d21 Mon Sep 17 00:00:00 2001 +From 88d4b02489a0a186bb18cc74c2d7b4d33b16a63f Mon Sep 17 00:00:00 2001 From: Julian Anastasov <ja@ssi.bg> Date: Sun, 26 Feb 2017 17:14:35 +0200 Subject: [PATCH] ipv4: mask tos for input route @@ -15,12 +15,13 @@ Problem [1] noticed by Shmulik Ladkani <shmulik.ladkani@gmail.com> Fixes: 89aef8921bfb ("ipv4: Delete routing cache.") Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/route.c b/net/ipv4/route.c -index 584ed667bfa4..8471dd116771 100644 +index 91b5cba864cb..b9c084a6e04e 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c -@@ -2009,6 +2009,7 @@ int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr, +@@ -1965,6 +1965,7 @@ int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr, { int res; diff --git a/queue/ipv6-avoid-write-to-a-possibly-cloned-skb.patch b/queue/ipv6-avoid-write-to-a-possibly-cloned-skb.patch index 0ca77d8..96090b7 100644 --- a/queue/ipv6-avoid-write-to-a-possibly-cloned-skb.patch +++ b/queue/ipv6-avoid-write-to-a-possibly-cloned-skb.patch @@ -1,4 +1,4 @@ -From 79e49503efe53a8c51d8b695bedc8a346c5e4a87 Mon Sep 17 00:00:00 2001 +From 8a07dbd91f5b38a12e47f1a57f34a3cefc1639fd Mon Sep 17 00:00:00 2001 From: Florian Westphal <fw@strlen.de> Date: Mon, 13 Mar 2017 16:24:28 +0100 Subject: [PATCH] ipv6: avoid write to a possibly cloned skb @@ -26,12 +26,13 @@ Cc: Hannes Frederic Sowa <hannes@stressinduktion.org> Reported-by: Andreas Karis <akaris@redhat.com> Signed-off-by: Florian Westphal <fw@strlen.de> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c -index df42096e1f04..58f6288e9ba5 100644 +index 1dfc402d9ad1..02d18d64a565 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c -@@ -768,13 +768,14 @@ slow_path: +@@ -741,13 +741,14 @@ slow_path: * Fragment the datagram. */ @@ -47,7 +48,7 @@ index df42096e1f04..58f6288e9ba5 100644 len = left; /* IF: it doesn't fit, use 'mtu' - the data space left */ if (len > mtu) -@@ -819,6 +820,10 @@ slow_path: +@@ -792,6 +793,10 @@ slow_path: */ skb_copy_from_linear_data(skb, skb_network_header(frag), hlen); diff --git a/queue/ipv6-make-ECMP-route-replacement-less-greedy.patch b/queue/ipv6-make-ECMP-route-replacement-less-greedy.patch index 284ec1c..a6bce45 100644 --- a/queue/ipv6-make-ECMP-route-replacement-less-greedy.patch +++ b/queue/ipv6-make-ECMP-route-replacement-less-greedy.patch @@ -1,4 +1,4 @@ -From 67e194007be08d071294456274dd53e0a04fdf90 Mon Sep 17 00:00:00 2001 +From be8b78b74ddb3f33280fc6ecfd22eaca091e42d4 Mon Sep 17 00:00:00 2001 From: Sabrina Dubroca <sd@queasysnail.net> Date: Mon, 13 Mar 2017 13:28:09 +0100 Subject: [PATCH] ipv6: make ECMP route replacement less greedy @@ -50,12 +50,13 @@ Acked-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> Reviewed-by: Xin Long <lucien.xin@gmail.com> Reviewed-by: Michal Kubecek <mkubecek@suse.cz> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c -index e4266746e4a2..d4bf2c68a545 100644 +index 771be1fa4176..ce0bed4ba722 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c -@@ -923,6 +923,8 @@ add: +@@ -904,6 +904,8 @@ add: ins = &rt->dst.rt6_next; iter = *ins; while (iter) { diff --git a/queue/ipv6-orphan-skbs-in-reassembly-unit.patch b/queue/ipv6-orphan-skbs-in-reassembly-unit.patch index bfa8d07..80aaa3a 100644 --- a/queue/ipv6-orphan-skbs-in-reassembly-unit.patch +++ b/queue/ipv6-orphan-skbs-in-reassembly-unit.patch @@ -1,4 +1,4 @@ -From b62fcb2b189f8bb50ba9e8ae0cd388dff685bae7 Mon Sep 17 00:00:00 2001 +From 55c200a48ad45f3e2010934b266144c79a1d8a8c Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 1 Mar 2017 14:45:06 -0800 Subject: [PATCH] ipv6: orphan skbs in reassembly unit diff --git a/queue/ktest-Fix-child-exit-code-processing.patch b/queue/ktest-Fix-child-exit-code-processing.patch index 038fdb6..ae9520b 100644 --- a/queue/ktest-Fix-child-exit-code-processing.patch +++ b/queue/ktest-Fix-child-exit-code-processing.patch @@ -1,4 +1,4 @@ -From 32677207dcc5e594254b7fb4fb2352b1755b1d5b Mon Sep 17 00:00:00 2001 +From 7915b85d39ba1e777e4e9824df35897f292595e3 Mon Sep 17 00:00:00 2001 From: "Steven Rostedt (VMware)" <rostedt@goodmis.org> Date: Tue, 7 Feb 2017 12:05:25 -0500 Subject: [PATCH] ktest: Fix child exit code processing @@ -11,12 +11,13 @@ return values for the bisect variables. Fixes: c5dacb88f0a64 ("ktest: Allow overriding bisect test results") Cc: stable@vger.kernel.org Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl -index caa90d391a96..a64da242b824 100755 +index d08e214ec6e7..223d88e25e05 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl -@@ -2633,7 +2633,7 @@ sub do_run_test { +@@ -2629,7 +2629,7 @@ sub do_run_test { } waitpid $child_pid, 0; diff --git a/queue/l2tp-avoid-use-after-free-caused-by-l2tp_ip_backlog_.patch b/queue/l2tp-avoid-use-after-free-caused-by-l2tp_ip_backlog_.patch index 4aee150..af35ddf 100644 --- a/queue/l2tp-avoid-use-after-free-caused-by-l2tp_ip_backlog_.patch +++ b/queue/l2tp-avoid-use-after-free-caused-by-l2tp_ip_backlog_.patch @@ -1,4 +1,4 @@ -From 51fb60eb162ab84c5edf2ae9c63cf0b878e5547e Mon Sep 17 00:00:00 2001 +From 9c981364a428c9ce3de68025745b357a59b0bab8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Paul=20H=C3=BCber?= <phueber@kernsp.in> Date: Sun, 26 Feb 2017 17:58:19 +0100 Subject: [PATCH] l2tp: avoid use-after-free caused by l2tp_ip_backlog_recv @@ -14,12 +14,13 @@ negative values as an IP protocol number for resubmission. Signed-off-by: Paul Hüber <phueber@kernsp.in> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/l2tp/l2tp_ip.c b/net/l2tp/l2tp_ip.c -index c59712057dc8..d25038cfd64e 100644 +index 445b7cd0826a..48ab93842322 100644 --- a/net/l2tp/l2tp_ip.c +++ b/net/l2tp/l2tp_ip.c -@@ -388,7 +388,7 @@ static int l2tp_ip_backlog_recv(struct sock *sk, struct sk_buff *skb) +@@ -383,7 +383,7 @@ static int l2tp_ip_backlog_recv(struct sock *sk, struct sk_buff *skb) drop: IP_INC_STATS(sock_net(sk), IPSTATS_MIB_INDISCARDS); kfree_skb(skb); diff --git a/queue/libceph-use-BUG-instead-of-BUG_ON-1.patch b/queue/libceph-use-BUG-instead-of-BUG_ON-1.patch index 068b4a1..6509956 100644 --- a/queue/libceph-use-BUG-instead-of-BUG_ON-1.patch +++ b/queue/libceph-use-BUG-instead-of-BUG_ON-1.patch @@ -1,4 +1,4 @@ -From d24cdcd3e40a6825135498e11c20c7976b9bf545 Mon Sep 17 00:00:00 2001 +From b6d771f55d80173a245b4c2064cca9f687ed8368 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Mon, 16 Jan 2017 12:06:09 +0100 Subject: [PATCH] libceph: use BUG() instead of BUG_ON(1) @@ -16,6 +16,7 @@ Using BUG() here avoids the warning. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Ilya Dryomov <idryomov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/ceph/osdmap.h b/include/linux/ceph/osdmap.h index 9a9041784dcf..412906609954 100644 diff --git a/queue/locking-rwsem-Fix-down_write_killable-for-CONFIG_RWS.patch b/queue/locking-rwsem-Fix-down_write_killable-for-CONFIG_RWS.patch index fe9ecc7..fb3c4d6 100644 --- a/queue/locking-rwsem-Fix-down_write_killable-for-CONFIG_RWS.patch +++ b/queue/locking-rwsem-Fix-down_write_killable-for-CONFIG_RWS.patch @@ -1,4 +1,4 @@ -From 1b6ed02607c05e85e16b47ac7b4c836965be5c25 Mon Sep 17 00:00:00 2001 +From cfcc00dd4d13313e7d3f58019b8d31f2e77561a8 Mon Sep 17 00:00:00 2001 From: Niklas Cassel <niklas.cassel@axis.com> Date: Sat, 25 Feb 2017 01:17:53 +0100 Subject: [PATCH] locking/rwsem: Fix down_write_killable() for diff --git a/queue/mac80211-don-t-handle-filtered-frames-within-a-BA-se.patch b/queue/mac80211-don-t-handle-filtered-frames-within-a-BA-se.patch index 1cc074e..f130450 100644 --- a/queue/mac80211-don-t-handle-filtered-frames-within-a-BA-se.patch +++ b/queue/mac80211-don-t-handle-filtered-frames-within-a-BA-se.patch @@ -1,4 +1,4 @@ -From 890030d3c425f49abaa4acf60e20f288b599f980 Mon Sep 17 00:00:00 2001 +From 0cff5f535a4d161fc3146a932671f900ad5e2fc8 Mon Sep 17 00:00:00 2001 From: Felix Fietkau <nbd@nbd.name> Date: Wed, 22 Feb 2017 16:16:07 +0100 Subject: [PATCH] mac80211: don't handle filtered frames within a BA session @@ -16,9 +16,10 @@ latency. Cc: stable@vger.kernel.org Signed-off-by: Felix Fietkau <nbd@nbd.name> Signed-off-by: Johannes Berg <johannes.berg@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/mac80211/status.c b/net/mac80211/status.c -index a3af6e1bfd98..05ccd55b5d83 100644 +index a2a68269675d..c9bea8136e77 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -51,7 +51,8 @@ static void ieee80211_handle_filtered_frame(struct ieee80211_local *local, diff --git a/queue/mac80211-don-t-reorder-frames-with-SN-smaller-than-S.patch b/queue/mac80211-don-t-reorder-frames-with-SN-smaller-than-S.patch index 50a8777..b0eb285 100644 --- a/queue/mac80211-don-t-reorder-frames-with-SN-smaller-than-S.patch +++ b/queue/mac80211-don-t-reorder-frames-with-SN-smaller-than-S.patch @@ -1,4 +1,4 @@ -From b7540d8f25c8034de7e4163fc23ac457bf057731 Mon Sep 17 00:00:00 2001 +From b47209ec3af48f9c6172e3b535b79ecae76a7d79 Mon Sep 17 00:00:00 2001 From: Sara Sharon <sara.sharon@intel.com> Date: Mon, 6 Feb 2017 15:28:42 +0200 Subject: [PATCH] mac80211: don't reorder frames with SN smaller than SSN @@ -14,12 +14,13 @@ head SN of the reorder buffer is set to the SSN, which is bigger. Cc: stable@vger.kernel.org Signed-off-by: Sara Sharon <sara.sharon@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c -index 3b5fd4188f2a..58ad23a44109 100644 +index d309e26a8ec4..466f41a07927 100644 --- a/net/mac80211/agg-rx.c +++ b/net/mac80211/agg-rx.c -@@ -398,6 +398,7 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta, +@@ -395,6 +395,7 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta, tid_agg_rx->timeout = timeout; tid_agg_rx->stored_mpdu_num = 0; tid_agg_rx->auto_seq = auto_seq; @@ -28,7 +29,7 @@ index 3b5fd4188f2a..58ad23a44109 100644 status = WLAN_STATUS_SUCCESS; diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c -index a8443d8bc233..28cc494a774d 100644 +index 1474882187a6..111d002d18fc 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -4,7 +4,7 @@ @@ -40,7 +41,7 @@ index a8443d8bc233..28cc494a774d 100644 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as -@@ -1034,6 +1034,18 @@ static bool ieee80211_sta_manage_reorder_buf(struct ieee80211_sub_if_data *sdata +@@ -984,6 +984,18 @@ static bool ieee80211_sta_manage_reorder_buf(struct ieee80211_sub_if_data *sdata buf_size = tid_agg_rx->buf_size; head_seq_num = tid_agg_rx->head_seq_num; @@ -60,7 +61,7 @@ index a8443d8bc233..28cc494a774d 100644 if (ieee80211_sn_less(mpdu_seq_num, head_seq_num)) { dev_kfree_skb(skb); diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h -index dd06ef0b8861..15599c70a38f 100644 +index 01708c85ec3c..ac3a2841dcee 100644 --- a/net/mac80211/sta_info.h +++ b/net/mac80211/sta_info.h @@ -189,6 +189,7 @@ struct tid_ampdu_tx { diff --git a/queue/mac80211-flush-delayed-work-when-entering-suspend.patch b/queue/mac80211-flush-delayed-work-when-entering-suspend.patch index 35856b8..4ff4197 100644 --- a/queue/mac80211-flush-delayed-work-when-entering-suspend.patch +++ b/queue/mac80211-flush-delayed-work-when-entering-suspend.patch @@ -1,4 +1,4 @@ -From a9e9200d8661c1a0be8c39f93deb383dc940de35 Mon Sep 17 00:00:00 2001 +From 321e3f5d8dc609a264238e6ba9b3692a7c060cfb Mon Sep 17 00:00:00 2001 From: Matt Chen <matt.chen@intel.com> Date: Sun, 22 Jan 2017 02:16:58 +0800 Subject: [PATCH] mac80211: flush delayed work when entering suspend @@ -19,9 +19,10 @@ in a delayed_work during suspend. Add a flush_delayed_work to fix it. Cc: stable@vger.kernel.org Signed-off-by: Matt Chen <matt.chen@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/mac80211/pm.c b/net/mac80211/pm.c -index 28a3a0957c9e..76a8bcd8ef11 100644 +index 00a43a70e1fc..0402fa45b343 100644 --- a/net/mac80211/pm.c +++ b/net/mac80211/pm.c @@ -168,6 +168,7 @@ int __ieee80211_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan) diff --git a/queue/mac80211-use-driver-indicated-transmitter-STA-only-f.patch b/queue/mac80211-use-driver-indicated-transmitter-STA-only-f.patch index c7946e5..a54e4a2 100644 --- a/queue/mac80211-use-driver-indicated-transmitter-STA-only-f.patch +++ b/queue/mac80211-use-driver-indicated-transmitter-STA-only-f.patch @@ -1,4 +1,4 @@ -From e0a3921ae1ce69f509dd9dae04a8ced8ffa8396b Mon Sep 17 00:00:00 2001 +From a3eb6326aafd266dd714bee37b57563a0b68307a Mon Sep 17 00:00:00 2001 From: Johannes Berg <johannes.berg@intel.com> Date: Mon, 27 Feb 2017 09:38:11 +0100 Subject: [PATCH] mac80211: use driver-indicated transmitter STA only for data diff --git a/queue/media-rc-raw-decoder-for-keymap-protocol-is-not-load.patch b/queue/media-rc-raw-decoder-for-keymap-protocol-is-not-load.patch index 3d4994a..6eb60f7 100644 --- a/queue/media-rc-raw-decoder-for-keymap-protocol-is-not-load.patch +++ b/queue/media-rc-raw-decoder-for-keymap-protocol-is-not-load.patch @@ -1,4 +1,4 @@ -From 413808685dd7c9b54bbc5af79da2eaddd0fc3cb2 Mon Sep 17 00:00:00 2001 +From af879f3a8cf2d623ff17b8a3d11b9b39f651adda Mon Sep 17 00:00:00 2001 From: Sean Young <sean@mess.org> Date: Wed, 22 Feb 2017 18:48:01 -0300 Subject: [PATCH] [media] rc: raw decoder for keymap protocol is not loaded on @@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c -index 26fd63bdf8e8..0e0ee0c29db3 100644 +index 8e7f2929fa6f..e75bb3e1f00a 100644 --- a/drivers/media/rc/rc-main.c +++ b/drivers/media/rc/rc-main.c @@ -1409,6 +1409,7 @@ int rc_register_device(struct rc_dev *dev) @@ -29,7 +29,7 @@ index 26fd63bdf8e8..0e0ee0c29db3 100644 if (!dev || !dev->map_name) return -EINVAL; -@@ -1494,14 +1495,18 @@ int rc_register_device(struct rc_dev *dev) +@@ -1495,14 +1496,18 @@ int rc_register_device(struct rc_dev *dev) goto out_input; } diff --git a/queue/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br.patch b/queue/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br.patch index a168531..c9f4a3b 100644 --- a/queue/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br.patch +++ b/queue/media-uvcvideo-uvc_scan_fallback-for-webcams-with-br.patch @@ -1,4 +1,4 @@ -From e950267ab802c8558f1100eafd4087fd039ad634 Mon Sep 17 00:00:00 2001 +From 5c9bbff3cd8eb4d8529861713510ad1a2006c553 Mon Sep 17 00:00:00 2001 From: Henrik Ingo <henrik.ingo@avoinelama.fi> Date: Sun, 29 May 2016 17:58:00 -0300 Subject: [PATCH] [media] uvcvideo: uvc_scan_fallback() for webcams with broken @@ -18,9 +18,10 @@ At the time of writing, devices known to have such a broken chain are Signed-off-by: Henrik Ingo <henrik.ingo@avoinelama.fi> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c -index 9c4b56b4a9c6..87b2fc3b0ac2 100644 +index 302e284a95eb..cde43b63c3da 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c @@ -1595,6 +1595,114 @@ static const char *uvc_print_chain(struct uvc_video_chain *chain) diff --git a/queue/memory-atmel-ebi-Fix-ns-cycles-conversions.patch b/queue/memory-atmel-ebi-Fix-ns-cycles-conversions.patch index d59c2be..ab4aa8e 100644 --- a/queue/memory-atmel-ebi-Fix-ns-cycles-conversions.patch +++ b/queue/memory-atmel-ebi-Fix-ns-cycles-conversions.patch @@ -1,4 +1,4 @@ -From ee194289502a6901cc77dc9a893bf2afd351ac5e Mon Sep 17 00:00:00 2001 +From ddb930b3a5b7124242e46e4f0f73bbbc563a99b1 Mon Sep 17 00:00:00 2001 From: Boris Brezillon <boris.brezillon@free-electrons.com> Date: Mon, 28 Nov 2016 16:17:56 +0100 Subject: [PATCH] memory/atmel-ebi: Fix ns <-> cycles conversions @@ -17,9 +17,10 @@ Reported-by: Chris Leahy <leahycm@gmail.com> Fixes: 6a4ec4cd0888 ("memory: add Atmel EBI (External Bus Interface) driver") Cc: <stable@vger.kernel.org> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/memory/atmel-ebi.c b/drivers/memory/atmel-ebi.c -index 047d6fcdcec2..1eaaa2be8ff2 100644 +index f87ad6f5d2dc..dbf52da7bc5a 100644 --- a/drivers/memory/atmel-ebi.c +++ b/drivers/memory/atmel-ebi.c @@ -93,7 +93,7 @@ static void at91sam9_ebi_get_config(struct at91_ebi_dev *ebid, diff --git a/queue/mlxsw-spectrum_router-Avoid-potential-packets-loss.patch b/queue/mlxsw-spectrum_router-Avoid-potential-packets-loss.patch index 194c968..eb93e76 100644 --- a/queue/mlxsw-spectrum_router-Avoid-potential-packets-loss.patch +++ b/queue/mlxsw-spectrum_router-Avoid-potential-packets-loss.patch @@ -1,4 +1,4 @@ -From f7df4923fa986247e93ec2cdff5ca168fff14dcf Mon Sep 17 00:00:00 2001 +From bde7d6638befc5e8a335582b8db9ba9b2add41b6 Mon Sep 17 00:00:00 2001 From: Ido Schimmel <idosch@mellanox.com> Date: Tue, 28 Feb 2017 08:55:40 +0100 Subject: [PATCH] mlxsw: spectrum_router: Avoid potential packets loss @@ -15,12 +15,13 @@ Fixes: 6b75c4807db3 ("mlxsw: spectrum_router: Add virtual router management") Signed-off-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c -index d7ac22d7f940..bd8de6b9be71 100644 +index 62514b9bf988..a391fd59ba43 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c -@@ -441,30 +441,40 @@ static int +@@ -478,30 +478,40 @@ static int mlxsw_sp_vr_lpm_tree_check(struct mlxsw_sp *mlxsw_sp, struct mlxsw_sp_vr *vr, struct mlxsw_sp_prefix_usage *req_prefix_usage) { diff --git a/queue/mm-do-not-call-mem_cgroup_free-from-within-mem_cgrou.patch b/queue/mm-do-not-call-mem_cgroup_free-from-within-mem_cgrou.patch index 0dbb512..1fba7f2 100644 --- a/queue/mm-do-not-call-mem_cgroup_free-from-within-mem_cgrou.patch +++ b/queue/mm-do-not-call-mem_cgroup_free-from-within-mem_cgrou.patch @@ -1,4 +1,4 @@ -From 40e952f9d687928b32db20226f085ae660a7237c Mon Sep 17 00:00:00 2001 +From b5f190012191e011ec7e7476914ae588632aad18 Mon Sep 17 00:00:00 2001 From: Tahsin Erdogan <tahsin@google.com> Date: Thu, 9 Mar 2017 16:17:26 -0800 Subject: [PATCH] mm: do not call mem_cgroup_free() from within @@ -44,12 +44,13 @@ Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/memcontrol.c b/mm/memcontrol.c -index 76f513cc1b0e..2bd7541d7c11 100644 +index 8bdb49e3b625..face124e24e9 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c -@@ -4138,17 +4138,22 @@ static void free_mem_cgroup_per_node_info(struct mem_cgroup *memcg, int node) +@@ -4167,17 +4167,22 @@ static void free_mem_cgroup_per_node_info(struct mem_cgroup *memcg, int node) kfree(memcg->nodeinfo[node]); } @@ -74,7 +75,7 @@ index 76f513cc1b0e..2bd7541d7c11 100644 static struct mem_cgroup *mem_cgroup_alloc(void) { struct mem_cgroup *memcg; -@@ -4199,7 +4204,7 @@ static struct mem_cgroup *mem_cgroup_alloc(void) +@@ -4228,7 +4233,7 @@ static struct mem_cgroup *mem_cgroup_alloc(void) fail: if (memcg->id.id > 0) idr_remove(&mem_cgroup_idr, memcg->id.id); diff --git a/queue/mnt-Tuck-mounts-under-others-instead-of-creating-sha.patch b/queue/mnt-Tuck-mounts-under-others-instead-of-creating-sha.patch index 6b11201..0447e82 100644 --- a/queue/mnt-Tuck-mounts-under-others-instead-of-creating-sha.patch +++ b/queue/mnt-Tuck-mounts-under-others-instead-of-creating-sha.patch @@ -1,4 +1,4 @@ -From 1ce161b27c12c170f718810be6da6aa6f4ced61d Mon Sep 17 00:00:00 2001 +From 6bfff39aa949508da97a5355aea2a083446bfecb Mon Sep 17 00:00:00 2001 From: "Eric W. Biederman" <ebiederm@xmission.com> Date: Fri, 20 Jan 2017 18:28:35 +1300 Subject: [PATCH] mnt: Tuck mounts under others instead of creating shadow/side diff --git a/queue/mpls-Do-not-decrement-alive-counter-for-unregister-e.patch b/queue/mpls-Do-not-decrement-alive-counter-for-unregister-e.patch index eabf7fe..d6e38f0 100644 --- a/queue/mpls-Do-not-decrement-alive-counter-for-unregister-e.patch +++ b/queue/mpls-Do-not-decrement-alive-counter-for-unregister-e.patch @@ -1,4 +1,4 @@ -From 79099aab38c8f5c746748b066ae74ba984fe2cc8 Mon Sep 17 00:00:00 2001 +From ed9cc80b1dae718d9b029eb751ef2ac4d1add2b1 Mon Sep 17 00:00:00 2001 From: David Ahern <dsa@cumulusnetworks.com> Date: Fri, 10 Mar 2017 14:11:39 -0800 Subject: [PATCH] mpls: Do not decrement alive counter for unregister events @@ -31,12 +31,13 @@ NETDEV_UNREGISTER is redundant. Fixes: c89359a42e2a4 ("mpls: support for dead routes") Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c -index a1477989ed0b..33211f9a2656 100644 +index 47977b333792..25bd592ec1a8 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c -@@ -1288,7 +1288,8 @@ static void mpls_ifdown(struct net_device *dev, int event) +@@ -956,7 +956,8 @@ static void mpls_ifdown(struct net_device *dev, int event) /* fall through */ case NETDEV_CHANGE: nh->nh_flags |= RTNH_F_LINKDOWN; diff --git a/queue/mpls-Send-route-delete-notifications-when-router-mod.patch b/queue/mpls-Send-route-delete-notifications-when-router-mod.patch index ea2ccc7..66a28d9 100644 --- a/queue/mpls-Send-route-delete-notifications-when-router-mod.patch +++ b/queue/mpls-Send-route-delete-notifications-when-router-mod.patch @@ -1,4 +1,4 @@ -From e37791ec1ad785b59022ae211f63a16189bacebf Mon Sep 17 00:00:00 2001 +From b26ce892d5140f89a3941fa68d4032944808f982 Mon Sep 17 00:00:00 2001 From: David Ahern <dsa@cumulusnetworks.com> Date: Fri, 10 Mar 2017 09:46:15 -0800 Subject: [PATCH] mpls: Send route delete notifications when router module is @@ -14,12 +14,13 @@ routes are freed. Fixes: 0189197f44160 ("mpls: Basic routing support") Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c -index 3818686182b2..a1477989ed0b 100644 +index 8e9c064568d4..47977b333792 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c -@@ -2028,6 +2028,7 @@ static void mpls_net_exit(struct net *net) +@@ -1701,6 +1701,7 @@ static void mpls_net_exit(struct net *net) for (index = 0; index < platform_labels; index++) { struct mpls_route *rt = rtnl_dereference(platform_label[index]); RCU_INIT_POINTER(platform_label[index], NULL); diff --git a/queue/mtd-pmcmsp-use-kstrndup-instead-of-kmalloc-strncpy.patch b/queue/mtd-pmcmsp-use-kstrndup-instead-of-kmalloc-strncpy.patch index d2591e2..7fee3dd 100644 --- a/queue/mtd-pmcmsp-use-kstrndup-instead-of-kmalloc-strncpy.patch +++ b/queue/mtd-pmcmsp-use-kstrndup-instead-of-kmalloc-strncpy.patch @@ -1,4 +1,4 @@ -From 906b268477bc03daaa04f739844c120fe4dbc991 Mon Sep 17 00:00:00 2001 +From 94c7071c37b803e712258e910c02c380f4153ef5 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Fri, 3 Feb 2017 10:49:17 +0100 Subject: [PATCH] mtd: pmcmsp: use kstrndup instead of kmalloc+strncpy @@ -15,6 +15,7 @@ Using kstrndup() simplifies the code and avoids the warning. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Marek Vasut <marek.vasut@gmail.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/maps/pmcmsp-flash.c b/drivers/mtd/maps/pmcmsp-flash.c index f9fa3fad728e..2051f28ddac6 100644 diff --git a/queue/net-don-t-call-strlen-on-the-user-buffer-in-packet_b.patch b/queue/net-don-t-call-strlen-on-the-user-buffer-in-packet_b.patch index 6d1f975..13d5ee9 100644 --- a/queue/net-don-t-call-strlen-on-the-user-buffer-in-packet_b.patch +++ b/queue/net-don-t-call-strlen-on-the-user-buffer-in-packet_b.patch @@ -1,4 +1,4 @@ -From 540e2894f7905538740aaf122bd8e0548e1c34a4 Mon Sep 17 00:00:00 2001 +From 86395a1cbfa3d75dcb09d3cdced87f6eec291c57 Mon Sep 17 00:00:00 2001 From: Alexander Potapenko <glider@google.com> Date: Wed, 1 Mar 2017 12:57:20 +0100 Subject: [PATCH] net: don't call strlen() on the user buffer in @@ -75,12 +75,13 @@ buffer. Signed-off-by: Alexander Potapenko <glider@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index 2bd0d1949312..a0dbe7ca8f72 100644 +index 184a3461cf79..b3dc668b0da7 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -3103,7 +3103,7 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, +@@ -3126,7 +3126,7 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, int addr_len) { struct sock *sk = sock->sk; @@ -89,7 +90,7 @@ index 2bd0d1949312..a0dbe7ca8f72 100644 /* * Check legality -@@ -3111,7 +3111,11 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, +@@ -3134,7 +3134,11 @@ static int packet_bind_spkt(struct socket *sock, struct sockaddr *uaddr, if (addr_len != sizeof(struct sockaddr)) return -EINVAL; diff --git a/queue/net-fix-socket-refcounting-in-skb_complete_tx_timest.patch b/queue/net-fix-socket-refcounting-in-skb_complete_tx_timest.patch index 5faf507..f45949e 100644 --- a/queue/net-fix-socket-refcounting-in-skb_complete_tx_timest.patch +++ b/queue/net-fix-socket-refcounting-in-skb_complete_tx_timest.patch @@ -1,4 +1,4 @@ -From 9ac25fc063751379cb77434fef9f3b088cd3e2f7 Mon Sep 17 00:00:00 2001 +From 1d108983e57b890c3ef6df30798905f4e67463a5 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Fri, 3 Mar 2017 21:01:03 -0800 Subject: [PATCH] net: fix socket refcounting in skb_complete_tx_timestamp() @@ -19,12 +19,13 @@ Cc: Soheil Hassas Yeganeh <soheil@google.com> Cc: Willem de Bruijn <willemb@google.com> Acked-by: Soheil Hassas Yeganeh <soheil@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/core/skbuff.c b/net/core/skbuff.c -index e2f37a560ec4..cd4ba8c6b609 100644 +index 473bf4a5b80a..b9953905f446 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -3828,13 +3828,14 @@ void skb_complete_tx_timestamp(struct sk_buff *skb, +@@ -3790,13 +3790,14 @@ void skb_complete_tx_timestamp(struct sk_buff *skb, if (!skb_may_tx_timestamp(sk, false)) return; diff --git a/queue/net-fix-socket-refcounting-in-skb_complete_wifi_ack.patch b/queue/net-fix-socket-refcounting-in-skb_complete_wifi_ack.patch index 408a4a2..1c83320 100644 --- a/queue/net-fix-socket-refcounting-in-skb_complete_wifi_ack.patch +++ b/queue/net-fix-socket-refcounting-in-skb_complete_wifi_ack.patch @@ -1,4 +1,4 @@ -From dd4f10722aeb10f4f582948839f066bebe44e5fb Mon Sep 17 00:00:00 2001 +From abbd9f13d87c31688d37c247dd50a36dfaa360ac Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Fri, 3 Mar 2017 21:01:02 -0800 Subject: [PATCH] net: fix socket refcounting in skb_complete_wifi_ack() @@ -19,12 +19,13 @@ Cc: Soheil Hassas Yeganeh <soheil@google.com> Cc: Willem de Bruijn <willemb@google.com> Acked-by: Soheil Hassas Yeganeh <soheil@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/core/skbuff.c b/net/core/skbuff.c -index f3557958e9bf..e2f37a560ec4 100644 +index 3864b4b68fa1..473bf4a5b80a 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c -@@ -3893,7 +3893,7 @@ void skb_complete_wifi_ack(struct sk_buff *skb, bool acked) +@@ -3847,7 +3847,7 @@ void skb_complete_wifi_ack(struct sk_buff *skb, bool acked) { struct sock *sk = skb->sk; struct sock_exterr_skb *serr; @@ -33,7 +34,7 @@ index f3557958e9bf..e2f37a560ec4 100644 skb->wifi_acked_valid = 1; skb->wifi_acked = acked; -@@ -3903,14 +3903,15 @@ void skb_complete_wifi_ack(struct sk_buff *skb, bool acked) +@@ -3857,14 +3857,15 @@ void skb_complete_wifi_ack(struct sk_buff *skb, bool acked) serr->ee.ee_errno = ENOMSG; serr->ee.ee_origin = SO_EE_ORIGIN_TXSTATUS; diff --git a/queue/net-mlx5e-Fix-wrong-CQE-decompression.patch b/queue/net-mlx5e-Fix-wrong-CQE-decompression.patch index e62bf6f..5553a04 100644 --- a/queue/net-mlx5e-Fix-wrong-CQE-decompression.patch +++ b/queue/net-mlx5e-Fix-wrong-CQE-decompression.patch @@ -1,4 +1,4 @@ -From 36154be40a28e4afaa0416da2681d80b7e2ca319 Mon Sep 17 00:00:00 2001 +From e20907579caf2128af4a0d5e043fab7c6859a5bf Mon Sep 17 00:00:00 2001 From: Tariq Toukan <tariqt@mellanox.com> Date: Wed, 22 Feb 2017 17:20:16 +0200 Subject: [PATCH] net/mlx5e: Fix wrong CQE decompression @@ -33,12 +33,13 @@ Reported-by: Tom Herbert <tom@herbertland.com> Cc: kernel-team@fb.com Signed-off-by: Saeed Mahameed <saeedm@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c -index d5ce20db3f0b..3d371688fbbb 100644 +index e7c969df3dad..3fa5575cda20 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rx.c -@@ -94,19 +94,18 @@ static inline void mlx5e_cqes_update_owner(struct mlx5e_cq *cq, u32 cqcc, int n) +@@ -91,19 +91,18 @@ static inline void mlx5e_cqes_update_owner(struct mlx5e_cq *cq, u32 cqcc, int n) static inline void mlx5e_decompress_cqe(struct mlx5e_rq *rq, struct mlx5e_cq *cq, u32 cqcc) { diff --git a/queue/net-mvpp2-fix-DMA-address-calculation-in-mvpp2_txq_i.patch b/queue/net-mvpp2-fix-DMA-address-calculation-in-mvpp2_txq_i.patch index 62a63c9..3eae925 100644 --- a/queue/net-mvpp2-fix-DMA-address-calculation-in-mvpp2_txq_i.patch +++ b/queue/net-mvpp2-fix-DMA-address-calculation-in-mvpp2_txq_i.patch @@ -1,4 +1,4 @@ -From 239a3b663647869330955ec59caac0100ef9b60a Mon Sep 17 00:00:00 2001 +From d6820630b33c5fe588ab9c6900f75cca081097f6 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Date: Tue, 21 Feb 2017 11:28:01 +0100 Subject: [PATCH] net: mvpp2: fix DMA address calculation in @@ -23,9 +23,10 @@ mvpp2_txq_inc_put(). Cc: <stable@vger.kernel.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/marvell/mvpp2.c b/drivers/net/ethernet/marvell/mvpp2.c -index c48632048f71..a6992ce34565 100644 +index 5588c560ec61..aadd38ec4f24 100644 --- a/drivers/net/ethernet/marvell/mvpp2.c +++ b/drivers/net/ethernet/marvell/mvpp2.c @@ -991,7 +991,7 @@ static void mvpp2_txq_inc_put(struct mvpp2_txq_pcpu *txq_pcpu, diff --git a/queue/net-net_enable_timestamp-can-be-called-from-irq-cont.patch b/queue/net-net_enable_timestamp-can-be-called-from-irq-cont.patch index a198104..51b84b7 100644 --- a/queue/net-net_enable_timestamp-can-be-called-from-irq-cont.patch +++ b/queue/net-net_enable_timestamp-can-be-called-from-irq-cont.patch @@ -1,4 +1,4 @@ -From 13baa00ad01bb3a9f893e3a08cbc2d072fc0c15d Mon Sep 17 00:00:00 2001 +From 5ff631437c88b77ba3cc771b46820a1a0a851203 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 1 Mar 2017 14:28:39 -0800 Subject: [PATCH] net: net_enable_timestamp() can be called from irq contexts @@ -25,12 +25,13 @@ Fixes: b90e5794c5bd ("net: dont call jump_label_dec from irq context") Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/core/dev.c b/net/core/dev.c -index e63bf61b19be..8637b2b71f3d 100644 +index 0913c32c0b9b..afffe665b3ed 100644 --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -1698,27 +1698,54 @@ EXPORT_SYMBOL_GPL(net_dec_egress_queue); +@@ -1697,27 +1697,54 @@ EXPORT_SYMBOL_GPL(net_dec_egress_queue); static struct static_key netstamp_needed __read_mostly; #ifdef HAVE_JUMP_LABEL static atomic_t netstamp_needed_deferred; diff --git a/queue/net-sched-actions-decrement-module-reference-count-a.patch b/queue/net-sched-actions-decrement-module-reference-count-a.patch index e912ed2..e78b258 100644 --- a/queue/net-sched-actions-decrement-module-reference-count-a.patch +++ b/queue/net-sched-actions-decrement-module-reference-count-a.patch @@ -1,4 +1,4 @@ -From edb9d1bff4bbe19b8ae0e71b1f38732591a9eeb2 Mon Sep 17 00:00:00 2001 +From 2568054a8dceb3a792673c8b9d44e0954c5c721d Mon Sep 17 00:00:00 2001 From: Roman Mashak <mrv@mojatatu.com> Date: Fri, 24 Feb 2017 11:00:32 -0500 Subject: [PATCH] net sched actions: decrement module reference count after @@ -63,12 +63,13 @@ Signed-off-by: Roman Mashak <mrv@mojatatu.com> Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com> Acked-by: Cong Wang <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/sched/act_api.c b/net/sched/act_api.c -index f219ff325ed4..dfe64f81cb16 100644 +index 027ddf412c40..e619ea4c0a4b 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c -@@ -859,10 +859,8 @@ static int tca_action_flush(struct net *net, struct nlattr *nla, +@@ -803,10 +803,8 @@ static int tca_action_flush(struct net *net, struct nlattr *nla, goto out_module_put; err = ops->walk(net, skb, &dcb, RTM_DELACTION, ops); @@ -80,7 +81,7 @@ index f219ff325ed4..dfe64f81cb16 100644 nla_nest_end(skb, nest); -@@ -879,7 +877,6 @@ static int tca_action_flush(struct net *net, struct nlattr *nla, +@@ -823,7 +821,6 @@ static int tca_action_flush(struct net *net, struct nlattr *nla, out_module_put: module_put(ops->owner); err_out: diff --git a/queue/net-tunnel-set-inner-protocol-in-network-gro-hooks.patch b/queue/net-tunnel-set-inner-protocol-in-network-gro-hooks.patch index 556b107..3d71b71 100644 --- a/queue/net-tunnel-set-inner-protocol-in-network-gro-hooks.patch +++ b/queue/net-tunnel-set-inner-protocol-in-network-gro-hooks.patch @@ -1,4 +1,4 @@ -From 294acf1c01bace5cea5d30b510504238bf5f7c25 Mon Sep 17 00:00:00 2001 +From a1efc8dd82f193535c4bfc6b7f38c40236622c29 Mon Sep 17 00:00:00 2001 From: Paolo Abeni <pabeni@redhat.com> Date: Tue, 7 Mar 2017 18:33:31 +0100 Subject: [PATCH] net/tunnel: set inner protocol in network gro hooks @@ -31,12 +31,13 @@ Fixes: 8bce6d7d0d1e ("udp: Generalize skb_udp_segment") Signed-off-by: Paolo Abeni <pabeni@redhat.com> Acked-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c -index 602d40f43687..5091f46826fa 100644 +index ed22af67c58a..fdbdc6459882 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c -@@ -1487,8 +1487,10 @@ int inet_gro_complete(struct sk_buff *skb, int nhoff) +@@ -1458,8 +1458,10 @@ int inet_gro_complete(struct sk_buff *skb, int nhoff) int proto = iph->protocol; int err = -ENOSYS; @@ -49,10 +50,10 @@ index 602d40f43687..5091f46826fa 100644 csum_replace2(&iph->check, iph->tot_len, newlen); iph->tot_len = newlen; diff --git a/net/ipv6/ip6_offload.c b/net/ipv6/ip6_offload.c -index 0838e6d01d2e..93e58a5e1837 100644 +index fdf875270f97..4d163433f1c3 100644 --- a/net/ipv6/ip6_offload.c +++ b/net/ipv6/ip6_offload.c -@@ -294,8 +294,10 @@ static int ipv6_gro_complete(struct sk_buff *skb, int nhoff) +@@ -291,8 +291,10 @@ static int ipv6_gro_complete(struct sk_buff *skb, int nhoff) struct ipv6hdr *iph = (struct ipv6hdr *)(skb->data + nhoff); int err = -ENOSYS; diff --git a/queue/nlm-Ensure-callback-code-also-checks-that-the-files-.patch b/queue/nlm-Ensure-callback-code-also-checks-that-the-files-.patch index d40ec72..32b1ccf 100644 --- a/queue/nlm-Ensure-callback-code-also-checks-that-the-files-.patch +++ b/queue/nlm-Ensure-callback-code-also-checks-that-the-files-.patch @@ -1,4 +1,4 @@ -From 251af29c320d86071664f02c76f0d063a19fefdf Mon Sep 17 00:00:00 2001 +From 88d15db4ebd430820be17f949be375bb76028131 Mon Sep 17 00:00:00 2001 From: Trond Myklebust <trond.myklebust@primarydata.com> Date: Sat, 11 Feb 2017 10:37:38 -0500 Subject: [PATCH] nlm: Ensure callback code also checks that the files match @@ -14,6 +14,7 @@ Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/lockd/lockd.h b/include/linux/lockd/lockd.h index c15373894a42..b37dee3acaba 100644 diff --git a/queue/orangefs-Use-RCU-for-destroy_inode.patch b/queue/orangefs-Use-RCU-for-destroy_inode.patch index 03c50a8..f4f2fd2 100644 --- a/queue/orangefs-Use-RCU-for-destroy_inode.patch +++ b/queue/orangefs-Use-RCU-for-destroy_inode.patch @@ -1,4 +1,4 @@ -From 0695d7dc1d9f19b82ec2cae24856bddce278cfe6 Mon Sep 17 00:00:00 2001 +From 1db82d5615256b0d90818d8bd1fd28a85a285f17 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra <peterz@infradead.org> Date: Fri, 24 Feb 2017 16:43:36 +0100 Subject: [PATCH] orangefs: Use RCU for destroy_inode @@ -10,12 +10,13 @@ freeing of inodes must be RCU-delayed on all filesystems Cc: stable@vger.kernel.org Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/orangefs/super.c b/fs/orangefs/super.c -index c48859f16e7b..67c24351a67f 100644 +index b9da9a0281c9..06c716aabcfb 100644 --- a/fs/orangefs/super.c +++ b/fs/orangefs/super.c -@@ -115,6 +115,13 @@ static struct inode *orangefs_alloc_inode(struct super_block *sb) +@@ -114,6 +114,13 @@ static struct inode *orangefs_alloc_inode(struct super_block *sb) return &orangefs_inode->vfs_inode; } @@ -29,7 +30,7 @@ index c48859f16e7b..67c24351a67f 100644 static void orangefs_destroy_inode(struct inode *inode) { struct orangefs_inode_s *orangefs_inode = ORANGEFS_I(inode); -@@ -123,7 +130,7 @@ static void orangefs_destroy_inode(struct inode *inode) +@@ -122,7 +129,7 @@ static void orangefs_destroy_inode(struct inode *inode) "%s: deallocated %p destroying inode %pU\n", __func__, orangefs_inode, get_khandle_from_ino(inode)); diff --git a/queue/pci-hotplug-pnv-php-Remove-WARN_ON-in-pnv_php_put_sl.patch b/queue/pci-hotplug-pnv-php-Remove-WARN_ON-in-pnv_php_put_sl.patch index b4fc851..95606f8 100644 --- a/queue/pci-hotplug-pnv-php-Remove-WARN_ON-in-pnv_php_put_sl.patch +++ b/queue/pci-hotplug-pnv-php-Remove-WARN_ON-in-pnv_php_put_sl.patch @@ -1,4 +1,4 @@ -From 36c7c9da40c408a71e5e6bfe12e57dcf549a296d Mon Sep 17 00:00:00 2001 +From a57c28c18d89d1e04598342e2562dd99692407a3 Mon Sep 17 00:00:00 2001 From: Gavin Shan <gwshan@linux.vnet.ibm.com> Date: Thu, 16 Feb 2017 10:22:32 +1100 Subject: [PATCH] pci/hotplug/pnv-php: Remove WARN_ON() in pnv_php_put_slot() @@ -26,12 +26,13 @@ Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com> Reviewed-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> Tested-by: Vaibhav Jain <vaibhav@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c -index 63cd9f354b79..da1bbf3eda55 100644 +index e6245b03f0a1..4308690b2ff3 100644 --- a/drivers/pci/hotplug/pnv_php.c +++ b/drivers/pci/hotplug/pnv_php.c -@@ -76,7 +76,7 @@ static void pnv_php_free_slot(struct kref *kref) +@@ -42,7 +42,7 @@ static void pnv_php_free_slot(struct kref *kref) static inline void pnv_php_put_slot(struct pnv_php_slot *php_slot) { diff --git a/queue/powerpc-Emulation-support-for-load-store-instruction.patch b/queue/powerpc-Emulation-support-for-load-store-instruction.patch index 9be18d7..f5e95b4 100644 --- a/queue/powerpc-Emulation-support-for-load-store-instruction.patch +++ b/queue/powerpc-Emulation-support-for-load-store-instruction.patch @@ -1,4 +1,4 @@ -From 3c4ffa4f3be74c911855c86d2d47395a94f432ef Mon Sep 17 00:00:00 2001 +From 2ee8653d24fbaaf3cde2b84c8a5f6d6d6ddeb691 Mon Sep 17 00:00:00 2001 From: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> Date: Tue, 14 Feb 2017 14:46:42 +0530 Subject: [PATCH] powerpc: Emulation support for load/store instructions on LE diff --git a/queue/powerpc-iommu-Pass-mm_struct-to-init-cleanup-helpers.patch b/queue/powerpc-iommu-Pass-mm_struct-to-init-cleanup-helpers.patch index 83cadab..422c49c 100644 --- a/queue/powerpc-iommu-Pass-mm_struct-to-init-cleanup-helpers.patch +++ b/queue/powerpc-iommu-Pass-mm_struct-to-init-cleanup-helpers.patch @@ -1,4 +1,4 @@ -From 88f54a3581eb9deaa3bd1aade40aef266d782385 Mon Sep 17 00:00:00 2001 +From bbbf21494eb97376a1d33a7555e557aba424adb0 Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy <aik@ozlabs.ru> Date: Wed, 30 Nov 2016 17:51:59 +1100 Subject: [PATCH] powerpc/iommu: Pass mm_struct to init/cleanup helpers @@ -18,12 +18,13 @@ This should not cause any behavioral change. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/include/asm/mmu_context.h b/arch/powerpc/include/asm/mmu_context.h -index 5c451140660a..424844bc2a57 100644 +index 9d2cd0c36ec2..31deb7d813e8 100644 --- a/arch/powerpc/include/asm/mmu_context.h +++ b/arch/powerpc/include/asm/mmu_context.h -@@ -23,8 +23,8 @@ extern bool mm_iommu_preregistered(void); +@@ -22,8 +22,8 @@ extern bool mm_iommu_preregistered(void); extern long mm_iommu_get(unsigned long ua, unsigned long entries, struct mm_iommu_table_group_mem_t **pmem); extern long mm_iommu_put(struct mm_iommu_table_group_mem_t *mem); @@ -35,10 +36,10 @@ index 5c451140660a..424844bc2a57 100644 unsigned long size); extern struct mm_iommu_table_group_mem_t *mm_iommu_find(unsigned long ua, diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c -index 270ee30abdcf..f516ac508ae3 100644 +index dba265c586df..942cf4907796 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c -@@ -915,7 +915,7 @@ void __init setup_arch(char **cmdline_p) +@@ -906,7 +906,7 @@ void __init setup_arch(char **cmdline_p) init_mm.context.pte_frag = NULL; #endif #ifdef CONFIG_SPAPR_TCE_IOMMU @@ -70,10 +71,10 @@ index b114f8b93ec9..ad8273590975 100644 #ifdef CONFIG_PPC_ICSWX diff --git a/arch/powerpc/mm/mmu_context_iommu.c b/arch/powerpc/mm/mmu_context_iommu.c -index e0f1c33601dd..ad2e575fd418 100644 +index da6a2168ae9e..699cd80f4e39 100644 --- a/arch/powerpc/mm/mmu_context_iommu.c +++ b/arch/powerpc/mm/mmu_context_iommu.c -@@ -373,16 +373,17 @@ void mm_iommu_mapped_dec(struct mm_iommu_table_group_mem_t *mem) +@@ -300,16 +300,17 @@ void mm_iommu_mapped_dec(struct mm_iommu_table_group_mem_t *mem) } EXPORT_SYMBOL_GPL(mm_iommu_mapped_dec); diff --git a/queue/powerpc-iommu-Stop-using-current-in-mm_iommu_xxx.patch b/queue/powerpc-iommu-Stop-using-current-in-mm_iommu_xxx.patch index e91d765..7df4704 100644 --- a/queue/powerpc-iommu-Stop-using-current-in-mm_iommu_xxx.patch +++ b/queue/powerpc-iommu-Stop-using-current-in-mm_iommu_xxx.patch @@ -1,4 +1,4 @@ -From 379e1ebb34144d05b1332d4028b595a4ddad3d30 Mon Sep 17 00:00:00 2001 +From b33c26b3aa60cf3dabf2e75c0c2a39cb3ca7d848 Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy <aik@ozlabs.ru> Date: Wed, 30 Nov 2016 17:52:00 +1100 Subject: [PATCH] powerpc/iommu: Stop using @current in mm_iommu_xxx diff --git a/queue/powerpc-mm-iommu-vfio-spapr-Put-pages-on-VFIO-contai.patch b/queue/powerpc-mm-iommu-vfio-spapr-Put-pages-on-VFIO-contai.patch index 524f8a6..3bd6f41 100644 --- a/queue/powerpc-mm-iommu-vfio-spapr-Put-pages-on-VFIO-contai.patch +++ b/queue/powerpc-mm-iommu-vfio-spapr-Put-pages-on-VFIO-contai.patch @@ -1,4 +1,4 @@ -From 4b6fad7097f883335b6d9627c883cb7f276d94c9 Mon Sep 17 00:00:00 2001 +From ce33c167a4600351c4920eccd6a80581efead82d Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy <aik@ozlabs.ru> Date: Wed, 30 Nov 2016 17:52:05 +1100 Subject: [PATCH] powerpc/mm/iommu, vfio/spapr: Put pages on VFIO container @@ -37,6 +37,7 @@ Reviewed-by: Nicholas Piggin <npiggin@gmail.com> Acked-by: Alex Williamson <alex.williamson@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/mm/mmu_context_book3s64.c b/arch/powerpc/mm/mmu_context_book3s64.c index ad8273590975..73bf6e14c3aa 100644 @@ -58,10 +59,10 @@ index ad8273590975..73bf6e14c3aa 100644 drop_cop(mm->context.acop, mm); kfree(mm->context.cop_lockp); diff --git a/arch/powerpc/mm/mmu_context_iommu.c b/arch/powerpc/mm/mmu_context_iommu.c -index 4c6db09e77ad..104bad029ce9 100644 +index a0b6c34e7c04..26bff3b06fcb 100644 --- a/arch/powerpc/mm/mmu_context_iommu.c +++ b/arch/powerpc/mm/mmu_context_iommu.c -@@ -365,14 +365,3 @@ void mm_iommu_init(struct mm_struct *mm) +@@ -292,14 +292,3 @@ void mm_iommu_init(struct mm_struct *mm) { INIT_LIST_HEAD_RCU(&mm->context.iommu_group_mem_list); } @@ -77,7 +78,7 @@ index 4c6db09e77ad..104bad029ce9 100644 - } -} diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c -index 4c03c8525c26..c8823578a1b2 100644 +index 4bebe813b5fd..33e59953c8a4 100644 --- a/drivers/vfio/vfio_iommu_spapr_tce.c +++ b/drivers/vfio/vfio_iommu_spapr_tce.c @@ -89,6 +89,15 @@ struct tce_iommu_group { @@ -96,7 +97,7 @@ index 4c03c8525c26..c8823578a1b2 100644 * The container descriptor supports only a single group per container. * Required by the API as the container is not supplied with the IOMMU group * at the moment of initialization. -@@ -102,6 +111,7 @@ struct tce_container { +@@ -101,6 +110,7 @@ struct tce_container { struct mm_struct *mm; struct iommu_table *tables[IOMMU_TABLE_GROUP_MAX_TABLES]; struct list_head group_list; @@ -104,7 +105,7 @@ index 4c03c8525c26..c8823578a1b2 100644 }; static long tce_iommu_mm_set(struct tce_container *container) -@@ -118,10 +128,27 @@ static long tce_iommu_mm_set(struct tce_container *container) +@@ -117,10 +127,27 @@ static long tce_iommu_mm_set(struct tce_container *container) return 0; } @@ -132,7 +133,7 @@ index 4c03c8525c26..c8823578a1b2 100644 if ((vaddr & ~PAGE_MASK) || (size & ~PAGE_MASK)) return -EINVAL; -@@ -130,7 +157,17 @@ static long tce_iommu_unregister_pages(struct tce_container *container, +@@ -129,7 +156,17 @@ static long tce_iommu_unregister_pages(struct tce_container *container, if (!mem) return -ENOENT; @@ -151,7 +152,7 @@ index 4c03c8525c26..c8823578a1b2 100644 } static long tce_iommu_register_pages(struct tce_container *container, -@@ -138,16 +175,29 @@ static long tce_iommu_register_pages(struct tce_container *container, +@@ -137,16 +174,29 @@ static long tce_iommu_register_pages(struct tce_container *container, { long ret = 0; struct mm_iommu_table_group_mem_t *mem = NULL; @@ -181,7 +182,7 @@ index 4c03c8525c26..c8823578a1b2 100644 container->enabled = true; return 0; -@@ -334,6 +384,7 @@ static void *tce_iommu_open(unsigned long arg) +@@ -333,6 +383,7 @@ static void *tce_iommu_open(unsigned long arg) mutex_init(&container->lock); INIT_LIST_HEAD_RCU(&container->group_list); @@ -189,7 +190,7 @@ index 4c03c8525c26..c8823578a1b2 100644 container->v2 = arg == VFIO_SPAPR_TCE_v2_IOMMU; -@@ -372,6 +423,14 @@ static void tce_iommu_release(void *iommu_data) +@@ -371,6 +422,14 @@ static void tce_iommu_release(void *iommu_data) tce_iommu_free_table(container, tbl); } diff --git a/queue/powerpc-xics-Work-around-limitations-of-OPAL-XICS-pr.patch b/queue/powerpc-xics-Work-around-limitations-of-OPAL-XICS-pr.patch index 6ff7767..5eabed9 100644 --- a/queue/powerpc-xics-Work-around-limitations-of-OPAL-XICS-pr.patch +++ b/queue/powerpc-xics-Work-around-limitations-of-OPAL-XICS-pr.patch @@ -1,4 +1,4 @@ -From a69e2fb70350a66f91175cd2625f1e8215c5b6e9 Mon Sep 17 00:00:00 2001 +From 05b018fa772695aa1b4b94bd51369620c6627045 Mon Sep 17 00:00:00 2001 From: Balbir Singh <bsingharora@gmail.com> Date: Fri, 3 Mar 2017 11:58:44 +1100 Subject: [PATCH] powerpc/xics: Work around limitations of OPAL XICS priority @@ -58,9 +58,10 @@ Tested-by: Vaidyanathan Srinivasan <svaidy@linux.vnet.ibm.com> Signed-off-by: Balbir Singh <bsingharora@gmail.com> [mpe: Rewrote comments and change log, change delay to 5ms] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/sysdev/xics/icp-opal.c b/arch/powerpc/sysdev/xics/icp-opal.c -index f9670eabfcfa..b53f80f0b4d8 100644 +index 9cb7410c7487..c9e39696eb77 100644 --- a/arch/powerpc/sysdev/xics/icp-opal.c +++ b/arch/powerpc/sysdev/xics/icp-opal.c @@ -91,6 +91,16 @@ static unsigned int icp_opal_get_irq(void) @@ -81,7 +82,7 @@ index f9670eabfcfa..b53f80f0b4d8 100644 opal_int_set_cppr(cppr); iosync(); diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c -index 69d858e51ac7..23efe4e42172 100644 +index 9d530f479588..1bffb7591dd4 100644 --- a/arch/powerpc/sysdev/xics/xics-common.c +++ b/arch/powerpc/sysdev/xics/xics-common.c @@ -20,6 +20,7 @@ diff --git a/queue/pwm-pca9685-Fix-period-change-with-same-duty-cycle.patch b/queue/pwm-pca9685-Fix-period-change-with-same-duty-cycle.patch index 0353421..6e7a0d3 100644 --- a/queue/pwm-pca9685-Fix-period-change-with-same-duty-cycle.patch +++ b/queue/pwm-pca9685-Fix-period-change-with-same-duty-cycle.patch @@ -1,4 +1,4 @@ -From 8d254a340efb12b40c4c1ff25a48a4f48f7bbd6b Mon Sep 17 00:00:00 2001 +From c7c01a70311293fa29063ad92032d92198164dca Mon Sep 17 00:00:00 2001 From: Clemens Gruber <clemens.gruber@pqgruber.com> Date: Tue, 13 Dec 2016 16:52:50 +0100 Subject: [PATCH] pwm: pca9685: Fix period change with same duty cycle @@ -19,12 +19,13 @@ Cc: <stable@vger.kernel.org> # v4.3+ Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pwm/pwm-pca9685.c b/drivers/pwm/pwm-pca9685.c -index 621656b9aa41..5566760f7dc4 100644 +index 117fccf7934a..01a6a83f625d 100644 --- a/drivers/pwm/pwm-pca9685.c +++ b/drivers/pwm/pwm-pca9685.c -@@ -67,7 +67,6 @@ +@@ -65,7 +65,6 @@ #define PCA9685_MAXCHAN 0x10 #define LED_FULL (1 << 4) @@ -32,7 +33,7 @@ index 621656b9aa41..5566760f7dc4 100644 #define MODE1_SLEEP (1 << 4) #define MODE2_INVRT (1 << 4) #define MODE2_OUTDRV (1 << 2) -@@ -268,16 +267,6 @@ static int pca9685_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, +@@ -117,16 +116,6 @@ static int pca9685_pwm_config(struct pwm_chip *chip, struct pwm_device *pwm, udelay(500); pca->period_ns = period_ns; diff --git a/queue/s390-TASK_SIZE-for-kernel-threads.patch b/queue/s390-TASK_SIZE-for-kernel-threads.patch index fec5d6c..45cbd38 100644 --- a/queue/s390-TASK_SIZE-for-kernel-threads.patch +++ b/queue/s390-TASK_SIZE-for-kernel-threads.patch @@ -1,4 +1,4 @@ -From fb94a687d96c570d46332a4a890f1dcb7310e643 Mon Sep 17 00:00:00 2001 +From 8132f8807662a16813fbf6f5e3bf298a02ba0430 Mon Sep 17 00:00:00 2001 From: Martin Schwidefsky <schwidefsky@de.ibm.com> Date: Fri, 24 Feb 2017 07:43:51 +0100 Subject: [PATCH] s390: TASK_SIZE for kernel threads @@ -13,12 +13,13 @@ thread and data pointing to kernel space. Cc: <stable@vger.kernel.org> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h -index c57c5c2f2484..e4988710aa86 100644 +index 602af692efdc..6bcbbece082b 100644 --- a/arch/s390/include/asm/processor.h +++ b/arch/s390/include/asm/processor.h -@@ -91,7 +91,8 @@ extern void execve_tail(void); +@@ -89,7 +89,8 @@ extern void execve_tail(void); * User space process size: 2GB for 31 bit, 4TB or 8PT for 64 bit. */ diff --git a/queue/s390-chsc-Add-exception-handler-for-CHSC-instruction.patch b/queue/s390-chsc-Add-exception-handler-for-CHSC-instruction.patch index 3f50640..55aa0c5 100644 --- a/queue/s390-chsc-Add-exception-handler-for-CHSC-instruction.patch +++ b/queue/s390-chsc-Add-exception-handler-for-CHSC-instruction.patch @@ -1,4 +1,4 @@ -From 77759137248f34864a8f7a58bbcebfcf1047504a Mon Sep 17 00:00:00 2001 +From 31fdf79cb726a21059f59bb9289c0ee1e3698894 Mon Sep 17 00:00:00 2001 From: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Date: Mon, 20 Feb 2017 14:52:58 +0100 Subject: [PATCH] s390/chsc: Add exception handler for CHSC instruction @@ -14,6 +14,7 @@ Signed-off-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Reviewed-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/s390/cio/ioasm.c b/drivers/s390/cio/ioasm.c index 8225da619014..4182f60124da 100644 diff --git a/queue/s390-dcssblk-fix-device-size-calculation-in-dcssblk_.patch b/queue/s390-dcssblk-fix-device-size-calculation-in-dcssblk_.patch index a3d31e5..f6a2b51 100644 --- a/queue/s390-dcssblk-fix-device-size-calculation-in-dcssblk_.patch +++ b/queue/s390-dcssblk-fix-device-size-calculation-in-dcssblk_.patch @@ -1,4 +1,4 @@ -From a63f53e34db8b49675448d03ae324f6c5bc04fe6 Mon Sep 17 00:00:00 2001 +From c09a550c991d26c2b6833be92facda028938b624 Mon Sep 17 00:00:00 2001 From: Gerald Schaefer <gerald.schaefer@de.ibm.com> Date: Mon, 30 Jan 2017 15:52:14 +0100 Subject: [PATCH] s390/dcssblk: fix device size calculation in @@ -17,6 +17,7 @@ Fixes: dd22f551 ("block: Change direct_access calling convention") Cc: <stable@vger.kernel.org> # 4.0+ Signed-off-by: Gerald Schaefer <gerald.schaefer@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index 9d66b4fb174b..415d10a67b7a 100644 diff --git a/queue/s390-kdump-Use-LINUX-ELF-note-name-instead-of-CORE.patch b/queue/s390-kdump-Use-LINUX-ELF-note-name-instead-of-CORE.patch index c44920c..39d0cc3 100644 --- a/queue/s390-kdump-Use-LINUX-ELF-note-name-instead-of-CORE.patch +++ b/queue/s390-kdump-Use-LINUX-ELF-note-name-instead-of-CORE.patch @@ -1,4 +1,4 @@ -From a4a81d8eebdc1d209d034f62a082a5131e4242b5 Mon Sep 17 00:00:00 2001 +From 4f8264586bafb7c7846f0f026edde809b2f603e3 Mon Sep 17 00:00:00 2001 From: Michael Holzheu <holzheu@linux.vnet.ibm.com> Date: Tue, 7 Feb 2017 18:09:14 +0100 Subject: [PATCH] s390/kdump: Use "LINUX" ELF note name instead of "CORE" @@ -23,12 +23,13 @@ Reported-by: Philipp Rudo <prudo@linux.vnet.ibm.com> Reviewed-by: Philipp Rudo <prudo@linux.vnet.ibm.com> Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c -index f9293bfefb7f..408b4f4fda0f 100644 +index 29df8484282b..e2fef619f289 100644 --- a/arch/s390/kernel/crash_dump.c +++ b/arch/s390/kernel/crash_dump.c -@@ -329,7 +329,11 @@ static void *nt_init_name(void *buf, Elf64_Word type, void *desc, int d_len, +@@ -331,7 +331,11 @@ static void *nt_init_name(void *buf, Elf64_Word type, void *desc, int d_len, static inline void *nt_init(void *buf, Elf64_Word type, void *desc, int d_len) { diff --git a/queue/s390-make-setup_randomness-work.patch b/queue/s390-make-setup_randomness-work.patch index fb03154..1f750dc 100644 --- a/queue/s390-make-setup_randomness-work.patch +++ b/queue/s390-make-setup_randomness-work.patch @@ -1,4 +1,4 @@ -From da8fd820f389a0e29080b14c61bf5cf1d8ef5ca1 Mon Sep 17 00:00:00 2001 +From bb2d10be5c2c1a681a0215e5623754ff8cef2f17 Mon Sep 17 00:00:00 2001 From: Heiko Carstens <heiko.carstens@de.ibm.com> Date: Sat, 4 Feb 2017 11:40:36 +0100 Subject: [PATCH] s390: make setup_randomness work @@ -18,12 +18,13 @@ To fix this use memblock_alloc and memblock_free instead. Fixes: bcfcbb6bae64 ("s390: add system information as device randomness") Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index 1a3388c32a83..aaef71ff7ab7 100644 +index d027f2eb3559..d2bc8fa8b4e6 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c -@@ -822,10 +822,10 @@ static void __init setup_randomness(void) +@@ -819,10 +819,10 @@ static void __init setup_randomness(void) { struct sysinfo_3_2_2 *vmms; diff --git a/queue/s390-qdio-clear-DSCI-prior-to-scanning-multiple-inpu.patch b/queue/s390-qdio-clear-DSCI-prior-to-scanning-multiple-inpu.patch index eb58192..848e789 100644 --- a/queue/s390-qdio-clear-DSCI-prior-to-scanning-multiple-inpu.patch +++ b/queue/s390-qdio-clear-DSCI-prior-to-scanning-multiple-inpu.patch @@ -1,4 +1,4 @@ -From 1e4a382fdc0ba8d1a85b758c0811de3a3631085e Mon Sep 17 00:00:00 2001 +From 460981a353d204bab2db3a69dfe60c09cc3d220a Mon Sep 17 00:00:00 2001 From: Julian Wiedmann <jwi@linux.vnet.ibm.com> Date: Mon, 21 Nov 2016 13:37:48 +0100 Subject: [PATCH] s390/qdio: clear DSCI prior to scanning multiple input queues @@ -33,6 +33,7 @@ Cc: <stable@vger.kernel.org> # v3.2+ Reviewed-by: Ursula Braun <ubraun@linux.vnet.ibm.com> Signed-off-by: Julian Wiedmann <jwi@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/s390/cio/qdio_thinint.c b/drivers/s390/cio/qdio_thinint.c index 5d06253c2a7a..30e9fbbff051 100644 diff --git a/queue/s390-use-correct-input-data-address-for-setup_random.patch b/queue/s390-use-correct-input-data-address-for-setup_random.patch index 640a1bd..5910a82 100644 --- a/queue/s390-use-correct-input-data-address-for-setup_random.patch +++ b/queue/s390-use-correct-input-data-address-for-setup_random.patch @@ -1,4 +1,4 @@ -From 4920e3cf77347d7d7373552d4839e8d832321313 Mon Sep 17 00:00:00 2001 +From 908479ab1b2d3842bcd436fd28e484292f07f113 Mon Sep 17 00:00:00 2001 From: Heiko Carstens <heiko.carstens@de.ibm.com> Date: Sun, 5 Feb 2017 23:03:18 +0100 Subject: [PATCH] s390: use correct input data address for setup_randomness @@ -20,12 +20,13 @@ length. Fixes: bcfcbb6bae64 ("s390: add system information as device randomness") Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c -index aaef71ff7ab7..f92c78277680 100644 +index d2bc8fa8b4e6..e974e53ab597 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c -@@ -824,7 +824,7 @@ static void __init setup_randomness(void) +@@ -821,7 +821,7 @@ static void __init setup_randomness(void) vmms = (struct sysinfo_3_2_2 *) memblock_alloc(PAGE_SIZE, PAGE_SIZE); if (stsi(vmms, 3, 2, 2) == 0 && vmms->count) diff --git a/queue/s390-zcrypt-Introduce-CEX6-toleration.patch b/queue/s390-zcrypt-Introduce-CEX6-toleration.patch index a07bc58..4b39809 100644 --- a/queue/s390-zcrypt-Introduce-CEX6-toleration.patch +++ b/queue/s390-zcrypt-Introduce-CEX6-toleration.patch @@ -1,4 +1,4 @@ -From b3e8652bcbfa04807e44708d4d0c8cdad39c9215 Mon Sep 17 00:00:00 2001 +From 5ac1544acdf1549ada94d397bbfc644a369c809d Mon Sep 17 00:00:00 2001 From: Harald Freudenberger <freude@linux.vnet.ibm.com> Date: Wed, 12 Oct 2016 15:58:14 +0200 Subject: [PATCH] s390/zcrypt: Introduce CEX6 toleration @@ -7,12 +7,13 @@ commit b3e8652bcbfa04807e44708d4d0c8cdad39c9215 upstream. Signed-off-by: Harald Freudenberger <freude@linux.vnet.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c -index f407b4f9d0ba..cac919d63b43 100644 +index ed92fb09fc8e..76b802cf2f0b 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c -@@ -1708,6 +1708,9 @@ static void ap_scan_bus(struct work_struct *unused) +@@ -1712,6 +1712,9 @@ static void ap_scan_bus(struct work_struct *unused) ap_dev->queue_depth = queue_depth; ap_dev->raw_hwtype = device_type; ap_dev->device_type = device_type; diff --git a/queue/scsi-ibmvscsis-Clean-up-properly-if-target_submit_cm.patch b/queue/scsi-ibmvscsis-Clean-up-properly-if-target_submit_cm.patch index f102a68..4953693 100644 --- a/queue/scsi-ibmvscsis-Clean-up-properly-if-target_submit_cm.patch +++ b/queue/scsi-ibmvscsis-Clean-up-properly-if-target_submit_cm.patch @@ -1,4 +1,4 @@ -From 7435b32e2d2fb5da6c2ae9b9c8ce56d8a3cb3bc3 Mon Sep 17 00:00:00 2001 +From 9ffc85db134cf100e619c6abe56c5f169d0736e5 Mon Sep 17 00:00:00 2001 From: Michael Cyr <mikecyr@us.ibm.com> Date: Thu, 13 Oct 2016 11:02:41 -0500 Subject: [PATCH] scsi: ibmvscsis: Clean up properly if target_submit_cmd/tmr @@ -10,12 +10,13 @@ Signed-off-by: Michael Cyr <mikecyr@us.ibm.com> Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com> Tested-by: Steven Royer <seroyer@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c -index 41af435a8943..cd9f5c734018 100644 +index 6128f6cca34d..55ce61f9c632 100644 --- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c -@@ -2560,6 +2560,10 @@ static void ibmvscsis_parse_cmd(struct scsi_info *vscsi, +@@ -2556,6 +2556,10 @@ static void ibmvscsis_parse_cmd(struct scsi_info *vscsi, data_len, attr, dir, 0); if (rc) { dev_err(&vscsi->dev, "target_submit_cmd failed, rc %d\n", rc); @@ -26,7 +27,7 @@ index 41af435a8943..cd9f5c734018 100644 goto fail; } return; -@@ -2639,6 +2643,9 @@ static void ibmvscsis_parse_task(struct scsi_info *vscsi, +@@ -2635,6 +2639,9 @@ static void ibmvscsis_parse_task(struct scsi_info *vscsi, if (rc) { dev_err(&vscsi->dev, "target_submit_tmr failed, rc %d\n", rc); diff --git a/queue/scsi-ibmvscsis-Issues-from-Dan-Carpenter-Smatch.patch b/queue/scsi-ibmvscsis-Issues-from-Dan-Carpenter-Smatch.patch index 951d876..68c7fa7 100644 --- a/queue/scsi-ibmvscsis-Issues-from-Dan-Carpenter-Smatch.patch +++ b/queue/scsi-ibmvscsis-Issues-from-Dan-Carpenter-Smatch.patch @@ -1,4 +1,4 @@ -From 11950d70b52d2bc5e3580da8cd63909ef38d67db Mon Sep 17 00:00:00 2001 +From d24776a1e45baf2ad8765f654ff9a6693ad2892e Mon Sep 17 00:00:00 2001 From: Michael Cyr <mikecyr@us.ibm.com> Date: Thu, 13 Oct 2016 11:02:43 -0500 Subject: [PATCH] scsi: ibmvscsis: Issues from Dan Carpenter/Smatch @@ -9,12 +9,13 @@ Signed-off-by: Michael Cyr <mikecyr@us.ibm.com> Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com> Tested-by: Steven Royer <seroyer@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c -index fe220a145079..c9fa3565c671 100644 +index 00a678428bba..34f448b4b277 100644 --- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c -@@ -1896,14 +1896,7 @@ static long ibmvscsis_mad(struct scsi_info *vscsi, struct viosrp_crq *crq) +@@ -1748,14 +1748,7 @@ static long ibmvscsis_mad(struct scsi_info *vscsi, struct viosrp_crq *crq) pr_debug("mad: type %d\n", be32_to_cpu(mad->type)); @@ -38,7 +39,7 @@ index fe220a145079..c9fa3565c671 100644 } cmd->rsp.sol_not = srp->sol_not; -@@ -3282,7 +3274,8 @@ static int ibmvscsis_probe(struct vio_dev *vdev, +@@ -3394,7 +3386,8 @@ static int ibmvscsis_probe(struct vio_dev *vdev, INIT_LIST_HEAD(&vscsi->waiting_rsp); INIT_LIST_HEAD(&vscsi->active_q); diff --git a/queue/scsi-ibmvscsis-Rearrange-functions-for-future-patche.patch b/queue/scsi-ibmvscsis-Rearrange-functions-for-future-patche.patch index 3ff120b..997b45a 100644 --- a/queue/scsi-ibmvscsis-Rearrange-functions-for-future-patche.patch +++ b/queue/scsi-ibmvscsis-Rearrange-functions-for-future-patche.patch @@ -1,4 +1,4 @@ -From 2e4757150a8b69ed52ab5d59ef1f72d964a1290d Mon Sep 17 00:00:00 2001 +From 5cef2384c1f080e5b10e95d18285a89c80cb4a9c Mon Sep 17 00:00:00 2001 From: Michael Cyr <mikecyr@us.ibm.com> Date: Thu, 13 Oct 2016 11:02:38 -0500 Subject: [PATCH] scsi: ibmvscsis: Rearrange functions for future patches diff --git a/queue/scsi-ibmvscsis-Return-correct-partition-name-to-clie.patch b/queue/scsi-ibmvscsis-Return-correct-partition-name-to-clie.patch index ea9e7b7..caefd80 100644 --- a/queue/scsi-ibmvscsis-Return-correct-partition-name-to-clie.patch +++ b/queue/scsi-ibmvscsis-Return-correct-partition-name-to-clie.patch @@ -1,4 +1,4 @@ -From 9c93cf03d4eb3dc58931ff7cac0af9c344fe5e0b Mon Sep 17 00:00:00 2001 +From 23b9600e9871865f3f19a999644c2dfc2599e164 Mon Sep 17 00:00:00 2001 From: Michael Cyr <mikecyr@us.ibm.com> Date: Thu, 13 Oct 2016 11:02:42 -0500 Subject: [PATCH] scsi: ibmvscsis: Return correct partition name/# to client @@ -9,12 +9,13 @@ Signed-off-by: Michael Cyr <mikecyr@us.ibm.com> Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com> Tested-by: Steven Royer <seroyer@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c -index cd9f5c734018..fe220a145079 100644 +index 34f448b4b277..6128f6cca34d 100644 --- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c -@@ -3297,6 +3297,9 @@ static int ibmvscsis_probe(struct vio_dev *vdev, +@@ -3402,6 +3402,9 @@ static int ibmvscsis_probe(struct vio_dev *vdev, strncat(vscsi->eye, vdev->name, MAX_EYE); vscsi->dds.unit_id = vdev->unit_address; @@ -24,7 +25,7 @@ index cd9f5c734018..fe220a145079 100644 spin_lock_bh(&ibmvscsis_dev_lock); list_add_tail(&vscsi->list, &ibmvscsis_dev_list); -@@ -3495,7 +3498,7 @@ static int ibmvscsis_get_system_info(void) +@@ -3617,7 +3620,7 @@ static int ibmvscsis_get_system_info(void) num = of_get_property(rootdn, "ibm,partition-no", NULL); if (num) diff --git a/queue/scsi-ibmvscsis-Synchronize-cmds-at-remove-time.patch b/queue/scsi-ibmvscsis-Synchronize-cmds-at-remove-time.patch index 2d6fa76..c7e033f 100644 --- a/queue/scsi-ibmvscsis-Synchronize-cmds-at-remove-time.patch +++ b/queue/scsi-ibmvscsis-Synchronize-cmds-at-remove-time.patch @@ -1,4 +1,4 @@ -From 8bf11557d44d00562360d370de8aa70ba89aa0d5 Mon Sep 17 00:00:00 2001 +From 99c6ebe3a1874a370818b86a3af1b2b8a55f7df8 Mon Sep 17 00:00:00 2001 From: Michael Cyr <mikecyr@us.ibm.com> Date: Thu, 13 Oct 2016 11:02:40 -0500 Subject: [PATCH] scsi: ibmvscsis: Synchronize cmds at remove time @@ -13,12 +13,13 @@ Signed-off-by: Michael Cyr <mikecyr@us.ibm.com> Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com> Tested-by: Steven Royer <seroyer@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c -index 2ce1d73033b2..41af435a8943 100644 +index 9ccb2f2e88fa..77afe6dd7be9 100644 --- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c -@@ -469,6 +469,18 @@ static void ibmvscsis_disconnect(struct work_struct *work) +@@ -470,6 +470,18 @@ static void ibmvscsis_disconnect(struct work_struct *work) case WAIT_ENABLED: switch (new_state) { @@ -37,7 +38,7 @@ index 2ce1d73033b2..41af435a8943 100644 /* should never happen */ case ERR_DISCONNECT: case ERR_DISCONNECT_RECONNECT: -@@ -481,6 +493,13 @@ static void ibmvscsis_disconnect(struct work_struct *work) +@@ -482,6 +494,13 @@ static void ibmvscsis_disconnect(struct work_struct *work) case WAIT_IDLE: switch (new_state) { @@ -51,7 +52,7 @@ index 2ce1d73033b2..41af435a8943 100644 case ERR_DISCONNECT: case ERR_DISCONNECT_RECONNECT: vscsi->state = new_state; -@@ -1186,6 +1205,15 @@ static void ibmvscsis_adapter_idle(struct scsi_info *vscsi) +@@ -1187,6 +1206,15 @@ static void ibmvscsis_adapter_idle(struct scsi_info *vscsi) free_qs = true; switch (vscsi->state) { @@ -67,7 +68,7 @@ index 2ce1d73033b2..41af435a8943 100644 case ERR_DISCONNECT_RECONNECT: ibmvscsis_reset_queue(vscsi); pr_debug("adapter_idle, disc_rec: flags 0x%x\n", vscsi->flags); -@@ -3338,6 +3366,7 @@ static int ibmvscsis_probe(struct vio_dev *vdev, +@@ -3356,6 +3384,7 @@ static int ibmvscsis_probe(struct vio_dev *vdev, (unsigned long)vscsi); init_completion(&vscsi->wait_idle); @@ -75,7 +76,7 @@ index 2ce1d73033b2..41af435a8943 100644 snprintf(wq_name, 24, "ibmvscsis%s", dev_name(&vdev->dev)); vscsi->work_q = create_workqueue(wq_name); -@@ -3393,10 +3422,11 @@ static int ibmvscsis_remove(struct vio_dev *vdev) +@@ -3411,10 +3440,11 @@ static int ibmvscsis_remove(struct vio_dev *vdev) pr_debug("remove (%s)\n", dev_name(&vscsi->dma_dev->dev)); @@ -91,7 +92,7 @@ index 2ce1d73033b2..41af435a8943 100644 vio_disable_interrupts(vdev); free_irq(vdev->irq, vscsi); -@@ -3405,7 +3435,6 @@ static int ibmvscsis_remove(struct vio_dev *vdev) +@@ -3423,7 +3453,6 @@ static int ibmvscsis_remove(struct vio_dev *vdev) DMA_BIDIRECTIONAL); kfree(vscsi->map_buf); tasklet_kill(&vscsi->work_task); diff --git a/queue/scsi-ibmvscsis-Synchronize-cmds-at-tpg_enable_store-.patch b/queue/scsi-ibmvscsis-Synchronize-cmds-at-tpg_enable_store-.patch index cd0ef68..933265c 100644 --- a/queue/scsi-ibmvscsis-Synchronize-cmds-at-tpg_enable_store-.patch +++ b/queue/scsi-ibmvscsis-Synchronize-cmds-at-tpg_enable_store-.patch @@ -1,4 +1,4 @@ -From c9b3379f60a83288a5e2f8ea75476460978689b0 Mon Sep 17 00:00:00 2001 +From 20e948fd6f1ed1216d5c1e7713c03f9a091e7d88 Mon Sep 17 00:00:00 2001 From: Michael Cyr <mikecyr@us.ibm.com> Date: Thu, 13 Oct 2016 11:02:39 -0500 Subject: [PATCH] scsi: ibmvscsis: Synchronize cmds at tpg_enable_store time @@ -19,12 +19,13 @@ Signed-off-by: Michael Cyr <mikecyr@us.ibm.com> Signed-off-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com> Tested-by: Steven Royer <seroyer@linux.vnet.ibm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c -index 01a430cc15e4..2ce1d73033b2 100644 +index 392723bd5fea..9ccb2f2e88fa 100644 --- a/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c +++ b/drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c -@@ -61,8 +61,6 @@ static long ibmvscsis_parse_command(struct scsi_info *vscsi, +@@ -62,8 +62,6 @@ static long ibmvscsis_parse_command(struct scsi_info *vscsi, static void ibmvscsis_adapter_idle(struct scsi_info *vscsi); @@ -33,7 +34,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 static void ibmvscsis_determine_resid(struct se_cmd *se_cmd, struct srp_rsp *rsp) { -@@ -417,7 +415,6 @@ static void ibmvscsis_disconnect(struct work_struct *work) +@@ -418,7 +416,6 @@ static void ibmvscsis_disconnect(struct work_struct *work) proc_work); u16 new_state; bool wait_idle = false; @@ -41,7 +42,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 spin_lock_bh(&vscsi->intr_lock); new_state = vscsi->new_state; -@@ -470,30 +467,12 @@ static void ibmvscsis_disconnect(struct work_struct *work) +@@ -471,30 +468,12 @@ static void ibmvscsis_disconnect(struct work_struct *work) vscsi->state = new_state; break; @@ -73,7 +74,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 dev_err(&vscsi->dev, "disconnect: invalid state %d for WAIT_IDLE\n", vscsi->state); break; -@@ -630,7 +609,6 @@ static void ibmvscsis_post_disconnect(struct scsi_info *vscsi, uint new_state, +@@ -631,7 +610,6 @@ static void ibmvscsis_post_disconnect(struct scsi_info *vscsi, uint new_state, break; case WAIT_ENABLED: @@ -81,7 +82,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 case WAIT_IDLE: case WAIT_CONNECTION: case CONNECTED: -@@ -675,7 +653,6 @@ static long ibmvscsis_handle_init_compl_msg(struct scsi_info *vscsi) +@@ -676,7 +654,6 @@ static long ibmvscsis_handle_init_compl_msg(struct scsi_info *vscsi) case SRP_PROCESSING: case CONNECTED: case WAIT_ENABLED: @@ -89,7 +90,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 default: rc = ERROR; dev_err(&vscsi->dev, "init_msg: invalid state %d to get init compl msg\n", -@@ -698,10 +675,6 @@ static long ibmvscsis_handle_init_msg(struct scsi_info *vscsi) +@@ -699,10 +676,6 @@ static long ibmvscsis_handle_init_msg(struct scsi_info *vscsi) long rc = ADAPT_SUCCESS; switch (vscsi->state) { @@ -100,7 +101,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 case WAIT_CONNECTION: rc = ibmvscsis_send_init_message(vscsi, INIT_COMPLETE_MSG); switch (rc) { -@@ -737,7 +710,7 @@ static long ibmvscsis_handle_init_msg(struct scsi_info *vscsi) +@@ -738,7 +711,7 @@ static long ibmvscsis_handle_init_msg(struct scsi_info *vscsi) case UNCONFIGURING: break; @@ -109,7 +110,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 case CONNECTED: case SRP_PROCESSING: case WAIT_IDLE: -@@ -800,11 +773,10 @@ static long ibmvscsis_init_msg(struct scsi_info *vscsi, struct viosrp_crq *crq) +@@ -801,11 +774,10 @@ static long ibmvscsis_init_msg(struct scsi_info *vscsi, struct viosrp_crq *crq) /** * ibmvscsis_establish_new_q() - Establish new CRQ queue * @vscsi: Pointer to our adapter structure @@ -122,7 +123,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 { long rc = ADAPT_SUCCESS; uint format; -@@ -816,19 +788,19 @@ static long ibmvscsis_establish_new_q(struct scsi_info *vscsi, uint new_state) +@@ -817,19 +789,19 @@ static long ibmvscsis_establish_new_q(struct scsi_info *vscsi, uint new_state) rc = vio_enable_interrupts(vscsi->dma_dev); if (rc) { @@ -145,7 +146,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 rc = ibmvscsis_send_init_message(vscsi, INIT_MSG); switch (rc) { case H_SUCCESS: -@@ -846,6 +818,8 @@ static long ibmvscsis_establish_new_q(struct scsi_info *vscsi, uint new_state) +@@ -847,6 +819,8 @@ static long ibmvscsis_establish_new_q(struct scsi_info *vscsi, uint new_state) rc = H_HARDWARE; break; } @@ -154,7 +155,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 } return rc; -@@ -854,7 +828,6 @@ static long ibmvscsis_establish_new_q(struct scsi_info *vscsi, uint new_state) +@@ -855,7 +829,6 @@ static long ibmvscsis_establish_new_q(struct scsi_info *vscsi, uint new_state) /** * ibmvscsis_reset_queue() - Reset CRQ Queue * @vscsi: Pointer to our adapter structure @@ -162,7 +163,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 * * This function calls h_free_q and then calls h_reg_q and does all * of the bookkeeping to get us back to where we can communicate. -@@ -871,7 +844,7 @@ static long ibmvscsis_establish_new_q(struct scsi_info *vscsi, uint new_state) +@@ -872,7 +845,7 @@ static long ibmvscsis_establish_new_q(struct scsi_info *vscsi, uint new_state) * EXECUTION ENVIRONMENT: * Process environment, called with interrupt lock held */ @@ -171,7 +172,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 { int bytes; long rc = ADAPT_SUCCESS; -@@ -884,19 +857,18 @@ static void ibmvscsis_reset_queue(struct scsi_info *vscsi, uint new_state) +@@ -885,19 +858,18 @@ static void ibmvscsis_reset_queue(struct scsi_info *vscsi, uint new_state) vscsi->rsp_q_timer.timer_pops = 0; vscsi->debit = 0; vscsi->credit = 0; @@ -194,7 +195,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 } if (rc != ADAPT_SUCCESS) { -@@ -1015,10 +987,6 @@ static long ibmvscsis_trans_event(struct scsi_info *vscsi, +@@ -1016,10 +988,6 @@ static long ibmvscsis_trans_event(struct scsi_info *vscsi, TRANS_EVENT)); break; @@ -205,7 +206,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 case SRP_PROCESSING: if ((vscsi->debit > 0) || !list_empty(&vscsi->schedule_q) || -@@ -1219,15 +1187,18 @@ static void ibmvscsis_adapter_idle(struct scsi_info *vscsi) +@@ -1220,15 +1188,18 @@ static void ibmvscsis_adapter_idle(struct scsi_info *vscsi) switch (vscsi->state) { case ERR_DISCONNECT_RECONNECT: @@ -227,7 +228,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 pr_debug("adapter_idle, disc: flags 0x%x, state 0x%hx\n", vscsi->flags, vscsi->state); break; -@@ -1772,8 +1743,8 @@ static void ibmvscsis_send_messages(struct scsi_info *vscsi) +@@ -1775,8 +1746,8 @@ static void ibmvscsis_send_messages(struct scsi_info *vscsi) be64_to_cpu(msg_hi), be64_to_cpu(cmd->rsp.tag)); @@ -238,7 +239,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 /* if all ok free up the command element resources */ if (rc == H_SUCCESS) { -@@ -2788,36 +2759,6 @@ static irqreturn_t ibmvscsis_interrupt(int dummy, void *data) +@@ -2792,36 +2763,6 @@ static irqreturn_t ibmvscsis_interrupt(int dummy, void *data) } /** @@ -275,7 +276,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 * ibmvscsis_enable_change_state() - Set new state based on enabled status * @vscsi: Pointer to our adapter structure * -@@ -2828,77 +2769,19 @@ static long ibmvscsis_check_q(struct scsi_info *vscsi) +@@ -2832,77 +2773,19 @@ static long ibmvscsis_check_q(struct scsi_info *vscsi) */ static long ibmvscsis_enable_change_state(struct scsi_info *vscsi) { @@ -363,7 +364,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 } return rc; -@@ -2918,7 +2801,6 @@ handle_state_change: +@@ -2922,7 +2805,6 @@ handle_state_change: */ static long ibmvscsis_create_command_q(struct scsi_info *vscsi, int num_cmds) { @@ -371,7 +372,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 int pages; struct vio_dev *vdev = vscsi->dma_dev; -@@ -2942,22 +2824,7 @@ static long ibmvscsis_create_command_q(struct scsi_info *vscsi, int num_cmds) +@@ -2946,22 +2828,7 @@ static long ibmvscsis_create_command_q(struct scsi_info *vscsi, int num_cmds) return -ENOMEM; } @@ -395,7 +396,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 } /** -@@ -3487,31 +3354,12 @@ static int ibmvscsis_probe(struct vio_dev *vdev, +@@ -3505,31 +3372,12 @@ static int ibmvscsis_probe(struct vio_dev *vdev, goto destroy_WQ; } @@ -428,7 +429,7 @@ index 01a430cc15e4..2ce1d73033b2 100644 destroy_WQ: destroy_workqueue(vscsi->work_q); unmap_buf: -@@ -3905,18 +3753,22 @@ static ssize_t ibmvscsis_tpg_enable_store(struct config_item *item, +@@ -3932,18 +3780,22 @@ static ssize_t ibmvscsis_tpg_enable_store(struct config_item *item, } if (tmp) { diff --git a/queue/serial-8250_pci-Add-MKS-Tenta-SCOM-0800-and-SCOM-080.patch b/queue/serial-8250_pci-Add-MKS-Tenta-SCOM-0800-and-SCOM-080.patch index 2c1195d..6d27664 100644 --- a/queue/serial-8250_pci-Add-MKS-Tenta-SCOM-0800-and-SCOM-080.patch +++ b/queue/serial-8250_pci-Add-MKS-Tenta-SCOM-0800-and-SCOM-080.patch @@ -1,4 +1,4 @@ -From 1c9c858e2ff8ae8024a3d75d2ed080063af43754 Mon Sep 17 00:00:00 2001 +From 3de33fde6d369bb33620c363e8a4b3e6b2b8f004 Mon Sep 17 00:00:00 2001 From: Ian Abbott <abbotti@mev.co.uk> Date: Fri, 3 Feb 2017 20:25:00 +0000 Subject: [PATCH] serial: 8250_pci: Add MKS Tenta SCOM-0800 and SCOM-0801 cards @@ -16,12 +16,13 @@ non-standard oscillator frequency of 20 MHz (base_baud = 1250000). Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c -index 3eb638c35ba1..0b63109d8750 100644 +index bc51b32b2774..67a1d5589692 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c -@@ -2577,6 +2577,8 @@ enum pci_board_num_t { +@@ -2876,6 +2876,8 @@ enum pci_board_num_t { pbn_b0_4_1152000_200, pbn_b0_8_1152000_200, @@ -30,7 +31,7 @@ index 3eb638c35ba1..0b63109d8750 100644 pbn_b0_2_1843200, pbn_b0_4_1843200, -@@ -2799,6 +2801,13 @@ static struct pciserial_board pci_boards[] = { +@@ -3109,6 +3111,13 @@ static struct pciserial_board pci_boards[] = { .uart_offset = 0x200, }, @@ -44,7 +45,7 @@ index 3eb638c35ba1..0b63109d8750 100644 [pbn_b0_2_1843200] = { .flags = FL_BASE0, .num_ports = 2, -@@ -5264,6 +5273,10 @@ static struct pci_device_id serial_pci_tbl[] = { +@@ -5775,6 +5784,10 @@ static struct pci_device_id serial_pci_tbl[] = { { PCI_DEVICE(0x1c29, 0x1108), .driver_data = pbn_fintek_8 }, { PCI_DEVICE(0x1c29, 0x1112), .driver_data = pbn_fintek_12 }, diff --git a/queue/serial-8250_pci-Detach-low-level-driver-during-PCI-e.patch b/queue/serial-8250_pci-Detach-low-level-driver-during-PCI-e.patch index 83fe869..d7fd84c 100644 --- a/queue/serial-8250_pci-Detach-low-level-driver-during-PCI-e.patch +++ b/queue/serial-8250_pci-Detach-low-level-driver-during-PCI-e.patch @@ -1,4 +1,4 @@ -From f209fa03fc9d131b3108c2e4936181eabab87416 Mon Sep 17 00:00:00 2001 +From 857896fe6c13b000d0753fd92e5faf11872925a8 Mon Sep 17 00:00:00 2001 From: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com> Date: Mon, 28 Nov 2016 19:34:42 -0200 Subject: [PATCH] serial: 8250_pci: Detach low-level driver during PCI error @@ -27,12 +27,13 @@ this one over one year ago. Signed-off-by: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c -index 5aeabf732d74..aa0166b6d450 100644 +index 67a1d5589692..6b5f3b13cbac 100644 --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c -@@ -52,6 +52,7 @@ struct serial_private { +@@ -56,6 +56,7 @@ struct serial_private { struct pci_dev *dev; unsigned int nr; struct pci_serial_quirk *quirk; @@ -40,7 +41,7 @@ index 5aeabf732d74..aa0166b6d450 100644 int line[0]; }; -@@ -3896,6 +3897,7 @@ pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board) +@@ -4064,6 +4065,7 @@ pciserial_init_ports(struct pci_dev *dev, const struct pciserial_board *board) } } priv->nr = i; @@ -48,7 +49,7 @@ index 5aeabf732d74..aa0166b6d450 100644 return priv; err_deinit: -@@ -3906,7 +3908,7 @@ err_out: +@@ -4074,7 +4076,7 @@ err_out: } EXPORT_SYMBOL_GPL(pciserial_init_ports); @@ -57,7 +58,7 @@ index 5aeabf732d74..aa0166b6d450 100644 { struct pci_serial_quirk *quirk; int i; -@@ -3920,7 +3922,11 @@ void pciserial_remove_ports(struct serial_private *priv) +@@ -4088,7 +4090,11 @@ void pciserial_remove_ports(struct serial_private *priv) quirk = find_quirk(priv->dev); if (quirk->exit) quirk->exit(priv->dev); @@ -69,7 +70,7 @@ index 5aeabf732d74..aa0166b6d450 100644 kfree(priv); } EXPORT_SYMBOL_GPL(pciserial_remove_ports); -@@ -5611,7 +5617,7 @@ static pci_ers_result_t serial8250_io_error_detected(struct pci_dev *dev, +@@ -5816,7 +5822,7 @@ static pci_ers_result_t serial8250_io_error_detected(struct pci_dev *dev, return PCI_ERS_RESULT_DISCONNECT; if (priv) @@ -78,7 +79,7 @@ index 5aeabf732d74..aa0166b6d450 100644 pci_disable_device(dev); -@@ -5636,9 +5642,18 @@ static pci_ers_result_t serial8250_io_slot_reset(struct pci_dev *dev) +@@ -5841,9 +5847,18 @@ static pci_ers_result_t serial8250_io_slot_reset(struct pci_dev *dev) static void serial8250_io_resume(struct pci_dev *dev) { struct serial_private *priv = pci_get_drvdata(dev); diff --git a/queue/serial-samsung-Continue-to-work-if-DMA-request-fails.patch b/queue/serial-samsung-Continue-to-work-if-DMA-request-fails.patch index 67b09b1..91dec9b 100644 --- a/queue/serial-samsung-Continue-to-work-if-DMA-request-fails.patch +++ b/queue/serial-samsung-Continue-to-work-if-DMA-request-fails.patch @@ -1,4 +1,4 @@ -From f98c7bce570bdbe344b74ff5daa7dfeef3f22929 Mon Sep 17 00:00:00 2001 +From 772cc073ee28844cc20a48fe0f538b5aee8788bb Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzk@kernel.org> Date: Sat, 25 Feb 2017 18:36:44 +0200 Subject: [PATCH] serial: samsung: Continue to work if DMA request fails @@ -26,12 +26,13 @@ Fixes: 62c37eedb74c ("serial: samsung: add dma reqest/release functions") Cc: <stable@vger.kernel.org> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c -index b4f86c219db1..7a17aedbf902 100644 +index ae2095a66708..1ca103c9ddef 100644 --- a/drivers/tty/serial/samsung.c +++ b/drivers/tty/serial/samsung.c -@@ -1031,8 +1031,10 @@ static int s3c64xx_serial_startup(struct uart_port *port) +@@ -1036,8 +1036,10 @@ static int s3c64xx_serial_startup(struct uart_port *port) if (ourport->dma) { ret = s3c24xx_serial_request_dma(ourport); if (ret < 0) { diff --git a/queue/slub-move-synchronize_sched-out-of-slab_mutex-on-shr.patch b/queue/slub-move-synchronize_sched-out-of-slab_mutex-on-shr.patch index bb30a4e..232d71d 100644 --- a/queue/slub-move-synchronize_sched-out-of-slab_mutex-on-shr.patch +++ b/queue/slub-move-synchronize_sched-out-of-slab_mutex-on-shr.patch @@ -1,4 +1,4 @@ -From 89e364db71fb5e7fc8d93228152abfa67daf35fa Mon Sep 17 00:00:00 2001 +From 60eaf80c7f6935d92d225fb36c1e941d425bef8d Mon Sep 17 00:00:00 2001 From: Vladimir Davydov <vdavydov.dev@gmail.com> Date: Mon, 12 Dec 2016 16:41:32 -0800 Subject: [PATCH] slub: move synchronize_sched out of slab_mutex on shrink @@ -28,12 +28,13 @@ Cc: Michal Hocko <mhocko@kernel.org> Cc: Pekka Enberg <penberg@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/slab.c b/mm/slab.c -index 0b0550ca85b4..7ea765cd7e93 100644 +index 44348149e02b..7bfb23440441 100644 --- a/mm/slab.c +++ b/mm/slab.c -@@ -2332,7 +2332,7 @@ out: +@@ -2339,7 +2339,7 @@ out: return nr_freed; } @@ -42,7 +43,7 @@ index 0b0550ca85b4..7ea765cd7e93 100644 { int ret = 0; int node; -@@ -2352,7 +2352,7 @@ int __kmem_cache_shrink(struct kmem_cache *cachep, bool deactivate) +@@ -2359,7 +2359,7 @@ int __kmem_cache_shrink(struct kmem_cache *cachep, bool deactivate) int __kmem_cache_shutdown(struct kmem_cache *cachep) { @@ -52,7 +53,7 @@ index 0b0550ca85b4..7ea765cd7e93 100644 void __kmem_cache_release(struct kmem_cache *cachep) diff --git a/mm/slab.h b/mm/slab.h -index bc05fdc3edce..ceb7d70cdb76 100644 +index 9653f2e2591a..36382b24ba98 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -146,7 +146,7 @@ static inline unsigned long kmem_cache_flags(unsigned long object_size, @@ -130,10 +131,10 @@ index 5ec158054ffe..eac04d4357ec 100644 return 0; } diff --git a/mm/slub.c b/mm/slub.c -index 2b3e740609e9..4a861f265cd7 100644 +index 7478e7191780..0288bc51f9d5 100644 --- a/mm/slub.c +++ b/mm/slub.c -@@ -3883,7 +3883,7 @@ EXPORT_SYMBOL(kfree); +@@ -3872,7 +3872,7 @@ EXPORT_SYMBOL(kfree); * being allocated from last increasing the chance that the last objects * are freed in them. */ @@ -142,7 +143,7 @@ index 2b3e740609e9..4a861f265cd7 100644 { int node; int i; -@@ -3895,21 +3895,6 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate) +@@ -3884,21 +3884,6 @@ int __kmem_cache_shrink(struct kmem_cache *s, bool deactivate) unsigned long flags; int ret = 0; @@ -164,7 +165,7 @@ index 2b3e740609e9..4a861f265cd7 100644 flush_all(s); for_each_kmem_cache_node(s, node, n) { INIT_LIST_HEAD(&discard); -@@ -3966,7 +3951,7 @@ static int slab_mem_going_offline_callback(void *arg) +@@ -3955,7 +3940,7 @@ static int slab_mem_going_offline_callback(void *arg) mutex_lock(&slab_mutex); list_for_each_entry(s, &slab_caches, list) diff --git a/queue/target-Fix-NULL-dereference-during-LUN-lookup-active.patch b/queue/target-Fix-NULL-dereference-during-LUN-lookup-active.patch index 009bbba..e9cb672 100644 --- a/queue/target-Fix-NULL-dereference-during-LUN-lookup-active.patch +++ b/queue/target-Fix-NULL-dereference-during-LUN-lookup-active.patch @@ -1,4 +1,4 @@ -From bd4e2d2907fa23a11d46217064ecf80470ddae10 Mon Sep 17 00:00:00 2001 +From 7689801af6a9c8b857f932207b6df86d730e3869 Mon Sep 17 00:00:00 2001 From: Nicholas Bellinger <nab@linux-iscsi.org> Date: Wed, 22 Feb 2017 22:06:32 -0800 Subject: [PATCH] target: Fix NULL dereference during LUN lookup + active I/O @@ -69,12 +69,13 @@ Cc: Vaibhav Tandon <vst@datera.io> Tested-by: Bryant G. Ly <bryantly@linux.vnet.ibm.com> Cc: <stable@vger.kernel.org> # v3.14+ Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/target/target_core_device.c b/drivers/target/target_core_device.c -index cb7047d66afc..c754ae33bf7b 100644 +index ea9617c7b403..cc38a3509f78 100644 --- a/drivers/target/target_core_device.c +++ b/drivers/target/target_core_device.c -@@ -78,12 +78,16 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd, u64 unpacked_lun) +@@ -77,12 +77,16 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd, u64 unpacked_lun) &deve->read_bytes); se_lun = rcu_dereference(deve->se_lun); @@ -93,7 +94,7 @@ index cb7047d66afc..c754ae33bf7b 100644 se_cmd->lun_ref_active = true; if ((se_cmd->data_direction == DMA_TO_DEVICE) && -@@ -97,6 +101,7 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd, u64 unpacked_lun) +@@ -96,6 +100,7 @@ transport_lookup_cmd_lun(struct se_cmd *se_cmd, u64 unpacked_lun) goto ref_dev; } } @@ -131,10 +132,10 @@ index d99752c6cd60..2744251178ad 100644 INIT_LIST_HEAD(&lun->lun_dev_link); atomic_set(&lun->lun_tg_pt_secondary_offline, 0); diff --git a/drivers/target/target_core_transport.c b/drivers/target/target_core_transport.c -index efb9e6f38201..434d9d693989 100644 +index 7fb4bed09e53..e55cdefe492e 100644 --- a/drivers/target/target_core_transport.c +++ b/drivers/target/target_core_transport.c -@@ -2700,10 +2700,39 @@ void target_wait_for_sess_cmds(struct se_session *se_sess) +@@ -2698,10 +2698,39 @@ void target_wait_for_sess_cmds(struct se_session *se_sess) } EXPORT_SYMBOL(target_wait_for_sess_cmds); @@ -176,10 +177,10 @@ index efb9e6f38201..434d9d693989 100644 static bool diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h -index d7336f3c6b60..16d3be8395be 100644 +index 48bc1ac1da43..6233e8fd95b5 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h -@@ -730,6 +730,7 @@ struct se_lun { +@@ -732,6 +732,7 @@ struct se_lun { struct config_group lun_group; struct se_port_stat_grps port_stat_grps; struct completion lun_ref_comp; diff --git a/queue/tcp-dccp-block-BH-for-SYN-processing.patch b/queue/tcp-dccp-block-BH-for-SYN-processing.patch index bd6e9d7..6de899d 100644 --- a/queue/tcp-dccp-block-BH-for-SYN-processing.patch +++ b/queue/tcp-dccp-block-BH-for-SYN-processing.patch @@ -1,4 +1,4 @@ -From 449809a66c1d0b1563dee84493e14bf3104d2d7e Mon Sep 17 00:00:00 2001 +From 078e6a38c4b3c252e28bf42e67ffa8e080c40e08 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Wed, 1 Mar 2017 08:39:49 -0800 Subject: [PATCH] tcp/dccp: block BH for SYN processing @@ -149,6 +149,7 @@ Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Andrey Konovalov <andreyknvl@google.com> Acked-by: Soheil Hassas Yeganeh <soheil@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/dccp/input.c b/net/dccp/input.c index 8fedc2d49770..4a05d7876850 100644 @@ -179,10 +180,10 @@ index 8fedc2d49770..4a05d7876850 100644 consume_skb(skb); return 0; diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index 2c0ff327b6df..39c393cc0fd3 100644 +index a756b8749a26..fe182835cd9c 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -5886,9 +5886,15 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) +@@ -5831,9 +5831,15 @@ int tcp_rcv_state_process(struct sock *sk, struct sk_buff *skb) if (th->syn) { if (th->fin) goto discard; diff --git a/queue/tcp-fix-various-issues-for-sockets-morphing-to-liste.patch b/queue/tcp-fix-various-issues-for-sockets-morphing-to-liste.patch index ae2509f..f84ec79 100644 --- a/queue/tcp-fix-various-issues-for-sockets-morphing-to-liste.patch +++ b/queue/tcp-fix-various-issues-for-sockets-morphing-to-liste.patch @@ -1,4 +1,4 @@ -From 02b2faaf0af1d85585f6d6980e286d53612acfc2 Mon Sep 17 00:00:00 2001 +From f68a6a3158a2995ea235ab3c6cf53588e06f7e3a Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Fri, 3 Mar 2017 14:08:21 -0800 Subject: [PATCH] tcp: fix various issues for sockets morphing to listen state @@ -23,12 +23,13 @@ Only IPv6 MTU reduction was properly testing TCP_CLOSE and TCP_LISTEN Signed-off-by: Eric Dumazet <edumazet@google.com> Reported-by: Dmitry Vyukov <dvyukov@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c -index 9a89b8deafae..8f3ec1365497 100644 +index 7b235fa12903..7c9531d4eb72 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c -@@ -279,10 +279,13 @@ EXPORT_SYMBOL(tcp_v4_connect); +@@ -270,10 +270,13 @@ EXPORT_SYMBOL(tcp_v4_connect); */ void tcp_v4_mtu_reduced(struct sock *sk) { @@ -45,10 +46,10 @@ index 9a89b8deafae..8f3ec1365497 100644 if (!dst) return; diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c -index 40d893556e67..b2ab411c6d37 100644 +index f712b411f6ed..025b13b3e598 100644 --- a/net/ipv4/tcp_timer.c +++ b/net/ipv4/tcp_timer.c -@@ -249,7 +249,8 @@ void tcp_delack_timer_handler(struct sock *sk) +@@ -245,7 +245,8 @@ void tcp_delack_timer_handler(struct sock *sk) sk_mem_reclaim_partial(sk); @@ -58,7 +59,7 @@ index 40d893556e67..b2ab411c6d37 100644 goto out; if (time_after(icsk->icsk_ack.timeout, jiffies)) { -@@ -552,7 +553,8 @@ void tcp_write_timer_handler(struct sock *sk) +@@ -548,7 +549,8 @@ void tcp_write_timer_handler(struct sock *sk) struct inet_connection_sock *icsk = inet_csk(sk); int event; diff --git a/queue/thp-fix-another-corner-case-of-munlock-vs.-THPs.patch b/queue/thp-fix-another-corner-case-of-munlock-vs.-THPs.patch index 95ee81b..73ac232 100644 --- a/queue/thp-fix-another-corner-case-of-munlock-vs.-THPs.patch +++ b/queue/thp-fix-another-corner-case-of-munlock-vs.-THPs.patch @@ -1,4 +1,4 @@ -From 6ebb4a1b848fe75323135f93e72c78f8780fd268 Mon Sep 17 00:00:00 2001 +From bb4175f76901482f72d62940b070a2ad8078905b Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Date: Thu, 9 Mar 2017 16:17:23 -0800 Subject: [PATCH] thp: fix another corner case of munlock() vs. THPs @@ -41,12 +41,13 @@ Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: <stable@vger.kernel.org> [4.5+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/mlock.c b/mm/mlock.c -index 1050511f8b2b..02f138244bf5 100644 +index 9c91acc0e328..afda53fc2213 100644 --- a/mm/mlock.c +++ b/mm/mlock.c -@@ -442,7 +442,7 @@ void munlock_vma_pages_range(struct vm_area_struct *vma, +@@ -441,7 +441,7 @@ void munlock_vma_pages_range(struct vm_area_struct *vma, while (start < end) { struct page *page; @@ -55,7 +56,7 @@ index 1050511f8b2b..02f138244bf5 100644 unsigned long page_increm; struct pagevec pvec; struct zone *zone; -@@ -456,8 +456,7 @@ void munlock_vma_pages_range(struct vm_area_struct *vma, +@@ -455,8 +455,7 @@ void munlock_vma_pages_range(struct vm_area_struct *vma, * suits munlock very well (and if somehow an abnormal page * has sneaked into the range, we won't oops here: great). */ @@ -65,7 +66,7 @@ index 1050511f8b2b..02f138244bf5 100644 if (page && !IS_ERR(page)) { if (PageTransTail(page)) { -@@ -468,8 +467,8 @@ void munlock_vma_pages_range(struct vm_area_struct *vma, +@@ -467,8 +466,8 @@ void munlock_vma_pages_range(struct vm_area_struct *vma, /* * Any THP page found by follow_page_mask() may * have gotten split before reaching diff --git a/queue/tracing-Add-undef-to-fix-compile-error.patch b/queue/tracing-Add-undef-to-fix-compile-error.patch index b086e0e..139949e 100644 --- a/queue/tracing-Add-undef-to-fix-compile-error.patch +++ b/queue/tracing-Add-undef-to-fix-compile-error.patch @@ -1,4 +1,4 @@ -From bf7165cfa23695c51998231c4efa080fe1d3548d Mon Sep 17 00:00:00 2001 +From b1bf15525db63011d249aa46a65766912db7169f Mon Sep 17 00:00:00 2001 From: Rik van Riel <riel@redhat.com> Date: Wed, 28 Sep 2016 22:55:54 -0400 Subject: [PATCH] tracing: Add #undef to fix compile error @@ -21,6 +21,7 @@ Cc: stable@vger.kernel.org Fixes: b8007ef74222 ("tracing: Separate raw syscall from syscall tracer") Signed-off-by: Rik van Riel <riel@redhat.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/trace/events/syscalls.h b/include/trace/events/syscalls.h index 14e49c798135..b35533b94277 100644 diff --git a/queue/tty-n_hdlc-get-rid-of-racy-n_hdlc.tbuf.patch b/queue/tty-n_hdlc-get-rid-of-racy-n_hdlc.tbuf.patch index 547a83d..f539845 100644 --- a/queue/tty-n_hdlc-get-rid-of-racy-n_hdlc.tbuf.patch +++ b/queue/tty-n_hdlc-get-rid-of-racy-n_hdlc.tbuf.patch @@ -1,4 +1,4 @@ -From 82f2341c94d270421f383641b7cd670e474db56b Mon Sep 17 00:00:00 2001 +From 7767d09c353c1793d5a7d11e0551bf5f77df13e7 Mon Sep 17 00:00:00 2001 From: Alexander Popov <alex.popov@linux.com> Date: Tue, 28 Feb 2017 19:54:40 +0300 Subject: [PATCH] tty: n_hdlc: get rid of racy n_hdlc.tbuf @@ -21,9 +21,10 @@ in case of tx error put current data buffer after the head of tx_buf_list. Signed-off-by: Alexander Popov <alex.popov@linux.com> Cc: stable <stable@vger.kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c -index 1bacbc3b19a0..e94aea8c0d05 100644 +index a7fa016f31eb..6d1e2f746ab4 100644 --- a/drivers/tty/n_hdlc.c +++ b/drivers/tty/n_hdlc.c @@ -114,7 +114,7 @@ diff --git a/queue/tun-fix-premature-POLLOUT-notification-on-tun-device.patch b/queue/tun-fix-premature-POLLOUT-notification-on-tun-device.patch index ebff286..578bcdf 100644 --- a/queue/tun-fix-premature-POLLOUT-notification-on-tun-device.patch +++ b/queue/tun-fix-premature-POLLOUT-notification-on-tun-device.patch @@ -1,4 +1,4 @@ -From b20e2d54789c6acbf6bd0efdbec2cf5fa4d90ef1 Mon Sep 17 00:00:00 2001 +From 852707702cf5a2bf496e7f6f71590fb7a206c450 Mon Sep 17 00:00:00 2001 From: Hannes Frederic Sowa <hannes@stressinduktion.org> Date: Mon, 13 Mar 2017 00:00:26 +0100 Subject: [PATCH] tun: fix premature POLLOUT notification on tun devices @@ -36,12 +36,13 @@ Reported-by: aszlig <aszlig@redmoonstudios.org> Cc: aszlig <aszlig@redmoonstudios.org> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/tun.c b/drivers/net/tun.c -index f58b7d850114..34cc3c590aa5 100644 +index c4e7c5c2117e..67349221a17c 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c -@@ -822,7 +822,18 @@ static void tun_net_uninit(struct net_device *dev) +@@ -825,7 +825,18 @@ static void tun_net_uninit(struct net_device *dev) /* Net device open. */ static int tun_net_open(struct net_device *dev) { @@ -60,7 +61,7 @@ index f58b7d850114..34cc3c590aa5 100644 return 0; } -@@ -1103,9 +1114,10 @@ static unsigned int tun_chr_poll(struct file *file, poll_table *wait) +@@ -1122,9 +1133,10 @@ static unsigned int tun_chr_poll(struct file *file, poll_table *wait) if (!skb_array_empty(&tfile->tx_array)) mask |= POLLIN | POLLRDNORM; diff --git a/queue/uapi-fix-linux-packet_diag.h-userspace-compilation-e.patch b/queue/uapi-fix-linux-packet_diag.h-userspace-compilation-e.patch index 018e2e8..70f303e 100644 --- a/queue/uapi-fix-linux-packet_diag.h-userspace-compilation-e.patch +++ b/queue/uapi-fix-linux-packet_diag.h-userspace-compilation-e.patch @@ -1,4 +1,4 @@ -From 745cb7f8a5de0805cade3de3991b7a95317c7c73 Mon Sep 17 00:00:00 2001 +From 068d2ca747b095c3385e451e8395ee3a52a25176 Mon Sep 17 00:00:00 2001 From: "Dmitry V. Levin" <ldv@altlinux.org> Date: Tue, 7 Mar 2017 23:50:50 +0300 Subject: [PATCH] uapi: fix linux/packet_diag.h userspace compilation error @@ -23,6 +23,7 @@ There are no UAPI headers besides these two that use MAX_ADDR_LEN. Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> Acked-by: Pavel Emelyanov <xemul@virtuozzo.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/uapi/linux/packet_diag.h b/include/uapi/linux/packet_diag.h index d08c63f3dd6f..0c5d5dd61b6a 100644 diff --git a/queue/usb-dwc3-gadget-make-Set-Endpoint-Configuration-macr.patch b/queue/usb-dwc3-gadget-make-Set-Endpoint-Configuration-macr.patch index fd841f5..22d64d5 100644 --- a/queue/usb-dwc3-gadget-make-Set-Endpoint-Configuration-macr.patch +++ b/queue/usb-dwc3-gadget-make-Set-Endpoint-Configuration-macr.patch @@ -1,4 +1,4 @@ -From 7369090a9fb57c3fc705ce355d2e4523a5a24716 Mon Sep 17 00:00:00 2001 +From eeb7a792252bbbcee43bd6201b0aab32882ee033 Mon Sep 17 00:00:00 2001 From: Felipe Balbi <felipe.balbi@linux.intel.com> Date: Tue, 31 Jan 2017 13:24:54 +0200 Subject: [PATCH] usb: dwc3: gadget: make Set Endpoint Configuration macros @@ -20,9 +20,10 @@ Cc: <stable@vger.kernel.org> # v3.2+ Reported-by: Mohamed Abbas <mohamed.abbas@intel.com> Sugested-by: Adam Andruszak <adam.andruszak@intel.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/dwc3/gadget.h b/drivers/usb/dwc3/gadget.h -index 3129bcf74d7d..265e223ab645 100644 +index e4a1d974a5ae..39459b718e98 100644 --- a/drivers/usb/dwc3/gadget.h +++ b/drivers/usb/dwc3/gadget.h @@ -28,23 +28,23 @@ struct dwc3; diff --git a/queue/usb-dwc3-omap-Fix-missing-break-in-dwc3_omap_set_mai.patch b/queue/usb-dwc3-omap-Fix-missing-break-in-dwc3_omap_set_mai.patch index bcf8397..2eaa1cb 100644 --- a/queue/usb-dwc3-omap-Fix-missing-break-in-dwc3_omap_set_mai.patch +++ b/queue/usb-dwc3-omap-Fix-missing-break-in-dwc3_omap_set_mai.patch @@ -1,4 +1,4 @@ -From 0913750f9fb6f26bcd00c8f9dd9a8d1b8d031246 Mon Sep 17 00:00:00 2001 +From 78b005921bc58344e01c158137d540e43464edd8 Mon Sep 17 00:00:00 2001 From: Roger Quadros <rogerq@ti.com> Date: Wed, 15 Feb 2017 13:38:22 +0200 Subject: [PATCH] usb: dwc3-omap: Fix missing break in dwc3_omap_set_mailbox() @@ -13,12 +13,13 @@ Fixes: d2728fb3e01f ("usb: dwc3: omap: Pass VBUS and ID events transparently") Cc: <stable@vger.kernel.org> #v4.8+ Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c -index 4a595777969e..f8d0747810e7 100644 +index 29e80cc9b634..5dd1832564c7 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c -@@ -250,6 +250,7 @@ static void dwc3_omap_set_mailbox(struct dwc3_omap *omap, +@@ -249,6 +249,7 @@ static void dwc3_omap_set_mailbox(struct dwc3_omap *omap, val = dwc3_omap_read_utmi_ctrl(omap); val |= USBOTGSS_UTMI_OTG_CTRL_IDDIG; dwc3_omap_write_utmi_ctrl(omap, val); diff --git a/queue/usb-gadget-dummy_hcd-clear-usb_gadget-region-before-.patch b/queue/usb-gadget-dummy_hcd-clear-usb_gadget-region-before-.patch index 41feb3d..7094419 100644 --- a/queue/usb-gadget-dummy_hcd-clear-usb_gadget-region-before-.patch +++ b/queue/usb-gadget-dummy_hcd-clear-usb_gadget-region-before-.patch @@ -1,4 +1,4 @@ -From 5bbc852676ae08e818241cf66a3ffe4be44225c4 Mon Sep 17 00:00:00 2001 +From 0b7ca433edc47718dad9f354cfaadef61582c7fc Mon Sep 17 00:00:00 2001 From: Peter Chen <peter.chen@nxp.com> Date: Tue, 28 Feb 2017 14:25:45 +0800 Subject: [PATCH] usb: gadget: dummy_hcd: clear usb_gadget region before @@ -62,9 +62,10 @@ Signed-off-by: Peter Chen <peter.chen@nxp.com> Tested-by: Xiaolong Ye <xiaolong.ye@intel.com> Reported-by: Fengguang Wu <fengguang.wu@intel.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/gadget/udc/dummy_hcd.c b/drivers/usb/gadget/udc/dummy_hcd.c -index c60abe3a68f9..8cabc5944d5f 100644 +index a81d9ab861dc..4fa5de2eb501 100644 --- a/drivers/usb/gadget/udc/dummy_hcd.c +++ b/drivers/usb/gadget/udc/dummy_hcd.c @@ -1031,6 +1031,8 @@ static int dummy_udc_probe(struct platform_device *pdev) diff --git a/queue/usb-gadget-function-f_fs-pass-companion-descriptor-a.patch b/queue/usb-gadget-function-f_fs-pass-companion-descriptor-a.patch index 9d9ba58..bf675da 100644 --- a/queue/usb-gadget-function-f_fs-pass-companion-descriptor-a.patch +++ b/queue/usb-gadget-function-f_fs-pass-companion-descriptor-a.patch @@ -1,4 +1,4 @@ -From faafdc8e1b797c7bb6845f03dafe8973e41f34ad Mon Sep 17 00:00:00 2001 +From 84b1ff316fbcec99c0323f07f2581df537793378 Mon Sep 17 00:00:00 2001 From: Felipe Balbi <felipe.balbi@linux.intel.com> Date: Tue, 31 Jan 2017 14:54:45 +0200 Subject: [PATCH] usb: gadget: function: f_fs: pass companion descriptor along diff --git a/queue/usb-gadget-udc-atmel-remove-memory-leak.patch b/queue/usb-gadget-udc-atmel-remove-memory-leak.patch index 3e46f75..53718be 100644 --- a/queue/usb-gadget-udc-atmel-remove-memory-leak.patch +++ b/queue/usb-gadget-udc-atmel-remove-memory-leak.patch @@ -1,4 +1,4 @@ -From 32856eea7bf75dfb99b955ada6e147f553a11366 Mon Sep 17 00:00:00 2001 +From 04fa9ccd4952b5f5fcc6dd52ad7526d92b44c5c3 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni <alexandre.belloni@free-electrons.com> Date: Wed, 11 Jan 2017 13:11:08 +0100 Subject: [PATCH] usb: gadget: udc: atmel: remove memory leak @@ -12,9 +12,10 @@ usba_ep so it is freed when the endpoint is. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c b/drivers/usb/gadget/udc/atmel_usba_udc.c -index f3212db9bc37..12c7687216e6 100644 +index 45bc997d0711..a95b3e75f750 100644 --- a/drivers/usb/gadget/udc/atmel_usba_udc.c +++ b/drivers/usb/gadget/udc/atmel_usba_udc.c @@ -1978,7 +1978,8 @@ static struct usba_ep * atmel_udc_of_init(struct platform_device *pdev, diff --git a/queue/usb-host-xhci-dbg-HCIVERSION-should-be-a-binary-numb.patch b/queue/usb-host-xhci-dbg-HCIVERSION-should-be-a-binary-numb.patch index 79347d7..cbf3c55 100644 --- a/queue/usb-host-xhci-dbg-HCIVERSION-should-be-a-binary-numb.patch +++ b/queue/usb-host-xhci-dbg-HCIVERSION-should-be-a-binary-numb.patch @@ -1,4 +1,4 @@ -From f95e60a7dbecd2de816bb3ad517b3d4fbc20b507 Mon Sep 17 00:00:00 2001 +From 7ca78683c1f9305571dc9fcb3659bc4c83c19ce7 Mon Sep 17 00:00:00 2001 From: Peter Chen <peter.chen@nxp.com> Date: Thu, 9 Mar 2017 15:39:36 +0200 Subject: [PATCH] usb: host: xhci-dbg: HCIVERSION should be a binary number @@ -16,12 +16,13 @@ Fixes: 04abb6de2825 ("xhci: Read and parse new xhci Signed-off-by: Peter Chen <peter.chen@nxp.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/host/xhci-dbg.c b/drivers/usb/host/xhci-dbg.c -index 363d125300ea..2b4a00fa735d 100644 +index 74c42f722678..3425154baf8b 100644 --- a/drivers/usb/host/xhci-dbg.c +++ b/drivers/usb/host/xhci-dbg.c -@@ -109,7 +109,7 @@ static void xhci_print_cap_regs(struct xhci_hcd *xhci) +@@ -111,7 +111,7 @@ static void xhci_print_cap_regs(struct xhci_hcd *xhci) xhci_dbg(xhci, "RTSOFF 0x%x:\n", temp & RTSOFF_MASK); /* xhci 1.1 controllers have the HCCPARAMS2 register */ diff --git a/queue/usb-host-xhci-plat-Fix-timeout-on-removal-of-hot-plu.patch b/queue/usb-host-xhci-plat-Fix-timeout-on-removal-of-hot-plu.patch index 8ac88c8..7abea9c 100644 --- a/queue/usb-host-xhci-plat-Fix-timeout-on-removal-of-hot-plu.patch +++ b/queue/usb-host-xhci-plat-Fix-timeout-on-removal-of-hot-plu.patch @@ -1,4 +1,4 @@ -From dcc7620cad5ad1326a78f4031a7bf4f0e5b42984 Mon Sep 17 00:00:00 2001 +From b52846503cb5bca93cd27f17e3ccba6095de1afe Mon Sep 17 00:00:00 2001 From: Guenter Roeck <linux@roeck-us.net> Date: Thu, 9 Mar 2017 15:39:37 +0200 Subject: [PATCH] usb: host: xhci-plat: Fix timeout on removal of hot pluggable @@ -24,12 +24,13 @@ Signed-off-by: Guenter Roeck <linux@roeck-us.net> Cc: stable <stable@vger.kernel.org> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c -index 6d33b42ffcf5..bd02a6cd8e2c 100644 +index abe360684f0b..5895e84f9dcc 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c -@@ -286,6 +286,8 @@ static int xhci_plat_remove(struct platform_device *dev) +@@ -274,6 +274,8 @@ static int xhci_plat_remove(struct platform_device *dev) struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct clk *clk = xhci->clk; diff --git a/queue/vfio-spapr-Add-a-helper-to-create-default-DMA-window.patch b/queue/vfio-spapr-Add-a-helper-to-create-default-DMA-window.patch index 1eb226f..f895722 100644 --- a/queue/vfio-spapr-Add-a-helper-to-create-default-DMA-window.patch +++ b/queue/vfio-spapr-Add-a-helper-to-create-default-DMA-window.patch @@ -1,4 +1,4 @@ -From 6f01cc692a16405235d5c34056455b182682123c Mon Sep 17 00:00:00 2001 +From ca3ae8adf9525e19695e5d38e450227a051916bb Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy <aik@ozlabs.ru> Date: Wed, 30 Nov 2016 17:52:02 +1100 Subject: [PATCH] vfio/spapr: Add a helper to create default DMA window @@ -23,12 +23,13 @@ Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c -index 4efd2b20c35c..a67bbfdd86d5 100644 +index 33e59953c8a4..e95c3ebcec59 100644 --- a/drivers/vfio/vfio_iommu_spapr_tce.c +++ b/drivers/vfio/vfio_iommu_spapr_tce.c -@@ -710,6 +710,29 @@ static long tce_iommu_remove_window(struct tce_container *container, +@@ -784,6 +784,29 @@ static long tce_iommu_remove_window(struct tce_container *container, return 0; } @@ -58,7 +59,7 @@ index 4efd2b20c35c..a67bbfdd86d5 100644 static long tce_iommu_ioctl(void *iommu_data, unsigned int cmd, unsigned long arg) { -@@ -1100,9 +1123,6 @@ static void tce_iommu_release_ownership_ddw(struct tce_container *container, +@@ -1199,9 +1222,6 @@ static void tce_iommu_release_ownership_ddw(struct tce_container *container, static long tce_iommu_take_ownership_ddw(struct tce_container *container, struct iommu_table_group *table_group) { @@ -68,7 +69,7 @@ index 4efd2b20c35c..a67bbfdd86d5 100644 if (!table_group->ops->create_table || !table_group->ops->set_window || !table_group->ops->release_ownership) { WARN_ON_ONCE(1); -@@ -1111,47 +1131,7 @@ static long tce_iommu_take_ownership_ddw(struct tce_container *container, +@@ -1210,47 +1230,7 @@ static long tce_iommu_take_ownership_ddw(struct tce_container *container, table_group->ops->take_ownership(table_group); @@ -116,7 +117,7 @@ index 4efd2b20c35c..a67bbfdd86d5 100644 } static int tce_iommu_attach_group(void *iommu_data, -@@ -1161,6 +1141,7 @@ static int tce_iommu_attach_group(void *iommu_data, +@@ -1260,6 +1240,7 @@ static int tce_iommu_attach_group(void *iommu_data, struct tce_container *container = iommu_data; struct iommu_table_group *table_group; struct tce_iommu_group *tcegrp = NULL; @@ -124,7 +125,7 @@ index 4efd2b20c35c..a67bbfdd86d5 100644 mutex_lock(&container->lock); -@@ -1203,14 +1184,30 @@ static int tce_iommu_attach_group(void *iommu_data, +@@ -1302,14 +1283,30 @@ static int tce_iommu_attach_group(void *iommu_data, } if (!table_group->ops || !table_group->ops->take_ownership || diff --git a/queue/vfio-spapr-Postpone-allocation-of-userspace-version-.patch b/queue/vfio-spapr-Postpone-allocation-of-userspace-version-.patch index e6f9edb..2a2bbe8 100644 --- a/queue/vfio-spapr-Postpone-allocation-of-userspace-version-.patch +++ b/queue/vfio-spapr-Postpone-allocation-of-userspace-version-.patch @@ -1,4 +1,4 @@ -From 39701e56f5f16ea0cf8fc9e8472e645f8de91d23 Mon Sep 17 00:00:00 2001 +From cde2800b34cd85a1b5040fef2e8d16290169f49f Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy <aik@ozlabs.ru> Date: Wed, 30 Nov 2016 17:52:01 +1100 Subject: [PATCH] vfio/spapr: Postpone allocation of userspace version of TCE @@ -25,12 +25,13 @@ Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Acked-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c -index d0c38b201267..4efd2b20c35c 100644 +index 80378ddadc5c..2a6e13892397 100644 --- a/drivers/vfio/vfio_iommu_spapr_tce.c +++ b/drivers/vfio/vfio_iommu_spapr_tce.c -@@ -515,6 +515,12 @@ static long tce_iommu_build_v2(struct tce_container *container, +@@ -509,6 +509,12 @@ static long tce_iommu_build_v2(struct tce_container *container, unsigned long hpa; enum dma_data_direction dirtmp; @@ -43,7 +44,7 @@ index d0c38b201267..4efd2b20c35c 100644 for (i = 0; i < pages; ++i) { struct mm_iommu_table_group_mem_t *mem = NULL; unsigned long *pua = IOMMU_TABLE_USERSPACE_ENTRY(tbl, -@@ -588,15 +594,6 @@ static long tce_iommu_create_table(struct tce_container *container, +@@ -582,15 +588,6 @@ static long tce_iommu_create_table(struct tce_container *container, WARN_ON(!ret && !(*ptbl)->it_ops->free); WARN_ON(!ret && ((*ptbl)->it_allocated_size != table_size)); @@ -59,7 +60,7 @@ index d0c38b201267..4efd2b20c35c 100644 return ret; } -@@ -1068,10 +1065,7 @@ static int tce_iommu_take_ownership(struct tce_container *container, +@@ -1062,10 +1059,7 @@ static int tce_iommu_take_ownership(struct tce_container *container, if (!tbl || !tbl->it_map) continue; diff --git a/queue/vfio-spapr-Postpone-default-window-creation.patch b/queue/vfio-spapr-Postpone-default-window-creation.patch index 4d8eabe..0434783 100644 --- a/queue/vfio-spapr-Postpone-default-window-creation.patch +++ b/queue/vfio-spapr-Postpone-default-window-creation.patch @@ -1,4 +1,4 @@ -From 04ceef4420f9328ee8ff01efbf4d1cdacbb41e5b Mon Sep 17 00:00:00 2001 +From ca90a20b55149e1b9fde5111451d352048fb1bc0 Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy <aik@ozlabs.ru> Date: Wed, 30 Nov 2016 17:52:03 +1100 Subject: [PATCH] vfio/spapr: Postpone default window creation diff --git a/queue/vfio-spapr-Reference-mm-in-tce_container.patch b/queue/vfio-spapr-Reference-mm-in-tce_container.patch index f1f4ea8..0079533 100644 --- a/queue/vfio-spapr-Reference-mm-in-tce_container.patch +++ b/queue/vfio-spapr-Reference-mm-in-tce_container.patch @@ -1,4 +1,4 @@ -From 59c85656552373c6eda826737c3a967aaa5cfe29 Mon Sep 17 00:00:00 2001 +From 7bf2e1d84acb5ab580fbff9c0a48b79544b22dd3 Mon Sep 17 00:00:00 2001 From: Alexey Kardashevskiy <aik@ozlabs.ru> Date: Wed, 30 Nov 2016 17:52:04 +1100 Subject: [PATCH] vfio/spapr: Reference mm in tce_container diff --git a/queue/vrf-Fix-use-after-free-in-vrf_xmit.patch b/queue/vrf-Fix-use-after-free-in-vrf_xmit.patch index 855fb9f..839c3d9 100644 --- a/queue/vrf-Fix-use-after-free-in-vrf_xmit.patch +++ b/queue/vrf-Fix-use-after-free-in-vrf_xmit.patch @@ -1,4 +1,4 @@ -From f7887d40e541f74402df0684a1463c0a0bb68c68 Mon Sep 17 00:00:00 2001 +From b2c457c482313890322eae126602b596a08507e7 Mon Sep 17 00:00:00 2001 From: David Ahern <dsa@cumulusnetworks.com> Date: Mon, 6 Mar 2017 08:53:04 -0800 Subject: [PATCH] vrf: Fix use-after-free in vrf_xmit @@ -27,12 +27,13 @@ skb->len and using the saved value to update stats. Fixes: 193125dbd8eb2 ("net: Introduce VRF device driver") Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c -index 22379da63400..fea687f35b5a 100644 +index aef025e4b178..cdf182a30a4a 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c -@@ -340,6 +340,7 @@ static netdev_tx_t is_ip_tx_frame(struct sk_buff *skb, struct net_device *dev) +@@ -322,6 +322,7 @@ static netdev_tx_t is_ip_tx_frame(struct sk_buff *skb, struct net_device *dev) static netdev_tx_t vrf_xmit(struct sk_buff *skb, struct net_device *dev) { @@ -40,7 +41,7 @@ index 22379da63400..fea687f35b5a 100644 netdev_tx_t ret = is_ip_tx_frame(skb, dev); if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) { -@@ -347,7 +348,7 @@ static netdev_tx_t vrf_xmit(struct sk_buff *skb, struct net_device *dev) +@@ -329,7 +330,7 @@ static netdev_tx_t vrf_xmit(struct sk_buff *skb, struct net_device *dev) u64_stats_update_begin(&dstats->syncp); dstats->tx_pkts++; diff --git a/queue/vti6-return-GRE_KEY-for-vti6.patch b/queue/vti6-return-GRE_KEY-for-vti6.patch index c1fae80..df79515 100644 --- a/queue/vti6-return-GRE_KEY-for-vti6.patch +++ b/queue/vti6-return-GRE_KEY-for-vti6.patch @@ -1,4 +1,4 @@ -From 7dcdf941cdc96692ab99fd790c8cc68945514851 Mon Sep 17 00:00:00 2001 +From 746e50dfe2006907ebd0ce76142f8854422b23e1 Mon Sep 17 00:00:00 2001 From: David Forster <dforster@brocade.com> Date: Fri, 24 Feb 2017 14:20:32 +0000 Subject: [PATCH] vti6: return GRE_KEY for vti6 @@ -10,12 +10,13 @@ to display tunnel keys on "ip -6 tunnel show" Signed-off-by: David Forster <dforster@brocade.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv6/ip6_vti.c b/net/ipv6/ip6_vti.c -index c795fee372c4..644ba59fbd9d 100644 +index 5bd3afdcc771..9359caadb7c5 100644 --- a/net/ipv6/ip6_vti.c +++ b/net/ipv6/ip6_vti.c -@@ -693,6 +693,10 @@ vti6_parm_to_user(struct ip6_tnl_parm2 *u, const struct __ip6_tnl_parm *p) +@@ -691,6 +691,10 @@ vti6_parm_to_user(struct ip6_tnl_parm2 *u, const struct __ip6_tnl_parm *p) u->link = p->link; u->i_key = p->i_key; u->o_key = p->o_key; diff --git a/queue/vxlan-correctly-validate-VXLAN-ID-against-VXLAN_N_VI.patch b/queue/vxlan-correctly-validate-VXLAN-ID-against-VXLAN_N_VI.patch index e404984..aad3f70 100644 --- a/queue/vxlan-correctly-validate-VXLAN-ID-against-VXLAN_N_VI.patch +++ b/queue/vxlan-correctly-validate-VXLAN-ID-against-VXLAN_N_VI.patch @@ -1,4 +1,4 @@ -From 4e37d6911f36545b286d15073f6f2222f840e81c Mon Sep 17 00:00:00 2001 +From bced10627a359a862cfd24b29f9662b668679e83 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Thu, 23 Feb 2017 17:19:41 +0100 Subject: [PATCH] vxlan: correctly validate VXLAN ID against VXLAN_N_VID @@ -12,12 +12,13 @@ Fixes: d342894c5d2f ("vxlan: virtual extensible lan") Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> Acked-by: Jiri Benc <jbenc@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c -index 556953f53437..268c2a12e61d 100644 +index e450b6a96a35..50914765cf1d 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c -@@ -2675,7 +2675,7 @@ static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[]) +@@ -2613,7 +2613,7 @@ static int vxlan_validate(struct nlattr *tb[], struct nlattr *data[]) if (data[IFLA_VXLAN_ID]) { __u32 id = nla_get_u32(data[IFLA_VXLAN_ID]); diff --git a/queue/vxlan-don-t-allow-overwrite-of-config-src-addr.patch b/queue/vxlan-don-t-allow-overwrite-of-config-src-addr.patch index b345c36..2ca2a88 100644 --- a/queue/vxlan-don-t-allow-overwrite-of-config-src-addr.patch +++ b/queue/vxlan-don-t-allow-overwrite-of-config-src-addr.patch @@ -1,4 +1,4 @@ -From 0b5f7485b1d74856b48f807a056ac6c452435274 Mon Sep 17 00:00:00 2001 +From dab7eba83b101a4004a48589064807ef0aca0712 Mon Sep 17 00:00:00 2001 From: Brian Russell <brussell@brocade.com> Date: Fri, 24 Feb 2017 17:47:11 +0000 Subject: [PATCH] vxlan: don't allow overwrite of config src addr diff --git a/queue/x86-hyperv-Handle-unknown-NMIs-on-one-CPU-when-unkno.patch b/queue/x86-hyperv-Handle-unknown-NMIs-on-one-CPU-when-unkno.patch index 0897262..d73a927 100644 --- a/queue/x86-hyperv-Handle-unknown-NMIs-on-one-CPU-when-unkno.patch +++ b/queue/x86-hyperv-Handle-unknown-NMIs-on-one-CPU-when-unkno.patch @@ -1,4 +1,4 @@ -From 59107e2f48831daedc46973ce4988605ab066de3 Mon Sep 17 00:00:00 2001 +From b1b83d322274a7ec5176f62adf5181054d4f7c12 Mon Sep 17 00:00:00 2001 From: Vitaly Kuznetsov <vkuznets@redhat.com> Date: Fri, 2 Dec 2016 11:07:20 +0100 Subject: [PATCH] x86/hyperv: Handle unknown NMIs on one CPU when @@ -65,12 +65,13 @@ Cc: Haiyang Zhang <haiyangz@microsoft.com> Link: http://lkml.kernel.org/r/20161202100720.28121-1-vkuznets@redhat.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c -index 6c044543545e..f37e02e41a77 100644 +index 8f44c5a50ab8..f228f74051b6 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c -@@ -30,6 +30,7 @@ +@@ -31,6 +31,7 @@ #include <asm/apic.h> #include <asm/timer.h> #include <asm/reboot.h> @@ -78,7 +79,7 @@ index 6c044543545e..f37e02e41a77 100644 struct ms_hyperv_info ms_hyperv; EXPORT_SYMBOL_GPL(ms_hyperv); -@@ -157,6 +158,26 @@ static unsigned char hv_get_nmi_reason(void) +@@ -158,6 +159,26 @@ static unsigned char hv_get_nmi_reason(void) return 0; } @@ -105,7 +106,7 @@ index 6c044543545e..f37e02e41a77 100644 static void __init ms_hyperv_init_platform(void) { /* -@@ -182,6 +203,9 @@ static void __init ms_hyperv_init_platform(void) +@@ -183,6 +204,9 @@ static void __init ms_hyperv_init_platform(void) pr_info("HyperV: LAPIC Timer Frequency: %#x\n", lapic_timer_frequency); } diff --git a/queue/x86-kasan-Fix-boot-with-KASAN-y-and-PROFILE_ANNOTATE.patch b/queue/x86-kasan-Fix-boot-with-KASAN-y-and-PROFILE_ANNOTATE.patch index b0f5ea6..a93c38a 100644 --- a/queue/x86-kasan-Fix-boot-with-KASAN-y-and-PROFILE_ANNOTATE.patch +++ b/queue/x86-kasan-Fix-boot-with-KASAN-y-and-PROFILE_ANNOTATE.patch @@ -1,4 +1,4 @@ -From be3606ff739d1c1be36389f8737c577ad87e1f57 Mon Sep 17 00:00:00 2001 +From 8d0dff5de98c9e452144e1a437284e5627907deb Mon Sep 17 00:00:00 2001 From: Andrey Ryabinin <aryabinin@virtuozzo.com> Date: Mon, 13 Mar 2017 19:33:37 +0300 Subject: [PATCH] x86/kasan: Fix boot with KASAN=y and @@ -26,6 +26,7 @@ Cc: lkp@01.org Cc: Dmitry Vyukov <dvyukov@google.com> Link: http://lkml.kernel.org/r/20170313163337.1704-1-aryabinin@virtuozzo.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c index 54a2372f5dbb..b5785c197e53 100644 @@ -40,7 +41,7 @@ index 54a2372f5dbb..b5785c197e53 100644 #include <linux/linkage.h> #include <linux/types.h> diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c -index 8d63d7a104c3..4c90cfdc128b 100644 +index 0493c17b8a51..333362f992e4 100644 --- a/arch/x86/mm/kasan_init_64.c +++ b/arch/x86/mm/kasan_init_64.c @@ -1,3 +1,4 @@ diff --git a/queue/x86-mm-fix-gup_pte_range-vs-DAX-mappings.patch b/queue/x86-mm-fix-gup_pte_range-vs-DAX-mappings.patch index 708f68d..f20f7d7 100644 --- a/queue/x86-mm-fix-gup_pte_range-vs-DAX-mappings.patch +++ b/queue/x86-mm-fix-gup_pte_range-vs-DAX-mappings.patch @@ -1,4 +1,4 @@ -From ef947b2529f918d9606533eb9c32b187ed6a5ede Mon Sep 17 00:00:00 2001 +From 84ab6c21113b8ff4fe1ec002d3bd8ccef35fbb90 Mon Sep 17 00:00:00 2001 From: Dan Williams <dan.j.williams@intel.com> Date: Thu, 9 Mar 2017 16:16:42 -0800 Subject: [PATCH] x86, mm: fix gup_pte_range() vs DAX mappings @@ -24,9 +24,10 @@ Cc: Thomas Gleixner <tglx@linutronix.de> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/mm/gup.c b/arch/x86/mm/gup.c -index 99c7805a9693..9d32ee608807 100644 +index b8b6a60b32cf..5421c8e1113c 100644 --- a/arch/x86/mm/gup.c +++ b/arch/x86/mm/gup.c @@ -120,6 +120,11 @@ static noinline int gup_pte_range(pmd_t pmd, unsigned long addr, diff --git a/queue/x86-perf-Fix-CR4.PCE-propagation-to-use-active_mm-in.patch b/queue/x86-perf-Fix-CR4.PCE-propagation-to-use-active_mm-in.patch index d4d11a0..21982e9 100644 --- a/queue/x86-perf-Fix-CR4.PCE-propagation-to-use-active_mm-in.patch +++ b/queue/x86-perf-Fix-CR4.PCE-propagation-to-use-active_mm-in.patch @@ -1,4 +1,4 @@ -From 5dc855d44c2ad960a86f593c60461f1ae1566b6d Mon Sep 17 00:00:00 2001 +From fd3f940787a3fef76367dea35b0b25a18f5267f5 Mon Sep 17 00:00:00 2001 From: Andy Lutomirski <luto@kernel.org> Date: Thu, 16 Mar 2017 12:59:39 -0700 Subject: [PATCH] x86/perf: Fix CR4.PCE propagation to use active_mm instead of @@ -26,12 +26,13 @@ Cc: stable@vger.kernel.org Fixes: 7911d3f7af14 ("perf/x86: Only allow rdpmc if a perf_event is mapped") Link: http://lkml.kernel.org/r/0c5b38a76ea50e405f9abe07a13dfaef87c173a1.1489694270.git.luto@kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c -index 1635c0c8df23..e07b36c5588a 100644 +index 7b0f1d932c87..f05fa2a46f26 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c -@@ -2100,8 +2100,8 @@ static int x86_pmu_event_init(struct perf_event *event) +@@ -2075,8 +2075,8 @@ static int x86_pmu_event_init(struct perf_event *event) static void refresh_pce(void *ignored) { diff --git a/queue/x86-tlb-Fix-tlb-flushing-when-lguest-clears-PGE.patch b/queue/x86-tlb-Fix-tlb-flushing-when-lguest-clears-PGE.patch index 53b7a0e..c17a7d7 100644 --- a/queue/x86-tlb-Fix-tlb-flushing-when-lguest-clears-PGE.patch +++ b/queue/x86-tlb-Fix-tlb-flushing-when-lguest-clears-PGE.patch @@ -1,4 +1,4 @@ -From 2c4ea6e28dbf15ab93632c5c189f3948366b8885 Mon Sep 17 00:00:00 2001 +From 68f0a2741838ad9847e4c1899d47edff9993ec0c Mon Sep 17 00:00:00 2001 From: Daniel Borkmann <daniel@iogearbox.net> Date: Sat, 11 Mar 2017 01:31:19 +0100 Subject: [PATCH] x86/tlb: Fix tlb flushing when lguest clears PGE @@ -72,9 +72,10 @@ Cc: stable@vger.kernel.org Link: http://lkml.kernrl.org/r/20170301125426.l4nf65rx4wahohyl@wfg-t540p.sh.intel.com Link: http://lkml.kernel.org/r/25c41ad9eca164be4db9ad84f768965b7eb19d9e.1489191673.git.daniel@iogearbox.net Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h -index 6fa85944af83..fc5abff9b7fd 100644 +index dee8a70382ba..8fe1de1a9e71 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h @@ -188,7 +188,7 @@ static inline void __native_flush_tlb_single(unsigned long addr) diff --git a/queue/x86-tsc-Fix-ART-for-TSC_KNOWN_FREQ.patch b/queue/x86-tsc-Fix-ART-for-TSC_KNOWN_FREQ.patch index ee7e8a6..3ae9a91 100644 --- a/queue/x86-tsc-Fix-ART-for-TSC_KNOWN_FREQ.patch +++ b/queue/x86-tsc-Fix-ART-for-TSC_KNOWN_FREQ.patch @@ -1,4 +1,4 @@ -From 49a75de019efbaf1d9135266a310b51afddcae0b Mon Sep 17 00:00:00 2001 +From cbfcff20f5a6e5ddb145cb5f277fb6fbc4b3f1c4 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra <peterz@infradead.org> Date: Mon, 13 Mar 2017 15:57:12 +0100 Subject: [PATCH] x86/tsc: Fix ART for TSC_KNOWN_FREQ diff --git a/queue/xen-do-not-re-use-pirq-number-cached-in-pci-device-m.patch b/queue/xen-do-not-re-use-pirq-number-cached-in-pci-device-m.patch index 1f7a15a..e839a7b 100644 --- a/queue/xen-do-not-re-use-pirq-number-cached-in-pci-device-m.patch +++ b/queue/xen-do-not-re-use-pirq-number-cached-in-pci-device-m.patch @@ -1,4 +1,4 @@ -From c74fd80f2f41d05f350bb478151021f88551afe8 Mon Sep 17 00:00:00 2001 +From d95b065f260e169d383f9086172a31df6d0b4004 Mon Sep 17 00:00:00 2001 From: Dan Streetman <ddstreet@ieee.org> Date: Fri, 13 Jan 2017 15:07:51 -0500 Subject: [PATCH] xen: do not re-use pirq number cached in pci device msi msg @@ -40,9 +40,10 @@ Signed-off-by: Dan Streetman <dan.streetman@canonical.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c -index e1fb269c87af..292ab0364a89 100644 +index 3a483cb5ac81..4ea9f290c19f 100644 --- a/arch/x86/pci/xen.c +++ b/arch/x86/pci/xen.c @@ -234,23 +234,14 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) diff --git a/queue/xtensa-move-parse_tag_fdt-out-of-ifdef-CONFIG_BLK_DE.patch b/queue/xtensa-move-parse_tag_fdt-out-of-ifdef-CONFIG_BLK_DE.patch index 13fbfb6..0b5a433 100644 --- a/queue/xtensa-move-parse_tag_fdt-out-of-ifdef-CONFIG_BLK_DE.patch +++ b/queue/xtensa-move-parse_tag_fdt-out-of-ifdef-CONFIG_BLK_DE.patch @@ -1,4 +1,4 @@ -From 4ab18701c66552944188dbcd0ce0012729baab84 Mon Sep 17 00:00:00 2001 +From cb775ec59b56d26d28e065d8af50332a1baba564 Mon Sep 17 00:00:00 2001 From: Max Filippov <jcmvbkbc@gmail.com> Date: Tue, 3 Jan 2017 09:37:34 -0800 Subject: [PATCH] xtensa: move parse_tag_fdt out of #ifdef @@ -13,9 +13,10 @@ BLK_DEV_INITRD support. Cc: stable@vger.kernel.org Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c -index 88a044af7504..23f2e034ba46 100644 +index c04697b5ea32..438875c8afb3 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -133,6 +133,8 @@ static int __init parse_tag_initrd(const bp_tag_t* tag) |