Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Browse source

Pull m68knommu fixes from Greg Ungerer:
 "There are two fixes here. One to add a missing linker section to the
  m68k architecture linker scripts, the other to fix a defconfig build
  problem"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k/defconfig: fix stmark2 broken local compilation
  m68k: add missing SOFTIRQENTRY_TEXT linker section

...

This commit is contained in:

Linus Torvalds 2017-12-06 18:16:20 -08:00

parent dd53a4214d 65323ee1ab

commit 10f837e52b

4 changed files with 6 additions and 1 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

arch/m68k/configs/stmark2_defconfig

View file

2

arch/m68k/kernel/vmlinux-nommu.lds

View file

2

arch/m68k/kernel/vmlinux-std.lds

View file

2

arch/m68k/kernel/vmlinux-sun3.lds

View file