Conflicts:
	Makefile.in
	aclocal.m4
	auxdir/Makefile.in
	configure
	contribs/Makefile.in
	contribs/arrayrun/Makefile.in
	contribs/cray/Makefile.in
	contribs/lua/Makefile.in
	contribs/pam/Makefile.in
	contribs/perlapi/Makefile.in
	contribs/perlapi/libslurm/Makefile.in
	contribs/perlapi/libslurmdb/Makefile.in
	contribs/phpext/Makefile.in
	contribs/sjobexit/Makefile.in
	contribs/slurmdb-direct/Makefile.in
	contribs/torque/Makefile.in
	doc/Makefile.in
	doc/html/Makefile.in
	doc/man/Makefile.in
	doc/man/man1/Makefile.in
	doc/man/man3/Makefile.in
	doc/man/man5/Makefile.in
	doc/man/man8/Makefile.in
	src/Makefile.in
	src/api/Makefile.in
	src/common/Makefile.in
	src/common/switch.c
	src/database/Makefile.in
	src/db_api/Makefile.in
	src/plugins/Makefile.in
	src/plugins/accounting_storage/Makefile.in
	src/plugins/accounting_storage/common/Makefile.in
	src/plugins/accounting_storage/filetxt/Makefile.in
	src/plugins/accounting_storage/mysql/Makefile.in
	src/plugins/accounting_storage/none/Makefile.in
	src/plugins/accounting_storage/pgsql/Makefile.in
	src/plugins/accounting_storage/slurmdbd/Makefile.in
	src/plugins/auth/Makefile.in
	src/plugins/auth/authd/Makefile.in
	src/plugins/auth/munge/Makefile.in
	src/plugins/auth/none/Makefile.in
	src/plugins/checkpoint/Makefile.in
	src/plugins/checkpoint/aix/Makefile.in
	src/plugins/checkpoint/blcr/Makefile.in
	src/plugins/checkpoint/none/Makefile.in
	src/plugins/checkpoint/ompi/Makefile.in
	src/plugins/crypto/Makefile.in
	src/plugins/crypto/munge/Makefile.in
	src/plugins/crypto/openssl/Makefile.in
	src/plugins/gres/Makefile.in
	src/plugins/gres/gpu/Makefile.in
	src/plugins/gres/nic/Makefile.in
	src/plugins/job_submit/Makefile.in
	src/plugins/job_submit/cnode/Makefile.in
	src/plugins/job_submit/defaults/Makefile.in
	src/plugins/job_submit/logging/Makefile.in
	src/plugins/job_submit/lua/Makefile.in
	src/plugins/job_submit/partition/Makefile.in
	src/plugins/jobacct_gather/Makefile.in
	src/plugins/jobacct_gather/aix/Makefile.in
	src/plugins/jobacct_gather/linux/Makefile.in
	src/plugins/jobacct_gather/none/Makefile.in
	src/plugins/jobcomp/Makefile.in
	src/plugins/jobcomp/filetxt/Makefile.in
	src/plugins/jobcomp/mysql/Makefile.in
	src/plugins/jobcomp/none/Makefile.in
	src/plugins/jobcomp/pgsql/Makefile.in
	src/plugins/jobcomp/script/Makefile.in
	src/plugins/launch/poe/Makefile.in
	src/plugins/launch/runjob/Makefile.in
	src/plugins/launch/slurm/Makefile.in
	src/plugins/mpi/Makefile.in
	src/plugins/mpi/lam/Makefile.in
	src/plugins/mpi/mpich1_p4/Makefile.in
	src/plugins/mpi/mpich1_shmem/Makefile.in
	src/plugins/mpi/mpichgm/Makefile.in
	src/plugins/mpi/mpichmx/Makefile.in
	src/plugins/mpi/mvapich/Makefile.in
	src/plugins/mpi/none/Makefile.in
	src/plugins/mpi/openmpi/Makefile.in
	src/plugins/preempt/Makefile.in
	src/plugins/preempt/none/Makefile.in
	src/plugins/preempt/partition_prio/Makefile.in
	src/plugins/preempt/qos/Makefile.in
	src/plugins/priority/Makefile.in
	src/plugins/priority/basic/Makefile.in
	src/plugins/priority/multifactor/Makefile.in
	src/plugins/proctrack/Makefile.in
	src/plugins/proctrack/aix/Makefile.in
	src/plugins/proctrack/cgroup/Makefile.in
	src/plugins/proctrack/linuxproc/Makefile.in
	src/plugins/proctrack/lua/Makefile.in
	src/plugins/proctrack/pgid/Makefile.in
	src/plugins/proctrack/sgi_job/Makefile.in
	src/plugins/sched/Makefile.in
	src/plugins/sched/backfill/Makefile.in
	src/plugins/sched/builtin/Makefile.in
	src/plugins/sched/hold/Makefile.in
	src/plugins/sched/wiki/Makefile.in
	src/plugins/sched/wiki2/Makefile.in
	src/plugins/select/Makefile.in
	src/plugins/select/bluegene/Makefile.in
	src/plugins/select/bluegene/ba/Makefile.in
	src/plugins/select/bluegene/ba_bgq/Makefile.in
	src/plugins/select/bluegene/bl/Makefile.in
	src/plugins/select/bluegene/bl_bgq/Makefile.in
	src/plugins/select/bluegene/sfree/Makefile.in
	src/plugins/select/cons_res/Makefile.in
	src/plugins/select/cray/Makefile.in
	src/plugins/select/cray/libalps/Makefile.in
	src/plugins/select/cray/libemulate/Makefile.in
	src/plugins/select/linear/Makefile.in
	src/plugins/switch/Makefile.in
	src/plugins/switch/federation/Makefile.am
	src/plugins/switch/none/Makefile.in
	src/plugins/task/Makefile.in
	src/plugins/task/affinity/Makefile.in
	src/plugins/task/cgroup/Makefile.in
	src/plugins/task/none/Makefile.in
	src/plugins/topology/3d_torus/Makefile.in
	src/plugins/topology/Makefile.in
	src/plugins/topology/node_rank/Makefile.in
	src/plugins/topology/none/Makefile.in
	src/plugins/topology/tree/Makefile.in
	src/sacct/Makefile.in
	src/sacctmgr/Makefile.in
	src/salloc/Makefile.in
	src/sattach/Makefile.in
	src/sbatch/Makefile.in
	src/sbcast/Makefile.in
	src/scancel/Makefile.in
	src/scontrol/Makefile.in
	src/sinfo/Makefile.in
	src/slurmctld/Makefile.in
	src/slurmd/Makefile.in
	src/slurmd/common/Makefile.in
	src/slurmd/slurmd/Makefile.in
	src/slurmd/slurmstepd/Makefile.in
	src/slurmdbd/Makefile.in
	src/smap/Makefile.in
	src/sprio/Makefile.in
	src/squeue/Makefile.in
	src/sreport/Makefile.in
	src/srun/Makefile.in
	src/srun/opt.c
	src/srun/srun.c
	src/srun_cr/Makefile.in
	src/sshare/Makefile.in
	src/sstat/Makefile.in
	src/strigger/Makefile.in
	src/sview/Makefile.in
	testsuite/Makefile.in
	testsuite/expect/Makefile.am
	testsuite/expect/Makefile.in
	testsuite/expect/README
	testsuite/expect/test1.94
	testsuite/slurm_unit/Makefile.in
	testsuite/slurm_unit/api/Makefile.in
	testsuite/slurm_unit/api/manual/Makefile.in
	testsuite/slurm_unit/common/Makefile.am
	testsuite/slurm_unit/common/Makefile.in

If using the sched/builtin plugin for FIFO scheduling, then do not
create an intermediate job queue to be sorted, but iterate directly
over the job list.

plugin specific

Conflicts:
	src/common/slurm_accounting_storage.c
	src/common/slurm_auth.c
	src/common/slurm_jobacct_gather.c
	src/common/slurm_priority.c
	src/common/slurm_topology.c
	src/slurmctld/sched_plugin.c

This is a backport of plugin initialization logic made in the
select/serial branch that we want to have in SLURM v2.4 and not
only in v2.5. Note the plugin logic in v2.5 is different and
this changes to not apply