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

config-mlnx-sn2700.patch fails to apply #2

Closed
rspolyak opened this issue Aug 30, 2016 · 1 comment · Fixed by #4
Closed

config-mlnx-sn2700.patch fails to apply #2

rspolyak opened this issue Aug 30, 2016 · 1 comment · Fixed by #4

Comments

@rspolyak
Copy link

rspolyak commented Aug 30, 2016 •
edited
Loading

During compilation config-mlnx-sn2700.patch patch fails:

Checking for changes in the working directory ... done
Importing patch "config-dell-s6000.patch" ... done
Importing patch "config-mlnx-sn2700.patch" ... error: patch failed: debian/build/build_amd64_none_amd64/.config:3492
error: debian/build/build_amd64_none_amd64/.config: patch does not apply
stg import: Diff does not apply cleanly
@rspolyak
Copy link
Author

In this particular case seems that config-mlnx-sn2700.patch was based on some other version of .config file than retrieved from launchpad.
CONFIG_SENSORS_CISCO_N2200=m is present in config-mlnx-sn2700.patch, but is not available in
debian/build/build_amd64_none_amd64/.config

@rspolyak rspolyak mentioned this issue Sep 13, 2016
Open
@lguohan lguohan mentioned this issue Sep 15, 2016
Merged
lguohan added a commit that referenced this issue Sep 15, 2016
@lguohan
bug fix: regenerate config-mlnx-sn2700.patch to apply correctly (#4)
206a893 
resolve #2
@antony-rheneus antony-rheneus mentioned this issue Dec 11, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

bug fix: regenerate config-mlnx-sn2700.patch to apply correctly lguohan/sonic-linux-kernel
1 participant
@rspolyak