kernel-5.19.17-300
* Mon Oct 24 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.19.17-1] - Linux v5.19.17 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
parent
11d8e00c54
commit
42b89a4376
@ -12,7 +12,7 @@ RHEL_MINOR = 99
|
|||||||
#
|
#
|
||||||
# Use this spot to avoid future merge conflicts.
|
# Use this spot to avoid future merge conflicts.
|
||||||
# Do not trim this comment.
|
# Do not trim this comment.
|
||||||
RHEL_RELEASE = 1
|
RHEL_RELEASE = 0
|
||||||
|
|
||||||
#
|
#
|
||||||
# ZSTREAM
|
# ZSTREAM
|
||||||
|
@ -369,6 +369,7 @@ CONFIG_ARM64_ERRATUM_2119858=y
|
|||||||
CONFIG_ARM64_ERRATUM_2139208=y
|
CONFIG_ARM64_ERRATUM_2139208=y
|
||||||
CONFIG_ARM64_ERRATUM_2224489=y
|
CONFIG_ARM64_ERRATUM_2224489=y
|
||||||
CONFIG_ARM64_ERRATUM_2253138=y
|
CONFIG_ARM64_ERRATUM_2253138=y
|
||||||
|
CONFIG_ARM64_ERRATUM_2441007=y
|
||||||
CONFIG_ARM64_ERRATUM_2441009=y
|
CONFIG_ARM64_ERRATUM_2441009=y
|
||||||
CONFIG_ARM64_ERRATUM_2457168=y
|
CONFIG_ARM64_ERRATUM_2457168=y
|
||||||
CONFIG_ARM64_ERRATUM_819472=y
|
CONFIG_ARM64_ERRATUM_819472=y
|
||||||
|
@ -294,6 +294,7 @@ CONFIG_ARM64_ERRATUM_2119858=y
|
|||||||
CONFIG_ARM64_ERRATUM_2139208=y
|
CONFIG_ARM64_ERRATUM_2139208=y
|
||||||
CONFIG_ARM64_ERRATUM_2224489=y
|
CONFIG_ARM64_ERRATUM_2224489=y
|
||||||
CONFIG_ARM64_ERRATUM_2253138=y
|
CONFIG_ARM64_ERRATUM_2253138=y
|
||||||
|
CONFIG_ARM64_ERRATUM_2441007=y
|
||||||
CONFIG_ARM64_ERRATUM_2441009=y
|
CONFIG_ARM64_ERRATUM_2441009=y
|
||||||
CONFIG_ARM64_ERRATUM_2457168=y
|
CONFIG_ARM64_ERRATUM_2457168=y
|
||||||
CONFIG_ARM64_ERRATUM_819472=y
|
CONFIG_ARM64_ERRATUM_819472=y
|
||||||
|
@ -369,6 +369,7 @@ CONFIG_ARM64_ERRATUM_2119858=y
|
|||||||
CONFIG_ARM64_ERRATUM_2139208=y
|
CONFIG_ARM64_ERRATUM_2139208=y
|
||||||
CONFIG_ARM64_ERRATUM_2224489=y
|
CONFIG_ARM64_ERRATUM_2224489=y
|
||||||
CONFIG_ARM64_ERRATUM_2253138=y
|
CONFIG_ARM64_ERRATUM_2253138=y
|
||||||
|
CONFIG_ARM64_ERRATUM_2441007=y
|
||||||
CONFIG_ARM64_ERRATUM_2441009=y
|
CONFIG_ARM64_ERRATUM_2441009=y
|
||||||
CONFIG_ARM64_ERRATUM_2457168=y
|
CONFIG_ARM64_ERRATUM_2457168=y
|
||||||
CONFIG_ARM64_ERRATUM_819472=y
|
CONFIG_ARM64_ERRATUM_819472=y
|
||||||
|
@ -294,6 +294,7 @@ CONFIG_ARM64_ERRATUM_2119858=y
|
|||||||
CONFIG_ARM64_ERRATUM_2139208=y
|
CONFIG_ARM64_ERRATUM_2139208=y
|
||||||
CONFIG_ARM64_ERRATUM_2224489=y
|
CONFIG_ARM64_ERRATUM_2224489=y
|
||||||
CONFIG_ARM64_ERRATUM_2253138=y
|
CONFIG_ARM64_ERRATUM_2253138=y
|
||||||
|
CONFIG_ARM64_ERRATUM_2441007=y
|
||||||
CONFIG_ARM64_ERRATUM_2441009=y
|
CONFIG_ARM64_ERRATUM_2441009=y
|
||||||
CONFIG_ARM64_ERRATUM_2457168=y
|
CONFIG_ARM64_ERRATUM_2457168=y
|
||||||
CONFIG_ARM64_ERRATUM_819472=y
|
CONFIG_ARM64_ERRATUM_819472=y
|
||||||
|
@ -361,6 +361,7 @@ CONFIG_ARM64_ERRATUM_2119858=y
|
|||||||
CONFIG_ARM64_ERRATUM_2139208=y
|
CONFIG_ARM64_ERRATUM_2139208=y
|
||||||
CONFIG_ARM64_ERRATUM_2224489=y
|
CONFIG_ARM64_ERRATUM_2224489=y
|
||||||
CONFIG_ARM64_ERRATUM_2253138=y
|
CONFIG_ARM64_ERRATUM_2253138=y
|
||||||
|
CONFIG_ARM64_ERRATUM_2441007=y
|
||||||
CONFIG_ARM64_ERRATUM_858921=y
|
CONFIG_ARM64_ERRATUM_858921=y
|
||||||
CONFIG_ARM64_USE_LSE_ATOMICS=y
|
CONFIG_ARM64_USE_LSE_ATOMICS=y
|
||||||
CONFIG_ARMADA_37XX_RWTM_MBOX=m
|
CONFIG_ARMADA_37XX_RWTM_MBOX=m
|
||||||
|
@ -361,6 +361,7 @@ CONFIG_ARM64_ERRATUM_2119858=y
|
|||||||
CONFIG_ARM64_ERRATUM_2139208=y
|
CONFIG_ARM64_ERRATUM_2139208=y
|
||||||
CONFIG_ARM64_ERRATUM_2224489=y
|
CONFIG_ARM64_ERRATUM_2224489=y
|
||||||
CONFIG_ARM64_ERRATUM_2253138=y
|
CONFIG_ARM64_ERRATUM_2253138=y
|
||||||
|
CONFIG_ARM64_ERRATUM_2441007=y
|
||||||
CONFIG_ARM64_ERRATUM_858921=y
|
CONFIG_ARM64_ERRATUM_858921=y
|
||||||
CONFIG_ARM64_USE_LSE_ATOMICS=y
|
CONFIG_ARM64_USE_LSE_ATOMICS=y
|
||||||
CONFIG_ARMADA_37XX_RWTM_MBOX=m
|
CONFIG_ARMADA_37XX_RWTM_MBOX=m
|
||||||
|
@ -353,6 +353,7 @@ CONFIG_ARM64_ERRATUM_2119858=y
|
|||||||
CONFIG_ARM64_ERRATUM_2139208=y
|
CONFIG_ARM64_ERRATUM_2139208=y
|
||||||
CONFIG_ARM64_ERRATUM_2224489=y
|
CONFIG_ARM64_ERRATUM_2224489=y
|
||||||
CONFIG_ARM64_ERRATUM_2253138=y
|
CONFIG_ARM64_ERRATUM_2253138=y
|
||||||
|
CONFIG_ARM64_ERRATUM_2441007=y
|
||||||
CONFIG_ARM64_ERRATUM_858921=y
|
CONFIG_ARM64_ERRATUM_858921=y
|
||||||
CONFIG_ARM64_USE_LSE_ATOMICS=y
|
CONFIG_ARM64_USE_LSE_ATOMICS=y
|
||||||
CONFIG_ARMADA_37XX_RWTM_MBOX=m
|
CONFIG_ARMADA_37XX_RWTM_MBOX=m
|
||||||
|
@ -353,6 +353,7 @@ CONFIG_ARM64_ERRATUM_2119858=y
|
|||||||
CONFIG_ARM64_ERRATUM_2139208=y
|
CONFIG_ARM64_ERRATUM_2139208=y
|
||||||
CONFIG_ARM64_ERRATUM_2224489=y
|
CONFIG_ARM64_ERRATUM_2224489=y
|
||||||
CONFIG_ARM64_ERRATUM_2253138=y
|
CONFIG_ARM64_ERRATUM_2253138=y
|
||||||
|
CONFIG_ARM64_ERRATUM_2441007=y
|
||||||
CONFIG_ARM64_ERRATUM_858921=y
|
CONFIG_ARM64_ERRATUM_858921=y
|
||||||
CONFIG_ARM64_USE_LSE_ATOMICS=y
|
CONFIG_ARM64_USE_LSE_ATOMICS=y
|
||||||
CONFIG_ARMADA_37XX_RWTM_MBOX=m
|
CONFIG_ARMADA_37XX_RWTM_MBOX=m
|
||||||
|
16
kernel.spec
16
kernel.spec
@ -122,17 +122,17 @@ Summary: The Linux kernel
|
|||||||
# the --with-release option overrides this setting.)
|
# the --with-release option overrides this setting.)
|
||||||
%define debugbuildsenabled 1
|
%define debugbuildsenabled 1
|
||||||
# define buildid .local
|
# define buildid .local
|
||||||
%define specversion 5.19.16
|
%define specversion 5.19.17
|
||||||
%define patchversion 5.19
|
%define patchversion 5.19
|
||||||
%define pkgrelease 301
|
%define pkgrelease 300
|
||||||
%define kversion 5
|
%define kversion 5
|
||||||
%define tarfile_release 5.19.16
|
%define tarfile_release 5.19.17
|
||||||
# This is needed to do merge window version magic
|
# This is needed to do merge window version magic
|
||||||
%define patchlevel 19
|
%define patchlevel 19
|
||||||
# This allows pkg_release to have configurable %%{?dist} tag
|
# This allows pkg_release to have configurable %%{?dist} tag
|
||||||
%define specrelease 301%{?buildid}%{?dist}
|
%define specrelease 300%{?buildid}%{?dist}
|
||||||
# This defines the kabi tarball version
|
# This defines the kabi tarball version
|
||||||
%define kabiversion 5.19.16
|
%define kabiversion 5.19.17
|
||||||
|
|
||||||
#
|
#
|
||||||
# End of genspec.sh variables
|
# End of genspec.sh variables
|
||||||
@ -3138,6 +3138,12 @@ fi
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 24 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.19.17-300]
|
||||||
|
- Reset release (Justin M. Forbes)
|
||||||
|
|
||||||
|
* Mon Oct 24 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.19.17-1]
|
||||||
|
- Linux v5.19.17
|
||||||
|
|
||||||
* Fri Oct 21 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.19.16-1]
|
* Fri Oct 21 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.19.16-1]
|
||||||
- Bump for build (Justin M. Forbes)
|
- Bump for build (Justin M. Forbes)
|
||||||
- drm/vc4: hdmi: Fix HSM clock too low on Pi4 (maxime@cerno.tech)
|
- drm/vc4: hdmi: Fix HSM clock too low on Pi4 (maxime@cerno.tech)
|
||||||
|
@ -26,8 +26,6 @@
|
|||||||
drivers/firmware/efi/efi.c | 124 ++-
|
drivers/firmware/efi/efi.c | 124 ++-
|
||||||
drivers/firmware/efi/secureboot.c | 38 +
|
drivers/firmware/efi/secureboot.c | 38 +
|
||||||
drivers/firmware/sysfb.c | 18 +-
|
drivers/firmware/sysfb.c | 18 +-
|
||||||
drivers/gpu/drm/drm_ioctl.c | 8 +-
|
|
||||||
drivers/gpu/drm/i915/display/intel_bios.c | 46 +-
|
|
||||||
drivers/gpu/drm/i915/display/intel_psr.c | 37 +-
|
drivers/gpu/drm/i915/display/intel_psr.c | 37 +-
|
||||||
drivers/gpu/drm/v3d/Kconfig | 5 +-
|
drivers/gpu/drm/v3d/Kconfig | 5 +-
|
||||||
drivers/gpu/drm/v3d/v3d_debugfs.c | 18 +-
|
drivers/gpu/drm/v3d/v3d_debugfs.c | 18 +-
|
||||||
@ -46,7 +44,6 @@
|
|||||||
drivers/net/phy/bcm-phy-ptp.c | 944 +++++++++++++++++++++
|
drivers/net/phy/bcm-phy-ptp.c | 944 +++++++++++++++++++++
|
||||||
drivers/net/phy/broadcom.c | 33 +-
|
drivers/net/phy/broadcom.c | 33 +-
|
||||||
drivers/pci/quirks.c | 24 +
|
drivers/pci/quirks.c | 24 +
|
||||||
drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 10 +-
|
|
||||||
drivers/soc/bcm/bcm2835-power.c | 72 +-
|
drivers/soc/bcm/bcm2835-power.c | 72 +-
|
||||||
drivers/usb/core/hub.c | 7 +
|
drivers/usb/core/hub.c | 7 +
|
||||||
include/linux/efi.h | 22 +-
|
include/linux/efi.h | 22 +-
|
||||||
@ -59,14 +56,13 @@
|
|||||||
kernel/module/signing.c | 9 +-
|
kernel/module/signing.c | 9 +-
|
||||||
net/bluetooth/hci_event.c | 20 +
|
net/bluetooth/hci_event.c | 20 +
|
||||||
net/ipv4/fib_semantics.c | 8 +-
|
net/ipv4/fib_semantics.c | 8 +-
|
||||||
scripts/pahole-flags.sh | 4 +
|
|
||||||
scripts/tags.sh | 2 +
|
scripts/tags.sh | 2 +
|
||||||
security/integrity/platform_certs/load_uefi.c | 6 +-
|
security/integrity/platform_certs/load_uefi.c | 6 +-
|
||||||
security/lockdown/Kconfig | 13 +
|
security/lockdown/Kconfig | 13 +
|
||||||
security/lockdown/lockdown.c | 1 +
|
security/lockdown/lockdown.c | 1 +
|
||||||
security/security.c | 6 +
|
security/security.c | 6 +
|
||||||
tools/testing/selftests/net/fib_nexthops.sh | 5 +
|
tools/testing/selftests/net/fib_nexthops.sh | 5 +
|
||||||
68 files changed, 1839 insertions(+), 358 deletions(-)
|
64 files changed, 1804 insertions(+), 325 deletions(-)
|
||||||
|
|
||||||
diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml
|
diff --git a/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml b/Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.yaml
|
||||||
index e6485f7b046f..217c42874f41 100644
|
index e6485f7b046f..217c42874f41 100644
|
||||||
@ -258,7 +254,7 @@ index 000000000000..733a26bd887a
|
|||||||
+
|
+
|
||||||
+endmenu
|
+endmenu
|
||||||
diff --git a/Makefile b/Makefile
|
diff --git a/Makefile b/Makefile
|
||||||
index a1d1978bbd03..d636b4d23342 100644
|
index 2113ad46488a..16ef1ab7b9f6 100644
|
||||||
--- a/Makefile
|
--- a/Makefile
|
||||||
+++ b/Makefile
|
+++ b/Makefile
|
||||||
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
|
@@ -18,6 +18,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
|
||||||
@ -273,7 +269,7 @@ index a1d1978bbd03..d636b4d23342 100644
|
|||||||
# to get the ordering right.
|
# to get the ordering right.
|
||||||
#
|
#
|
||||||
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
|
||||||
index 7630ba9cb6cc..c2e2991edd11 100644
|
index ccc4706484d3..9549a5af2cbb 100644
|
||||||
--- a/arch/arm/Kconfig
|
--- a/arch/arm/Kconfig
|
||||||
+++ b/arch/arm/Kconfig
|
+++ b/arch/arm/Kconfig
|
||||||
@@ -1382,9 +1382,9 @@ config HIGHMEM
|
@@ -1382,9 +1382,9 @@ config HIGHMEM
|
||||||
@ -377,10 +373,10 @@ index ce9826bce29b..948d18e59cf5 100644
|
|||||||
CONFIG_DRM_ETNAVIV=m
|
CONFIG_DRM_ETNAVIV=m
|
||||||
CONFIG_DRM_MXSFB=m
|
CONFIG_DRM_MXSFB=m
|
||||||
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
|
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
|
||||||
index cc1e7bb49d38..8bb79230ac24 100644
|
index dfd9228c2adc..1ea58e242a71 100644
|
||||||
--- a/arch/arm64/Kconfig
|
--- a/arch/arm64/Kconfig
|
||||||
+++ b/arch/arm64/Kconfig
|
+++ b/arch/arm64/Kconfig
|
||||||
@@ -1179,7 +1179,7 @@ endchoice
|
@@ -1196,7 +1196,7 @@ endchoice
|
||||||
|
|
||||||
config ARM64_FORCE_52BIT
|
config ARM64_FORCE_52BIT
|
||||||
bool "Force 52-bit virtual addresses for userspace"
|
bool "Force 52-bit virtual addresses for userspace"
|
||||||
@ -389,7 +385,7 @@ index cc1e7bb49d38..8bb79230ac24 100644
|
|||||||
help
|
help
|
||||||
For systems with 52-bit userspace VAs enabled, the kernel will attempt
|
For systems with 52-bit userspace VAs enabled, the kernel will attempt
|
||||||
to maintain compatibility with older software by providing 48-bit VAs
|
to maintain compatibility with older software by providing 48-bit VAs
|
||||||
@@ -1418,6 +1418,7 @@ config XEN
|
@@ -1435,6 +1435,7 @@ config XEN
|
||||||
config FORCE_MAX_ZONEORDER
|
config FORCE_MAX_ZONEORDER
|
||||||
int
|
int
|
||||||
default "14" if ARM64_64K_PAGES
|
default "14" if ARM64_64K_PAGES
|
||||||
@ -912,119 +908,6 @@ index 1f276f108cc9..7039ad9bdf7f 100644
|
|||||||
pd = sysfb_create_simplefb(si, &mode);
|
pd = sysfb_create_simplefb(si, &mode);
|
||||||
if (!IS_ERR(pd))
|
if (!IS_ERR(pd))
|
||||||
goto unlock_mutex;
|
goto unlock_mutex;
|
||||||
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
|
|
||||||
index 51fcf1298023..7f1097947731 100644
|
|
||||||
--- a/drivers/gpu/drm/drm_ioctl.c
|
|
||||||
+++ b/drivers/gpu/drm/drm_ioctl.c
|
|
||||||
@@ -472,7 +472,13 @@ EXPORT_SYMBOL(drm_invalid_op);
|
|
||||||
*/
|
|
||||||
static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value)
|
|
||||||
{
|
|
||||||
- int len;
|
|
||||||
+ size_t len;
|
|
||||||
+
|
|
||||||
+ /* don't attempt to copy a NULL pointer */
|
|
||||||
+ if (WARN_ONCE(!value, "BUG: the value to copy was not set!")) {
|
|
||||||
+ *buf_len = 0;
|
|
||||||
+ return 0;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
/* don't overflow userbuf */
|
|
||||||
len = strlen(value);
|
|
||||||
diff --git a/drivers/gpu/drm/i915/display/intel_bios.c b/drivers/gpu/drm/i915/display/intel_bios.c
|
|
||||||
index 91caf4523b34..84c086610235 100644
|
|
||||||
--- a/drivers/gpu/drm/i915/display/intel_bios.c
|
|
||||||
+++ b/drivers/gpu/drm/i915/display/intel_bios.c
|
|
||||||
@@ -332,18 +332,6 @@ static bool fixup_lfp_data_ptrs(const void *bdb, void *ptrs_block)
|
|
||||||
return validate_lfp_data_ptrs(bdb, ptrs);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static const void *find_fp_timing_terminator(const u8 *data, int size)
|
|
||||||
-{
|
|
||||||
- int i;
|
|
||||||
-
|
|
||||||
- for (i = 0; i < size - 1; i++) {
|
|
||||||
- if (data[i] == 0xff && data[i+1] == 0xff)
|
|
||||||
- return &data[i];
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- return NULL;
|
|
||||||
-}
|
|
||||||
-
|
|
||||||
static int make_lfp_data_ptr(struct lvds_lfp_data_ptr_table *table,
|
|
||||||
int table_size, int total_size)
|
|
||||||
{
|
|
||||||
@@ -367,11 +355,22 @@ static void next_lfp_data_ptr(struct lvds_lfp_data_ptr_table *next,
|
|
||||||
static void *generate_lfp_data_ptrs(struct drm_i915_private *i915,
|
|
||||||
const void *bdb)
|
|
||||||
{
|
|
||||||
- int i, size, table_size, block_size, offset;
|
|
||||||
- const void *t0, *t1, *block;
|
|
||||||
+ int i, size, table_size, block_size, offset, fp_timing_size;
|
|
||||||
struct bdb_lvds_lfp_data_ptrs *ptrs;
|
|
||||||
+ const void *block;
|
|
||||||
void *ptrs_block;
|
|
||||||
|
|
||||||
+ /*
|
|
||||||
+ * The hardcoded fp_timing_size is only valid for
|
|
||||||
+ * modernish VBTs. All older VBTs definitely should
|
|
||||||
+ * include block 41 and thus we don't need to
|
|
||||||
+ * generate one.
|
|
||||||
+ */
|
|
||||||
+ if (i915->vbt.version < 155)
|
|
||||||
+ return NULL;
|
|
||||||
+
|
|
||||||
+ fp_timing_size = 38;
|
|
||||||
+
|
|
||||||
block = find_raw_section(bdb, BDB_LVDS_LFP_DATA);
|
|
||||||
if (!block)
|
|
||||||
return NULL;
|
|
||||||
@@ -380,17 +379,8 @@ static void *generate_lfp_data_ptrs(struct drm_i915_private *i915,
|
|
||||||
|
|
||||||
block_size = get_blocksize(block);
|
|
||||||
|
|
||||||
- size = block_size;
|
|
||||||
- t0 = find_fp_timing_terminator(block, size);
|
|
||||||
- if (!t0)
|
|
||||||
- return NULL;
|
|
||||||
-
|
|
||||||
- size -= t0 - block - 2;
|
|
||||||
- t1 = find_fp_timing_terminator(t0 + 2, size);
|
|
||||||
- if (!t1)
|
|
||||||
- return NULL;
|
|
||||||
-
|
|
||||||
- size = t1 - t0;
|
|
||||||
+ size = fp_timing_size + sizeof(struct lvds_dvo_timing) +
|
|
||||||
+ sizeof(struct lvds_pnp_id);
|
|
||||||
if (size * 16 > block_size)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
@@ -408,7 +398,7 @@ static void *generate_lfp_data_ptrs(struct drm_i915_private *i915,
|
|
||||||
table_size = sizeof(struct lvds_dvo_timing);
|
|
||||||
size = make_lfp_data_ptr(&ptrs->ptr[0].dvo_timing, table_size, size);
|
|
||||||
|
|
||||||
- table_size = t0 - block + 2;
|
|
||||||
+ table_size = fp_timing_size;
|
|
||||||
size = make_lfp_data_ptr(&ptrs->ptr[0].fp_timing, table_size, size);
|
|
||||||
|
|
||||||
if (ptrs->ptr[0].fp_timing.table_size)
|
|
||||||
@@ -423,14 +413,14 @@ static void *generate_lfp_data_ptrs(struct drm_i915_private *i915,
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
- size = t1 - t0;
|
|
||||||
+ size = fp_timing_size + sizeof(struct lvds_dvo_timing) +
|
|
||||||
+ sizeof(struct lvds_pnp_id);
|
|
||||||
for (i = 1; i < 16; i++) {
|
|
||||||
next_lfp_data_ptr(&ptrs->ptr[i].fp_timing, &ptrs->ptr[i-1].fp_timing, size);
|
|
||||||
next_lfp_data_ptr(&ptrs->ptr[i].dvo_timing, &ptrs->ptr[i-1].dvo_timing, size);
|
|
||||||
next_lfp_data_ptr(&ptrs->ptr[i].panel_pnp_id, &ptrs->ptr[i-1].panel_pnp_id, size);
|
|
||||||
}
|
|
||||||
|
|
||||||
- size = t1 - t0;
|
|
||||||
table_size = sizeof(struct lvds_lfp_panel_name);
|
|
||||||
|
|
||||||
if (16 * (size + table_size) <= block_size) {
|
|
||||||
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
|
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
|
||||||
index 06db407e2749..36356893c7ca 100644
|
index 06db407e2749..36356893c7ca 100644
|
||||||
--- a/drivers/gpu/drm/i915/display/intel_psr.c
|
--- a/drivers/gpu/drm/i915/display/intel_psr.c
|
||||||
@ -3026,38 +2909,6 @@ index 2e68f50bc7ae..00e1d5bc83a5 100644
|
|||||||
/*
|
/*
|
||||||
* Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
|
* Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero)
|
||||||
* class code. Fix it.
|
* class code. Fix it.
|
||||||
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
|
||||||
index 5223d4c9afdf..39f14a5b78cd 100644
|
|
||||||
--- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
|
||||||
+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
|
|
||||||
@@ -1124,7 +1124,7 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
|
|
||||||
struct rockchip_usb2phy_port *rport,
|
|
||||||
struct device_node *child_np)
|
|
||||||
{
|
|
||||||
- int ret;
|
|
||||||
+ int ret, id;
|
|
||||||
|
|
||||||
rport->port_id = USB2PHY_PORT_OTG;
|
|
||||||
rport->port_cfg = &rphy->phy_cfg->port_cfgs[USB2PHY_PORT_OTG];
|
|
||||||
@@ -1162,13 +1162,15 @@ static int rockchip_usb2phy_otg_port_init(struct rockchip_usb2phy *rphy,
|
|
||||||
|
|
||||||
ret = devm_extcon_register_notifier(rphy->dev, rphy->edev,
|
|
||||||
EXTCON_USB_HOST, &rport->event_nb);
|
|
||||||
- if (ret)
|
|
||||||
+ if (ret) {
|
|
||||||
dev_err(rphy->dev, "register USB HOST notifier failed\n");
|
|
||||||
+ goto out;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (!of_property_read_bool(rphy->dev->of_node, "extcon")) {
|
|
||||||
/* do initial sync of usb state */
|
|
||||||
- ret = property_enabled(rphy->grf, &rport->port_cfg->utmi_id);
|
|
||||||
- extcon_set_state_sync(rphy->edev, EXTCON_USB_HOST, !ret);
|
|
||||||
+ id = property_enabled(rphy->grf, &rport->port_cfg->utmi_id);
|
|
||||||
+ extcon_set_state_sync(rphy->edev, EXTCON_USB_HOST, !id);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c
|
diff --git a/drivers/soc/bcm/bcm2835-power.c b/drivers/soc/bcm/bcm2835-power.c
|
||||||
index 1e0041ec8132..5bcd047768b6 100644
|
index 1e0041ec8132..5bcd047768b6 100644
|
||||||
--- a/drivers/soc/bcm/bcm2835-power.c
|
--- a/drivers/soc/bcm/bcm2835-power.c
|
||||||
@ -3448,19 +3299,6 @@ index db7b2503f068..36653cd5964a 100644
|
|||||||
nh = fib_info_nh(fi, 0);
|
nh = fib_info_nh(fi, 0);
|
||||||
if (cfg->fc_encap) {
|
if (cfg->fc_encap) {
|
||||||
if (fib_encap_match(net, cfg->fc_encap_type,
|
if (fib_encap_match(net, cfg->fc_encap_type,
|
||||||
diff --git a/scripts/pahole-flags.sh b/scripts/pahole-flags.sh
|
|
||||||
index 0d99ef17e4a5..d4f3d63cb434 100755
|
|
||||||
--- a/scripts/pahole-flags.sh
|
|
||||||
+++ b/scripts/pahole-flags.sh
|
|
||||||
@@ -20,4 +20,8 @@ if [ "${pahole_ver}" -ge "122" ]; then
|
|
||||||
extra_paholeopt="${extra_paholeopt} -j"
|
|
||||||
fi
|
|
||||||
|
|
||||||
+if [ "${pahole_ver}" -ge "124" ]; then
|
|
||||||
+ extra_paholeopt="${extra_paholeopt} --skip_encoding_btf_enum64"
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
echo ${extra_paholeopt}
|
|
||||||
diff --git a/scripts/tags.sh b/scripts/tags.sh
|
diff --git a/scripts/tags.sh b/scripts/tags.sh
|
||||||
index 01fab3d4f90b..2ae5dfc904f9 100755
|
index 01fab3d4f90b..2ae5dfc904f9 100755
|
||||||
--- a/scripts/tags.sh
|
--- a/scripts/tags.sh
|
||||||
|
6
sources
6
sources
@ -1,3 +1,3 @@
|
|||||||
SHA512 (linux-5.19.16.tar.xz) = 47163cd1429a09077134de1bc7f9e6fa3462a030a127a9d8f5268e9ecd1c26894e3edfeb002fff01fdc008a3c61d333d272d6a0d73df5528bc15079e3f93a993
|
SHA512 (linux-5.19.17.tar.xz) = 20f555e06ffc3e790bb280d60e1087f53df59a1c63832f797caf9c7289fff928d762cee7c044bfac47ed9160c52440be045b7dcab8dafde053495990ac1e6432
|
||||||
SHA512 (kernel-abi-stablelists-5.19.16.tar.bz2) = 56b1d77e7c1f8b463eae64c4dbc0f131aa5e4ef20005008cf5662a992cd0b10b380405c55d94eab31f3144e3c14808c939c76e9f545be5cb1cc9b875f2a0ef34
|
SHA512 (kernel-abi-stablelists-5.19.17.tar.bz2) = 71209db7b9257ef0234c08a3ae88d318657f1be42e01f05e2fe779f36204edd3ad2d7d767809a469d77bcd13300643c74a364514b278c3e820b683db805b0857
|
||||||
SHA512 (kernel-kabi-dw-5.19.16.tar.bz2) = e649054eca21dd03263304df8b17c30a7f86bd546e516d8371569905cb36648cf35cb24d05d36c20f6806580892200bf5f0254dd8d3bae9dee9b3ad57f2fd462
|
SHA512 (kernel-kabi-dw-5.19.17.tar.bz2) = ec46be1b67769d585aeb42946de8d3f4f5e5b88c078daeb1cc89d532325326e4e152d2a9d994e02c9d9b4ab38f0c710c8366ba3e9fa69b3b2ef40413849b06eb
|
||||||
|
Loading…
x
Reference in New Issue
Block a user