diff --git a/config-generic b/config-generic index c286c540d..e4dab09c1 100644 --- a/config-generic +++ b/config-generic @@ -453,6 +453,7 @@ CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_SRP=m CONFIG_SCSI_SRP_ATTRS=m CONFIG_SCSI_TGT=m +CONFIG_SCSI_ISCI=m CONFIG_SCSI_DH=y CONFIG_SCSI_DH_RDAC=m @@ -1471,12 +1472,12 @@ CONFIG_ATMEL=m CONFIG_B43=m CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y -CONFIG_B43_DEBUG=y +# CONFIG_B43_DEBUG is not set CONFIG_B43_PHY_LP=y CONFIG_B43_PHY_N=y # CONFIG_B43_FORCE_PIO is not set CONFIG_B43LEGACY=m -CONFIG_B43LEGACY_DEBUG=y +# CONFIG_B43LEGACY_DEBUG is not set CONFIG_B43LEGACY_DMA=y CONFIG_B43LEGACY_PIO=y CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y @@ -4011,7 +4012,7 @@ CONFIG_IBMASR=m CONFIG_PM_DEBUG=y CONFIG_PM_TRACE=y # CONFIG_PM_VERBOSE is not set -CONFIG_PM_TEST_SUSPEND=y +# CONFIG_PM_TEST_SUSPEND is not set CONFIG_PM_RUNTIME=y ## BEGIN ISA Junk. @@ -4476,7 +4477,7 @@ CONFIG_USB_ATMEL=m # CONFIG_RCU_CPU_STALL_DETECTOR is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_FUNCTION_GRAPH_TRACER is not set -CONFIG_BOOT_TRACER=y +# CONFIG_BOOT_TRACER is not set CONFIG_EARLY_PRINTK_DBGP=y CONFIG_SECURITYFS=y diff --git a/config-nodebug b/config-nodebug index 5730cd1b2..62650aa3a 100644 --- a/config-nodebug +++ b/config-nodebug @@ -2,99 +2,99 @@ CONFIG_SND_VERBOSE_PRINTK=y CONFIG_SND_DEBUG=y CONFIG_SND_PCM_XRUN_DEBUG=y -CONFIG_DEBUG_MUTEXES=y -CONFIG_DEBUG_RT_MUTEXES=y -CONFIG_DEBUG_LOCK_ALLOC=y -CONFIG_PROVE_LOCKING=y -CONFIG_DEBUG_VM=y -CONFIG_DEBUG_SPINLOCK=y -CONFIG_PROVE_RCU=y +# CONFIG_DEBUG_MUTEXES is not set +# CONFIG_DEBUG_RT_MUTEXES is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +# CONFIG_PROVE_LOCKING is not set +# CONFIG_DEBUG_VM is not set +# CONFIG_DEBUG_SPINLOCK is not set +# CONFIG_PROVE_RCU is not set # CONFIG_PROVE_RCU_REPEATEDLY is not set -CONFIG_DEBUG_PER_CPU_MAPS=y +# CONFIG_DEBUG_PER_CPU_MAPS is not set CONFIG_CPUMASK_OFFSTACK=y -CONFIG_CPU_NOTIFIER_ERROR_INJECT=m +# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set -CONFIG_FAULT_INJECTION=y -CONFIG_FAILSLAB=y -CONFIG_FAIL_PAGE_ALLOC=y -CONFIG_FAIL_MAKE_REQUEST=y -CONFIG_FAULT_INJECTION_DEBUG_FS=y -CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y -CONFIG_FAIL_IO_TIMEOUT=y +# CONFIG_FAULT_INJECTION is not set +# CONFIG_FAILSLAB is not set +# CONFIG_FAIL_PAGE_ALLOC is not set +# CONFIG_FAIL_MAKE_REQUEST is not set +# CONFIG_FAULT_INJECTION_DEBUG_FS is not set +# CONFIG_FAULT_INJECTION_STACKTRACE_FILTER is not set +# CONFIG_FAIL_IO_TIMEOUT is not set -CONFIG_SLUB_DEBUG_ON=y +# CONFIG_SLUB_DEBUG_ON is not set -CONFIG_LOCK_STAT=y +# CONFIG_LOCK_STAT is not set -CONFIG_DEBUG_STACK_USAGE=y +# CONFIG_DEBUG_STACK_USAGE is not set -CONFIG_ACPI_DEBUG=y +# CONFIG_ACPI_DEBUG is not set # CONFIG_ACPI_DEBUG_FUNC_TRACE is not set -CONFIG_DEBUG_SG=y +# CONFIG_DEBUG_SG is not set # CONFIG_DEBUG_PAGEALLOC is not set -CONFIG_DEBUG_WRITECOUNT=y -CONFIG_DEBUG_OBJECTS=y +# CONFIG_DEBUG_WRITECOUNT is not set +# CONFIG_DEBUG_OBJECTS is not set # CONFIG_DEBUG_OBJECTS_SELFTEST is not set -CONFIG_DEBUG_OBJECTS_FREE=y -CONFIG_DEBUG_OBJECTS_TIMERS=y -CONFIG_DEBUG_OBJECTS_RCU_HEAD=y +# CONFIG_DEBUG_OBJECTS_FREE is not set +# CONFIG_DEBUG_OBJECTS_TIMERS is not set +# CONFIG_DEBUG_OBJECTS_RCU_HEAD is not set CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 -CONFIG_X86_PTDUMP=y +# CONFIG_X86_PTDUMP is not set -CONFIG_CAN_DEBUG_DEVICES=y +# CONFIG_CAN_DEBUG_DEVICES is not set -CONFIG_MODULE_FORCE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set -CONFIG_SYSCTL_SYSCALL_CHECK=y +# CONFIG_SYSCTL_SYSCALL_CHECK is not set -CONFIG_DEBUG_NOTIFIERS=y +# CONFIG_DEBUG_NOTIFIERS is not set -CONFIG_DMA_API_DEBUG=y +# CONFIG_DMA_API_DEBUG is not set -CONFIG_MMIOTRACE=y +# CONFIG_MMIOTRACE is not set -CONFIG_DEBUG_CREDENTIALS=y +# CONFIG_DEBUG_CREDENTIALS is not set # off in both production debug and nodebug builds, # on in rawhide nodebug builds -CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set -CONFIG_EXT4_DEBUG=y +# CONFIG_EXT4_DEBUG is not set -CONFIG_DEBUG_PERF_USE_VMALLOC=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set -CONFIG_JBD2_DEBUG=y +# CONFIG_JBD2_DEBUG is not set -CONFIG_DEBUG_CFQ_IOSCHED=y +# CONFIG_DEBUG_CFQ_IOSCHED is not set -CONFIG_DRBD_FAULT_INJECTION=y +# CONFIG_DRBD_FAULT_INJECTION is not set -CONFIG_ATH_DEBUG=y -CONFIG_CARL9170_DEBUGFS=y -CONFIG_IWLWIFI_DEVICE_TRACING=y +# CONFIG_ATH_DEBUG is not set +# CONFIG_CARL9170_DEBUGFS is not set +# CONFIG_IWLWIFI_DEVICE_TRACING is not set -CONFIG_DEBUG_OBJECTS_WORK=y +# CONFIG_DEBUG_OBJECTS_WORK is not set # CONFIG_DEBUG_STRICT_USER_COPY_CHECKS is not set -CONFIG_DMADEVICES_DEBUG=y -CONFIG_DMADEVICES_VDEBUG=y +# CONFIG_DMADEVICES_DEBUG is not set +# CONFIG_DMADEVICES_VDEBUG is not set CONFIG_PM_ADVANCED_DEBUG=y -CONFIG_CEPH_LIB_PRETTYDEBUG=y -CONFIG_QUOTA_DEBUG=y +# CONFIG_CEPH_LIB_PRETTYDEBUG is not set +# CONFIG_QUOTA_DEBUG is not set CONFIG_PCI_DEFAULT_USE_CRS=y CONFIG_KGDB_KDB=y CONFIG_KDB_KEYBOARD=y -CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y -CONFIG_TEST_LIST_SORT=y +# CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER is not set +# CONFIG_TEST_LIST_SORT is not set -CONFIG_DEBUG_SET_MODULE_RONX=y +# CONFIG_DEBUG_SET_MODULE_RONX is not set diff --git a/config-x86_64-generic b/config-x86_64-generic index fe187a1bc..d4a9a5f4e 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -16,7 +16,7 @@ CONFIG_K8_NUMA=y CONFIG_AMD_NUMA=y CONFIG_X86_64_ACPI_NUMA=y # CONFIG_NUMA_EMU is not set -CONFIG_NR_CPUS=512 +CONFIG_NR_CPUS=256 CONFIG_X86_POWERNOW_K8=m CONFIG_X86_P4_CLOCKMOD=m CONFIG_IA32_EMULATION=y diff --git a/fix-scsi_dispatch_cmd.patch b/fix-scsi_dispatch_cmd.patch new file mode 100644 index 000000000..3976791ca --- /dev/null +++ b/fix-scsi_dispatch_cmd.patch @@ -0,0 +1,68 @@ +commit bfe159a51203c15d23cb3158fffdc25ec4b4dda1 +Author: James Bottomley +Date: Thu Jul 7 15:45:40 2011 -0500 + + [SCSI] fix crash in scsi_dispatch_cmd() + + USB surprise removal of sr is triggering an oops in + scsi_dispatch_command(). What seems to be happening is that USB is + hanging on to a queue reference until the last close of the upper + device, so the crash is caused by surprise remove of a mounted CD + followed by attempted unmount. + + The problem is that USB doesn't issue its final commands as part of + the SCSI teardown path, but on last close when the block queue is long + gone. The long term fix is probably to make sr do the teardown in the + same way as sd (so remove all the lower bits on ejection, but keep the + upper disk alive until last close of user space). However, the + current oops can be simply fixed by not allowing any commands to be + sent to a dead queue. + + Cc: stable@kernel.org + Signed-off-by: James Bottomley + +diff --git a/block/blk-core.c b/block/blk-core.c +index d2f8f40..1d49e1c 100644 +--- a/block/blk-core.c ++++ b/block/blk-core.c +@@ -839,6 +839,9 @@ struct request *blk_get_request(struct request_queue *q, int rw, gfp_t gfp_mask) + { + struct request *rq; + ++ if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags))) ++ return NULL; ++ + BUG_ON(rw != READ && rw != WRITE); + + spin_lock_irq(q->queue_lock); +diff --git a/block/blk-exec.c b/block/blk-exec.c +index 8a0e7ec..a1ebceb 100644 +--- a/block/blk-exec.c ++++ b/block/blk-exec.c +@@ -50,6 +50,13 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk, + { + int where = at_head ? ELEVATOR_INSERT_FRONT : ELEVATOR_INSERT_BACK; + ++ if (unlikely(test_bit(QUEUE_FLAG_DEAD, &q->queue_flags))) { ++ rq->errors = -ENXIO; ++ if (rq->end_io) ++ rq->end_io(rq, rq->errors); ++ return; ++ } ++ + rq->rq_disk = bd_disk; + rq->end_io = done; + WARN_ON(irqs_disabled()); +diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c +index ec1803a..28d9c9d 100644 +--- a/drivers/scsi/scsi_lib.c ++++ b/drivers/scsi/scsi_lib.c +@@ -213,6 +213,8 @@ int scsi_execute(struct scsi_device *sdev, const unsigned char *cmd, + int ret = DRIVER_ERROR << 24; + + req = blk_get_request(sdev->request_queue, write, __GFP_WAIT); ++ if (!req) ++ return ret; + + if (bufflen && blk_rq_map_kern(sdev->request_queue, req, + buffer, bufflen, __GFP_WAIT)) diff --git a/iwlagn-fix-dma-direction.patch b/iwlagn-fix-dma-direction.patch deleted file mode 100644 index 741276bf5..000000000 --- a/iwlagn-fix-dma-direction.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c -index 686e176..11da90a 100644 ---- a/drivers/net/wireless/iwlwifi/iwl-tx.c -+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c -@@ -126,7 +126,7 @@ static inline u8 iwl_tfd_get_num_tbs(struct iwl_tfd *tfd) - } - - static void iwlagn_unmap_tfd(struct iwl_priv *priv, struct iwl_cmd_meta *meta, -- struct iwl_tfd *tfd) -+ struct iwl_tfd *tfd, enum dma_data_direction dma_dir) - { - struct pci_dev *dev = priv->pci_dev; - int i; -@@ -151,7 +151,7 @@ static void iwlagn_unmap_tfd(struct iwl_priv *priv, struct iwl_cmd_meta *meta, - /* Unmap chunks, if any. */ - for (i = 1; i < num_tbs; i++) - pci_unmap_single(dev, iwl_tfd_tb_get_addr(tfd, i), -- iwl_tfd_tb_get_len(tfd, i), PCI_DMA_TODEVICE); -+ iwl_tfd_tb_get_len(tfd, i), dma_dir); - } - - /** -@@ -167,7 +167,8 @@ void iwlagn_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq) - struct iwl_tfd *tfd_tmp = txq->tfds; - int index = txq->q.read_ptr; - -- iwlagn_unmap_tfd(priv, &txq->meta[index], &tfd_tmp[index]); -+ iwlagn_unmap_tfd(priv, &txq->meta[index], &tfd_tmp[index], -+ PCI_DMA_TODEVICE); - - /* free SKB */ - if (txq->txb) { -@@ -700,10 +701,11 @@ int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd) - if (!(cmd->dataflags[i] & IWL_HCMD_DFL_NOCOPY)) - continue; - phys_addr = pci_map_single(priv->pci_dev, (void *)cmd->data[i], -- cmd->len[i], PCI_DMA_TODEVICE); -+ cmd->len[i], PCI_DMA_BIDIRECTIONAL); - if (pci_dma_mapping_error(priv->pci_dev, phys_addr)) { - iwlagn_unmap_tfd(priv, out_meta, -- &txq->tfds[q->write_ptr]); -+ &txq->tfds[q->write_ptr], -+ PCI_DMA_BIDIRECTIONAL); - idx = -ENOMEM; - goto out; - } -@@ -807,7 +809,7 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) - cmd = txq->cmd[cmd_index]; - meta = &txq->meta[cmd_index]; - -- iwlagn_unmap_tfd(priv, meta, &txq->tfds[index]); -+ iwlagn_unmap_tfd(priv, meta, &txq->tfds[index], PCI_DMA_BIDIRECTIONAL); - - /* Input error checking is done when commands are added to queue. */ - if (meta->flags & CMD_WANT_SKB) { diff --git a/kernel.spec b/kernel.spec index 920263427..42e0f810d 100644 --- a/kernel.spec +++ b/kernel.spec @@ -6,7 +6,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. For rawhide # and/or a kernel built from an rc or git snapshot, released_kernel should # be 0. -%global released_kernel 0 +%global released_kernel 1 # Save original buildid for later if it's defined %if 0%{?buildid:1} @@ -57,7 +57,8 @@ Summary: The Linux kernel # base_sublevel is the kernel version we're starting with and patching # on top of -- for example, 2.6.22-rc7-git1 starts with a 2.6.21 base, # which yields a base_sublevel of 21. -%define base_sublevel 0 +%define base_sublevel 39 +%define fake_sublevel 40 ## If this is a released kernel ## %if 0%{?released_kernel} @@ -75,19 +76,8 @@ Summary: The Linux kernel %define stable_base %(echo $((%{stable_update} - 1))) %endif %endif -%define rpmversion 3.%{base_sublevel}%{?stablerev} +%define rpmversion 2.6.%{fake_sublevel}%{?stablerev} -## The not-released-kernel case ## -%else -# The next upstream release sublevel (base_sublevel+1) -# % define upstream_sublevel %(echo $((%{base_sublevel} + 1))) -%define upstream_sublevel 0 -# The rc snapshot level -%define rcrev 5 -# The git snapshot level -%define gitrev 0 -# Set rpm version accordingly -%define rpmversion 3.%{upstream_sublevel} %endif # Nb: The above rcrev and gitrev values automagically define Patch00 and Patch01 below. @@ -131,7 +121,7 @@ Summary: The Linux kernel %define doc_build_fail true %endif -%define rawhide_skip_docs 1 +%define rawhide_skip_docs 0 %if 0%{?rawhide_skip_docs} %define with_doc 0 %define doc_build_fail true @@ -154,7 +144,7 @@ Summary: The Linux kernel # Set debugbuildsenabled to 1 for production (build separate debug kernels) # and 0 for rawhide (all kernels are debug kernels). # See also 'make debug' and 'make release'. -%define debugbuildsenabled 0 +%define debugbuildsenabled 1 # Want to build a vanilla kernel build without any non-upstream patches? %define with_vanilla %{?_with_vanilla: 1} %{?!_with_vanilla: 0} @@ -186,7 +176,7 @@ Summary: The Linux kernel # The kernel tarball/base version # % define kversion 3.%{base_sublevel} -%define kversion 3.%{base_sublevel}-rc%rcrev +%define kversion 2.6.%{base_sublevel} %define make_target bzImage @@ -433,7 +423,7 @@ Summary: The Linux kernel # First the general kernel 2.6 required versions as per # Documentation/Changes # -%define kernel_dot_org_conflicts ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2, module-init-tools < 3.13-1, device-mapper-libs < 1.02.63-2, mdadm < 3.2.1-5 +%define kernel_dot_org_conflicts ppp < 2.4.3-3, isdn4k-utils < 3.2-32, nfs-utils < 1.0.7-12, e2fsprogs < 1.37-4, util-linux < 2.12, jfsutils < 1.1.7-2, reiserfs-utils < 3.6.19-2, xfsprogs < 2.6.13-4, procps < 3.2.5-6.3, oprofile < 0.9.1-2, module-init-tools < 3.13-1 # # Then a series of requirements that are distribution specific, either @@ -530,8 +520,8 @@ BuildRequires: rpm-build >= 4.4.2.1-4 %define debuginfo_args --strict-build-id %endif -# Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 -Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-3.0-rc5.tar.bz2 +Source0: ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-%{kversion}.tar.bz2 +#Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-3.0-rc5.tar.bz2 Source11: genkey Source14: find-provides @@ -567,15 +557,17 @@ Source1000: config-local # Here should be only the patches up to the upstream canonical Linus tree. +Patch00: patch-3.0.bz2 + # For a stable release kernel %if 0%{?stable_update} %if 0%{?stable_base} %define stable_patch_00 patch-3.%{base_sublevel}.%{stable_base}.bz2 -Patch00: %{stable_patch_00} +Patch01: %{stable_patch_00} %endif %if 0%{?stable_rc} %define stable_patch_01 patch-3.%{base_sublevel}.%{stable_update}-rc%{stable_rc}.bz2 -Patch01: %{stable_patch_01} +Patch02: %{stable_patch_01} %endif # non-released_kernel case @@ -583,10 +575,9 @@ Patch01: %{stable_patch_01} # near the top of this spec file. %else %if 0%{?rcrev} -### HAX we're using -rc$x tarballs to make transitioning easier -# Patch00: patch-3.%{upstream_sublevel}-rc%{rcrev}.bz2 +Patch00: patch-3.0-rc%{rcrev}.bz2 %if 0%{?gitrev} -Patch01: patch-3.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.bz2 +Patch01: patch-3.0-rc%{rcrev}-git%{gitrev}.bz2 %endif %else # pre-{base_sublevel+1}-rc1 case @@ -600,7 +591,7 @@ Patch00: patch-3.%{base_sublevel}-git%{gitrev}.bz2 ### BRANCH PATCH ### %endif -Patch02: git-linus.diff +Patch03: git-linus.diff # we also need compile fixes for -vanilla Patch04: linux-2.6-compile-fixes.patch @@ -691,7 +682,8 @@ Patch12204: linux-2.6-enable-more-pci-autosuspend.patch Patch12205: runtime_pm_fixups.patch Patch12303: dmar-disable-when-ricoh-multifunction.patch -Patch12304: iwlagn-fix-dma-direction.patch + +Patch13000: fix-scsi_dispatch_cmd.patch %endif @@ -960,20 +952,20 @@ ApplyOptionalPatch() # Update to latest upstream. %if 0%{?released_kernel} -%define vanillaversion 3.%{base_sublevel} +%define vanillaversion 2.6.%{base_sublevel} # non-released_kernel case %else %if 0%{?rcrev} -%define vanillaversion 3.%{upstream_sublevel}-rc%{rcrev} +%define vanillaversion 2.6.%{upstream_sublevel}-rc%{rcrev} %if 0%{?gitrev} -%define vanillaversion 3.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev} +%define vanillaversion 2.6.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev} %endif %else # pre-{base_sublevel+1}-rc1 case %if 0%{?gitrev} -%define vanillaversion 3.%{base_sublevel}-git%{gitrev} +%define vanillaversion 2.6.%{base_sublevel}-git%{gitrev} %else -%define vanillaversion 3.%{base_sublevel} +%define vanillaversion 2.6.%{base_sublevel} %endif %endif %endif @@ -1040,14 +1032,14 @@ if [ ! -d kernel-%{kversion}%{?dist}/vanilla-%{vanillaversion} ]; then # Update vanilla to the latest upstream. # (non-released_kernel case only) %if 0%{?rcrev} - # ApplyPatch patch-3.%{upstream_sublevel}-rc%{rcrev}.bz2 + ApplyPatch patch-3.0-rc%{rcrev}.bz2 %if 0%{?gitrev} - ApplyPatch patch-3.%{upstream_sublevel}-rc%{rcrev}-git%{gitrev}.bz2 + ApplyPatch patch-3.0-rc%{rcrev}-git%{gitrev}.bz2 %endif %else # pre-{base_sublevel+1}-rc1 case %if 0%{?gitrev} - ApplyPatch patch-3.%{base_sublevel}-git%{gitrev}.bz2 + ApplyPatch patch-3.0-git%{gitrev}.bz2 %endif %endif @@ -1116,6 +1108,9 @@ do done %endif +# Update vanilla to the latest upstream. (2.6.39 -> 3.0) +ApplyPatch patch-3.0.bz2 + ApplyOptionalPatch git-linus.diff ApplyPatch linux-2.6-makefile-after_link.patch @@ -1266,7 +1261,8 @@ ApplyPatch neuter_intel_microcode_load.patch # rhbz#605888 ApplyPatch dmar-disable-when-ricoh-multifunction.patch -ApplyPatch iwlagn-fix-dma-direction.patch + +ApplyPatch fix-scsi_dispatch_cmd.patch # END OF PATCH APPLICATIONS @@ -1371,7 +1367,9 @@ BuildKernel() { # make sure EXTRAVERSION says what we want it to say perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = %{?stablerev}-%{release}.%{_target_cpu}${Flavour:+.${Flavour}}/" Makefile - perl -p -i -e 's/^SUBLEVEL.*/SUBLEVEL = /' Makefile + perl -p -i -e 's/^VERSION.*/VERSION = 2/' Makefile + perl -p -i -e 's/^PATCHLEVEL.*/PATCHLEVEL = 6/' Makefile + perl -p -i -e 's/^SUBLEVEL.*/SUBLEVEL = 40/' Makefile # if pre-rc1 devel kernel, must fix up SUBLEVEL for our versioning scheme ### XXX this will probably be dead code in 3.0 --kyle @@ -1878,8 +1876,17 @@ fi # and build. %changelog -* Mon Jun 27 2011 Kyle McMartin 3.0-0.rc5.git0.1 -- Linux 3.0-rc5 +* Thu Jul 28 2011 Dave Jones +- fix crash in scsi_dispatch_cmd() + +* Thu Jul 28 2011 Dave Jones 2.6.40-1 +- Turn off debugging options. (make release) + +* Tue Jul 26 2011 Dave Jones 2.6.40-0 +- Rebase to final 3.0 (munge to 2.6.40-0) + +* Thu Jun 30 2011 Kyle McMartin 2.6.40-0.rc5.git0.1 +- More than meets the eye, it's Linux 3.0-rc5 in disguise. * Mon Jun 27 2011 Dave Jones - Disable CONFIG_CRYPTO_MANAGER_DISABLE_TESTS, as this also disables FIPS (rhbz 716942) diff --git a/sources b/sources index c6f5315ed..ab481e125 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -02c37ab34ca73f3ff8f6c4963f0e7f1f linux-3.0-rc5.tar.bz2 +1aab7a741abe08d42e8eccf20de61e05 linux-2.6.39.tar.bz2 +df5790b51f218fc5e5463162b26afbfc patch-3.0.bz2