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/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>
---
crypto/crypto_user_base.c | 65 -------------------------
crypto/crypto_user_stat.c | 47 ------------------
drivers/gpu/drm/i915/intel_display.c | 8 ---
drivers/gpu/drm/i915/intel_hotplug.c | 7 --
drivers/gpu/drm/i915/intel_sprite.c | 32 ------------
drivers/scsi/scsi_lib.c | 35 -------------
6 files changed, 194 deletions(-)
--- a/crypto/crypto_user_base.c~linux-next-git-rejects
+++ a/crypto/crypto_user_base.c
@@ -84,13 +84,9 @@ static int crypto_report_cipher(struct s
{
struct crypto_report_cipher rcipher;
-<<<<<<< HEAD
- strncpy(rcipher.type, "cipher", sizeof(rcipher.type));
-=======
memset(&rcipher, 0, sizeof(rcipher));
strscpy(rcipher.type, "cipher", sizeof(rcipher.type));
->>>>>>> linux-next/akpm-base
rcipher.blocksize = alg->cra_blocksize;
rcipher.min_keysize = alg->cra_cipher.cia_min_keysize;
@@ -104,55 +100,7 @@ static int crypto_report_comp(struct sk_
{
struct crypto_report_comp rcomp;
-<<<<<<< HEAD
- strncpy(rcomp.type, "compression", sizeof(rcomp.type));
- if (nla_put(skb, CRYPTOCFGA_REPORT_COMPRESS,
- sizeof(struct crypto_report_comp), &rcomp))
- goto nla_put_failure;
- return 0;
-
-nla_put_failure:
- return -EMSGSIZE;
-}
-
-static int crypto_report_acomp(struct sk_buff *skb, struct crypto_alg *alg)
-{
- struct crypto_report_acomp racomp;
-
- strncpy(racomp.type, "acomp", sizeof(racomp.type));
-
- if (nla_put(skb, CRYPTOCFGA_REPORT_ACOMP,
- sizeof(struct crypto_report_acomp), &racomp))
- goto nla_put_failure;
- return 0;
-
-nla_put_failure:
- return -EMSGSIZE;
-}
-
-static int crypto_report_akcipher(struct sk_buff *skb, struct crypto_alg *alg)
-{
- struct crypto_report_akcipher rakcipher;
-
- strncpy(rakcipher.type, "akcipher", sizeof(rakcipher.type));
-
- if (nla_put(skb, CRYPTOCFGA_REPORT_AKCIPHER,
- sizeof(struct crypto_report_akcipher), &rakcipher))
- goto nla_put_failure;
- return 0;
-
-nla_put_failure:
- return -EMSGSIZE;
-}
-
-static int crypto_report_kpp(struct sk_buff *skb, struct crypto_alg *alg)
-{
- struct crypto_report_kpp rkpp;
-
- strncpy(rkpp.type, "kpp", sizeof(rkpp.type));
-=======
memset(&rcomp, 0, sizeof(rcomp));
->>>>>>> linux-next/akpm-base
strscpy(rcomp.type, "compression", sizeof(rcomp.type));
@@ -162,19 +110,12 @@ static int crypto_report_kpp(struct sk_b
static int crypto_report_one(struct crypto_alg *alg,
struct crypto_user_alg *ualg, struct sk_buff *skb)
{
-<<<<<<< HEAD
- strncpy(ualg->cru_name, alg->cra_name, sizeof(ualg->cru_name));
- strncpy(ualg->cru_driver_name, alg->cra_driver_name,
- sizeof(ualg->cru_driver_name));
- strncpy(ualg->cru_module_name, module_name(alg->cra_module),
-=======
memset(ualg, 0, sizeof(*ualg));
strscpy(ualg->cru_name, alg->cra_name, sizeof(ualg->cru_name));
strscpy(ualg->cru_driver_name, alg->cra_driver_name,
sizeof(ualg->cru_driver_name));
strscpy(ualg->cru_module_name, module_name(alg->cra_module),
->>>>>>> linux-next/akpm-base
sizeof(ualg->cru_module_name));
ualg->cru_type = 0;
@@ -187,15 +128,9 @@ static int crypto_report_one(struct cryp
if (alg->cra_flags & CRYPTO_ALG_LARVAL) {
struct crypto_report_larval rl;
-<<<<<<< HEAD
- strncpy(rl.type, "larval", sizeof(rl.type));
- if (nla_put(skb, CRYPTOCFGA_REPORT_LARVAL,
- sizeof(struct crypto_report_larval), &rl))
-=======
memset(&rl, 0, sizeof(rl));
strscpy(rl.type, "larval", sizeof(rl.type));
if (nla_put(skb, CRYPTOCFGA_REPORT_LARVAL, sizeof(rl), &rl))
->>>>>>> linux-next/akpm-base
goto nla_put_failure;
goto out;
}
--- a/crypto/crypto_user_stat.c~linux-next-git-rejects
+++ a/crypto/crypto_user_stat.c
@@ -39,11 +39,7 @@ static int crypto_report_aead(struct sk_
memset(&raead, 0, sizeof(raead));
-<<<<<<< HEAD
- strncpy(raead.type, "aead", sizeof(raead.type));
-=======
strscpy(raead.type, "aead", sizeof(raead.type));
->>>>>>> linux-next/akpm-base
v32 = atomic_read(&alg->encrypt_cnt);
raead.stat_encrypt_cnt = v32;
@@ -67,11 +63,7 @@ static int crypto_report_cipher(struct s
memset(&rcipher, 0, sizeof(rcipher));
-<<<<<<< HEAD
- strlcpy(rcipher.type, "cipher", sizeof(rcipher.type));
-=======
strscpy(rcipher.type, "cipher", sizeof(rcipher.type));
->>>>>>> linux-next/akpm-base
v32 = atomic_read(&alg->encrypt_cnt);
rcipher.stat_encrypt_cnt = v32;
@@ -95,11 +87,7 @@ static int crypto_report_comp(struct sk_
memset(&rcomp, 0, sizeof(rcomp));
-<<<<<<< HEAD
- strlcpy(rcomp.type, "compression", sizeof(rcomp.type));
-=======
strscpy(rcomp.type, "compression", sizeof(rcomp.type));
->>>>>>> linux-next/akpm-base
v32 = atomic_read(&alg->compress_cnt);
rcomp.stat_compress_cnt = v32;
v64 = atomic64_read(&alg->compress_tlen);
@@ -122,11 +110,7 @@ static int crypto_report_acomp(struct sk
memset(&racomp, 0, sizeof(racomp));
-<<<<<<< HEAD
- strlcpy(racomp.type, "acomp", sizeof(racomp.type));
-=======
strscpy(racomp.type, "acomp", sizeof(racomp.type));
->>>>>>> linux-next/akpm-base
v32 = atomic_read(&alg->compress_cnt);
racomp.stat_compress_cnt = v32;
v64 = atomic64_read(&alg->compress_tlen);
@@ -149,11 +133,7 @@ static int crypto_report_akcipher(struct
memset(&rakcipher, 0, sizeof(rakcipher));
-<<<<<<< HEAD
- strncpy(rakcipher.type, "akcipher", sizeof(rakcipher.type));
-=======
strscpy(rakcipher.type, "akcipher", sizeof(rakcipher.type));
->>>>>>> linux-next/akpm-base
v32 = atomic_read(&alg->encrypt_cnt);
rakcipher.stat_encrypt_cnt = v32;
v64 = atomic64_read(&alg->encrypt_tlen);
@@ -180,11 +160,7 @@ static int crypto_report_kpp(struct sk_b
memset(&rkpp, 0, sizeof(rkpp));
-<<<<<<< HEAD
- strlcpy(rkpp.type, "kpp", sizeof(rkpp.type));
-=======
strscpy(rkpp.type, "kpp", sizeof(rkpp.type));
->>>>>>> linux-next/akpm-base
v = atomic_read(&alg->setsecret_cnt);
rkpp.stat_setsecret_cnt = v;
@@ -206,11 +182,7 @@ static int crypto_report_ahash(struct sk
memset(&rhash, 0, sizeof(rhash));
-<<<<<<< HEAD
- strncpy(rhash.type, "ahash", sizeof(rhash.type));
-=======
strscpy(rhash.type, "ahash", sizeof(rhash.type));
->>>>>>> linux-next/akpm-base
v32 = atomic_read(&alg->hash_cnt);
rhash.stat_hash_cnt = v32;
@@ -230,11 +202,7 @@ static int crypto_report_shash(struct sk
memset(&rhash, 0, sizeof(rhash));
-<<<<<<< HEAD
- strncpy(rhash.type, "shash", sizeof(rhash.type));
-=======
strscpy(rhash.type, "shash", sizeof(rhash.type));
->>>>>>> linux-next/akpm-base
v32 = atomic_read(&alg->hash_cnt);
rhash.stat_hash_cnt = v32;
@@ -254,11 +222,7 @@ static int crypto_report_rng(struct sk_b
memset(&rrng, 0, sizeof(rrng));
-<<<<<<< HEAD
- strncpy(rrng.type, "rng", sizeof(rrng.type));
-=======
strscpy(rrng.type, "rng", sizeof(rrng.type));
->>>>>>> linux-next/akpm-base
v32 = atomic_read(&alg->generate_cnt);
rrng.stat_generate_cnt = v32;
@@ -278,13 +242,8 @@ static int crypto_reportstat_one(struct
{
memset(ualg, 0, sizeof(*ualg));
-<<<<<<< HEAD
- strlcpy(ualg->cru_name, alg->cra_name, sizeof(ualg->cru_name));
- strlcpy(ualg->cru_driver_name, alg->cra_driver_name,
-=======
strscpy(ualg->cru_name, alg->cra_name, sizeof(ualg->cru_name));
strscpy(ualg->cru_driver_name, alg->cra_driver_name,
->>>>>>> linux-next/akpm-base
sizeof(ualg->cru_driver_name));
strscpy(ualg->cru_module_name, module_name(alg->cra_module),
sizeof(ualg->cru_module_name));
@@ -300,14 +259,8 @@ static int crypto_reportstat_one(struct
struct crypto_stat rl;
memset(&rl, 0, sizeof(rl));
-<<<<<<< HEAD
- strlcpy(rl.type, "larval", sizeof(rl.type));
- if (nla_put(skb, CRYPTOCFGA_STAT_LARVAL,
- sizeof(struct crypto_stat), &rl))
-=======
strscpy(rl.type, "larval", sizeof(rl.type));
if (nla_put(skb, CRYPTOCFGA_STAT_LARVAL, sizeof(rl), &rl))
->>>>>>> linux-next/akpm-base
goto nla_put_failure;
goto out;
}
--- a/drivers/gpu/drm/i915/intel_display.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_display.c
@@ -5032,19 +5032,11 @@ static void skylake_pfit_enable(const st
if (WARN_ON(crtc_state->scaler_state.scaler_id < 0))
return;
-<<<<<<< HEAD
- pfit_w = (crtc->config->pch_pfit.size >> 16) & 0xFFFF;
- pfit_h = crtc->config->pch_pfit.size & 0xFFFF;
-
- hscale = (crtc->config->pipe_src_w << 16) / pfit_w;
- vscale = (crtc->config->pipe_src_h << 16) / pfit_h;
-=======
pfit_w = (crtc_state->pch_pfit.size >> 16) & 0xFFFF;
pfit_h = crtc_state->pch_pfit.size & 0xFFFF;
hscale = (crtc_state->pipe_src_w << 16) / pfit_w;
vscale = (crtc_state->pipe_src_h << 16) / pfit_h;
->>>>>>> linux-next/akpm-base
uv_rgb_hphase = skl_scaler_calc_phase(1, hscale, false);
uv_rgb_vphase = skl_scaler_calc_phase(1, vscale, false);
--- a/drivers/gpu/drm/i915/intel_hotplug.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_hotplug.c
@@ -491,14 +491,7 @@ void intel_hpd_irq_handler(struct drm_i9
queue_hp = true;
}
-<<<<<<< HEAD
- if (!long_hpd)
- continue;
-
- if (intel_hpd_irq_storm_detect(dev_priv, pin)) {
-=======
if (intel_hpd_irq_storm_detect(dev_priv, pin, long_hpd)) {
->>>>>>> linux-next/akpm-base
dev_priv->hotplug.event_bits &= ~BIT(pin);
storm_detected = true;
queue_hp = true;
--- a/drivers/gpu/drm/i915/intel_sprite.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_sprite.c
@@ -336,12 +336,8 @@ skl_program_scaler(struct intel_plane *p
0, INT_MAX);
/* TODO: handle sub-pixel coordinates */
-<<<<<<< HEAD
- if (plane_state->base.fb->format->format == DRM_FORMAT_NV12) {
-=======
if (plane_state->base.fb->format->format == DRM_FORMAT_NV12 &&
!icl_is_hdr_plane(plane)) {
->>>>>>> linux-next/akpm-base
y_hphase = skl_scaler_calc_phase(1, hscale, false);
y_vphase = skl_scaler_calc_phase(1, vscale, false);
@@ -359,10 +355,6 @@ skl_program_scaler(struct intel_plane *p
I915_WRITE_FW(SKL_PS_CTRL(pipe, scaler_id),
PS_SCALER_EN | PS_PLANE_SEL(plane->id) | scaler->mode);
-<<<<<<< HEAD
- I915_WRITE_FW(SKL_PS_PWR_GATE(pipe, scaler_id), 0);
-=======
->>>>>>> linux-next/akpm-base
I915_WRITE_FW(SKL_PS_VPHASE(pipe, scaler_id),
PS_Y_PHASE(y_vphase) | PS_UV_RGB_PHASE(uv_rgb_vphase));
I915_WRITE_FW(SKL_PS_HPHASE(pipe, scaler_id),
@@ -371,12 +363,6 @@ skl_program_scaler(struct intel_plane *p
I915_WRITE_FW(SKL_PS_WIN_SZ(pipe, scaler_id), (crtc_w << 16) | crtc_h);
}
-<<<<<<< HEAD
-void
-skl_update_plane(struct intel_plane *plane,
- const struct intel_crtc_state *crtc_state,
- const struct intel_plane_state *plane_state)
-=======
/* Preoffset values for YUV to RGB Conversion */
#define PREOFF_YUV_TO_RGB_HI 0x1800
#define PREOFF_YUV_TO_RGB_ME 0x1F00
@@ -484,7 +470,6 @@ skl_program_plane(struct intel_plane *pl
const struct intel_crtc_state *crtc_state,
const struct intel_plane_state *plane_state,
int color_plane, bool slave, u32 plane_ctl)
->>>>>>> linux-next/akpm-base
{
struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
enum plane_id plane_id = plane->id;
@@ -495,13 +480,8 @@ skl_program_plane(struct intel_plane *pl
u32 aux_stride = skl_plane_stride(plane_state, 1);
int crtc_x = plane_state->base.dst.x1;
int crtc_y = plane_state->base.dst.y1;
-<<<<<<< HEAD
- uint32_t x = plane_state->color_plane[0].x;
- uint32_t y = plane_state->color_plane[0].y;
-=======
uint32_t x = plane_state->color_plane[color_plane].x;
uint32_t y = plane_state->color_plane[color_plane].y;
->>>>>>> linux-next/akpm-base
uint32_t src_w = drm_rect_width(&plane_state->base.src) >> 16;
uint32_t src_h = drm_rect_height(&plane_state->base.src) >> 16;
struct intel_plane *linked = plane_state->linked_plane;
@@ -513,8 +493,6 @@ skl_program_plane(struct intel_plane *pl
/* Sizes are 0 based */
src_w--;
src_h--;
-<<<<<<< HEAD
-=======
keymax = (key->max_value & 0xffffff) | PLANE_KEYMAX_ALPHA(alpha);
@@ -527,7 +505,6 @@ skl_program_plane(struct intel_plane *pl
crtc_x = 0;
crtc_y = 0;
}
->>>>>>> linux-next/akpm-base
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
@@ -548,14 +525,6 @@ skl_program_plane(struct intel_plane *pl
I915_WRITE_FW(PLANE_AUX_DIST(pipe, plane_id),
(plane_state->color_plane[1].offset - surf_addr) | aux_stride);
-<<<<<<< HEAD
- if (plane_state->scaler_id >= 0) {
- skl_program_scaler(plane, crtc_state, plane_state);
-
- I915_WRITE_FW(PLANE_POS(pipe, plane_id), 0);
- } else {
- I915_WRITE_FW(PLANE_POS(pipe, plane_id), (crtc_y << 16) | crtc_x);
-=======
if (INTEL_GEN(dev_priv) < 11)
I915_WRITE_FW(PLANE_AUX_OFFSET(pipe, plane_id),
(plane_state->color_plane[1].y << 16) |
@@ -580,7 +549,6 @@ skl_program_plane(struct intel_plane *pl
}
I915_WRITE_FW(PLANE_CUS_CTL(pipe, plane_id), cus_ctl);
->>>>>>> linux-next/akpm-base
}
if (!slave && plane_state->scaler_id >= 0)
--- a/drivers/scsi/scsi_lib.c~linux-next-git-rejects
+++ a/drivers/scsi/scsi_lib.c
@@ -601,40 +601,6 @@ static bool scsi_end_request(struct requ
destroy_rcu_head(&cmd->rcu);
}
-<<<<<<< HEAD
- if (req->mq_ctx) {
- /*
- * In the MQ case the command gets freed by __blk_mq_end_request,
- * so we have to do all cleanup that depends on it earlier.
- *
- * We also can't kick the queues from irq context, so we
- * will have to defer it to a workqueue.
- */
- scsi_mq_uninit_cmd(cmd);
-
- /*
- * queue is still alive, so grab the ref for preventing it
- * from being cleaned up during running queue.
- */
- percpu_ref_get(&q->q_usage_counter);
-
- __blk_mq_end_request(req, error);
-
- if (scsi_target(sdev)->single_lun ||
- !list_empty(&sdev->host->starved_list))
- kblockd_schedule_work(&sdev->requeue_work);
- else
- blk_mq_run_hw_queues(q, true);
-
- percpu_ref_put(&q->q_usage_counter);
- } else {
- unsigned long flags;
-
- if (bidi_bytes)
- scsi_release_bidi_buffers(cmd);
- scsi_release_buffers(cmd);
- scsi_put_command(cmd);
-=======
/*
* In the MQ case the command gets freed by __blk_mq_end_request,
* so we have to do all cleanup that depends on it earlier.
@@ -643,7 +609,6 @@ static bool scsi_end_request(struct requ
* will have to defer it to a workqueue.
*/
scsi_mq_uninit_cmd(cmd);
->>>>>>> linux-next/akpm-base
__blk_mq_end_request(req, error);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
mm-cleancache-fix-corruption-on-missed-inode-invalidation-fix.patch
arm-arch-arm-include-asm-pageh-needs-personalityh.patch
mm.patch
mm-slab-remove-unnecessary-unlikely-fix.patch
mm-slub-record-final-state-of-slub-action-in-deactivate_slab-fix.patch
mm-page_owner-clamp-read-count-to-page_size-fix.patch
mm-hotplug-optimize-clear_hwpoisoned_pages-fix.patch
mm-ksm-do-not-block-on-page-lock-when-searching-stable-tree-fix.patch
mm-memory_hotplug-print-reason-for-the-offlining-failure-fix.patch
mm-memory_hotplug-be-more-verbose-for-memory-offline-failures-fix.patch
mm-convert-totalram_pages-and-totalhigh_pages-variables-to-atomic-checkpatch-fixes.patch
memory_hotplug-free-pages-as-higher-order-fix.patch
memory_hotplug-free-pages-as-higher-order-fix-fix.patch
fs-epoll-deal-with-wait_queue-only-once-fix.patch
exec-separate-mm_anonpages-and-rlimit_stack-accounting-checkpatch-fixes.patch
ipc-allow-boot-time-extension-of-ipcmni-from-32k-to-8m-checkpatch-fixes.patch
linux-next-git-rejects.patch
scripts-atomic-check-atomicssh-dont-assume-that-scripts-are-executable.patch
drivers-net-ethernet-qlogic-qed-qed_rdmah-fix-typo.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
