Fix merge conflict and updated GhsotBSD main with FreeBSD main. #371
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Release notes at https://www.sqlite.org/releaselog/3_50_2.html. Obtained from: https://www.sqlite.org/2025/sqlite-autoconf-3500200.tar.gz MFC after: 1 month Merge commit '89922daaa168292633b1a7a523bcd0559487c6ad'
This also fixes a few other trivial -Wunused-but-set-variable warnings. Pull Request: freebsd/freebsd-src#1677 MFC after: 1 month
Pull Request: freebsd/freebsd-src#1677 MFC after: 1 month
Pull Request: freebsd/freebsd-src#1677 MFC after: 1 month
Pull Request: freebsd/freebsd-src#1677 MFC after: 1 month
This re-enables all compiler warnings for these sources. Pull Request: freebsd/freebsd-src#1677 MFC after: 1 month
Currently, there is a race condition where the Makefile sh invocation of 'bhyveload -c stdio' exits before receiving any user input in the bootloader (e.g. in the form of a user typically pressing <enter>), causing the 'expect' script to wrongly spawn the 'bhyve' invocation while still in the bootloader. This patch wraps bhyveload in expect(1) to ensure that stdio is correctly consumed before the process exits. Signed-off-by: Siva Mahadevan <[email protected]> Sponsored by: The FreeBSD Foundation Pull Request: freebsd/freebsd-src#1757
Signed-off-by: Siva Mahadevan <[email protected]> Reviewed by: markj Pull Request: freebsd/freebsd-src#1738
MFC after: 1 week
For 34 days the libclntkrb5.so symlink was installed as libclntkrb5. Fix this and add the error to ObsoleteFiles.inc. Noted and Makefile patch by fluffy@. Fixes: ee3960c
Add PCI id for Arrow Lake to attach iic driver Reviewed by: wulf, mav Differential Revision: https://reviews.freebsd.org/D51107
…lity with libusb THe member bNumDeviceCapabilities is referred to as bNumDeviceCaps in the upstream libusb project. To improve compatibility, we are renaming the member accordingly. For backward compatibility, a mocro will be defined to map bNumDeviceCapabilities to bNumDeviceCaps. See: libusb/libusb@02ebafc Reviewed by: kevans Approved by: markj (mentor) MFC after: 2 weeks Sponsored by: FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50740
Reviewed by: kib, markj MFC after: 1 month Pull Request: freebsd/freebsd-src#1758
__uexterr_format: return empty string on no error, instead of "No error" err(): check for the first symbol of the exterr to decide if there is anything to print. Requested and reviewed by: markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D51204
Update ieee80211_output_seqno_assign() to support the transmitter sequence number assignment outlined in 802.11-2020 10.3.2.14.2 (Transmitter Requirements). Notably this correctly assigns the QoS NULL frames a seqno outside of the TID seqno space. Leave stub comments for the currently supported sequence number decisions. Add two new functions to access and increment the sequence number space, which will ensure that things wrap correctly. This should simplify drivers needing to constantly invent their own methods of fetching and incrementing the sequence number space. Differential Revision: https://reviews.freebsd.org/D50691 Reviewed by: bz
* Add test cases for opendir() and fdopendir(). * Drop O_NONBLOCK from opendir(); it was added a long time ago to avoid blocking if given a closed named pipe, but now we use O_DIRECTORY, which ensures that we get ENOTDIR in that case. * While here, remove unused #includes left over from the split. Sponsored by: Klara, Inc. Reviewed by: kevans, markj Differential Revision: https://reviews.freebsd.org/D51126
This doesn't affect terminal output but does affect the fonts used in other formats such as postscript and HTML. Sponsored by: Chelsio Communications
Using upper case for column width templates avoids overfull columns when using groff to generate a postscript version of the manpage but doesn't affect the terminal version. Use a wider default column (8 characters) for the "Type" column and use wider widths for tables with longer event types. In the terminal, man(1) forces a line break after overfull column items, but in the postscript and HTML versions the column just overflows into the adjacent column without any separation. Sponsored by: Chelsio Communications
While here, fix a couple of nearby nits. Sponsored by: Chelsio Communications
groff doesn't seem to handle nested column list blocks correctly for postscript and HTML output causing the subsequent nvme event to be indented incorrectly. Using a tag list block works around this. Sponsored by: Chelsio Communications
If the calling process has used SIG_IGN as handler or set the SA_NOCLDWAIT flag for SIGCHLD, processes will be automatically reaped on exit and calls to waitpid(3) will therefore fail with ECHILD. We waitpid primarily to reap our child so that the caller does not have to worry about it. ECHILD indicates that there is no child to reap, so we can just treat that as a success and move on. Signed-off-by: Kenny Levinsen <[email protected]> Tested by: Jan Beich Pull Request: freebsd/freebsd-src#1675
Now we have three flags provided. Sponsored by: The FreeBSD Foundation
Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D51206
Sponsored by: Netflix
The libusb set debug level by libusb_log_level instead of libusb_debug_level. We switch to libusb_log_level for better compatibility with the upstream libusb. Additionally, The upstream libusb has an option allows user to override the log function with a user-defined callback. To support the callback function with a single string without va_arg, we refactor the log facility as a function instead of a macro and parse all va_args inside. The legacy debug_level enum has been removed to enforce maintainer migrate from their deprecated source code. Reviewed by: kevans Approved by: markj (mentor), lwhsu (mentor) MFC after: 2 weeks Sponsored by: FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D50680
There is no reason for it to be non-modifing by F_SETFD. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D51212
Additionally, there's no way to get to the end without a valid stdin_pipe[1] at the moment, so don't check for it. stdin_pipe[0] is closed earlier, as the parent shouldn't need the read-side of the pipe. While we're here, also free the file actions earlier and on error -- they're not necessary once posix_spawnp() has returned. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D50537
This gives us some way to be able to write to stdin if we want to, or as a future improvement, will allow us to extract stdout from the process. The handle is setup to close and waitpid() on close/gc so that existing users wouldn't necessarily leak for the lifetime of the script if they weren't adopted to the new model. Reviewed by: bapt Differential Revision: https://reviews.freebsd.org/D50538
This allows us to do things like:
```
local fp = assert(fbsd.exec({"ls", "-l"}, true))
local fpout = assert(fp:stdout())
while true do
local line = fpout:read("l")
if not line then break end
print("Read: " .. line)
end
fp:close()
```
The makeman lua rewrite will use it to capture `make showconfig` output
for processing.
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D50539
…in config file. The fix is the same as for other parse.y files in the tree (see bgpd(8) or unwind(8)) ok bluhm@ Obtained from: OpenBSD, tobhe <[email protected]>, da1e1ceac5 Sponsored by: Rubicon Communications, LLC ("Netgate")
|
test this |
1 similar comment
|
test this |
We don't need the rules lock to protect the mbuf, or even the kif. If an
interface is removed (which is the only way for a kif to go away) we're not
going to receive traffic on it.
We can't delay taking the lock more, because pf_setup_pdesc() calls the
normalisation code, which iterates the scrub rules. If we ever get rid of those
(as OpenBSD has) it should be possible to delay taking the rules lock until we
actually need to iterate of the rules. That is, we might be able to avoid taking
it at all if we match an existing state.
Reviewed by: glebius
Sponsored by: Rubicon Communications, LLC ("Netgate")
Differential Revision: https://reviews.freebsd.org/D51329
We failed to verify that the packet was long enough for the provided IPv6 packet length. This could result in us walking off the end of the mbuf and panicing. PR: 288224 Reported by: Robert Morris <[email protected]> Tested by: Robert Morris <[email protected]> Reviewed by: emaste Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D51324
This reverts commit ea97c39. The rule is used in the ALTQ case, which I missed. Sponsored by: Rubicon Communications, LLC ("Netgate")
loader_brand was in a different spot in the dvd image compared to the others. Reviewed by: jrm Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51342
We've done the same in the past to the vnconfig.8->mdconfig.8 link in:
eb5f456 Remove ancient vnconfig symlink
Reviewed by: bcr, markj, ziaee
Approved by: markj (mentor)
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D27122
Be explicit that the user should update their branch and re-push to update the pull request. Reviewed by: imp Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51332
Add a helper script that populates variables used to invoke several tools.
This is also the first step towards cleaning up several inconsistencies
related to tool invocation in various release scripts (e.g. ${MAKEFS} vs makefs).
Sponsored by: Klara, Inc.
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D51038
Reviewed by: emaste, des
This change cleans up the inconsistent ways of invoking makefs and mkimg by making sure that these tools are invoked through their corresponding variables. This was previously only used in a few amd64 and arm64 release scripts. Sponsored by: Klara, Inc. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51039 Reviewed by: emaste, markj
Fix a UBSAN-reported error in `ffs_make_dirbuf` where a zero offset gets applied to a NULL pointer. Sponsored by: Klara, Inc. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51037 Reviewed by: emaste, mckusick
Sponsored by: Klara, Inc. Sponsored by: The FreeBSD Foundation
Way back in 2017 I wrote the initial VHT hostap support, and then added a NULL check here to stop it from panicing. However, there is no VHTINFO IE in an ASSOC_REQ management frame. Thus, the node would never have VHT state initialised. This mirrors what HT node setup does (which again doesn't have HTINFO IE's in an ASSOC_REQ frame), the upgrade will happen once the exchange completes. Fixes: 2023566 Differential Revision: https://reviews.freebsd.org/D50787
ieee80211_vht_get_vhtflags() is checking the htinfo IE for the 20/40MHz flag as part of deciding valid channel widths. However, in the hostapd path, the ASSOC_REQ/REASSOC_REQ path will parse the IEs, do some HT/VHT setup, then call ieee80211_ht_updatehtcap_final(). In a HT ASSOC/REASSOC request there won't be a HTINFO IE, however ieee80211_vht_get_vhtflags() still checks for it, leading to a panic. Instead, treat it as if we don't yet know if it's HT40 or not. I'm not sure if we should do that or have it just do _RETURN_CHAN_BITS(0). Differential Revision: https://reviews.freebsd.org/D50794
Differential Revision: https://reviews.freebsd.org/D46397 Reviewed by: kib, markj, br
Mostly a copy of pci subsystem support, by replacing pciconf with usbconfig and excluding hardware classes. Approved by: wireless (bz) manpages (ziaee) USB (bz) Differential Revision: https://reviews.freebsd.org/D48678
Most libxo-enabled utilities link to xo_parse_args.3. But that man page doesn't actually describe how to format command-line arguments. Rather, xo_options.7 does. I suspect that these utilities link to the former because the latter man page did not exist until libxo-0.7.2 (8a6ecef). And newer utilities have probably been copy/pasting the same text from older ones. But the superior man page does exist now, so we should link to it instead. MFC after: 2 weeks Sponsored by: ConnectWise Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D51354
Before this change, the first probed member of a pool would initialize vdev tree for the pool. Now, imagine a situation when a machine has a disk that has been removed from the pool, but the ZFS label was not erased. That's a typical scenario - disk goes offline, it is replaced with a spare, no data changes written to the gone disk. Then, disk appears back at boot time and it is the first one to be probed by the loader. It has the same pool GUID as all other members and naive loader would not see a conflict. Then the disk will be used as source of truth to read the bootenv. To fix that, provide vdev_free() that allows to rollback the already prebuilt vdev tree, so that a new one can be built from scratch. Upon encountering a newer configuration for already known top level part of a pool, call vdev_free() and let vdev_probe() to build a new one. The change has been tested with loader_lua and userboot.so, but it should have same effect on the legacy boot1 loader. Reviewed by: tsoome, mav, imp Differential Revision: https://reviews.freebsd.org/D51219
This change allows mandoc(1) to find these manual pages for all the relevant function names. Submitted by: Ingo Schwarze Obtained from: elftoolchain/r4192
The existing code frequently assigns unsigned 64-bit values to variables that are signed and / or shorter without checking for overflow. Try to deal with these cases. While here, fix two structs that used single-element arrays in place of flexible array members. PR: 287896 MFC after: 1 week Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D51339
Currently, a lot of tests report 'skipped' due to missing binaries in the PATH. The real issue is that /etc/rc forcibly restricts the PATH to the base system only. This patch re-enables a large chunk of skipped tests by adding the missing LOCALBASE directories to the PATH so that Kyua can discover third-party packages. It also fixes some minor rc scripting style as per the official freebsd scripting guide[0]. [0] https://docs.freebsd.org/en/articles/rc-scripting Signed-off-by: Siva Mahadevan <[email protected]> Sponsored by: The FreeBSD Foundation Approved by: lwhsu Differential Revision: https://reviews.freebsd.org/D51303
Signed-off-by: jefby <[email protected]> Reviewed-by: emaste Pull-request: freebsd/freebsd-src#1755
|
test this |
|
test this |
github-project-automation
bot
moved this from In Review
to Done
in Development Management
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.