[linux] 01/01: Update to 4.6-rc6

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit ae6831e8b640b45200605ba55df9b8dec61b51d0
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu May 5 22:17:45 2016 +0100

    Update to 4.6-rc6
---
 debian/changelog                                   |  4 ++-
 ...ll-invocation-from-mem_cgroup_move_charge.patch | 42 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 3 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3023d7e..143b9e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,6 @@
-linux (4.6~rc5-1~exp2) UNRELEASED; urgency=medium
+linux (4.6~rc6-1~exp1) UNRELEASED; urgency=medium
+
+  * New upstream release candidate
 
   [ Martin Michlmayr ]
   * i2c-modules udeb: Add modules from i2c/busses.
diff --git a/debian/patches/bugfix/all/memcg-remove-lru_add_drain_all-invocation-from-mem_cgroup_move_charge.patch b/debian/patches/bugfix/all/memcg-remove-lru_add_drain_all-invocation-from-mem_cgroup_move_charge.patch
deleted file mode 100644
index bcc2d28..0000000
--- a/debian/patches/bugfix/all/memcg-remove-lru_add_drain_all-invocation-from-mem_cgroup_move_charge.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Tejun Heo <tj at kernel.org>
-Subject: memcg: remove lru_add_drain_all() invocation from mem_cgroup_move_charge()
-Date: Thu, 21 Apr 2016 11:56:52 -0400
-Origin: http://permalink.gmane.org/gmane.linux.kernel.cgroups/15918
-Bug-Debian: https://bugs.debian.org/822084
-
-mem_cgroup_move_charge() invokes lru_add_drain_all() so that the pvec
-pages can be moved too.  lru_add_drain_all() schedules and flushes
-work items on system_wq which depends on being able to create new
-kworkers to make forward progress.  Since 1ed1328792ff ("sched,
-cgroup: replace signal_struct->group_rwsem with a global
-percpu_rwsem"), a new task can't be created while in the cgroup
-migration path and the described lru_add_drain_all() invocation can
-easily lead to a deadlock.
-
-Charge moving is best-effort and whether the pvec pages are migrated
-or not doesn't really matter.  Don't call it during charge moving.
-Eventually, we want to move the actual charge moving outside the
-migration path.
-
-Signed-off-by: Tejun Heo <tj at kernel.org>
-Debugged-and-tested-by: Petr Mladek <pmladek at suse.com>
-Reported-by: Cyril Hrubis <chrubis at suse.cz>
-Reported-by: Johannes Weiner <hannes at cmpxchg.org>
-Suggested-by: Michal Hocko <mhocko at kernel.org>
-Acked-by: Michal Hocko <mhocko at suse.com>
-Fixes: 1ed1328792ff ("sched, cgroup: replace signal_struct->group_rwsem with a global percpu_rwsem")
-Cc: stable at vger.kernel.org # v4.4+
----
- mm/memcontrol.c |    1 -
- 1 file changed, 1 deletion(-)
-
---- a/mm/memcontrol.c
-+++ b/mm/memcontrol.c
-@@ -4859,7 +4859,6 @@ static void mem_cgroup_move_charge(struc
- 		.mm = mm,
- 	};
- 
--	lru_add_drain_all();
- 	/*
- 	 * Signal lock_page_memcg() to take the memcg's move_lock
- 	 * while we're moving its pages to another memcg. Then wait
diff --git a/debian/patches/series b/debian/patches/series
index 7e89066..923c06f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -65,7 +65,6 @@ bugfix/all/disable-some-marvell-phys.patch
 bugfix/all/rtsx_usb_ms-use-msleep_interruptible-in-polling-loop.patch
 bugfix/all/fs-add-module_softdep-declarations-for-hard-coded-cr.patch
 bugfix/all/module-invalidate-signatures-on-force-loaded-modules.patch
-bugfix/all/memcg-remove-lru_add_drain_all-invocation-from-mem_cgroup_move_charge.patch
 
 # Miscellaneous features
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git