Skip to content

Conversation

@imaami
Copy link

@imaami imaami commented Feb 1, 2020

Repeatedly rebasing the -ck patches on top of new kernel releases has
lead to an accumulation of files that were deleted upstream. A brief
glance revealed resurrected files left over from deletions in v4.17,
v4.18, and v5.4.

This fixes the accidental partial reversion of the following commits:

c116954 ("char: remove the SGI snsc driver")
be65f9e ("staging: lustre: delete the filesystem from the tree.")
92c8c16 ("powerpc/embedded6xx: Remove C2K board support")
bb9d812 ("arch: remove tile port")
4ba66a9 ("arch: remove blackfin port")
b8c9c8f ("arch: remove score port")

Fixes: 36d5e8d ("Make preemptible kernel default.")
Fixes: 688c8d0 ("Replace all schedule timeout(1) with schedule_min_hrtimeout()")
Signed-off-by: Juuso Alasuutari juuso.alasuutari@gmail.com

Repeatedly rebasing the -ck patches on top of new kernel releases has
lead to an accumulation of files that were deleted upstream. A brief
glance revealed resurrected files left over from deletions in v4.17,
v4.18, and v5.4.

This fixes the accidental partial reversion of the following commits:

  c116954 ("char: remove the SGI snsc driver")
  be65f9e ("staging: lustre: delete the filesystem from the tree.")
  92c8c16 ("powerpc/embedded6xx: Remove C2K board support")
  bb9d812 ("arch: remove tile port")
  4ba66a9 ("arch: remove blackfin port")
  b8c9c8f ("arch: remove score port")

Fixes: 36d5e8d ("Make preemptible kernel default.")
Fixes: 688c8d0 ("Replace all schedule timeout(1) with schedule_min_hrtimeout()")
Signed-off-by: Juuso Alasuutari <juuso.alasuutari@gmail.com>
@imaami
Copy link
Author

imaami commented Feb 1, 2020

OK, here's my new attempt. Ended up only fixing the commit message (and rewriting my fix branch).

@ckolivas
Copy link
Owner

ckolivas commented Feb 3, 2020

This messes with the way the split out patches are created. Since it fixes two different patches it should be two different patches itself and then I would roll them into those patches.

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.

2 participants