Date: Mon, 24 Jun 2024 16:41:41 +0100 From: Mark Brown To: Rob Clark , Sean Paul Cc: Bartosz Golaszewski , Bjorn Andersson , Connor Abbott , Linux Kernel Mailing List , Linux Next Mailing List , Rob Clark Subject: linux-next: manual merge of the drm-msm tree with the qcom tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="tF+rPnmXMmmPiY27" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1257086 org.kernel.vger.linux-next:61909 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --tF+rPnmXMmmPiY27 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-msm tree got a conflict in: include/linux/firmware/qcom/qcom_scm.h between commits: 158ed777e330e ("firmware: qcom: scm: Add gpu_init_regs call") 178e19c0df1b1 ("firmware: qcom: scm: add support for SHM bridge operation= s") =66rom the qcom tree and commit: 90c3e2bc9ecbf ("firmware: qcom_scm: Add gpu_init_regs call") =66rom the drm-msm tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc include/linux/firmware/qcom/qcom_scm.h index 9f14976399ab8,a221a643dc12a..0000000000000 --- a/include/linux/firmware/qcom/qcom_scm.h +++ b/include/linux/firmware/qcom/qcom_scm.h --tF+rPnmXMmmPiY27 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ5k7QACgkQJNaLcl1U h9DtZgf+JWDavVOeEGi+W3qXnBC4EOr8J0+Gg1g/JMLxXDHBFNOBKSAGt3q+EKqH zqCTV9nCyAc7Nd4SNVB1L1aO4iWu6CKvETAHlou+Et0oKLV/IwB3hbArAoTcLMs3 Tx/JP5lDMKFW8GPFD/Y/Sg4igRVbPOPWEYiY8IULxt8REJHHzyaN7Ry1hKhiSg5A zpzLi2lhCwb4b5fpK8Y0hAnsnimvTj7d84YxJzjMRoCsFhRRLcRIx6Zfzx7hU1i9 nou9zDIIHOBPeXzsEYYETkmEguS9BNbdaafB2e1HAIg0jZnfI6r2h/jPybdw8W2x iulizHUxtdfdJ4hPEoy33USJZyoIEw== =JN2W -----END PGP SIGNATURE----- --tF+rPnmXMmmPiY27-- . Date: Mon, 24 Jun 2024 17:20:05 +0100 From: Mark Brown To: Dmitry Baryshkov Cc: Linux Kernel Mailing List , Linux Next Mailing List , Maxime Ripard Subject: linux-next: build failure after merge of the drm-msm-lumag tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="OzhFpMnD5U+YYOyJ" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1257122 org.kernel.vger.linux-next:61910 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --OzhFpMnD5U+YYOyJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi all, After merging the drm-msm-lumag tree, today's linux-next build (x86_64 allmodconfig) failed like this: ERROR: modpost: too long symbol "drm_atomic_helper_connector_hdmi_disable_audio_infoframe" [drivers/gpu/drm/msm/msm.ko] Caused by commit 000d1940c90984 ("drm/connector: hdmi: allow disabling Audio Infoframe") I used the version from 20240621 instead. --OzhFpMnD5U+YYOyJ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ5nLQACgkQJNaLcl1U h9Dyhwf/aE00dFlj/i85JoOZOI+HoeBOECCZ86tvhBvKOXwkqPXK0RJ/pda3pQTZ 9pmQsEalJvLRMcIpAIIfQgWA6dd53MUesshXZwnlMxSRDszMxXFuwCTRpNdOmcTH qCOZREc5QaHaiaF6ABDKK+f6JVmOuoYk6ZljTDkhDazce4hOJIyWYgtC8si8MS4s K6HAX0wKNoVCIjeVD4YE2NT9RWsEbZZTlmNZQ3VTxxuMngPXTI81fr12H/F9W3C5 AxQ0AtSGILqB/zbDicMsGZeo2rtG/nmbixeIh5PC5jUo2gn5BpZ3l7+/2yHNZZkx avod9t5pp6hTvZBrPOQNJ8hn+qoOFQ== =Bkdn -----END PGP SIGNATURE----- --OzhFpMnD5U+YYOyJ-- . Date: Mon, 24 Jun 2024 18:06:50 +0100 From: Mark Brown To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Borislav Petkov , Linux Kernel Mailing List , Linux Next Mailing List , Mario Limonciello , Perry Yuan , Xiaojian Du Subject: linux-next: manual merge of the tip tree with the pm tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="4klZvQdydUy1+7yP" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1257181 org.kernel.vger.linux-next:61911 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --4klZvQdydUy1+7yP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the tip tree got a conflict in: arch/x86/include/asm/cpufeatures.h between commit: c7107750b2ffa ("x86/cpufeatures: Add AMD FAST CPPC feature flag") =66rom the pm tree and commit: 78ce84b9e0a54 ("x86/cpufeatures: Flip the /proc/cpuinfo appearance logic") =66rom the tip tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc arch/x86/include/asm/cpufeatures.h index 6c128d463a143,6007462e03d66..0000000000000 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@@ -465,12 -466,11 +466,12 @@@ * * Reuse free bits when adding new feature flags! */ - #define X86_FEATURE_AMD_LBR_PMC_FREEZE (21*32+ 0) /* AMD LBR and PMC Free= ze */ - #define X86_FEATURE_CLEAR_BHB_LOOP (21*32+ 1) /* "" Clear branch history = at syscall entry using SW loop */ - #define X86_FEATURE_BHI_CTRL (21*32+ 2) /* "" BHI_DIS_S HW control avail= able */ - #define X86_FEATURE_CLEAR_BHB_HW (21*32+ 3) /* "" BHI_DIS_S HW control en= abled */ - #define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4) /* "" Clear branc= h history at vmexit using SW loop */ - #define X86_FEATURE_FAST_CPPC (21*32 + 5) /* "" AMD Fast CPPC */ + #define X86_FEATURE_AMD_LBR_PMC_FREEZE (21*32+ 0) /* "amd_lbr_pmc_freeze"= AMD LBR and PMC Freeze */ + #define X86_FEATURE_CLEAR_BHB_LOOP (21*32+ 1) /* Clear branch history at = syscall entry using SW loop */ + #define X86_FEATURE_BHI_CTRL (21*32+ 2) /* BHI_DIS_S HW control availabl= e */ + #define X86_FEATURE_CLEAR_BHB_HW (21*32+ 3) /* BHI_DIS_S HW control enabl= ed */ + #define X86_FEATURE_CLEAR_BHB_LOOP_ON_VMEXIT (21*32+ 4) /* Clear branch h= istory at vmexit using SW loop */ ++#define X86_FEATURE_FAST_CPPC (21*32 + 5) /* AMD Fast CPPC */ =20 /* * BUG word(s) --4klZvQdydUy1+7yP Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ5p6kACgkQJNaLcl1U h9BV/gf+IyBdZ108YiWqPp6OdY+fl10ivWtGa96tpjUhGmBj/9kQDQbWr/k5fJEU ER+E1ouGYwjmR6XO0Y7XuCGSggpcGTtXQKzqms8kYg+E6s6uQxI2P+5nkwX7p4Pa i5wehtb/8USpNi5cp2RpTCn/DDOauUnGdFB1KoYkdBXw1tQYt4imcjzwsB5bCj0l HRC011cCcgcDuD+ZucXF7h8y/L3IORm2K77Bbyem0eQPySBzPwlajOd26tmcM7im GKWqFp8H+YRMNsE/pInAFzpXt/flSdJkxU7tJ/FGaL175NhuNTcX7eC4lFIO5Zh4 ApX5YnecR3u2C8DY0ATmKTiGG+xdNA== =NgFk -----END PGP SIGNATURE----- --4klZvQdydUy1+7yP-- . Date: Mon, 24 Jun 2024 18:35:57 +0100 From: Mark Brown To: Greg KH Cc: Linux Kernel Mailing List , Linux Next Mailing List , Philipp Zabel , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= Subject: linux-next: manual merge of the driver-core tree with the reset tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="GJugohMgk3C+vYLN" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1257202 org.kernel.vger.linux-next:61912 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --GJugohMgk3C+vYLN Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the driver-core tree got a conflict in: drivers/reset/reset-meson-audio-arb.c between commit: 0e8b3bca280a7 ("reset: meson-audio-arb: Use devm_clk_get_enabled()") =66rom the reset tree and commit: b99e9c096148f ("reset: meson-audio-arb: Convert to platform remove callba= ck returning void") =66rom the driver-core tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/reset/reset-meson-audio-arb.c index 894ad9d37a665,8740f5f6abf80..0000000000000 --- a/drivers/reset/reset-meson-audio-arb.c +++ b/drivers/reset/reset-meson-audio-arb.c --GJugohMgk3C+vYLN Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ5rnwACgkQJNaLcl1U h9BqvAf+N+QFDTGcix7Fx0GDZJAEXLzVeLejo+SM2MugdPCxN56XGKZtQ+99h9lV Ryz0k7m/XCNxfME/gOt3slNh7lNIjPQDn9FIZW1TyYoMftE0p916LdA5bcFcNLLS 9vTJH8L3QFg1G6iSEJmI4mEvt8v5P3IN843X3f8+tNgO8dubELgnFtl3oUoqQSC4 KtqIpgqLOtD4zxl2X8sle9jOjImz/ZsquNNZKnIBRDk6HpAkND/bYuVycpcD3O3a UBxBVJIfP4aJ84mWee7YQBASN+tii+EJZu8tD52ErErBXEiY3yulsvI3Mjeea/4s vYXFAZ+tSCnHlwxT0ZMKt255Fdrk4g== =6y0T -----END PGP SIGNATURE----- --GJugohMgk3C+vYLN-- . Date: Mon, 24 Jun 2024 18:45:37 +0100 From: Mark Brown To: Greg KH Cc: Andy Shevchenko , Greg Kroah-Hartman , Linux Kernel Mailing List , Linux Next Mailing List , Petr Mladek , Tony Lindgren Subject: linux-next: manual merge of the tty tree with the printk tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="DC1J995vhGFiO/gP" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1257217 org.kernel.vger.linux-next:61913 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --DC1J995vhGFiO/gP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the tty tree got a conflict in: drivers/tty/serial/8250/8250_core.c between commit: b70dc67cceb97 ("serial: core: Revert unusable console quirk handling") =66rom the printk tree and commit: ffd8e8bd26e94 ("serial: 8250: Extract platform driver") =66rom the tty tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. I'm not sure git rerere will do the right thing with this one... diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/= 8250_core.c index 44f7cc56ff70d..5f9f06911795c 100644 --- a/drivers/tty/serial/8250/8250_core.c +++ b/drivers/tty/serial/8250/8250_core.c @@ -6,11 +6,9 @@ * * Copyright (C) 2001 Russell King. * - * Supports: ISA-compatible 8250/16550 ports - * PNP 8250/16550 ports + * Supports: * early_serial_setup() ports * userspace-configurable "phantom" ports - * "serial8250" platform devices * serial8250_register_8250_port() ports */ =20 @@ -35,52 +33,13 @@ #include #include #include -#ifdef CONFIG_SPARC -#include -#endif =20 #include =20 #include "8250.h" =20 -/* - * Configuration: - * share_irqs - whether we pass IRQF_SHARED to request_irq(). This opti= on - * is unsafe when used on edge-triggered interrupts. - */ -static unsigned int share_irqs =3D SERIAL8250_SHARE_IRQS; - -static unsigned int nr_uarts =3D CONFIG_SERIAL_8250_RUNTIME_UARTS; - -static struct uart_driver serial8250_reg; - -static unsigned int skip_txen_test; /* force skip of txen test at init tim= e */ - #define PASS_LIMIT 512 =20 -#include -/* - * SERIAL_PORT_DFNS tells us about built-in ports that have no - * standard enumeration mechanism. Platforms that can find all - * serial ports via mechanisms like ACPI or PCI need not supply it. - */ -#ifndef SERIAL_PORT_DFNS -#define SERIAL_PORT_DFNS -#endif - -static const struct old_serial_port old_serial_port[] =3D { - SERIAL_PORT_DFNS /* defined in asm/serial.h */ -}; - -#define UART_NR CONFIG_SERIAL_8250_NR_UARTS - -#ifdef CONFIG_SERIAL_8250_RSA - -#define PORT_RSA_MAX 4 -static unsigned long probe_rsa[PORT_RSA_MAX]; -static unsigned int probe_rsa_count; -#endif /* CONFIG_SERIAL_8250_RSA */ - struct irq_info { struct hlist_node node; int irq; @@ -345,45 +304,8 @@ static void univ8250_release_irq(struct uart_8250_port= *up) serial_unlink_irq_chain(up); } =20 -#ifdef CONFIG_SERIAL_8250_RSA -static int serial8250_request_rsa_resource(struct uart_8250_port *up) -{ - unsigned long start =3D UART_RSA_BASE << up->port.regshift; - unsigned int size =3D 8 << up->port.regshift; - struct uart_port *port =3D &up->port; - int ret =3D -EINVAL; - - switch (port->iotype) { - case UPIO_HUB6: - case UPIO_PORT: - start +=3D port->iobase; - if (request_region(start, size, "serial-rsa")) - ret =3D 0; - else - ret =3D -EBUSY; - break; - } - - return ret; -} - -static void serial8250_release_rsa_resource(struct uart_8250_port *up) -{ - unsigned long offset =3D UART_RSA_BASE << up->port.regshift; - unsigned int size =3D 8 << up->port.regshift; - struct uart_port *port =3D &up->port; - - switch (port->iotype) { - case UPIO_HUB6: - case UPIO_PORT: - release_region(port->iobase + offset, size); - break; - } -} -#endif - -static const struct uart_ops *base_ops; -static struct uart_ops univ8250_port_ops; +const struct uart_ops *univ8250_port_base_ops =3D NULL; +struct uart_ops univ8250_port_ops; =20 static const struct uart_8250_ops univ8250_driver_ops =3D { .setup_irq =3D univ8250_setup_irq, @@ -411,85 +333,12 @@ struct uart_8250_port *serial8250_get_port(int line) } EXPORT_SYMBOL_GPL(serial8250_get_port); =20 -static void (*serial8250_isa_config)(int port, struct uart_port *up, - u32 *capabilities); - -void serial8250_set_isa_configurator( - void (*v)(int port, struct uart_port *up, u32 *capabilities)) -{ - serial8250_isa_config =3D v; -} -EXPORT_SYMBOL(serial8250_set_isa_configurator); - -#ifdef CONFIG_SERIAL_8250_RSA - -static void univ8250_config_port(struct uart_port *port, int flags) -{ - struct uart_8250_port *up =3D up_to_u8250p(port); - - up->probe &=3D ~UART_PROBE_RSA; - if (port->type =3D=3D PORT_RSA) { - if (serial8250_request_rsa_resource(up) =3D=3D 0) - up->probe |=3D UART_PROBE_RSA; - } else if (flags & UART_CONFIG_TYPE) { - int i; - - for (i =3D 0; i < probe_rsa_count; i++) { - if (probe_rsa[i] =3D=3D up->port.iobase) { - if (serial8250_request_rsa_resource(up) =3D=3D 0) - up->probe |=3D UART_PROBE_RSA; - break; - } - } - } - - base_ops->config_port(port, flags); - - if (port->type !=3D PORT_RSA && up->probe & UART_PROBE_RSA) - serial8250_release_rsa_resource(up); -} - -static int univ8250_request_port(struct uart_port *port) -{ - struct uart_8250_port *up =3D up_to_u8250p(port); - int ret; - - ret =3D base_ops->request_port(port); - if (ret =3D=3D 0 && port->type =3D=3D PORT_RSA) { - ret =3D serial8250_request_rsa_resource(up); - if (ret < 0) - base_ops->release_port(port); - } - - return ret; -} - -static void univ8250_release_port(struct uart_port *port) -{ - struct uart_8250_port *up =3D up_to_u8250p(port); - - if (port->type =3D=3D PORT_RSA) - serial8250_release_rsa_resource(up); - base_ops->release_port(port); -} - -static void univ8250_rsa_support(struct uart_ops *ops) -{ - ops->config_port =3D univ8250_config_port; - ops->request_port =3D univ8250_request_port; - ops->release_port =3D univ8250_release_port; -} - -#else -#define univ8250_rsa_support(x) do { } while (0) -#endif /* CONFIG_SERIAL_8250_RSA */ - static inline void serial8250_apply_quirks(struct uart_8250_port *up) { up->port.quirks |=3D skip_txen_test ? UPQ_NO_TXEN_TEST : 0; } =20 -static struct uart_8250_port *serial8250_setup_port(int index) +struct uart_8250_port *serial8250_setup_port(int index) { struct uart_8250_port *up; =20 @@ -501,8 +350,8 @@ static struct uart_8250_port *serial8250_setup_port(int= index) up->port.port_id =3D index; =20 serial8250_init_port(up); - if (!base_ops) - base_ops =3D up->port.ops; + if (!univ8250_port_base_ops) + univ8250_port_base_ops =3D up->port.ops; up->port.ops =3D &univ8250_port_ops; =20 timer_setup(&up->timer, serial8250_timeout, 0); @@ -514,57 +363,7 @@ static struct uart_8250_port *serial8250_setup_port(in= t index) return up; } =20 -static void __init serial8250_isa_init_ports(void) -{ - struct uart_8250_port *up; - static int first =3D 1; - int i, irqflag =3D 0; - - if (!first) - return; - first =3D 0; - - if (nr_uarts > UART_NR) - nr_uarts =3D UART_NR; - - /* - * Set up initial isa ports based on nr_uart module param, or else - * default to CONFIG_SERIAL_8250_RUNTIME_UARTS. Note that we do not - * need to increase nr_uarts when setting up the initial isa ports. - */ - for (i =3D 0; i < nr_uarts; i++) - serial8250_setup_port(i); - - /* chain base port ops to support Remote Supervisor Adapter */ - univ8250_port_ops =3D *base_ops; - univ8250_rsa_support(&univ8250_port_ops); - - if (share_irqs) - irqflag =3D IRQF_SHARED; - - for (i =3D 0, up =3D serial8250_ports; - i < ARRAY_SIZE(old_serial_port) && i < nr_uarts; - i++, up++) { - struct uart_port *port =3D &up->port; - - port->iobase =3D old_serial_port[i].port; - port->irq =3D irq_canonicalize(old_serial_port[i].irq); - port->irqflags =3D 0; - port->uartclk =3D old_serial_port[i].baud_base * 16; - port->flags =3D old_serial_port[i].flags; - port->hub6 =3D 0; - port->membase =3D old_serial_port[i].iomem_base; - port->iotype =3D old_serial_port[i].io_type; - port->regshift =3D old_serial_port[i].iomem_reg_shift; - - port->irqflags |=3D irqflag; - if (serial8250_isa_config !=3D NULL) - serial8250_isa_config(i, &up->port, &up->capabilities); - } -} - -static void __init -serial8250_register_ports(struct uart_driver *drv, struct device *dev) +void __init serial8250_register_ports(struct uart_driver *drv, struct devi= ce *dev) { int i; =20 @@ -721,7 +520,7 @@ console_initcall(univ8250_console_init); #define SERIAL8250_CONSOLE NULL #endif =20 -static struct uart_driver serial8250_reg =3D { +struct uart_driver serial8250_reg =3D { .owner =3D THIS_MODULE, .driver_name =3D "serial", .dev_name =3D "ttyS", @@ -822,120 +621,6 @@ void serial8250_resume_port(int line) } EXPORT_SYMBOL(serial8250_resume_port); =20 -/* - * Register a set of serial devices attached to a platform device. The - * list is terminated with a zero flags entry, which means we expect - * all entries to have at least UPF_BOOT_AUTOCONF set. - */ -static int serial8250_probe(struct platform_device *dev) -{ - struct plat_serial8250_port *p =3D dev_get_platdata(&dev->dev); - struct uart_8250_port uart; - int ret, i, irqflag =3D 0; - - memset(&uart, 0, sizeof(uart)); - - if (share_irqs) - irqflag =3D IRQF_SHARED; - - for (i =3D 0; p && p->flags !=3D 0; p++, i++) { - uart.port.iobase =3D p->iobase; - uart.port.membase =3D p->membase; - uart.port.irq =3D p->irq; - uart.port.irqflags =3D p->irqflags; - uart.port.uartclk =3D p->uartclk; - uart.port.regshift =3D p->regshift; - uart.port.iotype =3D p->iotype; - uart.port.flags =3D p->flags; - uart.port.mapbase =3D p->mapbase; - uart.port.mapsize =3D p->mapsize; - uart.port.hub6 =3D p->hub6; - uart.port.has_sysrq =3D p->has_sysrq; - uart.port.private_data =3D p->private_data; - uart.port.type =3D p->type; - uart.bugs =3D p->bugs; - uart.port.serial_in =3D p->serial_in; - uart.port.serial_out =3D p->serial_out; - uart.dl_read =3D p->dl_read; - uart.dl_write =3D p->dl_write; - uart.port.handle_irq =3D p->handle_irq; - uart.port.handle_break =3D p->handle_break; - uart.port.set_termios =3D p->set_termios; - uart.port.set_ldisc =3D p->set_ldisc; - uart.port.get_mctrl =3D p->get_mctrl; - uart.port.pm =3D p->pm; - uart.port.dev =3D &dev->dev; - uart.port.irqflags |=3D irqflag; - ret =3D serial8250_register_8250_port(&uart); - if (ret < 0) { - dev_err(&dev->dev, "unable to register port at index %d " - "(IO%lx MEM%llx IRQ%d): %d\n", i, - p->iobase, (unsigned long long)p->mapbase, - p->irq, ret); - } - } - return 0; -} - -/* - * Remove serial ports registered against a platform device. - */ -static void serial8250_remove(struct platform_device *dev) -{ - int i; - - for (i =3D 0; i < nr_uarts; i++) { - struct uart_8250_port *up =3D &serial8250_ports[i]; - - if (up->port.dev =3D=3D &dev->dev) - serial8250_unregister_port(i); - } -} - -static int serial8250_suspend(struct platform_device *dev, pm_message_t st= ate) -{ - int i; - - for (i =3D 0; i < UART_NR; i++) { - struct uart_8250_port *up =3D &serial8250_ports[i]; - - if (up->port.type !=3D PORT_UNKNOWN && up->port.dev =3D=3D &dev->dev) - uart_suspend_port(&serial8250_reg, &up->port); - } - - return 0; -} - -static int serial8250_resume(struct platform_device *dev) -{ - int i; - - for (i =3D 0; i < UART_NR; i++) { - struct uart_8250_port *up =3D &serial8250_ports[i]; - - if (up->port.type !=3D PORT_UNKNOWN && up->port.dev =3D=3D &dev->dev) - serial8250_resume_port(i); - } - - return 0; -} - -static struct platform_driver serial8250_isa_driver =3D { - .probe =3D serial8250_probe, - .remove_new =3D serial8250_remove, - .suspend =3D serial8250_suspend, - .resume =3D serial8250_resume, - .driver =3D { - .name =3D "serial8250", - }, -}; - -/* - * This "device" covers _all_ ISA 8250-compatible serial devices listed - * in the table in include/asm/serial.h - */ -static struct platform_device *serial8250_isa_devs; - /* * serial8250_register_8250_port and serial8250_unregister_port allows for * 16x50 serial ports to be configured at run-time, to support PCMCIA @@ -1212,134 +897,5 @@ void serial8250_unregister_port(int line) } EXPORT_SYMBOL(serial8250_unregister_port); =20 -static int __init serial8250_init(void) -{ - int ret; - - if (nr_uarts =3D=3D 0) - return -ENODEV; - - serial8250_isa_init_ports(); - - pr_info("Serial: 8250/16550 driver, %d ports, IRQ sharing %s\n", - nr_uarts, str_enabled_disabled(share_irqs)); - -#ifdef CONFIG_SPARC - ret =3D sunserial_register_minors(&serial8250_reg, UART_NR); -#else - serial8250_reg.nr =3D UART_NR; - ret =3D uart_register_driver(&serial8250_reg); -#endif - if (ret) - goto out; - - ret =3D serial8250_pnp_init(); - if (ret) - goto unreg_uart_drv; - - serial8250_isa_devs =3D platform_device_alloc("serial8250", - PLAT8250_DEV_LEGACY); - if (!serial8250_isa_devs) { - ret =3D -ENOMEM; - goto unreg_pnp; - } - - ret =3D platform_device_add(serial8250_isa_devs); - if (ret) - goto put_dev; - - serial8250_register_ports(&serial8250_reg, &serial8250_isa_devs->dev); - - ret =3D platform_driver_register(&serial8250_isa_driver); - if (ret =3D=3D 0) - goto out; - - platform_device_del(serial8250_isa_devs); -put_dev: - platform_device_put(serial8250_isa_devs); -unreg_pnp: - serial8250_pnp_exit(); -unreg_uart_drv: -#ifdef CONFIG_SPARC - sunserial_unregister_minors(&serial8250_reg, UART_NR); -#else - uart_unregister_driver(&serial8250_reg); -#endif -out: - return ret; -} - -static void __exit serial8250_exit(void) -{ - struct platform_device *isa_dev =3D serial8250_isa_devs; - - /* - * This tells serial8250_unregister_port() not to re-register - * the ports (thereby making serial8250_isa_driver permanently - * in use.) - */ - serial8250_isa_devs =3D NULL; - - platform_driver_unregister(&serial8250_isa_driver); - platform_device_unregister(isa_dev); - - serial8250_pnp_exit(); - -#ifdef CONFIG_SPARC - sunserial_unregister_minors(&serial8250_reg, UART_NR); -#else - uart_unregister_driver(&serial8250_reg); -#endif -} - -module_init(serial8250_init); -module_exit(serial8250_exit); - MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Generic 8250/16x50 serial driver"); - -module_param_hw(share_irqs, uint, other, 0644); -MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices= (unsafe)"); - -module_param(nr_uarts, uint, 0644); -MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODU= LE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")"); - -module_param(skip_txen_test, uint, 0644); -MODULE_PARM_DESC(skip_txen_test, "Skip checking for the TXEN bug at init t= ime"); - -#ifdef CONFIG_SERIAL_8250_RSA -module_param_hw_array(probe_rsa, ulong, ioport, &probe_rsa_count, 0444); -MODULE_PARM_DESC(probe_rsa, "Probe I/O ports for RSA"); -#endif -MODULE_ALIAS_CHARDEV_MAJOR(TTY_MAJOR); - -#ifdef CONFIG_SERIAL_8250_DEPRECATED_OPTIONS -#ifndef MODULE -/* This module was renamed to 8250_core in 3.7. Keep the old "8250" name - * working as well for the module options so we don't break people. We - * need to keep the names identical and the convenient macros will happily - * refuse to let us do that by failing the build with redefinition errors - * of global variables. So we stick them inside a dummy function to avoid - * those conflicts. The options still get parsed, and the redefined - * MODULE_PARAM_PREFIX lets us keep the "8250." syntax alive. - * - * This is hacky. I'm sorry. - */ -static void __used s8250_options(void) -{ -#undef MODULE_PARAM_PREFIX -#define MODULE_PARAM_PREFIX "8250_core." - - module_param_cb(share_irqs, ¶m_ops_uint, &share_irqs, 0644); - module_param_cb(nr_uarts, ¶m_ops_uint, &nr_uarts, 0644); - module_param_cb(skip_txen_test, ¶m_ops_uint, &skip_txen_test, 0644); -#ifdef CONFIG_SERIAL_8250_RSA - __module_param_call(MODULE_PARAM_PREFIX, probe_rsa, - ¶m_array_ops, .arr =3D &__param_arr_probe_rsa, - 0444, -1, 0); -#endif -} -#else -MODULE_ALIAS("8250_core"); -#endif -#endif diff --git a/drivers/tty/serial/8250/8250_platform.c b/drivers/tty/serial/8= 250/8250_platform.c index ded985182e04a..4664dbbf26def 100644 --- a/drivers/tty/serial/8250/8250_platform.c +++ b/drivers/tty/serial/8250/8250_platform.c @@ -17,7 +17,6 @@ #include #endif =20 -#include "../serial_base.h" /* For serial_base_add_isa_preferred_console()= */ #include "8250.h" =20 /* @@ -97,8 +96,6 @@ void __init serial8250_isa_init_ports(void) port->irqflags |=3D irqflag; if (serial8250_isa_config !=3D NULL) serial8250_isa_config(i, &up->port, &up->capabilities); - - serial_base_add_isa_preferred_console(serial8250_reg.dev_name, i); } } =20 --DC1J995vhGFiO/gP Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ5sMAACgkQJNaLcl1U h9Ajugf5AQOGHw5WqhGFjoWp4tnBFTq8Bx0ZGHjGjIs8BSdJiV6G1BH6DjzEK+SN b9NNjGW+Zi94CL6Q4Ai8kttAaAHa3fMDGCWpQK5y2K/QkCxQbzYTxa0Fms+pOjnu wezp4lWNUlOz7S+CchgKVcL6xSH+jfhmkuTIt1Frjjkwe+zfgOZ0mRYX+YajezeH 6rQH4l4EHwc9knS7u4SUNTUzG/lmQExEuP/01Pcmupworgbutx8rGl8IQ33Jf7Hr 2XKQ8YzPbZ4L3ITSOSI8Afq3oyJMiEN1nA/07B2yhDse/FeSeaqXgFx1zjCIcHsB gvPpqx9kPc0YWBMBu+NpkEEhlqqeiw== =AMS7 -----END PGP SIGNATURE----- --DC1J995vhGFiO/gP-- . Date: Mon, 24 Jun 2024 18:55:15 +0100 From: Mark Brown To: William Breathitt Gray Cc: David Lechner , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the counter-next tree with the counter-current tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="40OqtuILxyApl9cd" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1257243 org.kernel.vger.linux-next:61915 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --40OqtuILxyApl9cd Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the counter-next tree got a conflict in: drivers/counter/ti-eqep.c between commit: 0cf81c73e4c6a ("counter: ti-eqep: enable clock at probe") =66rom the counter-current tree and commit: 1c30c6d024726 ("counter: ti-eqep: implement over/underflow events") =66rom the counter-next tree. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. diff --cc drivers/counter/ti-eqep.c index 825ae22c3ebc7,9742ba9fc3072..0000000000000 --- a/drivers/counter/ti-eqep.c +++ b/drivers/counter/ti-eqep.c @@@ -6,8 -6,8 +6,9 @@@ */ =20 #include +#include #include + #include #include #include #include @@@ -377,8 -465,7 +466,8 @@@ static int ti_eqep_probe(struct platfor struct counter_device *counter; struct ti_eqep_cnt *priv; void __iomem *base; + struct clk *clk; - int err; + int err, irq; =20 counter =3D devm_counter_alloc(dev, sizeof(*priv)); if (!counter) --40OqtuILxyApl9cd Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ5swIACgkQJNaLcl1U h9AFVQgAgDJvCuLymRf+pSDaEA3ZixKP1r/fCMazx0wEx0iwce9qiKiW2yvGYRpq HiR3ZJCfbxzcyo6hF4iZoIyHW8Mz4wKUGrMTDSuceaMO1oWn50DSjj2kk3NeA7zY FTaI0UqJHVOiAkpiprgw9PgbYYaAzKFbFB6yRVdPTgacVnZMZET1jmOvJ46kicP6 vOu0JhmkKrhtxGYwiVs8auZLcDIJkrUO77Fj4JBm4VOA5k1S9wSOeX1h8av6xKFz eF7jYbs9zwe66mnhIgOaBHQV+7hXhzbxUqRebm/eZ4pm3jcKr9jAWQrfY0SqP1EJ ExTWa6APtc9StQiXYoSlh478IT92zQ== =Y+J7 -----END PGP SIGNATURE----- --40OqtuILxyApl9cd-- . Message-ID: <6679b2a5.170a0220.4c3e.03c7@mx.google.com> Date: Mon, 24 Jun 2024 10:53:41 -0700 (PDT) Content-Type: text/plain; charset="utf-8" X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Kernelci-Kernel: v6.10-rc5-208-gd80fbb8036fc7 X-Kernelci-Report-Type: build X-Kernelci-Branch: pending-fixes X-Kernelci-Tree: next Subject: next/pending-fixes build: 8 builds: 0 failed, 8 passed, 19 warnings (v6.10-rc5-208-gd80fbb8036fc7) To: linux-next@vger.kernel.org From: "kernelci.org bot" Xref: photonic.trudheim.com org.kernel.vger.linux-next:61916 Newsgroups: org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail next/pending-fixes build: 8 builds: 0 failed, 8 passed, 19 warnings (v6.10-= rc5-208-gd80fbb8036fc7) Full Build Summary: https://kernelci.org/build/next/branch/pending-fixes/ke= rnel/v6.10-rc5-208-gd80fbb8036fc7/ Tree: next Branch: pending-fixes Git Describe: v6.10-rc5-208-gd80fbb8036fc7 Git Commit: d80fbb8036fc719a716b68659768e315a56e24ef Git URL: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git Built: 8 unique architectures Warnings Detected: arc: haps_hs_smp_defconfig (gcc-10): 2 warnings arm64: arm: i386: mips: 32r2el_defconfig (gcc-10): 3 warnings riscv: sparc: sparc64_defconfig (gcc-10): 14 warnings x86_64: Warnings summary: 2 WARNING: modpost: EXPORT symbol "_mcount" [vmlinux] version genera= tion failed, symbol will not be versioned. 2 :1519:2: warning: #warning syscall clone3 not implemented [= -Wcpp] 1 arch/sparc/vdso/vdso32/../vclock_gettime.c:343:1: warning: no prev= ious prototype for =E2=80=98__vdso_gettimeofday_stick=E2=80=99 [-Wmissing-p= rototypes] 1 arch/sparc/vdso/vdso32/../vclock_gettime.c:307:1: warning: no prev= ious prototype for =E2=80=98__vdso_gettimeofday=E2=80=99 [-Wmissing-prototy= pes] 1 arch/sparc/vdso/vdso32/../vclock_gettime.c:282:1: warning: no prev= ious prototype for =E2=80=98__vdso_clock_gettime_stick=E2=80=99 [-Wmissing-= prototypes] 1 arch/sparc/vdso/vdso32/../vclock_gettime.c:254:1: warning: no prev= ious prototype for =E2=80=98__vdso_clock_gettime=E2=80=99 [-Wmissing-protot= ypes] 1 arch/sparc/vdso/vclock_gettime.c:343:1: warning: no previous proto= type for =E2=80=98__vdso_gettimeofday_stick=E2=80=99 [-Wmissing-prototypes] 1 arch/sparc/vdso/vclock_gettime.c:307:1: warning: no previous proto= type for =E2=80=98__vdso_gettimeofday=E2=80=99 [-Wmissing-prototypes] 1 arch/sparc/vdso/vclock_gettime.c:282:1: warning: no previous proto= type for =E2=80=98__vdso_clock_gettime_stick=E2=80=99 [-Wmissing-prototypes] 1 arch/sparc/vdso/vclock_gettime.c:254:1: warning: no previous proto= type for =E2=80=98__vdso_clock_gettime=E2=80=99 [-Wmissing-prototypes] 1 arch/sparc/prom/p1275.c:52:6: warning: no previous prototype for = =E2=80=98prom_cif_init=E2=80=99 [-Wmissing-prototypes] 1 arch/sparc/prom/misc_64.c:165:5: warning: no previous prototype fo= r =E2=80=98prom_get_mmu_ihandle=E2=80=99 [-Wmissing-prototypes] 1 arch/mips/boot/dts/img/boston.dts:136.23-177.6: Warning (interrupt= _provider): /pci@14000000/pci2_root@0,0/eg20t_bridge@1,0,0: '#interrupt-cel= ls' found, but node is not an interrupt provider 1 arch/mips/boot/dts/img/boston.dts:128.17-178.5: Warning (interrupt= _provider): /pci@14000000/pci2_root@0,0: '#interrupt-cells' found, but node= is not an interrupt provider 1 arch/mips/boot/dts/img/boston.dtb: Warning (interrupt_map): Failed= prerequisite 'interrupt_provider' 1 arch/arc/boot/dts/haps_hs_idu.dts:68.16-72.5: Warning (interrupt_p= rovider): /fpga/pct: '#interrupt-cells' found, but node is not an interrupt= provider 1 arch/arc/boot/dts/haps_hs_idu.dtb: Warning (interrupt_map): Failed= prerequisite 'interrupt_provider' =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D Detailed per-defconfig build reports: ---------------------------------------------------------------------------= ----- 32r2el_defconfig (mips, gcc-10) =E2=80=94 PASS, 0 errors, 3 warnings, 0 sec= tion mismatches Warnings: arch/mips/boot/dts/img/boston.dts:128.17-178.5: Warning (interrupt_prov= ider): /pci@14000000/pci2_root@0,0: '#interrupt-cells' found, but node is n= ot an interrupt provider arch/mips/boot/dts/img/boston.dts:136.23-177.6: Warning (interrupt_prov= ider): /pci@14000000/pci2_root@0,0/eg20t_bridge@1,0,0: '#interrupt-cells' f= ound, but node is not an interrupt provider arch/mips/boot/dts/img/boston.dtb: Warning (interrupt_map): Failed prer= equisite 'interrupt_provider' ---------------------------------------------------------------------------= ----- defconfig (riscv, gcc-10) =E2=80=94 PASS, 0 errors, 0 warnings, 0 section m= ismatches ---------------------------------------------------------------------------= ----- defconfig (arm64, gcc-10) =E2=80=94 PASS, 0 errors, 0 warnings, 0 section m= ismatches ---------------------------------------------------------------------------= ----- haps_hs_smp_defconfig (arc, gcc-10) =E2=80=94 PASS, 0 errors, 2 warnings, 0= section mismatches Warnings: arch/arc/boot/dts/haps_hs_idu.dts:68.16-72.5: Warning (interrupt_provid= er): /fpga/pct: '#interrupt-cells' found, but node is not an interrupt prov= ider arch/arc/boot/dts/haps_hs_idu.dtb: Warning (interrupt_map): Failed prer= equisite 'interrupt_provider' ---------------------------------------------------------------------------= ----- i386_defconfig (i386, gcc-10) =E2=80=94 PASS, 0 errors, 0 warnings, 0 secti= on mismatches ---------------------------------------------------------------------------= ----- multi_v7_defconfig (arm, gcc-10) =E2=80=94 PASS, 0 errors, 0 warnings, 0 se= ction mismatches ---------------------------------------------------------------------------= ----- sparc64_defconfig (sparc, gcc-10) =E2=80=94 PASS, 0 errors, 14 warnings, 0 = section mismatches Warnings: :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] arch/sparc/vdso/vclock_gettime.c:254:1: warning: no previous prototype = for =E2=80=98__vdso_clock_gettime=E2=80=99 [-Wmissing-prototypes] arch/sparc/vdso/vclock_gettime.c:282:1: warning: no previous prototype = for =E2=80=98__vdso_clock_gettime_stick=E2=80=99 [-Wmissing-prototypes] arch/sparc/vdso/vclock_gettime.c:307:1: warning: no previous prototype = for =E2=80=98__vdso_gettimeofday=E2=80=99 [-Wmissing-prototypes] arch/sparc/vdso/vclock_gettime.c:343:1: warning: no previous prototype = for =E2=80=98__vdso_gettimeofday_stick=E2=80=99 [-Wmissing-prototypes] arch/sparc/vdso/vdso32/../vclock_gettime.c:254:1: warning: no previous = prototype for =E2=80=98__vdso_clock_gettime=E2=80=99 [-Wmissing-prototypes] arch/sparc/vdso/vdso32/../vclock_gettime.c:282:1: warning: no previous = prototype for =E2=80=98__vdso_clock_gettime_stick=E2=80=99 [-Wmissing-proto= types] arch/sparc/vdso/vdso32/../vclock_gettime.c:307:1: warning: no previous = prototype for =E2=80=98__vdso_gettimeofday=E2=80=99 [-Wmissing-prototypes] arch/sparc/vdso/vdso32/../vclock_gettime.c:343:1: warning: no previous = prototype for =E2=80=98__vdso_gettimeofday_stick=E2=80=99 [-Wmissing-protot= ypes] arch/sparc/prom/misc_64.c:165:5: warning: no previous prototype for =E2= =80=98prom_get_mmu_ihandle=E2=80=99 [-Wmissing-prototypes] arch/sparc/prom/p1275.c:52:6: warning: no previous prototype for =E2=80= =98prom_cif_init=E2=80=99 [-Wmissing-prototypes] WARNING: modpost: EXPORT symbol "_mcount" [vmlinux] version generation = failed, symbol will not be versioned. :1519:2: warning: #warning syscall clone3 not implemented [-Wcpp] WARNING: modpost: EXPORT symbol "_mcount" [vmlinux] version generation = failed, symbol will not be versioned. ---------------------------------------------------------------------------= ----- x86_64_defconfig (x86_64, gcc-10) =E2=80=94 PASS, 0 errors, 0 warnings, 0 s= ection mismatches --- For more info write to . Date: Mon, 24 Jun 2024 19:23:36 +0100 From: Mark Brown To: Greg KH , Uwe =?iso-8859-1?Q?Kleine-K=F6nig?= , Niklas =?iso-8859-1?Q?S=F6derlund?= , Andrew Lunn , "David S. Miller" Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the driver-core tree Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="fnI7Duvj7Pn/WS/q" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1257281 org.kernel.vger.linux-next:61918 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --fnI7Duvj7Pn/WS/q Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi all, After merging the driver-core tree, today's linux-next build (x86_64 allmodconfig) failed like this: /tmp/next/build/drivers/net/ethernet/renesas/rtsn.c:1381:27: error: initial= ization of 'void (*)(struct platform_device *)' from incompatible pointer t= ype 'int (*)(struct platform_device *)' [-Werror=3Dincompatible-pointer-typ= es] 1381 | .remove =3D rtsn_remove, | ^~~~~~~~~~~ /tmp/next/build/drivers/net/ethernet/renesas/rtsn.c:1381:27: note: (near in= itialization for 'rtsn_driver..remove') Caused by commit 0edb555a65d1e ("platform: Make platform_driver::remove() return void") interacting with b0d3969d2b4db ("net: ethernet: rtsn: Add support for Renesas Ethernet-TSN= ") I have applied the below patch. =46rom 8f276c3b5b1be09214cbd5643dd4fe4b2e6c692f Mon Sep 17 00:00:00 2001 =46rom: Mark Brown Date: Mon, 24 Jun 2024 19:02:24 +0100 Subject: [PATCH] net: ethernet: rtsn: Fix up for remove() coversion to retu= rn void Fixes: 0edb555a65d1e ("platform: Make platform_driver::remove() return void= ") Signed-off-by: Mark Brown --- drivers/net/ethernet/renesas/rtsn.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/net/ethernet/renesas/rtsn.c b/drivers/net/ethernet/ren= esas/rtsn.c index ad69d47463cbd..5a6cc99e6b35a 100644 --- a/drivers/net/ethernet/renesas/rtsn.c +++ b/drivers/net/ethernet/renesas/rtsn.c @@ -1358,7 +1358,7 @@ static int rtsn_probe(struct platform_device *pdev) return ret; } =20 -static int rtsn_remove(struct platform_device *pdev) +static void rtsn_remove(struct platform_device *pdev) { struct rtsn_private *priv =3D platform_get_drvdata(pdev); =20 @@ -1372,8 +1372,6 @@ static int rtsn_remove(struct platform_device *pdev) pm_runtime_disable(&pdev->dev); =20 free_netdev(priv->ndev); - - return 0; } =20 static struct platform_driver rtsn_driver =3D { --=20 2.39.2 --fnI7Duvj7Pn/WS/q Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ5uagACgkQJNaLcl1U h9AI0Qf/eLVgpyAXif2IQX/J4c88dt/Cfea1xezgjF5IjoBQYowjP4ytp/kwxLZN LtXjsESKx6vyPCtCSTPetqut9lo1mElbIubtSCXiODNIKxRdE3azseqTXqI8Di6K Z+6SQF04dDZPjwQzMsuhSnN+GfZyqrVnLIjDneemzf0uEBjuMfva0Go5WdpIF6Qp 7zaftKbpBcCP3BGFiJFkBOZq74Q4ENgEbcmN83EhSNTQ7ev9Hly+qAJKbXeYa/g7 JwkUdgwIflaQHEOJkMW85AVICjDToXJ/7wFEhHMA/4xVtP9hXZZXLuQ1V69zlmCH vdBYjcSBNyq4/tWeSaIUHAliAc0exg== =bvVu -----END PGP SIGNATURE----- --fnI7Duvj7Pn/WS/q-- . Date: Mon, 24 Jun 2024 19:57:40 +0100 From: Mark Brown To: Linux Next Mailing List Cc: Linux Kernel Mailing List Subject: linux-next: Tree for Jun 24 Message-ID: X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="FPoAcc1pD40vVTwI" Content-Disposition: inline Xref: photonic.trudheim.com org.kernel.vger.linux-kernel:1257315 org.kernel.vger.linux-next:61919 Newsgroups: org.kernel.vger.linux-kernel,org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail --FPoAcc1pD40vVTwI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi all, Changes since 20240621: The drm-msm tree gained a conflict with the qcom tree. The drm-msm-lumag tree gained a build failure, I use the version from 20240621 instead. The tip tree gained a conflict with the pm tree. The driver-core tree gained a conflict with the reset tree. The driver-core tree gained a build failure for which I applied a patch. The tty tree gained a conflict with the printk tree. The counter-next tree gained a conflict with the counter-current tree. Non-merge commits (relative to Linus' tree): 7232 8069 files changed, 728210 insertions(+), 138737 deletions(-) ---------------------------------------------------------------------------- I have created today's linux-next tree at git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git (patches at http://www.kernel.org/pub/linux/kernel/next/ ). If you are tracking the linux-next tree using git, you should not use "git pull" to do so as that will try to merge the new linux-next release with the old one. You should use "git fetch" and checkout or reset to the new master. You can see which trees have been included by looking in the Next/Trees file in the source. There is also the merge.log file in the Next directory. Between each merge, the tree was built with a defconfig for arm64, an allmodconfig for x86_64, a multi_v7_defconfig for arm and a native build of tools/perf. Below is a summary of the state of the merge. I am currently merging 378 trees (counting Linus' and 106 trees of bug fix patches pending for the current merge release). Stats about the size of the tree over time can be seen at http://neuling.org/linux-next-size.html . Status of my local build tests will be at http://kisskb.ellerman.id.au/linux-next . If maintainers want to give advice about cross compilers/configs that work, we are always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. --FPoAcc1pD40vVTwI Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEreZoqmdXGLWf4p/qJNaLcl1Uh9AFAmZ5waQACgkQJNaLcl1U h9Av/wgAgMNgWW8V6MGsM7jHlQ4sHJeDNdpsY4hkpyw3mO05pVsu6wee7r5DjWjO DwAF+9yebpM3Wp7kTaKbwMsFABhCb7ixSC7L8e35Q61wwoSBpzqKTlkLQJHgDQl5 wsYWWk39AHNnqfmjd1amfuGRamztF7wPCxBTdRiwqCDy9F8QaEyAgmDKoAriurtC WMSIN70Z88pqzZYktv79bkiFxg+6MDGnXGH6Avzwp/yvyqIAAMoXtTINRuV4YGxB T49ZfMzpaP1APcCOrEQPge9mFwsc17hW8PioetQX0/M72reLslcrxPu8v7e2r4gc 0cVn94avbhQE8Qbw3H9MLYwIGVFMNA== =hhAB -----END PGP SIGNATURE----- --FPoAcc1pD40vVTwI-- . Message-ID: <6679e3a5.170a0220.e0d0e.0ac2@mx.google.com> Date: Mon, 24 Jun 2024 14:22:45 -0700 (PDT) Content-Type: text/plain; charset="utf-8" X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Kernelci-Kernel: v6.10-rc5-208-gd80fbb8036fc7 X-Kernelci-Report-Type: test X-Kernelci-Branch: pending-fixes X-Kernelci-Tree: next Subject: next/pending-fixes baseline: 75 runs, 2 regressions (v6.10-rc5-208-gd80fbb8036fc7) To: linux-next@vger.kernel.org, kernel-build-reports@lists.linaro.org, kernelci-results@groups.io From: "kernelci.org bot" Xref: photonic.trudheim.com org.kernel.vger.linux-next:61920 Newsgroups: org.kernel.vger.linux-next Path: photonic.trudheim.com!nntp.lore.kernel.org!not-for-mail next/pending-fixes baseline: 75 runs, 2 regressions (v6.10-rc5-208-gd80fbb8= 036fc7) Regressions Summary ------------------- platform | arch | lab | compiler | defconfig | re= gressions -----------------+------+--------------+----------+--------------------+---= --------- beaglebone-black | arm | lab-cip | gcc-10 | multi_v7_defconfig | 1 = = jetson-tk1 | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 = = Details: https://kernelci.org/test/job/next/branch/pending-fixes/kernel/= v6.10-rc5-208-gd80fbb8036fc7/plan/baseline/ Test: baseline Tree: next Branch: pending-fixes Describe: v6.10-rc5-208-gd80fbb8036fc7 URL: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next= .git SHA: d80fbb8036fc719a716b68659768e315a56e24ef = Test Regressions ---------------- = platform | arch | lab | compiler | defconfig | re= gressions -----------------+------+--------------+----------+--------------------+---= --------- beaglebone-black | arm | lab-cip | gcc-10 | multi_v7_defconfig | 1 = = Details: https://kernelci.org/test/plan/id/6679c1fa9c782b166f7e7079 Results: 3 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 202= 10110) Plain log: https://storage.kernelci.org//next/pending-fixes/v6.10-rc5-2= 08-gd80fbb8036fc7/arm/multi_v7_defconfig/gcc-10/lab-cip/baseline-beaglebone= -black.txt HTML log: https://storage.kernelci.org//next/pending-fixes/v6.10-rc5-2= 08-gd80fbb8036fc7/arm/multi_v7_defconfig/gcc-10/lab-cip/baseline-beaglebone= -black.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/armel/rootfs.cpio.gz = * baseline.dmesg.crit: https://kernelci.org/test/case/id/6679c1fa9c782b16= 6f7e707e new failure (last pass: v6.10-rc4-318-gc7e7720403303) 1 lines 2024-06-24T18:58:57.215135 / # = 2024-06-24T18:58:57.224097 = 2024-06-24T18:58:57.328740 / # # 2024-06-24T18:58:57.336244 # 2024-06-24T18:58:57.438383 / # export SHELL=3D/bin/sh 2024-06-24T18:58:57.448202 export SHELL=3D/bin/sh 2024-06-24T18:58:57.550079 / # . /lava-1155725/environment 2024-06-24T18:58:57.560159 . /lava-1155725/environment 2024-06-24T18:58:57.661962 / # /lava-1155725/bin/lava-test-runner /lav= a-1155725/0 2024-06-24T18:58:57.671571 /lava-1155725/bin/lava-test-runner /lava-11= 55725/0 = ... (9 line(s) more) = = platform | arch | lab | compiler | defconfig | re= gressions -----------------+------+--------------+----------+--------------------+---= --------- jetson-tk1 | arm | lab-baylibre | gcc-10 | multi_v7_defconfig | 1 = = Details: https://kernelci.org/test/plan/id/6679b128edb11052bb7e708f Results: 0 PASS, 1 FAIL, 0 SKIP Full config: multi_v7_defconfig Compiler: gcc-10 (arm-linux-gnueabihf-gcc (Debian 10.2.1-6) 10.2.1 202= 10110) Plain log: https://storage.kernelci.org//next/pending-fixes/v6.10-rc5-2= 08-gd80fbb8036fc7/arm/multi_v7_defconfig/gcc-10/lab-baylibre/baseline-jetso= n-tk1.txt HTML log: https://storage.kernelci.org//next/pending-fixes/v6.10-rc5-2= 08-gd80fbb8036fc7/arm/multi_v7_defconfig/gcc-10/lab-baylibre/baseline-jetso= n-tk1.html Rootfs: http://storage.kernelci.org/images/rootfs/buildroot/buildroo= t-baseline/20230703.0/armel/rootfs.cpio.gz = * baseline.login: https://kernelci.org/test/case/id/6679b128edb11052bb7e7= 090 failing since 6 days (last pass: v6.3-10703-gb3f869e79cdf0, first f= ail: v6.10-rc4-262-g1ce98b2c2d5b0) = =20 .