[LinuxBIOS] Merge complete....

[Li-Ta Lo]

On Wed, 2005-06-22 at 11:42 -0600, Li-Ta Lo wrote:
> On Wed, 2005-06-22 at 03:50 -0600, Eric W. Biederman wrote: 
> > Since I want to avoid breaking things by acting too hastily I have
> > performed the merge and placed the code in the branch:
> >  linuxbios at linuxbios.org--devel/freebios--lnxi--1--patch-1
> > 
> > 
> > If no one has any real objections after looking at it I will merge with
> > the main branch.  Otherwise I will listen to the objections and see
> > where I go from there.
> > 
> 
> First pass of objections, I think these files are cvs/tla removed (by 
> you?) long time ago?
> 
> New-files:
>     src/mainboard/Iwill/DK8S2/debug.c
>     src/mainboard/Iwill/DK8S2/reset.c
>     src/mainboard/Iwill/DK8X/debug.c
>     src/mainboard/Iwill/DK8X/reset.c
>     src/mainboard/amd/quartet/debug.c
>     src/mainboard/amd/quartet/reset.c
>     src/mainboard/amd/serenade/reset.c
>     src/mainboard/amd/solo/debug.c
>     src/mainboard/amd/solo/reset.c
>     src/mainboard/arima/hdama/debug.c
>     src/mainboard/arima/hdama/reset.c
>     src/mainboard/ibm/e325/reset.c
>     src/mainboard/newisys/khepri/debug.c
>     src/mainboard/newisys/khepri/reset.c
>     src/mainboard/tyan/s2735/reset.c
>     src/mainboard/tyan/s2850/adaptec_scsi.c
>     src/mainboard/tyan/s2850/broadcom_nic.c
>     src/mainboard/tyan/s2850/debug.c
>     src/mainboard/tyan/s2850/hypertransport.c
>     src/mainboard/tyan/s2850/intel_nic.c
>     src/mainboard/tyan/s2850/promise_sata.c
>     src/mainboard/tyan/s2850/reset.c
>     src/mainboard/tyan/s2875/reset.c
>     src/mainboard/tyan/s2880/adaptec_scsi.c
>     src/mainboard/tyan/s2880/debug.c
>     src/mainboard/tyan/s2880/hypertransport.c
>     src/mainboard/tyan/s2880/intel_nic.c
>     src/mainboard/tyan/s2880/promise_sata.c
>     src/mainboard/tyan/s2880/reset.c
>     src/mainboard/tyan/s2880/tyan-fallback.config
>     src/mainboard/tyan/s2880/tyan-normal.config
>     src/mainboard/tyan/s2881/adaptec_scsi.c
>     src/mainboard/tyan/s2881/debug.c
>     src/mainboard/tyan/s2881/hypertransport.c
>     src/mainboard/tyan/s2881/intel_nic.c
>     src/mainboard/tyan/s2881/reset.c
>     src/mainboard/tyan/s2881/si_sata.c
>     src/mainboard/tyan/s2882/adaptec_scsi.c
>     src/mainboard/tyan/s2882/debug.c
>     src/mainboard/tyan/s2882/hypertransport.c
>     src/mainboard/tyan/s2882/intel_nic.c
>     src/mainboard/tyan/s2882/reset.c
>     src/mainboard/tyan/s2882/si_sata.c
>     src/mainboard/tyan/s2882/tyan-fallback.config
>     src/mainboard/tyan/s2882/tyan-normal.config
>     src/mainboard/tyan/s2885/adaptec_scsi.c
>     src/mainboard/tyan/s2885/broadcom_nic.c
>     src/mainboard/tyan/s2885/debug.c
>     src/mainboard/tyan/s2885/hypertransport.c
>     src/mainboard/tyan/s2885/intel_nic.c
>     src/mainboard/tyan/s2885/reset.c
>     src/mainboard/tyan/s2885/si_sata.c
>     src/mainboard/tyan/s2885/ti_firewire.c
>     src/mainboard/tyan/s2885/tyan-fallback.config
>     src/mainboard/tyan/s2885/tyan-normal.config
>     src/mainboard/tyan/s4880/adaptec_scsi.c
>     src/mainboard/tyan/s4880/debug.c
>     src/mainboard/tyan/s4880/hypertransport.c
>     src/mainboard/tyan/s4880/intel_nic.c
>     src/mainboard/tyan/s4880/reset.c
>     src/mainboard/tyan/s4880/si_sata.c
>     src/mainboard/tyan/s4882/reset.c

Are these files reversed patch too?

Modified-files:
    src/mainboard/Iwill/DK8S2/Config.lb
    src/mainboard/Iwill/DK8S2/Options.lb
    src/mainboard/Iwill/DK8S2/cmos.layout
    src/mainboard/Iwill/DK8S2/failover.c
    src/mainboard/Iwill/DK8S2/irq_tables.c
    src/mainboard/Iwill/DK8S2/mptable.c
    src/mainboard/Iwill/DK8X/Config.lb
    src/mainboard/Iwill/DK8X/Options.lb
    src/mainboard/amd/quartet/Config.lb
    src/mainboard/amd/quartet/Options.lb
    src/mainboard/amd/serenade/Config.lb
    src/mainboard/amd/serenade/Options.lb
    src/mainboard/amd/solo/Config.lb
    src/mainboard/amd/solo/Options.lb
    src/mainboard/arima/hdama/Config.lb
    src/mainboard/arima/hdama/Options.lb
    src/mainboard/arima/hdama/auto.c
    src/mainboard/arima/hdama/mptable.c
    src/mainboard/emulation/qemu-i386/Options.lb
    src/mainboard/ibm/e325/Config.lb
    src/mainboard/ibm/e325/Options.lb
    src/mainboard/newisys/khepri/Config.lb
    src/mainboard/newisys/khepri/Options.lb
    src/mainboard/tyan/s2735/Config.lb
    src/mainboard/tyan/s2735/Options.lb
    src/mainboard/tyan/s2850/Config.lb
    src/mainboard/tyan/s2850/Options.lb
    src/mainboard/tyan/s2875/Config.lb
    src/mainboard/tyan/s2875/Options.lb
    src/mainboard/tyan/s2880/Config.lb
    src/mainboard/tyan/s2880/Options.lb
    src/mainboard/tyan/s2881/Config.lb
    src/mainboard/tyan/s2881/Options.lb
    src/mainboard/tyan/s2882/Config.lb
    src/mainboard/tyan/s2882/Options.lb
    src/mainboard/tyan/s2882/auto.c
    src/mainboard/tyan/s2882/mptable.c
    src/mainboard/tyan/s2885/Config.lb
    src/mainboard/tyan/s2885/Options.lb
    src/mainboard/tyan/s2885/auto.c
    src/mainboard/tyan/s4880/Config.lb
    src/mainboard/tyan/s4880/Options.lb
    src/mainboard/tyan/s4882/Config.lb
    src/mainboard/tyan/s4882/Options.lb
    src/mainboard/tyan/s4882/auto.c
    src/mainboard/tyan/s4882/chip.h
    src/mainboard/tyan/s4882/failover.c
    src/mainboard/tyan/s4882/mainboard.c
-- 
Li-Ta Lo <ollie at lanl.gov>
Los Alamos National Lab