Re: linux-next: manual merge of the akpm tree with the staging tree

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 >

linux-next: manual merge of the akpm tree with the staging tree

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

linux-next: manual merge of the akpm tree with the staging tree

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

Re: linux-next: manual merge of the akpm tree with the staging tree

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

linux-next: manual merge of the akpm tree with the staging tree

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

linux-next: manual merge of the akpm tree with the staging tree

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

linux-next: manual merge of the akpm tree with the staging tree

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

linux-next: manual merge of the akpm tree with the staging tree

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