Skip to contentSkip to conversation

parisc architecture fixes for kernel v5.15-rc1

GIT PULL Merged Helge Deller 3 participants 4 messages Sep 10, 2021 – Sep 11, 2021

lore
Share & tools
lore
#0 lore raw

Hi Linus,

please pull some more parisc architecture fixes for kernel 5.15-rc1 from:

http://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git tags/for-5.15/parisc-3

Fixes:
* Build warning fixes in Makefile and Dino PCI driver
* Fix when sched_clock is marked unstable
* Drop strnlen_user() in favour of generic version
* Prevent kernel to write outside userspace signal stack
* Remove CONFIG_SET_FS incl. KERNEL_DS and USER_DS from parisc and switch to __get/put_kernel_nofault()

Thanks,
Helge

------------
The following changes since commit a3fa7a101dcff93791d1b1bdb3affcad1410c8c1:

Merge branches 'akpm' and 'akpm-hotfixes' (patches from Andrew) (2021-09-08 18:52:05 -0700)

are available in the Git repository at:

http://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-5.15-3

for you to fetch changes up to 671028728083e856e9919221b109e3b2cd2ccc49:

parisc: Implement __get/put_kernel_nofault() (2021-09-09 22:53:09 +0200)

----------------------------------------------------------------
Guenter Roeck (1):
parisc: Move pci_dev_is_behind_card_dino to where it is used

Helge Deller (7):
parisc: Add missing FORCE prerequisite in Makefile
parisc: Drop strnlen_user() in favour of generic version
parisc: Drop useless debug info and comments from signal.c
parisc: Check user signal stack trampoline is inside TASK_SIZE
parisc: Reduce sigreturn trampoline to 3 instructions
parisc: Mark sched_clock unstable only if clocks are not syncronized
parisc: Implement __get/put_kernel_nofault()

 arch/parisc/Kconfig                   |   2 -
 arch/parisc/boot/compressed/Makefile  |  18 ++---
 arch/parisc/include/asm/processor.h   |   4 --
 arch/parisc/include/asm/rt_sigframe.h |   2 +-
 arch/parisc/include/asm/thread_info.h |   2 -
 arch/parisc/include/asm/uaccess.h     | 125 +++++++++++++++++-----------------
 arch/parisc/kernel/asm-offsets.c      |   1 -
 arch/parisc/kernel/parisc_ksyms.c     |   1 -
 arch/parisc/kernel/setup.c            |   2 -
 arch/parisc/kernel/signal.c           |  45 +++++-------
 arch/parisc/kernel/signal32.h         |   2 +-
 arch/parisc/kernel/time.c             |   7 +-
 arch/parisc/lib/lusercopy.S           |  52 +-------------
 drivers/parisc/dino.c                 |  18 ++---
 14 files changed, 102 insertions(+), 179 deletions(-)
#1 lore raw
Quoted 4 lines · Helge Deller

please pull some more parisc architecture fixes for kernel 5.15-rc1 from:

http://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git tags/for-5.15/parisc-3

Well that doesn't work at all.

The *branch* name that you have a few lines lower down in the actual pull request part ('parisc-5.15-3') does work, but I didn't get the tag. I suspect you used the branch name because you couldn't get the wrong tag name to work, and didn't look at why it didn't work.

Because looking closer using 'git ls-remote', it's because your tag name was bogus. You actually named it 'for-5.13/parisc-3'.

I fixed it up and edited the wrong name after-the-fact, but please be more careful.

Quoted 2 lines

* Remove CONFIG_SET_FS incl. KERNEL_DS and USER_DS from parisc and switch to __get/put_kernel_nofault()

Lovely. Several architectures to go (alpha, arc, csky, h8300, hexagon, ia64, m68k, microblaze, nds32, nios2, openrisc, sh, sparc, um, and xtensa) but it's slowly shrinking..

Linus

#2 lore raw
Quoted 13 lines · Linus Torvalds
Quoted 4 lines · Helge Deller

please pull some more parisc architecture fixes for kernel 5.15-rc1 from:

http://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git tags/for-5.15/parisc-3

Well that doesn't work at all.

The *branch* name that you have a few lines lower down in the actual pull request part ('parisc-5.15-3') does work, but I didn't get the tag. I suspect you used the branch name because you couldn't get the wrong tag name to work, and didn't look at why it didn't work.

Quoted 5 lines

Because looking closer using 'git ls-remote', it's because your tag name was bogus. You actually named it 'for-5.13/parisc-3'.

I fixed it up and edited the wrong name after-the-fact, but please be more careful.

Linus, thanks for fixing it up!
It was actually a copy'n'paste mistake on my side. I used an old git-tag line from my bash history and missed that it was named "for-5.13" instead of "for-5.15".
Sorry for that.

Quoted 6 lines
Quoted 2 lines

* Remove CONFIG_SET_FS incl. KERNEL_DS and USER_DS from parisc and switch to __get/put_kernel_nofault()

Lovely. Several architectures to go (alpha, arc, csky, h8300, hexagon, ia64, m68k, microblaze, nds32, nios2, openrisc, sh, sparc, um, and xtensa) but it's slowly shrinking..

That's still quite many... :-)

Helge

merge bot Merged
#3 lore raw
In reply to Helge Deller
The pull request you sent on Fri, 10 Sep 2021 11:17:20 +0200:

The pull request you sent on Fri, 10 Sep 2021 11:17:20 +0200:

Quoted 1 line

http://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git tags/for-5.15/parisc-3

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/23ef827c1bacc6c2b8314ff5bf571d4db57059b0

Thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html