The patch titled
Subject: linux-next-git-rejects
has been removed from the -mm tree. Its filename was
linux-next-git-rejects.patch
This patch was dropped because it is obsolete
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/meson/meson_crtc.c | 3 -
drivers/infiniband/hw/mlx5/odp.c | 4 -
sound/core/control.c | 66 ---------------------------
tools/build/feature/Makefile | 3 -
tools/perf/Makefile.config | 7 --
5 files changed, 83 deletions(-)
--- a/drivers/gpu/drm/meson/meson_crtc.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/meson/meson_crtc.c
@@ -131,11 +131,8 @@ static void meson_crtc_atomic_disable(st
struct meson_crtc *meson_crtc = to_meson_crtc(crtc);
struct meson_drm *priv = meson_crtc->priv;
-<<<<<<< HEAD
-=======
DRM_DEBUG_DRIVER("\n");
->>>>>>> linux-next/akpm-base
drm_crtc_vblank_off(crtc);
priv->viu.osd1_enabled = false;
--- a/drivers/infiniband/hw/mlx5/odp.c~linux-next-git-rejects
+++ a/drivers/infiniband/hw/mlx5/odp.c
@@ -725,10 +725,6 @@ next_mr:
key);
if (bytes_mapped)
*bytes_mapped += bcnt;
-<<<<<<< HEAD
- ret = 0;
-=======
->>>>>>> linux-next/akpm-base
goto srcu_unlock;
}
--- a/sound/core/control.c~linux-next-git-rejects
+++ a/sound/core/control.c
@@ -348,67 +348,6 @@ static int snd_ctl_find_hole(struct snd_
return 0;
}
-<<<<<<< HEAD
-/* add a new kcontrol object; call with card->controls_rwsem locked */
-static int __snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)
-{
- struct snd_ctl_elem_id id;
- unsigned int idx;
- unsigned int count;
-
- id = kcontrol->id;
- if (id.index > UINT_MAX - kcontrol->count)
- return -EINVAL;
-
- if (snd_ctl_find_id(card, &id)) {
- dev_err(card->dev,
- "control %i:%i:%i:%s:%i is already present\n",
- id.iface, id.device, id.subdevice, id.name, id.index);
- return -EBUSY;
- }
-
- if (snd_ctl_find_hole(card, kcontrol->count) < 0)
- return -ENOMEM;
-
- list_add_tail(&kcontrol->list, &card->controls);
- card->controls_count += kcontrol->count;
- kcontrol->id.numid = card->last_numid + 1;
- card->last_numid += kcontrol->count;
-
- id = kcontrol->id;
- count = kcontrol->count;
- for (idx = 0; idx < count; idx++, id.index++, id.numid++)
- snd_ctl_notify(card, SNDRV_CTL_EVENT_MASK_ADD, &id);
-
- return 0;
-}
-
-/**
- * snd_ctl_add - add the control instance to the card
- * @card: the card instance
- * @kcontrol: the control instance to add
- *
- * Adds the control instance created via snd_ctl_new() or
- * snd_ctl_new1() to the given card. Assigns also an unique
- * numid used for fast search.
- *
- * It frees automatically the control which cannot be added.
- *
- * Return: Zero if successful, or a negative error code on failure.
- *
- */
-int snd_ctl_add(struct snd_card *card, struct snd_kcontrol *kcontrol)
-{
- int err = -EINVAL;
-
- if (! kcontrol)
- return err;
- if (snd_BUG_ON(!card || !kcontrol->info))
- goto error;
-
- down_write(&card->controls_rwsem);
- err = __snd_ctl_add(card, kcontrol);
-=======
enum snd_ctl_add_mode {
CTL_ADD_EXCLUSIVE, CTL_REPLACE, CTL_ADD_ON_REPLACE,
};
@@ -475,7 +414,6 @@ static int snd_ctl_add_replace(struct sn
down_write(&card->controls_rwsem);
err = __snd_ctl_add_replace(card, kcontrol, mode);
->>>>>>> linux-next/akpm-base
up_write(&card->controls_rwsem);
if (err < 0)
goto error;
@@ -1412,11 +1350,7 @@ static int snd_ctl_elem_add(struct snd_c
/* This function manage to free the instance on failure. */
down_write(&card->controls_rwsem);
-<<<<<<< HEAD
- err = __snd_ctl_add(card, kctl);
-=======
err = __snd_ctl_add_replace(card, kctl, CTL_ADD_EXCLUSIVE);
->>>>>>> linux-next/akpm-base
if (err < 0) {
snd_ctl_free_one(kctl);
goto unlock;
--- a/tools/build/feature/Makefile~linux-next-git-rejects
+++ a/tools/build/feature/Makefile
@@ -104,12 +104,9 @@ $(OUTPUT)test-bionic.bin:
$(OUTPUT)test-libelf.bin:
$(BUILD) -lelf
-<<<<<<< HEAD
-=======
$(OUTPUT)test-eventfd.bin:
$(BUILD)
->>>>>>> linux-next/akpm-base
$(OUTPUT)test-get_current_dir_name.bin:
$(BUILD)
--- a/tools/perf/Makefile.config~linux-next-git-rejects
+++ a/tools/perf/Makefile.config
@@ -299,21 +299,14 @@ ifndef NO_BIONIC
endif
endif
-<<<<<<< HEAD
-=======
ifeq ($(feature-eventfd), 1)
CFLAGS += -DHAVE_EVENTFD
endif
->>>>>>> linux-next/akpm-base
ifeq ($(feature-get_current_dir_name), 1)
CFLAGS += -DHAVE_GET_CURRENT_DIR_NAME
endif
-<<<<<<< HEAD
-
-=======
->>>>>>> linux-next/akpm-base
ifdef NO_LIBELF
NO_DWARF := 1
NO_DEMANGLE := 1
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
mm-slab-remove-unnecessary-unlikely-fix.patch
mm-slub-record-final-state-of-slub-action-in-deactivate_slab-fix.patch
mm-slub-improve-performance-by-skipping-checked-node-in-get_any_partial-fix.patch
mm-page_owner-clamp-read-count-to-page_size-fix.patch
mm-hotplug-optimize-clear_hwpoisoned_pages-fix.patch
mm-ksm-do-not-block-on-page-lock-when-searching-stable-tree-fix.patch
mm-memory_hotplug-print-reason-for-the-offlining-failure-fix.patch
mm-memory_hotplug-be-more-verbose-for-memory-offline-failures-fix.patch
mm-convert-totalram_pages-and-totalhigh_pages-variables-to-atomic-checkpatch-fixes.patch
mm-page_alloc-free-order-0-pages-through-pcp-in-page_frag_free-fix.patch
memory_hotplug-free-pages-as-higher-order-fix.patch
memory_hotplug-free-pages-as-higher-order-fix-fix.patch
fs-epoll-deal-with-wait_queue-only-once-fix.patch
autofs-improve-ioctl-sbi-checks-fix.patch
exec-separate-mm_anonpages-and-rlimit_stack-accounting-checkpatch-fixes.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
mm-replace-all-open-encodings-for-numa_no_node-fix.patch
mm-convert-pg_balloon-to-pg_offline-fix.patch
fs-remove-caller-signal_pending-branch-predictions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
