Commit 2dbf3d5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull AVR32 removal from Hans-Christian Noren Egtvedt:
 "This will remove support for AVR32 architecture from the kernel and
  clean away the most obvious architecture related parts. Removing dead
  code in drivers is the next step"

Notes from previous discussion about this:
 "The AVR32 architecture is not keeping up with the development of the
  kernel, and since it shares so much of the drivers with Atmel ARM SoC,
  it is starting to hinder these drivers to develop swiftly.

  Also, all AVR32 AP7 SoC processors are end of lifed from Atmel (now
  Microchip).

  Finally, the GCC toolchain is stuck at version 4.2.x, and has not
  received any patches since the last release from Atmel;
  4.2.4-atmel.1.1.3.avr32linux.1.

  When building kernel v4.10, this toolchain is no longer able to
  properly link the network stack.

  Haavard and I have came to the conclusion that we feel keeping AVR32
  on life support offers more obstacles for Atmel ARMs, than it gives
  joy to AVR32 users. I also suspect there are very few AVR32 users left
  today, if anybody at all"

That discussion was acked by Andy Shevchenko, Boris Brezillon, Nicolas
Ferre, and Haavard Skinnemoen.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  mm: remove AVR32 arch special handling in mm/Kconfig
  lib: remove check for AVR32 arch in test_user_copy
  lib: remove AVR32 entry in Kconfig.debug compile with frame pointers
  scripts: remove AVR32 support from checkstack.pl
  docs: remove all references to AVR32 architecture
  avr32: remove support for AVR32 architecture
parents a25fb850 01e7bc24

CREDITS

+8 −0
Original line number Diff line number Diff line
@@ -1034,6 +1034,10 @@ S: 2037 Walnut #6 
S: Boulder, Colorado 80302

S: USA



N: Hans-Christian Noren Egtvedt

E: egtvedt@samfundet.no

D: AVR32 architecture maintainer.



N: Heiko Eißfeldt

E: heiko@colossus.escape.de heiko@unifix.de

D: verify_area stuff, generic SCSI fixes
@@ -3398,6 +3402,10 @@ S: Suite 101 
S: Markham, Ontario L3R 2Z6

S: Canada



N: Haavard Skinnemoen

M: Haavard Skinnemoen <hskinnemoen@gmail.com>

D: AVR32 architecture port to Linux and maintainer.



N: Rick Sladkey

E: jrs@world.std.com

D: utility hacker: Emacs, NFS server, mount, kmem-ps, UPS debugger, strace, GDB

Documentation/admin-guide/README.rst

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ On what hardware does it run? 
  today Linux also runs on (at least) the Compaq Alpha AXP, Sun SPARC and

  UltraSPARC, Motorola 68000, PowerPC, PowerPC64, ARM, Hitachi SuperH, Cell,

  IBM S/390, MIPS, HP PA-RISC, Intel IA-64, DEC VAX, AMD x86-64, AXIS CRIS,

  Xtensa, Tilera TILE, AVR32, ARC and Renesas M32R architectures.

  Xtensa, Tilera TILE, ARC and Renesas M32R architectures.



  Linux is easily portable to most general-purpose 32- or 64-bit architectures

  as long as they have a paged memory management unit (PMMU) and a port of the

Documentation/admin-guide/kernel-parameters.rst

+0 −1
Original line number Diff line number Diff line
@@ -86,7 +86,6 @@ parameter is applicable:: 
	APIC	APIC support is enabled.

	APM	Advanced Power Management support is enabled.

	ARM	ARM architecture is enabled.

	AVR32	AVR32 architecture is enabled.

	AX25	Appropriate AX.25 support is enabled.

	BLACKFIN Blackfin architecture is enabled.

	CLK	Common clock infrastructure is enabled.

Documentation/admin-guide/kernel-parameters.txt

+1 −2
Original line number Diff line number Diff line
@@ -531,7 +531,6 @@ 
			[ACPI] acpi_pm

			[ARM] imx_timer1,OSTS,netx_timer,mpu_timer2,

				pxa_timer,timer3,32k_counter,timer0_1

			[AVR32] avr32

			[X86-32] pit,hpet,tsc;

				scx200_hrt on Geode; cyclone on IBM x440

			[MIPS] MIPS
@@ -2425,7 +2424,7 @@ 
			osd-targets. Please see:

			Documentation/filesystems/pnfs.txt for more explanations



	nmi_debug=	[KNL,AVR32,SH] Specify one or more actions to take

	nmi_debug=	[KNL,SH] Specify one or more actions to take

			when a NMI is triggered.

			Format: [state][,regs][,debounce][,die]

Documentation/features/core/BPF-JIT/arch-support.txt

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
    |         arc: | TODO |

    |         arm: |  ok  |

    |       arm64: |  ok  |

    |       avr32: | TODO |

    |    blackfin: | TODO |

    |         c6x: | TODO |

    |        cris: | TODO |

CRA Git | Maintained and supported by SUSTech CRA and CCSE