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>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 3 --
drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 27 ----------------------
sound/soc/ti/davinci-mcasp.c | 7 -----
sound/usb/stream.c | 6 ----
4 files changed, 43 deletions(-)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h
@@ -30,14 +30,11 @@
#define AMDGPU_VCN_FIRMWARE_OFFSET 256
#define AMDGPU_VCN_MAX_ENC_RINGS 3
-<<<<<<< HEAD
-=======
#define AMDGPU_MAX_VCN_INSTANCES 2
#define AMDGPU_VCN_HARVEST_VCN0 (1 << 0)
#define AMDGPU_VCN_HARVEST_VCN1 (1 << 1)
->>>>>>> linux-next/akpm-base
#define VCN_DEC_KMD_CMD 0x80000000
#define VCN_DEC_CMD_FENCE 0x00000000
#define VCN_DEC_CMD_TRAP 0x00000001
--- a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c
@@ -1493,11 +1493,7 @@ void vcn_v2_0_dec_ring_insert_start(stru
amdgpu_ring_write(ring, PACKET0(adev->vcn.internal.data0, 0));
amdgpu_ring_write(ring, 0);
-<<<<<<< HEAD
- amdgpu_ring_write(ring, PACKET0(mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET, 0));
-=======
amdgpu_ring_write(ring, PACKET0(adev->vcn.internal.cmd, 0));
->>>>>>> linux-next/akpm-base
amdgpu_ring_write(ring, VCN_DEC_KMD_CMD | (VCN_DEC_CMD_PACKET_START << 1));
}
@@ -1510,13 +1506,9 @@ void vcn_v2_0_dec_ring_insert_start(stru
*/
void vcn_v2_0_dec_ring_insert_end(struct amdgpu_ring *ring)
{
-<<<<<<< HEAD
- amdgpu_ring_write(ring, PACKET0(mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET, 0));
-=======
struct amdgpu_device *adev = ring->adev;
amdgpu_ring_write(ring, PACKET0(adev->vcn.internal.cmd, 0));
->>>>>>> linux-next/akpm-base
amdgpu_ring_write(ring, VCN_DEC_KMD_CMD | (VCN_DEC_CMD_PACKET_END << 1));
}
@@ -1563,11 +1555,7 @@ void vcn_v2_0_dec_ring_emit_fence(struct
amdgpu_ring_write(ring, PACKET0(adev->vcn.internal.data1, 0));
amdgpu_ring_write(ring, upper_32_bits(addr) & 0xff);
-<<<<<<< HEAD
- amdgpu_ring_write(ring, PACKET0(mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET, 0));
-=======
amdgpu_ring_write(ring, PACKET0(adev->vcn.internal.cmd, 0));
->>>>>>> linux-next/akpm-base
amdgpu_ring_write(ring, VCN_DEC_KMD_CMD | (VCN_DEC_CMD_FENCE << 1));
amdgpu_ring_write(ring, PACKET0(adev->vcn.internal.data0, 0));
@@ -2111,35 +2099,20 @@ static int vcn_v2_0_dec_ring_test_ring(s
unsigned i;
int r;
-<<<<<<< HEAD
- WREG32(adev->vcn.external.scratch9, 0xCAFEDEAD);
- r = amdgpu_ring_alloc(ring, 4);
- if (r)
- return r;
- amdgpu_ring_write(ring, PACKET0(mmUVD_GPCOM_VCPU_CMD_INTERNAL_OFFSET, 0));
-=======
WREG32(adev->vcn.inst[ring->me].external.scratch9, 0xCAFEDEAD);
r = amdgpu_ring_alloc(ring, 4);
if (r)
return r;
amdgpu_ring_write(ring, PACKET0(adev->vcn.internal.cmd, 0));
->>>>>>> linux-next/akpm-base
amdgpu_ring_write(ring, VCN_DEC_KMD_CMD | (VCN_DEC_CMD_PACKET_START << 1));
amdgpu_ring_write(ring, PACKET0(adev->vcn.internal.scratch9, 0));
amdgpu_ring_write(ring, 0xDEADBEEF);
amdgpu_ring_commit(ring);
for (i = 0; i < adev->usec_timeout; i++) {
-<<<<<<< HEAD
- tmp = RREG32(adev->vcn.external.scratch9);
- if (tmp == 0xDEADBEEF)
- break;
- DRM_UDELAY(1);
-=======
tmp = RREG32(adev->vcn.inst[ring->me].external.scratch9);
if (tmp == 0xDEADBEEF)
break;
udelay(1);
->>>>>>> linux-next/akpm-base
}
if (i >= adev->usec_timeout)
--- a/sound/soc/ti/davinci-mcasp.c~linux-next-git-rejects
+++ a/sound/soc/ti/davinci-mcasp.c
@@ -1292,8 +1292,6 @@ static int davinci_mcasp_hw_rule_slot_wi
return snd_mask_refine(fmt, &nfmt);
}
-<<<<<<< HEAD
-=======
static int davinci_mcasp_hw_rule_format_width(struct snd_pcm_hw_params *params,
struct snd_pcm_hw_rule *rule)
{
@@ -1316,7 +1314,6 @@ static int davinci_mcasp_hw_rule_format_
return snd_mask_refine(fmt, &nfmt);
}
->>>>>>> linux-next/akpm-base
static const unsigned int davinci_mcasp_dai_rates[] = {
8000, 11025, 16000, 22050, 32000, 44100, 48000, 64000,
88200, 96000, 176400, 192000,
@@ -1494,9 +1491,6 @@ static int davinci_mcasp_startup(struct
0, SNDRV_PCM_HW_PARAM_CHANNELS,
&mcasp->chconstr[substream->stream]);
-<<<<<<< HEAD
- if (mcasp->slot_width) {
-=======
if (mcasp->max_format_width) {
/*
* Only allow formats which require same amount of bits on the
@@ -1511,7 +1505,6 @@ static int davinci_mcasp_startup(struct
return ret;
}
else if (mcasp->slot_width) {
->>>>>>> linux-next/akpm-base
/* Only allow formats require <= slot_width bits on the bus */
ret = snd_pcm_hw_rule_add(substream->runtime, 0,
SNDRV_PCM_HW_PARAM_FORMAT,
--- a/sound/usb/stream.c~linux-next-git-rejects
+++ a/sound/usb/stream.c
@@ -1047,13 +1047,7 @@ found_clock:
pd = kzalloc(sizeof(*pd), GFP_KERNEL);
if (!pd) {
-<<<<<<< HEAD
- kfree(fp->chmap);
- kfree(fp->rate_table);
- kfree(fp);
-=======
audioformat_free(fp);
->>>>>>> linux-next/akpm-base
return NULL;
}
pd->pd_id = (stream == SNDRV_PCM_STREAM_PLAYBACK) ?
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
fs-ocfs2-fix-possible-null-pointer-dereferences-in-ocfs2_xa_prepare_entry-fix.patch
mm.patch
mm-introduce-page_shift-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix.patch
mm-throttle-allocators-when-failing-reclaim-over-memoryhigh-fix-fix-fix.patch
mm-memory_hotplug-remove-move_pfn_range-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-fix.patch
mm-compaction-clear-total_migratefree_scanned-before-scanning-a-new-zone-fix-2-fix.patch
mm-oom-avoid-printk-iteration-under-rcu-fix.patch
mm-oom_killer-add-task-uid-to-info-message-on-an-oom-kill-fix.patch
psi-annotate-refault-stalls-from-io-submission-fix.patch
psi-annotate-refault-stalls-from-io-submission-fix-2.patch
diff-sucks.patch
drivers-tty-serial-sh-scic-suppress-warning.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
