The patch titled make pktgen.c:get_ipsec_sa() static and non-inline has been removed from the -mm tree. Its filename was make-pktgencget_ipsec_sa-static-and-non-inline.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: make pktgen.c:get_ipsec_sa() static and non-inline Non-static inline code usually doesn't makes sense. In this case making is static and non-inline is the correct solution. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxx> --- Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- net/core/pktgen.c | 3 +-- 1 files changed, 1 insertion(+), 2 deletions(-) diff -puN net/core/pktgen.c~make-pktgencget_ipsec_sa-static-and-non-inline net/core/pktgen.c --- a/net/core/pktgen.c~make-pktgencget_ipsec_sa-static-and-non-inline +++ a/net/core/pktgen.c @@ -2156,8 +2156,7 @@ static inline int f_pick(struct pktgen_d /* If there was already an IPSEC SA, we keep it as is, else * we go look for it ... */ -inline -void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow) +static void get_ipsec_sa(struct pktgen_dev *pkt_dev, int flow) { struct xfrm_state *x = pkt_dev->flows[flow].x; if (!x) { _ Patches currently in -mm which might be from bunk@xxxxxxxxx are origin.patch remove-the-arm26-port.patch slow-down-printk-during-boot-fix-3.patch git-acpi.patch drivers-acpi-sbsc-remove-dead-code.patch make-drivers-acpi-eventcacpi_event_seqnum-static.patch make-struct-sony_nc_ids-static.patch git-alsa.patch kernel-auditscc-fix-an-off-by-one.patch drivers-base-power-make-2-functions-static.patch git-drm.patch git-dvb.patch export-v4l2_int_device_unregister.patch drivers-i2c-i2c-corec-make-code-static.patch git-hwmon.patch include-linux-kbuild-remove-duplicate-entries.patch git-kvm.patch testing-patch-for-ali-pata-fixes-hopefully-for-the-problems-with-atapi-dma.patch git-mmc.patch git-mtd.patch mtd-onenand_simc-make-struct-info-static.patch remove-fs-jffs2-ioctlc.patch drivers-net-cxgb3-xgmacc-remove-dead-code.patch e1000-if-0-two-functions.patch git-net.patch fore200e_param_bs_queue-must-be-__devinit.patch backlight-make-2-structs-static.patch git-ocfs2.patch parisc-extern-inline-static-inline.patch cpqphp_ctrlc-remove-dead-code.patch kernel-schedc-make-code-static.patch drivers-scsi-pcmcia-nsp_csc-remove-kernel-24-code.patch nsp32_restart_autoscsi-remove-error-check.patch make-scsi_host_link_pm_policy-static.patch drivers-scsi-scsi_errorc-should-include.patch drivers-scsi-constantsc-make-2-functions-static.patch git-unionfs.patch drivers-usb-serial-sierrac-make-3-functions-static.patch fix-gregkh-usb-usb-add-the-concept-of-default-authorization-to-usb-hosts.patch git-v9fs.patch git-ipwireless_cs.patch arch-i386-kernel-smpbootcsetup_trampoline-must-be.patch i386-remove-maccumulate-outgoing-args.patch arch-i386-mach-generic-probec-make-struct-apic_probe.patch arch-i386-mach-es7000-es7000platc-cleanups.patch i386-alternativec-really-stop-mces-during-code.patch i386-no-need-to-make-enable_cpu_hotplug-a-variable.patch arch-i386-mm-discontigc-make-some-variables-static.patch serial-sh-sci-fix-build-failure-from-kgdb-fallout.patch usb_serial_suspend-buggy-code.patch acpi_ec_remove-fix-use-after-free.patch acpi_battery_add-use-after-free.patch slubcearly_kmem_cache_node_alloc-shouldnt-be.patch mm-page_allocc-make-code-static.patch maps2-add-proc-kpagemap-interface.patch hugetlbfs-read-support-fix-2.patch mm-shmemc-make-3-functions-static.patch mm-migratec-cleanups.patch mm-mempolicyc-cleanups.patch mm-vmstatc-cleanups.patch cleanup-arch-alpha-makefile.patch unexport-pm_power_off_prepare.patch fs-reiserfs-cleanups.patch anon_inodes-shouldnt-be-user-visible.patch remove-unsafe-from-module-struct.patch kernel-rtmutex-debugc-cleanups.patch fs-afs-possible-cleanups.patch lib-ioremapc-should-include-linux-ioh.patch ipc-shmc-make-2-functions-static.patch introduce-i_sync-fix.patch ext2-reservations.patch fs-nfsd-exportc-make-3-functions-static.patch radeon_driver_vblank_do_wait-static.patch unexport-fb_prepare_logo.patch intel-iommu-intel-iommu-driver.patch revoke-core-code.patch mm-implement-swap-prefetching.patch pid-namespaces-define-is_global_init-and-is_container_init-m32r-fix.patch pid-namespaces-define-is_global_init-and-is_container_init-kernel-pidc-remove-unused-exports.patch the-next-round-of-scheduled-oss-code-removal.patch reiser4-export-remove_from_page_cache.patch reiser4.patch mutex-subsystem-synchro-test-module.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html