Messages in this thread | | | Date | Tue, 18 Aug 2015 18:46:57 +1000 | From | Stephen Rothwell <> | Subject | Re: linux-next: manual merge of the akpm-current tree with the v4l-dvb tree |
| |
Hi Andrew,
On Tue, 18 Aug 2015 18:44:48 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote: > > Today's linux-next merge of the akpm-current tree got a conflict in: > > mm/Kconfig
Also mm/Makefile
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
| |