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>
---
include/net/ax25.h | 9 ---------
net/ax25/ax25_dev.c | 4 ----
2 files changed, 13 deletions(-)
--- a/include/net/ax25.h~linux-next-git-rejects
+++ a/include/net/ax25.h
@@ -282,19 +282,10 @@ static __inline__ void ax25_cb_put(ax25_
}
}
-<<<<<<< HEAD
-static inline void ax25_dev_hold(ax25_dev *ax25_dev)
-{
- refcount_inc(&ax25_dev->refcount);
-}
-
-static inline void ax25_dev_put(ax25_dev *ax25_dev)
-=======
#define ax25_dev_hold(__ax25_dev) \
refcount_inc(&((__ax25_dev)->refcount))
static __inline__ void ax25_dev_put(ax25_dev *ax25_dev)
->>>>>>> linux-next/akpm-base
{
if (refcount_dec_and_test(&ax25_dev->refcount)) {
kfree(ax25_dev);
--- a/net/ax25/ax25_dev.c~linux-next-git-rejects
+++ a/net/ax25/ax25_dev.c
@@ -165,10 +165,6 @@ int ax25_fwd_ioctl(unsigned int cmd, str
}
ax25_dev->forward = fwd_dev->dev;
ax25_dev_put(fwd_dev);
-<<<<<<< HEAD
- ax25_dev_put(ax25_dev);
-=======
->>>>>>> linux-next/akpm-base
break;
case SIOCAX25DELFWD:
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
remove-bdi_congested-and-wb_congested-and-related-functions-fix.patch
mm.patch
documentation-vm-page_ownerrst-update-the-documentation-fix.patch
mm-move-page-writeback-sysctls-to-is-own-file-checkpatch-fixes.patch
mm-move-page-writeback-sysctls-to-is-own-file-fix.patch
mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch
numa-balancing-optimize-page-placement-for-memory-tiering-system-fix.patch
numa-balancing-optimize-page-placement-for-memory-tiering-system-fix-fix.patch
mm-handle-uninitialized-numa-nodes-gracefully-fix.patch
proc-alloc-path_max-bytes-for-proc-pid-fd-symlinks-fix.patch
linux-next-rejects.patch
mutex-subsystem-synchro-test-module-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
