* linux-next: manual merge of the akpm tree with the staging tree
@ 2013-04-15 5:21 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2013-04-15 5:21 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-next, linux-kernel, Dan Magenheimer, Wanpeng Li, Greg KH
[-- Attachment #1: Type: text/plain, Size: 1109 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/staging/zcache/ramster/ramster.c between commit df735543008f
("staging: ramster: Move debugfs code out of ramster.c file") from the
staging tree and commit "staging: zcache: enable ramster to be
built/loaded as a module" from the akpm 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/staging/zcache/ramster/ramster.c
index 8781627,3ead248..0000000
--- a/drivers/staging/zcache/ramster/ramster.c
+++ b/drivers/staging/zcache/ramster/ramster.c
diff --git a/drivers/staging/zcache/ramster/debug.c b/drivers/staging/zcache/ramster/debug.c
index bf34133..327e4f0 100644
--- a/drivers/staging/zcache/ramster/debug.c
+++ b/drivers/staging/zcache/ramster/debug.c
@@ -43,7 +43,7 @@ static struct debug_entry {
};
#undef ATTR
-int __init ramster_debugfs_init(void)
+int ramster_debugfs_init(void)
{
int i;
struct dentry *root = debugfs_create_dir("ramster", NULL);
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: linux-next: manual merge of the akpm tree with the staging tree
2014-07-10 6:27 Stephen Rothwell
@ 2014-07-10 16:12 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2014-07-10 16:12 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Andrew Morton, linux-next, linux-kernel, Sachin Kamat
On Thu, Jul 10, 2014 at 04:27:50PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm tree got a conflict in
> drivers/staging/emxx_udc/emxx_udc.c between commit 6de2a1a7b9e2
> ("staging: emxx_udc: Fix build error") from the staging tree and commit
> "drivers/staging/emxx_udc/emxx_udc.c: replace strict_strto() with
> kstrto()" from the akpm tree.
>
> I fixed it up (I just used the version from the staging tree) and can
> carry the fix as necessary (no action is required).
Sounds good, thanks.
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the akpm tree with the staging tree
@ 2014-07-10 6:27 Stephen Rothwell
2014-07-10 16:12 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2014-07-10 6:27 UTC (permalink / raw)
To: Andrew Morton, Greg KH; +Cc: linux-next, linux-kernel, Sachin Kamat
[-- Attachment #1: Type: text/plain, Size: 511 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/staging/emxx_udc/emxx_udc.c between commit 6de2a1a7b9e2
("staging: emxx_udc: Fix build error") from the staging tree and commit
"drivers/staging/emxx_udc/emxx_udc.c: replace strict_strto() with
kstrto()" from the akpm tree.
I fixed it up (I just used the version from the staging tree) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: manual merge of the akpm tree with the staging tree
@ 2013-08-13 7:53 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2013-08-13 7:53 UTC (permalink / raw)
To: Andrew Morton; +Cc: linux-next, linux-kernel, Greg KH, Dave Chinner
[-- Attachment #1: Type: text/plain, Size: 516 bytes --]
Hi Andrew,
Today's linux-next merge of the akpm tree got a conflict in
drivers/staging/zcache/zcache-main.c between commit 962564604873
("staging: zcache: delete it") from the staging tree and commits "drivers:
convert shrinkers to new count/scan API" and
"drivers-convert-shrinkers-to-new-count-scan-api-fix" from the akpm tree.
I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-07-10 16:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-15 5:21 linux-next: manual merge of the akpm tree with the staging tree Stephen Rothwell
2013-08-13 7:53 Stephen Rothwell
2014-07-10 6:27 Stephen Rothwell
2014-07-10 16:12 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).