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>
---
arch/arm64/kernel/traps.c | 6 ----
drivers/crypto/talitos.c | 4 ---
drivers/dma/dma-jz4780.c | 4 ---
drivers/hwmon/tc654.c | 4 ---
drivers/input/misc/da9063_onkey.c | 4 ---
drivers/media/i2c/cx25840/cx25840-core.c | 28 ---------------------
drivers/mmc/host/meson-mx-sdio.c | 4 ---
drivers/net/phy/dp83867.c | 3 --
drivers/net/phy/phylink.c | 22 ----------------
drivers/reset/reset-simple.c | 4 ---
drivers/scsi/libiscsi.c | 4 ---
drivers/scsi/libiscsi_tcp.c | 9 ------
drivers/scsi/libsas/sas_ata.c | 4 ---
drivers/scsi/scsi_sysctl.c | 4 ---
drivers/scsi/scsi_transport_fc.c | 10 -------
drivers/scsi/scsi_transport_iscsi.c | 4 ---
drivers/scsi/scsi_transport_sas.c | 4 ---
drivers/scsi/scsi_transport_spi.c | 4 ---
drivers/scsi/ses.c | 13 ---------
include/scsi/iscsi_if.h | 9 ------
include/scsi/iscsi_proto.h | 9 ------
include/scsi/libiscsi.h | 4 ---
include/scsi/libiscsi_tcp.h | 9 ------
include/scsi/sas_ata.h | 4 ---
include/scsi/scsi_bsg_iscsi.h | 4 ---
include/scsi/scsi_transport.h | 4 ---
include/scsi/scsi_transport_fc.h | 10 -------
include/scsi/scsi_transport_iscsi.h | 4 ---
include/scsi/scsi_transport_spi.h | 4 ---
sound/pci/hda/hda_intel.c | 7 -----
sound/pci/rme9652/hdspm.c | 3 --
sound/usb/line6/toneport.c | 5 ---
32 files changed, 1 insertion(+), 214 deletions(-)
--- a/arch/arm64/kernel/traps.c~linux-next-git-rejects
+++ a/arch/arm64/kernel/traps.c
@@ -253,15 +253,9 @@ void arm64_force_sig_fault(int signo, in
{
arm64_show_signal(signo, str);
if (signo == SIGKILL)
-<<<<<<< HEAD
- force_sig(SIGKILL, current);
- else
- force_sig_fault(signo, code, addr, current);
-=======
force_sig(SIGKILL);
else
force_sig_fault(signo, code, addr);
->>>>>>> linux-next/akpm-base
}
void arm64_force_sig_mceerr(int code, void __user *addr, short lsb,
--- a/drivers/crypto/talitos.c~linux-next-git-rejects
+++ a/drivers/crypto/talitos.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-or-later
-=======
// SPDX-License-Identifier: GPL-2.0+
->>>>>>> linux-next/akpm-base
/*
* talitos - Freescale Integrated Security Engine (SEC) device driver
*
--- a/drivers/dma/dma-jz4780.c~linux-next-git-rejects
+++ a/drivers/dma/dma-jz4780.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-or-later
-=======
// SPDX-License-Identifier: GPL-2.0+
->>>>>>> linux-next/akpm-base
/*
* Ingenic JZ4780 DMA controller
*
--- a/drivers/hwmon/tc654.c~linux-next-git-rejects
+++ a/drivers/hwmon/tc654.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-or-later
-=======
// SPDX-License-Identifier: GPL-2.0+
->>>>>>> linux-next/akpm-base
/*
* tc654.c - Linux kernel modules for fan speed controller
*
--- a/drivers/input/misc/da9063_onkey.c~linux-next-git-rejects
+++ a/drivers/input/misc/da9063_onkey.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-or-later
-=======
// SPDX-License-Identifier: GPL-2.0+
->>>>>>> linux-next/akpm-base
/*
* OnKey device driver for DA9063, DA9062 and DA9061 PMICs
* Copyright (C) 2015 Dialog Semiconductor Ltd.
--- a/drivers/media/i2c/cx25840/cx25840-core.c~linux-next-git-rejects
+++ a/drivers/media/i2c/cx25840/cx25840-core.c
@@ -1,29 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/* cx25840 - Conexant CX25840 audio/video decoder driver
- *
- * Copyright (C) 2004 Ulf Eklund
- *
- * Based on the saa7115 driver and on the first version of Chris Kennedy's
- * cx25840 driver.
- *
- * Changes by Tyler Trafford <tatrafford@xxxxxxxxxxx>
- * - cleanup/rewrite for V4L2 API (2005)
- *
- * VBI support by Hans Verkuil <hverkuil@xxxxxxxxx>.
- *
- * NTSC sliced VBI support by Christopher Neufeld <television@xxxxxxxxxxx>
- * with additional fixes by Hans Verkuil <hverkuil@xxxxxxxxx>.
- *
- * CX23885 support by Steven Toth <stoth@xxxxxxxxxxx>.
- *
- * CX2388[578] IRQ handling, IO Pin mux configuration and other small fixes are
- * Copyright (C) 2010 Andy Walls <awalls@xxxxxxxxxxxxxxxx>
- *
- * CX23888 DIF support for the HVR1850
- * Copyright (C) 2011 Steven Toth <stoth@xxxxxxxxxxxxxx>
-<<<<<<< HEAD
-=======
- *
+/*
* CX2584x pin to pad mapping and output format configuration support are
* Copyright (C) 2011 Maciej S. Szmigiero <mail@xxxxxxxxxxxxxxxxxxxxx>
*
@@ -36,7 +11,6 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
->>>>>>> linux-next/akpm-base
*/
#include <linux/kernel.h>
--- a/drivers/mmc/host/meson-mx-sdio.c~linux-next-git-rejects
+++ a/drivers/mmc/host/meson-mx-sdio.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-or-later
-=======
// SPDX-License-Identifier: GPL-2.0+
->>>>>>> linux-next/akpm-base
/*
* meson-mx-sdio.c - Meson6, Meson8 and Meson8b SDIO/MMC Host Controller
*
--- a/drivers/net/phy/dp83867.c~linux-next-git-rejects
+++ a/drivers/net/phy/dp83867.c
@@ -331,15 +331,12 @@ static int dp83867_config_init(struct ph
return ret;
/* Set up RGMII delays */
-<<<<<<< HEAD
-=======
/* If rgmii mode with no internal delay is selected,
* we do NOT use aligned mode as one might expect. Instead
* we use the PHY's default based on pin strapping. And the
* "mode 0" default is to *use* * internal delay with a
* value of 7 (2.00 ns).
*/
->>>>>>> linux-next/akpm-base
val = phy_read_mmd(phydev, DP83867_DEVADDR, DP83867_RGMIICTL);
val &= ~(DP83867_RGMII_TX_CLK_DELAY_EN | DP83867_RGMII_RX_CLK_DELAY_EN);
--- a/drivers/net/phy/phylink.c~linux-next-git-rejects
+++ a/drivers/net/phy/phylink.c
@@ -496,27 +496,6 @@ static void phylink_resolve(struct work_
}
}
-<<<<<<< HEAD
- if (link_state.link != netif_carrier_ok(ndev)) {
- if (!link_state.link) {
- netif_carrier_off(ndev);
- pl->ops->mac_link_down(ndev, pl->link_an_mode,
- pl->cur_interface);
- netdev_info(ndev, "Link is Down\n");
- } else {
- pl->cur_interface = link_state.interface;
- pl->ops->mac_link_up(ndev, pl->link_an_mode,
- pl->cur_interface, pl->phydev);
-
- netif_carrier_on(ndev);
-
- netdev_info(ndev,
- "Link is Up - %s/%s - flow control %s\n",
- phy_speed_to_str(link_state.speed),
- phy_duplex_to_str(link_state.duplex),
- phylink_pause_to_str(link_state.pause));
- }
-=======
if (pl->netdev)
link_changed = (link_state.link != netif_carrier_ok(ndev));
else
@@ -528,7 +507,6 @@ static void phylink_resolve(struct work_
phylink_mac_link_down(pl);
else
phylink_mac_link_up(pl, link_state);
->>>>>>> linux-next/akpm-base
}
if (!link_state.link && pl->mac_link_dropped) {
pl->mac_link_dropped = false;
--- a/drivers/reset/reset-simple.c~linux-next-git-rejects
+++ a/drivers/reset/reset-simple.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-or-later
-=======
// SPDX-License-Identifier: GPL-2.0+
->>>>>>> linux-next/akpm-base
/*
* Simple Reset Controller Driver
*
--- a/drivers/scsi/libiscsi.c~linux-next-git-rejects
+++ a/drivers/scsi/libiscsi.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-or-later
-=======
// SPDX-License-Identifier: GPL-2.0+
->>>>>>> linux-next/akpm-base
/*
* iSCSI lib functions
*
--- a/drivers/scsi/libiscsi_tcp.c~linux-next-git-rejects
+++ a/drivers/scsi/libiscsi_tcp.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-or-later
-=======
// SPDX-License-Identifier: GPL-2.0+
->>>>>>> linux-next/akpm-base
/*
* iSCSI over TCP/IP Data-Path lib
*
@@ -12,11 +8,6 @@
* Copyright (C) 2006 Red Hat, Inc. All rights reserved.
* maintained by open-iscsi@xxxxxxxxxxxxxxxx
*
-<<<<<<< HEAD
- * See the file COPYING included with this distribution for more details.
- *
-=======
->>>>>>> linux-next/akpm-base
* Credits:
* Christoph Hellwig
* FUJITA Tomonori
--- a/drivers/scsi/libsas/sas_ata.c~linux-next-git-rejects
+++ a/drivers/scsi/libsas/sas_ata.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-or-later
-=======
// SPDX-License-Identifier: GPL-2.0+
->>>>>>> linux-next/akpm-base
/*
* Support for SATA devices on Serial Attached SCSI (SAS) controllers
*
--- a/drivers/scsi/scsi_sysctl.c~linux-next-git-rejects
+++ a/drivers/scsi/scsi_sysctl.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-only
-=======
// SPDX-License-Identifier: GPL-2.0
->>>>>>> linux-next/akpm-base
/*
* Copyright (C) 2003 Christoph Hellwig.
*/
--- a/drivers/scsi/scsi_transport_fc.c~linux-next-git-rejects
+++ a/drivers/scsi/scsi_transport_fc.c
@@ -1,18 +1,8 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-or-later
-=======
// SPDX-License-Identifier: GPL-2.0+
->>>>>>> linux-next/akpm-base
/*
* FiberChannel transport specific attributes exported to sysfs.
*
* Copyright (c) 2003 Silicon Graphics, Inc. All rights reserved.
-<<<<<<< HEAD
- *
- * ========
- *
-=======
->>>>>>> linux-next/akpm-base
* Copyright (C) 2004-2007 James Smart, Emulex Corporation
* Rewrite for host, target, device, and remote port attributes,
* statistics, and service functions...
--- a/drivers/scsi/scsi_transport_iscsi.c~linux-next-git-rejects
+++ a/drivers/scsi/scsi_transport_iscsi.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-or-later
-=======
// SPDX-License-Identifier: GPL-2.0+
->>>>>>> linux-next/akpm-base
/*
* iSCSI transport class definitions
*
--- a/drivers/scsi/scsi_transport_sas.c~linux-next-git-rejects
+++ a/drivers/scsi/scsi_transport_sas.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-only
-=======
// SPDX-License-Identifier: GPL-2.0
->>>>>>> linux-next/akpm-base
/*
* Copyright (C) 2005-2006 Dell Inc.
*
--- a/drivers/scsi/scsi_transport_spi.c~linux-next-git-rejects
+++ a/drivers/scsi/scsi_transport_spi.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-or-later
-=======
// SPDX-License-Identifier: GPL-2.0+
->>>>>>> linux-next/akpm-base
/*
* Parallel SCSI (SPI) transport specific attributes exported to sysfs.
*
--- a/drivers/scsi/ses.c~linux-next-git-rejects
+++ a/drivers/scsi/ses.c
@@ -1,22 +1,9 @@
-<<<<<<< HEAD
-// SPDX-License-Identifier: GPL-2.0-only
-=======
// SPDX-License-Identifier: GPL-2.0
->>>>>>> linux-next/akpm-base
/*
* SCSI Enclosure Services
*
* Copyright (C) 2008 James Bottomley <James.Bottomley@xxxxxxxxxxxxxxxxxxxxx>
-<<<<<<< HEAD
- *
-**-----------------------------------------------------------------------------
-**
-**
-**-----------------------------------------------------------------------------
-*/
-=======
*/
->>>>>>> linux-next/akpm-base
#include <linux/slab.h>
#include <linux/module.h>
--- a/include/scsi/iscsi_if.h~linux-next-git-rejects
+++ a/include/scsi/iscsi_if.h
@@ -1,19 +1,10 @@
-<<<<<<< HEAD
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-=======
/* SPDX-License-Identifier: GPL-2.0+ */
->>>>>>> linux-next/akpm-base
/*
* iSCSI User/Kernel Shares (Defines, Constants, Protocol definitions, etc)
*
* Copyright (C) 2005 Dmitry Yusupov
* Copyright (C) 2005 Alex Aizman
* maintained by open-iscsi@xxxxxxxxxxxxxxxx
-<<<<<<< HEAD
- *
- * See the file COPYING included with this distribution for more details.
-=======
->>>>>>> linux-next/akpm-base
*/
#ifndef ISCSI_IF_H
--- a/include/scsi/iscsi_proto.h~linux-next-git-rejects
+++ a/include/scsi/iscsi_proto.h
@@ -1,19 +1,10 @@
-<<<<<<< HEAD
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-=======
/* SPDX-License-Identifier: GPL-2.0+ */
->>>>>>> linux-next/akpm-base
/*
* RFC 3720 (iSCSI) protocol data types
*
* Copyright (C) 2005 Dmitry Yusupov
* Copyright (C) 2005 Alex Aizman
* maintained by open-iscsi@xxxxxxxxxxxxxxxx
-<<<<<<< HEAD
- *
- * See the file COPYING included with this distribution for more details.
-=======
->>>>>>> linux-next/akpm-base
*/
#ifndef ISCSI_PROTO_H
--- a/include/scsi/libiscsi.h~linux-next-git-rejects
+++ a/include/scsi/libiscsi.h
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-=======
/* SPDX-License-Identifier: GPL-2.0+ */
->>>>>>> linux-next/akpm-base
/*
* iSCSI lib definitions
*
--- a/include/scsi/libiscsi_tcp.h~linux-next-git-rejects
+++ a/include/scsi/libiscsi_tcp.h
@@ -1,19 +1,10 @@
-<<<<<<< HEAD
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-=======
/* SPDX-License-Identifier: GPL-2.0+ */
->>>>>>> linux-next/akpm-base
/*
* iSCSI over TCP/IP Data-Path lib
*
* Copyright (C) 2008 Mike Christie
* Copyright (C) 2008 Red Hat, Inc. All rights reserved.
* maintained by open-iscsi@xxxxxxxxxxxxxxxx
-<<<<<<< HEAD
- *
- * See the file COPYING included with this distribution for more details.
-=======
->>>>>>> linux-next/akpm-base
*/
#ifndef LIBISCSI_TCP_H
--- a/include/scsi/sas_ata.h~linux-next-git-rejects
+++ a/include/scsi/sas_ata.h
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-=======
/* SPDX-License-Identifier: GPL-2.0+ */
->>>>>>> linux-next/akpm-base
/*
* Support for SATA devices on Serial Attached SCSI (SAS) controllers
*
--- a/include/scsi/scsi_bsg_iscsi.h~linux-next-git-rejects
+++ a/include/scsi/scsi_bsg_iscsi.h
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-=======
/* SPDX-License-Identifier: GPL-2.0+ */
->>>>>>> linux-next/akpm-base
/*
* iSCSI Transport BSG Interface
*
--- a/include/scsi/scsi_transport_fc.h~linux-next-git-rejects
+++ a/include/scsi/scsi_transport_fc.h
@@ -1,18 +1,8 @@
-<<<<<<< HEAD
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-=======
/* SPDX-License-Identifier: GPL-2.0+ */
->>>>>>> linux-next/akpm-base
/*
* FiberChannel transport specific attributes exported to sysfs.
*
* Copyright (c) 2003 Silicon Graphics, Inc. All rights reserved.
-<<<<<<< HEAD
- *
- * ========
- *
-=======
->>>>>>> linux-next/akpm-base
* Copyright (C) 2004-2007 James Smart, Emulex Corporation
* Rewrite for host, target, device, and remote port attributes,
* statistics, and service functions...
--- a/include/scsi/scsi_transport.h~linux-next-git-rejects
+++ a/include/scsi/scsi_transport.h
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-=======
/* SPDX-License-Identifier: GPL-2.0 */
->>>>>>> linux-next/akpm-base
/*
* Transport specific attributes.
*
--- a/include/scsi/scsi_transport_iscsi.h~linux-next-git-rejects
+++ a/include/scsi/scsi_transport_iscsi.h
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-=======
/* SPDX-License-Identifier: GPL-2.0+ */
->>>>>>> linux-next/akpm-base
/*
* iSCSI transport class definitions
*
--- a/include/scsi/scsi_transport_spi.h~linux-next-git-rejects
+++ a/include/scsi/scsi_transport_spi.h
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-=======
/* SPDX-License-Identifier: GPL-2.0+ */
->>>>>>> linux-next/akpm-base
/*
* Parallel SCSI (SPI) transport specific attributes exported to sysfs.
*
--- a/sound/pci/hda/hda_intel.c~linux-next-git-rejects
+++ a/sound/pci/hda/hda_intel.c
@@ -1687,13 +1687,6 @@ static int azx_create(struct snd_card *c
else
chip->bdl_pos_adj = bdl_pos_adj[dev];
-<<<<<<< HEAD
- /* Workaround for a communication error on CFL (bko#199007) and CNL */
- if (IS_CFL(pci) || IS_CNL(pci))
- chip->polling_mode = 1;
-
-=======
->>>>>>> linux-next/akpm-base
err = azx_bus_init(chip, model[dev], &pci_hda_io_ops);
if (err < 0) {
kfree(hda);
--- a/sound/pci/rme9652/hdspm.c~linux-next-git-rejects
+++ a/sound/pci/rme9652/hdspm.c
@@ -23,8 +23,6 @@
* Modified 2011-01-14 added S/PDIF input on RayDATs by Adrian Knoth
*
* Modified 2011-01-25 variable period sizes on RayDAT/AIO by Adrian Knoth
-<<<<<<< HEAD
-=======
*
* Modified 2019-05-23 fix AIO single speed ADAT capture and playback
* by Philippe.Bekaert@xxxxxxxxxxx
@@ -43,7 +41,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
->>>>>>> linux-next/akpm-base
*/
/* ************* Register Documentation *******************************************************
--- a/sound/usb/line6/toneport.c~linux-next-git-rejects
+++ a/sound/usb/line6/toneport.c
@@ -398,12 +398,7 @@ static int toneport_setup(struct usb_lin
*/
static void line6_toneport_disconnect(struct usb_line6 *line6)
{
-<<<<<<< HEAD
- struct usb_line6_toneport *toneport =
- (struct usb_line6_toneport *)line6;
-=======
struct usb_line6_toneport *toneport = line6_to_toneport(line6);
->>>>>>> linux-next/akpm-base
if (toneport_has_led(toneport))
toneport_remove_leds(toneport);
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
drivers-crypto-ux500-cryp-makefile-fix.patch
mm-vmallocc-fix-typo-in-comment.patch
prctl_set_mm-refactor-checks-from-validate_prctl_map-checkpatch-fixes.patch
prctl_set_mm-downgrade-mmap_sem-to-read-lock-checkpatch-fixes.patch
mm-mmu_gather-remove-__tlb_reset_range-for-force-flush-checkpatch-fixes.patch
scripts-spellingtxt-drop-sepc-from-the-misspelling-list-fix.patch
ocfs2-clear-zero-in-unaligned-direct-io-checkpatch-fixes.patch
mm.patch
include-linux-pfn_th-remove-pfn_t_to_virt.patch
mm-swap-use-rbtree-for-swap_extent-fix.patch
proc-sysctl-add-shared-variables-for-range-check-fix.patch
vmcore-add-a-kernel-parameter-novmcoredd-fix.patch
vmcore-add-a-kernel-parameter-novmcoredd-fix-fix.patch
byteorder-sanity-check-toolchain-vs-kernel-endianess-checkpatch-fixes.patch
selftests-ptrace-add-a-test-case-for-ptrace_get_syscall_info-checkpatch-fixes.patch
linux-next-rejects.patch
kernel-forkc-export-kernel_thread-to-modules.patch
linux-next-git-rejects.patch
