Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1209135
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: linux-next: manual merge of the akpm-current tree with the v4l-dvb tree |
| Date | 2015-08-18 10:50 +0200 |
| Message-ID | <pYKKL-12H-29@gated-at.bofh.it> (permalink) |
| References | <pYKKK-12H-17@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread
linux-next: manual merge of the akpm-current tree with the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-18 10:50 +0200 Re: linux-next: manual merge of the akpm-current tree with the v4l-dvb tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-18 10:50 +0200
csiph-web