From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 May 2017 00:55:59 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: v4.12-rc1~107
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=dd23f273d9a765d7f092c1bb0d1cd7aaf668077e;p=karo-tx-linux.git

Merge branch 'akpm' (patches from Andrew)

Merge misc updates from Andrew Morton:

 - a few misc things

 - most of MM

 - KASAN updates

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (102 commits)
  kasan: separate report parts by empty lines
  kasan: improve double-free report format
  kasan: print page description after stacks
  kasan: improve slab object description
  kasan: change report header
  kasan: simplify address description logic
  kasan: change allocation and freeing stack traces headers
  kasan: unify report headers
  kasan: introduce helper functions for determining bug type
  mm: hwpoison: call shake_page() after try_to_unmap() for mlocked page
  mm: hwpoison: call shake_page() unconditionally
  mm/swapfile.c: fix swap space leak in error path of swap_free_entries()
  mm/gup.c: fix access_ok() argument type
  mm/truncate: avoid pointless cleancache_invalidate_inode() calls.
  mm/truncate: bail out early from invalidate_inode_pages2_range() if mapping is empty
  fs/block_dev: always invalidate cleancache in invalidate_bdev()
  fs: fix data invalidation in the cleancache during direct IO
  zram: reduce load operation in page_same_filled
  zram: use zram_free_page instead of open-coded
  zram: introduce zram data accessor
  ...
---

dd23f273d9a765d7f092c1bb0d1cd7aaf668077e
diff --cc kernel/locking/lockdep.c
index dc3297895ce3,fd440b5a3c75..0a1b3c748478
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@@ -3947,9 -3954,8 +3954,9 @@@ EXPORT_SYMBOL_GPL(lock_unpin_lock)
  
  void lockdep_set_current_reclaim_state(gfp_t gfp_mask)
  {
- 	current->lockdep_reclaim_gfp = gfp_mask;
+ 	current->lockdep_reclaim_gfp = current_gfp_context(gfp_mask);
  }
 +EXPORT_SYMBOL_GPL(lockdep_set_current_reclaim_state);
  
  void lockdep_clear_current_reclaim_state(void)
  {