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/amba/bus.c | 3 ---
drivers/gpu/drm/i915/intel_runtime_pm.c | 10 ----------
drivers/usb/core/hcd.c | 17 -----------------
net/ceph/messenger.c | 4 ----
sound/soc/codecs/adau17x1.c | 3 ---
5 files changed, 37 deletions(-)
diff -puN drivers/amba/bus.c~linux-next-git-rejects drivers/amba/bus.c
--- a/drivers/amba/bus.c~linux-next-git-rejects
+++ a/drivers/amba/bus.c
@@ -71,12 +71,9 @@ static ssize_t driver_override_show(stru
struct amba_device *dev = to_amba_device(_dev);
ssize_t len;
-<<<<<<< HEAD
-=======
if (!dev->driver_override)
return 0;
->>>>>>> linux-next/akpm-base
device_lock(_dev);
len = sprintf(buf, "%s\n", dev->driver_override);
device_unlock(_dev);
diff -puN drivers/gpu/drm/i915/intel_runtime_pm.c~linux-next-git-rejects drivers/gpu/drm/i915/intel_runtime_pm.c
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -647,16 +647,6 @@ static void skl_enable_dc6(struct drm_i9
SKL_SELECT_ALTERNATE_DC_EXIT);
gen9_set_dc_state(dev_priv, DC_STATE_EN_UPTO_DC6);
-<<<<<<< HEAD
-}
-
-void skl_disable_dc6(struct drm_i915_private *dev_priv)
-{
- DRM_DEBUG_KMS("Disabling DC6\n");
-
- gen9_set_dc_state(dev_priv, DC_STATE_DISABLE);
-=======
->>>>>>> linux-next/akpm-base
}
static void hsw_power_well_sync_hw(struct drm_i915_private *dev_priv,
diff -puN drivers/usb/core/hcd.c~linux-next-git-rejects drivers/usb/core/hcd.c
--- a/drivers/usb/core/hcd.c~linux-next-git-rejects
+++ a/drivers/usb/core/hcd.c
@@ -2745,19 +2745,12 @@ int usb_add_hcd(struct usb_hcd *hcd,
if (!hcd->skip_phy_initialization && usb_hcd_is_primary_hcd(hcd)) {
hcd->phy_roothub = usb_phy_roothub_alloc(hcd->self.sysdev);
-<<<<<<< HEAD
- if (IS_ERR(hcd->phy_roothub)) {
- retval = PTR_ERR(hcd->phy_roothub);
- goto err_phy_roothub_alloc;
- }
-=======
if (IS_ERR(hcd->phy_roothub))
return PTR_ERR(hcd->phy_roothub);
retval = usb_phy_roothub_init(hcd->phy_roothub);
if (retval)
return retval;
->>>>>>> linux-next/akpm-base
retval = usb_phy_roothub_init(hcd->phy_roothub);
if (retval)
@@ -2942,16 +2935,6 @@ err_create_buf:
usb_phy_roothub_power_off(hcd->phy_roothub);
err_usb_phy_roothub_power_on:
usb_phy_roothub_exit(hcd->phy_roothub);
-<<<<<<< HEAD
-err_phy_roothub_alloc:
- if (hcd->remove_phy && hcd->usb_phy) {
- usb_phy_shutdown(hcd->usb_phy);
- usb_put_phy(hcd->usb_phy);
- hcd->usb_phy = NULL;
- }
-=======
-
->>>>>>> linux-next/akpm-base
return retval;
}
EXPORT_SYMBOL_GPL(usb_add_hcd);
diff -puN net/ceph/messenger.c~linux-next-git-rejects net/ceph/messenger.c
--- a/net/ceph/messenger.c~linux-next-git-rejects
+++ a/net/ceph/messenger.c
@@ -2570,10 +2570,6 @@ static int try_write(struct ceph_connect
dout("try_write start %p state %lu\n", con, con->state);
if (con->state != CON_STATE_PREOPEN &&
-<<<<<<< HEAD
- con->state != CON_STATE_CONNECTING &&
-=======
->>>>>>> linux-next/akpm-base
con->state != CON_STATE_NEGOTIATING &&
con->state != CON_STATE_OPEN)
return 0;
diff -puN sound/soc/codecs/adau17x1.c~linux-next-git-rejects sound/soc/codecs/adau17x1.c
--- a/sound/soc/codecs/adau17x1.c~linux-next-git-rejects
+++ a/sound/soc/codecs/adau17x1.c
@@ -843,8 +843,6 @@ int adau17x1_setup_firmware(struct snd_s
struct adau *adau = snd_soc_component_get_drvdata(component);
struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
-<<<<<<< HEAD
-=======
/* Check if sample rate is the same as before. If it is there is no
* point in performing the below steps as the call to
* sigmadsp_setup(...) will return directly when it finds the sample
@@ -854,7 +852,6 @@ int adau17x1_setup_firmware(struct snd_s
if (adau->sigmadsp->current_samplerate == rate)
return 0;
->>>>>>> linux-next/akpm-base
snd_soc_dapm_mutex_lock(dapm);
ret = regmap_read(adau->regmap, ADAU17X1_DSP_SAMPLING_RATE, &dspsr);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
i-need-old-gcc.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
zram-introduce-zram-memory-tracking-update-fix.patch
mm-check-for-sigkill-inside-dup_mmap-loop-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
mm-oom-cgroup-aware-oom-killer-fix-fix.patch
proc-simpler-iterations-for-proc-cmdline-fix.patch
ida-remove-simple_ida_lock-fix.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
