Merged to master at 9475e8e9bf6e..9e9071faf16d (from, to] You can see the entire diff with 'git diff' or at https://github.com/brho/akaros/compare/9475e8e9bf6e...9e9071faf16d
On 2016-08-04 at 11:42 Kyle Milka <[email protected]> wrote: > There were a few errors in these files, it will be easier to > just have the correct version upstream. > > Change-Id: I3ecb6bec4837d92d58cc7230d0afd1c7a5bde34a > Signed-off-by: Kyle Milka <[email protected]> > --- > kern/kfs/tinycore_cmdline | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kern/kfs/tinycore_cmdline b/kern/kfs/tinycore_cmdline > index 92dd1ec..10cfc14 100644 > --- a/kern/kfs/tinycore_cmdline > +++ b/kern/kfs/tinycore_cmdline > @@ -7,9 +7,9 @@ earlyprintk=vmcall,keep > apic=debug > noexec=off > nohlt > - init=/bin/launcher > lapic=notscdeadline > lapictimerfreq=1000000 > pit=none > nortc > nozswap > + noinvpcid -- You received this message because you are subscribed to the Google Groups "Akaros" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. For more options, visit https://groups.google.com/d/optout.
