The patch titled slab-api-remove-useless-ctor-parameter-and-reorder-parameters-vs-reiser4 has been removed from the -mm tree. Its filename was slab-api-remove-useless-ctor-parameter-and-reorder-parameters-vs-reiser4.patch This patch was dropped because it was folded into reiser4.patch ------------------------------------------------------ Subject: slab-api-remove-useless-ctor-parameter-and-reorder-parameters-vs-reiser4 From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> Cc: Christoph Lameter <clameter@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/reiser4/super_ops.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff -puN fs/reiser4/super_ops.c~slab-api-remove-useless-ctor-parameter-and-reorder-parameters-vs-reiser4 fs/reiser4/super_ops.c --- a/fs/reiser4/super_ops.c~slab-api-remove-useless-ctor-parameter-and-reorder-parameters-vs-reiser4 +++ a/fs/reiser4/super_ops.c @@ -20,14 +20,13 @@ static struct dentry *reiser4_debugfs_ro /** * init_once - constructor for reiser4 inodes - * @obj: inode to be initialized * @cache: cache @obj belongs to - * @flags: SLAB flags + * @obj: inode to be initialized * * Initialization function to be called when new page is allocated by reiser4 * inode cache. It is set on inode cache creation. */ -static void init_once(void *obj, struct kmem_cache *cache, unsigned long flags) +static void init_once(struct kmem_cache *cache, void *obj) { struct reiser4_inode_object *info; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch memory-hotplug-make-kmem_cache_node-for-slub-on-memory-online-avoid-panic.patch capabilities-clean-up-file-capability-reading.patch ext2-avoid-rec_len-overflow-with-64kb-block-size.patch intel-iommu-pci-generic-helper-function.patch intel-iommu-iova-allocation-and-management-routines.patch intel-iommu-intel-iommu-driver.patch intel-iommu-iommu-floppy-workaround.patch kexec-add-bss-to-resource-tree.patch acpi-add-reboot-mechanism.patch git-alsa.patch working-3d-dri-intel-agpko-resume-for-i815-chip.patch first-stab-at-elantech-touchpad-driver-for-26226-testers.patch git-kvm.patch git-libata-all.patch drivers-ata-libata-ehc-fix-printk-warning.patch ide-arm-hack.patch nf_ct_alloc_hashtable-use-__gfp_nowarn.patch ucc_geth-fix-build-break-introduced-by-commit-09f75cd7bf13720738e6a196cc0107ce9a5bd5a0-checkpatch-fixes.patch update-smc91x-driver-with-arm-versatile-board-info.patch git-nfsd-fixup.patch fix-build-breakage-if-sysfs-fix.patch git-scsi-misc.patch git-unionfs.patch security-convert-lsm-into-a-static-interface-fix-unionfs.patch slab-api-remove-useless-ctor-parameter-and-reorder-parameters-vs-unionfs.patch git-wireless.patch git-wireless-fixup.patch git-x86.patch fix-x86_64-mm-sched-clock-share.patch vmscan-give-referenced-active-and-unmapped-pages-a-second-trip-around-the-lru.patch vm-dont-run-touch_buffer-during-buffercache-lookups.patch pm-qos-infrastructure-and-interface-fix.patch pm-qos-infrastructure-and-interface-vs-git-acpi.patch pm-qos-infrastructure-and-interface-vs-git-acpi-2.patch pm-qos-infrastructure-and-interface-static-initialization-with-blocking-notifiers-checkpatch-fixes.patch deprecate-smbfs-in-favour-of-cifs.patch procfs-detect-duplicate-names.patch kernel-printkc-concerns-about-the-console-handover.patch sync_sb_inodes-propagate-errors.patch peterz-vs-ext4-mballoc-core.patch 64-bit-i_version-afs-fixes.patch r-o-bind-mounts-elevate-write-count-during-entire-ncp_ioctl-fix.patch slab-api-remove-useless-ctor-parameter-and-reorder-parameters-vs-revoke.patch revoke-wire-up-i386-system-calls.patch revoke-vs-git-block.patch memory-controller-memory-accounting-v7-fix.patch memory-controller-add-per-container-lru-and-reclaim-v7-fix.patch memory-controller-oom-handling-v7-vs-oom-killer-stuff.patch memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7-fix-2.patch memcontrol-move-oom-task-exclusion-to-tasklist-fix.patch ftd_sio-clean-ups-and-updates-for-new-termios-work-checkpatch-fixes.patch drivers-edac-add-marvell-mv64x60-driver-fix.patch make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch reiser4.patch slab-api-remove-useless-ctor-parameter-and-reorder-parameters-vs-reiser4.patch page-owner-tracking-leak-detector.patch nr_blockdev_pages-in_interrupt-warning.patch slab-leaks3-default-y.patch profile-likely-unlikely-macros-fix.patch put_bh-debug.patch kmap_atomic-debugging.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch w1-build-fix.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