Merge commit 'v3.1' into combined
Merge branch 'stable' into combined

Conflicts:
	block/blk-core.c
	drivers/staging/zram/zram_drv.c
	include/linux/netlink.h
	include/linux/suspend.h
	kernel/power/Makefile
	kernel/power/console.c
	kernel/power/hibernate.c
	kernel/power/process.c

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Freeze kernel threads separately.

Upstream has split freezing kernel threads from the
freeze_processes() function. Update our code to match.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Handle unsorted highmem struct pages.

Changes upstream mean that highmem pfns do not now
necessarily get struct pages that are in increasing
order - the address of the struct page for pfn(n+1)
may be numerically less than the address of the struct
page for pfn(n). Up until now, we've been using the
struct page address in the orig_address of pbes and
relying on their ordering in searching for the
correct pbe. Switch to saving pfns instead, but only
for highmem pages (at least until I'm told the same
thing can happen for lowmem).

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Restore gfp_mask in freezer test exit path

Address a failure to invoke pm_restore_gfp_mask in the
freezer testing path.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Remove module.h with export.h includes.

Use include/linux/export.h rather than module.h as
we only want it for EXPORT_SYMBOL definitions.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Fix zram driver.

Fix a couple of TuxOnIce related lines that were overlooked and
not exercised during compile testing of the last merge.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Merge branch 'stable' into combined
Catchup on atomic copy call changes in vanilla.

Catch up with vanilla in changes to calls to the device model and
so on when hibernating.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
More aggressive freeing of memory.

Give vmscan's routines greater determination when it comes to
freeing memory for hibernation. This lets us get much more
memory freed in one call to try_to_free_pages than was previously
the case.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Protect do_try_to_free_pages.

do_try_to_free_pages was getting called when the freezer is on,
under some circumstances, resulting in an oops if it tries to
swap out a page (and perhaps other issues).

And I thought TuxOnIce wasn't suffering bitrot while I was busy
with other things...

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Merge branch 'stable' into combined
Merge branch 'stable' into combined
3.2.1 release for HEAD branch.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Merge branch 'upstream-3.2' into tuxonice-3.2
Make jbd & jbd2 freezable

Add the missing set_freezable() calls to jbd and jbd2.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Fix 64 bit int to unsigned long casts

Fix a few TuxOnIce variables declared as int instead of unsigned
longs.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>
Merge branch 'upstream-3.2' into tuxonice-3.2
Merge branch 'upstream-3.2' into tuxonice-3.2
Freezer fixes (set freezable / yield)

Add missing set_freezable calls to a variety of threads that
invoke try_to_freeze, but will never actually be frozen because
they don't call set_freezable.

In addition, improve our md.c patch so it uses the freezer rather
than yielding, too.

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>

Conflicts:

	drivers/md/md.c

Signed-off-by: Nigel Cunningham <nigel@tuxonice.net>