linux-kernel - linux-next: manual merge of the akpm-current tree with the driver-core tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Wed, 7 Oct 2015 15:36:56 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Andrew Morton <akpm@...ux-foundation.org>, Greg KH <greg@...ah.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Viresh Kumar <viresh.kumar@...aro.org>,
	Mel Gorman <mgorman@...hsingularity.net>
Subject: linux-next: manual merge of the akpm-current tree with the
 driver-core tree

Hi Andrew,

Today's linux-next merge of the akpm-current tree got conflicts in:

  mm/failslab.c
  mm/page_alloc.c

between commit:

  621a5f7ad9cd ("debugfs: Pass bool pointer to debugfs_create_bool()")

from the driver-core tree and commit:

  67c145d9ff18 ("mm, page_alloc: rename __GFP_WAIT to __GFP_RECLAIM")

from the akpm-current tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

diff --cc mm/failslab.c
index 98fb490311eb,35c876c82b9d..000000000000
--- a/mm/failslab.c
+++ b/mm/failslab.c
@@@ -3,12 -3,12 +3,12 @@@
  
  static struct {
  	struct fault_attr attr;
- 	bool ignore_gfp_wait;
 -	u32 ignore_gfp_reclaim;
 -	int cache_filter;
++	bool ignore_gfp_reclaim;
 +	bool cache_filter;
  } failslab = {
  	.attr = FAULT_ATTR_INITIALIZER,
- 	.ignore_gfp_wait = true,
 -	.ignore_gfp_reclaim = 1,
 -	.cache_filter = 0,
++	.ignore_gfp_reclaim = true,
 +	.cache_filter = false,
  };
  
  bool should_failslab(size_t size, gfp_t gfpflags, unsigned long cache_flags)
diff --cc mm/page_alloc.c
index 805bbad2e24e,c73913648357..000000000000
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@@ -2159,13 -2277,13 +2277,13 @@@ failed
  static struct {
  	struct fault_attr attr;
  
 -	u32 ignore_gfp_highmem;
 -	u32 ignore_gfp_reclaim;
 +	bool ignore_gfp_highmem;
- 	bool ignore_gfp_wait;
++	bool ignore_gfp_reclaim;
  	u32 min_order;
  } fail_page_alloc = {
  	.attr = FAULT_ATTR_INITIALIZER,
- 	.ignore_gfp_wait = true,
 -	.ignore_gfp_reclaim = 1,
 -	.ignore_gfp_highmem = 1,
++	.ignore_gfp_reclaim = true,
 +	.ignore_gfp_highmem = true,
  	.min_order = 1,
  };
  
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/