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

Security kernel update to 4.9.189 #3913

Merged
merged 4 commits into from
Feb 13, 2020
Merged

Security kernel update to 4.9.189 #3913

merged 4 commits into from
Feb 13, 2020

Conversation

olivier-singla
Copy link
Contributor

@olivier-singla olivier-singla commented Dec 15, 2019 •
edited
Loading

This patch upgrade the kernel from version
4.9.0-9-2 (4.9.168-1+deb9u3) to 4.9.0-11-2 (4.9.189-3+deb9u2)

This PR needs another PR in sonic-linux-kernel:
sonic-net/sonic-linux-kernel#116

@lguohan
Copy link
Collaborator

lguohan commented Dec 16, 2019

build failures, please check.

@qiluo-msft
Copy link
Collaborator

Did you make code change in https://github.com/Azure/sonic-linux-kernel/ first ?

@olivier-singla
Copy link
Contributor Author

olivier-singla commented Dec 17, 2019 •
edited
Loading

Yes, I made code change in both sonic-buildimage and sonic-linux-kernel, and I pushed sonc-linux-kernel first. Does that make a difference?
Other PR is here:
sonic-net/sonic-linux-kernel#116
The two need to be built togethe: without sonic-linux-kernel kernel upgrade, sonic-buildimage kernel upgrade build will fail.
How do you handle the case when two PRs have a dependency and need to be built together?

@olivier-singla olivier-singla mentioned this pull request Dec 17, 2019
Merged
@qiluo-msft
Copy link
Collaborator

Let's block this PR on sonic-net/sonic-linux-kernel#116.
That one will be merged first, and then you need to update the submodule pointer in this PR.

@lguohan
Copy link
Collaborator

lguohan commented Dec 27, 2019

sonic-net/sonic-linux-kernel#116 is merged. Can you proceed and resolve the conflict?

olivier-singla
olivier-singla commented Dec 27, 2019
View reviewed changes
Copy link
Contributor Author

@olivier-singla olivier-singla left a comment

Choose a reason for hiding this comment

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

Looks good

@lguohan
Copy link
Collaborator

lguohan commented Dec 28, 2019

there is still build error. @olivier-singla , can you check?

dpkg-source: error: cannot fstat file ./linux_4.9.168.orig.tar.xz: No such file or directory

@olivier-singla
Copy link
Contributor Author

there is still build error. @olivier-singla , can you check?

dpkg-source: error: cannot fstat file ./linux_4.9.168.orig.tar.xz: No such file or directory

This PR needs another PR in sonic-linux-kernel:
sonic-net/sonic-linux-kernel#116

I think this is because this issue is being seen.

So we need to apply these two PR simultaneously:
sonic-net/sonic-linux-kernel#116
#3913

@rajendra-dendukuri
Copy link
Contributor

rajendra-dendukuri commented Jan 2, 2020 •
edited
Loading

retest this please

1 similar comment
@rajendra-dendukuri
Copy link
Contributor

retest this please

@rajendra-dendukuri
Copy link
Contributor

retest vsimage please

@olivier-singla
Copy link
Contributor Author

retest this please

@olivier-singla
Copy link
Contributor Author

retest vsimage please

1 similar comment
@olivier-singla
Copy link
Contributor Author

retest vsimage please

@olivier-singla
Copy link
Contributor Author

Hi Qi, is there any anything pending preventing to merge this PR?

@qiluo-msft
Copy link
Collaborator

The current changes are huge because your code is based on old commit on master branch but not the latest master. Could you please rebase to master, or merge master to your branch?

Then you need to pass all the PR checks to be merged.

olivier-singla and others added 4 commits February 12, 2020 15:29
@olivier-singla @lguohan
Security kernel update to 4.9.189
a1338ad 
This patch upgrade the kernel from version
4.9.0-9-2 (4.9.168-1+deb9u3) to 4.9.0-11-2 (4.9.189-3+deb9u2)
@olivier-singla @lguohan
Fixed architecture hard-coded to amd64
cbc6e0f
@rajendra-dendukuri @lguohan
Update submodule reference for sonic-linux-kernel
9387d8c
@olivier-singla @lguohan
Security kernel update to 4.9.189
0354b99 
This patch upgrade the kernel from version
4.9.0-9-2 (4.9.168-1+deb9u3) to 4.9.0-11-2 (4.9.189-3+deb9u2)
@lguohan
Copy link
Collaborator

lguohan commented Feb 12, 2020

@olivier-singla , next time, can you do rebase instead of merge, it will be much easier to see what has changed.

@lguohan lguohan merged commit 6a0dcb1 into sonic-net:master Feb 13, 2020
stepanblyschak pushed a commit to stepanblyschak/sonic-buildimage that referenced this pull request Feb 26, 2020
@olivier-singla @rajendra-dendukuri
[kernel]: security kernel update to 4.9.189 (sonic-net#3913)
e0216fa 
This patch upgrade the kernel from version
4.9.0-9-2 (4.9.168-1+deb9u3) to 4.9.0-11-2 (4.9.189-3+deb9u2)

Co-authored-by: rajendra-dendukuri <47423477+rajendra-dendukuri@users.noreply.github.com>
@jleveque jleveque mentioned this pull request Feb 27, 2020
Merged
abdosi pushed a commit that referenced this pull request Mar 15, 2020
@olivier-singla @rajendra-dendukuri @abdosi
[kernel]: security kernel update to 4.9.189 (#3913)
a8baca0 
This patch upgrade the kernel from version
4.9.0-9-2 (4.9.168-1+deb9u3) to 4.9.0-11-2 (4.9.189-3+deb9u2)

Co-authored-by: rajendra-dendukuri <47423477+rajendra-dendukuri@users.noreply.github.com>
abdosi referenced this pull request Mar 16, 2020
@lguohan @abdosi
[Mellanox]Integrate hw-mgmt 7.0000.3012 and advance the linux kernel (#…
9eb3a1b 
…4193)

* [Mellanox]Integrate hw-mgmt 7.0000.3012

* [sonic-linux-kernel]Advance the submodule head

Advance the sonic-linux-kernel

[sFlow]: Patch to fix skb_over_panic in psample driver (#120)
Added support in the kernel for fullcone 3-tuple unique nat. (#100)
Adding support to compile ARM architecture (#102)
[ixgbe] Support bcm54616s external phy in ixgbe (#122)
Fix i2c ISMT DMA buffer alignment issue (#123)
[mellanox]: Add SN4700 patches. (#126)
tiantianlv pushed a commit to SONIC-DEV/sonic-buildimage that referenced this pull request Apr 24, 2020
@olivier-singla @rajendra-dendukuri @tiantianlv
[kernel]: security kernel update to 4.9.189 (sonic-net#3913)
c06ca14 
This patch upgrade the kernel from version
4.9.0-9-2 (4.9.168-1+deb9u3) to 4.9.0-11-2 (4.9.189-3+deb9u2)

Co-authored-by: rajendra-dendukuri <47423477+rajendra-dendukuri@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@qiluo-msft qiluo-msft qiluo-msft approved these changes

Assignees
No one assigned
Labels
Included in 201911 Branch Request for 201911 Branch :shipit: Security 🛡️
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@olivier-singla @lguohan @qiluo-msft @rajendra-dendukuri @jleveque @abdosi