[LinuxPPS] 1 Aug 13:29 - Merge with linux-vanilla at v2.6.27-rc1.

[Rodolfo Giometti]

On Fri, Aug 01, 2008 at 04:06:28PM +0200, Udo van den Heuvel wrote:
> linuxpps: Rodolfo Giometti <> wrote:
> > Merge with linux-vanilla at v2.6.27-rc1.  
> >   
> > Conflicts:  
> >   
> > arch/x86/kernel/irq_32.c  
> > include/linux/tty.h  
> > include/linux/tty_ldisc.h  
> (cut)
> 
> These are the locations where changes were needed? (when compared to the
> 2.6.26 version?)

Just use the "interdiff" command. However the 2.6.26 and 2.6.27-rc1
versions are incompatible due ldisc changes.

Ciao,

Rodolfo

-- 

GNU/Linux Solutions                  e-mail: giometti at enneenne.com
Linux Device Driver                          giometti at linux.it
Embedded Systems                     phone:  +39 349 2432127
UNIX programming                     skype:  rodolfo.giometti