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
http://ozlabs.org/~akpm/mmots/broken-out/linux-next-git-rejects.patch
and later at
http://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/SubmitChecklist 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>
---
arch/s390/kvm/kvm-s390.c | 3
drivers/gpio/gpio-rcar.c | 14 ----
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 15 ----
drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 -
drivers/gpu/drm/i915/intel_lrc.c | 8 --
drivers/gpu/drm/sun4i/sun4i_tcon.c | 4 -
drivers/watchdog/hpwdt.c | 40 ------------
7 files changed, 88 deletions(-)
diff -puN arch/s390/kvm/kvm-s390.c~linux-next-git-rejects arch/s390/kvm/kvm-s390.c
--- a/arch/s390/kvm/kvm-s390.c~linux-next-git-rejects
+++ a/arch/s390/kvm/kvm-s390.c
@@ -88,10 +88,7 @@ struct kvm_stats_debugfs_item debugfs_en
{ "deliver_restart_signal", VCPU_STAT(deliver_restart_signal) },
{ "deliver_program_interruption", VCPU_STAT(deliver_program_int) },
{ "deliver_io_interrupt", VCPU_STAT(deliver_io_int) },
-<<<<<<< HEAD
-=======
{ "deliver_machine_check", VCPU_STAT(deliver_machine_check) },
->>>>>>> linux-next/akpm-base
{ "exit_wait_state", VCPU_STAT(exit_wait_state) },
{ "instruction_epsw", VCPU_STAT(instruction_epsw) },
{ "instruction_gs", VCPU_STAT(instruction_gs) },
diff -puN drivers/gpio/gpio-rcar.c~linux-next-git-rejects drivers/gpio/gpio-rcar.c
--- a/drivers/gpio/gpio-rcar.c~linux-next-git-rejects
+++ a/drivers/gpio/gpio-rcar.c
@@ -49,10 +49,7 @@ struct gpio_rcar_priv {
unsigned int irq_parent;
atomic_t wakeup_path;
bool has_both_edge_trigger;
-<<<<<<< HEAD
-=======
struct gpio_rcar_bank_info bank_info;
->>>>>>> linux-next/akpm-base
};
#define IOINTSEL 0x00 /* General IO/Interrupt Switching Register */
@@ -526,12 +523,6 @@ static int gpio_rcar_remove(struct platf
return 0;
}
-<<<<<<< HEAD
-static int __maybe_unused gpio_rcar_suspend(struct device *dev)
-{
- struct gpio_rcar_priv *p = dev_get_drvdata(dev);
-
-=======
#ifdef CONFIG_PM_SLEEP
static int gpio_rcar_suspend(struct device *dev)
{
@@ -546,16 +537,12 @@ static int gpio_rcar_suspend(struct devi
if (p->has_both_edge_trigger)
p->bank_info.bothedge = gpio_rcar_read(p, BOTHEDGE);
->>>>>>> linux-next/akpm-base
if (atomic_read(&p->wakeup_path))
device_set_wakeup_path(dev);
return 0;
}
-<<<<<<< HEAD
-static SIMPLE_DEV_PM_OPS(gpio_rcar_pm_ops, gpio_rcar_suspend, NULL);
-=======
static int gpio_rcar_resume(struct device *dev)
{
struct gpio_rcar_priv *p = dev_get_drvdata(dev);
@@ -592,7 +579,6 @@ static int gpio_rcar_resume(struct devic
#endif /* CONFIG_PM_SLEEP*/
static SIMPLE_DEV_PM_OPS(gpio_rcar_pm_ops, gpio_rcar_suspend, gpio_rcar_resume);
->>>>>>> linux-next/akpm-base
static struct platform_driver gpio_rcar_device_driver = {
.probe = gpio_rcar_probe,
diff -puN drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c~linux-next-git-rejects drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2520,12 +2520,7 @@ static const struct drm_crtc_funcs amdgp
.page_flip = drm_atomic_helper_page_flip,
.atomic_duplicate_state = dm_crtc_duplicate_state,
.atomic_destroy_state = dm_crtc_destroy_state,
-<<<<<<< HEAD
- .enable_vblank = dm_enable_vblank,
- .disable_vblank = dm_disable_vblank,
-=======
.set_crc_source = amdgpu_dm_crtc_set_crc_source,
->>>>>>> linux-next/akpm-base
};
static enum drm_connector_status
@@ -4778,16 +4773,6 @@ static int dm_update_planes_state(struct
return ret;
}
-<<<<<<< HEAD
- /*
- * Any atomic check errors that occur after this will
- * not need a release. The plane state will be attached
- * to the stream, and therefore part of the atomic
- * state. It'll be released when the atomic state is
- * cleaned.
- */
-=======
->>>>>>> linux-next/akpm-base
if (!dc_add_plane_to_context(
dc,
dm_new_crtc_state->stream,
diff -puN drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h~linux-next-git-rejects drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h
--- a/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h
@@ -201,10 +201,6 @@ struct hw_sequencer_funcs {
void (*set_cursor_position)(struct pipe_ctx *pipe);
void (*set_cursor_attribute)(struct pipe_ctx *pipe);
-<<<<<<< HEAD
-
-=======
->>>>>>> linux-next/akpm-base
};
void color_space_to_black_color(
diff -puN drivers/gpu/drm/i915/intel_lrc.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_lrc.c
--- a/drivers/gpu/drm/i915/intel_lrc.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_lrc.c
@@ -749,9 +749,6 @@ static void execlists_cancel_requests(st
GEM_TRACE("%s\n", engine->name);
-<<<<<<< HEAD
- spin_lock_irqsave(&engine->timeline->lock, flags);
-=======
/*
* Before we call engine->cancel_requests(), we should have exclusive
* access to the submission state. This is arranged for us by the
@@ -767,7 +764,6 @@ static void execlists_cancel_requests(st
* it is irq state.)
*/
local_irq_save(flags);
->>>>>>> linux-next/akpm-base
/* Cancel the requests on the HW and clear the ELSP tracker. */
execlists_cancel_port_requests(execlists);
@@ -820,11 +816,7 @@ static void execlists_cancel_requests(st
/* Mark all CS interrupts as complete */
execlists->active = 0;
-<<<<<<< HEAD
- spin_unlock_irqrestore(&engine->timeline->lock, flags);
-=======
local_irq_restore(flags);
->>>>>>> linux-next/akpm-base
}
/*
diff -puN drivers/gpu/drm/sun4i/sun4i_tcon.c~linux-next-git-rejects drivers/gpu/drm/sun4i/sun4i_tcon.c
--- a/drivers/gpu/drm/sun4i/sun4i_tcon.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/sun4i/sun4i_tcon.c
@@ -1164,16 +1164,12 @@ static const struct sun4i_tcon_quirks su
};
static const struct sun4i_tcon_quirks sun8i_a83t_lcd_quirks = {
-<<<<<<< HEAD
- .supports_lvds = true,
-=======
.has_channel_0 = true,
.supports_lvds = true,
};
static const struct sun4i_tcon_quirks sun8i_a83t_tv_quirks = {
.has_channel_1 = true,
->>>>>>> linux-next/akpm-base
};
static const struct sun4i_tcon_quirks sun8i_v3s_quirks = {
diff -puN drivers/watchdog/hpwdt.c~linux-next-git-rejects drivers/watchdog/hpwdt.c
--- a/drivers/watchdog/hpwdt.c~linux-next-git-rejects
+++ a/drivers/watchdog/hpwdt.c
@@ -36,15 +36,7 @@
static bool ilo5;
static unsigned int soft_margin = DEFAULT_MARGIN; /* in seconds */
static bool nowayout = WATCHDOG_NOWAYOUT;
-<<<<<<< HEAD
-#ifdef CONFIG_HPWDT_NMI_DECODING
-static unsigned int allow_kdump = 1;
-#endif
-static char expect_release;
-static unsigned long hpwdt_is_open;
-=======
static bool pretimeout = IS_ENABLED(CONFIG_HPWDT_NMI_DECODING);
->>>>>>> linux-next/akpm-base
static void __iomem *pci_mem_addr; /* the PCI-memory address */
static unsigned long __iomem *hpwdt_nmistat;
@@ -58,8 +50,6 @@ static const struct pci_device_id hpwdt_
};
MODULE_DEVICE_TABLE(pci, hpwdt_devices);
-<<<<<<< HEAD
-=======
/*
* Watchdog operations
@@ -103,7 +93,6 @@ static int hpwdt_ping(struct watchdog_de
return 0;
}
->>>>>>> linux-next/akpm-base
static unsigned int hpwdt_gettimeleft(struct watchdog_device *wdd)
{
@@ -161,21 +150,6 @@ static int hpwdt_my_nmi(void)
*/
static int hpwdt_pretimeout(unsigned int ulReason, struct pt_regs *regs)
{
-<<<<<<< HEAD
- if ((ulReason == NMI_UNKNOWN) && !hpwdt_my_nmi())
- return NMI_DONE;
-
- if (allow_kdump)
- hpwdt_stop();
-
- nmi_panic(regs, "An NMI occurred. Depending on your system the reason "
- "for the NMI is logged in any one of the following "
- "resources:\n"
- "1. Integrated Management Log (IML)\n"
- "2. OA Syslog\n"
- "3. OA Forward Progress Log\n"
- "4. iLO Event Log");
-=======
unsigned int mynmi = hpwdt_my_nmi();
static char panic_msg[] =
"00: An NMI occurred. Depending on your system the reason "
@@ -195,7 +169,6 @@ static int hpwdt_pretimeout(unsigned int
hex_byte_pack(panic_msg, mynmi);
nmi_panic(regs, panic_msg);
->>>>>>> linux-next/akpm-base
return NMI_HANDLED;
}
@@ -226,12 +199,6 @@ static const struct watchdog_ops hpwdt_o
#endif
};
-<<<<<<< HEAD
-/*
- * Init & Exit
- */
-
-=======
static struct watchdog_device hpwdt_dev = {
.info = &ident,
.ops = &hpwdt_ops,
@@ -247,7 +214,6 @@ static struct watchdog_device hpwdt_dev
/*
* Init & Exit
*/
->>>>>>> linux-next/akpm-base
static int hpwdt_init_nmi_decoding(struct pci_dev *dev)
{
@@ -403,14 +369,8 @@ MODULE_PARM_DESC(nowayout, "Watchdog can
__MODULE_STRING(WATCHDOG_NOWAYOUT) ")");
#ifdef CONFIG_HPWDT_NMI_DECODING
-<<<<<<< HEAD
-module_param(allow_kdump, int, 0);
-MODULE_PARM_DESC(allow_kdump, "Start a kernel dump after NMI occurs");
-#endif /* CONFIG_HPWDT_NMI_DECODING */
-=======
module_param(pretimeout, bool, 0);
MODULE_PARM_DESC(pretimeout, "Watchdog pretimeout enabled");
#endif
->>>>>>> linux-next/akpm-base
module_pci_driver(hpwdt_driver);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.patch
mm-mempolicy-avoid-use-uninitialized-preferred_node-fix.patch
hugetlbfs-check-for-pgoff-value-overflow-v3-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
ocfs2-without-quota-support-try-to-avoid-calling-quota-recovery-checkpatch-fixes.patch
mm.patch
mm-initialize-pages-on-demand-during-boot-fix-4-fix.patch
mm-initialize-pages-on-demand-during-boot-v5-fix.patch
mm-page_alloc-skip-over-regions-of-invalid-pfns-on-uma-fix.patch
direct-io-minor-cleanups-in-do_blockdev_direct_io-fix.patch
mm-fix-races-between-swapoff-and-flush-dcache-fix.patch
list_lru-prefetch-neighboring-list-entries-before-acquiring-lock-fix.patch
mm-oom-cgroup-aware-oom-killer-fix.patch
mm-oom-docs-describe-the-cgroup-aware-oom-killer-fix-2-fix.patch
proc-add-seq_put_decimal_ull_width-to-speed-up-proc-pid-smaps-fix.patch
linux-next-rejects.patch
linux-next-fixup.patch
fs-fsnotify-account-fsnotify-metadata-to-kmemcg-fix.patch
headers-untangle-kmemleakh-from-mmh-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
linux-next-git-rejects.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
