From: Greg Kroah-Hartman Date: Tue, 12 Jul 2016 02:45:58 +0000 (-0700) Subject: 3.14-stable patches X-Git-Tag: v4.6.5~29 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=93abd9aa0aa64546654d12978597be5188400c05;p=thirdparty%2Fkernel%2Fstable-queue.git 3.14-stable patches added patches: mm-export-migrate_page_move_mapping-and-migrate_page_copy.patch --- diff --git a/queue-3.14/mac80211-fix-mesh-estab_plinks-counting-in-sta-removal-case.patch b/queue-3.14/mac80211-fix-mesh-estab_plinks-counting-in-sta-removal-case.patch deleted file mode 100644 index 1e57a9549ec..00000000000 --- a/queue-3.14/mac80211-fix-mesh-estab_plinks-counting-in-sta-removal-case.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 126e7557328a1cd576be4fca95b133a2695283ff Mon Sep 17 00:00:00 2001 -From: Jouni Malinen -Date: Sun, 19 Jun 2016 23:51:02 +0300 -Subject: mac80211: Fix mesh estab_plinks counting in STA removal case - -From: Jouni Malinen - -commit 126e7557328a1cd576be4fca95b133a2695283ff upstream. - -If a user space program (e.g., wpa_supplicant) deletes a STA entry that -is currently in NL80211_PLINK_ESTAB state, the number of established -plinks counter was not decremented and this could result in rejecting -new plink establishment before really hitting the real maximum plink -limit. For !user_mpm case, this decrementation is handled by -mesh_plink_deactive(). - -Fix this by decrementing estab_plinks on STA deletion -(mesh_sta_cleanup() gets called from there) so that the counter has a -correct value and the Beacon frame advertisement in Mesh Configuration -element shows the proper value for capability to accept additional -peers. - -Signed-off-by: Jouni Malinen -Signed-off-by: Johannes Berg -Signed-off-by: Greg Kroah-Hartman - ---- - net/mac80211/mesh.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/net/mac80211/mesh.c -+++ b/net/mac80211/mesh.c -@@ -148,14 +148,17 @@ u32 mesh_accept_plinks_update(struct iee - void mesh_sta_cleanup(struct sta_info *sta) - { - struct ieee80211_sub_if_data *sdata = sta->sdata; -- u32 changed; -+ u32 changed = 0; - - /* - * maybe userspace handles peer allocation and peering, but in either - * case the beacon is still generated by the kernel and we might need - * an update. - */ -- changed = mesh_accept_plinks_update(sdata); -+ if (sdata->u.mesh.user_mpm && -+ sta->mesh->plink_state == NL80211_PLINK_ESTAB) -+ changed |= mesh_plink_dec_estab_count(sdata); -+ changed |= mesh_accept_plinks_update(sdata); - if (!sdata->u.mesh.user_mpm) { - changed |= mesh_plink_deactivate(sta); - del_timer_sync(&sta->plink_timer); diff --git a/queue-3.14/mm-export-migrate_page_move_mapping-and-migrate_page_copy.patch b/queue-3.14/mm-export-migrate_page_move_mapping-and-migrate_page_copy.patch new file mode 100644 index 00000000000..daf1a9d8c06 --- /dev/null +++ b/queue-3.14/mm-export-migrate_page_move_mapping-and-migrate_page_copy.patch @@ -0,0 +1,38 @@ +From 1118dce773d84f39ebd51a9fe7261f9169cb056e Mon Sep 17 00:00:00 2001 +From: Richard Weinberger +Date: Thu, 16 Jun 2016 23:26:14 +0200 +Subject: mm: Export migrate_page_move_mapping and migrate_page_copy + +From: Richard Weinberger + +commit 1118dce773d84f39ebd51a9fe7261f9169cb056e upstream. + +Export these symbols such that UBIFS can implement +->migratepage. + +Signed-off-by: Richard Weinberger +Acked-by: Christoph Hellwig +Signed-off-by: Greg Kroah-Hartman + +--- + mm/migrate.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/mm/migrate.c ++++ b/mm/migrate.c +@@ -423,6 +423,7 @@ int migrate_page_move_mapping(struct add + + return MIGRATEPAGE_SUCCESS; + } ++EXPORT_SYMBOL(migrate_page_move_mapping); + + /* + * The expected number of remaining references is the same as that +@@ -582,6 +583,7 @@ void migrate_page_copy(struct page *newp + if (PageWriteback(newpage)) + end_page_writeback(newpage); + } ++EXPORT_SYMBOL(migrate_page_copy); + + /************************************************************ + * Migration functions diff --git a/queue-3.14/series b/queue-3.14/series index 3f0dea31407..1d041d6d298 100644 --- a/queue-3.14/series +++ b/queue-3.14/series @@ -7,7 +7,6 @@ usb-musb-stop-bulk-endpoint-while-queue-is-rotated.patch usb-musb-ensure-rx-reinit-occurs-for-shared_fifo-endpoints.patch mac80211-mesh-flush-mesh-paths-unconditionally.patch mac80211_hwsim-add-missing-check-for-hwsim_attr_signal.patch -mac80211-fix-mesh-estab_plinks-counting-in-sta-removal-case.patch ib-mlx4-properly-initialize-grh-tclass-and-flowlabel-in-ahs.patch powerpc-iommu-remove-the-dependency-on-eeh-struct-in-ddw-mechanism.patch powerpc-pseries-fix-pci-config-address-for-ddw.patch @@ -19,4 +18,5 @@ x86-amd_nb-fix-boot-crash-on-non-amd-systems.patch make-nfs_atomic_open-call-d_drop-on-all-open_context-errors.patch nfs-fix-another-open_downgrade-bug.patch arm-8578-1-mm-ensure-pmd_present-only-checks-the-valid-bit.patch +mm-export-migrate_page_move_mapping-and-migrate_page_copy.patch ubifs-implement-migratepage.patch