* linux-next: manual merge of the akpm-current tree with the driver-core tree
@ 2014-11-10 8:55 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2014-11-10 8:55 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Wolfram Sang, Johan Hovold
[-- Attachment #1: Type: text/plain, Size: 936 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
drivers/rtc/rtc-omap.c between commit 0929ae376ef3 ("rtc: drop owner
assignment from platform_drivers") from the driver-core tree and commit
700abe25a31a ("rtc: omap: remove DRIVER_NAME macro") 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@canb•auug.org.au
diff --cc drivers/rtc/rtc-omap.c
index ae444a8bd602,fba13e53c278..000000000000
--- a/drivers/rtc/rtc-omap.c
+++ b/drivers/rtc/rtc-omap.c
@@@ -568,7 -718,8 +718,7 @@@ static struct platform_driver omap_rtc_
.remove = __exit_p(omap_rtc_remove),
.shutdown = omap_rtc_shutdown,
.driver = {
- .name = DRIVER_NAME,
+ .name = "omap_rtc",
- .owner = THIS_MODULE,
.pm = &omap_rtc_pm_ops,
.of_match_table = omap_rtc_of_match,
},
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the akpm-current tree with the driver-core tree
@ 2015-10-07 4:36 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-10-07 4:36 UTC (permalink / raw)
To: Andrew Morton, Greg KH; +Cc: linux-next, linux-kernel, Viresh Kumar, Mel Gorman
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@canb•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,
};
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-10-07 4:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-10-07 4:36 linux-next: manual merge of the akpm-current tree with the driver-core tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2014-11-10 8:55 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox