Date: Thu, 21 Aug 2025 11:55:26 -0700 From: "Enji Cooper (yaneurabeya)" <yaneurabeya@gmail.com> To: Cy Schubert <Cy.Schubert@cschubert.com> Cc: Warner Losh <imp@bsdimp.com>, Mark Johnston <markj@freebsd.org>, =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= <des@freebsd.org>, freebsd-current@freebsd.org, ivy@freebsd.org Subject: Re: HEADS UP: MIT KRB5 1.22.1 Import Message-ID: <61981CC2-8ED9-45B8-B626-0609DB152A60@gmail.com> In-Reply-To: <20250821164030.8014628A@slippy.cwsent.com> References: <20250821055519.65D8B684@slippy.cwsent.com> <86frdlkw30.fsf@ltc.des.dev> <20250821093615.B4293211@slippy.cwsent.com> <aKcqsXIyYobdRIlY@nuc> <20250821151023.39D09205@slippy.cwsent.com> <CANCZdfo9_D-D43JnoTxt1ivN_SZ2smpHQTJRL2oqp9q%2BYZEqfQ@mail.gmail.com> <20250821162750.D9BCC307@slippy.cwsent.com> <20250821164030.8014628A@slippy.cwsent.com>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] > On Aug 21, 2025, at 9:40 AM, Cy Schubert <Cy.Schubert@cschubert.com> wrote: > > In message <20250821162750.D9BCC307@slippy.cwsent.com>, Cy Schubert writes: … > I used the vendor branch commit hash. As with git-diff the files are rooted > from contrib/krb5 not from the root of the source tree. This must be a > subtree merge thing. I’ve been using `git subtree merge -P` as of late when doing vendor imports. git merge/git cherry-pick don’t do the right thing when I run those commands. Cheers, -Enji [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEkHfexGRJ3gYRdA2gGpE5DjPsNJgFAmina54ACgkQGpE5DjPs NJjJpxAAjBrGhNJk814Cphnn9Ws46ebRYA4LeQs6ZKwZek2HJS8hEOkt3Wrm6GqK fyILmN5fZpxORgX6lcKVGQlbXTgqjeXPYCX7pWslwYv9lXyD1/VysTzp9fVFI45u raIg8qrPCTWHdnFnlhBPtZ7dE8xmSzJHbMOqvTR/+LS36o2z70Qd3j88qR2l0Pav nidqlMn1A7w+iFT8sX71kC1oIIC6F66Ml7qJNc5cIVVR2ePKcekAYD9fMaz4HfOX DNJ4ZzzvV6J7B4XdI9/H63+ToiAgKTqd/yBOl2JgYk+FBiGHS54tI2SXtyVkKcwn Cv5Mf3UhefXdcd3sjsRpRJd0tMhk38tDz8MAa1kF64nS6qoelU11SXHgUjpxery5 HLDN1MlYGtrm6JGktvGPJLIOevB9aEVkY7W/qrLLLeMOeZBpDWS59arlb4kIB6gl IhxP47+k/uIgAEJcH1dMihZybg0qqpy4TlTHqqjHk7rsiMp+vAMvi/BeU2KKxJCN bzg/eql4oGrgEWEl2lrSfXMiuIROnY9jlVM/HEaDfUL9KgSKGGtoiY0hjVsZToQC 4Tx9fkr0nf7TMLgMQNZ/olT7eiwmDcM3zCayy88FVC43g0/cLCIa5btVlIQAqOWU zTH6v+RBEWLWjV08wS4tIOREdi4fMc7NNjm9gW6GxAGq+6s6UaQ= =QWHT -----END PGP SIGNATURE-----home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?61981CC2-8ED9-45B8-B626-0609DB152A60>