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>
---
Documentation/filesystems/Locking | 4
arch/arm/mach-exynos/Kconfig | 14 -
arch/microblaze/include/asm/pci.h | 7
arch/powerpc/Kconfig | 4
drivers/block/drbd/drbd_main.c | 4
drivers/md/md.c | 13 -
fs/afs/proc.c | 239 ----------------------------
fs/proc/internal.h | 3
fs/proc/proc_net.c | 17 -
fs/read_write.c | 26 ---
include/linux/device.h | 6
include/linux/proc_fs.h | 3
net/ipv4/ipconfig.c | 6
13 files changed, 346 deletions(-)
diff -puN arch/arm/mach-exynos/Kconfig~linux-next-git-rejects arch/arm/mach-exynos/Kconfig
--- a/arch/arm/mach-exynos/Kconfig~linux-next-git-rejects
+++ a/arch/arm/mach-exynos/Kconfig
@@ -107,20 +107,6 @@ config SOC_EXYNOS5420
default y
depends on ARCH_EXYNOS5
-<<<<<<< HEAD
-config SOC_EXYNOS5440
- bool "SAMSUNG EXYNOS5440"
- default y
- depends on ARCH_EXYNOS5
- select HAVE_ARM_ARCH_TIMER
- select AUTO_ZRELADDR
- select PINCTRL_EXYNOS5440
- select PM_OPP
- help
- Enable EXYNOS5440 SoC support
-
-=======
->>>>>>> linux-next/akpm-base
config SOC_EXYNOS5800
bool "SAMSUNG EXYNOS5800"
default y
diff -puN arch/microblaze/include/asm/pci.h~linux-next-git-rejects arch/microblaze/include/asm/pci.h
--- a/arch/microblaze/include/asm/pci.h~linux-next-git-rejects
+++ a/arch/microblaze/include/asm/pci.h
@@ -61,13 +61,6 @@ extern int pci_mmap_legacy_page_range(st
#define HAVE_PCI_LEGACY 1
-<<<<<<< HEAD
-extern void pcibios_claim_one_bus(struct pci_bus *b);
-
-extern void pcibios_finish_adding_to_bus(struct pci_bus *bus);
-
-=======
->>>>>>> linux-next/akpm-base
extern void pcibios_resource_survey(void);
struct file;
diff -puN arch/powerpc/Kconfig~linux-next-git-rejects arch/powerpc/Kconfig
--- a/arch/powerpc/Kconfig~linux-next-git-rejects
+++ a/arch/powerpc/Kconfig
@@ -462,11 +462,7 @@ config LD_HEAD_STUB_CATCH
config MPROFILE_KERNEL
depends on PPC64 && CPU_LITTLE_ENDIAN
-<<<<<<< HEAD
- def_bool !DISABLE_MPROFILE_KERNEL
-=======
def_bool $(success,$(srctree)/arch/powerpc/tools/gcc-check-mprofile-kernel.sh $(CC) -I$(srctree)/include -D__KERNEL__)
->>>>>>> linux-next/akpm-base
config HOTPLUG_CPU
bool "Support for enabling/disabling CPUs"
diff -puN Documentation/filesystems/Locking~linux-next-git-rejects Documentation/filesystems/Locking
--- a/Documentation/filesystems/Locking~linux-next-git-rejects
+++ a/Documentation/filesystems/Locking
@@ -439,13 +439,9 @@ prototypes:
ssize_t (*write_iter) (struct kiocb *, struct iov_iter *);
int (*iterate) (struct file *, struct dir_context *);
int (*iterate_shared) (struct file *, struct dir_context *);
-<<<<<<< HEAD
- unsigned int (*poll) (struct file *, struct poll_table_struct *);
-=======
__poll_t (*poll) (struct file *, struct poll_table_struct *);
struct wait_queue_head * (*get_poll_head)(struct file *, __poll_t);
__poll_t (*poll_mask) (struct file *, __poll_t);
->>>>>>> linux-next/akpm-base
long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
long (*compat_ioctl) (struct file *, unsigned int, unsigned long);
int (*pre_mmap) (struct file *, unsigned long, unsigned long);
diff -puN drivers/block/drbd/drbd_main.c~linux-next-git-rejects drivers/block/drbd/drbd_main.c
--- a/drivers/block/drbd/drbd_main.c~linux-next-git-rejects
+++ a/drivers/block/drbd/drbd_main.c
@@ -2989,12 +2989,8 @@ static int __init drbd_init(void)
goto fail;
err = -ENOMEM;
-<<<<<<< HEAD
- drbd_proc = proc_create_single("drbd", S_IFREG | 0444 , NULL, drbd_seq_show);
-=======
drbd_proc = proc_create_single("drbd", S_IFREG | 0444 , NULL,
drbd_seq_show);
->>>>>>> linux-next/akpm-base
if (!drbd_proc) {
pr_err("unable to register proc file\n");
goto fail;
diff -puN drivers/md/md.c~linux-next-git-rejects drivers/md/md.c
--- a/drivers/md/md.c~linux-next-git-rejects
+++ a/drivers/md/md.c
@@ -5523,12 +5523,6 @@ int md_run(struct mddev *mddev)
err = bioset_init(&mddev->bio_set, BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS);
if (err)
return err;
-<<<<<<< HEAD
- }
- if (!bioset_initialized(&mddev->sync_set)) {
- err = bioset_init(&mddev->sync_set, BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS);
- if (err)
-=======
}
if (!bioset_initialized(&mddev->sync_set)) {
err = bioset_init(&mddev->sync_set, BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS);
@@ -5548,7 +5542,6 @@ int md_run(struct mddev *mddev)
flush_bio_free, mddev);
if (!mddev->flush_bio_pool) {
err = -ENOMEM;
->>>>>>> linux-next/akpm-base
goto abort;
}
@@ -5710,8 +5703,6 @@ int md_run(struct mddev *mddev)
return 0;
abort:
-<<<<<<< HEAD
-=======
if (mddev->flush_bio_pool) {
mempool_destroy(mddev->flush_bio_pool);
mddev->flush_bio_pool = NULL;
@@ -5720,7 +5711,6 @@ abort:
mempool_destroy(mddev->flush_pool);
mddev->flush_pool = NULL;
}
->>>>>>> linux-next/akpm-base
bioset_exit(&mddev->bio_set);
bioset_exit(&mddev->sync_set);
@@ -5935,8 +5925,6 @@ void md_stop(struct mddev *mddev)
* This is called from dm-raid
*/
__md_stop(mddev);
-<<<<<<< HEAD
-=======
if (mddev->flush_bio_pool) {
mempool_destroy(mddev->flush_bio_pool);
mddev->flush_bio_pool = NULL;
@@ -5945,7 +5933,6 @@ void md_stop(struct mddev *mddev)
mempool_destroy(mddev->flush_pool);
mddev->flush_pool = NULL;
}
->>>>>>> linux-next/akpm-base
bioset_exit(&mddev->bio_set);
bioset_exit(&mddev->sync_set);
}
diff -puN fs/afs/proc.c~linux-next-git-rejects fs/afs/proc.c
--- a/fs/afs/proc.c~linux-next-git-rejects
+++ a/fs/afs/proc.c
@@ -22,149 +22,9 @@ static inline struct afs_net *afs_seq2ne
return afs_net(seq_file_net(m));
}
-<<<<<<< HEAD
-static int afs_proc_cells_open(struct inode *inode, struct file *file);
-static void *afs_proc_cells_start(struct seq_file *p, loff_t *pos);
-static void *afs_proc_cells_next(struct seq_file *p, void *v, loff_t *pos);
-static void afs_proc_cells_stop(struct seq_file *p, void *v);
-static int afs_proc_cells_show(struct seq_file *m, void *v);
-static ssize_t afs_proc_cells_write(struct file *file, const char __user *buf,
- size_t size, loff_t *_pos);
-
-static const struct seq_operations afs_proc_cells_ops = {
- .start = afs_proc_cells_start,
- .next = afs_proc_cells_next,
- .stop = afs_proc_cells_stop,
- .show = afs_proc_cells_show,
-};
-
-static const struct file_operations afs_proc_cells_fops = {
- .open = afs_proc_cells_open,
- .read = seq_read,
- .write = afs_proc_cells_write,
- .llseek = seq_lseek,
- .release = seq_release,
-};
-
-static ssize_t afs_proc_rootcell_read(struct file *file, char __user *buf,
- size_t size, loff_t *_pos);
-static ssize_t afs_proc_rootcell_write(struct file *file,
- const char __user *buf,
- size_t size, loff_t *_pos);
-
-static const struct file_operations afs_proc_rootcell_fops = {
- .read = afs_proc_rootcell_read,
- .write = afs_proc_rootcell_write,
- .llseek = no_llseek,
-};
-
-static void *afs_proc_cell_volumes_start(struct seq_file *p, loff_t *pos);
-static void *afs_proc_cell_volumes_next(struct seq_file *p, void *v,
- loff_t *pos);
-static void afs_proc_cell_volumes_stop(struct seq_file *p, void *v);
-static int afs_proc_cell_volumes_show(struct seq_file *m, void *v);
-
-static const struct seq_operations afs_proc_cell_volumes_ops = {
- .start = afs_proc_cell_volumes_start,
- .next = afs_proc_cell_volumes_next,
- .stop = afs_proc_cell_volumes_stop,
- .show = afs_proc_cell_volumes_show,
-};
-
-static void *afs_proc_cell_vlservers_start(struct seq_file *p, loff_t *pos);
-static void *afs_proc_cell_vlservers_next(struct seq_file *p, void *v,
- loff_t *pos);
-static void afs_proc_cell_vlservers_stop(struct seq_file *p, void *v);
-static int afs_proc_cell_vlservers_show(struct seq_file *m, void *v);
-
-static const struct seq_operations afs_proc_cell_vlservers_ops = {
- .start = afs_proc_cell_vlservers_start,
- .next = afs_proc_cell_vlservers_next,
- .stop = afs_proc_cell_vlservers_stop,
- .show = afs_proc_cell_vlservers_show,
-};
-
-static void *afs_proc_servers_start(struct seq_file *p, loff_t *pos);
-static void *afs_proc_servers_next(struct seq_file *p, void *v,
- loff_t *pos);
-static void afs_proc_servers_stop(struct seq_file *p, void *v);
-static int afs_proc_servers_show(struct seq_file *m, void *v);
-
-static const struct seq_operations afs_proc_servers_ops = {
- .start = afs_proc_servers_start,
- .next = afs_proc_servers_next,
- .stop = afs_proc_servers_stop,
- .show = afs_proc_servers_show,
-};
-
-static int afs_proc_sysname_open(struct inode *inode, struct file *file);
-static int afs_proc_sysname_release(struct inode *inode, struct file *file);
-static void *afs_proc_sysname_start(struct seq_file *p, loff_t *pos);
-static void *afs_proc_sysname_next(struct seq_file *p, void *v,
- loff_t *pos);
-static void afs_proc_sysname_stop(struct seq_file *p, void *v);
-static int afs_proc_sysname_show(struct seq_file *m, void *v);
-static ssize_t afs_proc_sysname_write(struct file *file,
- const char __user *buf,
- size_t size, loff_t *_pos);
-
-static const struct seq_operations afs_proc_sysname_ops = {
- .start = afs_proc_sysname_start,
- .next = afs_proc_sysname_next,
- .stop = afs_proc_sysname_stop,
- .show = afs_proc_sysname_show,
-};
-
-static const struct file_operations afs_proc_sysname_fops = {
- .open = afs_proc_sysname_open,
- .read = seq_read,
- .llseek = seq_lseek,
- .release = afs_proc_sysname_release,
- .write = afs_proc_sysname_write,
-};
-
-static int afs_proc_stats_show(struct seq_file *m, void *v);
-
-/*
- * initialise the /proc/fs/afs/ directory
- */
-int afs_proc_init(struct afs_net *net)
-{
- _enter("");
-
- net->proc_afs = proc_mkdir("fs/afs", NULL);
- if (!net->proc_afs)
- goto error_dir;
-
- if (!proc_create("cells", 0644, net->proc_afs, &afs_proc_cells_fops) ||
- !proc_create("rootcell", 0644, net->proc_afs, &afs_proc_rootcell_fops) ||
- !proc_create_seq("servers", 0644, net->proc_afs, &afs_proc_servers_ops) ||
- !proc_create_single("stats", 0644, net->proc_afs, afs_proc_stats_show) ||
- !proc_create("sysname", 0644, net->proc_afs, &afs_proc_sysname_fops))
- goto error_tree;
-
- _leave(" = 0");
- return 0;
-
-error_tree:
- proc_remove(net->proc_afs);
-error_dir:
- _leave(" = -ENOMEM");
- return -ENOMEM;
-}
-
-/*
- * clean up the /proc/fs/afs/ directory
- */
-void afs_proc_cleanup(struct afs_net *net)
-{
- proc_remove(net->proc_afs);
- net->proc_afs = NULL;
-=======
static inline struct afs_net *afs_seq2net_single(struct seq_file *m)
{
return afs_net(seq_file_single_net(m));
->>>>>>> linux-next/akpm-base
}
/*
@@ -172,9 +32,6 @@ static inline struct afs_net *afs_seq2ne
*/
static int afs_proc_cells_show(struct seq_file *m, void *v)
{
-<<<<<<< HEAD
- return seq_open(file, &afs_proc_cells_ops);
-=======
struct afs_cell *cell = list_entry(v, struct afs_cell, proc_link);
struct afs_net *net = afs_seq2net(m);
@@ -187,7 +44,6 @@ static int afs_proc_cells_show(struct se
/* display one cell per line on subsequent lines */
seq_printf(m, "%3u %s\n", atomic_read(&cell->usage), cell->name);
return 0;
->>>>>>> linux-next/akpm-base
}
static void *afs_proc_cells_start(struct seq_file *m, loff_t *_pos)
@@ -334,54 +190,6 @@ out:
return ret;
}
-<<<<<<< HEAD
-/*
- * initialise /proc/fs/afs/<cell>/
- */
-int afs_proc_cell_setup(struct afs_net *net, struct afs_cell *cell)
-{
- struct proc_dir_entry *dir;
-
- _enter("%p{%s},%p", cell, cell->name, net->proc_afs);
-
- dir = proc_mkdir(cell->name, net->proc_afs);
- if (!dir)
- goto error_dir;
-
- if (!proc_create_seq_data("vlservers", 0, dir,
- &afs_proc_cell_vlservers_ops, cell))
- goto error_tree;
- if (!proc_create_seq_data("volumes", 0, dir, &afs_proc_cell_volumes_ops,
- cell))
- goto error_tree;
-
- _leave(" = 0");
- return 0;
-
-error_tree:
- remove_proc_subtree(cell->name, net->proc_afs);
-error_dir:
- _leave(" = -ENOMEM");
- return -ENOMEM;
-}
-
-/*
- * remove /proc/fs/afs/<cell>/
- */
-void afs_proc_cell_remove(struct afs_net *net, struct afs_cell *cell)
-{
- _enter("");
-
- remove_proc_subtree(cell->name, net->proc_afs);
-
- _leave("");
-}
-
-/*
- * set up the iterator to start reading from the cells list and return the
- * first item
- */
-=======
static const char afs_vol_types[3][3] = {
[AFSVL_RWVOL] = "RW",
[AFSVL_ROVOL] = "RO",
@@ -409,16 +217,10 @@ static int afs_proc_cell_volumes_show(st
return 0;
}
->>>>>>> linux-next/akpm-base
static void *afs_proc_cell_volumes_start(struct seq_file *m, loff_t *_pos)
__acquires(cell->proc_lock)
{
struct afs_cell *cell = PDE_DATA(file_inode(m->file));
-<<<<<<< HEAD
-
- _enter("cell=%p pos=%Ld", cell, *_pos);
-=======
->>>>>>> linux-next/akpm-base
read_lock(&cell->proc_lock);
return seq_list_start_head(&cell->proc_volumes, *_pos);
@@ -427,11 +229,7 @@ static void *afs_proc_cell_volumes_start
static void *afs_proc_cell_volumes_next(struct seq_file *m, void *v,
loff_t *_pos)
{
-<<<<<<< HEAD
- struct afs_cell *cell = PDE_DATA(file_inode(p->file));
-=======
struct afs_cell *cell = PDE_DATA(file_inode(m->file));
->>>>>>> linux-next/akpm-base
return seq_list_next(v, &cell->proc_volumes, _pos);
}
@@ -439,11 +237,7 @@ static void *afs_proc_cell_volumes_next(
static void afs_proc_cell_volumes_stop(struct seq_file *m, void *v)
__releases(cell->proc_lock)
{
-<<<<<<< HEAD
- struct afs_cell *cell = PDE_DATA(file_inode(p->file));
-=======
struct afs_cell *cell = PDE_DATA(file_inode(m->file));
->>>>>>> linux-next/akpm-base
read_unlock(&cell->proc_lock);
}
@@ -460,12 +254,7 @@ static const struct seq_operations afs_p
*/
static int afs_proc_cell_vlservers_show(struct seq_file *m, void *v)
{
-<<<<<<< HEAD
- struct afs_cell *cell = PDE_DATA(file_inode(m->file));
- struct afs_volume *vol = list_entry(v, struct afs_volume, proc_link);
-=======
struct sockaddr_rxrpc *addr = v;
->>>>>>> linux-next/akpm-base
/* display header on line 1 */
if (v == (void *)1) {
@@ -473,25 +262,11 @@ static int afs_proc_cell_vlservers_show(
return 0;
}
-<<<<<<< HEAD
- seq_printf(m, "%3d %08x %s\n",
- atomic_read(&vol->usage), vol->vid,
- afs_vol_types[vol->type]);
-
- return 0;
-}
-
-/*
- * set up the iterator to start reading from the cells list and return the
- * first item
- */
-=======
/* display one cell per line on subsequent lines */
seq_printf(m, "%pISp\n", &addr->transport);
return 0;
}
->>>>>>> linux-next/akpm-base
static void *afs_proc_cell_vlservers_start(struct seq_file *m, loff_t *_pos)
__acquires(rcu)
{
@@ -518,11 +293,7 @@ static void *afs_proc_cell_vlservers_nex
loff_t *_pos)
{
struct afs_addr_list *alist;
-<<<<<<< HEAD
- struct afs_cell *cell = PDE_DATA(file_inode(p->file));
-=======
struct afs_cell *cell = PDE_DATA(file_inode(m->file));
->>>>>>> linux-next/akpm-base
loff_t pos;
alist = rcu_dereference(cell->vl_addrs);
@@ -570,13 +341,6 @@ static int afs_proc_servers_show(struct
return 0;
}
-<<<<<<< HEAD
-/*
- * Set up the iterator to start reading from the server list and return the
- * first item.
- */
-=======
->>>>>>> linux-next/akpm-base
static void *afs_proc_servers_start(struct seq_file *m, loff_t *_pos)
__acquires(rcu)
{
@@ -777,8 +541,6 @@ static int afs_proc_stats_show(struct se
atomic_long_read(&net->n_store_bytes));
return 0;
}
-<<<<<<< HEAD
-=======
/*
* initialise /proc/fs/afs/<cell>/
@@ -877,4 +639,3 @@ void afs_proc_cleanup(struct afs_net *ne
proc_remove(net->proc_afs);
net->proc_afs = NULL;
}
->>>>>>> linux-next/akpm-base
diff -puN fs/proc/internal.h~linux-next-git-rejects fs/proc/internal.h
--- a/fs/proc/internal.h~linux-next-git-rejects
+++ a/fs/proc/internal.h
@@ -48,10 +48,7 @@ struct proc_dir_entry {
const struct seq_operations *seq_ops;
int (*single_show)(struct seq_file *, void *);
};
-<<<<<<< HEAD
-=======
proc_write_t write;
->>>>>>> linux-next/akpm-base
void *data;
unsigned int state_size;
unsigned int low_ino;
diff -puN fs/proc/proc_net.c~linux-next-git-rejects fs/proc/proc_net.c
--- a/fs/proc/proc_net.c~linux-next-git-rejects
+++ a/fs/proc/proc_net.c
@@ -43,16 +43,11 @@ static int seq_open_net(struct inode *in
unsigned int state_size = PDE(inode)->state_size;
struct seq_net_private *p;
struct net *net;
-<<<<<<< HEAD
-
- WARN_ON_ONCE(state_size < sizeof(*p));
-=======
WARN_ON_ONCE(state_size < sizeof(*p));
if (file->f_mode & FMODE_WRITE && !PDE(inode)->write)
return -EACCES;
->>>>>>> linux-next/akpm-base
net = get_proc_net(inode);
if (!net)
@@ -81,10 +76,7 @@ static int seq_release_net(struct inode
static const struct file_operations proc_net_seq_fops = {
.open = seq_open_net,
.read = seq_read,
-<<<<<<< HEAD
-=======
.write = proc_simple_write,
->>>>>>> linux-next/akpm-base
.llseek = seq_lseek,
.release = seq_release_net,
};
@@ -104,8 +96,6 @@ struct proc_dir_entry *proc_create_net_d
return proc_register(parent, p);
}
EXPORT_SYMBOL_GPL(proc_create_net_data);
-<<<<<<< HEAD
-=======
/**
* proc_create_net_data_write - Create a writable net_ns-specific proc file
@@ -150,7 +140,6 @@ struct proc_dir_entry *proc_create_net_d
return proc_register(parent, p);
}
EXPORT_SYMBOL_GPL(proc_create_net_data_write);
->>>>>>> linux-next/akpm-base
static int single_open_net(struct inode *inode, struct file *file)
{
@@ -178,10 +167,7 @@ static int single_release_net(struct ino
static const struct file_operations proc_net_single_fops = {
.open = single_open_net,
.read = seq_read,
-<<<<<<< HEAD
-=======
.write = proc_simple_write,
->>>>>>> linux-next/akpm-base
.llseek = seq_lseek,
.release = single_release_net,
};
@@ -200,8 +186,6 @@ struct proc_dir_entry *proc_create_net_s
return proc_register(parent, p);
}
EXPORT_SYMBOL_GPL(proc_create_net_single);
-<<<<<<< HEAD
-=======
/**
* proc_create_net_single_write - Create a writable net_ns-specific proc file
@@ -245,7 +229,6 @@ struct proc_dir_entry *proc_create_net_s
return proc_register(parent, p);
}
EXPORT_SYMBOL_GPL(proc_create_net_single_write);
->>>>>>> linux-next/akpm-base
static struct net *get_proc_task_net(struct inode *dir)
{
diff -puN fs/read_write.c~linux-next-git-rejects fs/read_write.c
--- a/fs/read_write.c~linux-next-git-rejects
+++ a/fs/read_write.c
@@ -2052,37 +2052,12 @@ int vfs_dedupe_file_range(struct file *f
info->status = -EBADF;
goto next_loop;
}
-<<<<<<< HEAD
- dst = file_inode(dst_file);
-
- ret = mnt_want_write_file(dst_file);
- if (ret) {
- info->status = ret;
- goto next_fdput;
- }
-
- dst_off = info->dest_offset;
- ret = clone_verify_area(dst_file, dst_off, len, true);
- if (ret < 0) {
- info->status = ret;
- goto next_file;
- }
- ret = 0;
-=======
->>>>>>> linux-next/akpm-base
if (info->reserved) {
info->status = -EINVAL;
goto next_loop;
}
-<<<<<<< HEAD
-next_file:
- mnt_drop_write_file(dst_file);
-next_fdput:
- fdput(dst_fd);
-next_loop:
-=======
deduped = vfs_dedupe_file_range_one(file, off, dst_file,
info->dest_offset, len);
if (deduped == -EBADE)
@@ -2094,7 +2069,6 @@ next_loop:
next_loop:
fdput(dst_fd);
->>>>>>> linux-next/akpm-base
if (fatal_signal_pending(current))
goto out;
}
diff -puN include/linux/device.h~linux-next-git-rejects include/linux/device.h
--- a/include/linux/device.h~linux-next-git-rejects
+++ a/include/linux/device.h
@@ -98,11 +98,8 @@ extern void bus_remove_file(struct bus_t
* @p: The private data of the driver core, only the driver core can
* touch this.
* @lock_key: Lock class key for use by the lock validator
-<<<<<<< HEAD
-=======
* @need_parent_lock: When probing or removing a device on this bus, the
* device core should lock the device's parent.
->>>>>>> linux-next/akpm-base
*
* A bus is a channel between the processor and one or more devices. For the
* purposes of the device model, all devices are connected via a bus, even if
@@ -143,11 +140,8 @@ struct bus_type {
struct subsys_private *p;
struct lock_class_key lock_key;
-<<<<<<< HEAD
-=======
bool need_parent_lock;
->>>>>>> linux-next/akpm-base
};
extern int __must_check bus_register(struct bus_type *bus);
diff -puN include/linux/proc_fs.h~linux-next-git-rejects include/linux/proc_fs.h
--- a/include/linux/proc_fs.h~linux-next-git-rejects
+++ a/include/linux/proc_fs.h
@@ -63,8 +63,6 @@ struct proc_dir_entry *proc_create_net_d
struct proc_dir_entry *proc_create_net_single(const char *name, umode_t mode,
struct proc_dir_entry *parent,
int (*show)(struct seq_file *, void *), void *data);
-<<<<<<< HEAD
-=======
struct proc_dir_entry *proc_create_net_data_write(const char *name, umode_t mode,
struct proc_dir_entry *parent,
const struct seq_operations *ops,
@@ -75,7 +73,6 @@ struct proc_dir_entry *proc_create_net_s
int (*show)(struct seq_file *, void *),
proc_write_t write,
void *data);
->>>>>>> linux-next/akpm-base
#else /* CONFIG_PROC_FS */
diff -puN net/ipv4/ipconfig.c~linux-next-git-rejects net/ipv4/ipconfig.c
--- a/net/ipv4/ipconfig.c~linux-next-git-rejects
+++ a/net/ipv4/ipconfig.c
@@ -1317,8 +1317,6 @@ static int pnp_seq_show(struct seq_file
&ic_servaddr);
return 0;
}
-<<<<<<< HEAD
-=======
/* Create the /proc/net/ipconfig directory */
static int __init ipconfig_proc_net_init(void)
{
@@ -1374,7 +1372,6 @@ static const struct file_operations ntp_
.llseek = seq_lseek,
.release = single_release,
};
->>>>>>> linux-next/akpm-base
#endif /* CONFIG_PROC_FS */
/*
@@ -1460,12 +1457,9 @@ static int __init ip_auto_config(void)
#ifdef CONFIG_PROC_FS
proc_create_single("pnp", 0444, init_net.proc_net, pnp_seq_show);
-<<<<<<< HEAD
-=======
if (ipconfig_proc_net_init() == 0)
ipconfig_proc_net_create("ntp_servers", &ntp_servers_seq_fops);
->>>>>>> linux-next/akpm-base
#endif /* CONFIG_PROC_FS */
if (!ic_enable)
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-fix-race-between-kmem_cache-destroy-create-and-deactivate-v2-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
fs-ocfs2-adding-new-return-type-vm_fault_t-fix.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
zram-introduce-zram-memory-tracking-fix.patch
zram-introduce-zram-memory-tracking-update-fix.patch
zram-introduce-zram-memory-tracking-update-fix-fix.patch
mm-check-for-sigkill-inside-dup_mmap-loop-fix.patch
mm-vmalloc-pass-proper-vm_start-into-debugobjects-fix.patch
mm-shmem-make-statst_blksize-return-huge-page-size-if-thp-is-on-fix.patch
mm-ksm-move-page_stable_node-from-ksmh-to-ksmc-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-cgroup-aware-oom-killer-fix-2.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-simpler-iterations-for-proc-cmdline-fix.patch
revert-autofs-update-fs-autofs4-kconfig-fix.patch
kcov-prefault-the-kcov_area-fix.patch
kcov-prefault-the-kcov_area-fix-fix.patch
kcov-prefault-the-kcov_area-fix-fix-fix.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.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
