The patch titled drivers/net/mlx4/profile.c: fix min() warning has been removed from the -mm tree. Its filename was drivers-net-mlx4-profilec-fix-min-warning.patch This patch was dropped because it was merged into mainline or a subsystem tree The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: drivers/net/mlx4/profile.c: fix min() warning From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> sparc64 allmodconfig: drivers/net/mlx4/profile.c: In function `mlx4_make_profile': drivers/net/mlx4/profile.c:110: warning: comparison of distinct pointer types lacks a cast This happened because num_possible_cpus() was secretly changed (by ae7a47e72e1a0b5e2b46d1596bc2c22942a73023) from returning `int' to (now) returning `unsigned int'. I think that was a good change, so we should just swallow the fallout. Cc: "David S. Miller" <davem@xxxxxxxxxxxxx> Cc: Roland Dreier <rolandd@xxxxxxxxx> Cc: Yevgeny Petrilin <yevgenyp@xxxxxxxxxxxxxx> Cc: Jack Morgenstein <jackm@xxxxxxxxxxxxxxxxxx> Cc: Vladimir Sokolovsky <vlad@xxxxxxxxxxxxxx> Cc: Michael S. Tsirkin <mst@xxxxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/mlx4/profile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN drivers/net/mlx4/profile.c~drivers-net-mlx4-profilec-fix-min-warning drivers/net/mlx4/profile.c --- a/drivers/net/mlx4/profile.c~drivers-net-mlx4-profilec-fix-min-warning +++ a/drivers/net/mlx4/profile.c @@ -107,7 +107,7 @@ u64 mlx4_make_profile(struct mlx4_dev *d profile[MLX4_RES_AUXC].num = request->num_qp; profile[MLX4_RES_SRQ].num = request->num_srq; profile[MLX4_RES_CQ].num = request->num_cq; - profile[MLX4_RES_EQ].num = min(dev_cap->max_eqs, + profile[MLX4_RES_EQ].num = min_t(unsigned, dev_cap->max_eqs, dev_cap->reserved_eqs + num_possible_cpus() + 1); profile[MLX4_RES_DMPT].num = request->num_mpt; _ Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are origin.patch kprobes-fix-module-compilation-error-with-config_kprobes=n.patch i-need-old-gcc.patch linux-next.patch next-remove-localversion.patch fix-x86-optimise-x86s-do_page_fault-c-entry-point-for-the-page-fault-path.patch thinkpad-acpi-split-delayed-leds-stuff-clean-up-code-checkpatch-fixes.patch x86-define-arch_want_frame_pointers-fix.patch drivers-consolidate-driver_probe_done-loops-into-one-place-fix.patch drivers-consolidate-driver_probe_done-loops-into-one-place-checkpatch-fixes.patch clocksource-pass-clocksource-to-read-callback.patch pci-quirks-unhide-overflow-device-on-i828675p-pe-chipsets.patch raw-fix-rawctl-compat-ioctls-breakage-on-amd64-and-itanic.patch scsi-dpt_i2o-is-bust-on-ia64.patch nommu-fix-a-number-of-issues-with-the-per-mm-vma-patch.patch page_fault-retry-with-nopage_retry.patch page_fault-retry-with-nopage_retry-fix-3-fix.patch mm-add-proc-controls-for-pdflush-threads-fix.patch mm-add-proc-controls-for-pdflush-threads-fix-fix.patch proc-pid-maps-dont-show-pgoff-of-pure-anon-vmas-checkpatch-fixes.patch rtc-convert-leap_year-into-an-inline.patch rtc-add-platform-driver-for-efi-fix.patch pids-document-task_pgrp-task_session-is-not-safe-without-tasklist-rcu-fix.patch nilfs2-integrated-block-mapping-remove-nilfs-bmap-wrapper-macros-checkpatch-fixes.patch nilfs2-inode-operations-fix.patch nilfs2-pathname-operations-fix.patch nilfs2-super-block-operations-fix.patch reiser4.patch reiser4-remove-simple_prepare_write-usage-checkpatch-fixes.patch slab-leaks3-default-y.patch put_bh-debug.patch shrink_slab-handle-bad-shrinkers.patch getblk-handle-2tb-devices.patch getblk-handle-2tb-devices-fix.patch undeprecate-pci_find_device.patch notify_change-callers-must-hold-i_mutex.patch drivers-net-bonding-bond_sysfsc-suppress-uninitialized-var-warning.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