Merge remote-tracking branch 'sparc/master' into work.sparc32

Browse source

... and resolve a non-textual conflict in arch/sparc/lib/memset.S -
EXT(...) stuff shouldn't be reintroduced on merge.

...

This commit is contained in:

Al Viro 2021-01-03 20:05:34 -05:00

parent b4edf06c8a 0a95a6d1a4

commit 73686e787b

7 changed files with 19 additions and 18 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

2

arch/sparc/Kconfig

View file

4

arch/sparc/boot/piggyback.c

View file

2

arch/sparc/include/asm/backoff.h

View file

2

arch/sparc/include/asm/pgtsrmmu.h

View file

3

arch/sparc/kernel/pci.c

View file

6

arch/sparc/kernel/viohs.c

View file

18

arch/sparc/mm/srmmu.c

View file