I attach a diff against v3.0.43 at the end for reference - as gmail will expand tabs et cetera and I assume you would (very sensibly) only merge existing changes.
On 28 September 2012 04:32, Greg KH <[email protected]> wrote: > On Sat, Sep 22, 2012 at 07:13:01AM +1000, Andrew Worsley wrote: >> Hi I have been using the 3.0.42 stable kernel and hit problems getting >> PCI hotplug to work. >> I fixed my issues by back porting (with very little effort - a >> variable name change conflict) the following fixes from the mainline. >> >> I suggest you may want to consider them as valuable candidate fixes >> for your 3.0.y stable branch: >> >> Cc: <[email protected]> # 3.3-rc1: >> a4ac9fea016fc5c09227eb479bd35e34978323a4 PCI : Calculate right >> add_size >> Cc: <[email protected]> # 3.1-rc1: >> 2bbc6942273b5b3097bd265d82227bdd84b351b2 PCI : ability to relocate >> assigned pci-resources >> Cc: <[email protected]> # 3.1-rc1: >> be768912a49b10b68e96fbd8fa3cab0adfbd3091 PCI: honor child buses >> add_size in hot plug configuration > > These don't seem to apply to the 3.0 tree, are you sure you didn't also > backport other fixes? Yep I did the merge directly on v3.0.42 (what I had at the time) and got one conflict where a variable name had changed which was very easy to resolve by hand. The only problem was with: a4ac9fea01 PCI : Calculate right add_size Where I had to change realloc_head variable to add_head Here's my log for 3.0.y: * 34e81ae Merge remote branch 'remotes/stable/linux-3.0.y' into v3.0.42-fixes |\ | * 3d2e7b3 Linux 3.0.43 | * 8f365b6 hwmon: (asus_atk0110) Add quirk for Asus M5A78L | * a629a20 dccp: check ccid before dereferencing | * 2b6007f PARISC: Redefine ATOMIC_INIT and ATOMIC64_INIT to drop the casts | * 839b995 drm/vmwgfx: add MODULE_DEVICE_TABLE so vmwgfx loads at boot | * cc75079 Input: i8042 - add Gigabyte T1005 series netbooks to noloop table | * fd63204 fuse: fix retrieve length | * 04234b3 ext3: Fix fdatasync() for files with only i_size changes | * 31147bc udf: Fix data corruption for files in ICB | * 778105a SCSI: Fix 'Device not ready' issue on mpt2sas | * a87c6c9 SCSI: mpt2sas: Fix for Driver oops, when loading driver with max_queue_depth command line option to a very small value | * b787880 SCSI: megaraid_sas: Move poll_aen_lock initializer | * 3ee8d64 Remove user-triggerable BUG from mpol_to_str | * 7b296be powerpc: Restore correct DSCR in context switch | * 52640df powerpc: Fix DSCR inheritance in copy_thread() | * 52340b6 USB: CDC ACM: Fix NULL pointer dereference | * 9f48c23 USB: smsusb: remove __devinit* from the struct usb_device_id table | * 42d6954 USB: rtl8187: remove __devinit* from the struct usb_device_id table | * 82c6c33 USB: p54usb: remove __devinit* from the struct usb_device_id table | * 6a239aa USB: spca506: remove __devinit* from the struct usb_device_id table | * 7201325 block: replace __getblk_slow misfix by grow_dev_page fix | * 3696bb1 PCI: EHCI: Fix crash during hibernation on ASUS computers | * c227ece ath9k: fix decrypt_error initialization in ath_rx_tasklet() | * 92c4d22 ACPI: export symbol acpi_get_table_with_size | * 06c7487 cciss: fix incorrect scsi status reporting | * b8e52a4 svcrpc: sends on closed socket should stop immediately | * 299ee06 svcrpc: fix svc_xprt_enqueue/svc_recv busy-looping | * e684493 svcrpc: fix BUG() in svc_tcp_clear_pages | * 830cd76 audit: fix refcounting in audit-tree | * 56e4562 audit: don't free_chunk() after fsnotify_add_mark() | * 002d412 NFS: Alias the nfs module to nfs4 | * 4ad55ff NFSv4.1: Remove a bogus BUG_ON() in nfs4_layoutreturn_done | * 9516c03 NFSv3: Ensure that do_proc_get_root() reports errors correctly | * 8959204 mm: hugetlbfs: correctly populate shared pmd | * eb2f4fb USB: winbond: remove __devinit* from the struct usb_device_id table | * 4f7da69 alpha: Don't export SOCK_NONBLOCK to user space. | * 3db5984 vfs: canonicalize create mode in build_open_flags() | * 57dba9b vfs: missed source of ->f_pos races | * 0253e78 ASoC: wm9712: Fix microphone source selection | * d9026c7 ARM: imx: select CPU_FREQ_TABLE when needed | * 88b6962 ARM: S3C24XX: Fix s3c2410_dma_enqueue parameters | * c616bd5 ARM: 7489/1: errata: fix workaround for erratum #720789 on UP systems | * cb8a66c ARM: 7488/1: mm: use 5 bits for swapfile type encoding | * 9a0417a ARM: 7487/1: mm: avoid setting nG bit for user mappings that aren't present | * 33fe660 ALSA: hda - fix Copyright debug message | * 4281412 USB: emi62: remove __devinit* from the struct usb_device_id table | * 49f75e9 USB: vt6656: remove __devinit* from the struct usb_device_id table * | b40aff3 PCI : Calculate right add_size * | 3fb7b76 PCI : ability to relocate assigned pci-resources * | 4d181ba PCI: honor child buses add_size in hot plug configuration |/ * 5aa287d Linux 3.0.42 * 15e892b IB/srp: Fix a race condition * 3a933fe rt2x00: Add support for BUFFALO WLI-UC-GNM2 to rt2800usb. * edbc37f usb: serial: mos7840: Fixup mos7840_chars_in_buffer() * d0f56ad USB: ftdi_sio: Add VID/PID for Kondo Serial USB .... >> >> There was one additional change I made (not present) in the trunk >> which allowed me to configure the >> alignment of the hot-plugged bus via the kernel command line parameter >> resource_alignment that I found >> very useful. > > Having this upstream would be good as it's necessary for it to be > accepted into a stable kernel release. > > thanks, > > greg k-h Ok it will take me some time to do this as a separate patch and send it properly formatted as I have trouble with the gmail web interface mangling patches. If you have some better suggestions please let me know. Thanks Andrew
diff-versus-v3.0.43.patch
Description: Binary data
