Hi Ben,
Here are instructions for retrieving a preview of the next
3.2.y-stable release. Does the result look right? Would it make
sense to send out emails using Greg's templates to start the review
cycle?
I did not look carefully at netdev patches.
1. Enter a clone of
git://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git
2. Copy the 3.3.y queue:
cp -a releases/3.3.4 queue-3.2
3. Add patches omitted from 3.3.y because already upstream:
for patch in \
don-t-limit-non-nested-epoll-paths.patch \
spi-fix-device-unregistration-when-unregistering-the-bus-master.patch \
rt2800-add-support-for-the-fujitsu-stylistic-q550.patch \
rt2x00-identify-rt2800usb-chipsets.patch
do
cp releases/3.0.30/$patch queue-3.2/
done
4. Re-use backport of some netdev patches:
for patch in \
netlink-fix-races-after-skb-queueing.patch \
net_sched-gred-fix-oops-in-gred_dump-in-wred-mode.patch
do
cp releases/3.0.30/$patch queue-3.2/
done
5. 3.2.y does not need 22b4a4f22da4 ("tcp: fix retransmit of partially
acked frames"), so untangle it:
(
GIT_DIR=/path/to/linux.git
export GIT_DIR
git format-patch -1 -k -s --stdout a21d45726aca
) |
sed '
/^Subject:/ a\
\
commit a21d45726acacc963d8baddf74607d9b74e2b723 upstream.
/^-- $/,$ d
' >queue-3.2/tcp-avoid-order-1-allocations-on-wifi-and-tx-path.patch
6. Adjust context lines:
curl http://download.gmane.org/gmane.linux.kernel/1287956/1287957 \
>queue-3.2/fix-modpost-failures-in-fedora-17.patch
curl http://download.gmane.org/gmane.linux.kernel/1289018/1289019 \
>queue-3.2/kvm-unmap-pages-from-the-iommu-when-slots-are-removed.patch
curl http://download.gmane.org/gmane.linux.kernel/1289037/1289038 \
>queue-3.2/nfsd-fix-b0rken-error-value-for-setattr-on-read-only-mount.patch
sed -i -e '
s/_g_/_/g
s/_G_/_/g
' queue-3.2/phy-icplus-fix-auto-power-saving-in-ip101a_config_init.patch
7. Remove patches fixing regressions introduced after v3.2 and not
present in stable:
for patch in \
memblock-memblock-should-be-able-to-handle-zero-length-operations.patch \
arm-at91-fix-at91sam9261ek-ethernet-dm9000-irq.patch \
arm-omap-serial-fix-the-ocp-smart-idlemode-handling-bug.patch \
mmc-sdhci-refine-non-removable-card-checking-for-card-detection.patch \
mac80211-fix-logic-error-in-ibss-channel-type-check.patch \
md-don-t-call-add_disk-unless-there-is-good-reason.patch \
tcp-restore-correct-limit.patch
do
rm queue-3.2/$patch
done
8. Remove patches that use infrastructure too invasive to backport:
for patch in \
media-dvb_frontend-fix-a-regression-when-switching-back-to-dvb-s.patch
do
rm queue-3.2/$patch
done
9. Update series file using the patch below.
10. Import to git:
cd ../linux
git checkout stable/linux-3.2.y
git -c mailinfo.scissors=true quiltimport --patches ../stable/queue-3.2
11. Check the result:
$ git rev-parse --short HEAD^{tree}
c421b1e8002d
Thanks,
Jonathan
diff --git a/queue-3.3/series b/queue-3.2/series
index 74b59085..26a7d86c 100644
--- a/queue-3.3/series
+++ b/queue-3.2/series
@@ -2,14 +2,10 @@ perf-fix-build-breakage.patch
crypto-sha512-fix-byte-counter-overflow-in-sha-512.patch
alsa-hda-conexant-don-t-set-hp-pin-control-bit.patch
alsa-hda-conexant-set-up-the-missing-docking-station-pins.patch
-memblock-memblock-should-be-able-to-handle-zero-length-operations.patch
arm-clps711x-serial-driver-hungs-are-a-result-of-call-disable_irq-within-isr.patch
-arm-at91-fix-at91sam9261ek-ethernet-dm9000-irq.patch
arm-omap1-dmtimer-fix-broken-timer-clock-source-selection.patch
-arm-omap-serial-fix-the-ocp-smart-idlemode-handling-bug.patch
mmc-fixes-for-emmc-v4.5-discard-operation.patch
mmc-fixes-for-emmc-v4.5-sanitize-operation.patch
-mmc-sdhci-refine-non-removable-card-checking-for-card-detection.patch
mmc-unbreak-sdhci-esdhc-imx-on-i.mx25.patch
xen-gntdev-do-not-set-vm_pfnmap.patch
xen-xenbus-add-quirk-to-deal-with-misconfigured-backends.patch
@@ -20,15 +16,12 @@ uwb-fix-error-handling.patch
davinci_mdio-fix-mdio-timeout-check.patch
mwifiex-update-pcie8766-scratch-register-addresses.patch
brcm80211-smac-resume-transmit-fifo-upon-receiving-frames.patch
-mac80211-fix-logic-error-in-ibss-channel-type-check.patch
media-rc-core-set-mode-for-winbond-cir.patch
media-drxk-does-not-unlock-mutex-if-sanity-check-failed-in-scu_command.patch
-media-dvb_frontend-fix-a-regression-when-switching-back-to-dvb-s.patch
cfg80211-fix-interface-combinations-check.patch
staging-r8712u-fix-regression-caused-by-commit-8c213fa.patch
fix-modpost-failures-in-fedora-17.patch
mm-fix-s390-bug-by-__set_page_dirty_no_writeback-on-swap.patch
-md-don-t-call-add_disk-unless-there-is-good-reason.patch
md-fix-possible-corruption-of-array-metadata-on-shutdown.patch
jbd2-use-gfp_nofs-for-blkdev_issue_flush.patch
usb-serial-cp210x-fixed-usb_control_msg-timeout-values.patch
@@ -49,6 +42,10 @@ kvm-unmap-pages-from-the-iommu-when-slots-are-removed.patch
dell-laptop-add-3-machines-that-has-touchpad-led.patch
dell-laptop-touchpad-led-should-persist-its-status-after-s3.patch
bluetooth-add-support-for-atheros.patch
+don-t-limit-non-nested-epoll-paths.patch
+spi-fix-device-unregistration-when-unregistering-the-bus-master.patch
+rt2800-add-support-for-the-fujitsu-stylistic-q550.patch
+rt2x00-identify-rt2800usb-chipsets.patch
nfsd-fix-b0rken-error-value-for-setattr-on-read-only-mount.patch
nfsd-fix-error-values-returned-by-nfsd4_lockt-when.patch
nfsd-fix-endianness-breakage-in-test_stateid-handling.patch
@@ -72,7 +69,6 @@
bonding-properly-unset-current_arp_slave-on-slave-link-up.patch
wimax-i2400m-prevent-a-possible-kernel-bug-due-to-missing-fw_name-string.patch
netlink-fix-races-after-skb-queueing.patch
net-fix-a-race-in-sock_queue_err_skb.patch
-tcp-restore-correct-limit.patch
tcp-fix-tcp_rcv_rtt_update-use-of-an-unscaled-rtt-sample.patch
atl1-fix-kernel-panic-in-case-of-dma-errors.patch
8139cp-set-intr-mask-after-its-handler-is-registered.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
