Skip to content

[GIT PULL] remove unused linux/dma-buf.h include#1551

Merged
axboe merged 1 commit intoaxboe:masterfrom
xiongzile:master
Mar 17, 2026
Merged

[GIT PULL] remove unused linux/dma-buf.h include#1551
axboe merged 1 commit intoaxboe:masterfrom
xiongzile:master

Conversation

@xiongzile
Copy link
Copy Markdown
Contributor

This pull request removes an unused <linux/dma-buf.h> include from
examples/zcrx.c.

The header is not needed and indirectly pulls in <linux/if.h>, which
can conflict with <net/if.h> in userspace builds and lead to
redefinition errors.

Dropping it avoids the potential build issue and removes an unnecessary
dependency.


git request-pull output:

The following changes since commit 0b0f0fcc9d19c872b0bf96a77cc0f2fb4eeba44a:

  test/mshot-shutdown-race: abort if stalled for >= 1 second (2026-03-17 07:59:31 -0600)

are available in the Git repository at:

  https://github.com/BearLee001/liburing master

for you to fetch changes up to 28600a57a343bd0ac0dd9b7e4c02c5794477719c:

  examples: remove unused linux/dma-buf.h include (2026-03-18 00:46:02 +0800)

----------------------------------------------------------------
Zile Xiong (1):
      examples: remove unused linux/dma-buf.h include

 examples/zcrx.c | 1 -
 1 file changed, 1 deletion(-)

Click to show/hide pull request guidelines

Pull Request Guidelines

  1. To make everyone easily filter pull request from the email
    notification, use [GIT PULL] as a prefix in your PR title.
[GIT PULL] Your Pull Request Title
  1. Follow the commit message format rules below.
  2. Follow the Linux kernel coding style (see: https://github.com/torvalds/linux/blob/master/Documentation/process/coding-style.rst).

Commit message format rules:

  1. The first line is title (don't be more than 72 chars if possible).
  2. Then an empty line.
  3. Then a description (may be omitted for truly trivial changes).
  4. Then an empty line again (if it has a description).
  5. Then a Signed-off-by tag with your real name and email. For example:
Signed-off-by: Foo Bar <foo.bar@gmail.com>

The description should be word-wrapped at 72 chars. Some things should
not be word-wrapped. They may be some kind of quoted text - long
compiler error messages, oops reports, Link, etc. (things that have a
certain specific format).

Note that all of this goes in the commit message, not in the pull
request text. The pull request text should introduce what this pull
request does, and each commit message should explain the rationale for
why that particular change was made. The git tree is canonical source
of truth, not github.

Each patch should do one thing, and one thing only. If you find yourself
writing an explanation for why a patch is fixing multiple issues, that's
a good indication that the change should be split into separate patches.

If the commit is a fix for an issue, add a Fixes tag with the issue
URL.

Don't use GitHub anonymous email like this as the commit author:

123456789+username@users.noreply.github.com

Use a real email address!

Commit message example:

src/queue: don't flush SQ ring for new wait interface

If we have IORING_FEAT_EXT_ARG, then timeouts are done through the
syscall instead of by posting an internal timeout. This was done
to be both more efficient, but also to enable multi-threaded use
the wait side. If we touch the SQ state by flushing it, that isn't
safe without synchronization.

Fixes: https://github.com/axboe/liburing/issues/402
Signed-off-by: Jens Axboe <axboe@kernel.dk>

By submitting this pull request, I acknowledge that:

  1. I have followed the above pull request guidelines.
  2. I have the rights to submit this work under the same license.
  3. I agree to a Developer Certificate of Origin (see https://developercertificate.org for more information).

The header is not used and indirectly pulls in <linux/if.h>, which
conflicts with <net/if.h> in userspace builds.

Drop the unused include to avoid the header conflict and reduce
unnecessary dependencies.

Signed-off-by: Zile Xiong <xiongzile@bytedance.com>
@axboe axboe merged commit 041c20f into axboe:master Mar 17, 2026
19 checks passed
@isilence
Copy link
Copy Markdown
Collaborator

isilence commented Mar 17, 2026 via email

@xiongzile
Copy link
Copy Markdown
Contributor Author

On 3/17/26 16:49, Zile Xiong wrote: This pull request removes an unused <linux/dma-buf.h> include from examples/zcrx.c. The header is not needed and indirectly pulls in <linux/if.h>, which can conflict with <net/if.h> in userspace builds and lead to redefinition errors.
I'm very confused how linux/dma-buf.h happens to include if.h. Can you paste the compilation error? Because we have bigger problems if it's not allowed to include basic linux headers.

-- Pavel Begunkov

This was my mistake. My local kernel headers are modified so that
<linux/dma-buf.h> pulls in <linux/if.h> for IFNAMSIZ, which is not
the case upstream.

The include in examples/zcrx.c is unused.
Sorry for the confusion.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants