Re: svn commit: r345052 - head/sys/kern

2019-03-11 Thread Cy Schubert
In message <201903120510.x2c5afs9081...@repo.freebsd.org>, Warner Losh writes: > Author: imp > Date: Tue Mar 12 05:10:41 2019 > New Revision: 345052 > URL: https://svnweb.freebsd.org/changeset/base/345052 > > Log: > Fix botched merge with 355066 Should this be 335066? > > When merging fro

Re: svn commit: r345052 - head/sys/kern

2019-03-11 Thread Warner Losh
On Mon, Mar 11, 2019 at 11:10 PM Warner Losh wrote: > Author: imp > Date: Tue Mar 12 05:10:41 2019 > New Revision: 345052 > URL: https://svnweb.freebsd.org/changeset/base/345052 > > Log: > Fix botched merge with 355066 > It was actually 335066. And since this was before the 12 branch, it shoul

svn commit: r345052 - head/sys/kern

2019-03-11 Thread Warner Losh
Author: imp Date: Tue Mar 12 05:10:41 2019 New Revision: 345052 URL: https://svnweb.freebsd.org/changeset/base/345052 Log: Fix botched merge with 355066 When merging from Netflix's tree, resetting the carsize was dropped accidentally. This fix fixes that revision by properly resetting how