Modify

Opened 6 years ago

Closed 6 years ago

Last modified 4 years ago

#10843 closed defect (worksforme)

initial 3.2 for ar71xx fails to apply on r29871

Reported by: ddxx0n Owned by: developers
Priority: low Milestone: Barrier Breaker 14.07
Component: kernel Version: Trunk
Keywords: Cc:

Description

I had a try at the initial 3.2 support (great effort, by the way, thanks!) for my wndr3700v1, but it fails to apply to both 3.2.0 and 3.2.1 with the same error. Is it just me?

Applying patch platform/014-SERIAL-AR933X-Add-driver-for-the-built-in-UART-of-th.patch
patching file arch/mips/include/asm/mach-ath79/ar933x_uart_platform.h
patching file drivers/tty/serial/Kconfig
patching file drivers/tty/serial/Makefile
The next patch would create the file drivers/tty/serial/ar933x_uart.c,
which already exists!  Applying it anyway.
patching file drivers/tty/serial/ar933x_uart.c
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED -- rejects in file drivers/tty/serial/ar933x_uart.c
patching file include/linux/serial_core.h
Patch platform/014-SERIAL-AR933X-Add-driver-for-the-built-in-UART-of-th.patch does not apply (enforce with -f)
make[4]: *** [/build/openwrt/trunk/build_dir/linux-ar71xx_generic/linux-3.2.1/.quilt_checked] Error 1

Attachments (0)

Change History (3)

comment:1 Changed 6 years ago by ddxx0n

You can close this, it was a conflict between the unreleased 3.1 patches and the official 3.2 support

comment:2 Changed 6 years ago by juhosg

  • Resolution set to worksforme
  • Status changed from new to closed

comment:3 Changed 4 years ago by jow

  • Milestone changed from Attitude Adjustment 12.09 to Barrier Breaker 14.07

Milestone Attitude Adjustment 12.09 deleted

Add Comment

Modify Ticket

Action
as closed .
The resolution will be deleted. Next status will be 'reopened'.
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.