Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bpf: two small janitorial cleanups #16198

Merged
merged 2 commits into from May 20, 2021
Merged

bpf: two small janitorial cleanups #16198

merged 2 commits into from May 20, 2021

Conversation

tklauser
Copy link
Member

See commit messages for details.

@tklauser
bpf: move BPF_LICENSE to end of bpf_lxc.c
bb8dae2 
All other bpf_*.c files have BPF_LICENSE at the end of the file, move it
there in bpf_lxc.c as well, rather than having it appear somewhere
between functions.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
@tklauser
bpf: remove HOST_REDIRECT_TO_INGRESS from LXC_OPTIONS in Makefile
aafcccd 
Commit 3b64f23 ("Deprecate legacy flannel integration") removed all
traces of HOST_REDIRECT_TO_INGRESS, but commit 652ccd2
("lib/proxy.h: set variable as maybe unused to avoid compilation error")
accidentially added it to LXC_OPTIONS again.

Signed-off-by: Tobias Klauser <tobias@cilium.io>
@tklauser tklauser added kind/cleanup This includes no functional changes. release-note/misc This PR makes changes that have no direct user impact. labels May 18, 2021
@tklauser tklauser requested a review from a team May 18, 2021 09:31
@tklauser tklauser requested review from a team as code owners May 18, 2021 09:31
ti-mo
ti-mo approved these changes May 19, 2021
View reviewed changes
Copy link
Contributor

@ti-mo ti-mo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@tklauser
Copy link
Member Author

Received two reviews, all GH actions and Travis CI passed. No need to run full CI. Marking as ready to merge.

@tklauser tklauser added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label May 20, 2021
@twpayne twpayne merged commit 93b67da into cilium:master May 20, 2021
@tklauser tklauser deleted the pr/bpf-janitorial branch May 20, 2021 09:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pchaigno pchaigno pchaigno approved these changes

@ti-mo ti-mo ti-mo approved these changes

@jrfastab jrfastab Awaiting requested review from jrfastab

@michi-covalent michi-covalent Awaiting requested review from michi-covalent

Assignees

@jrfastab jrfastab

@michi-covalent michi-covalent

Labels
kind/cleanup This includes no functional changes. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@tklauser @pchaigno @ti-mo @twpayne @jrfastab @michi-covalent