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/gpu/drm/i915/intel_fbdev.c | 218 -----------------
drivers/gpu/drm/virtio/virtgpu_drv.c | 10
drivers/gpu/drm/virtio/virtgpu_drv.h | 9
tools/testing/selftests/netfilter/Makefile | 4
tools/testing/selftests/netfilter/nft_nat.sh | 47 ---
5 files changed, 288 deletions(-)
--- a/drivers/gpu/drm/i915/intel_fbdev.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/i915/intel_fbdev.c
@@ -285,224 +285,6 @@ out_unlock:
return ret;
}
-<<<<<<< HEAD
-static struct drm_fb_helper_crtc *
-intel_fb_helper_crtc(struct drm_fb_helper *fb_helper, struct drm_crtc *crtc)
-{
- int i;
-
- for (i = 0; i < fb_helper->crtc_count; i++)
- if (fb_helper->crtc_info[i].mode_set.crtc == crtc)
- return &fb_helper->crtc_info[i];
-
- return NULL;
-}
-
-/*
- * Try to read the BIOS display configuration and use it for the initial
- * fb configuration.
- *
- * The BIOS or boot loader will generally create an initial display
- * configuration for us that includes some set of active pipes and displays.
- * This routine tries to figure out which pipes and connectors are active
- * and stuffs them into the crtcs and modes array given to us by the
- * drm_fb_helper code.
- *
- * The overall sequence is:
- * intel_fbdev_init - from driver load
- * intel_fbdev_init_bios - initialize the intel_fbdev using BIOS data
- * drm_fb_helper_init - build fb helper structs
- * drm_fb_helper_single_add_all_connectors - more fb helper structs
- * intel_fbdev_initial_config - apply the config
- * drm_fb_helper_initial_config - call ->probe then register_framebuffer()
- * drm_setup_crtcs - build crtc config for fbdev
- * intel_fb_initial_config - find active connectors etc
- * drm_fb_helper_single_fb_probe - set up fbdev
- * intelfb_create - re-use or alloc fb, build out fbdev structs
- *
- * Note that we don't make special consideration whether we could actually
- * switch to the selected modes without a full modeset. E.g. when the display
- * is in VGA mode we need to recalculate watermarks and set a new high-res
- * framebuffer anyway.
- */
-static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
- struct drm_fb_helper_crtc **crtcs,
- struct drm_display_mode **modes,
- struct drm_fb_offset *offsets,
- bool *enabled, int width, int height)
-{
- struct drm_i915_private *dev_priv = to_i915(fb_helper->dev);
- unsigned long conn_configured, conn_seq, mask;
- unsigned int count = min(fb_helper->connector_count, BITS_PER_LONG);
- int i, j;
- bool *save_enabled;
- bool fallback = true, ret = true;
- int num_connectors_enabled = 0;
- int num_connectors_detected = 0;
- struct drm_modeset_acquire_ctx ctx;
-
- save_enabled = kcalloc(count, sizeof(bool), GFP_KERNEL);
- if (!save_enabled)
- return false;
-
- drm_modeset_acquire_init(&ctx, 0);
-
- while (drm_modeset_lock_all_ctx(fb_helper->dev, &ctx) != 0)
- drm_modeset_backoff(&ctx);
-
- memcpy(save_enabled, enabled, count);
- mask = GENMASK(count - 1, 0);
- conn_configured = 0;
-retry:
- conn_seq = conn_configured;
- for (i = 0; i < count; i++) {
- struct drm_fb_helper_connector *fb_conn;
- struct drm_connector *connector;
- struct drm_encoder *encoder;
- struct drm_fb_helper_crtc *new_crtc;
-
- fb_conn = fb_helper->connector_info[i];
- connector = fb_conn->connector;
-
- if (conn_configured & BIT(i))
- continue;
-
- if (conn_seq == 0 && !connector->has_tile)
- continue;
-
- if (connector->status == connector_status_connected)
- num_connectors_detected++;
-
- if (!enabled[i]) {
- DRM_DEBUG_KMS("connector %s not enabled, skipping\n",
- connector->name);
- conn_configured |= BIT(i);
- continue;
- }
-
- if (connector->force == DRM_FORCE_OFF) {
- DRM_DEBUG_KMS("connector %s is disabled by user, skipping\n",
- connector->name);
- enabled[i] = false;
- continue;
- }
-
- encoder = connector->state->best_encoder;
- if (!encoder || WARN_ON(!connector->state->crtc)) {
- if (connector->force > DRM_FORCE_OFF)
- goto bail;
-
- DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n",
- connector->name);
- enabled[i] = false;
- conn_configured |= BIT(i);
- continue;
- }
-
- num_connectors_enabled++;
-
- new_crtc = intel_fb_helper_crtc(fb_helper,
- connector->state->crtc);
-
- /*
- * Make sure we're not trying to drive multiple connectors
- * with a single CRTC, since our cloning support may not
- * match the BIOS.
- */
- for (j = 0; j < count; j++) {
- if (crtcs[j] == new_crtc) {
- DRM_DEBUG_KMS("fallback: cloned configuration\n");
- goto bail;
- }
- }
-
- DRM_DEBUG_KMS("looking for cmdline mode on connector %s\n",
- connector->name);
-
- /* go for command line mode first */
- modes[i] = drm_pick_cmdline_mode(fb_conn);
-
- /* try for preferred next */
- if (!modes[i]) {
- DRM_DEBUG_KMS("looking for preferred mode on connector %s %d\n",
- connector->name, connector->has_tile);
- modes[i] = drm_has_preferred_mode(fb_conn, width,
- height);
- }
-
- /* No preferred mode marked by the EDID? Are there any modes? */
- if (!modes[i] && !list_empty(&connector->modes)) {
- DRM_DEBUG_KMS("using first mode listed on connector %s\n",
- connector->name);
- modes[i] = list_first_entry(&connector->modes,
- struct drm_display_mode,
- head);
- }
-
- /* last resort: use current mode */
- if (!modes[i]) {
- /*
- * IMPORTANT: We want to use the adjusted mode (i.e.
- * after the panel fitter upscaling) as the initial
- * config, not the input mode, which is what crtc->mode
- * usually contains. But since our current
- * code puts a mode derived from the post-pfit timings
- * into crtc->mode this works out correctly.
- *
- * This is crtc->mode and not crtc->state->mode for the
- * fastboot check to work correctly. crtc_state->mode has
- * I915_MODE_FLAG_INHERITED, which we clear to force check
- * state.
- */
- DRM_DEBUG_KMS("looking for current mode on connector %s\n",
- connector->name);
- modes[i] = &connector->state->crtc->mode;
- }
- crtcs[i] = new_crtc;
-
- DRM_DEBUG_KMS("connector %s on [CRTC:%d:%s]: %dx%d%s\n",
- connector->name,
- connector->state->crtc->base.id,
- connector->state->crtc->name,
- modes[i]->hdisplay, modes[i]->vdisplay,
- modes[i]->flags & DRM_MODE_FLAG_INTERLACE ? "i" :"");
-
- fallback = false;
- conn_configured |= BIT(i);
- }
-
- if ((conn_configured & mask) != mask && conn_configured != conn_seq)
- goto retry;
-
- /*
- * If the BIOS didn't enable everything it could, fall back to have the
- * same user experiencing of lighting up as much as possible like the
- * fbdev helper library.
- */
- if (num_connectors_enabled != num_connectors_detected &&
- num_connectors_enabled < INTEL_INFO(dev_priv)->num_pipes) {
- DRM_DEBUG_KMS("fallback: Not all outputs enabled\n");
- DRM_DEBUG_KMS("Enabled: %i, detected: %i\n", num_connectors_enabled,
- num_connectors_detected);
- fallback = true;
- }
-
- if (fallback) {
-bail:
- DRM_DEBUG_KMS("Not using firmware configuration\n");
- memcpy(enabled, save_enabled, count);
- ret = false;
- }
-
- drm_modeset_drop_locks(&ctx);
- drm_modeset_acquire_fini(&ctx);
-
- kfree(save_enabled);
- return ret;
-}
-
-=======
->>>>>>> linux-next/akpm-base
static const struct drm_fb_helper_funcs intel_fb_helper_funcs = {
.fb_probe = intelfb_create,
};
--- a/drivers/gpu/drm/virtio/virtgpu_drv.c~linux-next-git-rejects
+++ a/drivers/gpu/drm/virtio/virtgpu_drv.c
@@ -206,19 +206,9 @@ static struct drm_driver driver = {
.debugfs_init = virtio_gpu_debugfs_init,
#endif
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
-<<<<<<< HEAD
- .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
.gem_prime_export = drm_gem_prime_export,
.gem_prime_import = drm_gem_prime_import,
- .gem_prime_pin = virtgpu_gem_prime_pin,
- .gem_prime_unpin = virtgpu_gem_prime_unpin,
.gem_prime_get_sg_table = virtgpu_gem_prime_get_sg_table,
- .gem_prime_import_sg_table = virtgpu_gem_prime_import_sg_table,
-=======
- .gem_prime_export = drm_gem_prime_export,
- .gem_prime_import = drm_gem_prime_import,
- .gem_prime_get_sg_table = virtgpu_gem_prime_get_sg_table,
->>>>>>> linux-next/akpm-base
.gem_prime_vmap = virtgpu_gem_prime_vmap,
.gem_prime_vunmap = virtgpu_gem_prime_vunmap,
.gem_prime_mmap = virtgpu_gem_prime_mmap,
--- a/drivers/gpu/drm/virtio/virtgpu_drv.h~linux-next-git-rejects
+++ a/drivers/gpu/drm/virtio/virtgpu_drv.h
@@ -375,16 +375,7 @@ void virtio_gpu_object_free_sg_table(str
int virtio_gpu_object_wait(struct virtio_gpu_object *bo, bool no_wait);
/* virtgpu_prime.c */
-<<<<<<< HEAD
-int virtgpu_gem_prime_pin(struct drm_gem_object *obj);
-void virtgpu_gem_prime_unpin(struct drm_gem_object *obj);
struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj);
-struct drm_gem_object *virtgpu_gem_prime_import_sg_table(
- struct drm_device *dev, struct dma_buf_attachment *attach,
- struct sg_table *sgt);
-=======
-struct sg_table *virtgpu_gem_prime_get_sg_table(struct drm_gem_object *obj);
->>>>>>> linux-next/akpm-base
void *virtgpu_gem_prime_vmap(struct drm_gem_object *obj);
void virtgpu_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr);
int virtgpu_gem_prime_mmap(struct drm_gem_object *obj,
--- a/tools/testing/selftests/netfilter/Makefile~linux-next-git-rejects
+++ a/tools/testing/selftests/netfilter/Makefile
@@ -1,10 +1,6 @@
# SPDX-License-Identifier: GPL-2.0
# Makefile for netfilter selftests
-<<<<<<< HEAD
-TEST_PROGS := nft_trans_stress.sh nft_nat.sh conntrack_icmp_related.sh
-=======
TEST_PROGS := nft_trans_stress.sh nft_nat.sh conntrack_icmp_related.sh bridge_brouter.sh
->>>>>>> linux-next/akpm-base
include ../lib.mk
--- a/tools/testing/selftests/netfilter/nft_nat.sh~linux-next-git-rejects
+++ a/tools/testing/selftests/netfilter/nft_nat.sh
@@ -347,10 +347,7 @@ EOF
test_masquerade6()
{
local natflags=$1
-<<<<<<< HEAD
-=======
local family=$2
->>>>>>> linux-next/akpm-base
local lret=0
ip netns exec ns0 sysctl net.ipv6.conf.all.forwarding=1 > /dev/null
@@ -395,11 +392,7 @@ EOF
ip netns exec ns2 ping -q -c 1 dead:1::99 > /dev/null # ping ns2->ns1
if [ $? -ne 0 ] ; then
-<<<<<<< HEAD
- echo "ERROR: cannot ping ns1 from ns2 with active ipv6 masquerade $natflags"
-=======
echo "ERROR: cannot ping ns1 from ns2 with active $family masquerade $natflags"
->>>>>>> linux-next/akpm-base
lret=1
fi
@@ -438,29 +431,17 @@ EOF
ip netns exec ns2 ping -q -c 1 dead:1::99 > /dev/null # ping ns2->ns1
if [ $? -ne 0 ] ; then
-<<<<<<< HEAD
- echo "ERROR: cannot ping ns1 from ns2 with active ipv6 masquerade $natflags (attempt 2)"
- lret=1
- fi
-
- ip netns exec ns0 nft flush chain ip6 nat postrouting
-=======
echo "ERROR: cannot ping ns1 from ns2 with active $family masquerade $natflags (attempt 2)"
lret=1
fi
ip netns exec ns0 nft flush chain $family nat postrouting
->>>>>>> linux-next/akpm-base
if [ $? -ne 0 ]; then
echo "ERROR: Could not flush $family nat postrouting" 1>&2
lret=1
fi
-<<<<<<< HEAD
- test $lret -eq 0 && echo "PASS: IPv6 masquerade $natflags for ns2"
-=======
test $lret -eq 0 && echo "PASS: $family IPv6 masquerade $natflags for ns2"
->>>>>>> linux-next/akpm-base
return $lret
}
@@ -468,10 +449,7 @@ EOF
test_masquerade()
{
local natflags=$1
-<<<<<<< HEAD
-=======
local family=$2
->>>>>>> linux-next/akpm-base
local lret=0
ip netns exec ns0 sysctl net.ipv4.conf.veth0.forwarding=1 > /dev/null
@@ -516,11 +494,7 @@ EOF
ip netns exec ns2 ping -q -c 1 10.0.1.99 > /dev/null # ping ns2->ns1
if [ $? -ne 0 ] ; then
-<<<<<<< HEAD
- echo "ERROR: cannot ping ns1 from ns2 with active ip masquere $natflags"
-=======
echo "ERROR: cannot ping ns1 from ns2 with active $family masquere $natflags"
->>>>>>> linux-next/akpm-base
lret=1
fi
@@ -558,29 +532,17 @@ EOF
ip netns exec ns2 ping -q -c 1 10.0.1.99 > /dev/null # ping ns2->ns1
if [ $? -ne 0 ] ; then
-<<<<<<< HEAD
- echo "ERROR: cannot ping ns1 from ns2 with active ip masquerade $natflags (attempt 2)"
- lret=1
- fi
-
- ip netns exec ns0 nft flush chain ip nat postrouting
-=======
echo "ERROR: cannot ping ns1 from ns2 with active $family masquerade $natflags (attempt 2)"
lret=1
fi
ip netns exec ns0 nft flush chain $family nat postrouting
->>>>>>> linux-next/akpm-base
if [ $? -ne 0 ]; then
echo "ERROR: Could not flush $family nat postrouting" 1>&2
lret=1
fi
-<<<<<<< HEAD
- test $lret -eq 0 && echo "PASS: IP masquerade $natflags for ns2"
-=======
test $lret -eq 0 && echo "PASS: $family IP masquerade $natflags for ns2"
->>>>>>> linux-next/akpm-base
return $lret
}
@@ -858,17 +820,8 @@ test_masquerade "" ip
test_masquerade6 "" ip6
reset_counters
-<<<<<<< HEAD
-test_masquerade ""
-test_masquerade6 ""
-
-reset_counters
-test_masquerade "fully-random"
-test_masquerade6 "fully-random"
-=======
test_masquerade "fully-random" ip
test_masquerade6 "fully-random" ip6
->>>>>>> linux-next/akpm-base
reset_counters
$test_inet_nat && test_masquerade "" inet
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
slab-fix-an-infinite-loop-in-leaks_show-fix.patch
userfaultfd-sysctl-add-vmunprivileged_userfaultfd-fix.patch
mm-compaction-fix-an-undefined-behaviour-fix.patch
mm-enable-error-injection-at-add_to_page_cache-fix.patch
mm-memory_hotplug-provide-a-more-generic-restrictions-for-memory-hotplug-fix.patch
mm-add-probe_user_read-fix.patch
mm-maintain-randomization-of-page-free-lists-checkpatch-fixes.patch
byteorder-sanity-check-toolchain-vs-kernel-endianess-checkpatch-fixes.patch
lib-list_sort-simplify-and-remove-max_list_length_bits-fix.patch
lib-test_vmallocc-test_func-eliminate-local-ret.patch
fs-binfmt_elfc-remove-unneeded-initialization-of-mm-start_stack.patch
reiserfs-add-comment-to-explain-endianness-issue-in-xattr_hash-checkpatch-fixes.patch
cpumask-fix-double-string-traverse-in-cpumask_parse-fix.patch
test_sysctl-add-proc_do_large_bitmap-test-case-fix.patch
convert-struct-pid-count-to-refcount_t-fix.patch
gcov-clang-support-checkpatch-fixes.patch
ipc-do-cyclic-id-allocation-for-the-ipc-object-fix.patch
linux-next-rejects.patch
mm-rename-ambiguously-named-memorystat-counters-and-functions-fix.patch
kernel-forkc-export-kernel_thread-to-modules.patch
slab-leaks3-default-y.patch
