The patch titled
Subject: linux-next-git-rejects
has been added to the -mm tree. Its filename is
linux-next-git-rejects.patch
This patch should soon appear at
https://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
https://ozlabs.org/~akpm/mmotm/broken-out/linux-next-git-rejects.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: linux-next-git-rejects
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
MAINTAINERS | 8 --------
block/genhd.c | 4 ----
drivers/block/loop.c | 7 -------
drivers/hid/wacom_wac.c | 8 --------
drivers/nfc/s3fwrn5/firmware.c | 4 ----
5 files changed, 31 deletions(-)
--- a/block/genhd.c~linux-next-git-rejects
+++ a/block/genhd.c
@@ -1100,11 +1100,7 @@ static void disk_release(struct device *
xa_destroy(&disk->part_tbl);
if (test_bit(GD_QUEUE_REF, &disk->state) && disk->queue)
blk_put_queue(disk->queue);
-<<<<<<< HEAD
- bdput(disk->part0); /* frees the disk */
-=======
iput(disk->part0->bd_inode); /* frees the disk */
->>>>>>> linux-next/akpm-base
}
static int block_uevent(struct device *dev, struct kobj_uevent_env *env)
--- a/drivers/block/loop.c~linux-next-git-rejects
+++ a/drivers/block/loop.c
@@ -1306,13 +1306,6 @@ static int loop_configure(struct loop_de
if (partscan)
lo->lo_disk->flags &= ~GENHD_FL_NO_PART_SCAN;
-<<<<<<< HEAD
- /* Grab the block_device to prevent its destruction after we
- * put /dev/loopXX inode. Later in __loop_clr_fd() we bdput(bdev).
- */
- bdgrab(bdev);
-=======
->>>>>>> linux-next/akpm-base
loop_global_unlock(lo, is_loop);
if (partscan)
loop_reread_partitions(lo);
--- a/drivers/hid/wacom_wac.c~linux-next-git-rejects
+++ a/drivers/hid/wacom_wac.c
@@ -2554,10 +2554,6 @@ static void wacom_wac_finger_slot(struct
int slot;
slot = input_mt_get_slot_by_key(input, hid_data->id);
-<<<<<<< HEAD
- if (slot < 0)
- return;
-=======
if (slot < 0) {
return;
} else {
@@ -2569,7 +2565,6 @@ static void wacom_wac_finger_slot(struct
return;
}
}
->>>>>>> linux-next/akpm-base
input_mt_slot(input, slot);
input_mt_report_slot_state(input, MT_TOOL_FINGER, prox);
@@ -3865,10 +3860,7 @@ int wacom_setup_touch_input_capabilities
input_dev->evbit[0] |= BIT_MASK(EV_SW);
__set_bit(SW_MUTE_DEVICE, input_dev->swbit);
wacom_wac->has_mute_touch_switch = true;
-<<<<<<< HEAD
-=======
wacom_wac->is_soft_touch_switch = true;
->>>>>>> linux-next/akpm-base
}
fallthrough;
--- a/drivers/nfc/s3fwrn5/firmware.c~linux-next-git-rejects
+++ a/drivers/nfc/s3fwrn5/firmware.c
@@ -423,11 +423,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_f
if (IS_ERR(tfm)) {
dev_err(&fw_info->ndev->nfc_dev->dev,
"Cannot allocate shash (code=%pe)\n", tfm);
-<<<<<<< HEAD
- goto out;
-=======
return PTR_ERR(tfm);
->>>>>>> linux-next/akpm-base
}
ret = crypto_shash_tfm_digest(tfm, fw->image, image_size, hash_data);
--- a/MAINTAINERS~linux-next-git-rejects
+++ a/MAINTAINERS
@@ -11365,19 +11365,11 @@ W: https://linuxtv.org
T: git git://linuxtv.org/media_tree.git
F: drivers/media/radio/radio-maxiradio*
-<<<<<<< HEAD
-MCAB MICROCHIP CAN BUS ANALYZER TOOL DRIVER
-R: Yasushi SHOJI <yashi@xxxxxxxxxxxxxxx>
-L: linux-can@xxxxxxxxxxxxxxx
-S: Maintained
-F: drivers/net/can/usb/mcba_usb.c
-=======
MAXLINEAR ETHERNET PHY DRIVER
M: Xu Liang <lxu@xxxxxxxxxxxxx>
L: netdev@xxxxxxxxxxxxxxx
S: Supported
F: drivers/net/phy/mxl-gpy.c
->>>>>>> linux-next/akpm-base
MCAN MMIO DEVICE DRIVER
M: Chandrasekar Ramakrishnan <rcsekar@xxxxxxxxxxx>
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm.patch
lazy-tlb-allow-lazy-tlb-mm-refcounting-to-be-configurable-fix.patch
mm-compaction-optimize-proactive-compaction-deferrals-fix.patch
mm-hugetlb-add-support-for-mempolicy-mpol_preferred_many-fix.patch
mm-mempolicy-convert-from-atomic_t-to-refcount_t-on-mempolicy-refcnt-fix.patch
linux-next-rejects.patch
linux-next-git-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
